rename parseUrl to urlParse, closer to core url module, url.parse

pass isBrowser as arg to factory fn
isRelativeUrl back and switched to use isProtocolAbsoluteUrl
2025-12-16 21:40:23 +01:00 · 2019-12-21 13:45:25 +02:00 · 2019-12-21 12:08:04 +02:00 · 2019-12-18 16:08:04 +02:00 · 2019-12-18 15:46:35 +02:00 · 2019-12-18 09:50:31 +00:00
3213 changed files with 76500 additions and 48955 deletions
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -1,8 +1,22 @@
 # Save as .codeclimate.yml (note leading .) in project root directory
+version: "2"
 languages:
-  Ruby: true
+  Ruby: false
  JavaScript: true
-  PHP: true
+  PHP: false
+checks:
+  file-lines:
+    config:
+      threshold: 500
+  method-lines:
+    config:
+      threshold: 50
+  method-complexity:
+    config:
+      threshold: 10
+  similar-code:
+    config:
+      threshold: 65
 exclude_paths:
 - "public/vendor/*"
 - "test/*"
--- a/.eslintignore
+++ b/.eslintignore
@@ -18,3 +18,4 @@ logs/
 /build
 .eslintrc
 test/files
+*.min.js
--- a/.eslintrc
+++ b/.eslintrc
@@ -14,9 +14,10 @@
 			"exports": "always-multiline",
 			"functions": "never"
 		}],
+		"no-return-await": "off",
+		"no-constant-condition": "off",
 		"no-empty": ["error", { "allowEmptyCatch": true }],
 		"no-underscore-dangle": "off",
-		"newline-per-chained-call": "off",
 		"no-console": "off",
 		"no-mixed-operators": ["error", { "allowSamePrecedence": true }],
 		"strict": ["error", "global"],
@@ -36,6 +37,13 @@
 		"no-restricted-globals": "off",
 		"function-paren-newline": "off",
 		"import/no-unresolved": "error",
+		"quotes": ["error", "single", {
+			"avoidEscape": true,
+			"allowTemplateLiterals": true
+		}],
+		"no-else-return": [ "error", { "allowElseIf": true } ],
+		"operator-linebreak": [ "error", "after" ],
+		"arrow-parens": ["error", "as-needed", { "requireForBlockBody": true }],

 		// ES6
 		"prefer-rest-params": "off",
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -10,9 +10,11 @@
 - **NodeBB version:** 
 - **NodeBB git hash:** 
 <!-- (to find your git hash, execute `git rev-parse HEAD` from the main NodeBB directory) -->
- **Database type:** mongo or redis
+- **Installed NodeBB Plugins:** 
+<!-- (to find installed plugins run ./nodebb plugins) -->
+- **Database type:** mongo, redis, or postgres
 - **Database version:** 
-<!-- `mongod --version` or `redis-server --version` -->
+<!-- `mongod --version`, `redis-server --version`, or `postgres --version` -->
 - **Exact steps to cause this issue:**
 <!--
 	1. First I did this...
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ pidfile

 /public/sounds
 /public/uploads
+/test/uploads

 # compiled files
 /public/stylesheet.css
@@ -60,7 +61,6 @@ tx.exe
 coverage
 .nyc_output

-build
 *.log
 test/files/normalise.jpg.png
 test/files/normalise-resized.jpg
--- a/.jshintrc
+++ b/.jshintrc
@@ -4,6 +4,8 @@

    "maxerr" : 50, // {int} Maximum error before stopping

+    "esversion": 6,
+
    // Enforcing
    "bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.)
    "camelcase" : false, // true: Identifiers must be in camelCase
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,33 +1,46 @@
 services:
+  - mongodb
  - redis-server
+  - postgresql
 before_install:
-  - "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6"
-  - "echo 'deb [ arch=amd64 ] http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.4 multiverse' | sudo tee /etc/apt/sources.list.d/mongodb-org-3.4.list"
-  - "sudo apt-get update"
-  - "sudo apt-get install -y mongodb-org"
-  - "sudo service mongod start"
+  - 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
-  - cp install/package.json package.json
-  - npm install
-  - 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,\\\"redis:host\\\":\\\"127.0.0.1\\\",\\\"redis:port\\\":6379,\\\"redis:password\\\":\\\"\\\",\\\"redis:database\\\":0,\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"abcdef\\\",\\\"admin:password:confirm\\\":\\\"abcdef\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":27017,\\\"database\\\":0}\"; fi"
-  - sh -c "if [ '$DB' = 'redis' ]; then node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567\\\",\\\"secret\\\":\\\"abcdef\\\",\\\"database\\\":\\\"redis\\\",\\\"mongo:host\\\":\\\"127.0.0.1\\\",\\\"mongo:port\\\":27017,\\\"mongo:username\\\":\\\"\\\",\\\"mongo:password\\\":\\\"\\\",\\\"mongo:database\\\":0,\\\"redis:host\\\":\\\"127.0.0.1\\\",\\\"redis:port\\\":6379,\\\"redis:password\\\":\\\"\\\",\\\"redis:database\\\":0,\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"abcdef\\\",\\\"admin:password:confirm\\\":\\\"abcdef\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":6379,\\\"database\\\":0}\"; fi"
+  - "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:
-  - CXX=g++-4.8 DB=mongodb
-  - CXX=g++-4.8 DB=redis
+  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
+      - ubuntu-toolchain-r-test
+      - mongodb-4.0-xenial
    packages:
-    - g++-4.8
+      - g++-4.8
+      - mongodb-org-server
 node_js:
-  - "8"
-  - "7"
-  - "6"
+  - "12"
+  - "10"
 branches:
  only:
    - master
--- a/.tx/config
+++ b/.tx/config
@@ -28,6 +28,7 @@ trans.it = public/language/it/category.json
 trans.ja = public/language/ja/category.json
 trans.ko = public/language/ko/category.json
 trans.lt = public/language/lt/category.json
+trans.lv = public/language/lv/category.json
 trans.ms = public/language/ms/category.json
 trans.nb = public/language/nb/category.json
 trans.nl = public/language/nl/category.json
@@ -77,6 +78,7 @@ trans.it = public/language/it/login.json
 trans.ja = public/language/ja/login.json
 trans.ko = public/language/ko/login.json
 trans.lt = public/language/lt/login.json
+trans.lv = public/language/lv/login.json
 trans.ms = public/language/ms/login.json
 trans.nb = public/language/nb/login.json
 trans.nl = public/language/nl/login.json
@@ -126,6 +128,7 @@ trans.it = public/language/it/recent.json
 trans.ja = public/language/ja/recent.json
 trans.ko = public/language/ko/recent.json
 trans.lt = public/language/lt/recent.json
+trans.lv = public/language/lv/recent.json
 trans.ms = public/language/ms/recent.json
 trans.nb = public/language/nb/recent.json
 trans.nl = public/language/nl/recent.json
@@ -175,6 +178,7 @@ trans.it = public/language/it/unread.json
 trans.ja = public/language/ja/unread.json
 trans.ko = public/language/ko/unread.json
 trans.lt = public/language/lt/unread.json
+trans.lv = public/language/lv/unread.json
 trans.ms = public/language/ms/unread.json
 trans.nb = public/language/nb/unread.json
 trans.nl = public/language/nl/unread.json
@@ -224,6 +228,7 @@ trans.it = public/language/it/modules.json
 trans.ja = public/language/ja/modules.json
 trans.ko = public/language/ko/modules.json
 trans.lt = public/language/lt/modules.json
+trans.lv = public/language/lv/modules.json
 trans.ms = public/language/ms/modules.json
 trans.nb = public/language/nb/modules.json
 trans.nl = public/language/nl/modules.json
@@ -273,6 +278,7 @@ trans.it = public/language/it/register.json
 trans.ja = public/language/ja/register.json
 trans.ko = public/language/ko/register.json
 trans.lt = public/language/lt/register.json
+trans.lv = public/language/lv/register.json
 trans.ms = public/language/ms/register.json
 trans.nb = public/language/nb/register.json
 trans.nl = public/language/nl/register.json
@@ -322,6 +328,7 @@ trans.it = public/language/it/user.json
 trans.ja = public/language/ja/user.json
 trans.ko = public/language/ko/user.json
 trans.lt = public/language/lt/user.json
+trans.lv = public/language/lv/user.json
 trans.ms = public/language/ms/user.json
 trans.nb = public/language/nb/user.json
 trans.nl = public/language/nl/user.json
@@ -371,6 +378,7 @@ trans.it = public/language/it/global.json
 trans.ja = public/language/ja/global.json
 trans.ko = public/language/ko/global.json
 trans.lt = public/language/lt/global.json
+trans.lv = public/language/lv/global.json
 trans.ms = public/language/ms/global.json
 trans.nb = public/language/nb/global.json
 trans.nl = public/language/nl/global.json
@@ -420,6 +428,7 @@ trans.it = public/language/it/notifications.json
 trans.ja = public/language/ja/notifications.json
 trans.ko = public/language/ko/notifications.json
 trans.lt = public/language/lt/notifications.json
+trans.lv = public/language/lv/notifications.json
 trans.ms = public/language/ms/notifications.json
 trans.nb = public/language/nb/notifications.json
 trans.nl = public/language/nl/notifications.json
@@ -469,6 +478,7 @@ trans.it = public/language/it/reset_password.json
 trans.ja = public/language/ja/reset_password.json
 trans.ko = public/language/ko/reset_password.json
 trans.lt = public/language/lt/reset_password.json
+trans.lv = public/language/lv/reset_password.json
 trans.ms = public/language/ms/reset_password.json
 trans.nb = public/language/nb/reset_password.json
 trans.nl = public/language/nl/reset_password.json
@@ -518,6 +528,7 @@ trans.it = public/language/it/users.json
 trans.ja = public/language/ja/users.json
 trans.ko = public/language/ko/users.json
 trans.lt = public/language/lt/users.json
+trans.lv = public/language/lv/users.json
 trans.ms = public/language/ms/users.json
 trans.nb = public/language/nb/users.json
 trans.nl = public/language/nl/users.json
@@ -567,6 +578,7 @@ trans.it = public/language/it/language.json
 trans.ja = public/language/ja/language.json
 trans.ko = public/language/ko/language.json
 trans.lt = public/language/lt/language.json
+trans.lv = public/language/lv/language.json
 trans.ms = public/language/ms/language.json
 trans.nb = public/language/nb/language.json
 trans.nl = public/language/nl/language.json
@@ -616,6 +628,7 @@ trans.it = public/language/it/pages.json
 trans.ja = public/language/ja/pages.json
 trans.ko = public/language/ko/pages.json
 trans.lt = public/language/lt/pages.json
+trans.lv = public/language/lv/pages.json
 trans.ms = public/language/ms/pages.json
 trans.nb = public/language/nb/pages.json
 trans.nl = public/language/nl/pages.json
@@ -665,6 +678,7 @@ trans.it = public/language/it/topic.json
 trans.ja = public/language/ja/topic.json
 trans.ko = public/language/ko/topic.json
 trans.lt = public/language/lt/topic.json
+trans.lv = public/language/lv/topic.json
 trans.ms = public/language/ms/topic.json
 trans.nb = public/language/nb/topic.json
 trans.nl = public/language/nl/topic.json
@@ -714,6 +728,7 @@ trans.it = public/language/it/success.json
 trans.ja = public/language/ja/success.json
 trans.ko = public/language/ko/success.json
 trans.lt = public/language/lt/success.json
+trans.lv = public/language/lv/success.json
 trans.ms = public/language/ms/success.json
 trans.nb = public/language/nb/success.json
 trans.nl = public/language/nl/success.json
@@ -763,6 +778,7 @@ trans.it = public/language/it/error.json
 trans.ja = public/language/ja/error.json
 trans.ko = public/language/ko/error.json
 trans.lt = public/language/lt/error.json
+trans.lv = public/language/lv/error.json
 trans.ms = public/language/ms/error.json
 trans.nb = public/language/nb/error.json
 trans.nl = public/language/nl/error.json
@@ -812,6 +828,7 @@ trans.it = public/language/it/flags.json
 trans.ja = public/language/ja/flags.json
 trans.ko = public/language/ko/flags.json
 trans.lt = public/language/lt/flags.json
+trans.lv = public/language/lv/flags.json
 trans.ms = public/language/ms/flags.json
 trans.nb = public/language/nb/flags.json
 trans.nl = public/language/nl/flags.json
@@ -860,6 +877,7 @@ trans.it = public/language/it/tags.json
 trans.ja = public/language/ja/tags.json
 trans.ko = public/language/ko/tags.json
 trans.lt = public/language/lt/tags.json
+trans.lv = public/language/lv/tags.json
 trans.ms = public/language/ms/tags.json
 trans.nb = public/language/nb/tags.json
 trans.nl = public/language/nl/tags.json
@@ -909,6 +927,7 @@ trans.it = public/language/it/email.json
 trans.ja = public/language/ja/email.json
 trans.ko = public/language/ko/email.json
 trans.lt = public/language/lt/email.json
+trans.lv = public/language/lv/email.json
 trans.ms = public/language/ms/email.json
 trans.nb = public/language/nb/email.json
 trans.nl = public/language/nl/email.json
@@ -958,6 +977,7 @@ trans.it = public/language/it/search.json
 trans.ja = public/language/ja/search.json
 trans.ko = public/language/ko/search.json
 trans.lt = public/language/lt/search.json
+trans.lv = public/language/lv/search.json
 trans.ms = public/language/ms/search.json
 trans.nb = public/language/nb/search.json
 trans.nl = public/language/nl/search.json
@@ -1007,6 +1027,7 @@ trans.it = public/language/it/groups.json
 trans.ja = public/language/ja/groups.json
 trans.ko = public/language/ko/groups.json
 trans.lt = public/language/lt/groups.json
+trans.lv = public/language/lv/groups.json
 trans.ms = public/language/ms/groups.json
 trans.nb = public/language/nb/groups.json
 trans.nl = public/language/nl/groups.json
@@ -1056,6 +1077,7 @@ trans.it = public/language/it/uploads.json
 trans.ja = public/language/ja/uploads.json
 trans.ko = public/language/ko/uploads.json
 trans.lt = public/language/lt/uploads.json
+trans.lv = public/language/lv/uploads.json
 trans.ms = public/language/ms/uploads.json
 trans.nb = public/language/nb/uploads.json
 trans.nl = public/language/nl/uploads.json
@@ -1105,6 +1127,7 @@ trans.it = public/language/it/admin/admin.json
 trans.ja = public/language/ja/admin/admin.json
 trans.ko = public/language/ko/admin/admin.json
 trans.lt = public/language/lt/admin/admin.json
+trans.lv = public/language/lv/admin/admin.json
 trans.ms = public/language/ms/admin/admin.json
 trans.nb = public/language/nb/admin/admin.json
 trans.nl = public/language/nl/admin/admin.json
@@ -1154,6 +1177,7 @@ trans.it = public/language/it/admin/menu.json
 trans.ja = public/language/ja/admin/menu.json
 trans.ko = public/language/ko/admin/menu.json
 trans.lt = public/language/lt/admin/menu.json
+trans.lv = public/language/lv/admin/menu.json
 trans.ms = public/language/ms/admin/menu.json
 trans.nb = public/language/nb/admin/menu.json
 trans.nl = public/language/nl/admin/menu.json
@@ -1203,6 +1227,7 @@ trans.it = public/language/it/admin/advanced/cache.json
 trans.ja = public/language/ja/admin/advanced/cache.json
 trans.ko = public/language/ko/admin/advanced/cache.json
 trans.lt = public/language/lt/admin/advanced/cache.json
+trans.lv = public/language/lv/admin/advanced/cache.json
 trans.ms = public/language/ms/admin/advanced/cache.json
 trans.nb = public/language/nb/admin/advanced/cache.json
 trans.nl = public/language/nl/admin/advanced/cache.json
@@ -1252,6 +1277,7 @@ trans.it = public/language/it/admin/advanced/database.json
 trans.ja = public/language/ja/admin/advanced/database.json
 trans.ko = public/language/ko/admin/advanced/database.json
 trans.lt = public/language/lt/admin/advanced/database.json
+trans.lv = public/language/lv/admin/advanced/database.json
 trans.ms = public/language/ms/admin/advanced/database.json
 trans.nb = public/language/nb/admin/advanced/database.json
 trans.nl = public/language/nl/admin/advanced/database.json
@@ -1301,6 +1327,7 @@ trans.it = public/language/it/admin/advanced/errors.json
 trans.ja = public/language/ja/admin/advanced/errors.json
 trans.ko = public/language/ko/admin/advanced/errors.json
 trans.lt = public/language/lt/admin/advanced/errors.json
+trans.lv = public/language/lv/admin/advanced/errors.json
 trans.ms = public/language/ms/admin/advanced/errors.json
 trans.nb = public/language/nb/admin/advanced/errors.json
 trans.nl = public/language/nl/admin/advanced/errors.json
@@ -1350,6 +1377,7 @@ trans.it = public/language/it/admin/advanced/events.json
 trans.ja = public/language/ja/admin/advanced/events.json
 trans.ko = public/language/ko/admin/advanced/events.json
 trans.lt = public/language/lt/admin/advanced/events.json
+trans.lv = public/language/lv/admin/advanced/events.json
 trans.ms = public/language/ms/admin/advanced/events.json
 trans.nb = public/language/nb/admin/advanced/events.json
 trans.nl = public/language/nl/admin/advanced/events.json
@@ -1399,6 +1427,7 @@ trans.it = public/language/it/admin/advanced/logs.json
 trans.ja = public/language/ja/admin/advanced/logs.json
 trans.ko = public/language/ko/admin/advanced/logs.json
 trans.lt = public/language/lt/admin/advanced/logs.json
+trans.lv = public/language/lv/admin/advanced/logs.json
 trans.ms = public/language/ms/admin/advanced/logs.json
 trans.nb = public/language/nb/admin/advanced/logs.json
 trans.nl = public/language/nl/admin/advanced/logs.json
@@ -1448,6 +1477,7 @@ trans.it = public/language/it/admin/appearance/customise.json
 trans.ja = public/language/ja/admin/appearance/customise.json
 trans.ko = public/language/ko/admin/appearance/customise.json
 trans.lt = public/language/lt/admin/appearance/customise.json
+trans.lv = public/language/lv/admin/appearance/customise.json
 trans.ms = public/language/ms/admin/appearance/customise.json
 trans.nb = public/language/nb/admin/appearance/customise.json
 trans.nl = public/language/nl/admin/appearance/customise.json
@@ -1497,6 +1527,7 @@ trans.it = public/language/it/admin/appearance/skins.json
 trans.ja = public/language/ja/admin/appearance/skins.json
 trans.ko = public/language/ko/admin/appearance/skins.json
 trans.lt = public/language/lt/admin/appearance/skins.json
+trans.lv = public/language/lv/admin/appearance/skins.json
 trans.ms = public/language/ms/admin/appearance/skins.json
 trans.nb = public/language/nb/admin/appearance/skins.json
 trans.nl = public/language/nl/admin/appearance/skins.json
@@ -1546,6 +1577,7 @@ trans.it = public/language/it/admin/appearance/themes.json
 trans.ja = public/language/ja/admin/appearance/themes.json
 trans.ko = public/language/ko/admin/appearance/themes.json
 trans.lt = public/language/lt/admin/appearance/themes.json
+trans.lv = public/language/lv/admin/appearance/themes.json
 trans.ms = public/language/ms/admin/appearance/themes.json
 trans.nb = public/language/nb/admin/appearance/themes.json
 trans.nl = public/language/nl/admin/appearance/themes.json
@@ -1595,6 +1627,7 @@ trans.it = public/language/it/admin/development/info.json
 trans.ja = public/language/ja/admin/development/info.json
 trans.ko = public/language/ko/admin/development/info.json
 trans.lt = public/language/lt/admin/development/info.json
+trans.lv = public/language/lv/admin/development/info.json
 trans.ms = public/language/ms/admin/development/info.json
 trans.nb = public/language/nb/admin/development/info.json
 trans.nl = public/language/nl/admin/development/info.json
@@ -1644,6 +1677,7 @@ trans.it = public/language/it/admin/development/logger.json
 trans.ja = public/language/ja/admin/development/logger.json
 trans.ko = public/language/ko/admin/development/logger.json
 trans.lt = public/language/lt/admin/development/logger.json
+trans.lv = public/language/lv/admin/development/logger.json
 trans.ms = public/language/ms/admin/development/logger.json
 trans.nb = public/language/nb/admin/development/logger.json
 trans.nl = public/language/nl/admin/development/logger.json
@@ -1693,6 +1727,7 @@ trans.it = public/language/it/admin/extend/plugins.json
 trans.ja = public/language/ja/admin/extend/plugins.json
 trans.ko = public/language/ko/admin/extend/plugins.json
 trans.lt = public/language/lt/admin/extend/plugins.json
+trans.lv = public/language/lv/admin/extend/plugins.json
 trans.ms = public/language/ms/admin/extend/plugins.json
 trans.nb = public/language/nb/admin/extend/plugins.json
 trans.nl = public/language/nl/admin/extend/plugins.json
@@ -1742,6 +1777,7 @@ trans.it = public/language/it/admin/extend/rewards.json
 trans.ja = public/language/ja/admin/extend/rewards.json
 trans.ko = public/language/ko/admin/extend/rewards.json
 trans.lt = public/language/lt/admin/extend/rewards.json
+trans.lv = public/language/lv/admin/extend/rewards.json
 trans.ms = public/language/ms/admin/extend/rewards.json
 trans.nb = public/language/nb/admin/extend/rewards.json
 trans.nl = public/language/nl/admin/extend/rewards.json
@@ -1791,6 +1827,7 @@ trans.it = public/language/it/admin/extend/widgets.json
 trans.ja = public/language/ja/admin/extend/widgets.json
 trans.ko = public/language/ko/admin/extend/widgets.json
 trans.lt = public/language/lt/admin/extend/widgets.json
+trans.lv = public/language/lv/admin/extend/widgets.json
 trans.ms = public/language/ms/admin/extend/widgets.json
 trans.nb = public/language/nb/admin/extend/widgets.json
 trans.nl = public/language/nl/admin/extend/widgets.json
@@ -1840,6 +1877,7 @@ 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
@@ -1889,6 +1927,7 @@ 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
@@ -1938,6 +1977,7 @@ 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
@@ -1987,6 +2027,7 @@ 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
@@ -2036,6 +2077,7 @@ 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
@@ -2085,6 +2127,7 @@ 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
@@ -2107,6 +2150,56 @@ trans.zh_CN = public/language/zh-CN/admin/general/sounds.json
 trans.zh_TW = public/language/zh-TW/admin/general/sounds.json
 type = KEYVALUEJSON

+[nodebb.admin-manage-admins-mods]
+file_filter = public/language/<lang>/admin/manage/admins-mods.json
+source_file = public/language/en-GB/admin/manage/admins-mods.json
+source_lang = en_GB
+trans.ar = public/language/ar/admin/manage/admins-mods.json
+trans.bg = public/language/bg/admin/manage/admins-mods.json
+trans.bn = public/language/bn/admin/manage/admins-mods.json
+trans.cs = public/language/cs/admin/manage/admins-mods.json
+trans.da = public/language/da/admin/manage/admins-mods.json
+trans.de = public/language/de/admin/manage/admins-mods.json
+trans.el = public/language/el/admin/manage/admins-mods.json
+trans.en@pirate = public/language/en-x-pirate/admin/manage/admins-mods.json
+trans.en_US = public/language/en-US/admin/manage/admins-mods.json
+trans.es = public/language/es/admin/manage/admins-mods.json
+trans.et = public/language/et/admin/manage/admins-mods.json
+trans.fa_IR = public/language/fa-IR/admin/manage/admins-mods.json
+trans.fi = public/language/fi/admin/manage/admins-mods.json
+trans.fr = public/language/fr/admin/manage/admins-mods.json
+trans.gl = public/language/gl/admin/manage/admins-mods.json
+trans.he = public/language/he/admin/manage/admins-mods.json
+trans.hr = public/language/hr/admin/manage/admins-mods.json
+trans.hu = public/language/hu/admin/manage/admins-mods.json
+trans.id = public/language/id/admin/manage/admins-mods.json
+trans.it = public/language/it/admin/manage/admins-mods.json
+trans.ja = public/language/ja/admin/manage/admins-mods.json
+trans.ko = public/language/ko/admin/manage/admins-mods.json
+trans.lt = public/language/lt/admin/manage/admins-mods.json
+trans.lv = public/language/lv/admin/manage/admins-mods.json
+trans.ms = public/language/ms/admin/manage/admins-mods.json
+trans.nb = public/language/nb/admin/manage/admins-mods.json
+trans.nl = public/language/nl/admin/manage/admins-mods.json
+trans.pl = public/language/pl/admin/manage/admins-mods.json
+trans.pt_BR = public/language/pt-BR/admin/manage/admins-mods.json
+trans.pt_PT = public/language/pt-PT/admin/manage/admins-mods.json
+trans.ro = public/language/ro/admin/manage/admins-mods.json
+trans.ru = public/language/ru/admin/manage/admins-mods.json
+trans.rw = public/language/rw/admin/manage/admins-mods.json
+trans.sc = public/language/sc/admin/manage/admins-mods.json
+trans.sk = public/language/sk/admin/manage/admins-mods.json
+trans.sl = public/language/sl/admin/manage/admins-mods.json
+trans.sr = public/language/sr/admin/manage/admins-mods.json
+trans.sv = public/language/sv/admin/manage/admins-mods.json
+trans.th = public/language/th/admin/manage/admins-mods.json
+trans.tr = public/language/tr/admin/manage/admins-mods.json
+trans.uk = public/language/uk/admin/manage/admins-mods.json
+trans.vi = public/language/vi/admin/manage/admins-mods.json
+trans.zh_CN = public/language/zh-CN/admin/manage/admins-mods.json
+trans.zh_TW = public/language/zh-TW/admin/manage/admins-mods.json
+type = KEYVALUEJSON
+
 [nodebb.admin-manage-categories]
 file_filter = public/language/<lang>/admin/manage/categories.json
 source_file = public/language/en-GB/admin/manage/categories.json
@@ -2134,6 +2227,7 @@ trans.it = public/language/it/admin/manage/categories.json
 trans.ja = public/language/ja/admin/manage/categories.json
 trans.ko = public/language/ko/admin/manage/categories.json
 trans.lt = public/language/lt/admin/manage/categories.json
+trans.lv = public/language/lv/admin/manage/categories.json
 trans.ms = public/language/ms/admin/manage/categories.json
 trans.nb = public/language/nb/admin/manage/categories.json
 trans.nl = public/language/nl/admin/manage/categories.json
@@ -2183,6 +2277,7 @@ trans.it = public/language/it/admin/manage/groups.json
 trans.ja = public/language/ja/admin/manage/groups.json
 trans.ko = public/language/ko/admin/manage/groups.json
 trans.lt = public/language/lt/admin/manage/groups.json
+trans.lv = public/language/lv/admin/manage/groups.json
 trans.ms = public/language/ms/admin/manage/groups.json
 trans.nb = public/language/nb/admin/manage/groups.json
 trans.nl = public/language/nl/admin/manage/groups.json
@@ -2232,6 +2327,7 @@ 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
@@ -2254,6 +2350,56 @@ 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
+source_lang = en_GB
+trans.ar = public/language/ar/admin/manage/privileges.json
+trans.bg = public/language/bg/admin/manage/privileges.json
+trans.bn = public/language/bn/admin/manage/privileges.json
+trans.cs = public/language/cs/admin/manage/privileges.json
+trans.da = public/language/da/admin/manage/privileges.json
+trans.de = public/language/de/admin/manage/privileges.json
+trans.el = public/language/el/admin/manage/privileges.json
+trans.en@pirate = public/language/en-x-pirate/admin/manage/privileges.json
+trans.en_US = public/language/en-US/admin/manage/privileges.json
+trans.es = public/language/es/admin/manage/privileges.json
+trans.et = public/language/et/admin/manage/privileges.json
+trans.fa_IR = public/language/fa-IR/admin/manage/privileges.json
+trans.fi = public/language/fi/admin/manage/privileges.json
+trans.fr = public/language/fr/admin/manage/privileges.json
+trans.gl = public/language/gl/admin/manage/privileges.json
+trans.he = public/language/he/admin/manage/privileges.json
+trans.hr = public/language/hr/admin/manage/privileges.json
+trans.hu = public/language/hu/admin/manage/privileges.json
+trans.id = public/language/id/admin/manage/privileges.json
+trans.it = public/language/it/admin/manage/privileges.json
+trans.ja = public/language/ja/admin/manage/privileges.json
+trans.ko = public/language/ko/admin/manage/privileges.json
+trans.lt = public/language/lt/admin/manage/privileges.json
+trans.lv = public/language/lv/admin/manage/privileges.json
+trans.ms = public/language/ms/admin/manage/privileges.json
+trans.nb = public/language/nb/admin/manage/privileges.json
+trans.nl = public/language/nl/admin/manage/privileges.json
+trans.pl = public/language/pl/admin/manage/privileges.json
+trans.pt_BR = public/language/pt-BR/admin/manage/privileges.json
+trans.pt_PT = public/language/pt-PT/admin/manage/privileges.json
+trans.ro = public/language/ro/admin/manage/privileges.json
+trans.ru = public/language/ru/admin/manage/privileges.json
+trans.rw = public/language/rw/admin/manage/privileges.json
+trans.sc = public/language/sc/admin/manage/privileges.json
+trans.sk = public/language/sk/admin/manage/privileges.json
+trans.sl = public/language/sl/admin/manage/privileges.json
+trans.sr = public/language/sr/admin/manage/privileges.json
+trans.sv = public/language/sv/admin/manage/privileges.json
+trans.th = public/language/th/admin/manage/privileges.json
+trans.tr = public/language/tr/admin/manage/privileges.json
+trans.uk = public/language/uk/admin/manage/privileges.json
+trans.vi = public/language/vi/admin/manage/privileges.json
+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
@@ -2281,6 +2427,7 @@ 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
@@ -2330,6 +2477,7 @@ trans.it = public/language/it/admin/manage/registration.json
 trans.ja = public/language/ja/admin/manage/registration.json
 trans.ko = public/language/ko/admin/manage/registration.json
 trans.lt = public/language/lt/admin/manage/registration.json
+trans.lv = public/language/lv/admin/manage/registration.json
 trans.ms = public/language/ms/admin/manage/registration.json
 trans.nb = public/language/nb/admin/manage/registration.json
 trans.nl = public/language/nl/admin/manage/registration.json
@@ -2379,6 +2527,7 @@ trans.it = public/language/it/admin/manage/tags.json
 trans.ja = public/language/ja/admin/manage/tags.json
 trans.ko = public/language/ko/admin/manage/tags.json
 trans.lt = public/language/lt/admin/manage/tags.json
+trans.lv = public/language/lv/admin/manage/tags.json
 trans.ms = public/language/ms/admin/manage/tags.json
 trans.nb = public/language/nb/admin/manage/tags.json
 trans.nl = public/language/nl/admin/manage/tags.json
@@ -2401,6 +2550,56 @@ trans.zh_CN = public/language/zh-CN/admin/manage/tags.json
 trans.zh_TW = public/language/zh-TW/admin/manage/tags.json
 type = KEYVALUEJSON

+[nodebb.admin-manage-uploads]
+file_filter = public/language/<lang>/admin/manage/uploads.json
+source_file = public/language/en-GB/admin/manage/uploads.json
+source_lang = en_GB
+trans.ar = public/language/ar/admin/manage/uploads.json
+trans.bg = public/language/bg/admin/manage/uploads.json
+trans.bn = public/language/bn/admin/manage/uploads.json
+trans.cs = public/language/cs/admin/manage/uploads.json
+trans.da = public/language/da/admin/manage/uploads.json
+trans.de = public/language/de/admin/manage/uploads.json
+trans.el = public/language/el/admin/manage/uploads.json
+trans.en@pirate = public/language/en-x-pirate/admin/manage/uploads.json
+trans.en_US = public/language/en-US/admin/manage/uploads.json
+trans.es = public/language/es/admin/manage/uploads.json
+trans.et = public/language/et/admin/manage/uploads.json
+trans.fa_IR = public/language/fa-IR/admin/manage/uploads.json
+trans.fi = public/language/fi/admin/manage/uploads.json
+trans.fr = public/language/fr/admin/manage/uploads.json
+trans.gl = public/language/gl/admin/manage/uploads.json
+trans.he = public/language/he/admin/manage/uploads.json
+trans.hr = public/language/hr/admin/manage/uploads.json
+trans.hu = public/language/hu/admin/manage/uploads.json
+trans.id = public/language/id/admin/manage/uploads.json
+trans.it = public/language/it/admin/manage/uploads.json
+trans.ja = public/language/ja/admin/manage/uploads.json
+trans.ko = public/language/ko/admin/manage/uploads.json
+trans.lt = public/language/lt/admin/manage/uploads.json
+trans.lv = public/language/lv/admin/manage/uploads.json
+trans.ms = public/language/ms/admin/manage/uploads.json
+trans.nb = public/language/nb/admin/manage/uploads.json
+trans.nl = public/language/nl/admin/manage/uploads.json
+trans.pl = public/language/pl/admin/manage/uploads.json
+trans.pt_BR = public/language/pt-BR/admin/manage/uploads.json
+trans.pt_PT = public/language/pt-PT/admin/manage/uploads.json
+trans.ro = public/language/ro/admin/manage/uploads.json
+trans.ru = public/language/ru/admin/manage/uploads.json
+trans.rw = public/language/rw/admin/manage/uploads.json
+trans.sc = public/language/sc/admin/manage/uploads.json
+trans.sk = public/language/sk/admin/manage/uploads.json
+trans.sl = public/language/sl/admin/manage/uploads.json
+trans.sr = public/language/sr/admin/manage/uploads.json
+trans.sv = public/language/sv/admin/manage/uploads.json
+trans.th = public/language/th/admin/manage/uploads.json
+trans.tr = public/language/tr/admin/manage/uploads.json
+trans.uk = public/language/uk/admin/manage/uploads.json
+trans.vi = public/language/vi/admin/manage/uploads.json
+trans.zh_CN = public/language/zh-CN/admin/manage/uploads.json
+trans.zh_TW = public/language/zh-TW/admin/manage/uploads.json
+type = KEYVALUEJSON
+
 [nodebb.admin-manage-users]
 file_filter = public/language/<lang>/admin/manage/users.json
 source_file = public/language/en-GB/admin/manage/users.json
@@ -2428,6 +2627,7 @@ trans.it = public/language/it/admin/manage/users.json
 trans.ja = public/language/ja/admin/manage/users.json
 trans.ko = public/language/ko/admin/manage/users.json
 trans.lt = public/language/lt/admin/manage/users.json
+trans.lv = public/language/lv/admin/manage/users.json
 trans.ms = public/language/ms/admin/manage/users.json
 trans.nb = public/language/nb/admin/manage/users.json
 trans.nl = public/language/nl/admin/manage/users.json
@@ -2450,6 +2650,56 @@ trans.zh_CN = public/language/zh-CN/admin/manage/users.json
 trans.zh_TW = public/language/zh-TW/admin/manage/users.json
 type = KEYVALUEJSON

+[nodebb.admin-manage-digest]
+file_filter = public/language/<lang>/admin/manage/digest.json
+source_file = public/language/en-GB/admin/manage/digest.json
+source_lang = en_GB
+trans.ar = public/language/ar/admin/manage/digest.json
+trans.bg = public/language/bg/admin/manage/digest.json
+trans.bn = public/language/bn/admin/manage/digest.json
+trans.cs = public/language/cs/admin/manage/digest.json
+trans.da = public/language/da/admin/manage/digest.json
+trans.de = public/language/de/admin/manage/digest.json
+trans.el = public/language/el/admin/manage/digest.json
+trans.en@pirate = public/language/en-x-pirate/admin/manage/digest.json
+trans.en_US = public/language/en-US/admin/manage/digest.json
+trans.es = public/language/es/admin/manage/digest.json
+trans.et = public/language/et/admin/manage/digest.json
+trans.fa_IR = public/language/fa-IR/admin/manage/digest.json
+trans.fi = public/language/fi/admin/manage/digest.json
+trans.fr = public/language/fr/admin/manage/digest.json
+trans.gl = public/language/gl/admin/manage/digest.json
+trans.he = public/language/he/admin/manage/digest.json
+trans.hr = public/language/hr/admin/manage/digest.json
+trans.hu = public/language/hu/admin/manage/digest.json
+trans.id = public/language/id/admin/manage/digest.json
+trans.it = public/language/it/admin/manage/digest.json
+trans.ja = public/language/ja/admin/manage/digest.json
+trans.ko = public/language/ko/admin/manage/digest.json
+trans.lt = public/language/lt/admin/manage/digest.json
+trans.lv = public/language/lv/admin/manage/digest.json
+trans.ms = public/language/ms/admin/manage/digest.json
+trans.nb = public/language/nb/admin/manage/digest.json
+trans.nl = public/language/nl/admin/manage/digest.json
+trans.pl = public/language/pl/admin/manage/digest.json
+trans.pt_BR = public/language/pt-BR/admin/manage/digest.json
+trans.pt_PT = public/language/pt-PT/admin/manage/digest.json
+trans.ro = public/language/ro/admin/manage/digest.json
+trans.ru = public/language/ru/admin/manage/digest.json
+trans.rw = public/language/rw/admin/manage/digest.json
+trans.sc = public/language/sc/admin/manage/digest.json
+trans.sk = public/language/sk/admin/manage/digest.json
+trans.sl = public/language/sl/admin/manage/digest.json
+trans.sr = public/language/sr/admin/manage/digest.json
+trans.sv = public/language/sv/admin/manage/digest.json
+trans.th = public/language/th/admin/manage/digest.json
+trans.tr = public/language/tr/admin/manage/digest.json
+trans.uk = public/language/uk/admin/manage/digest.json
+trans.vi = public/language/vi/admin/manage/digest.json
+trans.zh_CN = public/language/zh-CN/admin/manage/digest.json
+trans.zh_TW = public/language/zh-TW/admin/manage/digest.json
+type = KEYVALUEJSON
+
 [nodebb.admin-settings-advanced]
 file_filter = public/language/<lang>/admin/settings/advanced.json
 source_file = public/language/en-GB/admin/settings/advanced.json
@@ -2477,6 +2727,7 @@ trans.it = public/language/it/admin/settings/advanced.json
 trans.ja = public/language/ja/admin/settings/advanced.json
 trans.ko = public/language/ko/admin/settings/advanced.json
 trans.lt = public/language/lt/admin/settings/advanced.json
+trans.lv = public/language/lv/admin/settings/advanced.json
 trans.ms = public/language/ms/admin/settings/advanced.json
 trans.nb = public/language/nb/admin/settings/advanced.json
 trans.nl = public/language/nl/admin/settings/advanced.json
@@ -2526,6 +2777,7 @@ trans.it = public/language/it/admin/settings/cookies.json
 trans.ja = public/language/ja/admin/settings/cookies.json
 trans.ko = public/language/ko/admin/settings/cookies.json
 trans.lt = public/language/lt/admin/settings/cookies.json
+trans.lv = public/language/lv/admin/settings/cookies.json
 trans.ms = public/language/ms/admin/settings/cookies.json
 trans.nb = public/language/nb/admin/settings/cookies.json
 trans.nl = public/language/nl/admin/settings/cookies.json
@@ -2575,6 +2827,7 @@ trans.it = public/language/it/admin/settings/general.json
 trans.ja = public/language/ja/admin/settings/general.json
 trans.ko = public/language/ko/admin/settings/general.json
 trans.lt = public/language/lt/admin/settings/general.json
+trans.lv = public/language/lv/admin/settings/general.json
 trans.ms = public/language/ms/admin/settings/general.json
 trans.nb = public/language/nb/admin/settings/general.json
 trans.nl = public/language/nl/admin/settings/general.json
@@ -2624,6 +2877,7 @@ trans.it = public/language/it/admin/settings/guest.json
 trans.ja = public/language/ja/admin/settings/guest.json
 trans.ko = public/language/ko/admin/settings/guest.json
 trans.lt = public/language/lt/admin/settings/guest.json
+trans.lv = public/language/lv/admin/settings/guest.json
 trans.ms = public/language/ms/admin/settings/guest.json
 trans.nb = public/language/nb/admin/settings/guest.json
 trans.nl = public/language/nl/admin/settings/guest.json
@@ -2673,6 +2927,7 @@ trans.it = public/language/it/admin/settings/pagination.json
 trans.ja = public/language/ja/admin/settings/pagination.json
 trans.ko = public/language/ko/admin/settings/pagination.json
 trans.lt = public/language/lt/admin/settings/pagination.json
+trans.lv = public/language/lv/admin/settings/pagination.json
 trans.ms = public/language/ms/admin/settings/pagination.json
 trans.nb = public/language/nb/admin/settings/pagination.json
 trans.nl = public/language/nl/admin/settings/pagination.json
@@ -2722,6 +2977,7 @@ trans.it = public/language/it/admin/settings/reputation.json
 trans.ja = public/language/ja/admin/settings/reputation.json
 trans.ko = public/language/ko/admin/settings/reputation.json
 trans.lt = public/language/lt/admin/settings/reputation.json
+trans.lv = public/language/lv/admin/settings/reputation.json
 trans.ms = public/language/ms/admin/settings/reputation.json
 trans.nb = public/language/nb/admin/settings/reputation.json
 trans.nl = public/language/nl/admin/settings/reputation.json
@@ -2771,6 +3027,7 @@ trans.it = public/language/it/admin/settings/tags.json
 trans.ja = public/language/ja/admin/settings/tags.json
 trans.ko = public/language/ko/admin/settings/tags.json
 trans.lt = public/language/lt/admin/settings/tags.json
+trans.lv = public/language/lv/admin/settings/tags.json
 trans.ms = public/language/ms/admin/settings/tags.json
 trans.nb = public/language/nb/admin/settings/tags.json
 trans.nl = public/language/nl/admin/settings/tags.json
@@ -2820,6 +3077,7 @@ trans.it = public/language/it/admin/settings/user.json
 trans.ja = public/language/ja/admin/settings/user.json
 trans.ko = public/language/ko/admin/settings/user.json
 trans.lt = public/language/lt/admin/settings/user.json
+trans.lv = public/language/lv/admin/settings/user.json
 trans.ms = public/language/ms/admin/settings/user.json
 trans.nb = public/language/nb/admin/settings/user.json
 trans.nl = public/language/nl/admin/settings/user.json
@@ -2869,6 +3127,7 @@ trans.it = public/language/it/admin/settings/chat.json
 trans.ja = public/language/ja/admin/settings/chat.json
 trans.ko = public/language/ko/admin/settings/chat.json
 trans.lt = public/language/lt/admin/settings/chat.json
+trans.lv = public/language/lv/admin/settings/chat.json
 trans.ms = public/language/ms/admin/settings/chat.json
 trans.nb = public/language/nb/admin/settings/chat.json
 trans.nl = public/language/nl/admin/settings/chat.json
@@ -2918,6 +3177,7 @@ trans.it = public/language/it/admin/settings/email.json
 trans.ja = public/language/ja/admin/settings/email.json
 trans.ko = public/language/ko/admin/settings/email.json
 trans.lt = public/language/lt/admin/settings/email.json
+trans.lv = public/language/lv/admin/settings/email.json
 trans.ms = public/language/ms/admin/settings/email.json
 trans.nb = public/language/nb/admin/settings/email.json
 trans.nl = public/language/nl/admin/settings/email.json
@@ -2967,6 +3227,7 @@ trans.it = public/language/it/admin/settings/group.json
 trans.ja = public/language/ja/admin/settings/group.json
 trans.ko = public/language/ko/admin/settings/group.json
 trans.lt = public/language/lt/admin/settings/group.json
+trans.lv = public/language/lv/admin/settings/group.json
 trans.ms = public/language/ms/admin/settings/group.json
 trans.nb = public/language/nb/admin/settings/group.json
 trans.nl = public/language/nl/admin/settings/group.json
@@ -3016,6 +3277,7 @@ trans.it = public/language/it/admin/settings/notifications.json
 trans.ja = public/language/ja/admin/settings/notifications.json
 trans.ko = public/language/ko/admin/settings/notifications.json
 trans.lt = public/language/lt/admin/settings/notifications.json
+trans.lv = public/language/lv/admin/settings/notifications.json
 trans.ms = public/language/ms/admin/settings/notifications.json
 trans.nb = public/language/nb/admin/settings/notifications.json
 trans.nl = public/language/nl/admin/settings/notifications.json
@@ -3065,6 +3327,7 @@ trans.it = public/language/it/admin/settings/post.json
 trans.ja = public/language/ja/admin/settings/post.json
 trans.ko = public/language/ko/admin/settings/post.json
 trans.lt = public/language/lt/admin/settings/post.json
+trans.lv = public/language/lv/admin/settings/post.json
 trans.ms = public/language/ms/admin/settings/post.json
 trans.nb = public/language/nb/admin/settings/post.json
 trans.nl = public/language/nl/admin/settings/post.json
@@ -3114,6 +3377,7 @@ trans.it = public/language/it/admin/settings/sockets.json
 trans.ja = public/language/ja/admin/settings/sockets.json
 trans.ko = public/language/ko/admin/settings/sockets.json
 trans.lt = public/language/lt/admin/settings/sockets.json
+trans.lv = public/language/lv/admin/settings/sockets.json
 trans.ms = public/language/ms/admin/settings/sockets.json
 trans.nb = public/language/nb/admin/settings/sockets.json
 trans.nl = public/language/nl/admin/settings/sockets.json
@@ -3163,6 +3427,7 @@ trans.it = public/language/it/admin/settings/uploads.json
 trans.ja = public/language/ja/admin/settings/uploads.json
 trans.ko = public/language/ko/admin/settings/uploads.json
 trans.lt = public/language/lt/admin/settings/uploads.json
+trans.lv = public/language/lv/admin/settings/uploads.json
 trans.ms = public/language/ms/admin/settings/uploads.json
 trans.nb = public/language/nb/admin/settings/uploads.json
 trans.nl = public/language/nl/admin/settings/uploads.json
@@ -3212,6 +3477,7 @@ trans.it = public/language/it/admin/settings/web-crawler.json
 trans.ja = public/language/ja/admin/settings/web-crawler.json
 trans.ko = public/language/ko/admin/settings/web-crawler.json
 trans.lt = public/language/lt/admin/settings/web-crawler.json
+trans.lv = public/language/lv/admin/settings/web-crawler.json
 trans.ms = public/language/ms/admin/settings/web-crawler.json
 trans.nb = public/language/nb/admin/settings/web-crawler.json
 trans.nl = public/language/nl/admin/settings/web-crawler.json
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/13
+++ b/13
@@ -1,20 +1,23 @@
-# The base image is the latest 8.x node (LTS)
-FROM node:8.9.0
+FROM node:lts

 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app

 ARG NODE_ENV
 ENV NODE_ENV $NODE_ENV
+
 COPY install/package.json /usr/src/app/package.json
-RUN npm install && npm cache clean --force
+
+RUN npm install --only=prod && \
+    npm cache clean --force
+    
 COPY . /usr/src/app

 ENV NODE_ENV=production \
    daemon=false \
    silent=false

+EXPOSE 4567
+
 CMD ./nodebb start

-# the default port for NodeBB is exposed outside the container
-EXPOSE 4567
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,5 +1,7 @@
 'use strict';

+
+var async = require('async');
 var fork = require('child_process').fork;
 var env = process.env;
 var worker;
@@ -10,6 +12,26 @@ var running = 0;

 env.NODE_ENV = env.NODE_ENV || 'development';

+
+var nconf = require('nconf');
+nconf.file({
+	file: 'config.json',
+});
+
+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');
+
 module.exports = function (grunt) {
 	var args = [];
 	var initArgs = ['--build'];
@@ -37,7 +59,7 @@ module.exports = function (grunt) {
 			// Do nothing, just restart
 		}

-		if (compiling && incomplete.indexOf(compiling) === -1) {
+		if (compiling && !incomplete.includes(compiling)) {
 			incomplete.push(compiling);
 		}

@@ -70,80 +92,116 @@ module.exports = function (grunt) {
 	}

 	grunt.initConfig({
-		watch: {
-			lessUpdated_Client: {
-				files: [
-					'public/less/*.less',
-					'!public/less/admin/**/*.less',
-					'node_modules/nodebb-*/**/*.less',
-					'!node_modules/nodebb-*/node_modules/**',
-					'!node_modules/nodebb-*/.git/**',
-				],
-				options: {
-					interval: 1000,
-				},
-			},
-			lessUpdated_Admin: {
-				files: [
-					'public/less/admin/**/*.less',
-					'node_modules/nodebb-*/**/*.less',
-					'!node_modules/nodebb-*/node_modules/**',
-					'!node_modules/nodebb-*/.git/**',
-				],
-				options: {
-					interval: 1000,
-				},
-			},
-			clientUpdated: {
-				files: [
-					'public/src/**/*.js',
-					'node_modules/nodebb-*/**/*.js',
-					'!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'],
-				options: {
-					interval: 1000,
-				},
-			},
-			templatesUpdated: {
-				files: [
-					'src/views/**/*.tpl',
-					'node_modules/nodebb-*/**/*.tpl',
-					'!node_modules/nodebb-*/node_modules/**',
-					'!node_modules/nodebb-*/.git/**',
-				],
-				options: {
-					interval: 1000,
-				},
-			},
-			langUpdated: {
-				files: [
-					'public/language/en-GB/*.json',
-					'public/language/en-GB/**/*.json',
-					'node_modules/nodebb-*/**/*.json',
-					'!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,
-				},
-			},
-		},
+		watch: {},
 	});

 	grunt.loadNpmTasks('grunt-contrib-watch');

 	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');
+				}
+
+				if (process.argv.includes('--core')) {
+					plugins = [];
+				}
+
+				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');
+
+				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();
+			},
+		], done);
+	});
+
+	grunt.task.run('init');
+
 	env.NODE_ENV = 'development';

 	if (grunt.option('skip')) {
@@ -164,3 +222,25 @@ module.exports = function (grunt) {

 	grunt.event.on('watch', update);
 };
+
+function addBaseThemes(plugins, callback) {
+	const themeId = plugins.find(p => p.startsWith('nodebb-theme-'));
+	if (!themeId) {
+		return setImmediate(callback, null, plugins);
+	}
+	function getBaseRecursive(themeId) {
+		try {
+			const baseTheme = require(themeId + '/theme').baseTheme;
+
+			if (baseTheme) {
+				plugins.push(baseTheme);
+				getBaseRecursive(baseTheme);
+			}
+		} catch (err) {
+			console.log(err);
+		}
+	}
+
+	getBaseRecursive(themeId);
+	callback(null, plugins);
+}
--- a/README.md
+++ b/README.md
@@ -1,11 +1,9 @@
 # <img alt="NodeBB" src="http://i.imgur.com/mYxPPtB.png" />

-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/NodeBB/NodeBB?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![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)
-[![Documentation Status](https://readthedocs.org/projects/nodebb/badge/?version=latest)](https://readthedocs.org/projects/nodebb/?badge=latest)

 [**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.

@@ -42,7 +40,7 @@ Our minimalist "Persona" theme gets you going right away, no coding experience r
 ## How can I follow along/contribute?

 * If you are a developer, feel free to check out the source and submit pull requests. We also have a wide array of [plugins](http://community.nodebb.org/category/7/nodebb-plugins) which would be a great starting point for learning the codebase.
-* If you are a designer, [NodeBB needs themes](http://community.nodebb.org/category/10/nodebb-themes)! NodeBB's theming system allows extention of the base templates as well as styling via LESS or CSS. NodeBB's base theme utilizes [Bootstrap 3](http://getbootstrap.com/) but themes can choose to use a different framework altogether.
+* If you are a designer, [NodeBB needs themes](http://community.nodebb.org/category/10/nodebb-themes)! NodeBB's theming system allows extension of the base templates as well as styling via LESS or CSS. NodeBB's base theme utilizes [Bootstrap 3](http://getbootstrap.com/) but themes can choose to use a different framework altogether.
 * If you know languages other than English you can help us translate NodeBB. We use [Transifex](https://www.transifex.com/projects/p/nodebb/) for internationalization.
 * Please don't forget to **like**, **follow**, and **star our repo**! Join our growing [community](http://community.nodebb.org) to keep up to date with the latest NodeBB development.

@@ -50,7 +48,7 @@ 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 6 or greater ([installation/upgrade instructions](https://github.com/nodesource/distributions))
+* 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
 * nginx, version 1.3.13 or greater (**only if** intending to use nginx to proxy requests to a NodeBB)

--- a/app.js
+++ b/app.js
@@ -19,38 +19,30 @@

 'use strict';

-if (require.main !== module) {
-	require.main.require = function (path) {
-		return require(path);
-	};
-}
+require('./require-main');

-var nconf = require('nconf');
+const nconf = require('nconf');
 nconf.argv().env({
 	separator: '__',
 });

-var async = require('async');
-var winston = require('winston');
-var path = require('path');
+const winston = require('winston');
+const path = require('path');

-var file = require('./src/file');
+const file = require('./src/file');

 global.env = process.env.NODE_ENV || 'production';

 // Alternate configuration file support
-var	configFile = path.join(__dirname, 'config.json');
+const	configFile = path.resolve(__dirname, nconf.any(['config', 'CONFIG']) || 'config.json');

-if (nconf.get('config')) {
-	configFile = path.resolve(__dirname, nconf.get('config'));
-}
+const configExists = file.existsSync(configFile) || (nconf.get('url') && nconf.get('secret') && nconf.get('database'));

-var configExists = file.existsSync(configFile) || (nconf.get('url') && nconf.get('secret') && nconf.get('database'));
-
-var prestart = require('./src/prestart');
+const prestart = require('./src/prestart');
 prestart.loadConfig(configFile);
-prestart.versionCheck();
 prestart.setupWinston();
+prestart.versionCheck();
+winston.verbose('* using configuration stored in: %s', configFile);

 if (!process.send) {
 	// If run using `node app`, log GNU copyright info along with server info
@@ -67,33 +59,21 @@ if (nconf.get('setup') || nconf.get('install')) {
 } else if (nconf.get('upgrade')) {
 	require('./src/cli/upgrade').upgrade(true);
 } else if (nconf.get('reset')) {
-	var options = {
+	require('./src/cli/reset').reset({
 		theme: nconf.get('t'),
 		plugin: nconf.get('p'),
 		widgets: nconf.get('w'),
 		settings: nconf.get('s'),
 		all: nconf.get('a'),
-	};
-
-	async.series([
-		async.apply(require('./src/cli/reset').reset, options),
-		require('./src/meta/build').buildAll,
-	], function (err) {
-		if (err) {
-			throw err;
-		}
-
-		process.exit(0);
 	});
 } else if (nconf.get('activate')) {
 	require('./src/cli/manage').activate(nconf.get('activate'));
 } else if (nconf.get('plugins')) {
 	require('./src/cli/manage').listPlugins();
 } else if (nconf.get('build')) {
-	require('./src/meta/build').build(nconf.get('build'));
+	require('./src/cli/manage').build(nconf.get('build'));
 } else if (nconf.get('events')) {
 	require('./src/cli/manage').listEvents();
 } else {
 	require('./src/start').start();
 }
-
--- a/build/.gitignore
+++ b/build/.gitignore
@@ -0,0 +1,4 @@
+*
+*/
+!export
+!.gitignore
--- a/build/export/.gitignore
+++ b/build/export/.gitignore
@@ -0,0 +1,3 @@
+.
+!.gitignore
+!README
--- a/build/export/README
+++ b/build/export/README
@@ -0,0 +1,5 @@
+This directory contains archives of user uploads that are prepared on-demand
+when a user wants to retrieve a copy of their uploaded content.
+
+You can delete the files in here at will. They will just be regenerated if
+requested again.
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = { extends: ['@commitlint/config-angular'] };
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -0,0 +1,24 @@
+version: '3.5'
+
+services:
+  node:
+    build: .
+    restart: unless-stopped
+    depends_on:
+      - db
+    expose:
+      - 4567 # use a reverse proxy like Traefik
+
+  db:
+    image: mongo:bionic
+    restart: unless-stopped
+    expose:
+      - 27017
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: root
+    volumes:
+      - mongo:/data/db
+
+volumes:
+  mongo:
--- a/install/data/defaults.json
+++ b/install/data/defaults.json
@@ -1,42 +1,132 @@
 {
    "title": "NodeBB",
    "showSiteTitle": 1,
+    "defaultLang": "en-GB",
+    "loginDays": 14,
+    "loginSeconds": 0,
+    "loginAttempts": 5,
+    "lockoutDuration": 60,
+    "adminReloginDuration": 60,
    "postDelay": 10,
    "initialPostDelay": 10,
    "newbiePostDelay": 120,
+    "postEditDuration": 0,
+    "newbiePostEditDuration": 3600,
+    "postDeleteDuration": 0,
+    "enablePostHistory": 1,
+    "postCacheSize": 10485760,
+    "disableChat": 0,
+    "chatEditDuration": 0,
+    "chatDeleteDuration": 0,
+    "chatMessageDelay": 200,
    "newbiePostDelayThreshold": 3,
+    "postQueueReputationThreshold": 0,
+    "groupsExemptFromPostQueue": ["administrators", "Global Moderators"],
    "minimumPostLength": 8,
    "maximumPostLength": 32767,
    "minimumTagsPerTopic": 0,
    "maximumTagsPerTopic": 5,
    "minimumTagLength": 3,
    "maximumTagLength": 15,
-    "allowGuestSearching": 0,
    "allowTopicsThumbnail": 0,
    "registrationType": "normal",
-    "allowLocalLogin": 1,
+    "registrationApprovalType": "normal",
    "allowAccountDelete": 1,
    "allowFileUploads": 0,
+    "privateUploads": 0,
    "allowedFileExtensions": "png,jpg,bmp",
    "allowUserHomePage": 1,
+    "allowMultipleBadges": 0,
    "maximumFileSize": 2048,
+    "stripEXIFData": 1,
+    "resizeImageWidthThreshold": 2000,
+    "resizeImageWidth": 760,
+    "rejectImageWidth": 5000,
+    "rejectImageHeight": 5000,
+    "resizeImageQuality": 80,
+    "topicThumbSize": 120,
    "minimumTitleLength": 3,
    "maximumTitleLength": 255,
    "minimumUsernameLength": 2,
    "maximumUsernameLength": 16,
    "minimumPasswordLength": 6,
+    "minimumPasswordStrength": 1,
    "maximumSignatureLength": 255,
    "maximumAboutMeLength": 1000,
+    "maximumUsersInChatRoom": 0,
+    "maximumChatMessageLength": 1000,
    "maximumProfileImageSize": 256,
    "maximumCoverImageSize": 2048,
    "profileImageDimension": 200,
+    "profile:convertProfileImageToPNG": 0,
+    "profile:keepAllUserImages": 0,
    "requireEmailConfirmation": 0,
+    "gdpr_enabled": 1,
    "allowProfileImageUploads": 1,
    "teaserPost": "last-reply",
    "allowPrivateGroups": 1,
    "unreadCutoff": 2,
    "bookmarkThreshold": 5,
-    "topicsPerList": 20,
    "autoDetectLang": 1,
-    "privileges:flag": 0
-}
+    "reputation:disabled": 0,
+    "downvote:disabled": 0,
+    "disableSignatures": 0,
+    "min:rep:downvote": 0,
+    "min:rep:flag": 0,
+    "min:rep:profile-picture": 0,
+    "min:rep:cover-picture": 0,
+    "min:rep:website": 0,
+    "min:rep:aboutme": 0,
+    "min:rep:signature": 0,
+    "notificationType_upvote": "notification",
+    "notificationType_new-topic": "notification",
+    "notificationType_new-reply": "notification",
+    "notificationType_follow": "notification",
+    "notificationType_new-chat": "notification",
+    "notificationType_group-invite": "notification",
+    "notificationType_mention": "notification",
+    "notificationType_new-register": "notification",
+    "notificationType_post-queue": "notification",
+    "notificationType_new-post-flag": "notification",
+    "notificationType_new-user-flag": "notification",
+    "topicStaleDays": 60,
+    "maxTopicsPerPage": 20,
+    "maxPostsPerPage": 20,
+    "topicsPerPage": 20,
+    "postsPerPage": 20,
+    "userSearchResultsPerPage": 50,
+    "maximumGroupNameLength": 255,
+    "maximumGroupTitleLength": 40,
+    "preventTopicDeleteAfterReplies": 0,
+    "feeds:disableSitemap": 0,
+    "sitemapTopics": 500,
+    "maintenanceMode": 0,
+    "maintenanceModeStatus": 503,
+    "votesArePublic": 0,
+    "maximumInvites": 0,
+    "username:disableEdit": 0,
+    "email:disableEdit": 0,
+    "email:sendmail:rateLimit": 2,
+    "email:sendmail:rateDelta": 1000,
+    "hideFullname": 0,
+    "allowGuestHandles": 0,
+    "disableRecentCategoryFilter": 0,
+    "maximumRelatedTopics": 0,
+    "disableEmailSubscriptions": 0,
+    "emailConfirmInterval": 10,
+    "inviteExpiration": 7,
+    "digestHour": 17,
+    "passwordExpiryDays": 0,
+    "hsts-maxage": 31536000,
+    "hsts-subdomains": 0,
+    "hsts-preload": 0,
+    "hsts-enabled": 0,
+    "eventLoopCheckEnabled": 1,
+    "eventLoopLagThreshold": 100,
+    "eventLoopInterval": 500,
+    "onlineCutoff": 30,
+    "timeagoCutoff": 30,
+    "necroThreshold": 7,
+    "categoryWatchState": "watching",
+    "submitPluginUsage": 1
+}
--- a/install/data/navigation.json
+++ b/install/data/navigation.json
@@ -15,9 +15,7 @@
 		"iconClass": "fa-inbox",
 		"textClass": "visible-xs-inline",
 		"text": "[[global:header.unread]]",
-		"properties": {
-			"loggedIn": true
-		}
+		"groups": ["registered-users"]
 	},
 	{
 		"route": "/recent",
@@ -66,20 +64,9 @@
 		"iconClass": "fa-cogs",
 		"textClass": "visible-xs-inline",
 		"text": "[[global:header.admin]]",
+		"groups": ["administrators"],
 		"properties": {
-			"targetBlank": false,
-			"adminOnly": true
-		}
-	},
-	{
-		"route": "/search",
-		"title": "[[global:header.search]]",
-		"enabled": true,
-		"iconClass": "fa-search",
-		"textClass": "visible-xs-inline",
-		"text": "[[global:header.search]]",
-		"properties": {
-			"searchInstalled": true
+			"targetBlank": false
 		}
 	}
 ]
--- a/install/databases.js
+++ b/install/databases.js
@@ -7,6 +7,7 @@ var winston = require('winston');
 var questions = {
 	redis: require('../src/database/redis').questions,
 	mongo: require('../src/database/mongo').questions,
+	postgres: require('../src/database/postgres').questions,
 };

 module.exports = function (config, callback) {
@@ -38,6 +39,12 @@ function getDatabaseConfig(config, callback) {
 		} else {
 			prompt.get(questions.mongo, callback);
 		}
+	} else if (config.database === 'postgres') {
+		if (config['postgres:host'] && config['postgres:port']) {
+			callback(null, config);
+		} else {
+			prompt.get(questions.postgres, callback);
+		}
 	} else {
 		return callback(new Error('unknown database : ' + config.database));
 	}
@@ -69,11 +76,20 @@ function saveDatabaseConfig(config, databaseConfig, callback) {
 			database: databaseConfig['mongo:database'],
 			uri: databaseConfig['mongo:uri'],
 		};
+	} else if (config.database === 'postgres') {
+		config.postgres = {
+			host: databaseConfig['postgres:host'],
+			port: databaseConfig['postgres:port'],
+			username: databaseConfig['postgres:username'],
+			password: databaseConfig['postgres:password'],
+			database: databaseConfig['postgres:database'],
+			ssl: databaseConfig['postgres:ssl'],
+		};
 	} else {
 		return callback(new Error('unknown database : ' + config.database));
 	}

-	var allQuestions = questions.redis.concat(questions.mongo);
+	var allQuestions = questions.redis.concat(questions.mongo).concat(questions.postgres);
 	for (var x = 0; x < allQuestions.length; x += 1) {
 		delete config[allQuestions[x].name];
 	}
--- a/install/package.json
+++ b/install/package.json
@@ -2,139 +2,172 @@
    "name": "nodebb",
    "license": "GPL-3.0",
    "description": "NodeBB Forum",
-    "version": "1.7.1",
+    "version": "1.13.0",
    "homepage": "http://www.nodebb.org",
    "repository": {
-      "type": "git",
-      "url": "https://github.com/NodeBB/NodeBB/"
+        "type": "git",
+        "url": "https://github.com/NodeBB/NodeBB/"
    },
    "main": "app.js",
    "scripts": {
-      "start": "node loader.js",
-      "lint": "eslint --cache ./nodebb .",
-      "pretest": "npm run lint",
-      "test": "nyc --reporter=html --reporter=text-summary mocha",
-      "coveralls": "nyc report --reporter=text-lcov | coveralls && rm -r coverage"
+        "start": "node loader.js",
+        "lint": "eslint --cache ./nodebb .",
+        "pretest": "npm run lint",
+        "test": "nyc --reporter=html --reporter=text-summary mocha",
+        "coveralls": "nyc report --reporter=text-lcov | coveralls && rm -r coverage"
+    },
+    "husky": {
+        "hooks": {
+            "pre-commit": "lint-staged",
+            "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
+        }
+    },
+    "lint-staged": {
+        "*.js": [
+            "eslint --fix",
+            "git add"
+        ]
    },
    "dependencies": {
-      "ace-builds": "^1.2.9",
-      "async": "2.6.0",
-      "autoprefixer": "7.1.6",
-      "bcryptjs": "2.4.3",
-      "benchpressjs": "^1.2.0",
-      "body-parser": "^1.18.2",
-      "bootstrap": "^3.3.7",
-      "chart.js": "^2.7.0",
-      "colors": "^1.1.2",
-      "compression": "^1.7.1",
-      "commander": "^2.11.0",
-      "connect-ensure-login": "^0.1.1",
-      "connect-flash": "^0.1.1",
-      "connect-mongo": "2.0.0",
-      "connect-multiparty": "^2.1.0",
-      "connect-redis": "3.3.2",
-      "cookie-parser": "^1.4.3",
-      "cron": "^1.3.0",
-      "cropperjs": "^1.1.3",
-      "csurf": "^1.9.0",
-      "daemon": "^1.1.0",
-      "express": "^4.16.2",
-      "express-session": "^1.15.6",
-      "express-useragent": "1.0.8",
-      "graceful-fs": "^4.1.11",
-      "html-to-text": "3.3.0",
-      "ipaddr.js": "^1.5.4",
-      "jimp": "0.2.28",
-      "jquery": "^3.2.1",
-      "jsesc": "2.5.1",
-      "json-2-csv": "^2.1.2",
-      "less": "^2.7.2",
-      "lodash": "^4.17.4",
-      "logrotate-stream": "^0.2.5",
-      "lru-cache": "4.1.1",
-      "material-design-lite": "^1.3.0",
-      "mime": "^2.0.3",
-      "mkdirp": "^0.5.1",
-      "mongodb": "2.2.33",
-      "morgan": "^1.9.0",
-      "mousetrap": "^1.6.1",
-      "nconf": "^0.9.1",
-      "nodebb-plugin-composer-default": "6.0.7",
-      "nodebb-plugin-dbsearch": "2.0.9",
-      "nodebb-plugin-emoji": "2.0.7",
-      "nodebb-plugin-emoji-android": "2.0.0",
-      "nodebb-plugin-markdown": "8.2.0",
-      "nodebb-plugin-mentions": "2.2.2",
-      "nodebb-plugin-soundpack-default": "1.0.0",
-      "nodebb-plugin-spam-be-gone": "0.5.1",
-      "nodebb-rewards-essentials": "0.0.9",
-      "nodebb-theme-lavender": "5.0.0",
-      "nodebb-theme-persona": "7.2.4",
-      "nodebb-theme-slick": "1.1.2",
-      "nodebb-theme-vanilla": "8.1.2",
-      "nodebb-widget-essentials": "4.0.1",
-      "nodemailer": "4.4.0",
-      "passport": "^0.4.0",
-      "passport-local": "1.0.0",
-      "postcss": "6.0.14",
-      "postcss-clean": "1.1.0",
-      "promise-polyfill": "^6.0.2",
-      "prompt": "^1.0.0",
-      "redis": "2.8.0",
-      "request": "2.83.0",
-      "rimraf": "2.6.2",
-      "rss": "^1.2.2",
-      "sanitize-html": "^1.14.1",
-      "semver": "^5.4.1",
-      "serve-favicon": "^2.4.5",
-      "sitemap": "^1.13.0",
-      "socket.io": "2.0.4",
-      "socket.io-client": "2.0.4",
-      "socket.io-redis": "5.2.0",
-      "socketio-wildcard": "2.0.0",
-      "spdx-license-list": "^3.0.1",
-      "toobusy-js": "^0.5.1",
-      "uglify-js": "^3.1.5",
-      "validator": "9.1.2",
-      "winston": "^2.4.0",
-      "xml": "^1.0.1",
-      "xregexp": "3.2.0",
-      "zxcvbn": "^4.4.2"
+        "ace-builds": "^1.2.9",
+        "archiver": "^3.0.0",
+        "async": "^3.0.1",
+        "autoprefixer": "^9.4.6",
+        "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",
+        "cli-graph": "^3.2.2",
+        "clipboard": "^2.0.1",
+        "colors": "^1.1.2",
+        "commander": "^3.0.0",
+        "compression": "^1.7.1",
+        "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",
+        "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",
+        "lodash": "^4.17.15",
+        "logrotate-stream": "^0.2.5",
+        "lru-cache": "5.1.1",
+        "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",
+        "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",
+        "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",
+        "prompt": "^1.0.0",
+        "redis": "2.8.0",
+        "request": "2.88.0",
+        "rimraf": "3.0.0",
+        "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",
+        "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",
+        "spider-detector": "2.0.0",
+        "textcomplete": "^0.17.1",
+        "textcomplete.contenteditable": "^0.1.1",
+        "toobusy-js": "^0.5.1",
+        "uglify-es": "^3.3.9",
+        "validator": "12.1.0",
+        "winston": "3.2.1",
+        "xml": "^1.0.1",
+        "xregexp": "^4.1.1",
+        "zxcvbn": "^4.4.2"
    },
    "devDependencies": {
-      "coveralls": "^3.0.0",
-      "eslint": "^4.9.0",
-      "eslint-config-airbnb-base": "^12.1.0",
-      "eslint-plugin-import": "^2.8.0",
-      "grunt": "^1.0.1",
-      "grunt-contrib-watch": "^1.0.0",
-      "jsdom": "^11.3.0",
-      "mocha": "^4.0.1",
-      "mocha-lcov-reporter": "^1.3.0",
-      "nyc": "^11.2.1",
-      "smtp-server": "^3.3.0"
+        "@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",
+        "grunt-contrib-watch": "1.1.0",
+        "husky": "3.1.0",
+        "jsdom": "15.2.1",
+        "lint-staged": "9.4.2",
+        "mocha": "6.2.2",
+        "mocha-lcov-reporter": "1.3.0",
+        "nyc": "14.1.1",
+        "smtp-server": "3.5.0"
    },
    "bugs": {
-      "url": "https://github.com/NodeBB/NodeBB/issues"
+        "url": "https://github.com/NodeBB/NodeBB/issues"
    },
    "engines": {
-      "node": ">=6"
+        "node": ">=8"
    },
    "maintainers": [
-      {
-        "name": "Andrew Rodrigues",
-        "email": "andrew@nodebb.org",
-        "url": "https://github.com/psychobunny"
-      },
-      {
-        "name": "Julian Lam",
-        "email": "julian@nodebb.org",
-        "url": "https://github.com/julianlam"
-      },
-      {
-        "name": "Barış Soner Uşaklı",
-        "email": "baris@nodebb.org",
-        "url": "https://github.com/barisusakli"
-      }
+        {
+            "name": "Andrew Rodrigues",
+            "email": "andrew@nodebb.org",
+            "url": "https://github.com/psychobunny"
+        },
+        {
+            "name": "Julian Lam",
+            "email": "julian@nodebb.org",
+            "url": "https://github.com/julianlam"
+        },
+        {
+            "name": "Barış Soner Uşaklı",
+            "email": "baris@nodebb.org",
+            "url": "https://github.com/barisusakli"
+        }
    ]
-  }
+}
--- a/install/web.js
+++ b/install/web.js
@@ -8,35 +8,59 @@ var path = require('path');
 var childProcess = require('child_process');
 var less = require('less');
 var async = require('async');
-var uglify = require('uglify-js');
+var uglify = require('uglify-es');
 var nconf = require('nconf');
 var Benchpress = require('benchpressjs');

 var app = express();
 var server;

-winston.add(winston.transports.File, {
-	filename: 'logs/webinstall.log',
-	colorize: true,
-	timestamp: function () {
-		var date = new Date();
-		return date.getDate() + '/' + (date.getMonth() + 1) + ' ' + date.toTimeString().substr(0, 5) + ' [' + global.process.pid + ']';
-	},
+var formats = [
+	winston.format.colorize(),
+];
+
+const timestampFormat = winston.format((info) => {
+	var dateString = new Date().toISOString() + ' [' + global.process.pid + ']';
+	info.level = dateString + ' - ' + info.level;
+	return info;
+});
+formats.push(timestampFormat());
+formats.push(winston.format.splat());
+formats.push(winston.format.simple());
+
+winston.configure({
 	level: 'verbose',
+	format: winston.format.combine.apply(null, formats),
+	transports: [
+		new winston.transports.Console({
+			handleExceptions: true,
+		}),
+		new winston.transports.File({
+			filename: 'logs/webinstall.log',
+			handleExceptions: true,
+		}),
+	],
 });

-var web = {};
+var web = module.exports;
+
 var scripts = [
 	'node_modules/jquery/dist/jquery.js',
 	'public/vendor/xregexp/xregexp.js',
 	'public/vendor/xregexp/unicode/unicode-base.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;
+
 web.install = 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) {
@@ -55,7 +79,7 @@ web.install = function (port) {
 		extended: true,
 	}));

-	async.parallel([compileLess, compileJS, copyCSS], function (err) {
+	async.parallel([compileLess, compileJS, copyCSS, loadDefaults], function (err) {
 		if (err) {
 			winston.error(err);
 		}
@@ -75,10 +99,16 @@ function setupRoutes() {
 	app.get('/', welcome);
 	app.post('/', install);
 	app.post('/launch', launch);
+	app.get('/ping', ping);
+	app.get('/sping', ping);
+}
+
+function ping(req, res) {
+	res.status(200).send(req.path === '/sping' ? 'healthy' : '200');
 }

 function welcome(req, res) {
-	var dbs = ['redis', 'mongo'];
+	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;
@@ -93,32 +123,58 @@ function welcome(req, res) {
 	var defaults = require('./data/defaults');

 	res.render('install/index', {
+		url: nconf.get('url') || (req.protocol + '://' + req.get('host')),
+		launchUrl: launchUrl,
+		skipGeneralSetup: !!nconf.get('url'),
 		databases: databases,
 		skipDatabaseSetup: !!nconf.get('database'),
-		error: !!res.locals.error,
-		success: !!res.locals.success,
+		error: error,
+		success: success,
 		values: req.body,
 		minimumPasswordLength: defaults.minimumPasswordLength,
+		minimumPasswordStrength: defaults.minimumPasswordStrength,
+		installing: installing,
 	});
 }

 function install(req, res) {
+	if (installing) {
+		return welcome(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)) {
-			process.env[i.replace(':', '__')] = req.body[i];
+			setupEnvVars[i.replace(':', '__')] = req.body[i];
 		}
 	}

+	// Flatten any objects in setupEnvVars
+	const pushToRoot = function (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]);
+		}
+	}
+
+	winston.info('Starting setup process');
+	winston.info(setupEnvVars);
+	launchUrl = setupEnvVars.url;
+
 	var child = require('child_process').fork('app', ['--setup'], {
-		env: process.env,
+		env: setupEnvVars,
 	});

 	child.on('close', function (data) {
-		if (data === 0) {
-			res.locals.success = true;
-		} else {
-			res.locals.error = true;
-		}
+		installing = false;
+		success = data === 0;
+		error = data !== 0;

 		welcome(req, res);
 	});
@@ -127,16 +183,26 @@ function install(req, res) {
 function launch(req, res) {
 	res.json({});
 	server.close();
+	req.setTimeout(0);
+	var child;

-	var 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');
+		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',
@@ -212,4 +278,19 @@ function copyCSS(next) {
 	], next);
 }

-module.exports = web;
+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();
+	});
+}
--- a/loader.js
+++ b/loader.js
@@ -7,16 +7,26 @@ var path = require('path');
 var fork = require('child_process').fork;
 var async = require('async');
 var logrotate = require('logrotate-stream');
+var mkdirp = require('mkdirp');

 var file = require('./src/file');
 var pkg = require('./package.json');

+var pathToConfig = path.resolve(__dirname, process.env.CONFIG || 'config.json');
+
 nconf.argv().env().file({
-	file: path.join(__dirname, 'config.json'),
+	file: pathToConfig,
 });

 var	pidFilePath = path.join(__dirname, 'pidfile');
-var outputLogFilePath = path.join(__dirname, 'logs/output.log');
+
+var outputLogFilePath = path.join(__dirname, nconf.get('logFile') || 'logs/output.log');
+
+var 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;
@@ -35,7 +45,6 @@ Loader.init = function (callback) {
 	}

 	process.on('SIGHUP', Loader.restart);
-	process.on('SIGUSR2', Loader.reload);
 	process.on('SIGTERM', Loader.stop);
 	callback();
 };
@@ -82,9 +91,17 @@ Loader.addWorkerEvents = function (worker) {
 				console.log('[cluster] Restarting...');
 				Loader.restart();
 				break;
-			case 'reload':
-				console.log('[cluster] Reloading...');
-				Loader.reload();
+			case 'pubsub':
+				workers.forEach(function (w) {
+					w.send(message);
+				});
+				break;
+			case 'socket.io':
+				workers.forEach(function (w) {
+					if (w !== worker) {
+						w.send(message);
+					}
+				});
 				break;
 			}
 		}
@@ -113,7 +130,7 @@ function forkWorker(index, isPrimary) {
 	}

 	process.env.isPrimary = isPrimary;
-	process.env.isCluster = ports.length > 1;
+	process.env.isCluster = nconf.get('isCluster') || ports.length > 1;
 	process.env.port = ports[index];

 	var worker = fork(appPath, args, {
@@ -152,7 +169,6 @@ function getPorts() {
 Loader.restart = function () {
 	killWorkers();

-	var pathToConfig = path.join(__dirname, '/config.json');
 	nconf.remove('file');
 	nconf.use('file', { file: pathToConfig });

@@ -175,14 +191,6 @@ Loader.restart = function () {
 	});
 };

-Loader.reload = function () {
-	workers.forEach(function (worker) {
-		worker.send({
-			action: 'reload',
-		});
-	});
-};
-
 Loader.stop = function () {
 	killWorkers();

@@ -199,53 +207,41 @@ function killWorkers() {
 	});
 }

-Loader.notifyWorkers = function (msg, worker_pid) {
-	worker_pid = parseInt(worker_pid, 10);
-	workers.forEach(function (worker) {
-		if (parseInt(worker.pid, 10) !== worker_pid) {
-			try {
-				worker.send(msg);
-			} catch (e) {
-				console.log('[cluster/notifyWorkers] Failed to reach pid ' + worker_pid);
-			}
-		}
-	});
-};
-
-fs.open(path.join(__dirname, 'config.json'), 'r', function (err) {
-	if (!err) {
-		if (nconf.get('daemon') !== 'false' && nconf.get('daemon') !== false) {
-			if (file.existsSync(pidFilePath)) {
-				try {
-					var	pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
-					process.kill(pid, 0);
-					process.exit();
-				} catch (e) {
-					fs.unlinkSync(pidFilePath);
-				}
-			}
-
-			require('daemon')({
-				stdout: process.stdout,
-				stderr: process.stderr,
-				cwd: process.cwd(),
-			});
-
-			fs.writeFileSync(pidFilePath, process.pid);
-		}
-
-		async.series([
-			Loader.init,
-			Loader.displayStartupMessages,
-			Loader.start,
-		], function (err) {
-			if (err) {
-				console.error('[loader] Error during startup');
-				throw err;
-			}
-		});
-	} else {
+fs.open(pathToConfig, 'r', function (err) {
+	if (err) {
 		// No config detected, kickstart web installer
 		fork('app');
+		return;
 	}
+
+	if (nconf.get('daemon') !== 'false' && nconf.get('daemon') !== false) {
+		if (file.existsSync(pidFilePath)) {
+			try {
+				var	pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
+				process.kill(pid, 0);
+				process.exit();
+			} catch (e) {
+				fs.unlinkSync(pidFilePath);
+			}
+		}
+
+		require('daemon')({
+			stdout: process.stdout,
+			stderr: process.stderr,
+			cwd: process.cwd(),
+		});
+
+		fs.writeFileSync(pidFilePath, process.pid);
+	}
+
+	async.series([
+		Loader.init,
+		Loader.displayStartupMessages,
+		Loader.start,
+	], function (err) {
+		if (err) {
+			console.error('[loader] Error during startup');
+			throw err;
+		}
+	});
 });
--- a/nodebb.bat
+++ b/nodebb.bat
@@ -1 +1 @@
-@echo off && cd %~dp0 && node ./src/cli %*
+@echo off && cd %~dp0 && node ./nodebb %*
--- a/public/images/emails/banneduser.png
+++ b/public/images/emails/banneduser.png
--- a/public/images/emails/digestheader.jpg
+++ b/public/images/emails/digestheader.jpg
--- a/public/images/emails/emailconfirm.png
+++ b/public/images/emails/emailconfirm.png
--- a/public/images/emails/invitation.png
+++ b/public/images/emails/invitation.png
--- a/public/images/emails/newtopic.png
+++ b/public/images/emails/newtopic.png
--- a/public/images/emails/nodebb.png
+++ b/public/images/emails/nodebb.png
--- a/public/images/emails/notification.png
+++ b/public/images/emails/notification.png
--- a/public/images/emails/password.png
+++ b/public/images/emails/password.png
--- a/public/images/emails/triangularbackground.png
+++ b/public/images/emails/triangularbackground.png
--- a/public/images/emails/unreadpost.png
+++ b/public/images/emails/unreadpost.png
--- a/public/js-enabled.css
+++ b/public/js-enabled.css
@@ -1,7 +1,3 @@
 /*
    The following stylesheet is only included on pages that can execute javascript
 */
-
-.page-topic [component="post/content"] img:not(.not-responsive):not([data-state]) {
-	display: none !important;
-}
--- a/public/language/README.md
+++ b/public/language/README.md
@@ -0,0 +1,14 @@
+# Important note about localising NodeBB
+
+The files here are read-only and overwritten daily (if there are changes) by the
+helper bot [Misty](https://github.com/nodebb-misty).
+
+Our localisation efforts are handled via [our Transifex Project](https://www.transifex.com/nodebb/nodebb/),
+and any pull requests made to this directory will be automatically closed because
+localisations can go out-of-sync when edited directly.
+
+If there are non-localised strings and you cannot find them in Transifex, please
+[open a new issue on our bug tracker](https://github.com/NodeBB/NodeBB/issues/new)
+so we can take a look.
+
+Thank you for helping localise NodeBB!
--- a/public/language/TODO
+++ b/public/language/TODO
@@ -1,3 +0,0 @@
-NPM INSTALL
-For now, language packs will be stored here. Eventually, will be moved to server side to allow for npm install-ability.
-When that happens, server code will generate compressed JSON language files in this folder.
--- a/public/language/ar/admin/admin.json
+++ b/public/language/ar/admin/admin.json
@@ -1,5 +1,5 @@
 {
-	"alert.confirm-reload": "هل تريد بالتأكيد إعادة تحميل NodeBB؟",
+	"alert.confirm-rebuild-and-restart": "هل أنت متأكد إنك تريد إعادة بناء وتشغيل الـ NodeBB؟",
 	"alert.confirm-restart": "هل تريد بالتأكيد إعادة تشغيل NodeBB؟",

 	"acp-title": "لوحة تحكم إدارة NodeBB | %1",
--- a/public/language/ar/admin/advanced/cache.json
+++ b/public/language/ar/admin/advanced/cache.json
@@ -3,7 +3,7 @@
 	"posts-in-cache": "المشاركات المخزنة مؤقتاً",
 	"average-post-size": "متوسط حجم المشاركة",
 	"length-to-max": "الطول / أقصى حد",
-	"percent-full": "%1% Full",
+	"percent-full": "1% كاملة",
 	"post-cache-size": "حجم التخزين المؤقت للمشاركات",
 	"items-in-cache": "العناصر في التخزين المؤقت",
 	"control-panel": "لوحة التحكم",
--- a/public/language/ar/admin/advanced/database.json
+++ b/public/language/ar/admin/advanced/database.json
@@ -18,10 +18,17 @@
 	"mongo.resident-memory": "Resident Memory",
 	"mongo.virtual-memory": "الذاكرة الإفتراضية",
 	"mongo.mapped-memory": "Mapped Memory",
+	"mongo.bytes-in": "Bytes In",
+	"mongo.bytes-out": "Bytes Out",
+	"mongo.num-requests": "Number of Requests",
 	"mongo.raw-info": "MongoDB Raw Info",
+	"mongo.unauthorized": "NodeBB was unable to query the MongoDB database for relevant statistics. Please ensure that the user in use by NodeBB contains the &quot;clusterMonitor&quot; role for the &quot;admin&quot; database.",

 	"redis": "Redis",
 	"redis.version": "Redis Version",
+	"redis.keys": "Keys",
+	"redis.expires": "Expires",
+	"redis.avg-ttl": "Average TTL",
 	"redis.connected-clients": "Connected Clients",
 	"redis.connected-slaves": "Connected Slaves",
 	"redis.blocked-clients": "Blocked Clients",
@@ -30,7 +37,16 @@
 	"redis.total-connections-recieved": "إجمالي الاتصالات المستلمة",
 	"redis.total-commands-processed": "إجمالي الأوامر التي تمت معالجتها",
 	"redis.iops": "Instantaneous Ops. Per Second",
+	"redis.iinput": "Instantaneous Input Per Second",
+	"redis.ioutput": "Instantaneous Output Per Second",
+	"redis.total-input": "Total Input",
+	"redis.total-output": "Total Ouput",
+
 	"redis.keyspace-hits": "Keyspace Hits",
 	"redis.keyspace-misses": "Keyspace Misses",
-	"redis.raw-info": "Redis Raw Info"
-}
+	"redis.raw-info": "Redis Raw Info",
+
+	"postgres": "Postgres",
+	"postgres.version": "PostgreSQL Version",
+	"postgres.raw-info": "Postgres Raw Info"
+}
--- a/public/language/ar/admin/advanced/events.json
+++ b/public/language/ar/admin/advanced/events.json
@@ -2,5 +2,10 @@
 	"events": "أحداث",
 	"no-events": "لا توجد أحداث",
 	"control-panel": "لوحة تحكم الأحداث",
-	"delete-events": "حذف الأحداث"
+	"filters": "Filters",
+	"filters-apply": "Apply Filters",
+	"filter-type": "Event Type",
+	"filter-start": "Start Date",
+	"filter-end": "End Date",
+	"filter-perPage": "Per Page"
 }
--- a/public/language/ar/admin/appearance/customise.json
+++ b/public/language/ar/admin/appearance/customise.json
@@ -1,14 +1,14 @@
 {
-	"custom-css": "CSS مخصص",
-	"custom-css.description": "أدخل CSS الخاصة بك هنا، والتي سيتم تطبيقها بعد كل القوالب الأخرى.",
-	"custom-css.enable": "تفعيل CSS المخصص",
+	"custom-css": "Custom CSS/LESS",
+	"custom-css.description": "Enter your own CSS/LESS declarations here, which will be applied after all other styles.",
+	"custom-css.enable": "Enable Custom CSS/LESS",

 	"custom-js": "Javascript مخصصة",
 	"custom-js.description": "أدخل Javascript الخاص بك هنا. سيتم تنفيذها بعد تحميل الصفحة بالكامل.",
 	"custom-js.enable": "تفعيل Javascript المخصصة",

 	"custom-header": "ترويسة مخصصة",
-	"custom-header.description": "أدخل HTML الخاصة بك هنا (مثل العلامات الوصفية، وما إلى ذلك)، والتي سيتم إلحاقها الى<code>&lt;head&gt;</code> في تصميم المنتدى. يسمح باستخدام علامات النص البرمجي، ولكن سيتم تعطيلها؛ لتوفر تبويبة\n<a href=\"#custom-header\" data-toggle=\"tab\">Javascript المخصصة</a>",
+	"custom-header.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup. Script tags are allowed, but are discouraged, as the <a href=\"#custom-js\" data-toggle=\"tab\">Custom Javascript</a> tab is available.",
 	"custom-header.enable": "تفعيل الترويسة المخصصة",

 	"custom-css.livereload": "تفعيل إعادة التحميل المباشرة",
--- a/public/language/ar/admin/appearance/themes.json
+++ b/public/language/ar/admin/appearance/themes.json
@@ -7,5 +7,5 @@
    "revert-confirm": "هل أنت متأكد من أنك ترغب في استعادة قااب NodeBB الافتراضي؟",
    "theme-changed": "تم تغيير القالب",
    "revert-success": "لقد قمت بنجاح بإستعادة القالب الأساسي لـNodeBB",
-    "restart-to-activate": "الرجاء إعادة تشغيل NodeBB لتنشيط هذا القالب بشكل كامل"
+    "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
 }
--- a/public/language/ar/admin/development/info.json
+++ b/public/language/ar/admin/development/info.json
@@ -7,7 +7,8 @@
 	"online": "online",
 	"git": "git",
 	"memory": "memory",
-	"load": "load",
+	"load": "system load",
+	"cpu-usage": "cpu usage",
 	"uptime": "uptime",

 	"registered": "Registered",
--- a/public/language/ar/admin/extend/plugins.json
+++ b/public/language/ar/admin/extend/plugins.json
@@ -9,6 +9,7 @@

 	"plugin-search": "البحث عن الإضافات",
 	"plugin-search-placeholder": "جاري البحث عن الإضافات...",
+	"submit-anonymous-usage": "Submit anonymous plugin usage data.",
 	"reorder-plugins": "إعادة ترتيب الإضافات",
 	"order-active": "ترتيب الإضافات المفعلة",
 	"dev-interested": "هل انته مهتم ببرمجة إضافات لـNodeBB؟",
@@ -29,6 +30,8 @@
 	"plugin-item.more-info": "لمزيد من المعلومات:",
 	"plugin-item.unknown": "غير معروف",
 	"plugin-item.unknown-explanation": "تعذر تحديد حالة هذه الإضافة، ربما بسبب خطأ في الإعدادات.",
+	"plugin-item.compatible": "This plugin works on NodeBB %1",
+	"plugin-item.not-compatible": "This plugin has no compatibility data, make sure it works before installing on your production environment.",

 	"alert.enabled": "الإضافة مفعلة",
 	"alert.disabled": "الإضافة معطلة",
@@ -37,13 +40,15 @@
 	"alert.uninstalled": "تم إلغاء تنصيب الإضافة",
 	"alert.activate-success": "يرجى إعادة تشغيل NodeBB لتنشيط الإضافة بشكل بالكامل",
 	"alert.deactivate-success": "تم تعطيل الإضافة بنجاح",
-	"alert.upgrade-success": "يرجى إعادة تحميل NodeBB لترقية هذه الإضافة بشكل كامل",
+	"alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
 	"alert.install-success": "تم تثبيت الإضافة بنجاح، يرجى تفعيلها.",
 	"alert.uninstall-success": "تم تعطيل الإضافة وإلغاء تنصيبها بنجاح.",
 	"alert.suggest-error": "<p>NodeBB could not reach the package manager, proceed with installation of latest version?</p><div class=\"alert alert-danger\"><strong>Server returned (%1)</strong>: %2</div>",
 	"alert.package-manager-unreachable": "<p>NodeBB could not reach the package manager, an upgrade is not suggested at this time.</p>",
 	"alert.incompatible": "<p>Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.</p>",
 	"alert.possibly-incompatible": "<div class=\"alert alert-warning\"><p><strong>No Compatibility Information Found</strong></p><p>This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.</p></div><p>In the event that NodeBB cannot boot properly:</p><pre><code>$ ./nodebb reset plugin=\"%1\"</code></pre><p>Continue installation of latest version of this plugin?</p>",
+	"alert.reorder": "Plugins Re-ordered",
+	"alert.reorder-success": "Please rebuild and restart your NodeBB to fully complete the process.",

 	"license.title": "معلومات ترخيص الإضافة",
 	"license.intro": "The plugin <strong>%1</strong> is licensed under the %2. Please read and understand the license terms prior to activating this plugin.",
--- a/public/language/ar/admin/extend/widgets.json
+++ b/public/language/ar/admin/extend/widgets.json
@@ -2,6 +2,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.",
+	"clone-from": "Clone widgets from",
 	"containers.available": "Available Containers",
 	"containers.explanation": "Drag and drop on top of any active widget",
 	"containers.none": "None",
@@ -14,6 +15,16 @@

 	"alert.confirm-delete": "Are you sure you wish to delete this widget?",
 	"alert.updated": "Widgets Updated",
-	"alert.update-success": "Successfully updated widgets"
+	"alert.update-success": "Successfully updated widgets",
+	"alert.clone-success": "Successfully cloned widgets",

+	"error.select-clone": "Please select a page to clone from",
+
+	"title": "Title",
+	"title.placeholder": "Title (only shown on some containers)",
+	"container": "Container",
+	"container.placeholder": "Drag and drop a container or enter HTML here.",
+	"show-to-groups": "Show to groups",
+	"hide-from-groups": "Hide from groups",
+	"hide-on-mobile": "Hide on mobile"
 }
--- a/public/language/ar/admin/general/dashboard.json
+++ b/public/language/ar/admin/general/dashboard.json
@@ -2,7 +2,7 @@
 	"forum-traffic": "Forum Traffic",
 	"page-views": "مشاهدات الصفحات",
 	"unique-visitors": "زائرين فريدين",
-	"users": "أعضاء",
+	"new-users": "New Users",
 	"posts": "مشاركات",
 	"topics": "مواضيع",
 	"page-views-seven": "آخر 7 ايام",
@@ -14,19 +14,23 @@
 	"page-views-custom-help": "أدخل نطاقا زمنيا لمرات مشاهدة الصفحات التي ترغب في عرضها. إذا لم يظهر منتقي التاريخ، فإن التنسيق المقبول هو <code>YYYY-MM-DD</code>",
 	"page-views-custom-error": "الرجاء إدخال نطاق تاريخ صالح بالتنسيق <code>YYYY-MM-DD</code>",

-	"stats.day": "يوم",
-	"stats.week": "إسبوع",
-	"stats.month": "شهر",
+	"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>نسخة جديدة (الإصدار %1) تم إصدارها. خذ بعين الاعتبار <a href=\"https://docs.nodebb.org/configuring/upgrade/\">ترقية NodeBB الخاص بك</a>.</p>",
-	"prerelease-upgrade-available": "<p>نسخة ما قبل الإصدار من NodeBB هذه قديمة. إصدار أحدث (الإصدار %1) تم إصداره. خذ بعين الاعتبار <a href=\"https://docs.nodebb.org/configuring/upgrade/\">ترقية NodeBB الخاص بك</a>.</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": "إعادة التشغيل غير مطلوب",
@@ -36,9 +40,10 @@
 	"search-plugin-tooltip": "نصب إضافة البحث من صفحة الإضافات البرمجية لتنشيط وظيفة البحث",

 	"control-panel": "التحكم بالنظام",
-	"reload": "إعادة تحمبل",
-	"restart": "إعادة تشغيل",
-	"restart-warning": "إعادة تحميل او تشغيل NodeBB سوف يؤدي لقطع جميع الإتصالات لبضع ثواني.",
+	"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": "التحديث الفوري للرسم البياني",
@@ -63,7 +68,12 @@
 	"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": "مستخدمين مجهولين"
+	"graphs.anonymous-users": "مستخدمين مجهولين",
+	"last-restarted-by": "Last restarted by",
+	"no-users-browsing": "No users browsing"
 }
--- a/public/language/ar/admin/general/homepage.json
+++ b/public/language/ar/admin/general/homepage.json
@@ -3,5 +3,6 @@
 	"description": "Choose what page is shown when users navigate to the root URL of your forum.",
 	"home-page-route": "Home Page Route",
 	"custom-route": "Custom Route",
-	"allow-user-home-pages": "Allow User Home Pages"
+	"allow-user-home-pages": "Allow User Home Pages",
+	"home-page-title": "Title of the home page (default \"Home\")"
 }
--- a/public/language/ar/admin/general/navigation.json
+++ b/public/language/ar/admin/general/navigation.json
@@ -5,18 +5,13 @@
 	"tooltip": "Tooltip:",
 	"text": "Text:",
 	"text-class": "Text Class: <small>optional</small>",
+	"class": "Class: <small>optional</small>",
 	"id": "ID: <small>optional</small>",

 	"properties": "Properties:",
-	"only-admins": "Only display to Admins",
-	"only-global-mods-and-admins": "Only display to Global Moderators and Admins",
-	"only-logged-in": "Only display to logged in users",
-	"only-guest": "Only display to guests",
+	"groups": "Groups:",
 	"open-new-window": "Open in a new window",

-	"installed-plugins-required": "Installed Plugins Required:",
-	"search-plugin": "Search plugin",
-
 	"btn.delete": "Delete",
 	"btn.disable": "Disable",
 	"btn.enable": "Enable",
--- a/public/language/ar/admin/general/sounds.json
+++ b/public/language/ar/admin/general/sounds.json
@@ -1,5 +1,5 @@
 {
-	"notifications": "Notifications",
+	"notifications": "التنبيهات",
 	"chat-messages": "Chat Messages",
 	"play-sound": "Play",
 	"incoming-message": "Incoming Message",
--- a/public/language/ar/admin/manage/admins-mods.json
+++ b/public/language/ar/admin/manage/admins-mods.json
@@ -0,0 +1,10 @@
+{
+    "administrators": "Administrators",
+    "global-moderators": "Global Moderators",
+    "no-global-moderators": "No Global Moderators",
+    "moderators-of-category": "%1 Moderators",
+    "no-moderators": "No Moderators",
+    "add-administrator": "Add Administrator",
+    "add-global-moderator": "Add Global Moderator",
+    "add-moderator": "Add Moderator"
+}
--- a/public/language/ar/admin/manage/categories.json
+++ b/public/language/ar/admin/manage/categories.json
@@ -1,6 +1,6 @@
 {
-	"settings": "Category Settings",
-	"privileges": "Privileges",
+	"settings": "اعدادات القسم",
+	"privileges": "الصلاحيات",

 	"name": "Category Name",
 	"description": "Category Description",
@@ -17,8 +17,10 @@
 	"parent-category": "Parent Category",
 	"optional-parent-category": "(Optional) Parent Category",
 	"parent-category-none": "(None)",
+	"copy-parent": "Copy Parent",
 	"copy-settings": "Copy Settings From",
 	"optional-clone-settings": "(Optional) Clone Settings From Category",
+	"clone-children": "Clone Children Categories And Settings",
 	"purge": "Purge Category",

 	"enable": "Enable",
@@ -28,11 +30,13 @@
 	"select-category": "Select Category",
 	"set-parent-category": "Set Parent Category",

-	"privileges.description": "You can configure the access control privileges for this category in this section. Privileges can be granted on a per-user or a per-group basis. You can add a new user to this table by searching for them in the form below.",
+	"privileges.description": "You can configure the access control privileges for portions of the site in this section. Privileges can be granted on a per-user or a per-group basis. Select the domain of effect from the dropdown below.",
+	"privileges.category-selector": "Configuring privileges for ",
 	"privileges.warning": "<strong>Note</strong>: Privilege settings take effect immediately. It is not necessary to save the category after adjusting these settings.",
 	"privileges.section-viewing": "Viewing Privileges",
 	"privileges.section-posting": "Posting Privileges",
 	"privileges.section-moderation": "Moderation Privileges",
+	"privileges.section-other": "Other",
 	"privileges.section-user": "User",
 	"privileges.search-user": "Add User",
 	"privileges.no-users": "No user-specific privileges in this category.",
@@ -41,7 +45,12 @@
 	"privileges.search-group": "Add Group",
 	"privileges.copy-to-children": "Copy to Children",
 	"privileges.copy-from-category": "Copy from Category",
+	"privileges.copy-privileges-to-all-categories": "Copy to All Categories",
+	"privileges.copy-group-privileges-to-children": "Copy this group's privileges to the children of this category.",
+	"privileges.copy-group-privileges-to-all-categories": "Copy this group's privileges to all categories.",
+	"privileges.copy-group-privileges-from": "Copy this group's privileges from another category.",
 	"privileges.inherit": "If the <code>registered-users</code> group is granted a specific privilege, all other groups receive an <strong>implicit privilege</strong>, even if they are not explicitly defined/checked. This implicit privilege is shown to you because all users are part of the <code>registered-users</code> user group, and so, privileges for additional groups need not be explicitly granted.",
+	"privileges.copy-success": "Privileges copied!",

 	"analytics.back": "Back to Categories List",
 	"analytics.title": "Analytics for \"%1\" category",
@@ -65,5 +74,8 @@
 	"alert.find-user": "Find a User",
 	"alert.user-search": "Search for a user here...",
 	"alert.find-group": "Find a Group",
-	"alert.group-search": "Search for a group here..."
+	"alert.group-search": "Search for a group here...",
+	"collapse-all": "Collapse All",
+	"expand-all": "Expand All",
+	"disable-on-create": "Disable on create"
 }
--- a/public/language/ar/admin/manage/digest.json
+++ b/public/language/ar/admin/manage/digest.json
@@ -0,0 +1,21 @@
+{
+	"lead": "A listing of digest delivery stats and times is displayed below.",
+	"disclaimer": "Please be advised that email delivery is not guaranteed, due to the nature of email technology. Many variables factor into whether an email sent to the recipient server is ultimately delivered into the user's inbox, including server reputation, blacklisted IP addresses, and whether DKIM/SPF/DMARC is configured.",
+	"disclaimer-continued": "A successful delivery means the message was sent successfully by NodeBB and acknowledged by the recipient server. It does not mean the email landed in the inbox. For best results, we recommend using a third-party email delivery service such as <a href=\"https://sendgrid.com/why-sendgrid/\">SendGrid</a>.",
+
+	"user": "User",
+	"subscription": "Subscription Type",
+	"last-delivery": "Last successful delivery",
+	"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?",
+	"resent-single": "Manual digest resend completed",
+	"resent-day": "Daily digest resent",
+	"resent-week": "Weekly digest resent",
+	"resent-month": "Monthly digest resent",
+	"null": "<em>Never</em>",
+	"manual-run": "Manual digest run:",
+
+	"no-delivery-data": "No delivery data found"
+}
--- a/public/language/ar/admin/manage/groups.json
+++ b/public/language/ar/admin/manage/groups.json
@@ -1,8 +1,12 @@
 {
-	"name": "Group Name",
+	"name": "اسم المجموعة",
+	"badge": "Badge",
+	"properties": "Properties",
 	"description": "Group Description",
 	"member-count": "Member Count",
-	"system": "System Group",
+	"system": "System",
+	"hidden": "Hidden",
+	"private": "Private",
 	"edit": "Edit",
 	"search-placeholder": "Search",
 	"create": "Create Group",
@@ -17,10 +21,12 @@
 	"edit.user-title": "Title of Members",
 	"edit.icon": "Group Icon",
 	"edit.label-color": "Group Label Color",
+	"edit.text-color": "Group Text Color",
 	"edit.show-badge": "Show Badge",
 	"edit.private-details": "If enabled, joining of groups requires approval from a group owner.",
 	"edit.private-override": "Warning: Private groups is disabled at system level, which overrides this option.",
-	"edit.disable-requests": "Disable join requests",
+	"edit.disable-join": "Disable join requests",
+	"edit.disable-leave": "Disallow users from leaving the group",
 	"edit.hidden": "Hidden",
 	"edit.hidden-details": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
 	"edit.add-user": "Add User to Group",
--- a/public/language/ar/admin/manage/ip-blacklist.json
+++ b/public/language/ar/admin/manage/ip-blacklist.json
@@ -14,5 +14,6 @@
 	"alerts.applied-success": "Blacklist Applied",

 	"analytics.blacklist-hourly": "<strong>Figure 1</strong> &ndash; Blacklist hits per hour",
-	"analytics.blacklist-daily": "<strong>Figure 2</strong> &ndash; Blacklist hits per day"
+	"analytics.blacklist-daily": "<strong>Figure 2</strong> &ndash; Blacklist hits per day",
+	"ip-banned": "IP banned"
 }
--- a/public/language/ar/admin/manage/post-queue.json
+++ b/public/language/ar/admin/manage/post-queue.json
@@ -1,6 +1,6 @@
 {
 	"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; Posting Restrictions</a> and enable <strong>Post Queue</strong>.",
+	"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>.",
 	"user": "User",
 	"category": "Category",
 	"title": "Title",
--- a/public/language/ar/admin/manage/privileges.json
+++ b/public/language/ar/admin/manage/privileges.json
@@ -0,0 +1,35 @@
+{
+	"global": "Global",
+	"global.no-users": "No user-specific global privileges.",
+	"group-privileges": "Group Privileges",
+	"user-privileges": "User Privileges",
+	"chat": "Chat",
+	"upload-images": "Upload Images",
+	"upload-files": "Upload Files",
+	"signature": "Signature",
+	"ban": "Ban",
+	"search-content": "Search Content",
+	"search-users": "Search Users",
+	"search-tags": "Search Tags",
+	"view-users": "View Users",
+	"view-tags": "View Tags",
+	"view-groups": "View Groups",
+	"allow-local-login": "Local Login",
+	"allow-group-creation": "Group Create",
+	"view-users-info": "View Users Info",
+	"find-category": "Find Category",
+	"access-category": "Access Category",
+	"access-topics": "Access Topics",
+	"create-topics": "Create Topics",
+	"reply-to-topics": "Reply to Topics",
+	"tag-topics": "Tag Topics",
+	"edit-posts": "Edit Posts",
+	"view-edit-history": "View Edit History",
+	"delete-posts": "Delete Posts",
+	"view_deleted": "View Deleted Posts",
+	"upvote-posts": "Upvote Posts",
+	"downvote-posts": "Downvote Posts",
+	"delete-topics": "Delete Topics",
+	"purge": "Purge",
+	"moderate": "Moderate"
+}
--- a/public/language/ar/admin/manage/tags.json
+++ b/public/language/ar/admin/manage/tags.json
@@ -6,6 +6,7 @@
 	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
 	"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.",
--- a/public/language/ar/admin/manage/uploads.json
+++ b/public/language/ar/admin/manage/uploads.json
@@ -0,0 +1,9 @@
+{
+    "upload-file": "Upload File",
+    "filename": "Filename",
+    "usage": "Post Usage",
+    "orphaned": "Orphaned",
+    "size/filecount": "Size / Filecount",
+    "confirm-delete": "Do you really want to delete this file?",
+    "filecount": "%1 files"
+}
--- a/public/language/ar/admin/manage/users.json
+++ b/public/language/ar/admin/manage/users.json
@@ -1,11 +1,12 @@
 {
-	"users": "Users",
-	"edit": "Edit",
+	"users": "المستخدمين",
+	"edit": "تحرير",
 	"make-admin": "Make Admin",
 	"remove-admin": "Remove Admin",
 	"validate-email": "Validate Email",
 	"send-validation-email": "Send Validation Email",
 	"password-reset-email": "Send Password Reset Email",
+	"force-password-reset": "Force Password Reset & Log User Out",
 	"ban": "Ban User(s)",
 	"temp-ban": "Ban User(s) Temporarily",
 	"unban": "Unban User(s)",
@@ -14,6 +15,8 @@
 	"delete": "Delete User(s)",
 	"purge": "Delete User(s) and Content",
 	"download-csv": "Download CSV",
+	"manage-groups": "Manage Groups",
+	"add-group": "Add Group",
 	"invite": "Invite",
 	"new": "New User",

@@ -27,6 +30,13 @@
 	"pills.banned": "Banned",
 	"pills.search": "User Search",

+	"50-per-page": "50 per page",
+	"100-per-page": "100 per page",
+	"250-per-page": "250 per page",
+	"500-per-page": "500 per page",
+
+	"search.uid": "By User ID",
+	"search.uid-placeholder": "Enter a user ID to search",
 	"search.username": "By User Name",
 	"search.username-placeholder": "Enter a username to search",
 	"search.email": "By Email",
@@ -69,11 +79,19 @@
 	"alerts.lockout-reset-success": "Lockout(s) reset!",
 	"alerts.flag-reset-success": "Flags(s) reset!",
 	"alerts.no-remove-yourself-admin": "You can't remove yourself as Administrator!",
-	"alerts.make-admin-success": "User(s) are now administrators.",
-	"alerts.confirm-remove-admin": "Do you really want to remove admins?",
-	"alerts.remove-admin-success": "User(s) are no longer administrators.",
+	"alerts.make-admin-success": "User is now administrator.",
+	"alerts.confirm-remove-admin": "Do you really want to remove this administrator?",
+	"alerts.remove-admin-success": "User is no longer administrator.",
+	"alerts.make-global-mod-success": "User is now global moderator.",
+	"alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?",
+	"alerts.remove-global-mod-success": "User is no longer global moderator.",
+	"alerts.make-moderator-success": "User is now moderator.",
+	"alerts.confirm-remove-moderator": "Do you really want to remove this moderator?",
+	"alerts.remove-moderator-success": "User is no longer moderator.",
 	"alerts.confirm-validate-email": "Do you want to validate email(s) of these user(s)?",
+	"alerts.confirm-force-password-reset": "Are you sure you want to force the password reset and log out these user(s)?",
 	"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.delete-success": "User(s) Deleted!",
@@ -85,7 +103,7 @@
 	"alerts.error-x": "<strong>Error</strong><p>%1</p>",
 	"alerts.create-success": "User created!",

-	"alerts.prompt-email": "Email: ",
+	"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."
 }
--- a/public/language/ar/admin/menu.json
+++ b/public/language/ar/admin/menu.json
@@ -1,34 +1,38 @@
 {
-	"section-general": "General",
-	"general/dashboard": "Dashboard",
-	"general/homepage": "Home Page",
-	"general/navigation": "Navigation",
-	"general/languages": "Languages",
-	"general/sounds": "Sounds",
-	"general/social": "Social",
+	"section-general": "عام",
+	"general/dashboard": "اللوحة الرئيسية",
+	"general/homepage": "الصفحة الرئيسية",
+	"general/navigation": "التصفح",
+	"general/languages": "اللغات",
+	"general/sounds": "الأصوات",
+	"general/social": "شبكات التواصل",

-	"section-manage": "Manage",
-	"manage/categories": "Categories",
-	"manage/tags": "Tags",
-	"manage/users": "Users",
-	"manage/registration": "Registration Queue",
-	"manage/post-queue": "Post Queue",
-	"manage/groups": "Groups",
-	"manage/ip-blacklist": "IP Blacklist",
+	"section-manage": "إدارة",
+	"manage/categories": "الأقسام",
+	"manage/privileges": "Privileges",
+	"manage/tags": "الكلمات المفتاحية",
+	"manage/users": "الأعضاء",
+	"manage/admins-mods": "Admins & Mods",
+	"manage/registration": "قائمة انتظار التسجيل",
+	"manage/post-queue": "قائمة انتظار المشاركة",
+	"manage/groups": "المجموعات",
+	"manage/ip-blacklist": "قائمة حظر عناوين IP",
+	"manage/uploads": "Uploads",
+	"manage/digest": "Digests",

-	"section-settings": "Settings",
-	"settings/general": "General",
-	"settings/reputation": "Reputation",
-	"settings/email": "Email",
-	"settings/user": "User",
-	"settings/group": "Group",
-	"settings/guest": "Guests",
-	"settings/uploads": "Uploads",
-	"settings/post": "Post",
-	"settings/chat": "Chat",
-	"settings/pagination": "Pagination",
-	"settings/tags": "Tags",
-	"settings/notifications": "Notifications",
+	"section-settings": "إعدادات",
+	"settings/general": "عامة",
+	"settings/reputation": "السمعة",
+	"settings/email": "البريد الإلكتروني",
+	"settings/user": "الأعضاء",
+	"settings/group": "المجموعات",
+	"settings/guest": "الزوار",
+	"settings/uploads": "الرفع",
+	"settings/post": "المشاركة",
+	"settings/chat": "الدردشة",
+	"settings/pagination": "ترقيم الصفحات",
+	"settings/tags": "الكلمات المفتاحية",
+	"settings/notifications": "التنبيهات",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",
@@ -54,13 +58,14 @@
 	"section-advanced": "Advanced",
 	"advanced/database": "Database",
 	"advanced/events": "Events",
+	"advanced/hooks": "Hooks",
 	"advanced/logs": "Logs",
 	"advanced/errors": "Errors",
 	"advanced/cache": "Cache",
 	"development/logger": "Logger",
 	"development/info": "Info",

-	"reload-forum": "Reload Forum",
+	"rebuild-and-restart-forum": "Rebuild & Restart Forum",
 	"restart-forum": "Restart Forum",
 	"logout": "Log out",
 	"view-forum": "View Forum",
@@ -71,5 +76,8 @@
 	"search.keep-typing": "Type more to see results...",
 	"search.start-typing": "Start typing to see results...",

-	"connection-lost": "Connection to %1 has been lost, attempting to reconnect..."
+	"connection-lost": "Connection to %1 has been lost, attempting to reconnect...",
+
+	"alerts.version": "Running <strong>NodeBB v%1</strong>",
+	"alerts.upgrade": "Upgrade to v%1"
 }
--- a/public/language/ar/admin/settings/advanced.json
+++ b/public/language/ar/admin/settings/advanced.json
@@ -1,14 +1,23 @@
 {
 	"maintenance-mode": "Maintenance Mode",
 	"maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.",
+	"maintenance-mode.status": "Maintenance Mode Status Code",
 	"maintenance-mode.message": "Maintenance Message",
 	"headers": "Headers",
 	"headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame",
 	"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",
 	"headers.acao-help": "To deny access to all sites, leave empty",
+	"headers.acao-regex-help": "Enter regular expressions here to match dynamic origins. To deny access to all sites, leave empty",
+	"headers.acac": "Access-Control-Allow-Credentials",
 	"headers.acam": "Access-Control-Allow-Methods",
 	"headers.acah": "Access-Control-Allow-Headers",
+	"hsts": "Strict Transport Security",
+	"hsts.enabled": "Enabled HSTS (recommended)",
+	"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.enable": "Enable Traffic Management",
--- a/public/language/ar/admin/settings/chat.json
+++ b/public/language/ar/admin/settings/chat.json
@@ -5,5 +5,7 @@
 	"disable-editing-help": "Administrators and global moderators are exempt from this restriction",
 	"max-length": "Maximum length of chat messages",
 	"max-room-size": "Maximum number of users in chat rooms",
-	"delay": "Time between chat messages in milliseconds"
+	"delay": "Time between chat messages in milliseconds",
+	"restrictions.seconds-edit-after": "Number of seconds a chat message will remain editable. (0 disabled)",
+	"restrictions.seconds-delete-after": "Number of seconds a chat message will remain deletable. (0 disabled)"
 }
--- a/public/language/ar/admin/settings/cookies.json
+++ b/public/language/ar/admin/settings/cookies.json
@@ -1,9 +1,10 @@
 {
 	"eu-consent": "EU Consent",
-	"consent.enabled": "Enabled",
+	"consent.enabled": "تفعيل",
 	"consent.message": "Notification message",
 	"consent.acceptance": "Acceptance message",
 	"consent.link-text": "Policy Link Text",
+	"consent.link-url": "Policy Link URL",
 	"consent.blank-localised-default": "Leave blank to use NodeBB localised defaults",
 	"settings": "Settings",
 	"cookie-domain": "Session cookie domain",
--- a/public/language/ar/admin/settings/email.json
+++ b/public/language/ar/admin/settings/email.json
@@ -4,6 +4,9 @@
 	"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",
@@ -30,8 +33,8 @@
 	"testing.select": "Select Email Template",
 	"testing.send": "Send Test Email",
 	"testing.send-help": "The test email will be sent to the currently logged in user's email address.",
-	"subscriptions": "Email Subscriptions",
-	"subscriptions.disable": "Disable subscriber notification emails",
+	"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>"
 }
--- a/public/language/ar/admin/settings/group.json
+++ b/public/language/ar/admin/settings/group.json
@@ -3,9 +3,9 @@
 	"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-creation": "Allow Group Creation",
-	"allow-creation-help": "If enabled, users can create groups <em>(Default: disabled)</em>",
+	"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",
 	"cover-image": "Group Cover Image",
 	"default-cover": "Default Cover Images",
 	"default-cover-help": "Add comma-separated default cover images for groups that don't have an uploaded cover image"
--- a/public/language/ar/admin/settings/guest.json
+++ b/public/language/ar/admin/settings/guest.json
@@ -1,8 +1,5 @@
 {
 	"handles": "Guest Handles",
 	"handles.enabled": "Allow guest handles",
-	"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
-	"privileges": "Guest Privileges",
-	"privileges.can-search": "Allow guests to search without logging in",
-	"privileges.can-search-users": "Allow guests to search users without logging in"
+	"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\""
 }
--- a/public/language/ar/admin/settings/notifications.json
+++ b/public/language/ar/admin/settings/notifications.json
@@ -2,5 +2,6 @@
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
 	"welcome-notification-link": "Welcome Notification Link",
-	"welcome-notification-uid": "Welcome Notification User (UID)"
+	"welcome-notification-uid": "Welcome Notification User (UID)",
+	"notification-alert-timeout": "Notification Alert Timeout"
 }
--- a/public/language/ar/admin/settings/pagination.json
+++ b/public/language/ar/admin/settings/pagination.json
@@ -6,6 +6,5 @@
 	"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",
-	"initial-num-load": "Initial Number of Topics to Load on Unread, Recent, and Popular"
+	"max-topics-per-page": "Maximum topics per page"
 }
--- a/public/language/ar/admin/settings/post.json
+++ b/public/language/ar/admin/settings/post.json
@@ -6,25 +6,34 @@
 	"sorting.most-votes": "Most Votes",
 	"sorting.most-posts": "Most Posts",
 	"sorting.topic-default": "Default Topic Sorting",
+	"length": "Post Length",
+	"post-queue": "Post Queue",
 	"restrictions": "Posting Restrictions",
+	"restrictions-new": "New User Restrictions",
 	"restrictions.post-queue": "Enable post queue",
-	"restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.",
-	"restrictions.seconds-between": "Seconds between Posts",
-	"restrictions.seconds-between-new": "Seconds between Posts for New Users",
-	"restrictions.rep-threshold": "Reputation threshold before this restriction is lifted",
-	"restrictions.seconds-defore-new": "Seconds before new user can post",
-	"restrictions.seconds-edit-after": "Number of seconds users are allowed to edit posts after posting. (0 disabled)",
-	"restrictions.seconds-delete-after": "Number of seconds users are allowed to delete posts after posting. (0 disabled)",
-	"restrictions.replies-no-delete": "Number of replies after users are disallowed to delete their own topics. (0 disabled)",
+	"restrictions.post-queue-rep-threshold": "Reputation required to bypass post queue",
+	"restrictions.groups-exempt-from-post-queue": "Select groups that should be exempt from the post queue",
+	"restrictions-new.post-queue": "Enable new user restrictions",
+	"restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval",
+	"restrictions-new.post-queue-help": "Enabling new user restrictions will set restrictions on posts created by new users",
+	"restrictions.seconds-between": "Number of seconds between posts",
+	"restrictions.seconds-between-new": "Seconds between posts for new users",
+	"restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted",
+	"restrictions.seconds-before-new": "Seconds before a new user can make their first post",
+	"restrictions.seconds-edit-after": "Number of seconds a post remains editable (set to 0 to disable)",
+	"restrictions.seconds-delete-after": "Number of seconds a post remains deletable (set to 0 to disable)",
+	"restrictions.replies-no-delete": "Number of replies after users are disallowed to delete their own topics (set to 0 to disable)",
 	"restrictions.min-title-length": "Minimum Title Length",
 	"restrictions.max-title-length": "Maximum Title Length",
 	"restrictions.min-post-length": "Minimum Post Length",
 	"restrictions.max-post-length": "Maximum Post Length",
-	"restrictions.days-until-stale": "Days until Topic is considered stale",
+	"restrictions.days-until-stale": "Days until topic is considered stale",
 	"restrictions.stale-help": "If a topic is considered \"stale\", then a warning will be shown to users who attempt to reply to that topic.",
 	"timestamp": "Timestamp",
 	"timestamp.cut-off": "Date cut-off (in days)",
 	"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>",
 	"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",
@@ -45,5 +54,6 @@
 	"composer.enable-plugin-help": "Allow plugins to add content to the help tab",
 	"composer.custom-help": "Custom Help Text",
 	"ip-tracking": "IP Tracking",
-	"ip-tracking.each-post": "Track IP Address for each post"
+	"ip-tracking.each-post": "Track IP Address for each post",
+	"enable-post-history": "Enable Post History"
 }
--- a/public/language/ar/admin/settings/reputation.json
+++ b/public/language/ar/admin/settings/reputation.json
@@ -5,5 +5,10 @@
 	"votes-are-public": "All Votes Are Public",
 	"thresholds": "Activity Thresholds",
 	"min-rep-downvote": "Minimum reputation to downvote posts",
-	"min-rep-flag": "Minimum reputation to flag posts"
+	"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"
 }
--- a/public/language/ar/admin/settings/tags.json
+++ b/public/language/ar/admin/settings/tags.json
@@ -5,8 +5,6 @@
    "min-length": "Minimum Tag Length",
    "max-length": "Maximum Tag Length",
    "goto-manage": "Click here to visit the tag management page.",
-    "privacy": "Privacy",
-    "list-private": "Make the tags list private",
    "related-topics": "Related Topics",
    "max-related-topics": "Maximum related topics to display (if supported by theme)"
 }
--- a/public/language/ar/admin/settings/uploads.json
+++ b/public/language/ar/admin/settings/uploads.json
@@ -2,10 +2,21 @@
 	"posts": "المشاركات",
 	"allow-files": "السماح للأعضاء بتحميل الملفات الإعتيادية",
 	"private": "جعل الملفات التي تم رفعها خاصة",
-	"max-image-width": "تغيير حجم الصور إلى عرض محدد (بالبكسل)",
-	"max-image-width-help": "(بالبكسل، الافتراضي: 760 بكسل، ضع إلى 0 لتعطيل الخاصية)",
+	"strip-exif-data": "Strip EXIF Data",
+	"private-extensions": "File extensions to make private",
+	"private-uploads-extensions-help": "Enter comma-separated list of file extensions to make private here (e.g. <code>pdf,xls,doc</code>). An empty list means all files are private.",
+	"resize-image-width-threshold": "Resize images if they are wider than specified width",
+	"resize-image-width-threshold-help": "(in pixels, default: 1520 pixels, set to 0 to disable)",
+	"resize-image-width": "Resize images down to specified width",
+	"resize-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
+	"resize-image-quality": "Quality to use when resizing images",
+	"resize-image-quality-help": "Use a lower quality setting to reduce the file size of resized images.",
 	"max-file-size": "الحد الأقصى لحجم الملف (بالكيبيبايت)",
 	"max-file-size-help": "(بالكيبيبايت، الافتراضي: 2048)",
+	"reject-image-width": "Maximum Image Width (in pixels)",
+	"reject-image-width-help": "Images wider than this value will be rejected.",
+	"reject-image-height": "Maximum Image Height (in pixels)",
+	"reject-image-height-help": "Images taller than this value will be rejected.",
 	"allow-topic-thumbnails": "السماح للاعضاء برفع الصور المصغرة للموضوع",
 	"topic-thumb-size": "حجم الصورة المصغرة للموضوع",
 	"allowed-file-extensions": "إمتدادات الملفات المسموح بها",
--- a/public/language/ar/admin/settings/user.json
+++ b/public/language/ar/admin/settings/user.json
@@ -1,6 +1,5 @@
 {
 	"authentication": "المصادقة",
-	"allow-local-login": "السماح بتسجيل الدخول المحلي",
 	"require-email-confirmation": "يطلب تأكيد البريد الإلكتروني",
 	"email-confirm-interval": "لا يمكن للمستخدم إعادة إرسال رسالة تأكيد البريد الالكتروني حتى مرور",
 	"email-confirm-email2": "دقائق",
@@ -9,11 +8,12 @@
 	"allow-login-with.username": "اسم المستخدم فقط",
 	"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.",
 	"disable-username-changes": "عدم السماح بتغيير اسم المستخدم",
 	"disable-email-changes": "عدم السماح بتغيير البريد الالكتروني",
 	"disable-password-changes": "عدم السماح بتغيير كلمة المرور",
 	"allow-account-deletion": "السماح بحذف الحساب",
-	"user-info-private": "إخفاء قائمة المستخدم والبيانات عن الزوار",
 	"hide-fullname": "إخفاء الإسم الكامل عن المستخدمين",
 	"hide-email": "إخفاء البريد الإلكتروني عن المستخدمين",
 	"themes": "القوالب",
@@ -26,15 +26,23 @@
 	"lockout-duration": "مدة تأمين الحساب (دقائق)",
 	"login-days": "عدد الأيام لتذكر جلسات تسجيل دخول المستخدم",
 	"password-expiry-days": "فرض عملية تغيير كلمة المرور بعد مرور عدد محدد من الأيام",
+	"session-time": "Session Time",
+	"session-time-days": "Days",
+	"session-time-seconds": "Seconds",
+	"session-time-help": "These values are used to govern how long a user stays logged in when they check &quot;Remember Me&quot; on login. Note that only one of these values will be used. If there is no <i>seconds</i> value we fall back to <i>days</i>. If there is no <i>days</i> value we default to <i>14 days</i>.",
+	"online-cutoff": "Minutes after user is considered inactive",
+	"online-cutoff-help": "If user performs no actions for this duration, they are considered inactive and they do not receive realtime updates.",
 	"registration": "تسجيل المستخدم",
 	"registration-type": "نوع التسجيل",
+	"registration-approval-type": "Registration Approval Type",
 	"registration-type.normal": "عادي",
 	"registration-type.admin-approval": "بموافقة الإدارة",
 	"registration-type.admin-approval-ip": "بموافقة الإدارة لعناوين IP",
 	"registration-type.invite-only": "بالدعوات فقط",
 	"registration-type.admin-invite-only": "بالدعوات من قبل الإدارة فقط",
 	"registration-type.disabled": "لا يوجد تسجيل",
-	"registration-type.help": "عادي - بإمكان المستخدمين التسجيل من خلال صفحة /التسجيل.<br/>\nبموافقة الإدارة - يتم وضع قائمة تسجيلات المستخدمين في <a href=\"%1/admin/manage/registration\">قائمة إنتظار موافقة</a> الإدارة.<br/>\nبموافقة الإدارة لعناوين IP - عادي بالنسبة للمستخدمين الجدد، ويتطلب موافقة الإدارة للتسجيل من عناوين IP تم التسجيل بإستخدامها مسبقاً.<br/>\nبالدعوات فقط - بإمكان المستخدمين إرسال دعوات من خلال صفحة <a href=\"%1/users\" target=\"_blank\">الأعضاء</a>.<br/>\nبالدعوات من قبل الإدارة فقط - فقط المراء بإمكانهم إرسال الدعوات من خلال صفحة <a href=\"%1/users\" target=\"_blank\">الأعضاء</a> و صفحات <a href=\"%1/admin/manage/users\">الإدارة/المشرفين/الأعضاء</a>.<br/>\nلا يوجد تسجيل - إغلاق خيار التسجيل بالكامل.<br/>",
+	"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.max-invites": "الحد الأقصى للدعوات لكل عضو",
 	"max-invites": "الحد الأقصى للدعوات لكل عضو",
 	"max-invites-help": "0  لعدم تحديد قيود، الإدارة تحصل على دعوات لامحدودة <br> هذا الخيار يعمل فقط عند تحديد خيار \"بالدعوات فقط\"",
@@ -62,5 +70,10 @@
 	"email-chat-notifs": "Send an email if a new chat message arrives and I am not online",
 	"email-post-notif": "Send an email when replies are made to topics I am subscribed to",
 	"follow-created-topics": "Follow topics you create",
-	"follow-replied-topics": "Follow topics that you reply to"
+	"follow-replied-topics": "Follow topics that you reply to",
+	"default-notification-settings": "Default notification settings",
+	"categoryWatchState": "Default category watch state",
+	"categoryWatchState.watching": "Watching",
+	"categoryWatchState.notwatching": "Not Watching",
+	"categoryWatchState.ignoring": "Ignoring"
 }
--- a/public/language/ar/category.json
+++ b/public/language/ar/category.json
@@ -7,14 +7,16 @@
    "browsing": "تصفح",
    "no_replies": "لم يرد أحد",
    "no_new_posts": "لا توجد مشاركات جديدة.",
-    "share_this_category": "شارك هذا القسم",
    "watch": "تابع",
    "ignore": "تجاهل",
    "watching": "متابع",
+    "not-watching": "لست متابع",
    "ignoring": "متجاهل",
-    "watching.description": "أظهر المواضيع في غير مقروء",
-    "ignoring.description": "لا تظهر المواضيع في غير مقروء",
-    "watch.message": "أنت الآن تتابع التحديثات من هذا القسم وجميع الأقسام الفرعية",
-    "ignore.message": "أنت الآن تتجاهل التحديثات من هذا القسم وجميع الأقسام الفرعية",
+    "watching.description": "أظهر المواضيع في الغير مقروء و الحديث",
+    "not-watching.description": "Do not show topics in unread, show in recent",
+    "ignoring.description": "Do not show topics in unread and recent",
+    "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": "الأقسام المُتابعة"
 }
--- a/public/language/ar/email.json
+++ b/public/language/ar/email.json
@@ -1,38 +1,49 @@
 {
-    "password-reset-requested": "تم طلب إعادة تعيين كلمة المرور - %1!",
+    "test-email.subject": "Test Email",
+    "password-reset-requested": "Password Reset Requested!",
    "welcome-to": "مرحبًا بك في %1",
    "invite": "دعوة من %1",
    "greeting_no_name": "مرحبًا",
    "greeting_with_name": "مرحبًا بك يا %1",
+    "email.verify-your-email.subject": "Please verify your email",
+    "email.verify.text1": "Your email address has changed!",
    "welcome.text1": "شكرًا على تسجيلك في %1!",
    "welcome.text2": "لتفعيل حسابك، نحتاج إلى التأكد من صحة عنوان البريد الإلكتروني الذي سجلت به.",
    "welcome.text3": "تم قبول نتسجيلك ، يمكنك الدخول باتسخدام اسم المستخدم و كلمة المرور.",
    "welcome.cta": "انقر هنا لتفعيل عنوان بريدك الإلكتروني",
    "invitation.text1": "%1 قام بدعوتك للانضمام لـ %2",
-    "invitation.ctr": "إضغط هنا لإنشاء حسابك",
+    "invitation.text2": "Your invitation will expire in %1 days.",
+    "invitation.cta": "Click here to create your account.",
    "reset.text1": "لقد توصلنا بطلب إعادة تعيين كلمة المرور الخاصة بك، ربما لكونك قد نسيتها, إن لم يكن الأمر كذلك، المرجو تجاهل هذه الرسالة.",
    "reset.text2": "لمواصلة طلب إعاة تعيين كلمة المرور، الرجاء تتبع هذا الرابط.",
    "reset.cta": "انقر هنا لإعادة تعيين كلمة السر الخاصة بك.",
    "reset.notify.subject": "تم تغيير كلمة المرور بنجاح",
    "reset.notify.text1": "نحيطك علما أن كلمة مرورك قد تم تغييرها في %1",
    "reset.notify.text2": "إن لم يكن لديك علم بهذا، المرجو إشعار مدبر النظام بأسرع مايمكن.",
-    "digest.notifications": "لديك تنبيهات غير مقروءة من طرف %1:",
    "digest.latest_topics": "آخر المستجدات من %1",
    "digest.cta": "انقر هنا لمشاهدة %1",
    "digest.unsub.info": "تم إرسال هذا الإشعار بآخر المستجدات وفقا لخيارات تسجيلكم.",
-    "digest.no_topics": "ليس هناك مواضيع نشيطة في %1 الماضي",
    "digest.day": "يوم",
    "digest.week": "أسبوع",
    "digest.month": "شهر",
    "digest.subject": "إستهلاك ل",
+    "digest.title.day": "Your Daily Digest",
+    "digest.title.week": "Your Weekly Digest",
+    "digest.title.month": "Your Monthly Digest",
    "notif.chat.subject": "هناك محادثة جديدة من %1",
    "notif.chat.cta": "انقر هنا لمتابعة المحادثة",
    "notif.chat.unsub.info": "تم إرسال هذا الإشعار بوجودة محادثة جديدة وفقا لخيارات تسجيلك.",
-    "notif.post.cta": "انقر هنا لقراءة الموضوع بأكمله",
    "notif.post.unsub.info": "تم إشعارك بهذه المشاركة بناءً على الخيارات التي سبق وأن حددتها.",
-    "notif.cta": "Click here to go to forum",
+    "notif.post.unsub.one-click": "Alternatively, unsubscribe from future emails like this, by clicking",
+    "notif.cta": "To the forum",
+    "notif.cta-new-reply": "View Post",
+    "notif.cta-new-chat": "View Chat",
+    "notif.test.short": "Testing Notifications",
+    "notif.test.long": "This is a test of the notifications email. Send help!",
    "test.text1": "هذه رسالة تجريبية للتأكد من صحة إعدادت الرسائل الإلكترونية في منتدى NodeBB خاصتك.",
    "unsub.cta": "انقر هنا لتغيير تلك الإعدادات",
+    "unsubscribe": "unsubscribe",
+    "unsub.success": "You will no longer receive emails from the <strong>%1</strong> mailing list",
    "banned.subject": "You have been banned from %1",
    "banned.text1": "The user %1 has been banned from %2.",
    "banned.text2": "This ban will last until %1.",
--- a/public/language/ar/error.json
+++ b/public/language/ar/error.json
@@ -11,26 +11,33 @@
    "invalid-uid": "مستخدم غير موجود",
    "invalid-username": "اسم المستخدم غير مقبول",
    "invalid-email": "البريد الاكتروني غير مقبول",
+    "invalid-fullname": "Invalid Fullname",
+    "invalid-location": "Invalid Location",
+    "invalid-birthday": "Invalid Birthday",
    "invalid-title": "Invalid title",
    "invalid-user-data": "بيانات المستخدم غير صحيحة",
    "invalid-password": "كلمة السر غير مقبولة",
    "invalid-login-credentials": "Invalid login credentials",
    "invalid-username-or-password": "المرجود تحديد اسم مستخدم و كلمة مرور",
    "invalid-search-term": "كلمة البحث غير صحيحة",
+    "invalid-url": "Invalid URL",
+    "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-not-confirmed": "عنوان بريدك الإلكتروني غير مفعل بعد. انقر هنا لتفعيله من فضلك.",
+    "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": "بريدك الإلكتروني غير مفعل. رجاءًا تفحص صندوق البريد عن رسالة التفعيل.",
+    "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.",
    "no-email-to-confirm": "هذا المنتدى يستلزم تفعيل بريدك الإلكتروني، انقر هنا من فضلك لإدخاله.",
    "email-confirm-failed": "لم نستطع تفعيل بريدك الإلكتروني، المرجو المحاولة لاحقًا.",
    "confirm-email-already-sent": "لقد تم ارسال بريد التأكيد، الرجاء اﻹنتظار 1% دقائق لإعادة اﻹرسال",
    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
+    "digest-not-enabled": "This user does not have digests enabled, or the system default is not configured to send digests",
    "username-too-short": "اسم المستخدم قصير.",
    "username-too-long": "اسم المستخدم طويل",
    "password-too-long": "كلمة السر طويلة ",
+    "reset-rate-limited": "Too many password reset requests (rate limited)",
    "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)",
@@ -76,6 +83,7 @@
    "still-uploading": "الرجاء الانتظار حتى يكتمل الرفع.",
    "file-too-big": "الحد الأقصى لرفع الملفات %1 كيلو بت. رجاءًا ارفع ملف أصغر",
    "guest-upload-disabled": "خاصية رفع الملفات غير مفعلة للزوار.",
+    "cors-error": "Unable to upload image due to misconfigured CORS",
    "already-bookmarked": "You have already bookmarked this post",
    "already-unbookmarked": "You have already unbookmarked this post",
    "cant-ban-other-admins": "لايمكن حظر مدبر نظام آخر.",
@@ -85,6 +93,7 @@
    "invalid-image-type": "نوع الصورة غير مدعوم. الأنواع المدعومة هي :  %1",
    "invalid-image-extension": "امتداد الصورة غير مدعوم.",
    "invalid-file-type": "صيغة الملف غير مدعومة. الأنواع المدعومة هي: %1",
+    "invalid-image-dimensions": "Image dimensions are too big",
    "group-name-too-short": "اسم المجموعة قصير",
    "group-name-too-long": "اسم المجموعة طويل.",
    "group-already-exists": "المجموعة موجودة مسبقا",
@@ -94,6 +103,8 @@
    "group-needs-owner": "هذه المجموعة تتطلب مالك واحد على اﻷقل",
    "group-already-invited": "المستخدم سبق وأن تمت دعوته",
    "group-already-requested": "سبق وتم تسجيل طلب العضوية",
+    "group-join-disabled": "You are not able to join this group at this time",
+    "group-leave-disabled": "You are not able to leave this group at this time",
    "post-already-deleted": "سبق وتم حذف هذا الرد",
    "post-already-restored": "سبق وتم إلغاء حذف هذا الرد",
    "topic-already-deleted": "سبق وتم حذف هذا الموضوع",
@@ -113,11 +124,20 @@
    "cant-edit-chat-message": "غير مصرح لك بتعديل الرسالة.",
    "cant-remove-last-user": "لأيمكنك إزالت اخر مستخدم.",
    "cant-delete-chat-message": "غير مصرح لك بحذف الرسالة.",
+    "chat-edit-duration-expired": "You are only allowed to edit chat messages for %1 second(s) after posting",
+    "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.",
    "already-voting-for-this-post": "لقد شاركت بالتصويت ، ألا تذكر؟",
    "reputation-system-disabled": "نظام السمعة معطل",
    "downvoting-disabled": "التصويتات السلبية معطلة",
    "not-enough-reputation-to-downvote": "ليس لديك سمعة تكفي لإضافة صوت سلبي لهذا الموضوع",
    "not-enough-reputation-to-flag": "ليس لديك سمعة تكفي للإشعار بموضوع مخل",
+    "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website",
+    "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me",
+    "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": "لقد بلغت عن هذه المشاركة من قبل.",
    "self-vote": "You cannot vote on your own post",
    "reload-failed": "المنتدى واجه مشكلة أثناء إعادة التحميل: \"%1\".  سيواصل المنتدى خدمة العملاء السابقين لكن يجب عليك إلغاء أي تغيير قمت به قبل إعادة التحميل.",
@@ -126,14 +146,21 @@
    "wrong-login-type-email": "الرجاء استعمال بريدك اﻹلكتروني للدخول",
    "wrong-login-type-username": "الرجاء استعمال اسم المستخدم الخاص بك للدخول",
    "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first",
+    "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.",
    "invite-maximum-met": "لقد قمت بدعوة الحد الأقصى من الأشخاص (%1 من %2)",
    "no-session-found": "لم دخول مسجل!",
    "not-in-room": "المستخدم غير موجود في الغرفة.",
-    "no-users-in-room": "لا يوجد مستخدمين في الغرفة.",
    "cant-kick-self": "لا يمكنك طرد نفسك من المجموعة.",
    "no-users-selected": "لا يوجد مستخدم محدد.",
    "invalid-home-page-route": "Invalid home page route",
    "invalid-session": "Session Mismatch",
    "invalid-session-text": "يبدو أن فترة التسجيل لم تعد قائمة او هي غير مطابقة مع الخادم. يرجى إعادة تحميل هذه الصفحة.",
-    "no-topics-selected": "No topics selected!"
+    "no-topics-selected": "No topics selected!",
+    "cant-move-to-same-topic": "Can't move post to same topic!",
+    "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"
 }
--- a/public/language/ar/flags.json
+++ b/public/language/ar/flags.json
@@ -9,6 +9,7 @@
 	"updated": "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",
@@ -18,6 +19,7 @@
 	"filter-type": "Flag Type",
 	"filter-type-all": "All Content",
 	"filter-type-post": "Post",
+	"filter-type-user": "User",
 	"filter-state": "State",
 	"filter-assignee": "Assignee UID",
 	"filter-cid": "Category",
--- a/public/language/ar/global.json
+++ b/public/language/ar/global.json
@@ -48,17 +48,19 @@
    "alert.banned.message": "لقد تم حظر حسابك. سيتم تسجيل الخروج.",
    "alert.unfollow": "أنت لا تتابع %1 بعد الآن!",
    "alert.follow": "أنت الآن تتابع %1!",
-    "online": "المتواجدون حاليًّا",
    "users": "الأعضاء",
    "topics": "المواضيع",
    "posts": "المشاركات",
    "best": "الأفضل",
+    "votes": "Votes",
    "upvoters": "الموافقين",
    "upvoted": "مصوت بالموجب",
    "downvoters": "مصوتين بالسالب",
    "downvoted": "مصوت بالسالب",
    "views": "المشاهدات",
    "reputation": "السمعة",
+    "lastpost": "Last post",
+    "firstpost": "First post",
    "read_more": "اقرأ المزيد",
    "more": "المزيد",
    "posted_ago_by_guest": "كتب %1 بواسطة زائر",
@@ -76,6 +78,7 @@
    "recentposts": "آخر المشاركات",
    "recentips": "آخر عناوين ال IP التي سجلت الدخول",
    "moderator_tools": "أدوات المشرف",
+    "online": "المتواجدون حاليًّا",
    "away": "غير متواجد",
    "dnd": "عدم الإزعاج",
    "invisible": "مخفي",
@@ -84,6 +87,7 @@
    "language": "اللغة",
    "guest": "زائر",
    "guests": "الزوار",
+    "former_user": "A Former User",
    "updated.title": "تم تحديث المنتدى",
    "updated.message": "لقد تم تحديث المنتدى إلى آخر نسخة للتو. إضغط هنا لإعادة تحميل الصفحة.",
    "privacy": "الخصوصية",
@@ -96,6 +100,7 @@
    "enter_page_number": "ادخل رقم الصفحة",
    "upload_file": "ارفع ملف",
    "upload": "ارفع",
+    "uploads": "Uploads",
    "allowed-file-types": "صيغ الملفات المدعومة هي 1%",
    "unsaved-changes": "لديك تغييرات لم تحفظ. هل أنت متأكد من رغبتك بمغادرة الصفحة؟",
    "reconnecting-message": "يبدو أن اتصالك لـ %1 قد فقد. رجاءًا أنتظر ثم حاول الإتصال مرة اخرى.",
@@ -105,5 +110,6 @@
    "cookies.learn_more": "أعرف المزيد",
    "edited": "حُرِر",
    "disabled": "معطل",
-    "select": "تحديد"
+    "select": "تحديد",
+    "user-search-prompt": "Type something here to find users..."
 }
--- a/public/language/ar/groups.json
+++ b/public/language/ar/groups.json
@@ -25,9 +25,11 @@
    "details.latest_posts": "آخر المشاركات",
    "details.private": "خاص",
    "details.disableJoinRequests": "Disable join requests",
+    "details.disableLeave": "Disallow users from leaving the group",
    "details.grant": "منح/سحب المِلكية",
    "details.kick": "طرد",
    "details.kick_confirm": "Are you sure you want to remove this member from the group?",
+    "details.add-member": "Add Member",
    "details.owner_options": "إدارة المجموعة",
    "details.group_name": "اسم المجموعة",
    "details.member_count": "عدد اﻷعضاء",
@@ -35,7 +37,8 @@
    "details.description": "الوصف",
    "details.badge_preview": "معاينة الوسام",
    "details.change_icon": "تغيير الأيقونة",
-    "details.change_colour": "تغيير اللون",
+    "details.change_label_colour": "Change Label Colour",
+    "details.change_text_colour": "Change Text Colour",
    "details.badge_text": "نص الوسام",
    "details.userTitleEnabled": "إظهار الوسام",
    "details.private_help": "في حالة تفعيل الخيار، الانضمام إلى المجموعة يستلزم قبول مالكها",
@@ -46,9 +49,11 @@
    "event.updated": "تم تحديث بيانات المجموعة",
    "event.deleted": "تم حذف المجموعة %1",
    "membership.accept-invitation": "اقبل الدعوة",
+    "membership.accept.notification_title": "You are now a member of <strong>%1</strong>",
    "membership.invitation-pending": "الدعوة بانتظار القبول",
    "membership.join-group": "انظم للمجموعة",
    "membership.leave-group": "غادر المجموعة",
+    "membership.leave.notification_title": "<strong>%1</strong> has left group <strong>%2</strong>",
    "membership.reject": "رفض",
    "new-group.group_name": "اسم المجموعة",
    "upload-group-cover": "Upload group cover",
--- a/public/language/ar/modules.json
+++ b/public/language/ar/modules.json
@@ -1,5 +1,5 @@
 {
-    "chat.chatting_with": "الدردشة مع <span id=\"chat-with-name\"></span>",
+    "chat.chatting_with": "Chat with",
    "chat.placeholder": "أكتب رسالة دردشة هنا، اضغط ENTER للإرسال",
    "chat.send": "أرسل",
    "chat.no_active": "لا يوجد لديك دردشات نشطة.",
@@ -12,6 +12,7 @@
    "chat.recent-chats": "آخر الدردشات",
    "chat.contacts": "الأصدقاء",
    "chat.message-history": "تاريخ الرسائل",
+    "chat.options": "Chat options",
    "chat.pop-out": "افتح الدردشة في نافذة خاصة",
    "chat.minimize": "Minimize",
    "chat.maximize": "تكبير",
@@ -19,8 +20,23 @@
    "chat.thirty_days": "30 يومًا",
    "chat.three_months": "3 أشهر",
    "chat.delete_message_confirm": "هل أنت متأكد من أنك تريد حذف هذه الرسالة؟",
-    "chat.add-users-to-room": "Add users to room",
+    "chat.retrieving-users": "Retrieving users...",
+    "chat.manage-room": "Manage Chat Room",
+    "chat.add-user-help": "Search for users here. When selected, the user will be added to the chat. The new user will not be able to see chat messages written before they were added to the conversation. Only room owners (<i class=\"fa fa-star text-warning\"></i>) may remove users from chat rooms.",
    "chat.confirm-chat-with-dnd-user": "This user has set their status to DnD(Do not disturb). Do you still want to chat with them?",
+    "chat.rename-room": "Rename Room",
+    "chat.rename-placeholder": "Enter your room name here",
+    "chat.rename-help": "The room name set here will be viewable by all participants in the room.",
+    "chat.leave": "Leave Chat",
+    "chat.leave-prompt": "Are you sure you wish to leave this chat?",
+    "chat.leave-help": "Leaving this chat will remove you from future correspondence in this chat. If you are re-added in the future, you will not see any chat history from prior to your re-joining.",
+    "chat.in-room": "In this room",
+    "chat.kick": "Kick",
+    "chat.show-ip": "Show IP",
+    "chat.owner": "Room Owner",
+    "chat.system.user-join": "%1 has joined the room",
+    "chat.system.user-leave": "%1 has left the room",
+    "chat.system.room-rename": "%2 has renamed this room: %1",
    "composer.compose": "اكتب",
    "composer.show_preview": "عرض المعاينة",
    "composer.hide_preview": "إخفاء المعاينة",
@@ -34,6 +50,7 @@
    "composer.formatting.italic": "Italic",
    "composer.formatting.list": "List",
    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.code": "Code",
    "composer.formatting.link": "Link",
    "composer.formatting.picture": "Picture",
    "composer.upload-picture": "Upload Image",
--- a/public/language/ar/notifications.json
+++ b/public/language/ar/notifications.json
@@ -5,21 +5,20 @@
    "mark_all_read": "اجعل كل التنبيهات مقروءة",
    "back_to_home": "عودة إلى %1",
    "outgoing_link": "رابط خارجي",
-    "outgoing_link_message": "You are now leaving %1",
+    "outgoing_link_message": "أنت تغادر اﻻن %1",
    "continue_to": "استمر إلى %1",
    "return_to": "عودة إى %1",
-    "new_notification": "تنبيه جديد",
-    "new_notification_from": "You have a new Notification from %1",
+    "new_notification": "لديك تنبيه جديد",
    "you_have_unread_notifications": "لديك تنبيهات غير مقروءة.",
-    "all": "All",
-    "topics": "Topics",
-    "replies": "Replies",
-    "chat": "Chats",
-    "follows": "Follows",
-    "upvote": "Upvotes",
+    "all": "الكل",
+    "topics": "مواضيع",
+    "replies": "ردود",
+    "chat": "محادثات",
+    "follows": "متابعون",
+    "upvote": "الموافقين",
    "new-flags": "New Flags",
    "my-flags": "Flags assigned to me",
-    "bans": "Bans",
+    "bans": "الحظر",
    "new_message_from": "رسالة جديدة من <strong>%1</strong>",
    "upvoted_your_post_in": "<strong>%1</strong> أضاف صوتًا إيجابيا إلى مشاركتك في <strong>%2</strong>.",
    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
@@ -41,22 +40,23 @@
    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
    "new_register": "<strong>%1</strong> sent a registration request.",
    "new_register_multiple": "There are <strong>%1</strong> registration requests awaiting review.",
-    "flag_assigned_to_you": "<strong>Flag %1</strong> has been assigned to you",
+    "flag_assigned_to_you": "تم تخصيص العلامة 1%  لك",
    "post_awaiting_review": "Post awaiting review",
    "email-confirmed": "تم التحقق من عنوان البريد الإلكتروني",
    "email-confirmed-message": "شكرًا على إثبات صحة عنوان بريدك الإلكتروني. صار حسابك مفعلًا بالكامل.",
    "email-confirm-error-message": "حدث خطأ أثناء التحقق من عنوان بريدك الإلكتروني. ربما رمز التفعيل خاطئ أو انتهت صلاحيته.",
    "email-confirm-sent": "تم إرسال بريد التفعيل.",
    "none": "None",
-    "notification_only": "Notification Only",
-    "email_only": "Email Only",
-    "notification_and_email": "Notification & Email",
-    "notificationType_upvote": "When someone upvotes your post",
+    "notification_only": "التنبيهات فقط",
+    "email_only": "البريد الالكتروني فقط",
+    "notification_and_email": "التنبيهات والبريد اﻻلكتروني",
+    "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_follow": "When someone starts following you",
    "notificationType_new-chat": "When you receive a chat message",
    "notificationType_group-invite": "When you receive a group invite",
+    "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",
    "notificationType_new-post-flag": "When a post is flagged",
--- a/public/language/ar/pages.json
+++ b/public/language/ar/pages.json
@@ -6,6 +6,10 @@
    "popular-month": "المواضيع الشائعة هذا الشهر",
    "popular-alltime": "المواضيع الشائعة منذ القدم",
    "recent": "المواضيع الحديثة",
+    "top-day": "Top voted topics today",
+    "top-week": "Top voted topics this week",
+    "top-month": "Top voted topics this month",
+    "top-alltime": "Top Voted Topics",
    "moderator-tools": "Moderator Tools",
    "flagged-content": "Flagged Content",
    "ip-blacklist": "IP Blacklist",
@@ -19,7 +23,7 @@
    "users/search": "بحث عن مستخدم",
    "notifications": "التنبيهات",
    "tags": "الكلمات الدلالية",
-    "tag": "المواضيع المرتبطة بالوسم %1",
+    "tag": "Topics tagged under &quot;%1&quot;",
    "register": "تسجيل حساب",
    "registration-complete": "Registration complete",
    "login": "سجل الدخول الى حسابك",
@@ -39,8 +43,10 @@
    "account/following": "People %1 follows",
    "account/followers": "People who follow %1",
    "account/posts": "Posts made by %1",
+    "account/latest-posts": "Latest posts made by %1",
    "account/topics": "Topics created by %1",
    "account/groups": "%1's Groups",
+    "account/watched_categories": "%1's Watched Categories",
    "account/bookmarks": "%1's Bookmarked Posts",
    "account/settings": "خيارات المستخدم",
    "account/watched": "Topics watched by %1",
@@ -48,6 +54,9 @@
    "account/upvoted": "Posts upvoted by %1",
    "account/downvoted": "Posts downvoted by %1",
    "account/best": "Best posts made by %1",
+    "account/blocks": "Blocked users for %1",
+    "account/uploads": "Uploads by %1",
+    "account/sessions": "Login Sessions",
    "confirm": "تم التحقق من عنوان البريد الإلكتروني",
    "maintenance.text": "جاري صيانة %1. المرجو العودة لاحقًا.",
    "maintenance.messageIntro": "بالإضافة إلى ذلك، قام مدبر النظام بترك هذه الرسالة:",
--- a/public/language/ar/register.json
+++ b/public/language/ar/register.json
@@ -19,5 +19,8 @@
    "terms_of_use_error": "يجب عليك الموافقة على شروط الاستخدام",
    "registration-added-to-queue": "تمت إضافتك في قائمة الإنتضار. ستتلقى رسالة إلكترونية عند الموافقة على تسجيلك من قبل الإدارة.",
    "interstitial.intro": "نحتاج إلى بعض المعلومات الإضافية قبل أن نتمكن من إنشاء حسابك.",
-    "interstitial.errors-found": "تعذر علينا إتمام عملية التسجيل:"
+    "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."
 }
--- a/public/language/ar/reset_password.json
+++ b/public/language/ar/reset_password.json
@@ -9,7 +9,7 @@
    "repeat_password": "تأكيد كلمة المرور",
    "enter_email": "يرجى إدخال <strong>عنوان البريد الإلكتروني</strong> الخاص بك وسوف نرسل لك رسالة بالبريد الالكتروني مع تعليمات حول كيفية إستعادة حسابك.",
    "enter_email_address": "ادخل عنوان البريد الإلكتروني",
-    "password_reset_sent": "إعادة تعيين كلمة السر أرسلت",
+    "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.",
    "invalid_email": "بريد إلكتروني غير صالح أو غير موجود",
    "password_too_short": "كلمة المرور التي أدخلتها قصيرة، الرجاء اختر  كلمة مرور مختلفة",
    "passwords_do_not_match": "كلمتا السر التي أدخلتهما غير متطابقتان",
--- a/public/language/ar/search.json
+++ b/public/language/ar/search.json
@@ -5,6 +5,9 @@
    "in": "في",
    "titles": "العناوين",
    "titles-posts": "العناوين والمشاركات",
+    "match-words": "Match words",
+    "all": "All",
+    "any": "Any",
    "posted-by": "مشاركة من طرف",
    "in-categories": "في الفئات",
    "search-child-categories": "بحث في الفئات الفرعية",
@@ -14,6 +17,7 @@
    "at-most": "على اﻷكثر",
    "relevance": "Relevance",
    "post-time": "تاريخ المشاركة",
+    "votes": "Votes",
    "newer-than": "أحدث من",
    "older-than": "أقدم من",
    "any-date": "أي وقت",
@@ -27,6 +31,7 @@
    "sort-by": "عرض حسب",
    "last-reply-time": "تاريخ آخر رد",
    "topic-title": "عنوان الموضوع",
+    "topic-votes": "Topic votes",
    "number-of-replies": "عدد الردود",
    "number-of-views": "عدد المشاهدات",
    "topic-start-date": "تاريخ بدأ الموضوع",
@@ -38,5 +43,6 @@
    "clear-preferences": "ازالة التفضيلات",
    "search-preferences-saved": "تم حفظ تفضيلات البحث",
    "search-preferences-cleared": "تم ازالة تفضيلات البحث",
-    "show-results-as": "عرض النتائج كـ"
+    "show-results-as": "عرض النتائج كـ",
+    "see-more-results": "See more results (%1)"
 }
--- a/public/language/ar/topic.json
+++ b/public/language/ar/topic.json
@@ -18,11 +18,13 @@
    "last_reply_time": "Last reply",
    "reply-as-topic": "رد بموضوع",
    "guest-login-reply": "يجب عليك تسجيل الدخول للرد",
+    "login-to-view": "🔒 Log in to view",
    "edit": "تعديل",
    "delete": "حذف",
    "purge": "تطهير",
    "restore": "استعادة",
    "move": "نقل",
+    "change-owner": "Change Owner",
    "fork": "فرع",
    "link": "رابط",
    "share": "نشر",
@@ -30,8 +32,12 @@
    "locked": "مقفل",
    "pinned": "مثبت",
    "moved": "منقول",
+    "copy-ip": "Copy IP",
+    "ban-ip": "Ban IP",
+    "view-history": "Edit History",
    "bookmark_instructions": "اضغط هنا للعودة لأخر مشاركة مقروءة في الموضوع",
    "flag_title": "إشعار بمشاركة مخلة.",
+    "merged_message": "This topic has been merged into <a href=\"/topic/%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.",
@@ -52,13 +58,15 @@
    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
    "thread_tools.title": "أدوات الموضوع",
-    "thread_tools.markAsUnreadForAll": "Mark unread for all",
+    "thread_tools.markAsUnreadForAll": "Mark Unread For All",
    "thread_tools.pin": "علق الموضوع",
    "thread_tools.unpin": "إلغاء تعليق الموضوع",
    "thread_tools.lock": "أقفل الموضوع",
    "thread_tools.unlock": "إلغاء إقفال الموضوع",
    "thread_tools.move": "نقل الموضوع",
+    "thread_tools.move-posts": "Move Posts",
    "thread_tools.move_all": "نقل الكل",
+    "thread_tools.change_owner": "Change Owner",
    "thread_tools.select_category": "Select Category",
    "thread_tools.fork": "إنشاء فرع الموضوع",
    "thread_tools.delete": "حذف الموضوع",
@@ -92,6 +100,8 @@
    "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",
+    "change_owner_instruction": "Click the posts you want to assign to another user",
    "composer.title_placeholder": "أدخل عنوان موضوعك هنا...",
    "composer.handle_placeholder": "اﻹسم",
    "composer.discard": "نبذ التغييرات",
@@ -112,11 +122,18 @@
    "sort_by": "ترتيب حسب",
    "oldest_to_newest": "من الأقدم إلى الأحدث",
    "newest_to_oldest": "من الأحدث إلى الأقدم",
-    "most_votes": "الأكثر تصويتًا",
-    "most_posts": "اﻷكثر رداً",
+    "most_votes": "Most Votes",
+    "most_posts": "Most Posts",
    "stale.title": "Create new topic instead?",
    "stale.warning": "The topic you are replying to is quite old. Would you like to create a new topic instead, and reference this one in your reply?",
    "stale.create": "موضوع جديد",
    "stale.reply_anyway": "الرد على هذا الموضوع ",
-    "link_back": "رد:  [%1](%2)"
+    "link_back": "رد:  [%1](%2)",
+    "diffs.title": "Post Edit History",
+    "diffs.description": "This post has <strong>%1</strong> revisions. Click one of the revisions below to see the post content at that point in time.",
+    "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
+    "diffs.current-revision": "current revision",
+    "diffs.original-revision": "original revision",
+    "timeago_later": "%1 later",
+    "timeago_earlier": "%1 earlier"
 }
--- a/public/language/ar/uploads.json
+++ b/public/language/ar/uploads.json
@@ -2,5 +2,8 @@
    "uploading-file": "جاري رفع الملف...",
    "select-file-to-upload": "إختر ملف لرفعه!",
    "upload-success": "تم رفع الملف بنجاح!",
-    "maximum-file-size": "الحجم الأقصى %1 كيلوبت"
+    "maximum-file-size": "الحجم الأقصى %1 كيلوبت",
+    "no-uploads-found": "No uploads found",
+    "public-uploads-info": "Uploads are public, all visitors can see them.",
+    "private-uploads-info": "Uploads are private, only logged in users can see them."
 }
--- a/public/language/ar/user.json
+++ b/public/language/ar/user.json
@@ -1,6 +1,7 @@
 {
    "banned": "محظور",
    "offline": "غير متصل",
+    "deleted": "Deleted",
    "username": "إسم المستخدم",
    "joindate": "تاريخ الإنضمام",
    "postcount": "عدد المشاركات",
@@ -11,7 +12,7 @@
    "ban_account_confirm": "هل تريد حقاً حظر هاذا العضو؟",
    "unban_account": "إزالة حظر الحساب",
    "delete_account": "حذف الحساب",
-    "delete_account_confirm": "هل أن متأكد أنك تريد حذف حسابك؟<br /><strong> هذه العملية غير قابلة للإلغاء ولن يكون بالإمكان استعادة بياناتك</strong><br /><br />أدخل اسم المستخدم الخاص بك لتأكيد عملية الحذف",
+    "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 />",
    "account-deleted": "تم حذف الحساب",
    "fullname": "الاسم الكامل",
@@ -24,10 +25,17 @@
    "profile_views": "عدد المشاهدات",
    "reputation": "السمعة",
    "bookmarks": "Bookmarks",
+    "watched_categories": "Watched categories",
+    "change_all": "Change All",
    "watched": "متابع",
    "ignored": "تم تجاهله",
+    "default-category-watch-state": "Default category watch state",
    "followers": "المتابعون",
    "following": "يتابع",
+    "blocks": "Blocks",
+    "block_toggle": "Toggle Block",
+    "block_user": "Block User",
+    "unblock_user": "Unblock User",
    "aboutme": "معلومة عنك او السيرة الذاتية",
    "signature": "توقيع",
    "birthday": "عيد ميلاد",
@@ -42,6 +50,7 @@
    "change_picture": "تغيير الصورة",
    "change_username": "تغيير اسم المستخدم",
    "change_email": "تغيير البريد اﻹلكتروني",
+    "email_same_as_password": "Please enter your current password to continue &ndash; you've entered your new email again",
    "edit": "تعديل",
    "edit-profile": "تعديل الملف الشخصي",
    "default_picture": "أيقونة افتراضية",
@@ -52,7 +61,6 @@
    "change_password": "تغيير كلمة السر",
    "change_password_error": "كلمة سر غير صحيحة",
    "change_password_error_wrong_current": "كلمة السر الحالية ليست صحيحة",
-    "change_password_error_length": "كلمة السر قصيرة",
    "change_password_error_match": "كلمة السر غير مطابقة لتأكيد كلمة السر",
    "change_password_error_privileges": "ليس لديك الصلاحيات الكافية لتغيير كلمة السر هذه.",
    "change_password_success": "تم تحديث كلمة السر خاصتك.",
@@ -79,7 +87,6 @@
    "digest_daily": "يوميا",
    "digest_weekly": "أسبوعيًّا",
    "digest_monthly": "شهريًّا",
-    "settings-require-reload": "تغيير بعض اﻹعدادات يتطلب تحديث الصفحة. إضغط هنا لتحديث الصفحة",
    "has_no_follower": "هذا المستخدم ليس لديه أية متابعين :(",
    "follows_no_one": "هذا المستخدم لا يتابع أحد :(",
    "has_no_posts": "هذا المستخدم لم يشارك حتى الآن.",
@@ -89,12 +96,14 @@
    "has_no_upvoted_posts": "هذا المستخدم لم يقم بالتصويت للأعلى لأي مشاركة حتى الآن.",
    "has_no_downvoted_posts": "هذا المستخدم لم يقم بالتصويت للأسفل لأي مشاركة حتى الآن.",
    "has_no_voted_posts": "هذا المستخدم لا يمتلك اية مشاركات تم التصويت عليها",
+    "has_no_blocks": "You have blocked no users.",
    "email_hidden": "البريد الإلكتروني مخفي",
    "hidden": "مخفي",
    "paginate_description": "عرض المواضيع والردود موزعة على صفحات عوضاً عن التمرير اللانهائي.",
    "topics_per_page": "المواضيع في كل صفحة",
    "posts_per_page": "الردود في كل صفحة",
    "max_items_per_page": "أقصى %1",
+    "acp_language": "Admin Page Language",
    "notification_sounds": "تشغيل صوت عند تلقي تنبيه",
    "notifications_and_sounds": "التنبيهات والأصوات",
    "incoming-message-sound": "صوت الرسالة الواردة",
@@ -103,19 +112,20 @@
    "no-sound": "بدون صوت",
    "upvote-notif-freq": "معدل تكرار تنبيهات التصويت للأعلى",
    "upvote-notif-freq.all": "كل التصويتات للأعلى",
+    "upvote-notif-freq.first": "First Per Post",
    "upvote-notif-freq.everyTen": "كل عشر تصويتات للأعلى",
+    "upvote-notif-freq.threshold": "On 1, 5, 10, 25, 50, 100, 150, 200...",
    "upvote-notif-freq.logarithmic": "On 10, 100, 1000...",
    "upvote-notif-freq.disabled": "معطل",
    "browsing": "خيارات التصفح",
    "open_links_in_new_tab": "فتح الروابط الخارجية في نافدة جديدة",
    "enable_topic_searching": "تفعيل خاصية البحث داخل المواضيع",
    "topic_search_help": "إذا قمت بتفعيل ميزة البحث في-الموضوع،  سيتم تجاوز الخيار الافتراضي للمتصفح مما يؤدي للبحث بكامل الموضوع بدلا عن البحث في الجزء الظاهر في الشاشة.",
-    "delay_image_loading": "تأخير عرض الصور",
-    "image_load_delay_help": "إذا تم تمكينه، فلن يتم تحميل الصور في المواضيع حتى يتم تمريرها في الشاشة",
-    "scroll_to_my_post": "After posting a reply, show the new post",
+    "scroll_to_my_post": "بعد اضافة رد على المشاركة, قم بإظهار المشاركة",
    "follow_topics_you_reply_to": "متابعة المواضيع التي تقوم بالرد عليها",
    "follow_topics_you_create": "متابعة المواضيع التي تقوم بإنشائها",
    "grouptitle": "عنوان المجموعة",
+    "group-order-help": "Select a group and use the arrows to order titles",
    "no-group-title": "لا يوجد عنوان للمجموعة",
    "select-skin": "إختر سمة",
    "select-homepage": "إختر الصفحة الرئيسية",
@@ -141,5 +151,26 @@
    "info.email-history": "سجل البريد الإلكتروني",
    "info.moderation-note": "ملاحظة الإشراف",
    "info.moderation-note.success": "تم حفظ ملاحظة الإشراف",
-    "info.moderation-note.add": "إضافة ملاحظة"
+    "info.moderation-note.add": "إضافة ملاحظة",
+    "sessions.description": "This page allows you to view any active sessions on this forum and revoke them if necessary. You can revoke your own session by logging out of your account.",
+    "consent.title": "Your Rights &amp; Consent",
+    "consent.lead": "This community forum collects and processes your personal information.",
+    "consent.intro": "We use this information strictly to personalise your experience in this community, as well as to associate the posts you make to your user account. During the registration step you were asked to provide a username and email address, you can also optionally provide additional information to complete your user profile on this website.<br /><br />We retain this information for the life of your user account, and you are able to withdraw consent at any time by deleting your account. At any time you may request a copy of your contribution to this website, via your Rights &amp; Consent page.<br /><br />If you have any questions or concerns, we encourage you to reach out to this forum's administrative team.",
+    "consent.email_intro": "Occasionally, we may send emails to your registered email address in order to provide updates and/or to notify you of new activity that is pertinent to you. You can customise the frequency of the community digest (including disabling it outright), as well as select which types of notifications to receive via email, via your user settings page.",
+    "consent.digest_frequency": "Unless explicitly changed in your user settings, this community delivers email digests every %1.",
+    "consent.digest_off": "Unless explicitly changed in your user settings, this community does not send out email digests",
+    "consent.received": "You have provided consent for this website to collect and process your information. No additional action is required.",
+    "consent.not_received": "You have not provided consent for data collection and processing. At any time this website&apos;s administration may elect to delete your account in order to become compliant with the General Data Protection Regulation.",
+    "consent.give": "Give consent",
+    "consent.right_of_access": "You have the Right of Access",
+    "consent.right_of_access_description": "You have the right to access any data collected by this website upon request. You can retrieve a copy of this data by clicking the appropriate button below.",
+    "consent.right_to_rectification": "You have the Right to Rectification",
+    "consent.right_to_rectification_description": "You have the right to change or update any inaccurate data provided to us. Your profile can be updated by editing your profile, and post content can always be edited. If this is not the case, please contact this site&apos;s administrative team.",
+    "consent.right_to_erasure": "You have the Right to Erasure",
+    "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_uploads": "Export Uploaded Content (.zip)",
+    "consent.export_posts": "Export Posts (.csv)"
 }
--- a/public/language/ar/users.json
+++ b/public/language/ar/users.json
@@ -10,6 +10,7 @@
    "filter-by": "Filter By",
    "online-only": "المتصلون فقط",
    "invite": "دعوة",
+    "prompt-email": "Emails:",
    "invitation-email-sent": "تم إرسال دعوة بالبريد الإلكتروني إلى %1",
    "user_list": "قائمة اﻷعضاء",
    "recent_topics": "أحدث المواضيع",
--- a/public/language/bg/admin/admin.json
+++ b/public/language/bg/admin/admin.json
@@ -1,5 +1,5 @@
 {
-	"alert.confirm-reload": "Наистина ли искате да презаредите NodeBB?",
+	"alert.confirm-rebuild-and-restart": "Наистина ли искате да изградите повторно и да рестартирате NodeBB?",
 	"alert.confirm-restart": "Наистина ли искате да рестартирате NodeBB?",

 	"acp-title": "%1 | Контролен панел за администратори на NodeBB",
--- a/public/language/bg/admin/advanced/database.json
+++ b/public/language/bg/admin/advanced/database.json
@@ -18,10 +18,17 @@
 	"mongo.resident-memory": "Текущо активна памет",
 	"mongo.virtual-memory": "Виртуална памет",
 	"mongo.mapped-memory": "Заделена памет",
+	"mongo.bytes-in": "Байтове ВХ",
+	"mongo.bytes-out": "Байтове ИЗХ",
+	"mongo.num-requests": "Брой заявки",
 	"mongo.raw-info": "Сурови данни от MongoDB",
+	"mongo.unauthorized": "NodeBB не успя да получи нужните статистики от MongoDB. Моля, уверете се, че потребителят, който се използва от NodeBB, включва ролята „clusterMonitor“ за базата данни „admin“.",

 	"redis": "Redis",
 	"redis.version": "Версия на Redis",
+	"redis.keys": "Ключове",
+	"redis.expires": "Изтичания",
+	"redis.avg-ttl": "Средно време на живот (TTL)",
 	"redis.connected-clients": "Свързани клиенти",
 	"redis.connected-slaves": "Свързани второстепенни сървъри",
 	"redis.blocked-clients": "Блокирани клиенти",
@@ -30,7 +37,16 @@
 	"redis.total-connections-recieved": "Общо получени свързвания",
 	"redis.total-commands-processed": "Общо обработени команди",
 	"redis.iops": "Едновременни операции в секунда",
+	"redis.iinput": "Едновременен вход в секунда",
+	"redis.ioutput": "Едновременен изход в секунда",
+	"redis.total-input": "Общ вход",
+	"redis.total-output": "Общ изход",
+
 	"redis.keyspace-hits": "Успешни търсения на ключове",
 	"redis.keyspace-misses": "Неуспешни търсения на ключове",
-	"redis.raw-info": "Сурови данни от Redis"
-}
+	"redis.raw-info": "Сурови данни от Redis",
+
+	"postgres": "Postgres",
+	"postgres.version": "Версия на PostgreSQL",
+	"postgres.raw-info": "Сурови данни от Postgres"
+}
--- a/public/language/bg/admin/advanced/events.json
+++ b/public/language/bg/admin/advanced/events.json
@@ -2,5 +2,10 @@
 	"events": "Събития",
 	"no-events": "Няма събития",
 	"control-panel": "Контролен панел за събитията",
-	"delete-events": "Изтриване на събитията"
+	"filters": "Филтри",
+	"filters-apply": "Прилагане на филтрите",
+	"filter-type": "Вид събитие",
+	"filter-start": "Начална дата",
+	"filter-end": "Крайна дата",
+	"filter-perPage": "На страница"
 }
--- a/public/language/bg/admin/appearance/customise.json
+++ b/public/language/bg/admin/appearance/customise.json
@@ -1,14 +1,14 @@
 {
-	"custom-css": "Персонализиран CSS",
-	"custom-css.description": "Въведете своите собствени декларации за стилове, те ще бъдат приложени след всички останали стилове.",
-	"custom-css.enable": "Включване на персонализиран CSS",
+	"custom-css": "Персонализиран CSS/LESS",
+	"custom-css.description": "Въведете своите собствени декларации на CSS/LESS, те ще бъдат приложени след всички останали стилове.",
+	"custom-css.enable": "Включване на персонализиран CSS/LESS",

 	"custom-js": "Персонализиран код на Javascript",
 	"custom-js.description": "Въведете свой собствен код на javascript тук. Той ще бъде изпълнен след като страницата се зареди напълно.",
 	"custom-js.enable": "Включване на персонализирания код на Javascript",

 	"custom-header": "Персонализирана заглавна част",
-	"custom-header.description": "Въведете своя персонализиран код HTML тук (напр. елементи „meta“ и т.н.), те ще бъдат добавени към секцията <code>&lt;head&gt;</code> в кода на Вашия форум. Ползването на елементи „script“ е позволено, но непрепоръчително, тъй като за това можете да ползвате раздела <a href=\"#custom-header\" data-toggle=\"tab\">Персонализиран код на Javascript</a>.",
+	"custom-header.description": "Въведете своя персонализиран код HTML тук (напр. елементи „meta“ и т.н.), те ще бъдат добавени към секцията <code>&lt;head&gt;</code> в кода на Вашия форум. Ползването на елементи „script“ е позволено, но непрепоръчително, тъй като за това можете да ползвате раздела <a href=\"#custom-js\" data-toggle=\"tab\">Персонализиран код на Javascript</a>.",
 	"custom-header.enable": "Включване на персонализирана заглавна част",

 	"custom-css.livereload": "Включване на моменталното презареждане",
--- a/public/language/bg/admin/appearance/themes.json
+++ b/public/language/bg/admin/appearance/themes.json
@@ -7,5 +7,5 @@
    "revert-confirm": "Наистина ли искате да възстановите стандартната тема на NodeBB?",
    "theme-changed": "Темата е променена",
    "revert-success": "Вие възстановихте успешно стандартната тема на NodeBB.",
-    "restart-to-activate": "Моля, рестартирайте NodeBB, за да може тази тема да влезе в сила напълно."
+    "restart-to-activate": "Моля, изградете повторно и рестартирайте NodeBB, за да може тази тема да влезе в сила напълно."
 }
--- a/public/language/bg/admin/development/info.json
+++ b/public/language/bg/admin/development/info.json
@@ -7,7 +7,8 @@
 	"online": "на линия",
 	"git": "git",
 	"memory": "памет",
-	"load": "натоварване",
+	"load": "натоварване на системата",
+	"cpu-usage": "използване на процесора",
 	"uptime": "активно време",

 	"registered": "Регистрирани",
--- a/public/language/bg/admin/extend/plugins.json
+++ b/public/language/bg/admin/extend/plugins.json
@@ -9,6 +9,7 @@

 	"plugin-search": "Търсене на добавки",
 	"plugin-search-placeholder": "Търсене на добавка…",
+	"submit-anonymous-usage": "Изпращане на анонимни данни за употребата на добавката",
 	"reorder-plugins": "Пренареждане на добавките",
 	"order-active": "Подреждане на включените добавки",
 	"dev-interested": "Искате ли да пишете добавки за NodeBB?",
@@ -29,6 +30,8 @@
 	"plugin-item.more-info": "За повече информация",
 	"plugin-item.unknown": "Неизвестно",
 	"plugin-item.unknown-explanation": "Състоянието на тази добавка не може да бъде определено, може би поради грешка в конфигурацията.",
+	"plugin-item.compatible": "Тази добавка работи с NodeBB %1",
+	"plugin-item.not-compatible": "Тази добавка няма информация за съвместимост. Уверете се, че работи, преди да я инсталирате на истинския си сървър.",

 	"alert.enabled": "Добавката е включена",
 	"alert.disabled": "Добавката е изключена",
@@ -37,13 +40,15 @@
 	"alert.uninstalled": "Добавката е деинсталирана",
 	"alert.activate-success": "Моля, рестартирайте NodeBB, за да включите тази добавка напълно.",
 	"alert.deactivate-success": "Добавката е изключена успешно.",
-	"alert.upgrade-success": "Моля, презаредете NodeBB, за да обновите тази добавка напълно.",
+	"alert.upgrade-success": "Моля, изградете повторно и презаредете NodeBB, за да обновите тази добавка напълно.",
 	"alert.install-success": "Добавката е инсталирана успешно, моля, включете я",
 	"alert.uninstall-success": "Добавката беше изключена и деинсталирана успешно.",
 	"alert.suggest-error": "<p>NodeBB не може да се свърже с пакетния мениджър. Искате ли да продължите с инсталацията на най-новата версия?</p><div class=\"alert alert-danger\"><strong>Сървърът върна (%1)</strong>: %2</div>",
 	"alert.package-manager-unreachable": "<p>NodeBB не може да се свърже с пакетния мениджър. Не се препоръчва обновяване в момента.</p>",
 	"alert.incompatible": "<p>Вашата версия на NodeBB (версия %1) може да използва най-много версия %2 на тази добавка. Моля, обновете NodeBB, ако искате да инсталирате по-нова версия на тази добавка.</p>",
 	"alert.possibly-incompatible": "<div class=\"alert alert-warning\"><p><strong>Няма информация за съвместимостта</strong></p><p>Тази добавка не е посочила конкретна версия за инсталация, съвместима с Вашата версия на NodeBB. Не можем да гарантираме пълна съвместимост и има възможност Вашият NodeBB да не може да стартира правилно.</p></div><p>Ако NodeBB не може да стартира, използвайте следната команда:</p><pre><code>$ ./nodebb reset plugin=\"%1\"</code></pre><p>Искате ли да продължите с инсталацията на най-новата версия на тази добавка?</p>",
+	"alert.reorder": "Добавките са пренаредени",
+	"alert.reorder-success": "Моля, изградете повторно и рестартирайте NodeBB, за да завърши този процес напълно.",

 	"license.title": "Информация за лиценза на добавката",
 	"license.intro": "Добавката „<strong>%1</strong>“ използва лиценза „%2“. Моля, прочетете условията на лиценза и се уверете, че ги разбирате, преди да включите добавката.",
--- a/public/language/bg/admin/extend/widgets.json
+++ b/public/language/bg/admin/extend/widgets.json
@@ -2,6 +2,7 @@
 	"available": "Налични джаджи",
 	"explanation": "Изберете джаджа от падащото меню, а след това я завлачете и пуснете в областта за джаджи в някой от шаблоните вляво.",
 	"none-installed": "Няма намерени джаджи! Включете добавката с основните джаджи в контролния панел за <a href=\"%1\">добавките</a>.",
+	"clone-from": "Клониране на джаджите от",
 	"containers.available": "Налични контейнери",
 	"containers.explanation": "Завлачете и пуснете върху някоя активна джаджа",
 	"containers.none": "Няма",
@@ -14,6 +15,16 @@

 	"alert.confirm-delete": "Наистина ли искате да изтриете джаджата?",
 	"alert.updated": "Джаджите са обновени",
-	"alert.update-success": "Джаджите са обновени успешно"
+	"alert.update-success": "Джаджите са обновени успешно",
+	"alert.clone-success": "Джаджите са клонирани успешно",

+	"error.select-clone": "Изберете страница, от която да клонирате",
+
+	"title": "Заглавие",
+	"title.placeholder": "Заглавие (показва се само в някои контейнери)",
+	"container": "Контейнер",
+	"container.placeholder": "Завлачете и пуснете контейнер или въведете HTML тук.",
+	"show-to-groups": "Показване на групите",
+	"hide-from-groups": "Скриване от групите",
+	"hide-on-mobile": "Скриване на мобилни устройства"
 }
--- a/public/language/bg/admin/general/dashboard.json
+++ b/public/language/bg/admin/general/dashboard.json
@@ -2,7 +2,7 @@
 	"forum-traffic": "Трафик на форума",
 	"page-views": "Преглеждания на страниците",
 	"unique-visitors": "Уникални посетители",
-	"users": "Потребители",
+	"new-users": "Нови потребители",
 	"posts": "Публикации",
 	"topics": "Теми",
 	"page-views-seven": "Последните 7 дни",
@@ -14,19 +14,23 @@
 	"page-views-custom-help": "Въведете интервал от дати, за които искате да видите преглежданията на страниците. Ако не се появи календар за избор, можете да въведете датите във формат: <code>ГГГГ-ММ-ДД</code>",
 	"page-views-custom-error": "Моля, въведете правилен интервал от дати във формата: <code>ГГГГ-ММ-ДД</code>",

-	"stats.day": "Ден",
-	"stats.week": "Седмица",
-	"stats.month": "Месец",
+	"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/\">обновете NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>Това е остаряла предварителна версия на NodeBB. Има нова версия (версия %1). Ако имате възможност, <a href=\"https://docs.nodebb.org/configuring/upgrade/\">обновете NodeBB</a>.</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": "Не се изисква рестартиране",
@@ -36,9 +40,10 @@
 	"search-plugin-tooltip": "Инсталирайте добавка за търсене от страницата с добавките, за да включите функционалността за търсене",

 	"control-panel": "Системен контрол",
-	"reload": "Презареждане",
+	"rebuild-and-restart": "Повторно изграждане и рестартиране",
 	"restart": "Рестартиране",
-	"restart-warning": "Презареждането и рестартирането на NodeBB ще прекъсне всички връзки за няколко секунди.",
+	"restart-warning": "Повторното изграждане и рестартирането на NodeBB ще прекъснат всички връзки за няколко секунди.",
+	"restart-disabled": "Възможностите за повторно изграждане и рестартиране на NodeBB са изключени, тъй като изглежда, че NodeBB не се изпълнява чрез подходящия демон.",
 	"maintenance-mode": "Режим на профилактика",
 	"maintenance-mode-title": "Щракнете тук, за да зададете режим на профилактика на NodeBB",
 	"realtime-chart-updates": "Актуализации на таблиците в реално време",
@@ -63,7 +68,12 @@
 	"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": "Анонимни потребители"
+	"graphs.anonymous-users": "Анонимни потребители",
+	"last-restarted-by": "Последно рестартиране от",
+	"no-users-browsing": "Няма разглеждащи потребители"
 }
--- a/Show More
+++ b/Show More