chore: incrementing version number - v1.17.0-beta.0

This reverts commit 477157cc2b.

.codeclimate.yml

@@ -17,6 +17,14 @@ checks:
   similar-code:
     config:
       threshold: 65
+plugins:
+  duplication:
+    enabled: true
+    config:
+      languages:
+        javascript:
+          mass_threshold: 110
+          count_threshold: 3
 exclude_paths:
 - "public/vendor/*"
 - "test/*"

.eslintignore

@@ -7,7 +7,6 @@ node_modules/
 logs/
 /public/templates
 /public/uploads
-/public/sounds
 /public/vendor
 /public/src/modules/string.js
 .idea/

.eslintrc

@@ -5,136 +5,111 @@
 	},
 
 	"rules": {
-		// Customized
+		// === Configure rules for our style ===
+		// imports must be resolvable
+		"import/no-unresolved": "error",
+		// use single quotes,
+		// unless a different style allows avoiding escapes
+		"quotes": ["error", "single", {
+			"avoidEscape": true,
+			"allowTemplateLiterals": true
+		}],
+		// allow else-if return
+		"no-else-return": [ "error", { "allowElseIf": true } ],
+		// expressions split over multiple lines
+		// should break after the operator
+		"operator-linebreak": [ "error", "after" ],
+		// require arrow parens only when needed
+		// and whenever the body is a block
+		"arrow-parens": ["error", "as-needed", { "requireForBlockBody": true }],
+		// what variables are errors in callbacks
 		"handle-callback-err": [ "error","^(e$|(e|(.*(_e|E)))rr)" ],
+		// allow dangling commas in functions
+		// require them everywhere else
 		"comma-dangle": ["error", {
 			"arrays": "always-multiline",
 			"objects": "always-multiline",
 			"imports": "always-multiline",
 			"exports": "always-multiline",
-			"functions": "never"
+			"functions": "only-multiline"
 		}],
+		// we actually encourage `return await`
 		"no-return-await": "off",
-		"no-constant-condition": "off",
+		// allow `while (true)`
+		"no-constant-condition": ["error", { "checkLoops": false }],
+		// allow ignoring an error with `catch`
 		"no-empty": ["error", { "allowEmptyCatch": true }],
-		"no-underscore-dangle": "off",
-		"no-console": "off",
+		// allow `3 + 5 - 1`, but not `3 * 5 - 1`
 		"no-mixed-operators": ["error", { "allowSamePrecedence": true }],
+		// require `'use strict';`
 		"strict": ["error", "global"],
-		"consistent-return": "off",
-		"func-names": "off",
+		// we actually use tabs for indentation
+		"indent": ["error", "tab", { "SwitchCase": 1 }],
 		"no-tabs": "off",
-		"indent": ["error", "tab"],
+		// we want `== null` to also handle undefined
 		"no-eq-null": "off",
-		"camelcase": "off",
-		"no-new": "off",
-		"no-shadow": "off",
-		"no-use-before-define": ["error", "nofunc"],
-		"no-prototype-builtins": "off",
-		"new-cap": "off",
+		// allow `for (..; i++)`
 		"no-plusplus": ["error", { "allowForLoopAfterthoughts": true }],
-		"object-curly-newline": "off",
-		"no-restricted-globals": "off",
-		"function-paren-newline": "off",
-		"import/no-unresolved": "error",
-		"quotes": ["error", "single", {
-			"avoidEscape": true,
-			"allowTemplateLiterals": true
+		// allow using functions defined later
+		"no-use-before-define": ["error", "nofunc"],
+		// require consistent newlines before and after braces
+		// if contents are multiline
+		"object-curly-newline": ["error", { "consistent": true, "multiline": true }],
+		// require consistent linebreaks inline function parenthesis (arguments or params)
+		"function-paren-newline": ["error", "consistent"],
+		// only require const if all parts of destructuring can be const
+		"prefer-const": ["error", { "destructuring": "all" }],
+		// don't require destructuring for arrays or assignment
+		"prefer-destructuring": ["error", {
+			"VariableDeclarator": { "array": false, "object": true },
+			"AssignmentExpression": { "array": false, "object": false }
 		}],
-		"no-else-return": [ "error", { "allowElseIf": true } ],
-		"operator-linebreak": [ "error", "after" ],
-		"arrow-parens": ["error", "as-needed", { "requireForBlockBody": true }],
+		// identical to airbnb rule, except for allowing for..of, because we want to use it
+		"no-restricted-syntax": [
+			"error",
+			{
+				"selector": "ForInStatement",
+				"message": "for..in loops iterate over the entire prototype chain, which is virtually never what you want. Use Object.{keys,values,entries}, and iterate over the resulting array."
+			},
+			{
+				"selector": "LabeledStatement",
+				"message": "Labels are a form of GOTO; using them makes code confusing and hard to maintain and understand."
+			},
+			{
+				"selector": "WithStatement",
+				"message": "`with` is disallowed in strict mode because it makes code impossible to predict and optimize."
+			}
+		],
+		// allow lines of up to 120 characters
+		"max-len": ["error", { "code": 120, "tabWidth": 2, "ignoreUrls": true, "ignoreStrings": true, "ignoreTemplateLiterals": true, "ignoreRegExpLiterals": true }],
 
-		// ES6
-		"prefer-rest-params": "off",
-		"prefer-spread": "off",
-		"prefer-arrow-callback": "off",
-		"prefer-template": "off",
-		"no-var": "off",
+		// === Disable rules ===
+		// more liberal naming
+		"camelcase": "off",
+		"no-underscore-dangle": "off",
+		// don't require anonymous function names
+		"func-names": "off",
+		// allow console
+		"no-console": "off",
+		// allow new for side effects
+		// allow new with non-capitalized
+		"no-new": "off",
+		"new-cap": "off",
+		// allow shadowing variables (usually callbacks)
+		"no-shadow": "off",
+		// allow multiple empty lines in a row
+		"no-multiple-empty-lines": "off",
+		// allow not using object shorthand
 		"object-shorthand": "off",
-		"vars-on-top": "off",
-		"prefer-destructuring": "off",
 
 		// TODO
+		"consistent-return": "off",
+		"no-restricted-globals": "off",
+		"no-prototype-builtins": "off",
 		"import/no-extraneous-dependencies": "off",
 		"import/no-dynamic-require": "off",
-		"import/newline-after-import": "off",
-		"no-bitwise": "off",
 		"global-require": "off",
-		"max-len": "off",
 		"no-param-reassign": "off",
-		"no-restricted-syntax": "off",
-		"no-script-url": "off",
-		"default-case": "off",
-		"linebreak-style": "off",
-
-		// "no-multi-assign": "off",
-		// "one-var": "off",
-		// "no-undef": "off",
-		// "max-nested-callbacks": "off",
-		// "no-mixed-requires": "off",
-		// "brace-style": "off",
-		// "max-statements-per-line": "off",
-		// "no-unused-vars": "off",
-		// "no-mixed-spaces-and-tabs": "off",
-		// "no-useless-concat": "off",
-		// "require-jsdoc": "off",
-		// "eqeqeq": "off",
-		// "no-negated-condition": "off",
-		// "one-var-declaration-per-line": "off",
-		// "no-lonely-if": "off",
-		// "radix": "off",
-		// "no-else-return": "off",
-		// "no-useless-escape": "off",
-		// "block-scoped-var": "off",
-		// "operator-assignment": "off",
-		// "yoda": "off",
-		// "no-loop-func": "off",
-		// "no-void": "off",
-		// "valid-jsdoc": "off",
-		// "no-cond-assign": "off",
-		// "no-redeclare": "off",
-		// "no-unreachable": "off",
-		// "no-nested-ternary": "off",
-		// "operator-linebreak": "off",
-		// "guard-for-in": "off",
-		// "no-unneeded-ternary": "off",
-		// "no-sequences": "off",
-		// "no-extend-native": "off",
-		// "no-shadow-restricted-names": "off",
-		// "no-extra-boolean-cast": "off",
-		// "no-path-concat": "off",
-		// "no-unused-expressions": "off",
-		// "no-return-assign": "off",
-		// "no-restricted-modules": "off",
-		// "object-curly-spacing": "off",
-		// "indent": "off",
-		// "padded-blocks": "off",
-		// "eol-last": "off",
-		// "lines-around-directive": "off",
-		// "strict": "off",
-		// "comma-dangle": "off",
-		// "no-multi-spaces": "off",
-		// "quotes": "off",
-		// "keyword-spacing": "off",
-		// "no-mixed-operators": "off",
-		// "comma-spacing": "off",
-		// "no-trailing-spaces": "off",
-		// "key-spacing": "off",
-		// "no-multiple-empty-lines": "off",
-		// "spaced-comment": "off",
-		// "space-in-parens": "off",
-		// "block-spacing": "off",
-		// "quote-props": "off",
-		// "space-unary-ops": "off",
-		// "no-empty": "off",
-		// "dot-notation": "off",
-		// "func-call-spacing": "off",
-		// "array-bracket-spacing": "off",
-		// "object-property-newline": "off",
-		// "no-continue": "off",
-		// "no-extra-semi": "off",
-		// "no-spaced-func": "off",
-		// "no-useless-return": "off"
+		"default-case": "off"
 	}
 }

.github/ISSUE_TEMPLATE.md

@@ -9,6 +9,7 @@
 
 - **NodeBB version:** 
 - **NodeBB git hash:** 
+- **NodeJS version:**
 <!-- (to find your git hash, execute `git rev-parse HEAD` from the main NodeBB directory) -->
 - **Installed NodeBB Plugins:** 
 <!-- (to find installed plugins run ./nodebb plugins) -->
@@ -19,6 +20,9 @@
 <!--
 	1. First I did this...
 	2. Then, I clicked on this item...
+
+	A quick note: MP4 and MOV formatted video files are now allowed to be uploaded to GH.
+	Please upload if reproduction steps are hard to describe or reproduce reliably.
 -->
 - **What you expected:**
 <!-- e.g. I expected *abc* to *xyz* -->

.github/SECURITY.md

@@ -0,0 +1,9 @@
+# Reporting a security vulnerability
+
+NodeBB's security policy is based around a private bug bounty program. Users are invited to explore NodeBB for vulnerabilities, and report them to the NodeBB team so that they can be patched.
+
+If you have found a security vulnerability, **do not post it onto our GitHub tracker**. Some security vulnerabilities are quite severe and discretion is recommended. Email the NodeBB Security Team at security@nodebb.org, instead.
+
+# Bug Bounty Program
+
+Security vulnerability reports may be eligible for a bounty based on severity and confirmation from NodeBB team members. For full details regarding our bug bounty program, including the bounty amounts, please consult the following page: https://blog.nodebb.org/bounty

.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@v2
+        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

.gitignore

@@ -1,3 +1,4 @@
+dist/
 yarn.lock
 npm-debug.log
 node_modules/
@@ -27,7 +28,6 @@ pidfile
 # templates
 /public/templates
 
-/public/sounds
 /public/uploads
 /test/uploads
 
@@ -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
@@ -66,3 +67,5 @@ test/files/normalise.jpg.png
 test/files/normalise-resized.jpg
 package-lock.json
 /package.json
+*.mongodb
+link-plugins.sh

.mocharc.yml

@@ -0,0 +1,4 @@
+reporter: dot
+timeout: 25000
+exit: true
+bail: true

.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\\\":5432,\\\"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\\\":5432,\\\"username\\\":\\\"postgres\\\",\\\"database\\\":\\\"travis_ci_test\\\"}\"; fi"
-after_success:
-  - "npm run coveralls"
-language: node_js
-sudo: false
-dist: xenial
-env:
-  global:
-    - PGUSER=postgres
-    - PGPORT=5432
-    - 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:
-  - "12"
-  - "10"
-branches:
-  only:
-    - master
-    - develop

.tx/config

@@ -251,6 +251,106 @@ trans.zh_CN = public/language/zh-CN/modules.json
 trans.zh_TW = public/language/zh-TW/modules.json
 type = KEYVALUEJSON
 
+[nodebb.post-queue]
+file_filter = public/language/<lang>/post-queue.json
+source_file = public/language/en-GB/post-queue.json
+source_lang = en_GB
+trans.ar = public/language/ar/post-queue.json
+trans.bg = public/language/bg/post-queue.json
+trans.bn = public/language/bn/post-queue.json
+trans.cs = public/language/cs/post-queue.json
+trans.da = public/language/da/post-queue.json
+trans.de = public/language/de/post-queue.json
+trans.el = public/language/el/post-queue.json
+trans.en@pirate = public/language/en-x-pirate/post-queue.json
+trans.en_US = public/language/en-US/post-queue.json
+trans.es = public/language/es/post-queue.json
+trans.et = public/language/et/post-queue.json
+trans.fa_IR = public/language/fa-IR/post-queue.json
+trans.fi = public/language/fi/post-queue.json
+trans.fr = public/language/fr/post-queue.json
+trans.gl = public/language/gl/post-queue.json
+trans.he = public/language/he/post-queue.json
+trans.hr = public/language/hr/post-queue.json
+trans.hu = public/language/hu/post-queue.json
+trans.id = public/language/id/post-queue.json
+trans.it = public/language/it/post-queue.json
+trans.ja = public/language/ja/post-queue.json
+trans.ko = public/language/ko/post-queue.json
+trans.lt = public/language/lt/post-queue.json
+trans.lv = public/language/lv/post-queue.json
+trans.ms = public/language/ms/post-queue.json
+trans.nb = public/language/nb/post-queue.json
+trans.nl = public/language/nl/post-queue.json
+trans.pl = public/language/pl/post-queue.json
+trans.pt_BR = public/language/pt-BR/post-queue.json
+trans.pt_PT = public/language/pt-PT/post-queue.json
+trans.ro = public/language/ro/post-queue.json
+trans.ru = public/language/ru/post-queue.json
+trans.rw = public/language/rw/post-queue.json
+trans.sc = public/language/sc/post-queue.json
+trans.sk = public/language/sk/post-queue.json
+trans.sl = public/language/sl/post-queue.json
+trans.sr = public/language/sr/post-queue.json
+trans.sv = public/language/sv/post-queue.json
+trans.th = public/language/th/post-queue.json
+trans.tr = public/language/tr/post-queue.json
+trans.uk = public/language/uk/post-queue.json
+trans.vi = public/language/vi/post-queue.json
+trans.zh_CN = public/language/zh-CN/post-queue.json
+trans.zh_TW = public/language/zh-TW/post-queue.json
+type = KEYVALUEJSON
+
+[nodebb.ip-blacklist]
+file_filter = public/language/<lang>/ip-blacklist.json
+source_file = public/language/en-GB/ip-blacklist.json
+source_lang = en_GB
+trans.ar = public/language/ar/ip-blacklist.json
+trans.bg = public/language/bg/ip-blacklist.json
+trans.bn = public/language/bn/ip-blacklist.json
+trans.cs = public/language/cs/ip-blacklist.json
+trans.da = public/language/da/ip-blacklist.json
+trans.de = public/language/de/ip-blacklist.json
+trans.el = public/language/el/ip-blacklist.json
+trans.en@pirate = public/language/en-x-pirate/ip-blacklist.json
+trans.en_US = public/language/en-US/ip-blacklist.json
+trans.es = public/language/es/ip-blacklist.json
+trans.et = public/language/et/ip-blacklist.json
+trans.fa_IR = public/language/fa-IR/ip-blacklist.json
+trans.fi = public/language/fi/ip-blacklist.json
+trans.fr = public/language/fr/ip-blacklist.json
+trans.gl = public/language/gl/ip-blacklist.json
+trans.he = public/language/he/ip-blacklist.json
+trans.hr = public/language/hr/ip-blacklist.json
+trans.hu = public/language/hu/ip-blacklist.json
+trans.id = public/language/id/ip-blacklist.json
+trans.it = public/language/it/ip-blacklist.json
+trans.ja = public/language/ja/ip-blacklist.json
+trans.ko = public/language/ko/ip-blacklist.json
+trans.lt = public/language/lt/ip-blacklist.json
+trans.lv = public/language/lv/ip-blacklist.json
+trans.ms = public/language/ms/ip-blacklist.json
+trans.nb = public/language/nb/ip-blacklist.json
+trans.nl = public/language/nl/ip-blacklist.json
+trans.pl = public/language/pl/ip-blacklist.json
+trans.pt_BR = public/language/pt-BR/ip-blacklist.json
+trans.pt_PT = public/language/pt-PT/ip-blacklist.json
+trans.ro = public/language/ro/ip-blacklist.json
+trans.ru = public/language/ru/ip-blacklist.json
+trans.rw = public/language/rw/ip-blacklist.json
+trans.sc = public/language/sc/ip-blacklist.json
+trans.sk = public/language/sk/ip-blacklist.json
+trans.sl = public/language/sl/ip-blacklist.json
+trans.sr = public/language/sr/ip-blacklist.json
+trans.sv = public/language/sv/ip-blacklist.json
+trans.th = public/language/th/ip-blacklist.json
+trans.tr = public/language/tr/ip-blacklist.json
+trans.uk = public/language/uk/ip-blacklist.json
+trans.vi = public/language/vi/ip-blacklist.json
+trans.zh_CN = public/language/zh-CN/ip-blacklist.json
+trans.zh_TW = public/language/zh-TW/ip-blacklist.json
+type = KEYVALUEJSON
+
 [nodebb.register]
 file_filter = public/language/<lang>/register.json
 source_file = public/language/en-GB/register.json
@@ -1850,304 +1950,304 @@ trans.zh_CN = public/language/zh-CN/admin/extend/widgets.json
 trans.zh_TW = public/language/zh-TW/admin/extend/widgets.json
 type = KEYVALUEJSON
 
-[nodebb.admin-general-dashboard]
-file_filter = public/language/<lang>/admin/general/dashboard.json
-source_file = public/language/en-GB/admin/general/dashboard.json
+[nodebb.admin-dashboard]
+file_filter = public/language/<lang>/admin/dashboard.json
+source_file = public/language/en-GB/admin/dashboard.json
 source_lang = en_GB
-trans.ar = public/language/ar/admin/general/dashboard.json
-trans.bg = public/language/bg/admin/general/dashboard.json
-trans.bn = public/language/bn/admin/general/dashboard.json
-trans.cs = public/language/cs/admin/general/dashboard.json
-trans.da = public/language/da/admin/general/dashboard.json
-trans.de = public/language/de/admin/general/dashboard.json
-trans.el = public/language/el/admin/general/dashboard.json
-trans.en@pirate = public/language/en-x-pirate/admin/general/dashboard.json
-trans.en_US = public/language/en-US/admin/general/dashboard.json
-trans.es = public/language/es/admin/general/dashboard.json
-trans.et = public/language/et/admin/general/dashboard.json
-trans.fa_IR = public/language/fa-IR/admin/general/dashboard.json
-trans.fi = public/language/fi/admin/general/dashboard.json
-trans.fr = public/language/fr/admin/general/dashboard.json
-trans.gl = public/language/gl/admin/general/dashboard.json
-trans.he = public/language/he/admin/general/dashboard.json
-trans.hr = public/language/hr/admin/general/dashboard.json
-trans.hu = public/language/hu/admin/general/dashboard.json
-trans.id = public/language/id/admin/general/dashboard.json
-trans.it = public/language/it/admin/general/dashboard.json
-trans.ja = public/language/ja/admin/general/dashboard.json
-trans.ko = public/language/ko/admin/general/dashboard.json
-trans.lt = public/language/lt/admin/general/dashboard.json
-trans.lv = public/language/lv/admin/general/dashboard.json
-trans.ms = public/language/ms/admin/general/dashboard.json
-trans.nb = public/language/nb/admin/general/dashboard.json
-trans.nl = public/language/nl/admin/general/dashboard.json
-trans.pl = public/language/pl/admin/general/dashboard.json
-trans.pt_BR = public/language/pt-BR/admin/general/dashboard.json
-trans.pt_PT = public/language/pt-PT/admin/general/dashboard.json
-trans.ro = public/language/ro/admin/general/dashboard.json
-trans.ru = public/language/ru/admin/general/dashboard.json
-trans.rw = public/language/rw/admin/general/dashboard.json
-trans.sc = public/language/sc/admin/general/dashboard.json
-trans.sk = public/language/sk/admin/general/dashboard.json
-trans.sl = public/language/sl/admin/general/dashboard.json
-trans.sr = public/language/sr/admin/general/dashboard.json
-trans.sv = public/language/sv/admin/general/dashboard.json
-trans.th = public/language/th/admin/general/dashboard.json
-trans.tr = public/language/tr/admin/general/dashboard.json
-trans.uk = public/language/uk/admin/general/dashboard.json
-trans.vi = public/language/vi/admin/general/dashboard.json
-trans.zh_CN = public/language/zh-CN/admin/general/dashboard.json
-trans.zh_TW = public/language/zh-TW/admin/general/dashboard.json
+trans.ar = public/language/ar/admin/dashboard.json
+trans.bg = public/language/bg/admin/dashboard.json
+trans.bn = public/language/bn/admin/dashboard.json
+trans.cs = public/language/cs/admin/dashboard.json
+trans.da = public/language/da/admin/dashboard.json
+trans.de = public/language/de/admin/dashboard.json
+trans.el = public/language/el/admin/dashboard.json
+trans.en@pirate = public/language/en-x-pirate/admin/dashboard.json
+trans.en_US = public/language/en-US/admin/dashboard.json
+trans.es = public/language/es/admin/dashboard.json
+trans.et = public/language/et/admin/dashboard.json
+trans.fa_IR = public/language/fa-IR/admin/dashboard.json
+trans.fi = public/language/fi/admin/dashboard.json
+trans.fr = public/language/fr/admin/dashboard.json
+trans.gl = public/language/gl/admin/dashboard.json
+trans.he = public/language/he/admin/dashboard.json
+trans.hr = public/language/hr/admin/dashboard.json
+trans.hu = public/language/hu/admin/dashboard.json
+trans.id = public/language/id/admin/dashboard.json
+trans.it = public/language/it/admin/dashboard.json
+trans.ja = public/language/ja/admin/dashboard.json
+trans.ko = public/language/ko/admin/dashboard.json
+trans.lt = public/language/lt/admin/dashboard.json
+trans.lv = public/language/lv/admin/dashboard.json
+trans.ms = public/language/ms/admin/dashboard.json
+trans.nb = public/language/nb/admin/dashboard.json
+trans.nl = public/language/nl/admin/dashboard.json
+trans.pl = public/language/pl/admin/dashboard.json
+trans.pt_BR = public/language/pt-BR/admin/dashboard.json
+trans.pt_PT = public/language/pt-PT/admin/dashboard.json
+trans.ro = public/language/ro/admin/dashboard.json
+trans.ru = public/language/ru/admin/dashboard.json
+trans.rw = public/language/rw/admin/dashboard.json
+trans.sc = public/language/sc/admin/dashboard.json
+trans.sk = public/language/sk/admin/dashboard.json
+trans.sl = public/language/sl/admin/dashboard.json
+trans.sr = public/language/sr/admin/dashboard.json
+trans.sv = public/language/sv/admin/dashboard.json
+trans.th = public/language/th/admin/dashboard.json
+trans.tr = public/language/tr/admin/dashboard.json
+trans.uk = public/language/uk/admin/dashboard.json
+trans.vi = public/language/vi/admin/dashboard.json
+trans.zh_CN = public/language/zh-CN/admin/dashboard.json
+trans.zh_TW = public/language/zh-TW/admin/dashboard.json
 type = KEYVALUEJSON
 
-[nodebb.admin-general-homepage]
-file_filter = public/language/<lang>/admin/general/homepage.json
-source_file = public/language/en-GB/admin/general/homepage.json
+[nodebb.admin-settings-homepage]
+file_filter = public/language/<lang>/admin/settings/homepage.json
+source_file = public/language/en-GB/admin/settings/homepage.json
 source_lang = en_GB
-trans.ar = public/language/ar/admin/general/homepage.json
-trans.bg = public/language/bg/admin/general/homepage.json
-trans.bn = public/language/bn/admin/general/homepage.json
-trans.cs = public/language/cs/admin/general/homepage.json
-trans.da = public/language/da/admin/general/homepage.json
-trans.de = public/language/de/admin/general/homepage.json
-trans.el = public/language/el/admin/general/homepage.json
-trans.en@pirate = public/language/en-x-pirate/admin/general/homepage.json
-trans.en_US = public/language/en-US/admin/general/homepage.json
-trans.es = public/language/es/admin/general/homepage.json
-trans.et = public/language/et/admin/general/homepage.json
-trans.fa_IR = public/language/fa-IR/admin/general/homepage.json
-trans.fi = public/language/fi/admin/general/homepage.json
-trans.fr = public/language/fr/admin/general/homepage.json
-trans.gl = public/language/gl/admin/general/homepage.json
-trans.he = public/language/he/admin/general/homepage.json
-trans.hr = public/language/hr/admin/general/homepage.json
-trans.hu = public/language/hu/admin/general/homepage.json
-trans.id = public/language/id/admin/general/homepage.json
-trans.it = public/language/it/admin/general/homepage.json
-trans.ja = public/language/ja/admin/general/homepage.json
-trans.ko = public/language/ko/admin/general/homepage.json
-trans.lt = public/language/lt/admin/general/homepage.json
-trans.lv = public/language/lv/admin/general/homepage.json
-trans.ms = public/language/ms/admin/general/homepage.json
-trans.nb = public/language/nb/admin/general/homepage.json
-trans.nl = public/language/nl/admin/general/homepage.json
-trans.pl = public/language/pl/admin/general/homepage.json
-trans.pt_BR = public/language/pt-BR/admin/general/homepage.json
-trans.pt_PT = public/language/pt-PT/admin/general/homepage.json
-trans.ro = public/language/ro/admin/general/homepage.json
-trans.ru = public/language/ru/admin/general/homepage.json
-trans.rw = public/language/rw/admin/general/homepage.json
-trans.sc = public/language/sc/admin/general/homepage.json
-trans.sk = public/language/sk/admin/general/homepage.json
-trans.sl = public/language/sl/admin/general/homepage.json
-trans.sr = public/language/sr/admin/general/homepage.json
-trans.sv = public/language/sv/admin/general/homepage.json
-trans.th = public/language/th/admin/general/homepage.json
-trans.tr = public/language/tr/admin/general/homepage.json
-trans.uk = public/language/uk/admin/general/homepage.json
-trans.vi = public/language/vi/admin/general/homepage.json
-trans.zh_CN = public/language/zh-CN/admin/general/homepage.json
-trans.zh_TW = public/language/zh-TW/admin/general/homepage.json
+trans.ar = public/language/ar/admin/settings/homepage.json
+trans.bg = public/language/bg/admin/settings/homepage.json
+trans.bn = public/language/bn/admin/settings/homepage.json
+trans.cs = public/language/cs/admin/settings/homepage.json
+trans.da = public/language/da/admin/settings/homepage.json
+trans.de = public/language/de/admin/settings/homepage.json
+trans.el = public/language/el/admin/settings/homepage.json
+trans.en@pirate = public/language/en-x-pirate/admin/settings/homepage.json
+trans.en_US = public/language/en-US/admin/settings/homepage.json
+trans.es = public/language/es/admin/settings/homepage.json
+trans.et = public/language/et/admin/settings/homepage.json
+trans.fa_IR = public/language/fa-IR/admin/settings/homepage.json
+trans.fi = public/language/fi/admin/settings/homepage.json
+trans.fr = public/language/fr/admin/settings/homepage.json
+trans.gl = public/language/gl/admin/settings/homepage.json
+trans.he = public/language/he/admin/settings/homepage.json
+trans.hr = public/language/hr/admin/settings/homepage.json
+trans.hu = public/language/hu/admin/settings/homepage.json
+trans.id = public/language/id/admin/settings/homepage.json
+trans.it = public/language/it/admin/settings/homepage.json
+trans.ja = public/language/ja/admin/settings/homepage.json
+trans.ko = public/language/ko/admin/settings/homepage.json
+trans.lt = public/language/lt/admin/settings/homepage.json
+trans.lv = public/language/lv/admin/settings/homepage.json
+trans.ms = public/language/ms/admin/settings/homepage.json
+trans.nb = public/language/nb/admin/settings/homepage.json
+trans.nl = public/language/nl/admin/settings/homepage.json
+trans.pl = public/language/pl/admin/settings/homepage.json
+trans.pt_BR = public/language/pt-BR/admin/settings/homepage.json
+trans.pt_PT = public/language/pt-PT/admin/settings/homepage.json
+trans.ro = public/language/ro/admin/settings/homepage.json
+trans.ru = public/language/ru/admin/settings/homepage.json
+trans.rw = public/language/rw/admin/settings/homepage.json
+trans.sc = public/language/sc/admin/settings/homepage.json
+trans.sk = public/language/sk/admin/settings/homepage.json
+trans.sl = public/language/sl/admin/settings/homepage.json
+trans.sr = public/language/sr/admin/settings/homepage.json
+trans.sv = public/language/sv/admin/settings/homepage.json
+trans.th = public/language/th/admin/settings/homepage.json
+trans.tr = public/language/tr/admin/settings/homepage.json
+trans.uk = public/language/uk/admin/settings/homepage.json
+trans.vi = public/language/vi/admin/settings/homepage.json
+trans.zh_CN = public/language/zh-CN/admin/settings/homepage.json
+trans.zh_TW = public/language/zh-TW/admin/settings/homepage.json
 type = KEYVALUEJSON
 
-[nodebb.admin-general-languages]
-file_filter = public/language/<lang>/admin/general/languages.json
-source_file = public/language/en-GB/admin/general/languages.json
+[nodebb.admin-settings-languages]
+file_filter = public/language/<lang>/admin/settings/languages.json
+source_file = public/language/en-GB/admin/settings/languages.json
 source_lang = en_GB
-trans.ar = public/language/ar/admin/general/languages.json
-trans.bg = public/language/bg/admin/general/languages.json
-trans.bn = public/language/bn/admin/general/languages.json
-trans.cs = public/language/cs/admin/general/languages.json
-trans.da = public/language/da/admin/general/languages.json
-trans.de = public/language/de/admin/general/languages.json
-trans.el = public/language/el/admin/general/languages.json
-trans.en@pirate = public/language/en-x-pirate/admin/general/languages.json
-trans.en_US = public/language/en-US/admin/general/languages.json
-trans.es = public/language/es/admin/general/languages.json
-trans.et = public/language/et/admin/general/languages.json
-trans.fa_IR = public/language/fa-IR/admin/general/languages.json
-trans.fi = public/language/fi/admin/general/languages.json
-trans.fr = public/language/fr/admin/general/languages.json
-trans.gl = public/language/gl/admin/general/languages.json
-trans.he = public/language/he/admin/general/languages.json
-trans.hr = public/language/hr/admin/general/languages.json
-trans.hu = public/language/hu/admin/general/languages.json
-trans.id = public/language/id/admin/general/languages.json
-trans.it = public/language/it/admin/general/languages.json
-trans.ja = public/language/ja/admin/general/languages.json
-trans.ko = public/language/ko/admin/general/languages.json
-trans.lt = public/language/lt/admin/general/languages.json
-trans.lv = public/language/lv/admin/general/languages.json
-trans.ms = public/language/ms/admin/general/languages.json
-trans.nb = public/language/nb/admin/general/languages.json
-trans.nl = public/language/nl/admin/general/languages.json
-trans.pl = public/language/pl/admin/general/languages.json
-trans.pt_BR = public/language/pt-BR/admin/general/languages.json
-trans.pt_PT = public/language/pt-PT/admin/general/languages.json
-trans.ro = public/language/ro/admin/general/languages.json
-trans.ru = public/language/ru/admin/general/languages.json
-trans.rw = public/language/rw/admin/general/languages.json
-trans.sc = public/language/sc/admin/general/languages.json
-trans.sk = public/language/sk/admin/general/languages.json
-trans.sl = public/language/sl/admin/general/languages.json
-trans.sr = public/language/sr/admin/general/languages.json
-trans.sv = public/language/sv/admin/general/languages.json
-trans.th = public/language/th/admin/general/languages.json
-trans.tr = public/language/tr/admin/general/languages.json
-trans.uk = public/language/uk/admin/general/languages.json
-trans.vi = public/language/vi/admin/general/languages.json
-trans.zh_CN = public/language/zh-CN/admin/general/languages.json
-trans.zh_TW = public/language/zh-TW/admin/general/languages.json
+trans.ar = public/language/ar/admin/settings/languages.json
+trans.bg = public/language/bg/admin/settings/languages.json
+trans.bn = public/language/bn/admin/settings/languages.json
+trans.cs = public/language/cs/admin/settings/languages.json
+trans.da = public/language/da/admin/settings/languages.json
+trans.de = public/language/de/admin/settings/languages.json
+trans.el = public/language/el/admin/settings/languages.json
+trans.en@pirate = public/language/en-x-pirate/admin/settings/languages.json
+trans.en_US = public/language/en-US/admin/settings/languages.json
+trans.es = public/language/es/admin/settings/languages.json
+trans.et = public/language/et/admin/settings/languages.json
+trans.fa_IR = public/language/fa-IR/admin/settings/languages.json
+trans.fi = public/language/fi/admin/settings/languages.json
+trans.fr = public/language/fr/admin/settings/languages.json
+trans.gl = public/language/gl/admin/settings/languages.json
+trans.he = public/language/he/admin/settings/languages.json
+trans.hr = public/language/hr/admin/settings/languages.json
+trans.hu = public/language/hu/admin/settings/languages.json
+trans.id = public/language/id/admin/settings/languages.json
+trans.it = public/language/it/admin/settings/languages.json
+trans.ja = public/language/ja/admin/settings/languages.json
+trans.ko = public/language/ko/admin/settings/languages.json
+trans.lt = public/language/lt/admin/settings/languages.json
+trans.lv = public/language/lv/admin/settings/languages.json
+trans.ms = public/language/ms/admin/settings/languages.json
+trans.nb = public/language/nb/admin/settings/languages.json
+trans.nl = public/language/nl/admin/settings/languages.json
+trans.pl = public/language/pl/admin/settings/languages.json
+trans.pt_BR = public/language/pt-BR/admin/settings/languages.json
+trans.pt_PT = public/language/pt-PT/admin/settings/languages.json
+trans.ro = public/language/ro/admin/settings/languages.json
+trans.ru = public/language/ru/admin/settings/languages.json
+trans.rw = public/language/rw/admin/settings/languages.json
+trans.sc = public/language/sc/admin/settings/languages.json
+trans.sk = public/language/sk/admin/settings/languages.json
+trans.sl = public/language/sl/admin/settings/languages.json
+trans.sr = public/language/sr/admin/settings/languages.json
+trans.sv = public/language/sv/admin/settings/languages.json
+trans.th = public/language/th/admin/settings/languages.json
+trans.tr = public/language/tr/admin/settings/languages.json
+trans.uk = public/language/uk/admin/settings/languages.json
+trans.vi = public/language/vi/admin/settings/languages.json
+trans.zh_CN = public/language/zh-CN/admin/settings/languages.json
+trans.zh_TW = public/language/zh-TW/admin/settings/languages.json
 type = KEYVALUEJSON
 
-[nodebb.admin-general-navigation]
-file_filter = public/language/<lang>/admin/general/navigation.json
-source_file = public/language/en-GB/admin/general/navigation.json
+[nodebb.admin-settings-navigation]
+file_filter = public/language/<lang>/admin/settings/navigation.json
+source_file = public/language/en-GB/admin/settings/navigation.json
 source_lang = en_GB
-trans.ar = public/language/ar/admin/general/navigation.json
-trans.bg = public/language/bg/admin/general/navigation.json
-trans.bn = public/language/bn/admin/general/navigation.json
-trans.cs = public/language/cs/admin/general/navigation.json
-trans.da = public/language/da/admin/general/navigation.json
-trans.de = public/language/de/admin/general/navigation.json
-trans.el = public/language/el/admin/general/navigation.json
-trans.en@pirate = public/language/en-x-pirate/admin/general/navigation.json
-trans.en_US = public/language/en-US/admin/general/navigation.json
-trans.es = public/language/es/admin/general/navigation.json
-trans.et = public/language/et/admin/general/navigation.json
-trans.fa_IR = public/language/fa-IR/admin/general/navigation.json
-trans.fi = public/language/fi/admin/general/navigation.json
-trans.fr = public/language/fr/admin/general/navigation.json
-trans.gl = public/language/gl/admin/general/navigation.json
-trans.he = public/language/he/admin/general/navigation.json
-trans.hr = public/language/hr/admin/general/navigation.json
-trans.hu = public/language/hu/admin/general/navigation.json
-trans.id = public/language/id/admin/general/navigation.json
-trans.it = public/language/it/admin/general/navigation.json
-trans.ja = public/language/ja/admin/general/navigation.json
-trans.ko = public/language/ko/admin/general/navigation.json
-trans.lt = public/language/lt/admin/general/navigation.json
-trans.lv = public/language/lv/admin/general/navigation.json
-trans.ms = public/language/ms/admin/general/navigation.json
-trans.nb = public/language/nb/admin/general/navigation.json
-trans.nl = public/language/nl/admin/general/navigation.json
-trans.pl = public/language/pl/admin/general/navigation.json
-trans.pt_BR = public/language/pt-BR/admin/general/navigation.json
-trans.pt_PT = public/language/pt-PT/admin/general/navigation.json
-trans.ro = public/language/ro/admin/general/navigation.json
-trans.ru = public/language/ru/admin/general/navigation.json
-trans.rw = public/language/rw/admin/general/navigation.json
-trans.sc = public/language/sc/admin/general/navigation.json
-trans.sk = public/language/sk/admin/general/navigation.json
-trans.sl = public/language/sl/admin/general/navigation.json
-trans.sr = public/language/sr/admin/general/navigation.json
-trans.sv = public/language/sv/admin/general/navigation.json
-trans.th = public/language/th/admin/general/navigation.json
-trans.tr = public/language/tr/admin/general/navigation.json
-trans.uk = public/language/uk/admin/general/navigation.json
-trans.vi = public/language/vi/admin/general/navigation.json
-trans.zh_CN = public/language/zh-CN/admin/general/navigation.json
-trans.zh_TW = public/language/zh-TW/admin/general/navigation.json
+trans.ar = public/language/ar/admin/settings/navigation.json
+trans.bg = public/language/bg/admin/settings/navigation.json
+trans.bn = public/language/bn/admin/settings/navigation.json
+trans.cs = public/language/cs/admin/settings/navigation.json
+trans.da = public/language/da/admin/settings/navigation.json
+trans.de = public/language/de/admin/settings/navigation.json
+trans.el = public/language/el/admin/settings/navigation.json
+trans.en@pirate = public/language/en-x-pirate/admin/settings/navigation.json
+trans.en_US = public/language/en-US/admin/settings/navigation.json
+trans.es = public/language/es/admin/settings/navigation.json
+trans.et = public/language/et/admin/settings/navigation.json
+trans.fa_IR = public/language/fa-IR/admin/settings/navigation.json
+trans.fi = public/language/fi/admin/settings/navigation.json
+trans.fr = public/language/fr/admin/settings/navigation.json
+trans.gl = public/language/gl/admin/settings/navigation.json
+trans.he = public/language/he/admin/settings/navigation.json
+trans.hr = public/language/hr/admin/settings/navigation.json
+trans.hu = public/language/hu/admin/settings/navigation.json
+trans.id = public/language/id/admin/settings/navigation.json
+trans.it = public/language/it/admin/settings/navigation.json
+trans.ja = public/language/ja/admin/settings/navigation.json
+trans.ko = public/language/ko/admin/settings/navigation.json
+trans.lt = public/language/lt/admin/settings/navigation.json
+trans.lv = public/language/lv/admin/settings/navigation.json
+trans.ms = public/language/ms/admin/settings/navigation.json
+trans.nb = public/language/nb/admin/settings/navigation.json
+trans.nl = public/language/nl/admin/settings/navigation.json
+trans.pl = public/language/pl/admin/settings/navigation.json
+trans.pt_BR = public/language/pt-BR/admin/settings/navigation.json
+trans.pt_PT = public/language/pt-PT/admin/settings/navigation.json
+trans.ro = public/language/ro/admin/settings/navigation.json
+trans.ru = public/language/ru/admin/settings/navigation.json
+trans.rw = public/language/rw/admin/settings/navigation.json
+trans.sc = public/language/sc/admin/settings/navigation.json
+trans.sk = public/language/sk/admin/settings/navigation.json
+trans.sl = public/language/sl/admin/settings/navigation.json
+trans.sr = public/language/sr/admin/settings/navigation.json
+trans.sv = public/language/sv/admin/settings/navigation.json
+trans.th = public/language/th/admin/settings/navigation.json
+trans.tr = public/language/tr/admin/settings/navigation.json
+trans.uk = public/language/uk/admin/settings/navigation.json
+trans.vi = public/language/vi/admin/settings/navigation.json
+trans.zh_CN = public/language/zh-CN/admin/settings/navigation.json
+trans.zh_TW = public/language/zh-TW/admin/settings/navigation.json
 type = KEYVALUEJSON
 
-[nodebb.admin-general-social]
-file_filter = public/language/<lang>/admin/general/social.json
-source_file = public/language/en-GB/admin/general/social.json
+[nodebb.admin-settings-social]
+file_filter = public/language/<lang>/admin/settings/social.json
+source_file = public/language/en-GB/admin/settings/social.json
 source_lang = en_GB
-trans.ar = public/language/ar/admin/general/social.json
-trans.bg = public/language/bg/admin/general/social.json
-trans.bn = public/language/bn/admin/general/social.json
-trans.cs = public/language/cs/admin/general/social.json
-trans.da = public/language/da/admin/general/social.json
-trans.de = public/language/de/admin/general/social.json
-trans.el = public/language/el/admin/general/social.json
-trans.en@pirate = public/language/en-x-pirate/admin/general/social.json
-trans.en_US = public/language/en-US/admin/general/social.json
-trans.es = public/language/es/admin/general/social.json
-trans.et = public/language/et/admin/general/social.json
-trans.fa_IR = public/language/fa-IR/admin/general/social.json
-trans.fi = public/language/fi/admin/general/social.json
-trans.fr = public/language/fr/admin/general/social.json
-trans.gl = public/language/gl/admin/general/social.json
-trans.he = public/language/he/admin/general/social.json
-trans.hr = public/language/hr/admin/general/social.json
-trans.hu = public/language/hu/admin/general/social.json
-trans.id = public/language/id/admin/general/social.json
-trans.it = public/language/it/admin/general/social.json
-trans.ja = public/language/ja/admin/general/social.json
-trans.ko = public/language/ko/admin/general/social.json
-trans.lt = public/language/lt/admin/general/social.json
-trans.lv = public/language/lv/admin/general/social.json
-trans.ms = public/language/ms/admin/general/social.json
-trans.nb = public/language/nb/admin/general/social.json
-trans.nl = public/language/nl/admin/general/social.json
-trans.pl = public/language/pl/admin/general/social.json
-trans.pt_BR = public/language/pt-BR/admin/general/social.json
-trans.pt_PT = public/language/pt-PT/admin/general/social.json
-trans.ro = public/language/ro/admin/general/social.json
-trans.ru = public/language/ru/admin/general/social.json
-trans.rw = public/language/rw/admin/general/social.json
-trans.sc = public/language/sc/admin/general/social.json
-trans.sk = public/language/sk/admin/general/social.json
-trans.sl = public/language/sl/admin/general/social.json
-trans.sr = public/language/sr/admin/general/social.json
-trans.sv = public/language/sv/admin/general/social.json
-trans.th = public/language/th/admin/general/social.json
-trans.tr = public/language/tr/admin/general/social.json
-trans.uk = public/language/uk/admin/general/social.json
-trans.vi = public/language/vi/admin/general/social.json
-trans.zh_CN = public/language/zh-CN/admin/general/social.json
-trans.zh_TW = public/language/zh-TW/admin/general/social.json
+trans.ar = public/language/ar/admin/settings/social.json
+trans.bg = public/language/bg/admin/settings/social.json
+trans.bn = public/language/bn/admin/settings/social.json
+trans.cs = public/language/cs/admin/settings/social.json
+trans.da = public/language/da/admin/settings/social.json
+trans.de = public/language/de/admin/settings/social.json
+trans.el = public/language/el/admin/settings/social.json
+trans.en@pirate = public/language/en-x-pirate/admin/settings/social.json
+trans.en_US = public/language/en-US/admin/settings/social.json
+trans.es = public/language/es/admin/settings/social.json
+trans.et = public/language/et/admin/settings/social.json
+trans.fa_IR = public/language/fa-IR/admin/settings/social.json
+trans.fi = public/language/fi/admin/settings/social.json
+trans.fr = public/language/fr/admin/settings/social.json
+trans.gl = public/language/gl/admin/settings/social.json
+trans.he = public/language/he/admin/settings/social.json
+trans.hr = public/language/hr/admin/settings/social.json
+trans.hu = public/language/hu/admin/settings/social.json
+trans.id = public/language/id/admin/settings/social.json
+trans.it = public/language/it/admin/settings/social.json
+trans.ja = public/language/ja/admin/settings/social.json
+trans.ko = public/language/ko/admin/settings/social.json
+trans.lt = public/language/lt/admin/settings/social.json
+trans.lv = public/language/lv/admin/settings/social.json
+trans.ms = public/language/ms/admin/settings/social.json
+trans.nb = public/language/nb/admin/settings/social.json
+trans.nl = public/language/nl/admin/settings/social.json
+trans.pl = public/language/pl/admin/settings/social.json
+trans.pt_BR = public/language/pt-BR/admin/settings/social.json
+trans.pt_PT = public/language/pt-PT/admin/settings/social.json
+trans.ro = public/language/ro/admin/settings/social.json
+trans.ru = public/language/ru/admin/settings/social.json
+trans.rw = public/language/rw/admin/settings/social.json
+trans.sc = public/language/sc/admin/settings/social.json
+trans.sk = public/language/sk/admin/settings/social.json
+trans.sl = public/language/sl/admin/settings/social.json
+trans.sr = public/language/sr/admin/settings/social.json
+trans.sv = public/language/sv/admin/settings/social.json
+trans.th = public/language/th/admin/settings/social.json
+trans.tr = public/language/tr/admin/settings/social.json
+trans.uk = public/language/uk/admin/settings/social.json
+trans.vi = public/language/vi/admin/settings/social.json
+trans.zh_CN = public/language/zh-CN/admin/settings/social.json
+trans.zh_TW = public/language/zh-TW/admin/settings/social.json
 type = KEYVALUEJSON
 
-[nodebb.admin-general-sounds]
-file_filter = public/language/<lang>/admin/general/sounds.json
-source_file = public/language/en-GB/admin/general/sounds.json
+[nodebb.admin-settings-sounds]
+file_filter = public/language/<lang>/admin/settings/sounds.json
+source_file = public/language/en-GB/admin/settings/sounds.json
 source_lang = en_GB
-trans.ar = public/language/ar/admin/general/sounds.json
-trans.bg = public/language/bg/admin/general/sounds.json
-trans.bn = public/language/bn/admin/general/sounds.json
-trans.cs = public/language/cs/admin/general/sounds.json
-trans.da = public/language/da/admin/general/sounds.json
-trans.de = public/language/de/admin/general/sounds.json
-trans.el = public/language/el/admin/general/sounds.json
-trans.en@pirate = public/language/en-x-pirate/admin/general/sounds.json
-trans.en_US = public/language/en-US/admin/general/sounds.json
-trans.es = public/language/es/admin/general/sounds.json
-trans.et = public/language/et/admin/general/sounds.json
-trans.fa_IR = public/language/fa-IR/admin/general/sounds.json
-trans.fi = public/language/fi/admin/general/sounds.json
-trans.fr = public/language/fr/admin/general/sounds.json
-trans.gl = public/language/gl/admin/general/sounds.json
-trans.he = public/language/he/admin/general/sounds.json
-trans.hr = public/language/hr/admin/general/sounds.json
-trans.hu = public/language/hu/admin/general/sounds.json
-trans.id = public/language/id/admin/general/sounds.json
-trans.it = public/language/it/admin/general/sounds.json
-trans.ja = public/language/ja/admin/general/sounds.json
-trans.ko = public/language/ko/admin/general/sounds.json
-trans.lt = public/language/lt/admin/general/sounds.json
-trans.lv = public/language/lv/admin/general/sounds.json
-trans.ms = public/language/ms/admin/general/sounds.json
-trans.nb = public/language/nb/admin/general/sounds.json
-trans.nl = public/language/nl/admin/general/sounds.json
-trans.pl = public/language/pl/admin/general/sounds.json
-trans.pt_BR = public/language/pt-BR/admin/general/sounds.json
-trans.pt_PT = public/language/pt-PT/admin/general/sounds.json
-trans.ro = public/language/ro/admin/general/sounds.json
-trans.ru = public/language/ru/admin/general/sounds.json
-trans.rw = public/language/rw/admin/general/sounds.json
-trans.sc = public/language/sc/admin/general/sounds.json
-trans.sk = public/language/sk/admin/general/sounds.json
-trans.sl = public/language/sl/admin/general/sounds.json
-trans.sr = public/language/sr/admin/general/sounds.json
-trans.sv = public/language/sv/admin/general/sounds.json
-trans.th = public/language/th/admin/general/sounds.json
-trans.tr = public/language/tr/admin/general/sounds.json
-trans.uk = public/language/uk/admin/general/sounds.json
-trans.vi = public/language/vi/admin/general/sounds.json
-trans.zh_CN = public/language/zh-CN/admin/general/sounds.json
-trans.zh_TW = public/language/zh-TW/admin/general/sounds.json
+trans.ar = public/language/ar/admin/settings/sounds.json
+trans.bg = public/language/bg/admin/settings/sounds.json
+trans.bn = public/language/bn/admin/settings/sounds.json
+trans.cs = public/language/cs/admin/settings/sounds.json
+trans.da = public/language/da/admin/settings/sounds.json
+trans.de = public/language/de/admin/settings/sounds.json
+trans.el = public/language/el/admin/settings/sounds.json
+trans.en@pirate = public/language/en-x-pirate/admin/settings/sounds.json
+trans.en_US = public/language/en-US/admin/settings/sounds.json
+trans.es = public/language/es/admin/settings/sounds.json
+trans.et = public/language/et/admin/settings/sounds.json
+trans.fa_IR = public/language/fa-IR/admin/settings/sounds.json
+trans.fi = public/language/fi/admin/settings/sounds.json
+trans.fr = public/language/fr/admin/settings/sounds.json
+trans.gl = public/language/gl/admin/settings/sounds.json
+trans.he = public/language/he/admin/settings/sounds.json
+trans.hr = public/language/hr/admin/settings/sounds.json
+trans.hu = public/language/hu/admin/settings/sounds.json
+trans.id = public/language/id/admin/settings/sounds.json
+trans.it = public/language/it/admin/settings/sounds.json
+trans.ja = public/language/ja/admin/settings/sounds.json
+trans.ko = public/language/ko/admin/settings/sounds.json
+trans.lt = public/language/lt/admin/settings/sounds.json
+trans.lv = public/language/lv/admin/settings/sounds.json
+trans.ms = public/language/ms/admin/settings/sounds.json
+trans.nb = public/language/nb/admin/settings/sounds.json
+trans.nl = public/language/nl/admin/settings/sounds.json
+trans.pl = public/language/pl/admin/settings/sounds.json
+trans.pt_BR = public/language/pt-BR/admin/settings/sounds.json
+trans.pt_PT = public/language/pt-PT/admin/settings/sounds.json
+trans.ro = public/language/ro/admin/settings/sounds.json
+trans.ru = public/language/ru/admin/settings/sounds.json
+trans.rw = public/language/rw/admin/settings/sounds.json
+trans.sc = public/language/sc/admin/settings/sounds.json
+trans.sk = public/language/sk/admin/settings/sounds.json
+trans.sl = public/language/sl/admin/settings/sounds.json
+trans.sr = public/language/sr/admin/settings/sounds.json
+trans.sv = public/language/sv/admin/settings/sounds.json
+trans.th = public/language/th/admin/settings/sounds.json
+trans.tr = public/language/tr/admin/settings/sounds.json
+trans.uk = public/language/uk/admin/settings/sounds.json
+trans.vi = public/language/vi/admin/settings/sounds.json
+trans.zh_CN = public/language/zh-CN/admin/settings/sounds.json
+trans.zh_TW = public/language/zh-TW/admin/settings/sounds.json
 type = KEYVALUEJSON
 
 [nodebb.admin-manage-admins-mods]
@@ -2300,56 +2400,6 @@ trans.zh_CN = public/language/zh-CN/admin/manage/groups.json
 trans.zh_TW = public/language/zh-TW/admin/manage/groups.json
 type = KEYVALUEJSON
 
-[nodebb.admin-manage-ip-blacklist]
-file_filter = public/language/<lang>/admin/manage/ip-blacklist.json
-source_file = public/language/en-GB/admin/manage/ip-blacklist.json
-source_lang = en_GB
-trans.ar = public/language/ar/admin/manage/ip-blacklist.json
-trans.bg = public/language/bg/admin/manage/ip-blacklist.json
-trans.bn = public/language/bn/admin/manage/ip-blacklist.json
-trans.cs = public/language/cs/admin/manage/ip-blacklist.json
-trans.da = public/language/da/admin/manage/ip-blacklist.json
-trans.de = public/language/de/admin/manage/ip-blacklist.json
-trans.el = public/language/el/admin/manage/ip-blacklist.json
-trans.en@pirate = public/language/en-x-pirate/admin/manage/ip-blacklist.json
-trans.en_US = public/language/en-US/admin/manage/ip-blacklist.json
-trans.es = public/language/es/admin/manage/ip-blacklist.json
-trans.et = public/language/et/admin/manage/ip-blacklist.json
-trans.fa_IR = public/language/fa-IR/admin/manage/ip-blacklist.json
-trans.fi = public/language/fi/admin/manage/ip-blacklist.json
-trans.fr = public/language/fr/admin/manage/ip-blacklist.json
-trans.gl = public/language/gl/admin/manage/ip-blacklist.json
-trans.he = public/language/he/admin/manage/ip-blacklist.json
-trans.hr = public/language/hr/admin/manage/ip-blacklist.json
-trans.hu = public/language/hu/admin/manage/ip-blacklist.json
-trans.id = public/language/id/admin/manage/ip-blacklist.json
-trans.it = public/language/it/admin/manage/ip-blacklist.json
-trans.ja = public/language/ja/admin/manage/ip-blacklist.json
-trans.ko = public/language/ko/admin/manage/ip-blacklist.json
-trans.lt = public/language/lt/admin/manage/ip-blacklist.json
-trans.lv = public/language/lv/admin/manage/ip-blacklist.json
-trans.ms = public/language/ms/admin/manage/ip-blacklist.json
-trans.nb = public/language/nb/admin/manage/ip-blacklist.json
-trans.nl = public/language/nl/admin/manage/ip-blacklist.json
-trans.pl = public/language/pl/admin/manage/ip-blacklist.json
-trans.pt_BR = public/language/pt-BR/admin/manage/ip-blacklist.json
-trans.pt_PT = public/language/pt-PT/admin/manage/ip-blacklist.json
-trans.ro = public/language/ro/admin/manage/ip-blacklist.json
-trans.ru = public/language/ru/admin/manage/ip-blacklist.json
-trans.rw = public/language/rw/admin/manage/ip-blacklist.json
-trans.sc = public/language/sc/admin/manage/ip-blacklist.json
-trans.sk = public/language/sk/admin/manage/ip-blacklist.json
-trans.sl = public/language/sl/admin/manage/ip-blacklist.json
-trans.sr = public/language/sr/admin/manage/ip-blacklist.json
-trans.sv = public/language/sv/admin/manage/ip-blacklist.json
-trans.th = public/language/th/admin/manage/ip-blacklist.json
-trans.tr = public/language/tr/admin/manage/ip-blacklist.json
-trans.uk = public/language/uk/admin/manage/ip-blacklist.json
-trans.vi = public/language/vi/admin/manage/ip-blacklist.json
-trans.zh_CN = public/language/zh-CN/admin/manage/ip-blacklist.json
-trans.zh_TW = public/language/zh-TW/admin/manage/ip-blacklist.json
-type = KEYVALUEJSON
-
 [nodebb.admin-manage-privileges]
 file_filter = public/language/<lang>/admin/manage/privileges.json
 source_file = public/language/en-GB/admin/manage/privileges.json
@@ -2400,56 +2450,6 @@ trans.zh_CN = public/language/zh-CN/admin/manage/privileges.json
 trans.zh_TW = public/language/zh-TW/admin/manage/privileges.json
 type = KEYVALUEJSON
 
-[nodebb.admin-manage-post-queue]
-file_filter = public/language/<lang>/admin/manage/post-queue.json
-source_file = public/language/en-GB/admin/manage/post-queue.json
-source_lang = en_GB
-trans.ar = public/language/ar/admin/manage/post-queue.json
-trans.bg = public/language/bg/admin/manage/post-queue.json
-trans.bn = public/language/bn/admin/manage/post-queue.json
-trans.cs = public/language/cs/admin/manage/post-queue.json
-trans.da = public/language/da/admin/manage/post-queue.json
-trans.de = public/language/de/admin/manage/post-queue.json
-trans.el = public/language/el/admin/manage/post-queue.json
-trans.en@pirate = public/language/en-x-pirate/admin/manage/post-queue.json
-trans.en_US = public/language/en-US/admin/manage/post-queue.json
-trans.es = public/language/es/admin/manage/post-queue.json
-trans.et = public/language/et/admin/manage/post-queue.json
-trans.fa_IR = public/language/fa-IR/admin/manage/post-queue.json
-trans.fi = public/language/fi/admin/manage/post-queue.json
-trans.fr = public/language/fr/admin/manage/post-queue.json
-trans.gl = public/language/gl/admin/manage/post-queue.json
-trans.he = public/language/he/admin/manage/post-queue.json
-trans.hr = public/language/hr/admin/manage/post-queue.json
-trans.hu = public/language/hu/admin/manage/post-queue.json
-trans.id = public/language/id/admin/manage/post-queue.json
-trans.it = public/language/it/admin/manage/post-queue.json
-trans.ja = public/language/ja/admin/manage/post-queue.json
-trans.ko = public/language/ko/admin/manage/post-queue.json
-trans.lt = public/language/lt/admin/manage/post-queue.json
-trans.lv = public/language/lv/admin/manage/post-queue.json
-trans.ms = public/language/ms/admin/manage/post-queue.json
-trans.nb = public/language/nb/admin/manage/post-queue.json
-trans.nl = public/language/nl/admin/manage/post-queue.json
-trans.pl = public/language/pl/admin/manage/post-queue.json
-trans.pt_BR = public/language/pt-BR/admin/manage/post-queue.json
-trans.pt_PT = public/language/pt-PT/admin/manage/post-queue.json
-trans.ro = public/language/ro/admin/manage/post-queue.json
-trans.ru = public/language/ru/admin/manage/post-queue.json
-trans.rw = public/language/rw/admin/manage/post-queue.json
-trans.sc = public/language/sc/admin/manage/post-queue.json
-trans.sk = public/language/sk/admin/manage/post-queue.json
-trans.sl = public/language/sl/admin/manage/post-queue.json
-trans.sr = public/language/sr/admin/manage/post-queue.json
-trans.sv = public/language/sv/admin/manage/post-queue.json
-trans.th = public/language/th/admin/manage/post-queue.json
-trans.tr = public/language/tr/admin/manage/post-queue.json
-trans.uk = public/language/uk/admin/manage/post-queue.json
-trans.vi = public/language/vi/admin/manage/post-queue.json
-trans.zh_CN = public/language/zh-CN/admin/manage/post-queue.json
-trans.zh_TW = public/language/zh-TW/admin/manage/post-queue.json
-type = KEYVALUEJSON
-
 [nodebb.admin-manage-registration]
 file_filter = public/language/<lang>/admin/manage/registration.json
 source_file = public/language/en-GB/admin/manage/registration.json
@@ -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

Dockerfile

@@ -19,5 +19,4 @@ ENV NODE_ENV=production \
 
 EXPOSE 4567
 
-CMD ./nodebb start
-
+CMD node ./nodebb build ;  node ./nodebb start

Gruntfile.js

@@ -1,95 +1,34 @@
 'use strict';
 
+const path = require('path');
+const nconf = require('nconf');
 
-var async = require('async');
-var fork = require('child_process').fork;
-var env = process.env;
-var worker;
-var updateWorker;
-var initWorker;
-var incomplete = [];
-var running = 0;
+nconf.argv().env({
+	separator: '__',
+});
+const winston = require('winston');
+const { fork } = require('child_process');
+
+const { env } = process;
+let worker;
 
 env.NODE_ENV = env.NODE_ENV || 'development';
 
+const configFile = path.resolve(__dirname, nconf.any(['config', 'CONFIG']) || 'config.json');
+const prestart = require('./src/prestart');
 
-var nconf = require('nconf');
-nconf.file({
-	file: 'config.json',
-});
+prestart.loadConfig(configFile);
 
-nconf.defaults({
-	base_dir: __dirname,
-	views_dir: './build/public/templates',
-});
-var winston = require('winston');
-winston.configure({
-	transports: [
-		new winston.transports.Console({
-			handleExceptions: true,
-		}),
-	],
-});
-var db = require('./src/database');
+const db = require('./src/database');
 
 module.exports = function (grunt) {
-	var args = [];
-	var initArgs = ['--build'];
+	const args = [];
+
 	if (!grunt.option('verbose')) {
 		args.push('--log-level=info');
-		initArgs.push('--log-level=info');
-	}
-
-	function update(action, filepath, target) {
-		var updateArgs = args.slice();
-		var compiling;
-		var time = Date.now();
-
-		if (target === 'lessUpdated_Client') {
-			compiling = 'clientCSS';
-		} else if (target === 'lessUpdated_Admin') {
-			compiling = 'acpCSS';
-		} else if (target === 'clientUpdated') {
-			compiling = 'js';
-		} else if (target === 'templatesUpdated') {
-			compiling = 'tpl';
-		} else if (target === 'langUpdated') {
-			compiling = 'lang';
-		} else if (target === 'serverUpdated') {
-			// Do nothing, just restart
-		}
-
-		if (compiling && !incomplete.includes(compiling)) {
-			incomplete.push(compiling);
-		}
-
-		updateArgs.push('--build');
-		updateArgs.push(incomplete.join(','));
-
-		worker.kill();
-		if (updateWorker) {
-			updateWorker.kill('SIGKILL');
-		}
-		updateWorker = fork('app.js', updateArgs, { env: env });
-		running += 1;
-		updateWorker.on('exit', function () {
-			running -= 1;
-			if (running === 0) {
-				worker = fork('app.js', args, {
-					env: env,
-				});
-				worker.on('message', function () {
-					if (incomplete.length) {
-						incomplete = [];
-
-						if (grunt.option('verbose')) {
-							grunt.log.writeln('NodeBB restarted in ' + (Date.now() - time) + ' ms');
-						}
-					}
-				});
-			}
-		});
+		nconf.set('log-level', 'info');
 	}
+	prestart.setupWinston();
 
 	grunt.initConfig({
 		watch: {},
@@ -99,148 +38,179 @@ module.exports = function (grunt) {
 
 	grunt.registerTask('default', ['watch']);
 
-	grunt.registerTask('init', function () {
-		var done = this.async();
-		async.waterfall([
-			function (next) {
-				db.init(next);
-			},
-			function (next) {
-				db.getSortedSetRange('plugins:active', 0, -1, next);
-			},
-			function (plugins, next) {
-				addBaseThemes(plugins, next);
-			},
-			function (plugins, next) {
-				if (!plugins.includes('nodebb-plugin-composer-default')) {
-					plugins.push('nodebb-plugin-composer-default');
-				}
+	grunt.registerTask('init', async function () {
+		const done = this.async();
+		let plugins = [];
+		if (!process.argv.includes('--core')) {
+			await db.init();
+			plugins = await db.getSortedSetRange('plugins:active', 0, -1);
+			addBaseThemes(plugins);
+			if (!plugins.includes('nodebb-plugin-composer-default')) {
+				plugins.push('nodebb-plugin-composer-default');
+			}
+			if (!plugins.includes('nodebb-theme-persona')) {
+				plugins.push('nodebb-theme-persona');
+			}
+		}
 
-				if (process.argv.includes('--core')) {
-					plugins = [];
-				}
+		const styleUpdated_Client = plugins.map(p => `node_modules/${p}/*.less`)
+			.concat(plugins.map(p => `node_modules/${p}/*.css`))
+			.concat(plugins.map(p => `node_modules/${p}/+(public|static|less)/**/*.less`))
+			.concat(plugins.map(p => `node_modules/${p}/+(public|static)/**/*.css`));
 
-				const lessUpdated_Client = plugins.map(p => 'node_modules/' + p + '/**/*.less');
-				const lessUpdated_Admin = plugins.map(p => 'node_modules/' + p + '/**/*.less');
-				const clientUpdated = plugins.map(p => 'node_modules/' + p + '/**/*.js');
-				const templatesUpdated = plugins.map(p => 'node_modules/' + p + '/**/*.tpl');
-				const langUpdated = plugins.map(p => 'node_modules/' + p + '/**/*.json');
+		const styleUpdated_Admin = plugins.map(p => `node_modules/${p}/*.less`)
+			.concat(plugins.map(p => `node_modules/${p}/*.css`))
+			.concat(plugins.map(p => `node_modules/${p}/+(public|static|less)/**/*.less`))
+			.concat(plugins.map(p => `node_modules/${p}/+(public|static)/**/*.css`));
 
-				grunt.config(['watch'], {
-					lessUpdated_Client: {
-						files: [
-							'public/less/*.less',
-							'!public/less/admin/**/*.less',
-							...lessUpdated_Client,
-							'!node_modules/nodebb-*/node_modules/**',
-							'!node_modules/nodebb-*/.git/**',
-						],
-						options: {
-							interval: 1000,
-						},
-					},
-					lessUpdated_Admin: {
-						files: [
-							'public/less/admin/**/*.less',
-							...lessUpdated_Admin,
-							'!node_modules/nodebb-*/node_modules/**',
-							'!node_modules/nodebb-*/.git/**',
-						],
-						options: {
-							interval: 1000,
-						},
-					},
-					clientUpdated: {
-						files: [
-							'public/src/**/*.js',
-							...clientUpdated,
-							'!node_modules/nodebb-*/node_modules/**',
-							'node_modules/benchpressjs/build/benchpress.js',
-							'!node_modules/nodebb-*/.git/**',
-						],
-						options: {
-							interval: 1000,
-						},
-					},
-					serverUpdated: {
-						files: ['*.js', 'install/*.js', 'src/**/*.js', '!src/upgrades/**'],
-						options: {
-							interval: 1000,
-						},
-					},
-					templatesUpdated: {
-						files: [
-							'src/views/**/*.tpl',
-							...templatesUpdated,
-							'!node_modules/nodebb-*/node_modules/**',
-							'!node_modules/nodebb-*/.git/**',
-						],
-						options: {
-							interval: 1000,
-						},
-					},
-					langUpdated: {
-						files: [
-							'public/language/en-GB/*.json',
-							'public/language/en-GB/**/*.json',
-							...langUpdated,
-							'!node_modules/nodebb-*/node_modules/**',
-							'!node_modules/nodebb-*/.git/**',
-							'!node_modules/nodebb-*/plugin.json',
-							'!node_modules/nodebb-*/package.json',
-							'!node_modules/nodebb-*/theme.json',
-						],
-						options: {
-							interval: 1000,
-						},
-					},
-				});
-				next();
+		const clientUpdated = plugins.map(p => `node_modules/${p}/+(public|static)/**/*.js`);
+		const serverUpdated = plugins.map(p => `node_modules/${p}/*.js`)
+			.concat(plugins.map(p => `node_modules/${p}/+(lib|src)/**/*.js`));
+
+		const templatesUpdated = plugins.map(p => `node_modules/${p}/+(public|static|templates)/**/*.tpl`);
+		const langUpdated = plugins.map(p => `node_modules/${p}/+(public|static|languages)/**/*.json`);
+
+		grunt.config(['watch'], {
+			styleUpdated_Client: {
+				files: [
+					'public/less/**/*.less',
+					...styleUpdated_Client,
+				],
+				options: {
+					interval: 1000,
+				},
 			},
-		], done);
+			styleUpdated_Admin: {
+				files: [
+					'public/less/**/*.less',
+					...styleUpdated_Admin,
+				],
+				options: {
+					interval: 1000,
+				},
+			},
+			clientUpdated: {
+				files: [
+					'public/src/**/*.js',
+					'public/vendor/**/*.js',
+					...clientUpdated,
+					'node_modules/benchpressjs/build/benchpress.js',
+				],
+				options: {
+					interval: 1000,
+				},
+			},
+			serverUpdated: {
+				files: [
+					'app.js',
+					'install/*.js',
+					'src/**/*.js',
+					'public/src/modules/translator.js',
+					'public/src/modules/helpers.js',
+					'public/src/utils.js',
+					serverUpdated,
+					'!src/upgrades/**',
+				],
+				options: {
+					interval: 1000,
+				},
+			},
+			templatesUpdated: {
+				files: [
+					'src/views/**/*.tpl',
+					...templatesUpdated,
+				],
+				options: {
+					interval: 1000,
+				},
+			},
+			langUpdated: {
+				files: [
+					'public/language/en-GB/*.json',
+					'public/language/en-GB/**/*.json',
+					...langUpdated,
+				],
+				options: {
+					interval: 1000,
+				},
+			},
+		});
+		const build = require('./src/meta/build');
+		if (!grunt.option('skip')) {
+			await build.build(true);
+		}
+		run();
+		done();
 	});
 
+	function run() {
+		if (worker) {
+			worker.kill();
+		}
+
+		const execArgv = [];
+		const inspect = process.argv.find(a => a.startsWith('--inspect'));
+
+		if (inspect) {
+			execArgv.push(inspect);
+		}
+
+		worker = fork('app.js', args, {
+			env,
+			execArgv,
+		});
+	}
+
 	grunt.task.run('init');
 
-	env.NODE_ENV = 'development';
+	grunt.event.removeAllListeners('watch');
+	grunt.event.on('watch', (action, filepath, target) => {
+		let compiling;
+		if (target === 'styleUpdated_Client') {
+			compiling = 'clientCSS';
+		} else if (target === 'styleUpdated_Admin') {
+			compiling = 'acpCSS';
+		} else if (target === 'clientUpdated') {
+			compiling = 'js';
+		} else if (target === 'templatesUpdated') {
+			compiling = 'tpl';
+		} else if (target === 'langUpdated') {
+			compiling = 'lang';
+		} else if (target === 'serverUpdated') {
+			// empty require cache
+			const paths = ['./src/meta/build.js', './src/meta/index.js'];
+			paths.forEach(p => delete require.cache[require.resolve(p)]);
+			return run();
+		}
 
-	if (grunt.option('skip')) {
-		worker = fork('app.js', args, {
-			env: env,
+		require('./src/meta/build').build([compiling], (err) => {
+			if (err) {
+				winston.error(err.stack);
+			}
+			if (worker) {
+				worker.send({ compiling: compiling });
+			}
 		});
-	} else {
-		initWorker = fork('app.js', initArgs, {
-			env: env,
-		});
-
-		initWorker.on('exit', function () {
-			worker = fork('app.js', args, {
-				env: env,
-			});
-		});
-	}
-
-	grunt.event.on('watch', update);
+	});
 };
 
-function addBaseThemes(plugins, callback) {
-	const themeId = plugins.find(p => p.startsWith('nodebb-theme-'));
+function addBaseThemes(plugins) {
+	let themeId = plugins.find(p => p.includes('nodebb-theme-'));
 	if (!themeId) {
-		return setImmediate(callback, null, plugins);
+		return plugins;
 	}
-	function getBaseRecursive(themeId) {
+	let baseTheme;
+	do {
 		try {
-			const baseTheme = require(themeId + '/theme').baseTheme;
-
-			if (baseTheme) {
-				plugins.push(baseTheme);
-				getBaseRecursive(baseTheme);
-			}
+			baseTheme = require(`${themeId}/theme`).baseTheme;
 		} catch (err) {
 			console.log(err);
 		}
-	}
 
-	getBaseRecursive(themeId);
-	callback(null, plugins);
+		if (baseTheme) {
+			plugins.push(baseTheme);
+			themeId = baseTheme;
+		}
+	} while (baseTheme);
+	return plugins;
 }

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,9 @@ 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 8 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
+* If you are using [clustering](https://docs.nodebb.org/configuring/scaling/) you need Redis installed and configured.
 * nginx, version 1.3.13 or greater (**only if** intending to use nginx to proxy requests to a NodeBB)
 
 ## Installation

app.js

@@ -22,6 +22,7 @@
 require('./require-main');
 
 const nconf = require('nconf');
+
 nconf.argv().env({
 	separator: '__',
 });
@@ -31,14 +32,16 @@ const path = require('path');
 
 const file = require('./src/file');
 
+process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 global.env = process.env.NODE_ENV || 'production';
 
 // Alternate configuration file support
-const	configFile = path.resolve(__dirname, nconf.any(['config', 'CONFIG']) || 'config.json');
+const configFile = path.resolve(__dirname, nconf.any(['config', 'CONFIG']) || 'config.json');
 
 const configExists = file.existsSync(configFile) || (nconf.get('url') && nconf.get('secret') && nconf.get('database'));
 
 const prestart = require('./src/prestart');
+
 prestart.loadConfig(configFile);
 prestart.setupWinston();
 prestart.versionCheck();
@@ -46,7 +49,7 @@ winston.verbose('* using configuration stored in: %s', configFile);
 
 if (!process.send) {
 	// If run using `node app`, log GNU copyright info along with server info
-	winston.info('NodeBB v' + nconf.get('version') + ' Copyright (C) 2013-' + (new Date()).getFullYear() + ' NodeBB Inc.');
+	winston.info(`NodeBB v${nconf.get('version')} Copyright (C) 2013-${(new Date()).getFullYear()} NodeBB Inc.`);
 	winston.info('This program comes with ABSOLUTELY NO WARRANTY.');
 	winston.info('This is free software, and you are welcome to redistribute it under certain conditions.');
 	winston.info('');

commitlint.config.js

@@ -1,3 +1,26 @@
 'use strict';
 
-module.exports = { extends: ['@commitlint/config-angular'] };
+module.exports = {
+	extends: ['@commitlint/config-angular'],
+	rules: {
+		'header-max-length': [1, 'always', 72],
+		'type-enum': [
+			2,
+			'always',
+			[
+				'breaking',
+				'build',
+				'chore',
+				'ci',
+				'docs',
+				'feat',
+				'fix',
+				'perf',
+				'refactor',
+				'revert',
+				'style',
+				'test',
+			],
+		],
+	},
+};

install/data/defaults.json

@@ -20,21 +20,22 @@
     "chatDeleteDuration": 0,
     "chatMessageDelay": 200,
     "newbiePostDelayThreshold": 3,
+    "postQueue": 0,
     "postQueueReputationThreshold": 0,
     "groupsExemptFromPostQueue": ["administrators", "Global Moderators"],
     "minimumPostLength": 8,
     "maximumPostLength": 32767,
+    "systemTags": "",
     "minimumTagsPerTopic": 0,
     "maximumTagsPerTopic": 5,
     "minimumTagLength": 3,
     "maximumTagLength": 15,
-    "allowTopicsThumbnail": 0,
+    "allowTopicsThumbnail": 1,
     "registrationType": "normal",
     "registrationApprovalType": "normal",
     "allowAccountDelete": 1,
-    "allowFileUploads": 0,
     "privateUploads": 0,
-    "allowedFileExtensions": "png,jpg,bmp",
+    "allowedFileExtensions": "png,jpg,bmp,txt",
     "allowUserHomePage": 1,
     "allowMultipleBadges": 0,
     "maximumFileSize": 2048,
@@ -44,7 +45,7 @@
     "rejectImageWidth": 5000,
     "rejectImageHeight": 5000,
     "resizeImageQuality": 80,
-    "topicThumbSize": 120,
+    "topicThumbSize": 512,
     "minimumTitleLength": 3,
     "maximumTitleLength": 255,
     "minimumUsernameLength": 2,
@@ -71,6 +72,8 @@
     "reputation:disabled": 0,
     "downvote:disabled": 0,
     "disableSignatures": 0,
+    "downvotesPerDay": 10,
+    "downvotesPerUserPerDay": 3,
     "min:rep:downvote": 0,
     "min:rep:flag": 0,
     "min:rep:profile-picture": 0,
@@ -78,12 +81,17 @@
     "min:rep:website": 0,
     "min:rep:aboutme": 0,
     "min:rep:signature": 0,
+    "flags:limitPerTarget": 0,
     "notificationType_upvote": "notification",
     "notificationType_new-topic": "notification",
     "notificationType_new-reply": "notification",
+    "notificationType_post-edit": "notification",
     "notificationType_follow": "notification",
     "notificationType_new-chat": "notification",
+    "notificationType_new-group-chat": "notification",
     "notificationType_group-invite": "notification",
+    "notificationType_group-leave": "notification",
+    "notificationType_group-request-membership": "notification",
     "notificationType_mention": "notification",
     "notificationType_new-register": "notification",
     "notificationType_post-queue": "notification",
@@ -94,11 +102,13 @@
     "maxPostsPerPage": 20,
     "topicsPerPage": 20,
     "postsPerPage": 20,
+    "categoriesPerPage": 50,
     "userSearchResultsPerPage": 50,
     "maximumGroupNameLength": 255,
     "maximumGroupTitleLength": 40,
     "preventTopicDeleteAfterReplies": 0,
     "feeds:disableSitemap": 0,
+    "feeds:disableRSS": 0,
     "sitemapTopics": 500,
     "maintenanceMode": 0,
     "maintenanceModeStatus": 503,
@@ -106,15 +116,22 @@
     "maximumInvites": 0,
     "username:disableEdit": 0,
     "email:disableEdit": 0,
-    "email:sendmail:rateLimit": 2,
-    "email:sendmail:rateDelta": 1000,
+    "email:smtpTransport:pool": 0,
     "hideFullname": 0,
+    "hideEmail": 0,
+    "showFullnameAsDisplayName": 0,
     "allowGuestHandles": 0,
+    "guestsIncrementTopicViews": 1,
+    "allowGuestReplyNotifications": 1,
+    "incrementTopicViewsInterval": 60,
+    "recentMaxTopics": 200,
     "disableRecentCategoryFilter": 0,
     "maximumRelatedTopics": 0,
     "disableEmailSubscriptions": 0,
     "emailConfirmInterval": 10,
+    "removeEmailNotificationImages": 0,
     "inviteExpiration": 7,
+    "dailyDigestFreq": "off",
     "digestHour": 17,
     "passwordExpiryDays": 0,
     "hsts-maxage": 31536000,
@@ -128,5 +145,14 @@
     "timeagoCutoff": 30,
     "necroThreshold": 7,
     "categoryWatchState": "watching",
-    "submitPluginUsage": 1
+    "submitPluginUsage": 1,
+    "showAverageApprovalTime": 1,
+    "autoApproveTime": 0,
+    "maxUserSessions": 10,
+    "useCompression": 0,
+    "updateUrlWithPostIndex": 1,
+    "composer:showHelpTab": 1,
+    "composer:allowPluginHelp": 1,
+    "maxReconnectionAttempts": 5,
+    "reconnectionDelay": 1500
 }

install/databases.js

@@ -1,58 +1,51 @@
 'use strict';
 
-var async = require('async');
-var prompt = require('prompt');
-var winston = require('winston');
+const prompt = require('prompt');
+const winston = require('winston');
 
-var questions = {
+const util = require('util');
+
+const promptGet = util.promisify((schema, callback) => prompt.get(schema, callback));
+
+const questions = {
 	redis: require('../src/database/redis').questions,
 	mongo: require('../src/database/mongo').questions,
 	postgres: require('../src/database/postgres').questions,
 };
 
-module.exports = function (config, callback) {
-	async.waterfall([
-		function (next) {
-			winston.info('\nNow configuring ' + config.database + ' database:');
-			getDatabaseConfig(config, next);
-		},
-		function (databaseConfig, next) {
-			saveDatabaseConfig(config, databaseConfig, next);
-		},
-	], callback);
+module.exports = async function (config) {
+	winston.info(`\nNow configuring ${config.database} database:`);
+	const databaseConfig = await getDatabaseConfig(config);
+	return saveDatabaseConfig(config, databaseConfig);
 };
 
-function getDatabaseConfig(config, callback) {
+async function getDatabaseConfig(config) {
 	if (!config) {
-		return callback(new Error('aborted'));
+		throw new Error('invalid config, aborted');
 	}
 
 	if (config.database === 'redis') {
 		if (config['redis:host'] && config['redis:port']) {
-			callback(null, config);
-		} else {
-			prompt.get(questions.redis, callback);
+			return config;
 		}
+		return await promptGet(questions.redis);
 	} else if (config.database === 'mongo') {
 		if ((config['mongo:host'] && config['mongo:port']) || config['mongo:uri']) {
-			callback(null, config);
-		} else {
-			prompt.get(questions.mongo, callback);
+			return config;
 		}
+		return await promptGet(questions.mongo);
 	} else if (config.database === 'postgres') {
 		if (config['postgres:host'] && config['postgres:port']) {
-			callback(null, config);
-		} else {
-			prompt.get(questions.postgres, callback);
+			return config;
 		}
-	} else {
-		return callback(new Error('unknown database : ' + config.database));
+		return await promptGet(questions.postgres);
 	}
+	throw new Error(`unknown database : ${config.database}`);
 }
 
-function saveDatabaseConfig(config, databaseConfig, callback) {
+function saveDatabaseConfig(config, databaseConfig) {
 	if (!databaseConfig) {
-		return callback(new Error('aborted'));
+		throw new Error('invalid config, aborted');
 	}
 
 	// Translate redis properties into redis object
@@ -86,13 +79,13 @@ function saveDatabaseConfig(config, databaseConfig, callback) {
 			ssl: databaseConfig['postgres:ssl'],
 		};
 	} else {
-		return callback(new Error('unknown database : ' + config.database));
+		throw new Error(`unknown database : ${config.database}`);
 	}
 
-	var allQuestions = questions.redis.concat(questions.mongo).concat(questions.postgres);
-	for (var x = 0; x < allQuestions.length; x += 1) {
+	const allQuestions = questions.redis.concat(questions.mongo).concat(questions.postgres);
+	for (let x = 0; x < allQuestions.length; x += 1) {
 		delete config[allQuestions[x].name];
 	}
 
-	callback(null, config);
+	return config;
 }

install/package.json

@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "1.13.0",
+    "version": "1.17.0-beta.0",
     "homepage": "http://www.nodebb.org",
     "repository": {
         "type": "git",
@@ -11,15 +11,21 @@
     "main": "app.js",
     "scripts": {
         "start": "node loader.js",
-        "lint": "eslint --cache ./nodebb .",
-        "pretest": "npm run lint",
-        "test": "nyc --reporter=html --reporter=text-summary mocha",
+        "lint": "npx eslint --cache ./nodebb .",
+        "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": "lint-staged",
-            "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
+            "pre-commit": "npx lint-staged",
+            "commit-msg": "npx commitlint -E HUSKY_GIT_PARAMS"
         }
     },
     "lint-staged": {
@@ -29,129 +35,143 @@
         ]
     },
     "dependencies": {
-        "ace-builds": "^1.2.9",
-        "archiver": "^3.0.0",
-        "async": "^3.0.1",
-        "autoprefixer": "^9.4.6",
+        "@adactive/bootstrap-tagsinput": "^0.8.2",
+        "ace-builds": "^1.4.9",
+        "archiver": "^5.0.0",
+        "async": "^3.2.0",
+        "autoprefixer": "10.2.4",
         "bcryptjs": "2.4.3",
-        "benchpressjs": "^2.0.0",
-        "body-parser": "^1.18.2",
-        "bootstrap": "^3.4.0",
-        "bootswatch": "git://github.com/thomaspark/bootswatch.git#c41a8f066feb8950c6f9c6bcf5a3c37d1085404e",
-        "chart.js": "^2.7.1",
+        "benchpressjs": "2.4.1",
+        "body-parser": "^1.19.0",
+        "bootbox": "5.5.2",
+        "bootstrap": "^3.4.1",
+        "chart.js": "^2.9.3",
         "cli-graph": "^3.2.2",
-        "clipboard": "^2.0.1",
-        "colors": "^1.1.2",
-        "commander": "^3.0.0",
-        "compression": "^1.7.1",
+        "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",
         "connect-mongo": "3.2.0",
-        "connect-multiparty": "^2.1.0",
-        "connect-pg-simple": "^6.0.0",
-        "connect-redis": "4.0.3",
-        "cookie-parser": "^1.4.3",
-        "cron": "^1.3.0",
-        "cropperjs": "^1.2.2",
-        "csurf": "^1.9.0",
+        "connect-multiparty": "^2.2.0",
+        "connect-pg-simple": "^6.1.0",
+        "connect-redis": "5.1.0",
+        "cookie-parser": "^1.4.5",
+        "cron": "^1.8.2",
+        "cropperjs": "^1.5.6",
+        "csurf": "^1.11.0",
         "daemon": "^1.1.0",
-        "diff": "^4.0.1",
-        "express": "^4.16.2",
-        "express-session": "^1.15.6",
-        "express-useragent": "^1.0.12",
-        "graceful-fs": "^4.1.11",
-        "helmet": "^3.11.0",
-        "html-to-text": "^5.0.0",
-        "ipaddr.js": "^1.5.4",
-        "jquery": "^3.2.1",
-        "jsesc": "2.5.2",
-        "json-2-csv": "^3.0.0",
-        "jsonwebtoken": "^8.4.0",
-        "less": "^3.10.3",
+        "diff": "^5.0.0",
+        "express": "^4.17.1",
+        "express-session": "^1.17.0",
+        "express-useragent": "^1.0.13",
+        "graceful-fs": "^4.2.3",
+        "helmet": "^4.0.0",
+        "html-to-text": "6.0.0",
+        "ipaddr.js": "^2.0.0",
+        "jquery": "3.5.1",
+        "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.6",
+        "jsonwebtoken": "^8.5.1",
+        "less": "^3.11.1",
         "lodash": "^4.17.15",
-        "logrotate-stream": "^0.2.5",
-        "lru-cache": "5.1.1",
+        "logrotate-stream": "^0.2.6",
+        "lru-cache": "6.0.0",
         "material-design-lite": "^1.3.0",
-        "mime": "^2.2.0",
-        "mkdirp": "^0.5.1",
-        "mongodb": "3.4.0",
-        "morgan": "^1.9.1",
-        "mousetrap": "^1.6.1",
-        "mubsub-nbb": "^1.5.1",
-        "nconf": "^0.10.0",
-        "nodebb-plugin-composer-default": "6.3.20",
-        "nodebb-plugin-dbsearch": "4.0.7",
-        "nodebb-plugin-emoji": "^3.0.0",
-        "nodebb-plugin-emoji-android": "2.0.0",
-        "nodebb-plugin-markdown": "8.11.0",
-        "nodebb-plugin-mentions": "2.7.3",
+        "mime": "^2.4.4",
+        "mkdirp": "^1.0.4",
+        "mongodb": "3.6.4",
+        "morgan": "^1.10.0",
+        "mousetrap": "^1.6.5",
+        "@nodebb/bootswatch": "3.4.2",
+        "nconf": "^0.11.0",
+        "nodebb-plugin-composer-default": "6.5.11",
+        "nodebb-plugin-dbsearch": "4.2.0",
+        "nodebb-plugin-emoji": "^3.3.0",
+        "nodebb-plugin-emoji-android": "2.0.1",
+        "nodebb-plugin-markdown": "8.12.6",
+        "nodebb-plugin-mentions": "2.13.7",
         "nodebb-plugin-soundpack-default": "1.0.0",
-        "nodebb-plugin-spam-be-gone": "0.6.7",
-        "nodebb-rewards-essentials": "0.1.2",
-        "nodebb-theme-lavender": "5.0.11",
-        "nodebb-theme-persona": "10.1.30",
-        "nodebb-theme-slick": "1.2.28",
-        "nodebb-theme-vanilla": "11.1.12",
-        "nodebb-widget-essentials": "4.0.17",
-        "nodemailer": "^6.0.0",
-        "passport": "^0.4.0",
+        "nodebb-plugin-spam-be-gone": "0.7.7",
+        "nodebb-rewards-essentials": "0.1.4",
+        "nodebb-theme-lavender": "5.2.1",
+        "nodebb-theme-persona": "10.5.14",
+        "nodebb-theme-slick": "1.4.3",
+        "nodebb-theme-vanilla": "11.4.4",
+        "nodebb-widget-essentials": "5.0.3",
+        "nodemailer": "^6.4.6",
+        "nprogress": "0.2.0",
+        "passport": "^0.4.1",
+        "passport-http-bearer": "^1.0.1",
         "passport-local": "1.0.0",
-        "pg": "^7.4.0",
-        "pg-cursor": "^2.0.0",
-        "postcss": "7.0.21",
-        "postcss-clean": "1.1.0",
-        "promise-polyfill": "^8.0.0",
+        "pg": "^8.0.2",
+        "pg-cursor": "^2.1.9",
+        "postcss": "8.2.6",
+        "postcss-clean": "1.2.0",
+        "promise-polyfill": "^8.1.3",
         "prompt": "^1.0.0",
-        "redis": "2.8.0",
-        "request": "2.88.0",
-        "rimraf": "3.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": "^1.16.3",
-        "semver": "^7.0.0",
-        "serve-favicon": "^2.4.5",
-        "sharp": "0.23.4",
-        "sitemap": "^5.0.0",
-        "socket.io": "2.3.0",
+        "sanitize-html": "^2.0.0",
+        "semver": "^7.2.1",
+        "serve-favicon": "^2.5.0",
+        "sharp": "0.27.1",
+        "sitemap": "^6.1.0",
+        "slideout": "1.0.1",
+        "socket.io": "3.1.1",
         "socket.io-adapter-cluster": "^1.0.1",
-        "socket.io-adapter-mongo": "^2.0.4",
-        "socket.io-adapter-postgres": "^1.2.1",
-        "socket.io-client": "2.3.0",
-        "socket.io-redis": "5.2.0",
-        "socketio-wildcard": "2.0.0",
-        "spdx-license-list": "^6.0.0",
+        "socket.io-client": "3.1.1",
+        "socket.io-redis": "6.0.1",
+        "sortablejs": "1.13.0",
+        "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": "12.1.0",
-        "winston": "3.2.1",
+        "validator": "13.5.2",
+        "visibilityjs": "2.0.2",
+        "winston": "3.3.3",
         "xml": "^1.0.1",
-        "xregexp": "^4.1.1",
+        "xregexp": "^5.0.1",
+        "yargs": "16.2.0",
         "zxcvbn": "^4.4.2"
     },
     "devDependencies": {
-        "@commitlint/cli": "8.2.0",
-        "@commitlint/config-angular": "8.2.0",
-        "coveralls": "3.0.9",
-        "eslint": "6.7.0",
-        "eslint-config-airbnb-base": "14.0.0",
-        "eslint-plugin-import": "2.18.2",
-        "grunt": "1.0.4",
+        "@apidevtools/swagger-parser": "10.0.2",
+        "@commitlint/cli": "11.0.0",
+        "@commitlint/config-angular": "11.0.0",
+        "coveralls": "3.1.0",
+        "eslint": "7.20.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": "3.1.0",
-        "jsdom": "15.2.1",
-        "lint-staged": "9.4.2",
-        "mocha": "6.2.2",
+        "husky": "5.0.9",
+        "jsdom": "16.4.0",
+        "lint-staged": "10.5.4",
+        "mocha": "8.3.0",
         "mocha-lcov-reporter": "1.3.0",
-        "nyc": "14.1.1",
-        "smtp-server": "3.5.0"
+        "nyc": "15.1.0",
+        "smtp-server": "3.8.0"
     },
     "bugs": {
         "url": "https://github.com/NodeBB/NodeBB/issues"
     },
     "engines": {
-        "node": ">=8"
+        "node": ">=10"
     },
     "maintainers": [
         {

install/web.js

@@ -1,27 +1,34 @@
 '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');
 
-var app = express();
-var server;
+const lessRenderAsync = util.promisify(
+	(style, opts, cb) => less.render(String(style), opts, cb)
+);
+const uglify = require('uglify-es');
+const nconf = require('nconf');
 
-var formats = [
+const Benchpress = require('benchpressjs');
+const mkdirp = require('mkdirp');
+const { paths } = require('../src/constants');
+
+const app = express();
+let server;
+
+const formats = [
 	winston.format.colorize(),
 ];
 
 const timestampFormat = winston.format((info) => {
-	var dateString = new Date().toISOString() + ' [' + global.process.pid + ']';
-	info.level = dateString + ' - ' + info.level;
+	const dateString = `${new Date().toISOString()} [${global.process.pid}]`;
+	info.level = `${dateString} - ${info.level}`;
 	return info;
 });
 formats.push(timestampFormat());
@@ -42,55 +49,57 @@ 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);
+	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);
+	app.engine('tpl', (filepath, options, 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);
-		}
+	try {
+		await Promise.all([
+			compileTemplate(),
+			compileLess(),
+			compileJS(),
+			copyCSS(),
+			loadDefaults(),
+		]);
 		setupRoutes();
 		launchExpress(port);
-	});
+	} catch (err) {
+		winston.error(err.stack);
+	}
 };
 
 
 function launchExpress(port) {
-	server = app.listen(port, function () {
+	server = app.listen(port, () => {
 		winston.info('Web installer listening on http://%s:%s', '0.0.0.0', port);
 	});
 }
@@ -108,11 +117,9 @@ function ping(req, res) {
 }
 
 function welcome(req, res) {
-	var dbs = ['redis', 'mongo', 'postgres'];
-	var databases = dbs.map(function (databaseName) {
-		var questions = require('../src/database/' + databaseName).questions.filter(function (question) {
-			return question && !question.hideOnWebInstall;
-		});
+	const dbs = ['redis', 'mongo', 'postgres'];
+	const databases = dbs.map((databaseName) => {
+		const questions = require(`../src/database/${databaseName}`).questions.filter(question => question && !question.hideOnWebInstall);
 
 		return {
 			name: databaseName,
@@ -120,10 +127,10 @@ function welcome(req, res) {
 		};
 	});
 
-	var defaults = require('./data/defaults');
+	const defaults = require('./data/defaults');
 
 	res.render('install/index', {
-		url: nconf.get('url') || (req.protocol + '://' + req.get('host')),
+		url: nconf.get('url') || (`${req.protocol}://${req.get('host')}`),
 		launchUrl: launchUrl,
 		skipGeneralSetup: !!nconf.get('url'),
 		databases: databases,
@@ -143,23 +150,23 @@ function install(req, res) {
 	}
 	req.setTimeout(0);
 	installing = true;
-	var setupEnvVars = nconf.get();
-	for (var i in req.body) {
-		if (req.body.hasOwnProperty(i) && !process.env.hasOwnProperty(i)) {
-			setupEnvVars[i.replace(':', '__')] = req.body[i];
+	const setupEnvVars = nconf.get();
+	for (const [key, value] of Object.entries(req.body)) {
+		if (!process.env.hasOwnProperty(key)) {
+			setupEnvVars[key.replace(':', '__')] = value;
 		}
 	}
 
 	// Flatten any objects in setupEnvVars
 	const pushToRoot = function (parentKey, key) {
-		setupEnvVars[parentKey + '__' + key] = setupEnvVars[parentKey][key];
+		setupEnvVars[`${parentKey}__${key}`] = setupEnvVars[parentKey][key];
 	};
-	for (var j in setupEnvVars) {
-		if (setupEnvVars.hasOwnProperty(j) && typeof setupEnvVars[j] === 'object' && setupEnvVars[j] !== null && !Array.isArray(setupEnvVars[j])) {
-			Object.keys(setupEnvVars[j]).forEach(pushToRoot.bind(null, j));
-			delete setupEnvVars[j];
-		} else if (Array.isArray(setupEnvVars[j])) {
-			setupEnvVars[j] = JSON.stringify(setupEnvVars[j]);
+	for (const [parentKey, value] of Object.entries(setupEnvVars)) {
+		if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
+			Object.keys(value).forEach(key => pushToRoot(parentKey, key));
+			delete setupEnvVars[parentKey];
+		} else if (Array.isArray(value)) {
+			setupEnvVars[parentKey] = JSON.stringify(value);
 		}
 	}
 
@@ -167,11 +174,11 @@ function install(req, res) {
 	winston.info(setupEnvVars);
 	launchUrl = setupEnvVars.url;
 
-	var child = require('child_process').fork('app', ['--setup'], {
+	const child = require('child_process').fork('app', ['--setup'], {
 		env: setupEnvVars,
 	});
 
-	child.on('close', function (data) {
+	child.on('close', (data) => {
 		installing = false;
 		success = data === 0;
 		error = data !== 0;
@@ -180,117 +187,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);
+		let 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) {
-	fs.readFile(path.join(__dirname, '../public/less/install.less'), function (err, style) {
-		if (err) {
-			return winston.error('Unable to read LESS install file: ', err);
-		}
-
-		less.render(style.toString(), function (err, css) {
-			if (err) {
-				return winston.error('Unable to compile LESS: ', err);
-			}
-
-			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, { filename: 'install/index.tpl' }),
+		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,
 	});
 }

loader.js

@@ -1,46 +1,45 @@
 'use strict';
 
-var	nconf = require('nconf');
-var fs = require('fs');
-var url = require('url');
-var path = require('path');
-var fork = require('child_process').fork;
-var async = require('async');
-var logrotate = require('logrotate-stream');
-var mkdirp = require('mkdirp');
+const nconf = require('nconf');
+const fs = require('fs');
+const url = require('url');
+const path = require('path');
+const { fork } = require('child_process');
+const async = require('async');
+const logrotate = require('logrotate-stream');
+const mkdirp = require('mkdirp');
 
-var file = require('./src/file');
-var pkg = require('./package.json');
+const file = require('./src/file');
+const pkg = require('./package.json');
 
-var pathToConfig = path.resolve(__dirname, process.env.CONFIG || 'config.json');
+const pathToConfig = path.resolve(__dirname, process.env.CONFIG || 'config.json');
 
 nconf.argv().env().file({
 	file: pathToConfig,
 });
 
-var	pidFilePath = path.join(__dirname, 'pidfile');
+const pidFilePath = path.join(__dirname, 'pidfile');
 
-var outputLogFilePath = path.join(__dirname, nconf.get('logFile') || 'logs/output.log');
+const outputLogFilePath = path.join(__dirname, nconf.get('logFile') || 'logs/output.log');
 
-var logDir = path.dirname(outputLogFilePath);
+const logDir = path.dirname(outputLogFilePath);
 if (!fs.existsSync(logDir)) {
 	mkdirp.sync(path.dirname(outputLogFilePath));
 }
 
-var output = logrotate({ file: outputLogFilePath, size: '1m', keep: 3, compress: true });
-var silent = nconf.get('silent') === 'false' ? false : nconf.get('silent') !== false;
-var numProcs;
-var workers = [];
-var Loader = {
+const output = logrotate({ file: outputLogFilePath, size: '1m', keep: 3, compress: true });
+const silent = nconf.get('silent') === 'false' ? false : nconf.get('silent') !== false;
+let numProcs;
+const workers = [];
+const Loader = {
 	timesStarted: 0,
 };
-var appPath = path.join(__dirname, 'app.js');
+const appPath = path.join(__dirname, 'app.js');
 
 Loader.init = function (callback) {
 	if (silent) {
-		console.log = function () {
-			var args = Array.prototype.slice.call(arguments);
-			output.write(args.join(' ') + '\n');
+		console.log = (...args) => {
+			output.write(`${args.join(' ')}\n`);
 		};
 	}
 
@@ -51,7 +50,7 @@ Loader.init = function (callback) {
 
 Loader.displayStartupMessages = function (callback) {
 	console.log('');
-	console.log('NodeBB v' + pkg.version + ' Copyright (C) 2013-2014 NodeBB Inc.');
+	console.log(`NodeBB v${pkg.version} Copyright (C) 2013-2014 NodeBB Inc.`);
 	console.log('This program comes with ABSOLUTELY NO WARRANTY.');
 	console.log('This is free software, and you are welcome to redistribute it under certain conditions.');
 	console.log('For the full license, please visit: http://www.gnu.org/copyleft/gpl.html');
@@ -60,23 +59,23 @@ Loader.displayStartupMessages = function (callback) {
 };
 
 Loader.addWorkerEvents = function (worker) {
-	worker.on('exit', function (code, signal) {
+	worker.on('exit', (code, signal) => {
 		if (code !== 0) {
 			if (Loader.timesStarted < numProcs * 3) {
 				Loader.timesStarted += 1;
 				if (Loader.crashTimer) {
 					clearTimeout(Loader.crashTimer);
 				}
-				Loader.crashTimer = setTimeout(function () {
+				Loader.crashTimer = setTimeout(() => {
 					Loader.timesStarted = 0;
 				}, 10000);
 			} else {
-				console.log((numProcs * 3) + ' restarts in 10 seconds, most likely an error on startup. Halting.');
+				console.log(`${numProcs * 3} restarts in 10 seconds, most likely an error on startup. Halting.`);
 				process.exit();
 			}
 		}
 
-		console.log('[cluster] Child Process (' + worker.pid + ') has exited (code: ' + code + ', signal: ' + signal + ')');
+		console.log(`[cluster] Child Process (${worker.pid}) has exited (code: ${code}, signal: ${signal})`);
 		if (!(worker.suicide || code === 0)) {
 			console.log('[cluster] Spinning up another process...');
 
@@ -84,25 +83,25 @@ Loader.addWorkerEvents = function (worker) {
 		}
 	});
 
-	worker.on('message', function (message) {
+	worker.on('message', (message) => {
 		if (message && typeof message === 'object' && message.action) {
 			switch (message.action) {
-			case 'restart':
-				console.log('[cluster] Restarting...');
-				Loader.restart();
-				break;
-			case 'pubsub':
-				workers.forEach(function (w) {
-					w.send(message);
-				});
-				break;
-			case 'socket.io':
-				workers.forEach(function (w) {
-					if (w !== worker) {
+				case 'restart':
+					console.log('[cluster] Restarting...');
+					Loader.restart();
+					break;
+				case 'pubsub':
+					workers.forEach((w) => {
 						w.send(message);
-					}
-				});
-				break;
+					});
+					break;
+				case 'socket.io':
+					workers.forEach((w) => {
+						if (w !== worker) {
+							w.send(message);
+						}
+					});
+					break;
 			}
 		}
 	});
@@ -110,9 +109,9 @@ Loader.addWorkerEvents = function (worker) {
 
 Loader.start = function (callback) {
 	numProcs = getPorts().length;
-	console.log('Clustering enabled: Spinning up ' + numProcs + ' process(es).\n');
+	console.log(`Clustering enabled: Spinning up ${numProcs} process(es).\n`);
 
-	for (var x = 0; x < numProcs; x += 1) {
+	for (let x = 0; x < numProcs; x += 1) {
 		forkWorker(x, x === 0);
 	}
 
@@ -122,18 +121,18 @@ Loader.start = function (callback) {
 };
 
 function forkWorker(index, isPrimary) {
-	var ports = getPorts();
-	var args = [];
+	const ports = getPorts();
+	const args = [];
 
 	if (!ports[index]) {
-		return console.log('[cluster] invalid port for worker : ' + index + ' ports: ' + ports.length);
+		return console.log(`[cluster] invalid port for worker : ${index} ports: ${ports.length}`);
 	}
 
 	process.env.isPrimary = isPrimary;
 	process.env.isCluster = nconf.get('isCluster') || ports.length > 1;
 	process.env.port = ports[index];
 
-	var worker = fork(appPath, args, {
+	const worker = fork(appPath, args, {
 		silent: silent,
 		env: process.env,
 	});
@@ -146,20 +145,20 @@ function forkWorker(index, isPrimary) {
 	Loader.addWorkerEvents(worker);
 
 	if (silent) {
-		var output = logrotate({ file: outputLogFilePath, size: '1m', keep: 3, compress: true });
+		const output = logrotate({ file: outputLogFilePath, size: '1m', keep: 3, compress: true });
 		worker.stdout.pipe(output);
 		worker.stderr.pipe(output);
 	}
 }
 
 function getPorts() {
-	var _url = nconf.get('url');
+	const _url = nconf.get('url');
 	if (!_url) {
 		console.log('[cluster] url is undefined, please check your config.json');
 		process.exit();
 	}
-	var urlObject = url.parse(_url);
-	var port = nconf.get('PORT') || nconf.get('port') || urlObject.port || 4567;
+	const urlObject = url.parse(_url);
+	let port = nconf.get('PORT') || nconf.get('port') || urlObject.port || 4567;
 	if (!Array.isArray(port)) {
 		port = [port];
 	}
@@ -172,13 +171,13 @@ Loader.restart = function () {
 	nconf.remove('file');
 	nconf.use('file', { file: pathToConfig });
 
-	fs.readFile(pathToConfig, { encoding: 'utf-8' }, function (err, configFile) {
+	fs.readFile(pathToConfig, { encoding: 'utf-8' }, (err, configFile) => {
 		if (err) {
 			console.error('Error reading config');
 			throw err;
 		}
 
-		var conf = JSON.parse(configFile);
+		const conf = JSON.parse(configFile);
 
 		nconf.stores.env.readOnly = false;
 		nconf.set('url', conf.url);
@@ -201,13 +200,13 @@ Loader.stop = function () {
 };
 
 function killWorkers() {
-	workers.forEach(function (worker) {
+	workers.forEach((worker) => {
 		worker.suicide = true;
 		worker.kill();
 	});
 }
 
-fs.open(pathToConfig, 'r', function (err) {
+fs.open(pathToConfig, 'r', (err) => {
 	if (err) {
 		// No config detected, kickstart web installer
 		fork('app');
@@ -217,7 +216,7 @@ fs.open(pathToConfig, 'r', function (err) {
 	if (nconf.get('daemon') !== 'false' && nconf.get('daemon') !== false) {
 		if (file.existsSync(pidFilePath)) {
 			try {
-				var	pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
+				const	pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
 				process.kill(pid, 0);
 				process.exit();
 			} catch (e) {
@@ -231,14 +230,14 @@ fs.open(pathToConfig, 'r', function (err) {
 			cwd: process.cwd(),
 		});
 
-		fs.writeFileSync(pidFilePath, process.pid);
+		fs.writeFileSync(pidFilePath, String(process.pid));
 	}
 
 	async.series([
 		Loader.init,
 		Loader.displayStartupMessages,
 		Loader.start,
-	], function (err) {
+	], (err) => {
 		if (err) {
 			console.error('[loader] Error during startup');
 			throw err;

public/.eslintrc

@@ -5,7 +5,6 @@
 		"socket": true,
 		"ajaxify": true,
 		"config": true,
-		"RELATIVE_PATH": true,
 		"utils": true,
 		"overrides": true,
 		"componentHandler": true,
@@ -18,25 +17,53 @@
 		"jquery": true,
 		"amd": true,
 		"browser": true,
-		"es6": false
+		"es6": true
 	},
 	"rules": {
+		"comma-dangle": ["error", {
+			"arrays": "always-multiline",
+			"objects": "always-multiline",
+			"imports": "always-multiline",
+			"exports": "always-multiline",
+			"functions": "never"
+		}],
+		"block-scoped-var": "off",
 		"no-dupe-class-members": "off",
+		"prefer-object-spread": "off",
+		"prefer-reflect": "off",
+
+		// ES6
+		"prefer-rest-params": "off",
+		"prefer-spread": "off",
+		"prefer-arrow-callback": "off",
+		"prefer-template": "off",
 		"no-var": "off",
 		"object-shorthand": "off",
-		"prefer-arrow-callback": "off",
-		"prefer-spread": "off",
-		"prefer-reflect": "off",
-		"prefer-template": "off"
+		"vars-on-top": "off",
+		"prefer-destructuring": "off",
+		// identical to airbnb rule
+		// except for allowing for..in, because for..of is unavailable on some clients
+		"no-restricted-syntax": [
+			"error",
+			{
+				"selector": "ForOfStatement",
+				"message": "iterators/generators require regenerator-runtime, which is too heavyweight for this guide to allow them. Separately, loops should be avoided in favor of array iterations."
+			},
+			{
+				"selector": "LabeledStatement",
+				"message": "Labels are a form of GOTO; using them makes code confusing and hard to maintain and understand."
+			},
+			{
+				"selector": "WithStatement",
+				"message": "`with` is disallowed in strict mode because it makes code impossible to predict and optimize."
+			}
+		]
 	},
 	"parserOptions": {
-		"ecmaVersion": 5,
+		"ecmaVersion": 2018,
 		"ecmaFeatures": {
-			"arrowFunctions": false,
 			"classes": false,
 			"defaultParams": false,
-			"destructuring": false,
-			"experimentalObjectRestSpread": false,
 			"blockBindings": false,
 			"forOf": false,
 			"generators": false,
@@ -49,9 +76,7 @@
 			"objectLiteralShorthandProperties": false,
 			"impliedStrict": false,
 			"restParams": false,
-			"spread": false,
-			"superInFunctions": false,
-			"templateStrings": false
+			"superInFunctions": false
 		}
 	}
 }

public/.jshintrc

@@ -63,7 +63,6 @@
 		"socket": true,
 		"ajaxify": true,
 		"config": true,
-		"RELATIVE_PATH": true,
 		"utils": true,
 		"overrides": true,
 		"componentHandler": true,

public/503.html

@@ -1,13 +1,13 @@
 <html>
 <head>
 	<title>Excessive Load Warning</title>
-	<link href='https://fonts.googleapis.com/css?family=Ubuntu:400,500,700' rel='stylesheet' type='text/css'>
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<style type="text/css">
 	body {
 		background: #00A9EA;
 		color: white;
-		font-family: 'Ubuntu', sans-serif;
+		/* see public/less/admin/vars.less for documentation on system font family */
+		font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
 		text-align: center;
 		-webkit-transform-style: preserve-3d;
 		-moz-transform-style: preserve-3d;

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>

public/js-enabled.css

@@ -1,3 +0,0 @@
-/*
-    The following stylesheet is only included on pages that can execute javascript
-*/

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": "العناصر في التخزين المؤقت"
 }

public/language/ar/admin/advanced/events.json

@@ -2,6 +2,7 @@
 	"events": "أحداث",
 	"no-events": "لا توجد أحداث",
 	"control-panel": "لوحة تحكم الأحداث",
+	"delete-events": "Delete Events",
 	"filters": "Filters",
 	"filters-apply": "Apply Filters",
 	"filter-type": "Event Type",

public/language/ar/admin/dashboard.json

@@ -0,0 +1,79 @@
+{
+	"forum-traffic": "Forum Traffic",
+	"page-views": "مشاهدات الصفحات",
+	"unique-visitors": "زائرين فريدين",
+	"new-users": "New Users",
+	"posts": "مشاركات",
+	"topics": "مواضيع",
+	"page-views-seven": "آخر 7 ايام",
+	"page-views-thirty": "آخر 30 يوماً",
+	"page-views-last-day": "آخر 24 ساعة",
+	"page-views-custom": "مدة زمنية مخصصة",
+	"page-views-custom-start": "بداية المدة",
+	"page-views-custom-end": "نهاية المده",
+	"page-views-custom-help": "أدخل نطاقا زمنيا لمرات مشاهدة الصفحات التي ترغب في عرضها. إذا لم يظهر منتقي التاريخ، فإن التنسيق المقبول هو <code>YYYY-MM-DD</code>",
+	"page-views-custom-error": "الرجاء إدخال نطاق تاريخ صالح بالتنسيق <code>YYYY-MM-DD</code>",
+
+	"stats.yesterday": "Yesterday",
+	"stats.today": "Today",
+	"stats.last-week": "Last Week",
+	"stats.this-week": "This Week",
+	"stats.last-month": "Last Month",
+	"stats.this-month": "This Month",
+	"stats.all": "كل الوقت",
+
+	"updates": "تحديثات",
+	"running-version": "المنتدى يعمل حاليا على <strong>NodeBB الإصدار<span id=\"version\">%1</span></strong>.",
+	"keep-updated": "تأكد دائما من أن NodeBB يعمل على احدث إصدار للحصول على أحدث التصحيحات الأمنية وإصلاحات الأخطاء.",
+	"up-to-date": "<p>المنتدى <strong>يعمل على أحدث إصدار</strong> <i class=\"fa fa-check\"></i></p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">upgrading your NodeBB</a>.</p>",
+	"prerelease-warning": "<p>هذه نسخة <strong>ماقبل الإصدار</strong> من NodeBB. قد تحدث أخطاء غير مقصودة. <i class=\"fa fa-exclamation-triangle\"></i></p>",
+	"running-in-development": "المنتدى قيد التشغيل في وضع \"المطورين\". وقد تكون هناك ثغرات أمنية مفتوحة؛ من فضلك تواصل مع مسؤول نظامك.",
+	"latest-lookup-failed": "<p>Failed to look up latest available version of NodeBB</p>",
+
+	"notices": "إشعارات",
+	"restart-not-required": "إعادة التشغيل غير مطلوب",
+	"restart-required": "إعادة التشغيل مطلوبة",
+	"search-plugin-installed": "إضافة البحث منصبة",
+	"search-plugin-not-installed": "إضافة البحث غير منصبة",
+	"search-plugin-tooltip": "نصب إضافة البحث من صفحة الإضافات البرمجية لتنشيط وظيفة البحث",
+
+	"control-panel": "التحكم بالنظام",
+	"rebuild-and-restart": "Rebuild &amp; Restart",
+	"restart": "Restart",
+	"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
+	"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
+	"maintenance-mode": "وضع الصيانة",
+	"maintenance-mode-title": "انقر هنا لإعداد وضع الصيانة لـNodeBB",
+	"realtime-chart-updates": "التحديث الفوري للرسم البياني",
+
+	"active-users": "المستخدمين النشطين",
+	"active-users.users": "الأعضاء",
+	"active-users.guests": "الزوار",
+	"active-users.total": "المجموع",
+	"active-users.connections": "Connections",
+
+	"anonymous-registered-users": "المجهولين مقابل المستخدمين المسجلين",
+	"anonymous": "مجهول",
+	"registered": "مسجل",
+
+	"user-presence": "تواجد المستخدمين",
+	"on-categories": "في قائمة الأقسام",
+	"reading-posts": "قراءة المشاركات",
+	"browsing-topics": "تصفح المواضيع",
+	"recent": "الأخيرة",
+	"unread": "غير مقروء",
+
+	"high-presence-topics": "مواضيع ذات حضور قوي",
+
+	"graphs.page-views": "مشاهدات الصفحة",
+	"graphs.page-views-registered": "Page Views Registered",
+	"graphs.page-views-guest": "Page Views Guest",
+	"graphs.page-views-bot": "Page Views Bot",
+	"graphs.unique-visitors": "زوار فريدين",
+	"graphs.registered-users": "مستخدمين مسجلين",
+	"graphs.anonymous-users": "مستخدمين مجهولين",
+	"last-restarted-by": "Last restarted by",
+	"no-users-browsing": "No users browsing"
+}

public/language/ar/admin/development/info.json

@@ -1,7 +1,9 @@
 {
-	"you-are-on": "Info - You are on <strong>%1:%2</strong>",
+	"you-are-on": "You are on <strong>%1:%2</strong>",
+	"ip": "IP <strong>%1</strong>",
 	"nodes-responded": "%1 nodes responded within %2ms!",
 	"host": "host",
+	"primary": "primary / run jobs",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "online",

public/language/ar/admin/extend/plugins.json

@@ -1,4 +1,5 @@
 {
+	"trending": "Trending",
 	"installed": "منصبة",
 	"active": "مفعلة",
 	"inactive": "معطلة",

public/language/ar/admin/extend/widgets.json

@@ -1,7 +1,7 @@
 {
 	"available": "Available Widgets",
 	"explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.",
-	"none-installed": "No widgets found! Activate the essential widgets plugin in the <a href=\"%1\">plugins</a> control panel.",
+	"none-installed": "No widgets found! Activate the widget essentials plugin in the <a href=\"%1\">plugins</a> control panel.",
 	"clone-from": "Clone widgets from",
 	"containers.available": "Available Containers",
 	"containers.explanation": "Drag and drop on top of any active widget",

public/language/ar/admin/manage/categories.json

@@ -10,12 +10,16 @@
 	"custom-class": "Custom Class",
 	"num-recent-replies": "# of Recent Replies",
 	"ext-link": "External Link",
+	"subcategories-per-page": "Subcategories per page",
 	"is-section": "Treat this category as a section",
+	"post-queue": "Post queue",
+	"tag-whitelist": "Tag Whitelist",
 	"upload-image": "Upload Image",
 	"delete-image": "Remove",
 	"category-image": "Category Image",
 	"parent-category": "Parent Category",
 	"optional-parent-category": "(Optional) Parent Category",
+	"top-level": "Top Level",
 	"parent-category-none": "(None)",
 	"copy-parent": "Copy Parent",
 	"copy-settings": "Copy Settings From",
@@ -26,6 +30,9 @@
 	"enable": "Enable",
 	"disable": "Disable",
 	"edit": "Edit",
+	"analytics": "Analytics",
+	"view-category": "View category",
+	"set-order": "Set order",
 
 	"select-category": "Select Category",
 	"set-parent-category": "Set Parent Category",
@@ -42,6 +49,8 @@
 	"privileges.no-users": "No user-specific privileges in this category.",
 	"privileges.section-group": "Group",
 	"privileges.group-private": "This group is private",
+  	"privileges.inheritance-exception": "This group does not inherit privileges from registered-users group",
+  	"privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group",
 	"privileges.search-group": "Add Group",
 	"privileges.copy-to-children": "Copy to Children",
 	"privileges.copy-from-category": "Copy from Category",
@@ -63,7 +72,6 @@
 	"alert.create-success": "Category successfully created!",
 	"alert.none-active": "You have no active categories.",
 	"alert.create": "Create a Category",
-	"alert.confirm-moderate": "<strong>Are you sure you wish to grant the moderation privilege to this user group?</strong> This group is public, and any users can join at will.",
 	"alert.confirm-purge": "<p class=\"lead\">Do you really want to purge this category \"%1\"?</p><h5><strong class=\"text-danger\">Warning!</strong> All topics and posts in this category will be purged!</h5> <p class=\"help-block\">Purging a category will remove all topics and posts, and delete the category from the database. If you want to remove a category <em>temporarily</em>, you'll want to \"disable\" the category instead.</p>",
 	"alert.purge-success": "Category purged!",
 	"alert.copy-success": "Settings Copied!",
@@ -75,7 +83,9 @@
 	"alert.user-search": "Search for a user here...",
 	"alert.find-group": "Find a Group",
 	"alert.group-search": "Search for a group here...",
+	"alert.not-enough-whitelisted-tags": "Whitelisted tags are less than minimum tags, you need to create more whitelisted tags!",
 	"collapse-all": "Collapse All",
 	"expand-all": "Expand All",
-	"disable-on-create": "Disable on create"
+	"disable-on-create": "Disable on create",
+	"no-matches": "No matches"
 }

public/language/ar/admin/manage/digest.json

@@ -9,7 +9,7 @@
 	"default": "System default",
 	"default-help": "<em>System default</em> means the user has not explicitly overridden the global forum setting for digests, which is currently: &quot;<strong>%1</strong>&quot;",
 	"resend": "Resend Digest",
-	"resend-all-confirm": "Are you sure you wish to mnually execute this digest run?",
+	"resend-all-confirm": "Are you sure you wish to manually execute this digest run?",
 	"resent-single": "Manual digest resend completed",
 	"resent-day": "Daily digest resent",
 	"resent-week": "Weekly digest resent",
@@ -18,4 +18,4 @@
 	"manual-run": "Manual digest run:",
 
 	"no-delivery-data": "No delivery data found"
-}
+}

public/language/ar/admin/manage/groups.json

@@ -8,6 +8,9 @@
 	"hidden": "Hidden",
 	"private": "Private",
 	"edit": "Edit",
+	"delete": "Delete",
+	"privileges": "Privileges",
+	"download-csv": "CSV",
 	"search-placeholder": "Search",
 	"create": "Create Group",
 	"description-placeholder": "A short description about your group",

public/language/ar/admin/manage/privileges.json

@@ -1,13 +1,16 @@
 {
 	"global": "Global",
-	"global.no-users": "No user-specific global privileges.",
+	"admin": "Admin",
 	"group-privileges": "Group Privileges",
 	"user-privileges": "User Privileges",
+	"edit-privileges": "Edit Privileges",
+  	"select-clear-all": "Select/Clear All",
 	"chat": "Chat",
 	"upload-images": "Upload Images",
 	"upload-files": "Upload Files",
 	"signature": "Signature",
 	"ban": "Ban",
+	"invite": "Invite",
 	"search-content": "Search Content",
 	"search-users": "Search Users",
 	"search-tags": "Search Tags",
@@ -31,5 +34,26 @@
 	"downvote-posts": "Downvote Posts",
 	"delete-topics": "Delete Topics",
 	"purge": "Purge",
-	"moderate": "Moderate"
+	"moderate": "Moderate",
+	"admin-dashboard": "Dashboard",
+	"admin-categories": "Categories",
+	"admin-privileges": "Privileges",
+	"admin-users": "Users",
+	"admin-admins-mods": "Admins & Mods",
+	"admin-groups": "Groups",
+	"admin-tags": "Tags",
+	"admin-settings": "Settings",
+
+	"alert.confirm-moderate": "<strong>Are you sure you wish to grant the moderation privilege to this user group?</strong> This group is public, and any users can join at will.",
+	"alert.confirm-admins-mods": "<strong>Are you sure you wish to grant the &quot;Admins &amp; Mods&quot; privilege to this user/group?</strong> Users with this privilege are able to promote and demote other users into privileged positions, <em>including super administrator</em>",
+	"alert.confirm-save": "Please confirm your intention to save these privileges",
+	"alert.saved": "Privilege changes saved and applied",
+	"alert.confirm-discard": "Are you sure you wish to discard your privilege changes?",
+	"alert.discarded": "Privilege changes discarded",
+	"alert.confirm-copyToAll": "Are you sure you wish to apply this privilege set to <strong>all categories</strong>?",
+	"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.admin-warning": "Administrators implicitly get all privileges"
 }

public/language/ar/admin/manage/tags.json

@@ -3,17 +3,17 @@
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",
 
-	"alerts.editing-multiple": "Editing multiple tags",
-	"alerts.editing-x": "Editing \"%1\" tag",
+	"alerts.editing": "Editing tag(s)",
 	"alerts.confirm-delete": "Do you want to delete the selected tags?",
-	"alerts.update-success": "Tag Updated!"
+	"alerts.update-success": "Tag Updated!",
+	"reset-colors": "Reset colors"
 }

public/language/ar/admin/manage/users.json

@@ -12,23 +12,18 @@
 	"unban": "Unban User(s)",
 	"reset-lockout": "Reset Lockout",
 	"reset-flags": "Reset Flags",
-	"delete": "Delete User(s)",
-	"purge": "Delete User(s) and Content",
+	"delete": "Delete <strong>User(s)</strong>",
+	"delete-content": "Delete User(s) <strong>Content</strong>",
+	"purge": "Delete <strong>User(s)</strong> and <strong>Content</strong>",
 	"download-csv": "Download CSV",
 	"manage-groups": "Manage Groups",
 	"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",
@@ -93,9 +88,11 @@
 	"alerts.validate-email-success": "Emails validated",
 	"alerts.validate-force-password-reset-success": "User(s) passwords have been reset and their existing sessions have been revoked.",
 	"alerts.password-reset-confirm": "Do you want to send password reset email(s) to these user(s)?",
-	"alerts.confirm-delete": "<b>Warning!</b><br/>Do you really want to delete user(s)?<br/> This action is not reversable! Only the user account will be deleted, their posts and topics will remain.",
+	"alerts.confirm-delete": "<strong>Warning!</strong><p>Do you really want to delete <strong>user(s)</strong>?</p><p>This action is not reversible! Only the user account will be deleted, their posts and topics will remain.</p>",
 	"alerts.delete-success": "User(s) Deleted!",
-	"alerts.confirm-purge": "<b>Warning!</b><br/>Do you really want to delete user(s) and their content?<br/> This action is not reversable! All user data and content will be erased!",
+	"alerts.confirm-delete-content": "<strong>Warning!</strong><p>Do you really want to delete these user(s) <strong>content</strong>?</p><p>This action is not reversible! The users' accounts will remain, but their posts and topics will be deleted.</p>",
+	"alerts.delete-content-success": "User(s) Content Deleted!",
+	"alerts.confirm-purge": "<strong>Warning!</strong><p>Do you really want to delete <strong>user(s) and their content</strong>?</p><p>This action is not reversible! All user data and content will be erased!</p>",
 	"alerts.create": "Create User",
 	"alerts.button-create": "Create",
 	"alerts.button-cancel": "Cancel",
@@ -105,5 +102,7 @@
 
 	"alerts.prompt-email": "Emails: ",
 	"alerts.email-sent-to": "An invitation email has been sent to %1",
-	"alerts.x-users-found": "%1 user(s) found! Search took %2 ms."
+	"alerts.x-users-found": "%1 user(s) found, (%2 seconds)",
+	"export-users-started": "Exporting users as csv, this might take a while. You will receive a notification when it is complete.",
+	"export-users-completed": "Users exported as csv, click here to download."
 }

public/language/ar/admin/menu.json

@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "عام",
-	"general/dashboard": "اللوحة الرئيسية",
-	"general/homepage": "الصفحة الرئيسية",
-	"general/navigation": "التصفح",
-	"general/languages": "اللغات",
-	"general/sounds": "الأصوات",
-	"general/social": "شبكات التواصل",
 
 	"section-manage": "إدارة",
 	"manage/categories": "الأقسام",
@@ -22,17 +17,23 @@
 
 	"section-settings": "إعدادات",
 	"settings/general": "عامة",
-	"settings/reputation": "السمعة",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
+	"settings/reputation": "Reputation & Flags",
 	"settings/email": "البريد الإلكتروني",
-	"settings/user": "الأعضاء",
-	"settings/group": "المجموعات",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "الزوار",
 	"settings/uploads": "الرفع",
-	"settings/post": "المشاركة",
-	"settings/chat": "الدردشة",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "ترقيم الصفحات",
 	"settings/tags": "الكلمات المفتاحية",
 	"settings/notifications": "التنبيهات",
+	"settings/api": "API Access",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",
@@ -70,7 +71,7 @@
 	"logout": "Log out",
 	"view-forum": "View Forum",
 
-	"search.placeholder": "Search for settings",
+	"search.placeholder": "Press "/" to search for settings",
 	"search.no-results": "No results...",
 	"search.search-forum": "Search the forum for <strong></strong>",
 	"search.keep-typing": "Type more to see results...",

public/language/ar/admin/settings/advanced.json

@@ -5,6 +5,8 @@
 	"maintenance-mode.message": "Maintenance Message",
 	"headers": "Headers",
 	"headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame",
+	"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
+	"headers.csp-frame-ancestors-help": "'none', 'self'(default) or list of URIs to allow.",
 	"headers.powered-by": "Customise the \"Powered By\" header sent by NodeBB",
 	"headers.acao": "Access-Control-Allow-Origin",
 	"headers.acao-regex": "Access-Control-Allow-Origin Regular Expression",
@@ -15,14 +17,27 @@
 	"headers.acah": "Access-Control-Allow-Headers",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "Enabled HSTS (recommended)",
+	"hsts.maxAge": "HSTS Max Age",
 	"hsts.subdomains": "Include subdomains in HSTS header",
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Traffic Management",
-	"traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Enable Traffic Management",
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"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."
 }

public/language/ar/admin/settings/api.json

@@ -0,0 +1,16 @@
+{
+	"tokens": "Tokens",
+	"settings": "Settings",
+	"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",
+
+	"require-https": "Require API usage via HTTPS only",
+	"require-https-caveat": "<strong>Note</strong>: Some installations involving load balancers may proxy their requests to NodeBB using HTTP, in which case this option should remain disabled.",
+
+	"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"
+}

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)"
 }

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"
 }

public/language/ar/admin/settings/email.json

@@ -4,9 +4,6 @@
 	"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
-	"sendmail-rate-limit": "Send <em>X</em> emails...",
-	"sendmail-rate-delta": "... every <em>X</em> milliseconds",
-	"sendmail-rate-help": "Instructs the NodeBB mailer to limit the number of messages sent at once in order to not overwhelm email receiving services. These options do not apply if SMTP Transport is enabled (below).",
 
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Use an external email server to send emails",
@@ -25,6 +22,8 @@
 	"smtp-transport.username": "Username",
 	"smtp-transport.username-help": "<b>For the Gmail service,</b> enter the full email address here, especially if you are using a Google Apps managed domain.",
 	"smtp-transport.password": "Password",
+	"smtp-transport.pool": "Enable pooled connections",
+	"smtp-transport.pool-help": "Pooling connections prevents NodeBB from creating a new connection for every email. This option only applies if SMTP Transport is enabled.",
 
 	"template": "Edit Email Template",
 	"template.select": "Select Email Template",
@@ -36,5 +35,7 @@
 	"subscriptions": "Email Digests",
 	"subscriptions.disable": "Disable email digests",
 	"subscriptions.hour": "Digest Hour",
-	"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>"
+	"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>",
+	"notifications.settings": "Email notification settings",
+	"notifications.remove-images": "Remove images from email notifications"
 }

public/language/ar/admin/settings/general.json

@@ -1,35 +1,44 @@
 {
-	"site-settings": "Site Settings",
-	"title": "Site Title",
-	"title.url": "URL",
+	"site-settings": "اعدادات الموقع",
+	"title": "عنوان الموقع",
+	"title.short": "عنوان قصير",
+	"title.short-placeholder": "ان لم تقم بكتابة عنوان مختصر, سيتم استخدام عنوان الموقع الكلي",
+	"title.url": "الرابط",
 	"title.url-placeholder": "The URL of the site title",
 	"title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.",
-	"title.name": "Your Community Name",
+	"title.name": "اسم المنتدي",
 	"title.show-in-header": "Show Site Title in Header",
-	"browser-title": "Browser Title",
+	"browser-title": "عنوان المتصفح",
 	"browser-title-help": "If no browser title is specified, the site title will be used",
 	"title-layout": "Title Layout",
 	"title-layout-help": "Define how the browser title will be structured ie. {pageTitle} | {browserTitle}",
 	"description.placeholder": "A short description about your community",
-	"description": "Site Description",
-	"keywords": "Site Keywords",
+	"description": "وصف الموقع",
+	"keywords": "الكلمات الدليله للموقع",
 	"keywords-placeholder": "Keywords describing your community, comma-separated",
-	"logo": "Site Logo",
-	"logo.image": "Image",
+	"logo": "شعار الموقع",
+	"logo.image": "صورة",
 	"logo.image-placeholder": "Path to a logo to display on forum header",
-	"logo.upload": "Upload",
-	"logo.url": "URL",
+	"logo.upload": "رفع",
+	"logo.url": "الرابط",
 	"logo.url-placeholder": "The URL of the site logo",
 	"logo.url-help": "When the logo is clicked, send users to this address. If left blank, user will be sent to the forum index.",
-	"logo.alt-text": "Alt Text",
+	"logo.alt-text": "نص بديل",
 	"log.alt-text-placeholder": "Alternative text for accessibility",
-	"favicon": "Favicon",
-	"favicon.upload": "Upload",
-	"touch-icon": "Homescreen/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.",
+	"favicon": "صورة المفضله",
+	"favicon.upload": "رفع",
+	"pwa": "Progressive Web App",
+	"touch-icon": "Touch Icon",
+	"touch-icon.upload": "رفع",
+	"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",
-	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page"
+	"search-default-sort-by": "الترتيب الافتراضي للبحث",
+	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page",
+	"site-colors": "Site Color Metadata",
+	"theme-color": "لون الثيم",
+	"background-color": "لون الخلفية",
+	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
 }

public/language/ar/admin/settings/group.json

@@ -3,6 +3,7 @@
 	"private-groups": "Private Groups",
 	"private-groups.help": "If enabled, joining of groups requires the approval of the group owner <em>(Default: enabled)</em>",
 	"private-groups.warning": "<strong>Beware!</strong> If this option is disabled and you have private groups, they automatically become public.",
+	"allow-multiple-badges": "Allow Multiple Badges",
 	"allow-multiple-badges-help": "This flag can be used to allow users to select multiple group badges, requires theme support.",
 	"max-name-length": "Maximum Group Name Length",
 	"max-title-length": "Maximum Group Title Length",

public/language/ar/admin/settings/guest.json

@@ -1,5 +1,7 @@
 {
-	"handles": "Guest Handles",
+	"settings": "Settings",
 	"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.enabled": "Allow guests to increase topic view counts",
+	"reply-notifications.enabled": "Allow guests to generate reply notifications"
 }

public/language/ar/admin/settings/languages.json

@@ -0,0 +1,6 @@
+{
+	"language-settings": "اعدادات اللغة",
+	"description": "تُحدد اللغة الافتراضية إعدادات اللغة لجميع المستخدمين الذين يزورون المنتدى. <br />يمكن للأعضاء تجاوز اللغة الافتراضية من خلال صفحة إعدادات الحساب الخاصة بهم.",
+	"default-language": "اللغة الافتراضية",
+	"auto-detect": "الكشف عن إعدادات اللغة للزوار بشكل آلي"
+}

public/language/ar/admin/settings/notifications.json

@@ -2,6 +2,5 @@
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
 	"welcome-notification-link": "Welcome Notification Link",
-	"welcome-notification-uid": "Welcome Notification User (UID)",
-	"notification-alert-timeout": "Notification Alert Timeout"
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }

public/language/ar/admin/settings/pagination.json

@@ -1,10 +1,12 @@
 {
 	"pagination": "Pagination Settings",
 	"enable": "Paginate topics and posts instead of using infinite scroll.",
+	"posts": "Post Pagination",
 	"topics": "Topic Pagination",
 	"posts-per-page": "Posts per Page",
 	"max-posts-per-page": "Maximum posts per page",
 	"categories": "Category Pagination",
 	"topics-per-page": "Topics per Page",
-	"max-topics-per-page": "Maximum topics per page"
+	"max-topics-per-page": "Maximum topics per page",
+	"categories-per-page": "Categories per page"
 }

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",
@@ -42,6 +44,7 @@
 	"unread.cutoff": "Unread cutoff days",
 	"unread.min-track-last": "Minimum posts in topic before tracking last read",
 	"recent": "Recent Settings",
+	"recent.max-topics": "Maximum topics on /recent",
 	"recent.categoryFilter.disable": "Disable filtering of topics in ignored categories on the /recent page",
 	"signature": "Signature Settings",
 	"signature.disable": "Disable signatures",

public/language/ar/admin/settings/reputation.json

@@ -5,10 +5,18 @@
 	"votes-are-public": "All Votes Are Public",
 	"thresholds": "Activity Thresholds",
 	"min-rep-downvote": "Minimum reputation to downvote posts",
+	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
+	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
 	"min-rep-flag": "Minimum reputation to flag posts",
 	"min-rep-website": "Minimum reputation to add \"Website\" to user profile",
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",
 	"min-rep-signature": "Minimum reputation to add \"Signature\" to user profile",
 	"min-rep-profile-picture": "Minimum reputation to add \"Profile Picture\" to user profile",
-	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile"
+	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile",
+
+	"flags": "Flag Settings",
+	"flags.limit-per-target": "Maximum number of times something can be flagged",
+	"flags.limit-per-target-placeholder": "Default: 0",
+	"flags.limit-per-target-help": "When a post or user is flagged multiple times, each additional flag is considered a "report" and added to the original flag. Set this option to a number other than zero to limit the number of reports an item can receive.",
+	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned"
 }

public/language/ar/admin/settings/sounds.json

@@ -0,0 +1,9 @@
+{
+	"notifications": "التنبيهات",
+	"chat-messages": "Chat Messages",
+	"play-sound": "Play",
+	"incoming-message": "Incoming Message",
+	"outgoing-message": "Outgoing Message",
+	"upload-new-sound": "Upload New Sound",
+	"saved": "Settings Saved"
+}

public/language/ar/admin/settings/tags.json

@@ -1,10 +1,12 @@
 {
     "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
+    "system-tags": "System Tags",
+    "system-tags-help": "Only privileged users will be able to use these tags.",
     "min-per-topic": "Minimum Tags per Topic",
     "max-per-topic": "Maximum Tags per Topic",
     "min-length": "Minimum Tag Length",
     "max-length": "Maximum Tag Length",
-    "goto-manage": "Click here to visit the tag management page.",
     "related-topics": "Related Topics",
     "max-related-topics": "Maximum related topics to display (if supported by theme)"
 }

public/language/ar/admin/settings/user.json

@@ -9,13 +9,14 @@
 	"allow-login-with.email": "البريد الالكتروني فقط",
 	"account-settings": "إعدادت الحساب",
 	"gdpr_enabled": "Enable GDPR consent collection",
-	"gdpr_enabled_help": "When enabled, all new registrants will be required to explicitly give consent for data collection and usage under the <a href=\"https://eugdpr.org/the-regulation/gdpr-faqs/\">General Data Protection Regulation (GDPR)</a>. <strong>Note</strong>: Enabling GDPR does not force pre-existing users to provide consent. To do so, you will need to install the GDPR plugin.",
+	"gdpr_enabled_help": "When enabled, all new registrants will be required to explicitly give consent for data collection and usage under the <a href=\"https://ec.europa.eu/info/priorities/justice-and-fundamental-rights/data-protection/2018-reform-eu-data-protection-rules/eu-data-protection-rules_en\">General Data Protection Regulation (GDPR)</a>. <strong>Note</strong>: Enabling GDPR does not force pre-existing users to provide consent. To do so, you will need to install the GDPR plugin.",
 	"disable-username-changes": "عدم السماح بتغيير اسم المستخدم",
 	"disable-email-changes": "عدم السماح بتغيير البريد الالكتروني",
 	"disable-password-changes": "عدم السماح بتغيير كلمة المرور",
 	"allow-account-deletion": "السماح بحذف الحساب",
 	"hide-fullname": "إخفاء الإسم الكامل عن المستخدمين",
 	"hide-email": "إخفاء البريد الإلكتروني عن المستخدمين",
+	"show-fullname-as-displayname": "Show user's full name as their display name if available",
 	"themes": "القوالب",
 	"disable-user-skins": "منع المستخدمين من اختيار سمة مخصص",
 	"account-protection": "حماية الحساب",
@@ -43,6 +44,9 @@
 	"registration-type.disabled": "لا يوجد تسجيل",
 	"registration-type.help": "Normal - Users can register from the /register page.<br/>\nInvite Only - Users can invite others from the <a href=\"%1/users\" target=\"_blank\">users</a> page.<br/>\nAdmin Invite Only - Only administrators can invite others from <a href=\"%1/users\" target=\"_blank\">users</a> and <a href=\"%1/admin/manage/users\">admin/manage/users</a> pages.<br/>\nNo registration - No user registration.<br/>",
 	"registration-approval-type.help": "Normal - Users are registered immediately.<br/>\nAdmin Approval - User registrations are placed in an <a href=\"%1/admin/manage/registration\">approval queue</a> for administrators.<br/>\nAdmin Approval for IPs - Normal for new users, Admin Approval for IP addresses that already have an account.<br/>",
+	"registration-queue-auto-approve-time": "Automatic Approval Time",
+	"registration-queue-auto-approve-time-help": "Hours before user is approved automatically. 0 to disable.",
+	"registration-queue-show-average-time": "Show users average time it takes to approve a new user",
 	"registration.max-invites": "الحد الأقصى للدعوات لكل عضو",
 	"max-invites": "الحد الأقصى للدعوات لكل عضو",
 	"max-invites-help": "0  لعدم تحديد قيود، الإدارة تحصل على دعوات لامحدودة <br> هذا الخيار يعمل فقط عند تحديد خيار \"بالدعوات فقط\"",
@@ -62,6 +66,7 @@
 	"restrict-chat": "السماح فقط برسائل الدردشة من المستخدمين الذين أتبعهم",
 	"outgoing-new-tab": "Open outgoing links in new tab",
 	"topic-search": "Enable In-Topic Searching",
+	"update-url-with-post-index": "Update url with post index while browsing topics",
 	"digest-freq": "Subscribe to Digest",
 	"digest-freq.off": "Off",
 	"digest-freq.daily": "Daily",
@@ -76,4 +81,4 @@
 	"categoryWatchState.watching": "Watching",
 	"categoryWatchState.notwatching": "Not Watching",
 	"categoryWatchState.ignoring": "Ignoring"
-}
+}

public/language/ar/category.json

@@ -18,5 +18,6 @@
     "watching.message": "You are now watching updates from this category and all subcategories",
     "notwatching.message": "You are not watching updates from this category and all subcategories",
     "ignoring.message": "You are now ignoring updates from this category and all subcategories",
-    "watched-categories": "الأقسام المُتابعة"
+    "watched-categories": "الأقسام المُتابعة",
+    "x-more-categories": "%1 more categories"
 }

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": "يوم",

public/language/ar/error.json

@@ -9,6 +9,7 @@
     "invalid-tid": "موضوع غير متواجد",
     "invalid-pid": "رد غير موجود",
     "invalid-uid": "مستخدم غير موجود",
+    "invalid-date": "A valid date must be provided",
     "invalid-username": "اسم المستخدم غير مقبول",
     "invalid-email": "البريد الاكتروني غير مقبول",
     "invalid-fullname": "Invalid Fullname",
@@ -21,11 +22,13 @@
     "invalid-username-or-password": "المرجود تحديد اسم مستخدم و كلمة مرور",
     "invalid-search-term": "كلمة البحث غير صحيحة",
     "invalid-url": "Invalid URL",
+    "invalid-event": "Invalid event: %1",
     "local-login-disabled": "Local login system has been disabled for non-privileged accounts.",
     "csrf-invalid": "لم تتمكن من تسجيل الدخول. هنالك أحتمال ان جلستك انتهت. رجاءًا حاول مرة اخرى.",
     "invalid-pagination-value": "رقم الصفحة غير صحيح ، يجب أن يكون بين %1 و %2 .",
     "username-taken": "اسم المستخدم مأخوذ",
     "email-taken": "البريد الالكتروني مأخوذ",
+    "email-invited": "Email was already invited",
     "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.",
     "email-not-confirmed-chat": "لا يمكنك الدردشة حتى تقوم بتأكيد بريدك الإلكتروني، الرجاء إضغط هنا لتأكيد بريدك اﻹلكتروني.",
     "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.",
@@ -38,6 +41,7 @@
     "username-too-long": "اسم المستخدم طويل",
     "password-too-long": "كلمة السر طويلة ",
     "reset-rate-limited": "Too many password reset requests (rate limited)",
+    "reset-same-password": "Please use a password that is different from your current one",
     "user-banned": "المستخدم محظور",
     "user-banned-reason": "Sorry, this account has been banned (Reason: %1)",
     "user-banned-reason-until": "Sorry, this account has been banned until %1 (Reason: %2)",
@@ -80,6 +84,7 @@
     "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 character(s)",
     "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
     "too-many-tags": "Too many tags. Topics can't have more than %1 tag(s)",
+    "cant-use-system-tag": "You can not use this system tag.",
     "still-uploading": "الرجاء الانتظار حتى يكتمل الرفع.",
     "file-too-big": "الحد الأقصى لرفع الملفات %1 كيلو بت. رجاءًا ارفع ملف أصغر",
     "guest-upload-disabled": "خاصية رفع الملفات غير مفعلة للزوار.",
@@ -88,7 +93,9 @@
     "already-unbookmarked": "You have already unbookmarked this post",
     "cant-ban-other-admins": "لايمكن حظر مدبر نظام آخر.",
     "cant-remove-last-admin": "رجاءًا ، أضف مدير أخر قبل حذف صلاحيات الإدارة من حسابك.",
+    "account-deletion-disabled": "Account deletion is disabled",
     "cant-delete-admin": "رجاءًا أزل صلاحيات الإدارة قبل حذف الحساب. ",
+    "already-deleting": "Already deleting",
     "invalid-image": "Invalid image",
     "invalid-image-type": "نوع الصورة غير مدعوم. الأنواع المدعومة هي :  %1",
     "invalid-image-extension": "امتداد الصورة غير مدعوم.",
@@ -128,6 +135,7 @@
     "chat-delete-duration-expired": "You are only allowed to delete chat messages for %1 second(s) after posting",
     "chat-deleted-already": "This chat message has already been deleted.",
     "chat-restored-already": "This chat message has already been restored.",
+    "chat-room-does-not-exist": "Chat room does not exist.",
     "already-voting-for-this-post": "لقد شاركت بالتصويت ، ألا تذكر؟",
     "reputation-system-disabled": "نظام السمعة معطل",
     "downvoting-disabled": "التصويتات السلبية معطلة",
@@ -138,8 +146,14 @@
     "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature",
     "not-enough-reputation-min-rep-profile-picture": "You do not have enough reputation to add a profile picture",
     "not-enough-reputation-min-rep-cover-picture": "You do not have enough reputation to add a cover picture",
-    "already-flagged": "لقد بلغت عن هذه المشاركة من قبل.",
+    "post-already-flagged": "You have already flagged this post",
+    "user-already-flagged": "You have already flagged this user",
+    "post-flagged-too-many-times": "This post has been flagged by others already",
+    "user-flagged-too-many-times": "This user has been flagged by others already",
+    "cant-flag-privileged": "You are not allowed to flag the profiles or content of privileged users (moderators/global moderators/admins)",
     "self-vote": "You cannot vote on your own post",
+    "too-many-downvotes-today": "You can only downvote %1 times a day",
+    "too-many-downvotes-today-user": "You can only downvote a user %1 times a day",
     "reload-failed": "المنتدى واجه مشكلة أثناء إعادة التحميل: \"%1\".  سيواصل المنتدى خدمة العملاء السابقين لكن يجب عليك إلغاء أي تغيير قمت به قبل إعادة التحميل.",
     "registration-error": "حدث خطأ أثناء التسجيل",
     "parse-error": "حدث خطأ ما أثناء تحليل استجابة الخادم",
@@ -157,10 +171,16 @@
     "invalid-session-text": "يبدو أن فترة التسجيل لم تعد قائمة او هي غير مطابقة مع الخادم. يرجى إعادة تحميل هذه الصفحة.",
     "no-topics-selected": "No topics selected!",
     "cant-move-to-same-topic": "Can't move post to same topic!",
+    "cant-move-topic-to-same-category": "Can't move topic to the same category!",
     "cannot-block-self": "You cannot block yourself!",
     "cannot-block-privileged": "You cannot block administrators or global moderators",
     "cannot-block-guest": "Guest are not able to block other users",
     "already-blocked": "This user is already blocked",
     "already-unblocked": "This user is already unblocked",
-    "no-connection": "There seems to be a problem with your internet connection"
+    "no-connection": "There seems to be a problem with your internet connection",
+    "socket-reconnect-failed": "Unable to reach the server at this time. Click here to try again, or try again later",
+    "plugin-not-whitelisted": "Unable to install plugin – only plugins whitelisted by the NodeBB Package Manager can be installed via the ACP",
+    "topic-event-unrecognized": "Topic event '%1' unrecognized",
+    "cant-set-child-as-parent": "Can't set child as parent category",
+    "cant-set-self-as-parent": "Can't set self as parent category"
 }

public/language/ar/flags.json

@@ -1,58 +1,73 @@
 {
-	"state": "State",
-	"reporter": "Reporter",
-	"reported-at": "Reported At",
-	"description": "Description",
+	"state": "الحالة",
+	"reports": "Reports",
+	"first-reported": "First Reported",
 	"no-flags": "Hooray! No flags found.",
-	"assignee": "Assignee",
-	"update": "Update",
-	"updated": "Updated",
+	"assignee": "المحال إليه",
+	"update": "تحديث",
+	"updated": "تم التحديث",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
 
 	"graph-label": "Daily Flags",
 	"quick-filters": "Quick Filters",
 	"filter-active": "There are one or more filters active in this list of flags",
-	"filter-reset": "Remove Filters",
-	"filters": "Filter Options",
+	"filter-reset": "ازالة الفلاتر",
+	"filters": "خيارات الفلتر",
 	"filter-reporterId": "Reporter UID",
 	"filter-targetUid": "Flagged UID",
-	"filter-type": "Flag Type",
-	"filter-type-all": "All Content",
-	"filter-type-post": "Post",
-	"filter-type-user": "User",
-	"filter-state": "State",
+	"filter-type": "عنوان العلامة",
+	"filter-type-all": "كل المحتوي",
+	"filter-type-post": "مشاركة",
+	"filter-type-user": "مستخدم",
+	"filter-state": "الحالة",
 	"filter-assignee": "Assignee UID",
 	"filter-cid": "Category",
 	"filter-quick-mine": "Assigned to me",
 	"filter-cid-all": "All categories",
 	"apply-filters": "Apply Filters",
+	"more-filters": "More Filters",
 
-	"quick-links": "Quick Links",
+	"quick-actions": "اجراءات سريعه",
 	"flagged-user": "Flagged User",
-	"view-profile": "View Profile",
-	"start-new-chat": "Start New Chat",
+	"view-profile": "مشاهدة الملف الشخصي",
+	"start-new-chat": "بدء محادثه جديده",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
+	"delete-post": "حذف المشاركة",
+	"purge-post": "Purge Post",
+	"restore-post": "استرجاع المشاركة",
 
-	"user-view": "View Profile",
-	"user-edit": "Edit Profile",
+	"user-view": "مشاهدة الملف الشخصي",
+	"user-edit": "تعديل الملف الشخصي",
 
 	"notes": "Flag Notes",
-	"add-note": "Add Note",
+	"add-note": "اضافة ملاحظة",
 	"no-notes": "No shared notes.",
+	"delete-note-confirm": "Are you sure you want to delete this flag note?",
+	"note-added": "Note Added",
+	"note-deleted": "Note Deleted",
 
-	"history": "Flag History",
-	"back": "Back to Flags List",
+	"history": "Account & Flag History",
 	"no-history": "No flag history.",
 
 	"state-all": "All states",
 	"state-open": "New/Open",
 	"state-wip": "Work in Progress",
-	"state-resolved": "Resolved",
-	"state-rejected": "Rejected",
+	"state-resolved": "تم حلها",
+	"state-rejected": "تم رفضها",
 	"no-assignee": "Not Assigned",
-	"note-added": "Note Added",
 
-	"modal-title": "Report Inappropriate Content",
+	"sort": "Sort by",
+	"sort-newest": "Newest first",
+	"sort-oldest": "Oldest first",
+	"sort-reports": "Most reports",
+	"sort-all": "All flag types...",
+	"sort-posts-only": "Posts only...",
+	"sort-downvotes": "Most downvotes",
+	"sort-upvotes": "Most upvotes",
+	"sort-replies": "Most replies",
+
+	"modal-title": "Report Content",
 	"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
 	"modal-reason-spam": "Spam",
 	"modal-reason-offensive": "Offensive",
@@ -62,5 +77,10 @@
 	"modal-submit-success": "Content has been flagged for moderation.",
 	"modal-submit-confirm": "Confirm Submission",
 	"modal-submit-confirm-text": "You have a custom reason specified already. Are you sure you wish to submit via quick-report?",
-	"modal-submit-confirm-text-help": "Submitting a quick report will overwrite any custom reasons defined."
+	"modal-submit-confirm-text-help": "Submitting a quick report will overwrite any custom reasons defined.",
+
+	"bulk-actions": "Bulk Actions",
+	"bulk-resolve": "Resolve Flag(s)",
+	"bulk-success": "%1 flags updated",
+	"flagged-timeago-readable": "Flagged <span class=\"timeago\" title=\"%1\"></span> (%2)"
 }

public/language/ar/global.json

@@ -30,6 +30,7 @@
     "header.unread": "غير مقروء",
     "header.tags": "وسم",
     "header.popular": "الأكثر شهرة",
+    "header.top": "Top",
     "header.users": "المستخدمين",
     "header.groups": "المجموعات",
     "header.chats": "المحادثات",
@@ -45,19 +46,25 @@
     "alert.success": "نجاح",
     "alert.error": "خطأ",
     "alert.banned": "محظور",
-    "alert.banned.message": "لقد تم حظر حسابك. سيتم تسجيل الخروج.",
+    "alert.banned.message": "You have just been banned, your access is now restricted.",
+    "alert.unbanned": "Unbanned",
+    "alert.unbanned.message": "Your ban has been lifted.",
     "alert.unfollow": "أنت لا تتابع %1 بعد الآن!",
     "alert.follow": "أنت الآن تتابع %1!",
     "users": "الأعضاء",
     "topics": "المواضيع",
     "posts": "المشاركات",
+    "x-posts": "%1 posts",
     "best": "الأفضل",
     "votes": "Votes",
+    "x-votes": "%1 votes",
+    "voters": "Voters",
     "upvoters": "الموافقين",
     "upvoted": "مصوت بالموجب",
     "downvoters": "مصوتين بالسالب",
     "downvoted": "مصوت بالسالب",
     "views": "المشاهدات",
+    "posters": "Posters",
     "reputation": "السمعة",
     "lastpost": "Last post",
     "firstpost": "First post",
@@ -88,6 +95,8 @@
     "guest": "زائر",
     "guests": "الزوار",
     "former_user": "A Former User",
+    "system-user": "System",
+    "unknown-user": "Unknown user",
     "updated.title": "تم تحديث المنتدى",
     "updated.message": "لقد تم تحديث المنتدى إلى آخر نسخة للتو. إضغط هنا لإعادة تحميل الصفحة.",
     "privacy": "الخصوصية",

public/language/ar/groups.json

@@ -35,6 +35,7 @@
     "details.member_count": "عدد اﻷعضاء",
     "details.creation_date": "تاريخ الإنشاء",
     "details.description": "الوصف",
+    "details.member-post-cids": "Category IDs to display posts from",
     "details.badge_preview": "معاينة الوسام",
     "details.change_icon": "تغيير الأيقونة",
     "details.change_label_colour": "Change Label Colour",

public/language/ar/login.json

@@ -8,5 +8,6 @@
     "failed_login_attempt": "تسجيل الدخول غير ناجح",
     "login_successful": "قمت بتسجيل الدخول بنجاح!",
     "dont_have_account": "لا تملك حساب؟",
-    "logged-out-due-to-inactivity": "لقد تم تسجيل خروجك من لوحة تحكم بسبب عدم نشاطك"
+    "logged-out-due-to-inactivity": "لقد تم تسجيل خروجك من لوحة تحكم بسبب عدم نشاطك",
+    "caps-lock-enabled": "Caps Lock is enabled"
 }

public/language/ar/modules.json

@@ -1,6 +1,7 @@
 {
     "chat.chatting_with": "Chat with",
     "chat.placeholder": "أكتب رسالة دردشة هنا، اضغط ENTER للإرسال",
+    "chat.scroll-up-alert": "You are looking at older messages, click here to go to most recent message.",
     "chat.send": "أرسل",
     "chat.no_active": "لا يوجد لديك دردشات نشطة.",
     "chat.user_typing": "%1 يكتب رسالة...",
@@ -12,6 +13,7 @@
     "chat.recent-chats": "آخر الدردشات",
     "chat.contacts": "الأصدقاء",
     "chat.message-history": "تاريخ الرسائل",
+    "chat.message-deleted": "Message Deleted",
     "chat.options": "Chat options",
     "chat.pop-out": "افتح الدردشة في نافذة خاصة",
     "chat.minimize": "Minimize",
@@ -57,10 +59,17 @@
     "composer.upload-file": "Upload File",
     "composer.zen_mode": "Zen Mode",
     "composer.select_category": "Select a category",
+    "composer.textarea.placeholder": "Enter your post content here, drag and drop images",
     "bootbox.ok": "OK",
     "bootbox.cancel": "إلغاء",
     "bootbox.confirm": "تأكيد",
     "cover.dragging_title": "Cover Photo Positioning",
     "cover.dragging_message": "Drag the cover photo to the desired position and click \"Save\"",
-    "cover.saved": "Cover photo image and position saved"
+    "cover.saved": "Cover photo image and position saved",
+    "thumbs.modal.title": "Manage topic thumbnails",
+    "thumbs.modal.no-thumbs": "No thumbnails found.",
+    "thumbs.modal.resize-note": "<strong>Note</strong>: This forum is configured to resize topic thumbnails down to a maximum width of %1px",
+    "thumbs.modal.add": "Add thumbnail",
+    "thumbs.modal.remove": "Remove thumbnail",
+    "thumbs.modal.confirm-remove": "Are you sure you want to remove this thumbnail?"
 }

public/language/ar/notifications.json

@@ -35,6 +35,7 @@
     "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
     "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> أنشأ موضوعًا جديدًا: <strong>%2</strong>",
+    "user_edited_post": "<strong>%1</strong> has edited a post in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> صار يتابعك.",
     "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
     "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
@@ -42,6 +43,10 @@
     "new_register_multiple": "There are <strong>%1</strong> registration requests awaiting review.",
     "flag_assigned_to_you": "تم تخصيص العلامة 1%  لك",
     "post_awaiting_review": "Post awaiting review",
+    "profile-exported": "<strong>%1</strong> profile exported, click to download",
+    "posts-exported": "<strong>%1</strong> posts exported, click to download",
+    "uploads-exported": "<strong>%1</strong> uploads exported, click to download",
+    "users-csv-exported": "Users csv exported, click to download",
     "email-confirmed": "تم التحقق من عنوان البريد الإلكتروني",
     "email-confirmed-message": "شكرًا على إثبات صحة عنوان بريدك الإلكتروني. صار حسابك مفعلًا بالكامل.",
     "email-confirm-error-message": "حدث خطأ أثناء التحقق من عنوان بريدك الإلكتروني. ربما رمز التفعيل خاطئ أو انتهت صلاحيته.",
@@ -53,9 +58,12 @@
     "notificationType_upvote": "عندما يوافقك احدهم على منشورك",
     "notificationType_new-topic": "When someone you follow posts a topic",
     "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_post-edit": "When a post is edited in a topic you are watching",
     "notificationType_follow": "When someone starts following you",
     "notificationType_new-chat": "When you receive a chat message",
+    "notificationType_new-group-chat": "When you receive a group chat message",
     "notificationType_group-invite": "When you receive a group invite",
+    "notificationType_group-leave": "When a user leaves your group",
     "notificationType_group-request-membership": "When someone requests to join a group you own",
     "notificationType_new-register": "When someone gets added to registration queue",
     "notificationType_post-queue": "When a new post is queued",

public/language/ar/post-queue.json

@@ -1,3 +1,4 @@
+
 {
 	"post-queue": "Post Queue",
 	"description": "There are no posts in the post queue. <br> To enable this feature, go to <a href=\"%1\">Settings &rarr; Post &rarr; Post Queue</a> and enable <strong>Post Queue</strong>.",
@@ -7,5 +8,11 @@
 	"content": "Content",
 	"posted": "Posted",
 	"reply-to": "Reply to \"%1\"",
-	"content-editable": "You can click on individual content to edit before posting."
+	"content-editable": "Click on content to edit",
+	"category-editable": "Click on category to edit",
+	"title-editable": "Click on title to edit",
+	"reply": "Reply",
+	"topic": "Topic",
+	"accept": "Accept",
+	"reject": "Reject"
 }

public/language/ar/register.json

@@ -18,9 +18,14 @@
     "agree_to_terms_of_use": "أوافق على شروط الاستخدام",
     "terms_of_use_error": "يجب عليك الموافقة على شروط الاستخدام",
     "registration-added-to-queue": "تمت إضافتك في قائمة الإنتضار. ستتلقى رسالة إلكترونية عند الموافقة على تسجيلك من قبل الإدارة.",
+    "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.",
+    "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.",
     "interstitial.intro": "نحتاج إلى بعض المعلومات الإضافية قبل أن نتمكن من إنشاء حسابك.",
     "interstitial.errors-found": "تعذر علينا إتمام عملية التسجيل:",
     "gdpr_agree_data": "I consent to the collection and processing of my personal information on this website.",
     "gdpr_agree_email": "I consent to receive digest and notification emails from this website.",
-    "gdpr_consent_denied": "You must give consent to this site to collect/process your information, and to send you emails."
+    "gdpr_consent_denied": "You must give consent to this site to collect/process your information, and to send you emails.",
+    "invite.error-admin-only": "Direct user registration has been disabled. Please contact an administrator for more details.",
+    "invite.error-invite-only": "Direct user registration has been disabled. You must be invited by an existing user in order to access this forum.",
+    "invite.error-invalid-data": "The registration data received does not correspond to our records. Please contact an administrator for more details"
 }

public/language/ar/reset_password.json

@@ -7,6 +7,7 @@
     "wrong_reset_code.message": "رمز إعادة التعين غير صحيح، يرجى المحاولة مرة أخرى أو <a href='/reset'>اطلب رمزا جديدا</a>",
     "new_password": "كلمة المرور الجديدة",
     "repeat_password": "تأكيد كلمة المرور",
+    "changing_password": "Changing Password",
     "enter_email": "يرجى إدخال <strong>عنوان البريد الإلكتروني</strong> الخاص بك وسوف نرسل لك رسالة بالبريد الالكتروني مع تعليمات حول كيفية إستعادة حسابك.",
     "enter_email_address": "ادخل عنوان البريد الإلكتروني",
     "password_reset_sent": "If the specified address corresponds to an existing user account, a password reset email was sent. Please note that only one email will be sent per minute.",

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\""
 }

public/language/ar/tags.json

@@ -3,5 +3,6 @@
     "tags": "الكلمات الدلالية",
     "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "أدخل الكلمات الدلالية...",
-    "no_tags": "لا يوجد كلمات دلالية بعد."
+    "no_tags": "لا يوجد كلمات دلالية بعد.",
+    "select_tags": "Select Tags"
 }

public/language/ar/topic.json

@@ -1,7 +1,5 @@
 {
     "topic": "موضوع",
-    "topic_id": "معرف الموضوع",
-    "topic_id_placeholder": "أدخل معرف الموضوع",
     "no_topics_found": "لا توجد مواضيع !",
     "no_posts_found": "لا  توجد مشاركات!",
     "post_is_deleted": "هذه المشاركة محذوفة!",
@@ -31,13 +29,25 @@
     "tools": "أدوات",
     "locked": "مقفل",
     "pinned": "مثبت",
+    "pinned-with-expiry": "Pinned until %1",
     "moved": "منقول",
+    "moved-from": "Moved from %1",
     "copy-ip": "Copy IP",
     "ban-ip": "Ban IP",
     "view-history": "Edit History",
+    "locked-by": "Locked by",
+    "unlocked-by": "Unlocked by",
+    "pinned-by": "Pinned by",
+    "unpinned-by": "Unpinned by",
+    "deleted-by": "Deleted by",
+    "restored-by": "Restored by",
+    "queued-by": "Post queued for approval →",
     "bookmark_instructions": "اضغط هنا للعودة لأخر مشاركة مقروءة في الموضوع",
-    "flag_title": "إشعار بمشاركة مخلة.",
-    "merged_message": "This topic has been merged into <a href=\"/topic/%1\">%2</a>",
+    "flag-post": "Flag this post",
+    "flag-user": "Flag this user",
+    "already-flagged": "Already Flagged",
+    "view-flag-report": "View Flag Report",
+    "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "هذه المشاركة محذوفة. فقط من لهم صلاحية الإشراف على ا لمشاركات يمكنهم معاينتها.",
     "following_topic.message": "ستستلم تنبيها عند كل مشاركة جديدة في هذا الموضوع.",
     "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
@@ -78,10 +88,17 @@
     "thread_tools.purge_confirm": "هل أنت متأكد أنك تريد تطهير هذا الموضوع؟",
     "thread_tools.merge_topics": "Merge Topics",
     "thread_tools.merge": "Merge",
-    "topic_move_success": "تم نقل هذا الموضوع إلى %1 بنجاح",
+    "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",
     "post_delete_confirm": "هل أنت متأكد أنك تريد حذف هذه المشاركة؟",
     "post_restore_confirm": "هل أنت متأكد أنك تريد استعادة هذه المشاركة؟",
     "post_purge_confirm": "هل أنت متأكد أنك تريد تطهير هذه المشاركة؟",
+    "pin-modal-expiry": "Expiration Date",
+    "pin-modal-help": "You can optionally set an expiration date for the pinned topic(s) here. Alternatively, you can leave this field blank to have the topic stay pinned until it is manually unpinned.",
     "load_categories": "تحميل الفئات",
     "confirm_move": "انقل",
     "confirm_fork": "فرع",
@@ -96,14 +113,21 @@
     "fork_topic": "فرع الموضوع",
     "fork_topic_instruction": "إضغط على المشاركات التي تريد تفريعها",
     "fork_no_pids": "لم تختر أي مشاركة",
+    "no-posts-selected": "No posts selected!",
+    "x-posts-selected": "%1 post(s) selected",
+    "x-posts-will-be-moved-to-y": "%1 post(s) will be moved to \"%2\"",
     "fork_pid_count": "1% مشاركة محددة",
     "fork_success": "تم إنشاء فرع للموضوع بنجاح! إضغط هنا لمعاينة الفرع.",
     "delete_posts_instruction": "Click the posts you want to delete/purge",
-    "merge_topics_instruction": "Click the topics you want to merge",
-    "move_posts_instruction": "Click the posts you want to move",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
+    "move_posts_instruction": "Click the posts you want to move then go to target topic and click move.",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "أدخل عنوان موضوعك هنا...",
-    "composer.handle_placeholder": "اﻹسم",
+    "composer.handle_placeholder": "Enter your name/handle here",
     "composer.discard": "نبذ التغييرات",
     "composer.submit": "حفظ",
     "composer.replying_to": "الرد على %1",
@@ -134,6 +158,13 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
+    "diffs.delete": "Delete this revision",
+    "diffs.deleted": "Revision deleted",
     "timeago_later": "%1 later",
-    "timeago_earlier": "%1 earlier"
+    "timeago_earlier": "%1 earlier",
+    "first-post": "First post",
+    "last-post": "Last post"
 }

public/language/ar/user.json

@@ -1,20 +1,27 @@
 {
     "banned": "محظور",
     "offline": "غير متصل",
-    "deleted": "Deleted",
+    "deleted": "محذوف",
     "username": "إسم المستخدم",
     "joindate": "تاريخ الإنضمام",
     "postcount": "عدد المشاركات",
     "email": "البريد الإلكتروني",
     "confirm_email": "تأكيد عنوان البريد الإلكتروني",
     "account_info": "معلومات الحساب",
+    "admin_actions_label": "Administrative Actions",
     "ban_account": "حظر الحساب",
     "ban_account_confirm": "هل تريد حقاً حظر هاذا العضو؟",
     "unban_account": "إزالة حظر الحساب",
     "delete_account": "حذف الحساب",
-    "delete_account_confirm": "Are you sure you want to delete your account? <br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your password to confirm that you wish to destroy this account.",
-    "delete_this_account_confirm": "هل انت متأكد من رغبتك بحذف هذا الحساب؟ <br /> <strong>هذا الإجراء لا رجعة فيه ولن تتمكن من استرداد أي بيانات</strong><br /><br />",
+    "delete_account_as_admin": "Delete <strong>Account</strong>",
+    "delete_content": "Delete Account <strong>Content</strong>",
+    "delete_all": "Delete <strong>Account</strong> and <strong>Content</strong>",
+    "delete_account_confirm": "Are you sure you want to anonymize your posts and delete your account?<br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your password to confirm that you wish to destroy this account.",
+    "delete_this_account_confirm": "Are you sure you want to delete this account while leaving its contents behind?<br /><strong>This action is irreversible, posts will be anonymized, and you will not be able to restore post associations with the deleted account</strong><br /><br />",
+    "delete_account_content_confirm": "Are you sure you want to delete this account's content (posts/topics/uploads)? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
+    "delete_all_confirm": "Are you sure you want to delete this account and all of its content (posts/topics/uploads)? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
     "account-deleted": "تم حذف الحساب",
+    "account-content-deleted": "Account content deleted",
     "fullname": "الاسم الكامل",
     "website": "الموقع الإلكتروني",
     "location": "الموقع",
@@ -104,12 +111,7 @@
     "posts_per_page": "الردود في كل صفحة",
     "max_items_per_page": "أقصى %1",
     "acp_language": "Admin Page Language",
-    "notification_sounds": "تشغيل صوت عند تلقي تنبيه",
-    "notifications_and_sounds": "التنبيهات والأصوات",
-    "incoming-message-sound": "صوت الرسالة الواردة",
-    "outgoing-message-sound": "صوت الرسائل الصادرة",
-    "notification-sound": "صوت التنبيهات",
-    "no-sound": "بدون صوت",
+    "notifications": "Notifications",
     "upvote-notif-freq": "معدل تكرار تنبيهات التصويت للأعلى",
     "upvote-notif-freq.all": "كل التصويتات للأعلى",
     "upvote-notif-freq.first": "First Per Post",
@@ -121,6 +123,7 @@
     "open_links_in_new_tab": "فتح الروابط الخارجية في نافدة جديدة",
     "enable_topic_searching": "تفعيل خاصية البحث داخل المواضيع",
     "topic_search_help": "إذا قمت بتفعيل ميزة البحث في-الموضوع،  سيتم تجاوز الخيار الافتراضي للمتصفح مما يؤدي للبحث بكامل الموضوع بدلا عن البحث في الجزء الظاهر في الشاشة.",
+    "update_url_with_post_index": "Update url with post index while browsing topics",
     "scroll_to_my_post": "بعد اضافة رد على المشاركة, قم بإظهار المشاركة",
     "follow_topics_you_reply_to": "متابعة المواضيع التي تقوم بالرد عليها",
     "follow_topics_you_create": "متابعة المواضيع التي تقوم بإنشائها",
@@ -132,7 +135,7 @@
     "homepage": "الصفحة الرئيسية",
     "homepage_description": "حدد صفحة لاستخدامها كصفحة رئيسية للمنتدى أو \"لا شيء\" لاستخدام الصفحة الرئيسية الافتراضية.",
     "custom_route": "مسار الصفحة الرئيسية المخصصة",
-    "custom_route_help": "أدخل اسم مسار هنا، بدون أي شرطة مائلة (على سبيل المثال \"حديثة\" أو \"شائعة\")",
+    "custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\" or \"category/2/general-discussion\")",
     "sso.title": "خدمات تسجيل الدخول الموحد",
     "sso.associated": "مرتبط مع",
     "sso.not-associated": "انقر هنا لربط مع",
@@ -144,6 +147,7 @@
     "info.ban-history": "سجل الحظر الأحدث",
     "info.no-ban-history": "هذا المستخدم لم يتم حظره مطلقا",
     "info.banned-until": "محظور حتى %1",
+    "info.banned-expiry": "Expiry",
     "info.banned-permanently": "محظور بشكل دائم",
     "info.banned-reason-label": "سبب",
     "info.banned-no-reason": "لم يتم إعطاء سبب.",
@@ -170,7 +174,10 @@
     "consent.right_to_erasure_description": "At any time, you are able to revoke your consent to data collection and/or processing by deleting your account. Your individual profile can be deleted, although your posted content will remain. If you wish to delete both your account <strong>and</strong> your content, please contact the administrative team for this website.",
     "consent.right_to_data_portability": "You have the Right to Data Portability",
     "consent.right_to_data_portability_description": "You may request from us a machine-readable export of any collected data about you and your account. You can do so by clicking the appropriate button below.",
-    "consent.export_profile": "Export Profile (.csv)",
+    "consent.export_profile": "Export Profile (.json)",
+    "consent.export-profile-success": "Exporting profile, you will get a notification when it is complete.",
     "consent.export_uploads": "Export Uploaded Content (.zip)",
-    "consent.export_posts": "Export Posts (.csv)"
+    "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.",
+    "consent.export_posts": "Export Posts (.csv)",
+    "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete."
 }

public/language/ar/users.json

@@ -11,6 +11,7 @@
     "online-only": "المتصلون فقط",
     "invite": "دعوة",
     "prompt-email": "Emails:",
+    "groups-to-join": "Groups to be joined when invite is accepted:",
     "invitation-email-sent": "تم إرسال دعوة بالبريد الإلكتروني إلى %1",
     "user_list": "قائمة اﻷعضاء",
     "recent_topics": "أحدث المواضيع",

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": "Елементи в кеша"
 }

public/language/bg/admin/advanced/events.json

@@ -2,6 +2,7 @@
 	"events": "Събития",
 	"no-events": "Няма събития",
 	"control-panel": "Контролен панел за събитията",
+	"delete-events": "Изтриване на събитията",
 	"filters": "Филтри",
 	"filters-apply": "Прилагане на филтрите",
 	"filter-type": "Вид събитие",

public/language/bg/admin/dashboard.json

@@ -0,0 +1,79 @@
+{
+	"forum-traffic": "Трафик на форума",
+	"page-views": "Преглеждания на страниците",
+	"unique-visitors": "Уникални посетители",
+	"new-users": "Нови потребители",
+	"posts": "Публикации",
+	"topics": "Теми",
+	"page-views-seven": "Последните 7 дни",
+	"page-views-thirty": "Последните 30 дни",
+	"page-views-last-day": "Последните 24 часа",
+	"page-views-custom": "Интервал по избор",
+	"page-views-custom-start": "Начална дата",
+	"page-views-custom-end": "Крайна дата",
+	"page-views-custom-help": "Въведете интервал от дати, за които искате да видите преглежданията на страниците. Ако не се появи календар за избор, можете да въведете датите във формат: <code>ГГГГ-ММ-ДД</code>",
+	"page-views-custom-error": "Моля, въведете правилен интервал от дати във формата: <code>ГГГГ-ММ-ДД</code>",
+
+	"stats.yesterday": "Вчера",
+	"stats.today": "Днес",
+	"stats.last-week": "Миналата седмица",
+	"stats.this-week": "Тази седмица",
+	"stats.last-month": "Миналия месец",
+	"stats.this-month": "Този месец",
+	"stats.all": "От началото",
+
+	"updates": "Обновления",
+	"running-version": "Вие използвате <strong>NodeBB версия <span id=\"version\">%1</span></strong>.",
+	"keep-updated": "Стремете се винаги да използвате най-новата версия на NodeBB, за да се възползвате от последните подобрения на сигурността и поправки на проблеми.",
+	"up-to-date": "<p>Вие използвате <strong>най-новата версия</strong> <i class=\"fa fa-check\"></i></p>",
+	"upgrade-available": "<p>Има нова версия (версия %1). Ако имате възможност, <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">обновете NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>Това е остаряла предварителна версия на NodeBB. Има нова версия (версия %1). Ако имате възможност, <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">обновете NodeBB</a>.</p>",
+	"prerelease-warning": "<p>Това е версия за <strong>предварителен преглед</strong> на NodeBB. Възможно е да има неочаквани неизправности. <i class=\"fa fa-exclamation-triangle\"></i></p>",
+	"running-in-development": "<span>Форумът работи в режим за разработчици, така че може да бъде уязвим. Моля, свържете се със системния си администратор.</span>",
+	"latest-lookup-failed": "<p>Не може да бъде извършена проверка за последната налична версия на NodeBB</p>",
+
+	"notices": "Забележки",
+	"restart-not-required": "Не се изисква рестартиране",
+	"restart-required": "Изисква се рестартиране",
+	"search-plugin-installed": "Добавката за търсене е инсталирана",
+	"search-plugin-not-installed": "Добавката за търсене не е инсталирана",
+	"search-plugin-tooltip": "Инсталирайте добавка за търсене от страницата с добавките, за да включите функционалността за търсене",
+
+	"control-panel": "Системен контрол",
+	"rebuild-and-restart": "Повторно изграждане и рестартиране",
+	"restart": "Рестартиране",
+	"restart-warning": "Повторното изграждане и рестартирането на NodeBB ще прекъснат всички връзки за няколко секунди.",
+	"restart-disabled": "Възможностите за повторно изграждане и рестартиране на NodeBB са изключени, тъй като изглежда, че NodeBB не се изпълнява чрез подходящия демон.",
+	"maintenance-mode": "Режим на профилактика",
+	"maintenance-mode-title": "Щракнете тук, за да зададете режим на профилактика на NodeBB",
+	"realtime-chart-updates": "Актуализации на таблиците в реално време",
+
+	"active-users": "Дейни потребители",
+	"active-users.users": "Потребители",
+	"active-users.guests": "Гости",
+	"active-users.total": "Общо",
+	"active-users.connections": "Връзки",
+
+	"anonymous-registered-users": "Анонимни към регистрирани потребители",
+	"anonymous": "Анонимни",
+	"registered": "Регистрирани",
+
+	"user-presence": "Присъствие на потребителите ",
+	"on-categories": "В списъка с категории",
+	"reading-posts": "Четящи публикации",
+	"browsing-topics": "Разглеждащи теми",
+	"recent": "Скорошни",
+	"unread": "Непрочетени",
+
+	"high-presence-topics": "Теми с най-голяма присъственост",
+
+	"graphs.page-views": "Преглеждания на страниците",
+	"graphs.page-views-registered": "Преглеждания на страниците от регистрирани потребители",
+	"graphs.page-views-guest": "Преглеждания на страниците от гости",
+	"graphs.page-views-bot": "Преглеждания на страниците от ботове",
+	"graphs.unique-visitors": "Уникални посетители",
+	"graphs.registered-users": "Регистрирани потребители",
+	"graphs.anonymous-users": "Анонимни потребители",
+	"last-restarted-by": "Последно рестартиране от",
+	"no-users-browsing": "Няма разглеждащи потребители"
+}

public/language/bg/admin/development/info.json

@@ -1,7 +1,9 @@
 {
-	"you-are-on": "Информация — Вие сте на <strong>%1:%2</strong>",
+	"you-are-on": "Вие сте на <strong>%1:%2</strong>",
+	"ip": "IP <strong>%1</strong>",
 	"nodes-responded": "%1 възела отговориха в рамките на %2мсек!",
 	"host": "сървър",
+	"primary": "основен / изпълнение на задачите",
 	"pid": "ид. на процеса",
 	"nodejs": "nodejs",
 	"online": "на линия",

public/language/bg/admin/extend/plugins.json

@@ -1,4 +1,5 @@
 {
+	"trending": "Популярни",
 	"installed": "Инсталирани",
 	"active": "Включени",
 	"inactive": "Изключени",

public/language/bg/admin/manage/categories.json

@@ -10,12 +10,16 @@
 	"custom-class": "Персонализиран клас",
 	"num-recent-replies": "Брой на скорошните отговори",
 	"ext-link": "Външна връзка",
+	"subcategories-per-page": "Брой подкатегории на страница",
 	"is-section": "Използване на тази категория като раздел",
+	"post-queue": "Опашка за публикации",
+	"tag-whitelist": "Списък от разрешени етикети",
 	"upload-image": "Качване на изображение",
 	"delete-image": "Премахване",
 	"category-image": "Изображение на категорията",
 	"parent-category": "Базова категория",
 	"optional-parent-category": "(Незадължително) Базова категория",
+	"top-level": "Най-горно ниво",
 	"parent-category-none": "(Няма)",
 	"copy-parent": "Копиране на базовата",
 	"copy-settings": "Копиране на настройките от",
@@ -26,6 +30,9 @@
 	"enable": "Включване",
 	"disable": "Изключване",
 	"edit": "Редактиране",
+	"analytics": "Анализи",
+	"view-category": "Преглед на категорията",
+	"set-order": "Запазване на реда",
 
 	"select-category": "Изберете категория",
 	"set-parent-category": "Задайте базова категория",
@@ -42,6 +49,8 @@
 	"privileges.no-users": "В тази категория няма правомощия за отделни потребители.",
 	"privileges.section-group": "Група",
 	"privileges.group-private": "Тази група е частна",
+  	"privileges.inheritance-exception": "Тази група не наследява правомощията от групата на регистрираните потребители",
+  	"privileges.banned-user-inheritance": "Блокираните потребители наследяват правомощията от групата на блокираните потребители",
 	"privileges.search-group": "Добавяне на група",
 	"privileges.copy-to-children": "Копиране в наследниците",
 	"privileges.copy-from-category": "Копиране от категория",
@@ -63,7 +72,6 @@
 	"alert.create-success": "Категорията е създадена успешно!",
 	"alert.none-active": "Нямате активни категории.",
 	"alert.create": "Създаване на категория",
-	"alert.confirm-moderate": "<strong>Наистина ли искате да дадете правомощието за модериране на тази потребителска група?</strong> Тази група е публична и всеки може свободно да се присъедини към нея.",
 	"alert.confirm-purge": "<p class=\"lead\">Наистина ли искате да изтриете категорията „%1“?</p><h5><strong class=\"text-danger\">Внимание!</strong> Всички теми и публикации в тази категория ще бъдат изтрити!</h5> <p class=\"help-block\">Изтриването на категорията ще премахне всички теми и публикации, и ще изтрие категорията от базата данни. Ако искате да премахнете категорията <em>временно</em>, можете просто да я „изключите“.</p>",
 	"alert.purge-success": "Категорията е изтрита!",
 	"alert.copy-success": "Настройките са копирани!",
@@ -75,7 +83,9 @@
 	"alert.user-search": "Потърсете потребител тук…",
 	"alert.find-group": "Търсене на група",
 	"alert.group-search": "Потърсете група тук…",
+	"alert.not-enough-whitelisted-tags": "Разрешените етикети са по-малко от минимума. Трябва да създадете още разрешени етикети!",
 	"collapse-all": "Свиване на всички",
 	"expand-all": "Разгъване на всички",
-	"disable-on-create": "Изключване при създаване"
+	"disable-on-create": "Изключване при създаване",
+	"no-matches": "Няма съвпадения"
 }

public/language/bg/admin/manage/digest.json

@@ -18,4 +18,4 @@
 	"manual-run": "Ръчно разпращане на резюмето:",
 
 	"no-delivery-data": "Няма данни за доставката"
-}
+}