chore: incrementing version number - v1.15.1

(cherry picked from commit 2790a3a3fe) Signed-off-by: Misty (Bot) <deploy@nodebb.org>
chore: update changelog for v1.15.1
2026-01-01 05:10:42 +01:00 · 2020-11-11 22:51:06 +00:00 · 2020-11-11 22:51:06 +00:00 · 2020-11-11 12:48:32 -05:00 · 2020-11-11 12:48:22 -05:00 · 2020-11-11 15:52:59 +00:00
1286 changed files with 12585 additions and 15192 deletions
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -0,0 +1,204 @@
+name: Lint and test
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+    branches:
+      - master
+      - develop
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  test:
+    name: Lint and test
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        node: [10, 12, 14]
+        database: [mongo-dev, mongo, redis, postgres]
+        include:
+          # only run coverage once
+          - os: ubuntu-latest
+            node: 14
+            coverage: true
+          # test under development once
+          - database: mongo-dev
+            test_env: development
+          # only run eslint once
+          - os: ubuntu-latest
+            node: 14
+            database: mongo-dev
+            lint: true
+    runs-on: ${{ matrix.os }}
+    env:
+      TEST_ENV: ${{ matrix.test_env || 'production' }}
+
+    services:
+      postgres:
+        image: 'postgres:10-alpine'
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          # Maps port 5432 on service container to the host
+          - 5432:5432
+
+      redis:
+        image: 'redis:2.8.9'
+        # Set health checks to wait until redis has started
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          # Maps port 6379 on service container to the host
+          - 6379:6379
+
+      mongo:
+        image: 'mongo:3.2'
+        ports:
+          # Maps port 27017 on service container to the host
+          - 27017:27017
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - run: cp install/package.json package.json
+
+      - name: Install Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node }}
+
+      - name: NPM Install
+        uses: bahmutov/npm-install@v1
+        with:
+          useLockFile: false
+
+      - name: Setup on MongoDB
+        if: startsWith(matrix.database, 'mongo')
+        env:
+          SETUP: >-
+            {
+              "url": "http://127.0.0.1:4567",
+              "secret": "abcdef",
+              "admin:username": "admin",
+              "admin:email": "test@example.org",
+              "admin:password": "hAN3Eg8W",
+              "admin:password:confirm": "hAN3Eg8W",
+
+              "database": "mongo",
+              "mongo:host": "127.0.0.1",
+              "mongo:port": 27017,
+              "mongo:username": "",
+              "mongo:password": "",
+              "mongo:database": "nodebb"
+            }
+          CI: >-
+            {
+              "host": "127.0.0.1",
+              "port": 27017,
+              "database": "ci_test"
+            }
+        run: |
+          node app --setup="${SETUP}" --ci="${CI}"
+
+      - name: Setup on PostgreSQL
+        if: startsWith(matrix.database, 'postgres')
+        env:
+          SETUP: >-
+            {
+              "url": "http://127.0.0.1:4567",
+              "secret": "abcdef",
+              "admin:username": "admin",
+              "admin:email": "test@example.org",
+              "admin:password": "hAN3Eg8W",
+              "admin:password:confirm": "hAN3Eg8W",
+
+              "database": "postgres",
+              "postgres:host": "127.0.0.1",
+              "postgres:port": 5432,
+              "postgres:username": "postgres",
+              "postgres:password": "postgres",
+              "postgres:database": "nodebb"
+            }
+          CI: >-
+            {
+              "host": "127.0.0.1",
+              "database": "ci_test",
+              "port": 5432,
+              "username": "postgres",
+              "password": "postgres"
+            }
+        run: |
+          node -e "const { Client } = require('pg'); const c = new Client({ host: '127.0.0.1', port: 5432, user: 'postgres', password: 'postgres' }); c.connect().then(() => c.query('CREATE DATABASE nodebb')).then(() => c.query('CREATE DATABASE ci_test')).then(() => c.end())"
+          node app --setup="${SETUP}" --ci="${CI}"
+
+      - name: Setup on Redis
+        if: startsWith(matrix.database, 'redis')
+        env:
+          SETUP: >-
+            {
+              "url": "http://127.0.0.1:4567/forum",
+              "secret": "abcdef",
+              "admin:username": "admin",
+              "admin:email": "test@example.org",
+              "admin:password": "hAN3Eg8W",
+              "admin:password:confirm": "hAN3Eg8W",
+
+              "database": "redis",
+              "redis:host": "127.0.0.1",
+              "redis:port": 6379,
+              "redis:password": "",
+              "redis:database": 0
+            }
+          CI: >-
+            {
+              "host": "127.0.0.1",
+              "database": 1,
+              "port": 6379
+            }
+        run: |
+          node app --setup="${SETUP}" --ci="${CI}"
+
+      - name: Run ESLint
+        if: matrix.lint
+        run: npm run lint
+
+      - name: Node tests
+        run: npm test
+
+      - name: Extract coverage info
+        run: npm run coverage
+
+      - name: Test coverage
+        uses: coverallsapp/github-action@v1.1.2
+        if: matrix.coverage
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          flag-name: ${{ matrix.os }}-node-${{ matrix.node }}-db-${{ matrix.database }}
+          parallel: true
+  
+  finish:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Coveralls Finished
+        uses: coverallsapp/github-action@v1.1.2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel-finished: true
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,7 @@ pidfile
 /public/acp.min.js.map
 /public/installer.css
 /public/installer.min.js
+/public/bootstrap.min.css
 /public/logo.png

 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,47 +0,0 @@
-services:
-  - mongodb
-  - redis-server
-  - postgresql
-before_install:
-  - cp install/package.json package.json
-  - sudo apt-get update
-  - sudo apt-get --yes remove postgresql\*
-  - sudo apt-get install -y postgresql-12 postgresql-client-12
-  - sudo cp /etc/postgresql/{9.6,12}/main/pg_hba.conf
-  - sudo service postgresql restart 12
-before_script:
-  - sleep 15 # wait for mongodb to be ready
-  - "mongo mydb_test --eval 'db.createUser({user:\"travis\", pwd: \"test\", roles: []});'"
-  - sh -c "if [ '$DB' = 'mongodb' ]; then node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567\\\",\\\"secret\\\":\\\"abcdef\\\",\\\"database\\\":\\\"mongo\\\",\\\"mongo:host\\\":\\\"127.0.0.1\\\",\\\"mongo:port\\\":27017,\\\"mongo:username\\\":\\\"\\\",\\\"mongo:password\\\":\\\"\\\",\\\"mongo:database\\\":0,\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"hAN3Eg8W\\\",\\\"admin:password:confirm\\\":\\\"hAN3Eg8W\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":27017,\\\"database\\\":\\\"travis_ci_test\\\"}\"; fi"
-  - sh -c "if [ '$DB' = 'redis' ]; then node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567/forum\\\",\\\"secret\\\":\\\"abcdef\\\",\\\"database\\\":\\\"redis\\\",\\\"redis:host\\\":\\\"127.0.0.1\\\",\\\"redis:port\\\":6379,\\\"redis:password\\\":\\\"\\\",\\\"redis:database\\\":0,\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"hAN3Eg8W\\\",\\\"admin:password:confirm\\\":\\\"hAN3Eg8W\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":6379,\\\"database\\\":1}\"; fi"
-  - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database nodebb;' -U postgres; psql -c 'create database travis_ci_test;' -U postgres; node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567\\\",\\\"secret\\\":\\\"abcdef\\\",\\\"database\\\":\\\"postgres\\\",\\\"postgres:host\\\":\\\"127.0.0.1\\\",\\\"postgres:port\\\":5433,\\\"postgres:password\\\":\\\"\\\",\\\"postgres:database\\\":\\\"nodebb\\\",\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"hAN3Eg8W\\\",\\\"admin:password:confirm\\\":\\\"hAN3Eg8W\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":5433,\\\"username\\\":\\\"postgres\\\",\\\"database\\\":\\\"travis_ci_test\\\"}\"; fi"
-after_success:
-  - "npm run coveralls"
-language: node_js
-sudo: false
-dist: xenial
-env:
-  global:
-    - PGUSER=postgres
-    - PGPORT=5433
-    - CXX=g++-4.8
-  jobs:
-    - "DB=mongodb TEST_ENV=production"
-    - "DB=mongodb TEST_ENV=development"
-    - "DB=redis TEST_ENV=production"
-    - "DB=postgres TEST_ENV=production"
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-      - mongodb-4.0-xenial
-    packages:
-      - g++-4.8
-      - mongodb-org-server
-node_js:
-  - "14"
-  - "12"
-branches:
-  only:
-    - master
-    - develop
--- a/.tx/config
+++ b/.tx/config
@@ -3300,6 +3300,56 @@ trans.zh_CN = public/language/zh-CN/admin/settings/notifications.json
 trans.zh_TW = public/language/zh-TW/admin/settings/notifications.json
 type = KEYVALUEJSON

+[nodebb.admin-settings-api]
+file_filter = public/language/<lang>/admin/settings/api.json
+source_file = public/language/en-GB/admin/settings/api.json
+source_lang = en_GB
+trans.ar = public/language/ar/admin/settings/api.json
+trans.bg = public/language/bg/admin/settings/api.json
+trans.bn = public/language/bn/admin/settings/api.json
+trans.cs = public/language/cs/admin/settings/api.json
+trans.da = public/language/da/admin/settings/api.json
+trans.de = public/language/de/admin/settings/api.json
+trans.el = public/language/el/admin/settings/api.json
+trans.en@pirate = public/language/en-x-pirate/admin/settings/api.json
+trans.en_US = public/language/en-US/admin/settings/api.json
+trans.es = public/language/es/admin/settings/api.json
+trans.et = public/language/et/admin/settings/api.json
+trans.fa_IR = public/language/fa-IR/admin/settings/api.json
+trans.fi = public/language/fi/admin/settings/api.json
+trans.fr = public/language/fr/admin/settings/api.json
+trans.gl = public/language/gl/admin/settings/api.json
+trans.he = public/language/he/admin/settings/api.json
+trans.hr = public/language/hr/admin/settings/api.json
+trans.hu = public/language/hu/admin/settings/api.json
+trans.id = public/language/id/admin/settings/api.json
+trans.it = public/language/it/admin/settings/api.json
+trans.ja = public/language/ja/admin/settings/api.json
+trans.ko = public/language/ko/admin/settings/api.json
+trans.lt = public/language/lt/admin/settings/api.json
+trans.lv = public/language/lv/admin/settings/api.json
+trans.ms = public/language/ms/admin/settings/api.json
+trans.nb = public/language/nb/admin/settings/api.json
+trans.nl = public/language/nl/admin/settings/api.json
+trans.pl = public/language/pl/admin/settings/api.json
+trans.pt_BR = public/language/pt-BR/admin/settings/api.json
+trans.pt_PT = public/language/pt-PT/admin/settings/api.json
+trans.ro = public/language/ro/admin/settings/api.json
+trans.ru = public/language/ru/admin/settings/api.json
+trans.rw = public/language/rw/admin/settings/api.json
+trans.sc = public/language/sc/admin/settings/api.json
+trans.sk = public/language/sk/admin/settings/api.json
+trans.sl = public/language/sl/admin/settings/api.json
+trans.sr = public/language/sr/admin/settings/api.json
+trans.sv = public/language/sv/admin/settings/api.json
+trans.th = public/language/th/admin/settings/api.json
+trans.tr = public/language/tr/admin/settings/api.json
+trans.uk = public/language/uk/admin/settings/api.json
+trans.vi = public/language/vi/admin/settings/api.json
+trans.zh_CN = public/language/zh-CN/admin/settings/api.json
+trans.zh_TW = public/language/zh-TW/admin/settings/api.json
+type = KEYVALUEJSON
+
 [nodebb.admin-settings-post]
 file_filter = public/language/<lang>/admin/settings/post.json
 source_file = public/language/en-GB/admin/settings/post.json
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/README.md
+++ b/README.md
@@ -1,15 +1,16 @@
-# <img alt="NodeBB" src="http://i.imgur.com/mYxPPtB.png" />
+# ![NodeBB](public/images/logo.svg)

 [![Build Status](https://travis-ci.org/NodeBB/NodeBB.svg?branch=master)](https://travis-ci.org/NodeBB/NodeBB)
 [![Coverage Status](https://coveralls.io/repos/github/NodeBB/NodeBB/badge.svg?branch=master)](https://coveralls.io/github/NodeBB/NodeBB?branch=master)
 [![Dependency Status](https://david-dm.org/nodebb/nodebb.svg?path=install)](https://david-dm.org/nodebb/nodebb?path=install)
 [![Code Climate](https://codeclimate.com/github/NodeBB/NodeBB/badges/gpa.svg)](https://codeclimate.com/github/NodeBB/NodeBB)

-[**NodeBB Forum Software**](https://nodebb.org) is powered by Node.js and built on either a Redis or MongoDB database. It utilizes web sockets for instant interactions and real-time notifications. NodeBB has many modern features out of the box such as social network integration and streaming discussions, while still making sure to be compatible with older browsers.
+[**NodeBB Forum Software**](https://nodebb.org) is powered by Node.js and supports either Redis, MongoDB, or a PostgreSQL database. It utilizes web sockets for instant interactions and real-time notifications. NodeBB has many modern features out of the box such as social network integration and streaming discussions, while still making sure to be compatible with older browsers.

 Additional functionality is enabled through the use of third-party plugins.

-* [Demo & Meta Discussion](http://community.nodebb.org)
+* [Demo](https://try.nodebb.org)
+* [Developer Community](http://community.nodebb.org)
 * [Documentation & Installation Instructions](http://docs.nodebb.org)
 * [Help translate NodeBB](https://www.transifex.com/projects/p/nodebb/)
 * [NodeBB Blog](http://blog.nodebb.org)
@@ -48,8 +49,8 @@ Our minimalist "Persona" theme gets you going right away, no coding experience r

 NodeBB requires the following software to be installed:

-* A version of Node.js at least 10 or greater ([installation/upgrade instructions](https://github.com/nodesource/distributions))
-* Redis, version 2.8.9 or greater **or** MongoDB, version 2.6 or greater
+* A version of Node.js at least 12 or greater ([installation/upgrade instructions](https://github.com/nodesource/distributions))
+* MongoDB, version 2.6 or greater **or** Redis, version 2.8.9 or greater
 * nginx, version 1.3.13 or greater (**only if** intending to use nginx to proxy requests to a NodeBB)

 ## Installation
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -3,6 +3,7 @@
 module.exports = {
 	extends: ['@commitlint/config-angular'],
 	rules: {
+		'header-max-length': [1, 'always', 72],
 		'type-enum': [
 			2,
 			'always',
--- a/install/data/defaults.json
+++ b/install/data/defaults.json
@@ -114,6 +114,8 @@
    "hideFullname": 0,
    "hideEmail": 0,
    "allowGuestHandles": 0,
+    "guestsIncrementTopicViews": 1,
+    "incrementTopicViewsInterval": 60,
    "recentMaxTopics": 200,
    "disableRecentCategoryFilter": 0,
    "maximumRelatedTopics": 0,
@@ -133,5 +135,7 @@
    "timeagoCutoff": 30,
    "necroThreshold": 7,
    "categoryWatchState": "watching",
-    "submitPluginUsage": 1
+    "submitPluginUsage": 1,
+    "maxUserSessions": 10,
+    "useCompression": 0
 }
--- a/install/package.json
+++ b/install/package.json
@@ -2,7 +2,7 @@
    "name": "nodebb",
    "license": "GPL-3.0",
    "description": "NodeBB Forum",
-    "version": "1.15.0-beta.28",
+    "version": "1.15.1",
    "homepage": "http://www.nodebb.org",
    "repository": {
        "type": "git",
@@ -12,10 +12,16 @@
    "scripts": {
        "start": "node loader.js",
        "lint": "npx eslint --cache ./nodebb .",
-        "pretest": "npm run lint",
        "test": "npx nyc --reporter=html --reporter=text-summary npx mocha",
+        "coverage": "nyc report --reporter=text-lcov > ./coverage/lcov.info",
        "coveralls": "nyc report --reporter=text-lcov | coveralls && rm -r coverage"
    },
+    "nyc": {
+        "exclude": [
+            "src/upgrades/*",
+            "test/*"
+        ]
+    },
    "husky": {
        "hooks": {
            "pre-commit": "npx lint-staged",
@@ -29,19 +35,22 @@
        ]
    },
    "dependencies": {
+        "@adactive/bootstrap-tagsinput": "^0.8.2",
        "ace-builds": "^1.4.9",
        "archiver": "^5.0.0",
        "async": "^3.2.0",
        "autoprefixer": "^10.0.0",
        "bcryptjs": "2.4.3",
-        "benchpressjs": "2.0.4",
+        "benchpressjs": "2.1.0",
        "body-parser": "^1.19.0",
+        "bootbox": "4.4.0",
        "bootstrap": "^3.4.1",
        "chart.js": "^2.9.3",
        "cli-graph": "^3.2.2",
        "clipboard": "^2.0.6",
        "colors": "^1.4.0",
        "commander": "^6.0.0",
+        "compare-versions": "3.6.0",
        "compression": "^1.7.4",
        "connect-ensure-login": "^0.1.1",
        "connect-flash": "^0.1.1",
@@ -54,7 +63,7 @@
        "cropperjs": "^1.5.6",
        "csurf": "^1.11.0",
        "daemon": "^1.1.0",
-        "diff": "^4.0.2",
+        "diff": "^5.0.0",
        "express": "^4.17.1",
        "express-session": "^1.17.0",
        "express-useragent": "^1.0.13",
@@ -63,8 +72,12 @@
        "html-to-text": "^5.1.1",
        "ipaddr.js": "^2.0.0",
        "jquery": "3.5.1",
-        "jsesc": "3.0.1",
-        "json2csv": "5.0.3",
+        "jquery-deserialize": "2.0.0-rc1",
+        "jquery-form": "4.3.0",
+        "jquery-serializeobject": "1.0.0",
+        "jquery-ui": "1.12.1",
+        "jsesc": "3.0.2",
+        "json2csv": "5.0.4",
        "jsonwebtoken": "^8.5.1",
        "less": "^3.11.1",
        "lodash": "^4.17.15",
@@ -73,59 +86,67 @@
        "material-design-lite": "^1.3.0",
        "mime": "^2.4.4",
        "mkdirp": "^1.0.4",
-        "mongodb": "3.6.2",
+        "mongodb": "3.6.3",
        "morgan": "^1.10.0",
        "mousetrap": "^1.6.5",
        "@nodebb/bootswatch": "3.4.2",
-        "@nodebb/mubsub": "1.7.0",
-        "@nodebb/socket.io-adapter-mongo": "3.1.0",
+        "@nodebb/mubsub": "1.7.1",
+        "@nodebb/socket.io-adapter-mongo": "3.1.1",
        "nconf": "^0.10.0",
-        "nodebb-plugin-composer-default": "6.3.57",
+        "nodebb-plugin-composer-default": "6.4.6",
        "nodebb-plugin-dbsearch": "4.1.2",
        "nodebb-plugin-emoji": "^3.3.0",
        "nodebb-plugin-emoji-android": "2.0.0",
        "nodebb-plugin-markdown": "8.12.1",
-        "nodebb-plugin-mentions": "2.10.0",
+        "nodebb-plugin-mentions": "2.13.4",
        "nodebb-plugin-soundpack-default": "1.0.0",
-        "nodebb-plugin-spam-be-gone": "0.7.2",
-        "nodebb-rewards-essentials": "0.1.3",
-        "nodebb-theme-lavender": "5.0.13",
-        "nodebb-theme-persona": "10.2.41",
-        "nodebb-theme-slick": "1.2.34",
-        "nodebb-theme-vanilla": "11.2.18",
+        "nodebb-plugin-spam-be-gone": "0.7.3",
+        "nodebb-rewards-essentials": "0.1.4",
+        "nodebb-theme-lavender": "5.0.14",
+        "nodebb-theme-persona": "10.2.67",
+        "nodebb-theme-slick": "1.2.40",
+        "nodebb-theme-vanilla": "11.3.0",
        "nodebb-widget-essentials": "4.1.2",
        "nodemailer": "^6.4.6",
+        "nprogress": "0.2.0",
        "passport": "^0.4.1",
+        "passport-http-bearer": "^1.0.1",
        "passport-local": "1.0.0",
        "pg": "^8.0.2",
        "pg-cursor": "^2.1.9",
-        "postcss": "8.0.6",
+        "postcss": "8.1.7",
        "postcss-clean": "1.1.0",
        "promise-polyfill": "^8.1.3",
        "prompt": "^1.0.0",
        "redis": "3.0.2",
        "request": "2.88.2",
        "request-promise-native": "^1.0.8",
+        "requirejs": "2.3.6",
        "rimraf": "3.0.2",
        "rss": "^1.2.2",
        "sanitize-html": "^2.0.0",
        "semver": "^7.2.1",
        "serve-favicon": "^2.5.0",
-        "sharp": "0.26.1",
+        "sharp": "0.26.2",
        "sitemap": "^6.1.0",
+        "slideout": "1.0.1",
        "socket.io": "2.3.0",
        "socket.io-adapter-cluster": "^1.0.1",
        "socket.io-adapter-postgres": "^1.2.1",
-        "socket.io-client": "2.3.0",
+        "socket.io-client": "2.3.1",
        "socket.io-redis": "5.4.0",
        "socketio-wildcard": "2.0.0",
+        "sortablejs": "1.10.2",
        "spdx-license-list": "^6.1.0",
        "spider-detector": "2.0.0",
        "textcomplete": "^0.17.1",
        "textcomplete.contenteditable": "^0.1.1",
+        "timeago": "^1.6.7",
+        "tinycon": "0.6.8",
        "toobusy-js": "^0.5.1",
        "uglify-es": "^3.3.9",
        "validator": "13.1.17",
+        "visibilityjs": "2.0.2",
        "winston": "3.3.3",
        "xml": "^1.0.1",
        "xregexp": "^4.3.0",
@@ -133,18 +154,18 @@
    },
    "devDependencies": {
        "@apidevtools/swagger-parser": "10.0.2",
-        "@commitlint/cli": "9.1.2",
-        "@commitlint/config-angular": "9.1.2",
+        "@commitlint/cli": "11.0.0",
+        "@commitlint/config-angular": "11.0.0",
        "coveralls": "3.1.0",
-        "eslint": "7.10.0",
-        "eslint-config-airbnb-base": "14.2.0",
+        "eslint": "7.13.0",
+        "eslint-config-airbnb-base": "14.2.1",
        "eslint-plugin-import": "2.22.1",
        "grunt": "1.3.0",
        "grunt-contrib-watch": "1.1.0",
        "husky": "4.3.0",
        "jsdom": "16.4.0",
-        "lint-staged": "10.4.0",
-        "mocha": "8.1.3",
+        "lint-staged": "10.5.1",
+        "mocha": "8.2.1",
        "mocha-lcov-reporter": "1.3.0",
        "nyc": "15.1.0",
        "smtp-server": "3.7.0"
--- a/install/web.js
+++ b/install/web.js
@@ -1,21 +1,27 @@
 'use strict';

-var winston = require('winston');
-var express = require('express');
-var bodyParser = require('body-parser');
-var fs = require('fs');
-var path = require('path');
-var childProcess = require('child_process');
-var less = require('less');
-var async = require('async');
-var uglify = require('uglify-es');
-var nconf = require('nconf');
-var Benchpress = require('benchpressjs');
+const winston = require('winston');
+const express = require('express');
+const bodyParser = require('body-parser');
+const fs = require('fs');
+const path = require('path');
+const childProcess = require('child_process');
+const less = require('less');
+const util = require('util');
+const lessRenderAsync = util.promisify(
+	(style, opts, cb) => less.render(String(style), opts, cb)
+);
+const uglify = require('uglify-es');
+const nconf = require('nconf');

-var app = express();
-var server;
+const Benchpress = require('benchpressjs');
+const mkdirp = require('mkdirp');
+const { paths } = require('../src/constants');

-var formats = [
+const app = express();
+let server;
+
+const formats = [
 	winston.format.colorize(),
 ];

@@ -42,50 +48,52 @@ winston.configure({
 	],
 });

-var web = module.exports;
+const web = module.exports;

-var scripts = [
+const scripts = [
 	'node_modules/jquery/dist/jquery.js',
-	'public/vendor/xregexp/xregexp.js',
-	'public/vendor/xregexp/unicode/unicode-base.js',
+	'node_modules/xregexp/xregexp-all.js',
+	'public/src/modules/slugify.js',
 	'public/src/utils.js',
 	'public/src/installer/install.js',
 	'node_modules/zxcvbn/dist/zxcvbn.js',
 ];

-var installing = false;
-var success = false;
-var error = false;
-var launchUrl;
+let installing = false;
+let success = false;
+let error = false;
+let launchUrl;

-web.install = function (port) {
+const viewsDir = path.join(paths.baseDir, 'build/public/templates');
+
+web.install = async function (port) {
 	port = port || 4567;
 	winston.info('Launching web installer on port ' + port);

 	app.use(express.static('public', {}));
 	app.engine('tpl', function (filepath, options, callback) {
-		async.waterfall([
-			function (next) {
-				fs.readFile(filepath, 'utf-8', next);
-			},
-			function (buffer, next) {
-				Benchpress.compileParse(buffer.toString(), options, next);
-			},
-		], callback);
+		filepath = filepath.replace(/\.tpl$/, '.js');
+
+		Benchpress.__express(filepath, options, callback);
 	});
 	app.set('view engine', 'tpl');
-	app.set('views', path.join(__dirname, '../src/views'));
+	app.set('views', viewsDir);
 	app.use(bodyParser.urlencoded({
 		extended: true,
 	}));
-
-	async.parallel([compileLess, compileJS, copyCSS, loadDefaults], function (err) {
-		if (err) {
-			winston.error(err.stack);
-		}
+	try {
+		await Promise.all([
+			compileTemplate(),
+			compileLess(),
+			compileJS(),
+			copyCSS(),
+			loadDefaults(),
+		]);
 		setupRoutes();
 		launchExpress(port);
-	});
+	} catch (err) {
+		winston.error(err.stack);
+	}
 };


@@ -180,120 +188,116 @@ function install(req, res) {
 	});
 }

-function launch(req, res) {
-	res.json({});
-	server.close();
-	req.setTimeout(0);
-	var child;
+async function launch(req, res) {
+	try {
+		res.json({});
+		server.close();
+		req.setTimeout(0);
+		var child;

-	if (!nconf.get('launchCmd')) {
-		child = childProcess.spawn('node', ['loader.js'], {
-			detached: true,
-			stdio: ['ignore', 'ignore', 'ignore'],
-		});
+		if (!nconf.get('launchCmd')) {
+			child = childProcess.spawn('node', ['loader.js'], {
+				detached: true,
+				stdio: ['ignore', 'ignore', 'ignore'],
+			});

-		console.log('\nStarting NodeBB');
-		console.log('    "./nodebb stop" to stop the NodeBB server');
-		console.log('    "./nodebb log" to view server output');
-		console.log('    "./nodebb restart" to restart NodeBB');
-	} else {
-		// Use launchCmd instead, if specified
-		child = childProcess.exec(nconf.get('launchCmd'), {
-			detached: true,
-			stdio: ['ignore', 'ignore', 'ignore'],
-		});
-	}
-
-	var filesToDelete = [
-		'installer.css',
-		'installer.min.js',
-		'bootstrap.min.css',
-	];
-
-	async.each(filesToDelete, function (filename, next) {
-		fs.unlink(path.join(__dirname, '../public', filename), next);
-	}, function (err) {
-		if (err) {
-			winston.warn('Unable to remove installer files');
+			console.log('\nStarting NodeBB');
+			console.log('    "./nodebb stop" to stop the NodeBB server');
+			console.log('    "./nodebb log" to view server output');
+			console.log('    "./nodebb restart" to restart NodeBB');
+		} else {
+			// Use launchCmd instead, if specified
+			child = childProcess.exec(nconf.get('launchCmd'), {
+				detached: true,
+				stdio: ['ignore', 'ignore', 'ignore'],
+			});
 		}

+		const filesToDelete = [
+			'installer.css',
+			'installer.min.js',
+			'bootstrap.min.css',
+		];
+		await Promise.all(
+			filesToDelete.map(
+				filename => fs.promises.unlink(path.join(__dirname, '../public', filename))
+			)
+		);
 		child.unref();
 		process.exit(0);
-	});
-}
-
-function compileLess(callback) {
-	var installSrc = path.join(__dirname, '../public/less/install.less');
-	fs.readFile(installSrc, function (err, style) {
-		if (err) {
-			return winston.error('Unable to read LESS install file: ', err.stack);
-		}
-
-		less.render(style.toString(), {
-			filename: path.resolve(installSrc),
-		}, function (err, css) {
-			if (err) {
-				return winston.error('Unable to compile LESS: ', err.stack);
-			}
-
-			fs.writeFile(path.join(__dirname, '../public/installer.css'), css.css, callback);
-		});
-	});
-}
-
-function compileJS(callback) {
-	var code = '';
-	async.eachSeries(scripts, function (srcPath, next) {
-		fs.readFile(path.join(__dirname, '..', srcPath), function (err, buffer) {
-			if (err) {
-				return next(err);
-			}
-
-			code += buffer.toString();
-			next();
-		});
-	}, function (err) {
-		if (err) {
-			return callback(err);
-		}
-		try {
-			var minified = uglify.minify(code, {
-				compress: false,
-			});
-			if (!minified.code) {
-				return callback(new Error('[[error:failed-to-minify]]'));
-			}
-			fs.writeFile(path.join(__dirname, '../public/installer.min.js'), minified.code, callback);
-		} catch (e) {
-			callback(e);
-		}
-	});
-}
-
-function copyCSS(next) {
-	async.waterfall([
-		function (next) {
-			fs.readFile(path.join(__dirname, '../node_modules/bootstrap/dist/css/bootstrap.min.css'), 'utf8', next);
-		},
-		function (src, next) {
-			fs.writeFile(path.join(__dirname, '../public/bootstrap.min.css'), src, next);
-		},
-	], next);
-}
-
-function loadDefaults(next) {
-	var setupDefaultsPath = path.join(__dirname, '../setup.json');
-	fs.access(setupDefaultsPath, fs.constants.F_OK | fs.constants.R_OK, function (err) {
-		if (err) {
-			// setup.json not found or inaccessible, proceed with no defaults
-			return setImmediate(next);
-		}
-
-		winston.info('[installer] Found setup.json, populating default values');
-		nconf.file({
-			file: setupDefaultsPath,
-		});
-
-		next();
+	} catch (err) {
+		winston.error(err.stack);
+		throw err;
+	}
+}
+
+// this is necessary because otherwise the compiled templates won't be available on a clean install
+async function compileTemplate() {
+	const sourceFile = path.join(__dirname, '../src/views/install/index.tpl');
+	const destTpl = path.join(viewsDir, 'install/index.tpl');
+	const destJs = path.join(viewsDir, 'install/index.js');
+
+	const source = await fs.promises.readFile(sourceFile, 'utf8');
+
+	const [compiled] = await Promise.all([
+		Benchpress.precompile(source),
+		mkdirp(path.dirname(destJs)),
+	]);
+
+	await Promise.all([
+		fs.promises.writeFile(destJs, compiled),
+		fs.promises.writeFile(destTpl, source),
+	]);
+}
+
+async function compileLess() {
+	try {
+		const installSrc = path.join(__dirname, '../public/less/install.less');
+		const style = await fs.promises.readFile(installSrc);
+		const css = await lessRenderAsync(style, { filename: path.resolve(installSrc) });
+		await fs.promises.writeFile(path.join(__dirname, '../public/installer.css'), css.css);
+	} catch (err) {
+		winston.error('Unable to compile LESS: \n' + err.stack);
+		throw err;
+	}
+}
+
+async function compileJS() {
+	let code = '';
+
+	for (const srcPath of scripts) {
+		// eslint-disable-next-line no-await-in-loop
+		const buffer = await fs.promises.readFile(path.join(__dirname, '..', srcPath));
+		code += buffer.toString();
+	}
+	const minified = uglify.minify(code, {
+		compress: false,
+	});
+	if (!minified.code) {
+		throw new Error('[[error:failed-to-minify]]');
+	}
+	await fs.promises.writeFile(path.join(__dirname, '../public/installer.min.js'), minified.code);
+}
+
+async function copyCSS() {
+	const src = await fs.promises.readFile(
+		path.join(__dirname, '../node_modules/bootstrap/dist/css/bootstrap.min.css'), 'utf8'
+	);
+	await fs.promises.writeFile(path.join(__dirname, '../public/bootstrap.min.css'), src);
+}
+
+async function loadDefaults() {
+	const setupDefaultsPath = path.join(__dirname, '../setup.json');
+	try {
+		await fs.promises.access(setupDefaultsPath, fs.constants.F_OK | fs.constants.R_OK);
+	} catch (err) {
+		// setup.json not found or inaccessible, proceed with no defaults
+		if (err.code !== 'ENOENT') {
+			throw err;
+		}
+	}
+	winston.info('[installer] Found setup.json, populating default values');
+	nconf.file({
+		file: setupDefaultsPath,
 	});
 }
--- a/loader.js
+++ b/loader.js
@@ -1,6 +1,6 @@
 'use strict';

-var	nconf = require('nconf');
+var nconf = require('nconf');
 var fs = require('fs');
 var url = require('url');
 var path = require('path');
@@ -18,7 +18,7 @@ nconf.argv().env().file({
 	file: pathToConfig,
 });

-var	pidFilePath = path.join(__dirname, 'pidfile');
+var pidFilePath = path.join(__dirname, 'pidfile');

 var outputLogFilePath = path.join(__dirname, nconf.get('logFile') || 'logs/output.log');

--- a/public/.eslintrc
+++ b/public/.eslintrc
@@ -17,7 +17,7 @@
 		"jquery": true,
 		"amd": true,
 		"browser": true,
-		"es6": false
+		"es6": true
 	},
 	"rules": {
 		"block-scoped-var": "off",
@@ -31,12 +31,10 @@
 		"prefer-template": "off"
 	},
 	"parserOptions": {
-		"ecmaVersion": 5,
+		"ecmaVersion": 6,
 		"ecmaFeatures": {
-			"arrowFunctions": false,
 			"classes": false,
 			"defaultParams": false,
-			"destructuring": false,
 			"experimentalObjectRestSpread": false,
 			"blockBindings": false,
 			"forOf": false,
@@ -50,9 +48,7 @@
 			"objectLiteralShorthandProperties": false,
 			"impliedStrict": false,
 			"restParams": false,
-			"spread": false,
-			"superInFunctions": false,
-			"templateStrings": false
+			"superInFunctions": false
 		}
 	}
 }
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/images/logo.png
+++ b/public/images/logo.png
--- a/public/images/logo.svg
+++ b/public/images/logo.svg
@@ -0,0 +1,16 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="321" height="75" viewBox="0 0 321 75">
+  <defs>
+    <radialGradient id="nodebb-a" cx="65.599%" cy="0%" r="169.036%" fx="65.599%" fy="0%" gradientTransform="matrix(-.5183 .5916 -.38031 -.80624 .996 -.388)">
+      <stop offset="0%" stop-color="#2A6CBE"/>
+      <stop offset="38.688%" stop-color="#2062BC"/>
+      <stop offset="49.182%" stop-color="#1F5FBC"/>
+      <stop offset="66.583%" stop-color="#1C5ABD"/>
+      <stop offset="85.354%" stop-color="#1956BC"/>
+      <stop offset="100%" stop-color="#1851BE"/>
+    </radialGradient>
+  </defs>
+  <g fill="none" transform="translate(1 1)">
+    <path fill="#000306" stroke="#000306" stroke-width=".275" d="M195.810017,20 C210.691849,20 221.256813,28.7272272 221.484017,45.845679 C221.490864,46.3615394 221.461776,47.1194739 221.396754,48.1194827 C221.328352,49.1714504 220.455158,49.9897119 219.400969,49.9897119 L179.110557,49.9897119 C179.110557,56.6336943 182.723978,64.2757202 196.378026,64.2757202 C204.088827,64.2757202 211.625406,61.928339 218.987763,57.2335766 L219.553745,56.8677968 C220.246813,56.4139645 221.17656,56.6079034 221.630392,57.3009716 C221.757029,57.4943637 221.837254,57.7144077 221.864806,57.943925 C222.131013,60.1615294 222.004084,61.5832211 221.484017,62.2089999 C220.452051,63.4507301 210.901843,73 196.378026,73 C180.58738,73 169,61.8765432 169,46.3909465 C169,31.3415638 180.019372,20 195.810017,20 Z M162.92733,0 C164.031899,-4.2495073e-16 164.92733,0.8954305 164.92733,2 L164.928075,44.1266361 C164.975781,44.8118124 165,45.5058194 165,46.2079256 C165,61.5334332 153.460581,73 138,73 C122.427386,73 111,61.5334332 111,46.2079256 C111,30.882418 122.427386,19.4158511 138,19.4158511 C144.981278,19.4158511 151.163029,21.7538895 155.843826,25.7295173 L155.843557,4.54188628 C155.843557,2.03347175 157.877029,4.60788274e-16 160.385444,0 L162.92733,0 Z M81,20 C96.4605809,20 108,31.3415638 108,46.5 C108,61.6584362 96.4605809,73 81,73 C65.4273859,73 54,61.6584362 54,46.5 C54,31.3415638 65.4273859,20 81,20 Z M27.324263,20 C41.6099773,20 50,29.1649049 50,41.7801268 L50,67.5 C50,69.4329966 48.4329966,71 46.5,71 L42.2494331,71 C41.1448636,71 40.2494331,70.1045695 40.2494331,69 L40.2494331,42.5348837 C40.2494331,34.3403805 35.8276644,28.6257928 26.3038549,28.6257928 C10.0816327,28.6257928 9.75718821,35.7795705 9.75069932,44.6831843 L9.75056689,71 L2,71 C0.8954305,71 1.3527075e-16,70.1045695 0,69 L0,35.2932975 L0,35.2932975 C0,24.3935718 19.1609977,20 27.324263,20 Z M81,28.7242798 C70.8049793,28.7242798 63.6348548,36.4670782 63.6348548,46.5 C63.6348548,56.3148148 70.8049793,64.2757202 81,64.2757202 C91.1950207,64.2757202 98.3651452,56.3148148 98.3651452,46.5 C98.3651452,36.4670782 91.1950207,28.7242798 81,28.7242798 Z M138,28.2362872 C127.804979,28.2362872 120.634855,36.0644241 120.634855,46.2079256 C120.634855,56.1309161 127.804979,64.179564 138,64.179564 C148.195021,64.179564 155.365145,56.1309161 155.365145,46.2079256 C155.365145,36.0644241 148.195021,28.2362872 138,28.2362872 Z M195.810017,28.7242798 C186.721876,28.7242798 180.473779,33.9588477 179.224159,41.8106996 L211.259858,41.8106996 C210.010238,33.9588477 204.443752,28.7242798 195.810017,28.7242798 Z"/>
+    <path fill="url(#nodebb-a)" d="M277,19 L276.999615,57.7303365 C276.99251,64.180962 276.88949,68.6242617 276.88949,73 L276.88949,73 L255.649055,73 C242.962262,73 236,67.06 236,57.7257143 C236,51.4771429 239.558488,46.9257143 245.1283,45.0742857 C240.564149,43.1457143 237.779243,38.8257143 237.779243,33.5028571 C237.779243,24.8628571 244.664149,19 256.732074,19 L256.732074,19 L277,19 Z M299.267926,19 C311.335851,19 318.220757,24.8628571 318.220757,33.5028571 C318.220757,38.8257143 315.435851,43.1457143 310.8717,45.0742857 C316.441512,46.9257143 320,51.4771429 320,57.7257143 C320,67.06 313.037738,73 300.350945,73 L279.11051,73 L279.11051,73 C279.11051,68.6242617 279.00749,64.180962 279.000385,57.7303365 L279,19 L299.267926,19 Z M266.092452,49.8571429 L256.499999,49.8571429 C250.156602,49.8571429 246.984904,52.2485714 246.984904,56.9542857 C246.984904,61.8914286 249.924527,64.36 255.726414,64.36 L255.726414,64.36 L260.754716,64.36 C264.777358,64.36 266.092452,62.4314286 266.092452,56.5685714 L266.092452,56.5685714 L266.092452,49.8571429 Z M299.500001,49.8571429 L289.907548,49.8571429 L289.907548,56.5685714 C289.907548,62.4314286 291.222642,64.36 295.245284,64.36 L300.273586,64.36 C306.075473,64.36 309.015096,61.8914286 309.015096,56.9542857 C309.015096,52.2485714 305.843398,49.8571429 299.500001,49.8571429 Z M266.169811,27.64 L257.350942,27.64 C251.703772,27.64 248.764149,30.1857143 248.764149,34.5057143 C248.764149,38.8257143 251.703772,41.3714286 257.350942,41.3714286 L257.350942,41.3714286 L266.169811,41.3714286 L266.169811,27.64 Z M298.649058,27.64 L289.830189,27.64 L289.830189,41.3714286 L298.649058,41.3714286 C304.296228,41.3714286 307.235851,38.8257143 307.235851,34.5057143 C307.235851,30.1857143 304.296228,27.64 298.649058,27.64 Z"/>
+  </g>
+</svg>
--- a/public/images/logo@3x.png
+++ b/public/images/logo@3x.png
--- a/public/images/touch/144.png
+++ b/public/images/touch/144.png
--- a/public/images/touch/192.png
+++ b/public/images/touch/192.png
--- a/public/images/touch/36.png
+++ b/public/images/touch/36.png
--- a/public/images/touch/48.png
+++ b/public/images/touch/48.png
--- a/public/images/touch/512.png
+++ b/public/images/touch/512.png
--- a/public/images/touch/72.png
+++ b/public/images/touch/72.png
--- a/public/images/touch/96.png
+++ b/public/images/touch/96.png
--- a/public/images/ui-bg_flat_0_aaaaaa_40x100.png
+++ b/public/images/ui-bg_flat_0_aaaaaa_40x100.png
--- a/public/images/ui-icons_444444_256x240.png
+++ b/public/images/ui-icons_444444_256x240.png
--- a/public/images/ui-icons_555555_256x240.png
+++ b/public/images/ui-icons_555555_256x240.png
--- a/public/images/ui-icons_777620_256x240.png
+++ b/public/images/ui-icons_777620_256x240.png
--- a/public/images/ui-icons_777777_256x240.png
+++ b/public/images/ui-icons_777777_256x240.png
--- a/public/images/ui-icons_cc0000_256x240.png
+++ b/public/images/ui-icons_cc0000_256x240.png
--- a/public/images/ui-icons_ffffff_256x240.png
+++ b/public/images/ui-icons_ffffff_256x240.png
--- a/public/language/ar/admin/advanced/cache.json
+++ b/public/language/ar/admin/advanced/cache.json
@@ -1,11 +1,6 @@
 {
 	"post-cache": "التخزين المؤقت للمشاركات",
-	"posts-in-cache": "المشاركات المخزنة مؤقتاً",
-	"average-post-size": "متوسط حجم المشاركة",
-	"length-to-max": "الطول / أقصى حد",
 	"percent-full": "1% كاملة",
 	"post-cache-size": "حجم التخزين المؤقت للمشاركات",
-	"items-in-cache": "العناصر في التخزين المؤقت",
-	"control-panel": "لوحة التحكم",
-	"update-settings": "تحديث إعدادات التخزين المؤقت"
+	"items-in-cache": "العناصر في التخزين المؤقت"
 }
--- a/public/language/ar/admin/extend/plugins.json
+++ b/public/language/ar/admin/extend/plugins.json
@@ -1,4 +1,5 @@
 {
+	"trending": "Trending",
 	"installed": "منصبة",
 	"active": "مفعلة",
 	"inactive": "معطلة",
--- a/public/language/ar/admin/manage/privileges.json
+++ b/public/language/ar/admin/manage/privileges.json
@@ -48,5 +48,6 @@
 	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's privilege set to <strong>all categories</strong>?",
 	"alert.confirm-copyToChildren": "Are you sure you wish to apply this privilege set to <strong>all descendant (child) categories</strong>?",
 	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's privilege set to <strong>all descendant (child) categories</strong>?",
-	"alert.no-undo": "<em>This action cannot be undone.</em>"
+	"alert.no-undo": "<em>This action cannot be undone.</em>",
+	"alert.admin-warning": "Administrators implicitly get all privileges"
 }
--- a/public/language/ar/admin/manage/users.json
+++ b/public/language/ar/admin/manage/users.json
@@ -20,16 +20,10 @@
 	"add-group": "Add Group",
 	"invite": "Invite",
 	"new": "New User",
-
-	"pills.latest": "Latest Users",
+	"filter-by": "Filter by",
 	"pills.unvalidated": "Not Validated",
-	"pills.no-posts": "No Posts",
-	"pills.top-posters": "Top Posters",
-	"pills.top-rep": "Most Reputation",
-	"pills.inactive": "Inactive",
-	"pills.flagged": "Most Flagged",
+	"pills.validated": "Validated",
 	"pills.banned": "Banned",
-	"pills.search": "User Search",

 	"50-per-page": "50 per page",
 	"100-per-page": "100 per page",
--- a/public/language/ar/admin/settings/advanced.json
+++ b/public/language/ar/admin/settings/advanced.json
@@ -32,5 +32,12 @@
 	"sockets.settings": "WebSocket Settings",
 	"sockets.max-attempts": "Max Reconnection Attempts",
 	"sockets.default-placeholder": "Default: %1",
-	"sockets.delay": "Reconnection Delay"
+	"sockets.delay": "Reconnection Delay",
+
+	"analytics.settings": "Analytics Settings",
+	"analytics.max-cache": "Analytics Cache Max Value",
+	"analytics.max-cache-help": "On high-traffic installs, the cache could be exhausted continuously if there are more concurrent active users than the Max Cache value. (Restart required)",
+	"compression.settings": "Compression Settings",
+	"compression.enable": "Enable Compression",
+	"compression.help": "This setting enables gzip compression. For a high-traffic website in production, the best way to put compression in place is to implement it at a reverse proxy level. You can enable it here for testing purposes."
 }
--- a/public/language/ar/admin/settings/api.json
+++ b/public/language/ar/admin/settings/api.json
@@ -0,0 +1,12 @@
+{
+	"tokens": "Tokens",
+	"lead-text": "From this page you can configure access to the Write API in NodeBB.",
+	"intro": "By default, the Write API authenticates users based on their session cookie, but NodeBB also supports Bearer authentication via tokens generated via this page.",
+	"docs": "Click here to access the full API specification",
+
+	"uid": "User ID",
+	"uid-help-text": "Specify a User ID to associate with this token. If the user ID is <code>0</code>, it will be considered a <em>master</em> token, which can assume the identity of other users based on the <code>_uid</code> parameter",
+	"description": "Description",
+	"no-description": "No description specified.",
+	"token-on-save": "Token will be generated once form is saved"
+}
--- a/public/language/ar/admin/settings/chat.json
+++ b/public/language/ar/admin/settings/chat.json
@@ -6,6 +6,7 @@
 	"max-length": "Maximum length of chat messages",
 	"max-room-size": "Maximum number of users in chat rooms",
 	"delay": "Time between chat messages in milliseconds",
+	"notification-delay": "Notification delay for chat messages. (0 for no delay)",
 	"restrictions.seconds-edit-after": "Number of seconds a chat message will remain editable. (0 disabled)",
 	"restrictions.seconds-delete-after": "Number of seconds a chat message will remain deletable. (0 disabled)"
 }
--- a/public/language/ar/admin/settings/cookies.json
+++ b/public/language/ar/admin/settings/cookies.json
@@ -8,5 +8,6 @@
 	"consent.blank-localised-default": "Leave blank to use NodeBB localised defaults",
 	"settings": "Settings",
 	"cookie-domain": "Session cookie domain",
+	"max-user-sessions": "Max active sessions per user",
 	"blank-default": "Leave blank for default"
 }
--- a/public/language/ar/admin/settings/general.json
+++ b/public/language/ar/admin/settings/general.json
@@ -27,9 +27,12 @@
 	"log.alt-text-placeholder": "Alternative text for accessibility",
 	"favicon": "صورة المفضله",
 	"favicon.upload": "رفع",
-	"touch-icon": "Homescreen/Touch Icon",
+	"pwa": "Progressive Web App",
+	"touch-icon": "Touch Icon",
 	"touch-icon.upload": "رفع",
-	"touch-icon.help": "Recommended size and format: 192x192, PNG format only. If no touch icon is specified, NodeBB will fall back to using the favicon.",
+	"touch-icon.help": "Recommended size and format: 512x512, PNG format only. If no touch icon is specified, NodeBB will fall back to using the favicon.",
+	"maskable-icon": "Maskable (Homescreen) Icon",
+	"maskable-icon.help": "Recommended size and format: 512x512, PNG format only. If no maskable icon is specified, NodeBB will fall back to the Touch Icon.",
 	"outgoing-links": "Outgoing Links",
 	"outgoing-links.warning-page": "Use Outgoing Links Warning Page",
 	"search-default-sort-by": "الترتيب الافتراضي للبحث",
@@ -38,4 +41,4 @@
 	"theme-color": "لون الثيم",
 	"background-color": "لون الخلفية",
 	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
-}
+}
--- a/public/language/ar/admin/settings/guest.json
+++ b/public/language/ar/admin/settings/guest.json
@@ -1,5 +1,7 @@
 {
 	"handles": "Guest Handles",
 	"handles.enabled": "Allow guest handles",
-	"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\""
+	"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
+	"topic-views": "Topic views",
+	"topic-views.enabled": "Allow guests to increase topic view counts"
 }
--- a/public/language/ar/admin/settings/post.json
+++ b/public/language/ar/admin/settings/post.json
@@ -34,6 +34,8 @@
 	"timestamp.cut-off-help": "Dates &amp; times will be shown in a relative manner (e.g. \"3 hours ago\" / \"5 days ago\"), and localised into various\n\t\t\t\t\tlanguages. After a certain point, this text can be switched to display the localised date itself\n\t\t\t\t\t(e.g. 5 Nov 2016 15:30).<br /><em>(Default: <code>30</code>, or one month). Set to 0 to always display dates, leave blank to always display relative times.</em>",
 	"timestamp.necro-threshold": "Necro Threshold (in days)",
 	"timestamp.necro-threshold-help": "A message will be shown between posts if the time between them is longer than the necro threshold. (Default: <code>7</code>, or one week). Set to 0 to disable.</em>",
+	"timestamp.topic-views-interval": "Increment topic views interval (in minutes)",
+	"timestamp.topic-views-interval-help": "Topic views will only increment once every X minutes as defined by this setting.",
 	"teaser": "Teaser Post",
 	"teaser.last-post": "Last &ndash; Show the latest post, including the original post, if no replies",
 	"teaser.last-reply": "Last &ndash; Show the latest reply, or a \"No replies\" placeholder if no replies",
--- a/public/language/ar/email.json
+++ b/public/language/ar/email.json
@@ -21,6 +21,8 @@
    "reset.notify.text1": "نحيطك علما أن كلمة مرورك قد تم تغييرها في %1",
    "reset.notify.text2": "إن لم يكن لديك علم بهذا، المرجو إشعار مدبر النظام بأسرع مايمكن.",
    "digest.latest_topics": "آخر المستجدات من %1",
+    "digest.top-topics": "Top topics from %1",
+    "digest.popular-topics": "Popular topics from %1",
    "digest.cta": "انقر هنا لمشاهدة %1",
    "digest.unsub.info": "تم إرسال هذا الإشعار بآخر المستجدات وفقا لخيارات تسجيلكم.",
    "digest.day": "يوم",
--- a/public/language/ar/search.json
+++ b/public/language/ar/search.json
@@ -44,5 +44,6 @@
    "search-preferences-saved": "تم حفظ تفضيلات البحث",
    "search-preferences-cleared": "تم ازالة تفضيلات البحث",
    "show-results-as": "عرض النتائج كـ",
-    "see-more-results": "See more results (%1)"
+    "see-more-results": "See more results (%1)",
+    "search-in-category": "Search in \"%1\""
 }
--- a/public/language/ar/topic.json
+++ b/public/language/ar/topic.json
@@ -79,7 +79,9 @@
    "thread_tools.purge_confirm": "هل أنت متأكد أنك تريد تطهير هذا الموضوع؟",
    "thread_tools.merge_topics": "Merge Topics",
    "thread_tools.merge": "Merge",
-    "topic_move_success": "This topic will be moved shortly. Click here to undo.",
+    "topic_move_success": "This topic will be moved to \"%1\" shortly. Click here to undo.",
+    "topic_move_multiple_success": "These topics will be moved to \"%1\" shortly. Click here to undo.",
+    "topic_move_all_success": "All topics will be moved to \"%1\" shortly. Click here to undo.",
    "topic_move_undone": "Topic move undone",
    "topic_move_posts_success": "Posts will be moved shortly. Click here to undo.",
    "topic_move_posts_undone": "Post move undone",
--- a/public/language/bg/admin/advanced/cache.json
+++ b/public/language/bg/admin/advanced/cache.json
@@ -1,11 +1,6 @@
 {
 	"post-cache": "Кеш за публикации",
-	"posts-in-cache": "Публикации в кеша",
-	"average-post-size": "Среден обем на публикация",
-	"length-to-max": "Дължина / максимум",
 	"percent-full": "Запълненост: %1%",
 	"post-cache-size": "Размер на кеша за публикации",
-	"items-in-cache": "Елементи в кеша",
-	"control-panel": "Контролен панел",
-	"update-settings": "Обновяване на настройките на кеша"
+	"items-in-cache": "Елементи в кеша"
 }
--- a/public/language/bg/admin/extend/plugins.json
+++ b/public/language/bg/admin/extend/plugins.json
@@ -1,4 +1,5 @@
 {
+	"trending": "Популярни",
 	"installed": "Инсталирани",
 	"active": "Включени",
 	"inactive": "Изключени",
--- a/public/language/bg/admin/manage/privileges.json
+++ b/public/language/bg/admin/manage/privileges.json
@@ -48,5 +48,6 @@
 	"alert.confirm-copyToAllGroup": "Наистина ли искате да приложите набора от правомощия на таи група към <strong>всички категории</strong>?",
 	"alert.confirm-copyToChildren": "Наистина ли искате да приложите този набор от правомощия към <strong>всички по-долни (дъщерни) категории</strong>?",
 	"alert.confirm-copyToChildrenGroup": "Наистина ли искате да приложите набора от правомощия на таи група към <strong>всички по-долни (дъщерни) категории</strong>?",
-	"alert.no-undo": "<em>Това действие е необратимо.</em>"
+	"alert.no-undo": "<em>Това действие е необратимо.</em>",
+	"alert.admin-warning": "Администраторите имат всички правомощия по подразбиране"
 }
--- a/public/language/bg/admin/manage/users.json
+++ b/public/language/bg/admin/manage/users.json
@@ -20,16 +20,10 @@
 	"add-group": "Добавяне на група",
 	"invite": "Покана",
 	"new": "Нов потребител",
-
-	"pills.latest": "Последни потребители",
+	"filter-by": "Филтриране по",
 	"pills.unvalidated": "Няма потвърдена е-поща",
-	"pills.no-posts": "Няма публикации",
-	"pills.top-posters": "С най-много публикации",
-	"pills.top-rep": "С най-много репутация",
-	"pills.inactive": "Недеен",
-	"pills.flagged": "С най-много доклади",
+	"pills.validated": "Потвърдена",
 	"pills.banned": "Блокиран",
-	"pills.search": "Търсене на потребители",

 	"50-per-page": "50 на страница",
 	"100-per-page": "100 на страница",
--- a/public/language/bg/admin/settings/advanced.json
+++ b/public/language/bg/admin/settings/advanced.json
@@ -32,5 +32,12 @@
 	"sockets.settings": "Настройки за WebSocket",
 	"sockets.max-attempts": "Максимален брой опити за повторно свързване",
 	"sockets.default-placeholder": "По подразбиране: %1",
-	"sockets.delay": "Забавяне при повторно свързване"
+	"sockets.delay": "Забавяне при повторно свързване",
+
+	"analytics.settings": "Настройки за анализите",
+	"analytics.max-cache": "Макс. стойност на кеша за анализите",
+	"analytics.max-cache-help": "При инсталации с натоварен трафик, кешът може да бъде изразходен, ако има повече едновременни потребители, от колкото е максималната стойност на кеша. (Изисква рестартиране)",
+	"compression.settings": "Настройки за компресирането",
+	"compression.enable": "Включване на компресирането",
+	"compression.help": "Тази настройка включва компресирането чрез „gzip“. За натоварени уеб сайтове най-добрият начин за използване на компресия е тя да се случва на нивото на обратния сървър-посредник (reverse proxy). Но с цел тестване, можете да го включите и тук."
 }
--- a/public/language/bg/admin/settings/api.json
+++ b/public/language/bg/admin/settings/api.json
@@ -0,0 +1,12 @@
+{
+	"tokens": "Кодове",
+	"lead-text": "На тази страница можете да настроите достъпа до ППИ за писане в NodeBB.",
+	"intro": "По подразбиране ППИ за писане удостоверява потребителите чрез бисквитката им за сесията, но NodeBB поддържа и удостоверяване чрез метода „Bearer“, използвайки кодовете от тази страница.",
+	"docs": "Щракнете тук за достъп до пълната документация на ППИ",
+
+	"uid": "Потребителски ИД",
+	"uid-help-text": "Посочете потребителски ИД, който да бъде свързан с този код. Ако ИД е <code>0</code>, това ще се счита за <em>главен</em> код, който може да приема идентичността на всеки от другите потребители чрез параметъра <code>_uid</code>",
+	"description": "Описание",
+	"no-description": "Няма описание.",
+	"token-on-save": "Кодът ще бъде създаден след като данните бъдат запазени"
+}
--- a/public/language/bg/admin/settings/chat.json
+++ b/public/language/bg/admin/settings/chat.json
@@ -5,7 +5,8 @@
 	"disable-editing-help": "Това ограничение не засяга администраторите и глобалните модератори",
 	"max-length": "Максимална дължина на съобщенията в разговорите",
 	"max-room-size": "Максимален брой потребители в стая за разговор",
-	"delay": "Време между съобщеният в разговорите (в милисекунди)",
+	"delay": "Време между съобщенията в разговорите (в милисекунди)",
+	"notification-delay": "Забавяне преди известяване за съобщения в разговорите. (0 – без забавяне)",
 	"restrictions.seconds-edit-after": "Брой секунди, през които съобщенията в разговор могат да бъдат редактирани. (0 = изключено)",
 	"restrictions.seconds-delete-after": "Брой секунди, през които съобщенията в разговор могат да бъдат изтривани. (0 = изключено)"
 }
--- a/public/language/bg/admin/settings/cookies.json
+++ b/public/language/bg/admin/settings/cookies.json
@@ -8,5 +8,6 @@
 	"consent.blank-localised-default": "Оставете това празно, за да използвате данните по подразбиране на NodeBB, които са преведени",
 	"settings": "Настройки",
 	"cookie-domain": "Домейн на бисквитката за сесията",
+	"max-user-sessions": "Максимален брой активни сесии за потребител",
 	"blank-default": "Оставете празно, за да използвате стойността по подразбиране"
 }
--- a/public/language/bg/admin/settings/general.json
+++ b/public/language/bg/admin/settings/general.json
@@ -27,9 +27,12 @@
 	"log.alt-text-placeholder": "Алтернативен текст за достъпност",
 	"favicon": "Иконка на уеб сайта",
 	"favicon.upload": "Качване",
-	"touch-icon": "Иконка за начален екран (мобилно устройство)",
+	"pwa": "Прогресивно уеб-приложение",
+	"touch-icon": "Иконка за сензорен екран",
 	"touch-icon.upload": "Качване",
-	"touch-icon.help": "Препоръчителен размер и формат: 192x192, само във формат „PNG“. Ако не е посочена иконка за начален екран на мобилно устройство, NodeBB ще използва иконката на уеб сайта.",
+	"touch-icon.help": "Препоръчителен размер и формат: 512x512, само във формат „PNG“. Ако не е посочена иконка за сензорен екран, NodeBB ще използва иконката на уеб сайта.",
+	"maskable-icon": "Маскируема иконка (за начален екран)",
+	"maskable-icon.help": "Препоръчителен размер и формат: 512x512, само във формат „PNG“. Ако не е посочена маскируема иконка, NodeBB ще използва иконката за сензорен екран.",
 	"outgoing-links": "Изходящи връзки",
 	"outgoing-links.warning-page": "Показване на предупредителна страница при щракване върху външни връзки",
 	"search-default-sort-by": "Подредба по подразбиране при търсене",
@@ -38,4 +41,4 @@
 	"theme-color": "Цвят на темата",
 	"background-color": "Фонов цвят",
 	"background-color-help": "Цвят, който да се използва като фон за началния екран, когато уеб сайтът е инсталиран като приложение"
-}
+}
--- a/public/language/bg/admin/settings/guest.json
+++ b/public/language/bg/admin/settings/guest.json
@@ -1,5 +1,7 @@
 {
 	"handles": "Имена за гостите",
 	"handles.enabled": "Позволяване на имената за гостите",
-	"handles.enabled-help": "Тази възможност предоставя ново поле, което позволява на гостите да си изберат име, което да се използва за всяка публикация, която правят. Ако е изключено, всички те просто ще имат името „Гост“."
+	"handles.enabled-help": "Тази възможност предоставя ново поле, което позволява на гостите да си изберат име, което да се използва за всяка публикация, която правят. Ако е изключено, всички те просто ще имат името „Гост“.",
+	"topic-views": "Преглеждания на темите",
+	"topic-views.enabled": "Гостите да допринасят за броя на преглеждания на темите"
 }
--- a/public/language/bg/admin/settings/post.json
+++ b/public/language/bg/admin/settings/post.json
@@ -34,6 +34,8 @@
 	"timestamp.cut-off-help": "Датите и времената ще бъдат показвани относително (напр. „преди 3 часа“ или „преди 5 дни“), и преведени на множество\n\\t\\t\\t\\t\\tезици. След определено време, този текст ще започне да показва самите дата и час, според езика на потребителя\n\\t\\t\\t\\t\\t(напр. „5 ноември 2016 15:30“).<br /><em>(По подразбиране: <code>30</code>, тоест един месец). Ако зададете 0, винаги ще се изписват дати, а ако оставите полето празно, времето ще бъде винаги относително.</em>",
 	"timestamp.necro-threshold": "Мъртва граница (в дни)",
 	"timestamp.necro-threshold-help": "Между публикациите ще бъде показано съобщение, ако времето между тях е по-дълго от мъртвата граница. (По подразбиране: <code>7</code>, или една седмица). Задайте 0 за изключване.</em>",
+	"timestamp.topic-views-interval": "Интервал за увеличаване на броя на преглеждания на темите (в минути)",
+	"timestamp.topic-views-interval-help": "Броят на преглеждания на темите ще се увеличава веднъж на всеки Х минути, според тази настройка.",
 	"teaser": "Представителна публикация",
 	"teaser.last-post": "Последната &ndash; Показване на последната публикация, или първоначалната такава, ако няма отговори.",
 	"teaser.last-reply": "Последната &ndash; Показване на последния отговор, или „Няма отговори“, ако все още няма такива.",
--- a/public/language/bg/email.json
+++ b/public/language/bg/email.json
@@ -21,6 +21,8 @@
    "reset.notify.text1": "Известяваме Ви, че на %1, Вашата парола беше променена успешно.",
    "reset.notify.text2": "Ако не сте поискали това, моля, свържете се незабавно с администратор.",
    "digest.latest_topics": "Последни теми от %1",
+    "digest.top-topics": "Най-интересните теми от %1",
+    "digest.popular-topics": "Популярни теми от %1",
    "digest.cta": "Натиснете тук, за да посетите %1",
    "digest.unsub.info": "Това резюме беше изпратено до Вас поради настройките Ви за абонаментите.",
    "digest.day": "ден",
--- a/public/language/bg/search.json
+++ b/public/language/bg/search.json
@@ -44,5 +44,6 @@
    "search-preferences-saved": "Предпочитанията за търсене бяха запазени",
    "search-preferences-cleared": "Предпочитанията за търсене бяха изчистени",
    "show-results-as": "Показване на резултатите като",
-    "see-more-results": "Показване на още резултати (%1)"
+    "see-more-results": "Показване на още резултати (%1)",
+    "search-in-category": "Търсене в „%1“"
 }
--- a/public/language/bg/topic.json
+++ b/public/language/bg/topic.json
@@ -79,7 +79,9 @@
    "thread_tools.purge_confirm": "Наистина ли искате да изчистите тази тема?",
    "thread_tools.merge_topics": "Сливане на темите",
    "thread_tools.merge": "Сливане",
-    "topic_move_success": "Темата ще бъде преместена след малко. Натиснете тук, за да отмените преместването.",
+    "topic_move_success": "Темата ще бъде преместена в „%1“ след малко. Натиснете тук, за да отмените преместването.",
+    "topic_move_multiple_success": "Темите ще бъдат преместени в „%1“ след малко. Натиснете тук, за да отмените преместването.",
+    "topic_move_all_success": "Всички теми ще бъдат преместени в „%1“ след малко. Натиснете тук, за да отмените преместването.",
    "topic_move_undone": "Преместването на темата беше отменено",
    "topic_move_posts_success": "Публикациите ще бъдат преместени след малко. Натиснете тук, за да отмените преместването.",
    "topic_move_posts_undone": "Преместването на публикациите беше отменено",
--- a/public/language/bn/admin/advanced/cache.json
+++ b/public/language/bn/admin/advanced/cache.json
@@ -1,11 +1,6 @@
 {
 	"post-cache": "Post Cache",
-	"posts-in-cache": "Posts in Cache",
-	"average-post-size": "Average Post Size",
-	"length-to-max": "Length / Max",
 	"percent-full": "%1% Full",
 	"post-cache-size": "Post Cache Size",
-	"items-in-cache": "Items in Cache",
-	"control-panel": "Control Panel",
-	"update-settings": "Update Cache Settings"
+	"items-in-cache": "Items in Cache"
 }
--- a/public/language/bn/admin/extend/plugins.json
+++ b/public/language/bn/admin/extend/plugins.json
@@ -1,4 +1,5 @@
 {
+	"trending": "Trending",
 	"installed": "Installed",
 	"active": "Active",
 	"inactive": "Inactive",
--- a/public/language/bn/admin/manage/privileges.json
+++ b/public/language/bn/admin/manage/privileges.json
@@ -48,5 +48,6 @@
 	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's privilege set to <strong>all categories</strong>?",
 	"alert.confirm-copyToChildren": "Are you sure you wish to apply this privilege set to <strong>all descendant (child) categories</strong>?",
 	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's privilege set to <strong>all descendant (child) categories</strong>?",
-	"alert.no-undo": "<em>This action cannot be undone.</em>"
+	"alert.no-undo": "<em>This action cannot be undone.</em>",
+	"alert.admin-warning": "Administrators implicitly get all privileges"
 }
--- a/public/language/bn/admin/manage/users.json
+++ b/public/language/bn/admin/manage/users.json
@@ -20,16 +20,10 @@
 	"add-group": "Add Group",
 	"invite": "Invite",
 	"new": "New User",
-
-	"pills.latest": "Latest Users",
+	"filter-by": "Filter by",
 	"pills.unvalidated": "Not Validated",
-	"pills.no-posts": "No Posts",
-	"pills.top-posters": "Top Posters",
-	"pills.top-rep": "Most Reputation",
-	"pills.inactive": "Inactive",
-	"pills.flagged": "Most Flagged",
+	"pills.validated": "Validated",
 	"pills.banned": "Banned",
-	"pills.search": "User Search",

 	"50-per-page": "50 per page",
 	"100-per-page": "100 per page",
--- a/public/language/bn/admin/settings/advanced.json
+++ b/public/language/bn/admin/settings/advanced.json
@@ -32,5 +32,12 @@
 	"sockets.settings": "WebSocket Settings",
 	"sockets.max-attempts": "Max Reconnection Attempts",
 	"sockets.default-placeholder": "Default: %1",
-	"sockets.delay": "Reconnection Delay"
+	"sockets.delay": "Reconnection Delay",
+
+	"analytics.settings": "Analytics Settings",
+	"analytics.max-cache": "Analytics Cache Max Value",
+	"analytics.max-cache-help": "On high-traffic installs, the cache could be exhausted continuously if there are more concurrent active users than the Max Cache value. (Restart required)",
+	"compression.settings": "Compression Settings",
+	"compression.enable": "Enable Compression",
+	"compression.help": "This setting enables gzip compression. For a high-traffic website in production, the best way to put compression in place is to implement it at a reverse proxy level. You can enable it here for testing purposes."
 }
--- a/public/language/bn/admin/settings/api.json
+++ b/public/language/bn/admin/settings/api.json
@@ -0,0 +1,12 @@
+{
+	"tokens": "Tokens",
+	"lead-text": "From this page you can configure access to the Write API in NodeBB.",
+	"intro": "By default, the Write API authenticates users based on their session cookie, but NodeBB also supports Bearer authentication via tokens generated via this page.",
+	"docs": "Click here to access the full API specification",
+
+	"uid": "User ID",
+	"uid-help-text": "Specify a User ID to associate with this token. If the user ID is <code>0</code>, it will be considered a <em>master</em> token, which can assume the identity of other users based on the <code>_uid</code> parameter",
+	"description": "Description",
+	"no-description": "No description specified.",
+	"token-on-save": "Token will be generated once form is saved"
+}
--- a/public/language/bn/admin/settings/chat.json
+++ b/public/language/bn/admin/settings/chat.json
@@ -6,6 +6,7 @@
 	"max-length": "Maximum length of chat messages",
 	"max-room-size": "Maximum number of users in chat rooms",
 	"delay": "Time between chat messages in milliseconds",
+	"notification-delay": "Notification delay for chat messages. (0 for no delay)",
 	"restrictions.seconds-edit-after": "Number of seconds a chat message will remain editable. (0 disabled)",
 	"restrictions.seconds-delete-after": "Number of seconds a chat message will remain deletable. (0 disabled)"
 }
--- a/public/language/bn/admin/settings/cookies.json
+++ b/public/language/bn/admin/settings/cookies.json
@@ -8,5 +8,6 @@
 	"consent.blank-localised-default": "Leave blank to use NodeBB localised defaults",
 	"settings": "Settings",
 	"cookie-domain": "Session cookie domain",
+	"max-user-sessions": "Max active sessions per user",
 	"blank-default": "Leave blank for default"
 }
--- a/public/language/bn/admin/settings/general.json
+++ b/public/language/bn/admin/settings/general.json
@@ -27,9 +27,12 @@
 	"log.alt-text-placeholder": "Alternative text for accessibility",
 	"favicon": "Favicon",
 	"favicon.upload": "Upload",
-	"touch-icon": "Homescreen/Touch Icon",
+	"pwa": "Progressive Web App",
+	"touch-icon": "Touch Icon",
 	"touch-icon.upload": "Upload",
-	"touch-icon.help": "Recommended size and format: 192x192, PNG format only. If no touch icon is specified, NodeBB will fall back to using the favicon.",
+	"touch-icon.help": "Recommended size and format: 512x512, PNG format only. If no touch icon is specified, NodeBB will fall back to using the favicon.",
+	"maskable-icon": "Maskable (Homescreen) Icon",
+	"maskable-icon.help": "Recommended size and format: 512x512, PNG format only. If no maskable icon is specified, NodeBB will fall back to the Touch Icon.",
 	"outgoing-links": "Outgoing Links",
 	"outgoing-links.warning-page": "Use Outgoing Links Warning Page",
 	"search-default-sort-by": "Search default sort by",
@@ -38,4 +41,4 @@
 	"theme-color": "Theme Color",
 	"background-color": "Background Color",
 	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
-}
+}
--- a/public/language/bn/admin/settings/guest.json
+++ b/public/language/bn/admin/settings/guest.json
@@ -1,5 +1,7 @@
 {
 	"handles": "Guest Handles",
 	"handles.enabled": "Allow guest handles",
-	"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\""
+	"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
+	"topic-views": "Topic views",
+	"topic-views.enabled": "Allow guests to increase topic view counts"
 }
--- a/public/language/bn/admin/settings/post.json
+++ b/public/language/bn/admin/settings/post.json
@@ -34,6 +34,8 @@
 	"timestamp.cut-off-help": "Dates &amp; times will be shown in a relative manner (e.g. \"3 hours ago\" / \"5 days ago\"), and localised into various\n\t\t\t\t\tlanguages. After a certain point, this text can be switched to display the localised date itself\n\t\t\t\t\t(e.g. 5 Nov 2016 15:30).<br /><em>(Default: <code>30</code>, or one month). Set to 0 to always display dates, leave blank to always display relative times.</em>",
 	"timestamp.necro-threshold": "Necro Threshold (in days)",
 	"timestamp.necro-threshold-help": "A message will be shown between posts if the time between them is longer than the necro threshold. (Default: <code>7</code>, or one week). Set to 0 to disable.</em>",
+	"timestamp.topic-views-interval": "Increment topic views interval (in minutes)",
+	"timestamp.topic-views-interval-help": "Topic views will only increment once every X minutes as defined by this setting.",
 	"teaser": "Teaser Post",
 	"teaser.last-post": "Last &ndash; Show the latest post, including the original post, if no replies",
 	"teaser.last-reply": "Last &ndash; Show the latest reply, or a \"No replies\" placeholder if no replies",
--- a/public/language/bn/email.json
+++ b/public/language/bn/email.json
@@ -21,6 +21,8 @@
    "reset.notify.text1": "আপনাকে জানাচ্ছি যে %1 এ আপনার পাসওয়ার্ড পরিবর্তন হয়েছে",
    "reset.notify.text2": "এটা আপনার অজান্তে হলে এখনই প্রশাসককে আবহিত করুন",
    "digest.latest_topics": "%1 এর সর্বশেষ টপিকসমূহ",
+    "digest.top-topics": "Top topics from %1",
+    "digest.popular-topics": "Popular topics from %1",
    "digest.cta": "%1 ভিজিট করতে এখানে ক্লিক করুন",
    "digest.unsub.info": "আপনার সাবস্ক্রীপশন সেটিংসের কারনে আপনাকে এই ডাইজেষ্টটি পাঠানো হয়েছে।",
    "digest.day": "দিন",
--- a/public/language/bn/search.json
+++ b/public/language/bn/search.json
@@ -44,5 +44,6 @@
    "search-preferences-saved": "Search preferences saved",
    "search-preferences-cleared": "Search preferences cleared",
    "show-results-as": "ফলাফল দেখানো হোক : ",
-    "see-more-results": "See more results (%1)"
+    "see-more-results": "See more results (%1)",
+    "search-in-category": "Search in \"%1\""
 }
--- a/public/language/bn/topic.json
+++ b/public/language/bn/topic.json
@@ -79,7 +79,9 @@
    "thread_tools.purge_confirm": "আপনি নিশ্চিত যে আপনি টপিকটি পার্জ করতে চাচ্ছেন ? ",
    "thread_tools.merge_topics": "Merge Topics",
    "thread_tools.merge": "Merge",
-    "topic_move_success": "This topic will be moved shortly. Click here to undo.",
+    "topic_move_success": "This topic will be moved to \"%1\" shortly. Click here to undo.",
+    "topic_move_multiple_success": "These topics will be moved to \"%1\" shortly. Click here to undo.",
+    "topic_move_all_success": "All topics will be moved to \"%1\" shortly. Click here to undo.",
    "topic_move_undone": "Topic move undone",
    "topic_move_posts_success": "Posts will be moved shortly. Click here to undo.",
    "topic_move_posts_undone": "Post move undone",
--- a/public/language/cs/admin/advanced/cache.json
+++ b/public/language/cs/admin/advanced/cache.json
@@ -1,11 +1,6 @@
 {
 	"post-cache": "Mezipaměť příspěvku",
-	"posts-in-cache": "Příspěvků v mezipaměti",
-	"average-post-size": "Průměrná velikost příspěvku",
-	"length-to-max": "Délka / Maximum",
 	"percent-full": "%1% plný",
 	"post-cache-size": "Velikost mezipaměti příspěvku",
-	"items-in-cache": "Položek v mezipaměti",
-	"control-panel": "Ovládací panel",
-	"update-settings": "Aktualizovat nastavení mezipaměti"
+	"items-in-cache": "Položek v mezipaměti"
 }
--- a/public/language/cs/admin/extend/plugins.json
+++ b/public/language/cs/admin/extend/plugins.json
@@ -1,4 +1,5 @@
 {
+	"trending": "Trending",
 	"installed": "Nainstalováno",
 	"active": "Aktivní",
 	"inactive": "Neaktivní",
--- a/public/language/cs/admin/manage/privileges.json
+++ b/public/language/cs/admin/manage/privileges.json
@@ -48,5 +48,6 @@
 	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's privilege set to <strong>all categories</strong>?",
 	"alert.confirm-copyToChildren": "Are you sure you wish to apply this privilege set to <strong>all descendant (child) categories</strong>?",
 	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's privilege set to <strong>all descendant (child) categories</strong>?",
-	"alert.no-undo": "<em>This action cannot be undone.</em>"
+	"alert.no-undo": "<em>This action cannot be undone.</em>",
+	"alert.admin-warning": "Administrators implicitly get all privileges"
 }
--- a/public/language/cs/admin/manage/users.json
+++ b/public/language/cs/admin/manage/users.json
@@ -20,16 +20,10 @@
 	"add-group": "Přidat skupinu",
 	"invite": "Pozvat",
 	"new": "Nový uživatel",
-
-	"pills.latest": "Poslední uživatelé",
+	"filter-by": "Filter by",
 	"pills.unvalidated": "Neověřeno",
-	"pills.no-posts": "Žádné příspěvky",
-	"pills.top-posters": "Nejvíce příspěvků",
-	"pills.top-rep": "Nejvíce reputace",
-	"pills.inactive": "Neaktivní",
-	"pills.flagged": "Nejoznačovanější",
+	"pills.validated": "Validated",
 	"pills.banned": "Zakázán",
-	"pills.search": "Hledat uživatele",

 	"50-per-page": "50 na stránku",
 	"100-per-page": "100 na stránku",
--- a/public/language/cs/admin/settings/advanced.json
+++ b/public/language/cs/admin/settings/advanced.json
@@ -32,5 +32,12 @@
 	"sockets.settings": "WebSocket Settings",
 	"sockets.max-attempts": "Max Reconnection Attempts",
 	"sockets.default-placeholder": "Default: %1",
-	"sockets.delay": "Reconnection Delay"
+	"sockets.delay": "Reconnection Delay",
+
+	"analytics.settings": "Analytics Settings",
+	"analytics.max-cache": "Analytics Cache Max Value",
+	"analytics.max-cache-help": "On high-traffic installs, the cache could be exhausted continuously if there are more concurrent active users than the Max Cache value. (Restart required)",
+	"compression.settings": "Compression Settings",
+	"compression.enable": "Enable Compression",
+	"compression.help": "This setting enables gzip compression. For a high-traffic website in production, the best way to put compression in place is to implement it at a reverse proxy level. You can enable it here for testing purposes."
 }
--- a/public/language/cs/admin/settings/api.json
+++ b/public/language/cs/admin/settings/api.json
@@ -0,0 +1,12 @@
+{
+	"tokens": "Tokens",
+	"lead-text": "From this page you can configure access to the Write API in NodeBB.",
+	"intro": "By default, the Write API authenticates users based on their session cookie, but NodeBB also supports Bearer authentication via tokens generated via this page.",
+	"docs": "Click here to access the full API specification",
+
+	"uid": "User ID",
+	"uid-help-text": "Specify a User ID to associate with this token. If the user ID is <code>0</code>, it will be considered a <em>master</em> token, which can assume the identity of other users based on the <code>_uid</code> parameter",
+	"description": "Description",
+	"no-description": "No description specified.",
+	"token-on-save": "Token will be generated once form is saved"
+}
--- a/public/language/cs/admin/settings/chat.json
+++ b/public/language/cs/admin/settings/chat.json
@@ -6,6 +6,7 @@
 	"max-length": "Maximální délka konverzační zprávy",
 	"max-room-size": "Maximální počet uživatelů v konverzační místnosti",
 	"delay": "Čas mezi konverzačními zprávami v milisekundách",
+	"notification-delay": "Notification delay for chat messages. (0 for no delay)",
 	"restrictions.seconds-edit-after": "Počet sekund, kdy může být ještě konverzační zpráva upravena (pro zakázání - 0)",
 	"restrictions.seconds-delete-after": "Počet sekund, kdy může být ještě konverzační zpráva odstraněna (pro zakázání - 0)"
 }
--- a/public/language/cs/admin/settings/cookies.json
+++ b/public/language/cs/admin/settings/cookies.json
@@ -8,5 +8,6 @@
 	"consent.blank-localised-default": "Pro použití výchozího textu NodeBB, zanechte prázdné",
 	"settings": "Nastavení",
 	"cookie-domain": "Doména relace cookies",
+	"max-user-sessions": "Max active sessions per user",
 	"blank-default": "Pro výchozí, zanechte prázdné"
 }
--- a/public/language/cs/admin/settings/general.json
+++ b/public/language/cs/admin/settings/general.json
@@ -27,9 +27,12 @@
 	"log.alt-text-placeholder": "Alternativní text pro přístupnost",
 	"favicon": "Ikonka (favicon)",
 	"favicon.upload": "Nahrát",
-	"touch-icon": "Ikonka domovské obrazovky/dotyková",
+	"pwa": "Progressive Web App",
+	"touch-icon": "Touch Icon",
 	"touch-icon.upload": "Nahrát",
-	"touch-icon.help": "Doporučená velikost a formát je: jen v *.png 192x192. Nebude-li určena dotyková ikona, NodeBB nepoužije žádnou z ikon (favicon).",
+	"touch-icon.help": "Recommended size and format: 512x512, PNG format only. If no touch icon is specified, NodeBB will fall back to using the favicon.",
+	"maskable-icon": "Maskable (Homescreen) Icon",
+	"maskable-icon.help": "Recommended size and format: 512x512, PNG format only. If no maskable icon is specified, NodeBB will fall back to the Touch Icon.",
 	"outgoing-links": "Odchozí odkazy",
 	"outgoing-links.warning-page": "Použít stránku s upozorněním při odchozích odkazech",
 	"search-default-sort-by": "Výchozí třídění při hledání",
@@ -38,4 +41,4 @@
 	"theme-color": "Theme Color",
 	"background-color": "Background Color",
 	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
-}
+}
--- a/public/language/cs/admin/settings/guest.json
+++ b/public/language/cs/admin/settings/guest.json
@@ -1,5 +1,7 @@
 {
 	"handles": "Zacházení s hosty",
 	"handles.enabled": "Povolit upravení zacházení s hosty",
-	"handles.enabled-help": "Tato možnost odkryje nové pole, které umožňuje hostům vybrat jméno, které se připojí ke každému příspěvku, který vytvoří. Bude-li zakázáno, budou jednoduše nazýváni „Host”"
+	"handles.enabled-help": "Tato možnost odkryje nové pole, které umožňuje hostům vybrat jméno, které se připojí ke každému příspěvku, který vytvoří. Bude-li zakázáno, budou jednoduše nazýváni „Host”",
+	"topic-views": "Topic views",
+	"topic-views.enabled": "Allow guests to increase topic view counts"
 }
--- a/public/language/cs/admin/settings/post.json
+++ b/public/language/cs/admin/settings/post.json
@@ -34,6 +34,8 @@
 	"timestamp.cut-off-help": "Datum a čas bude zobrazen relativně (tj. „před 3 hodinami” / „před 5 dny”), a dle toho lokalizován do různých\n\t\t\t\t\tjazyků. Za určitých okolností, může tento text být přepnut na lokalizované datum\n\t\t\t\t\t(tj. 5 Led 2017 15:30)<br /><em>(výchozí: <code>30</code>,nebo měsíc). Nastavte na 0, pro zobrazení datumů, zanecháte-li prázdné, bude vždy zobrazen relativní čas.</em>",
 	"timestamp.necro-threshold": "Necro Threshold (in days)",
 	"timestamp.necro-threshold-help": "A message will be shown between posts if the time between them is longer than the necro threshold. (Default: <code>7</code>, or one week). Set to 0 to disable.</em>",
+	"timestamp.topic-views-interval": "Increment topic views interval (in minutes)",
+	"timestamp.topic-views-interval-help": "Topic views will only increment once every X minutes as defined by this setting.",
 	"teaser": "Ukázka příspěvku",
 	"teaser.last-post": "Poslední – zobrazení posledního příspěvku, včetně hlavního příspěvku, nejsou-li odpovědi",
 	"teaser.last-reply": "Poslední – zobrazení poslední odpovědi, nebo nejsou-li žádné odpovědi textu „Bez odpovědi”",
--- a/public/language/cs/email.json
+++ b/public/language/cs/email.json
@@ -21,6 +21,8 @@
    "reset.notify.text1": "Informujeme Vás, že na %1 vaše heslo bylo úspěšně změněno.",
    "reset.notify.text2": "Pokud jste to neschválil, prosíme neprodleně kontaktujte správce.",
    "digest.latest_topics": "Nejnovější témata od %1",
+    "digest.top-topics": "Top topics from %1",
+    "digest.popular-topics": "Popular topics from %1",
    "digest.cta": "Kliknutím zde navštívíte %1",
    "digest.unsub.info": "Tento výtah vám byl odeslán, protože jste si to nastavili ve vašich odběrech.",
    "digest.day": "den",
--- a/public/language/cs/search.json
+++ b/public/language/cs/search.json
@@ -44,5 +44,6 @@
    "search-preferences-saved": "Hledat dle uložených nastavení",
    "search-preferences-cleared": "Hledat dle smazaných nastavení",
    "show-results-as": "Zobrazit výsledek jako",
-    "see-more-results": "Zobrazit více výsledků (%1)"
+    "see-more-results": "Zobrazit více výsledků (%1)",
+    "search-in-category": "Search in \"%1\""
 }
--- a/public/language/cs/topic.json
+++ b/public/language/cs/topic.json
@@ -79,7 +79,9 @@
    "thread_tools.purge_confirm": "Jste si jist/a, že chcete vyčistit toto téma?",
    "thread_tools.merge_topics": "Sloučit témata",
    "thread_tools.merge": "Sloučit",
-    "topic_move_success": "This topic will be moved shortly. Click here to undo.",
+    "topic_move_success": "This topic will be moved to \"%1\" shortly. Click here to undo.",
+    "topic_move_multiple_success": "These topics will be moved to \"%1\" shortly. Click here to undo.",
+    "topic_move_all_success": "All topics will be moved to \"%1\" shortly. Click here to undo.",
    "topic_move_undone": "Topic move undone",
    "topic_move_posts_success": "Posts will be moved shortly. Click here to undo.",
    "topic_move_posts_undone": "Post move undone",
--- a/public/language/da/admin/advanced/cache.json
+++ b/public/language/da/admin/advanced/cache.json
@@ -1,11 +1,6 @@
 {
 	"post-cache": "Indlægs Cache",
-	"posts-in-cache": "Indlæg i Cache",
-	"average-post-size": "Gennemsnitlig Størrelse af Indlæg",
-	"length-to-max": "Længde / Max",
 	"percent-full": "%1% Fuld",
 	"post-cache-size": "Indlægs Cache Størrelse",
-	"items-in-cache": "Ting i Cache",
-	"control-panel": "Kontrol Panel",
-	"update-settings": "Opdater Cache Indstillinger"
+	"items-in-cache": "Ting i Cache"
 }
--- a/public/language/da/admin/extend/plugins.json
+++ b/public/language/da/admin/extend/plugins.json
@@ -1,4 +1,5 @@
 {
+	"trending": "Trending",
 	"installed": "Installed",
 	"active": "Active",
 	"inactive": "Inactive",
--- a/public/language/da/admin/manage/privileges.json
+++ b/public/language/da/admin/manage/privileges.json
@@ -48,5 +48,6 @@
 	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's privilege set to <strong>all categories</strong>?",
 	"alert.confirm-copyToChildren": "Are you sure you wish to apply this privilege set to <strong>all descendant (child) categories</strong>?",
 	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's privilege set to <strong>all descendant (child) categories</strong>?",
-	"alert.no-undo": "<em>This action cannot be undone.</em>"
+	"alert.no-undo": "<em>This action cannot be undone.</em>",
+	"alert.admin-warning": "Administrators implicitly get all privileges"
 }
--- a/public/language/da/admin/manage/users.json
+++ b/public/language/da/admin/manage/users.json
@@ -20,16 +20,10 @@
 	"add-group": "Add Group",
 	"invite": "Invite",
 	"new": "New User",
-
-	"pills.latest": "Latest Users",
+	"filter-by": "Filter by",
 	"pills.unvalidated": "Not Validated",
-	"pills.no-posts": "No Posts",
-	"pills.top-posters": "Top Posters",
-	"pills.top-rep": "Most Reputation",
-	"pills.inactive": "Inactive",
-	"pills.flagged": "Most Flagged",
+	"pills.validated": "Validated",
 	"pills.banned": "Banned",
-	"pills.search": "User Search",

 	"50-per-page": "50 per page",
 	"100-per-page": "100 per page",
--- a/public/language/da/admin/settings/advanced.json
+++ b/public/language/da/admin/settings/advanced.json
@@ -32,5 +32,12 @@
 	"sockets.settings": "WebSocket Settings",
 	"sockets.max-attempts": "Max Reconnection Attempts",
 	"sockets.default-placeholder": "Default: %1",
-	"sockets.delay": "Reconnection Delay"
+	"sockets.delay": "Reconnection Delay",
+
+	"analytics.settings": "Analytics Settings",
+	"analytics.max-cache": "Analytics Cache Max Value",
+	"analytics.max-cache-help": "On high-traffic installs, the cache could be exhausted continuously if there are more concurrent active users than the Max Cache value. (Restart required)",
+	"compression.settings": "Compression Settings",
+	"compression.enable": "Enable Compression",
+	"compression.help": "This setting enables gzip compression. For a high-traffic website in production, the best way to put compression in place is to implement it at a reverse proxy level. You can enable it here for testing purposes."
 }
--- a/public/language/da/admin/settings/api.json
+++ b/public/language/da/admin/settings/api.json
@@ -0,0 +1,12 @@
+{
+	"tokens": "Tokens",
+	"lead-text": "From this page you can configure access to the Write API in NodeBB.",
+	"intro": "By default, the Write API authenticates users based on their session cookie, but NodeBB also supports Bearer authentication via tokens generated via this page.",
+	"docs": "Click here to access the full API specification",
+
+	"uid": "User ID",
+	"uid-help-text": "Specify a User ID to associate with this token. If the user ID is <code>0</code>, it will be considered a <em>master</em> token, which can assume the identity of other users based on the <code>_uid</code> parameter",
+	"description": "Description",
+	"no-description": "No description specified.",
+	"token-on-save": "Token will be generated once form is saved"
+}
--- a/public/language/da/admin/settings/chat.json
+++ b/public/language/da/admin/settings/chat.json
@@ -6,6 +6,7 @@
 	"max-length": "Maximum length of chat messages",
 	"max-room-size": "Maximum number of users in chat rooms",
 	"delay": "Time between chat messages in milliseconds",
+	"notification-delay": "Notification delay for chat messages. (0 for no delay)",
 	"restrictions.seconds-edit-after": "Number of seconds a chat message will remain editable. (0 disabled)",
 	"restrictions.seconds-delete-after": "Number of seconds a chat message will remain deletable. (0 disabled)"
 }
--- a/public/language/da/admin/settings/cookies.json
+++ b/public/language/da/admin/settings/cookies.json
@@ -8,5 +8,6 @@
 	"consent.blank-localised-default": "Leave blank to use NodeBB localised defaults",
 	"settings": "Settings",
 	"cookie-domain": "Session cookie domain",
+	"max-user-sessions": "Max active sessions per user",
 	"blank-default": "Leave blank for default"
 }
--- a/public/language/da/admin/settings/general.json
+++ b/public/language/da/admin/settings/general.json
@@ -27,9 +27,12 @@
 	"log.alt-text-placeholder": "Alternative text for accessibility",
 	"favicon": "Favicon",
 	"favicon.upload": "Upload",
-	"touch-icon": "Homescreen/Touch Icon",
+	"pwa": "Progressive Web App",
+	"touch-icon": "Touch Icon",
 	"touch-icon.upload": "Upload",
-	"touch-icon.help": "Recommended size and format: 192x192, PNG format only. If no touch icon is specified, NodeBB will fall back to using the favicon.",
+	"touch-icon.help": "Recommended size and format: 512x512, PNG format only. If no touch icon is specified, NodeBB will fall back to using the favicon.",
+	"maskable-icon": "Maskable (Homescreen) Icon",
+	"maskable-icon.help": "Recommended size and format: 512x512, PNG format only. If no maskable icon is specified, NodeBB will fall back to the Touch Icon.",
 	"outgoing-links": "Outgoing Links",
 	"outgoing-links.warning-page": "Use Outgoing Links Warning Page",
 	"search-default-sort-by": "Search default sort by",
@@ -38,4 +41,4 @@
 	"theme-color": "Theme Color",
 	"background-color": "Background Color",
 	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
-}
+}
--- a/public/language/da/admin/settings/guest.json
+++ b/public/language/da/admin/settings/guest.json
@@ -1,5 +1,7 @@
 {
 	"handles": "Guest Handles",
 	"handles.enabled": "Allow guest handles",
-	"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\""
+	"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
+	"topic-views": "Topic views",
+	"topic-views.enabled": "Allow guests to increase topic view counts"
 }
--- a/public/language/da/admin/settings/post.json
+++ b/public/language/da/admin/settings/post.json
@@ -34,6 +34,8 @@
 	"timestamp.cut-off-help": "Dates &amp; times will be shown in a relative manner (e.g. \"3 hours ago\" / \"5 days ago\"), and localised into various\n\t\t\t\t\tlanguages. After a certain point, this text can be switched to display the localised date itself\n\t\t\t\t\t(e.g. 5 Nov 2016 15:30).<br /><em>(Default: <code>30</code>, or one month). Set to 0 to always display dates, leave blank to always display relative times.</em>",
 	"timestamp.necro-threshold": "Necro Threshold (in days)",
 	"timestamp.necro-threshold-help": "A message will be shown between posts if the time between them is longer than the necro threshold. (Default: <code>7</code>, or one week). Set to 0 to disable.</em>",
+	"timestamp.topic-views-interval": "Increment topic views interval (in minutes)",
+	"timestamp.topic-views-interval-help": "Topic views will only increment once every X minutes as defined by this setting.",
 	"teaser": "Teaser Post",
 	"teaser.last-post": "Last &ndash; Show the latest post, including the original post, if no replies",
 	"teaser.last-reply": "Last &ndash; Show the latest reply, or a \"No replies\" placeholder if no replies",
--- a/public/language/da/email.json
+++ b/public/language/da/email.json
@@ -21,6 +21,8 @@
    "reset.notify.text1": "Bemærk:  %1 gang blev dit kodeord ændret.",
    "reset.notify.text2": "Hvis du ikke godkendte dette, kontakt straks en administrator.",
    "digest.latest_topics": "Nyeste emne fra %1",
+    "digest.top-topics": "Top topics from %1",
+    "digest.popular-topics": "Popular topics from %1",
    "digest.cta": "Klik her for at gå til %1",
    "digest.unsub.info": "Du har fået tilsendt dette sammendrag pga. indstillingerne i dit abonnement.",
    "digest.day": "dag",
--- a/public/language/da/search.json
+++ b/public/language/da/search.json
@@ -44,5 +44,6 @@
    "search-preferences-saved": "Søgnings præferencer gemt",
    "search-preferences-cleared": "Søgnings præferencer slettet",
    "show-results-as": "Vis resultater som",
-    "see-more-results": "See more results (%1)"
+    "see-more-results": "See more results (%1)",
+    "search-in-category": "Search in \"%1\""
 }
--- a/public/language/da/topic.json
+++ b/public/language/da/topic.json
@@ -79,7 +79,9 @@
    "thread_tools.purge_confirm": "Er du sikker på at du vil udrense denne tråd?",
    "thread_tools.merge_topics": "Merge Topics",
    "thread_tools.merge": "Merge",
-    "topic_move_success": "This topic will be moved shortly. Click here to undo.",
+    "topic_move_success": "This topic will be moved to \"%1\" shortly. Click here to undo.",
+    "topic_move_multiple_success": "These topics will be moved to \"%1\" shortly. Click here to undo.",
+    "topic_move_all_success": "All topics will be moved to \"%1\" shortly. Click here to undo.",
    "topic_move_undone": "Topic move undone",
    "topic_move_posts_success": "Posts will be moved shortly. Click here to undo.",
    "topic_move_posts_undone": "Post move undone",
--- a/Show More
+++ b/Show More