chore: incrementing version number - v1.15.0-beta.28

This reverts commit 966d3f7654.

.eslintignore

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

.eslintrc

@@ -121,7 +121,7 @@
 		// "comma-spacing": "off",
 		// "no-trailing-spaces": "off",
 		// "key-spacing": "off",
-		// "no-multiple-empty-lines": "off",
+		"no-multiple-empty-lines": "off"
 		// "spaced-comment": "off",
 		// "space-in-parens": "off",
 		// "block-spacing": "off",

.github/SECURITY.md

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

.gitignore

@@ -28,7 +28,6 @@ pidfile
 # templates
 /public/templates
 
-/public/sounds
 /public/uploads
 /test/uploads
 
@@ -67,4 +66,5 @@ test/files/normalise.jpg.png
 test/files/normalise-resized.jpg
 package-lock.json
 /package.json
-*.mongodb
+*.mongodb
+link-plugins.sh

.travis.yml

@@ -39,8 +39,8 @@ addons:
       - g++-4.8
       - mongodb-org-server
 node_js:
+  - "14"
   - "12"
-  - "10"
 branches:
   only:
     - master

.tx/config

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

Gruntfile.js

@@ -45,6 +45,9 @@ module.exports = function (grunt) {
 			if (!plugins.includes('nodebb-plugin-composer-default')) {
 				plugins.push('nodebb-plugin-composer-default');
 			}
+			if (!plugins.includes('nodebb-theme-persona')) {
+				plugins.push('nodebb-theme-persona');
+			}
 		}
 
 		const styleUpdated_Client = plugins.map(p => 'node_modules/' + p + '/*.less')

README.md

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

app.js

@@ -35,7 +35,7 @@ process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 global.env = process.env.NODE_ENV || 'production';
 
 // Alternate configuration file support
-const	configFile = path.resolve(__dirname, nconf.any(['config', 'CONFIG']) || 'config.json');
+const configFile = path.resolve(__dirname, nconf.any(['config', 'CONFIG']) || 'config.json');
 
 const configExists = file.existsSync(configFile) || (nconf.get('url') && nconf.get('secret') && nconf.get('database'));
 

commitlint.config.js

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

install/data/defaults.json

@@ -70,6 +70,8 @@
     "reputation:disabled": 0,
     "downvote:disabled": 0,
     "disableSignatures": 0,
+    "downvotesPerDay": 10,
+    "downvotesPerUserPerDay": 3,
     "min:rep:downvote": 0,
     "min:rep:flag": 0,
     "min:rep:profile-picture": 0,
@@ -77,6 +79,7 @@
     "min:rep:website": 0,
     "min:rep:aboutme": 0,
     "min:rep:signature": 0,
+    "flags:limitPerTarget": 0,
     "notificationType_upvote": "notification",
     "notificationType_new-topic": "notification",
     "notificationType_new-reply": "notification",
@@ -107,11 +110,11 @@
     "maximumInvites": 0,
     "username:disableEdit": 0,
     "email:disableEdit": 0,
-    "email:sendmail:rateLimit": 2,
-    "email:sendmail:rateDelta": 1000,
+    "email:smtpTransport:pool": false,
     "hideFullname": 0,
     "hideEmail": 0,
     "allowGuestHandles": 0,
+    "recentMaxTopics": 200,
     "disableRecentCategoryFilter": 0,
     "maximumRelatedTopics": 0,
     "disableEmailSubscriptions": 0,

install/databases.js

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

install/package.json

@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "1.14.0-4",
+    "version": "1.15.0-beta.28",
     "homepage": "http://www.nodebb.org",
     "repository": {
         "type": "git",
@@ -11,15 +11,15 @@
     "main": "app.js",
     "scripts": {
         "start": "node loader.js",
-        "lint": "eslint --cache ./nodebb .",
+        "lint": "npx eslint --cache ./nodebb .",
         "pretest": "npm run lint",
-        "test": "nyc --reporter=html --reporter=text-summary mocha",
+        "test": "npx nyc --reporter=html --reporter=text-summary npx mocha",
         "coveralls": "nyc report --reporter=text-lcov | coveralls && rm -r coverage"
     },
     "husky": {
         "hooks": {
-            "pre-commit": "lint-staged",
-            "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
+            "pre-commit": "npx lint-staged",
+            "commit-msg": "npx commitlint -E HUSKY_GIT_PARAMS"
         }
     },
     "lint-staged": {
@@ -30,26 +30,25 @@
     },
     "dependencies": {
         "ace-builds": "^1.4.9",
-        "archiver": "^4.0.0",
+        "archiver": "^5.0.0",
         "async": "^3.2.0",
-        "autoprefixer": "^9.7.6",
+        "autoprefixer": "^10.0.0",
         "bcryptjs": "2.4.3",
-        "benchpressjs": "^2.0.2",
+        "benchpressjs": "2.0.4",
         "body-parser": "^1.19.0",
         "bootstrap": "^3.4.1",
-        "bootswatch": "git://github.com/thomaspark/bootswatch.git#c41a8f066feb8950c6f9c6bcf5a3c37d1085404e",
         "chart.js": "^2.9.3",
         "cli-graph": "^3.2.2",
         "clipboard": "^2.0.6",
         "colors": "^1.4.0",
-        "commander": "^5.0.0",
+        "commander": "^6.0.0",
         "compression": "^1.7.4",
         "connect-ensure-login": "^0.1.1",
         "connect-flash": "^0.1.1",
         "connect-mongo": "3.2.0",
         "connect-multiparty": "^2.2.0",
         "connect-pg-simple": "^6.1.0",
-        "connect-redis": "4.0.4",
+        "connect-redis": "5.0.0",
         "cookie-parser": "^1.4.5",
         "cron": "^1.8.2",
         "cropperjs": "^1.5.6",
@@ -60,45 +59,47 @@
         "express-session": "^1.17.0",
         "express-useragent": "^1.0.13",
         "graceful-fs": "^4.2.3",
-        "helmet": "^3.22.0",
+        "helmet": "^4.0.0",
         "html-to-text": "^5.1.1",
-        "ipaddr.js": "^1.9.1",
+        "ipaddr.js": "^2.0.0",
         "jquery": "3.5.1",
         "jsesc": "3.0.1",
-        "json2csv": "5.0.1",
+        "json2csv": "5.0.3",
         "jsonwebtoken": "^8.5.1",
         "less": "^3.11.1",
         "lodash": "^4.17.15",
         "logrotate-stream": "^0.2.6",
-        "lru-cache": "5.1.1",
+        "lru-cache": "6.0.0",
         "material-design-lite": "^1.3.0",
         "mime": "^2.4.4",
         "mkdirp": "^1.0.4",
-        "mongodb": "3.5.8",
+        "mongodb": "3.6.2",
         "morgan": "^1.10.0",
         "mousetrap": "^1.6.5",
-        "@nodebb/mubsub": "^1.6.0",
+        "@nodebb/bootswatch": "3.4.2",
+        "@nodebb/mubsub": "1.7.0",
+        "@nodebb/socket.io-adapter-mongo": "3.1.0",
         "nconf": "^0.10.0",
-        "nodebb-plugin-composer-default": "6.3.40",
-        "nodebb-plugin-dbsearch": "4.0.7",
+        "nodebb-plugin-composer-default": "6.3.57",
+        "nodebb-plugin-dbsearch": "4.1.2",
         "nodebb-plugin-emoji": "^3.3.0",
         "nodebb-plugin-emoji-android": "2.0.0",
-        "nodebb-plugin-markdown": "8.11.2",
-        "nodebb-plugin-mentions": "2.7.4",
+        "nodebb-plugin-markdown": "8.12.1",
+        "nodebb-plugin-mentions": "2.10.0",
         "nodebb-plugin-soundpack-default": "1.0.0",
-        "nodebb-plugin-spam-be-gone": "0.7.1",
+        "nodebb-plugin-spam-be-gone": "0.7.2",
         "nodebb-rewards-essentials": "0.1.3",
-        "nodebb-theme-lavender": "5.0.11",
-        "nodebb-theme-persona": "10.1.48",
-        "nodebb-theme-slick": "1.2.29",
-        "nodebb-theme-vanilla": "11.1.23",
-        "nodebb-widget-essentials": "4.1.0",
+        "nodebb-theme-lavender": "5.0.13",
+        "nodebb-theme-persona": "10.2.41",
+        "nodebb-theme-slick": "1.2.34",
+        "nodebb-theme-vanilla": "11.2.18",
+        "nodebb-widget-essentials": "4.1.2",
         "nodemailer": "^6.4.6",
         "passport": "^0.4.1",
         "passport-local": "1.0.0",
         "pg": "^8.0.2",
         "pg-cursor": "^2.1.9",
-        "postcss": "7.0.30",
+        "postcss": "8.0.6",
         "postcss-clean": "1.1.0",
         "promise-polyfill": "^8.1.3",
         "prompt": "^1.0.0",
@@ -107,17 +108,16 @@
         "request-promise-native": "^1.0.8",
         "rimraf": "3.0.2",
         "rss": "^1.2.2",
-        "sanitize-html": "^1.23.0",
+        "sanitize-html": "^2.0.0",
         "semver": "^7.2.1",
         "serve-favicon": "^2.5.0",
-        "sharp": "0.25.3",
+        "sharp": "0.26.1",
         "sitemap": "^6.1.0",
         "socket.io": "2.3.0",
         "socket.io-adapter-cluster": "^1.0.1",
-        "socket.io-adapter-mongo": "^2.0.5",
         "socket.io-adapter-postgres": "^1.2.1",
         "socket.io-client": "2.3.0",
-        "socket.io-redis": "5.3.0",
+        "socket.io-redis": "5.4.0",
         "socketio-wildcard": "2.0.0",
         "spdx-license-list": "^6.1.0",
         "spider-detector": "2.0.0",
@@ -125,35 +125,35 @@
         "textcomplete.contenteditable": "^0.1.1",
         "toobusy-js": "^0.5.1",
         "uglify-es": "^3.3.9",
-        "validator": "13.0.0",
-        "winston": "3.2.1",
+        "validator": "13.1.17",
+        "winston": "3.3.3",
         "xml": "^1.0.1",
         "xregexp": "^4.3.0",
         "zxcvbn": "^4.4.2"
     },
     "devDependencies": {
-        "@apidevtools/swagger-parser": "9.0.1",
-        "@commitlint/cli": "8.3.5",
-        "@commitlint/config-angular": "8.3.4",
+        "@apidevtools/swagger-parser": "10.0.2",
+        "@commitlint/cli": "9.1.2",
+        "@commitlint/config-angular": "9.1.2",
         "coveralls": "3.1.0",
-        "eslint": "7.1.0",
-        "eslint-config-airbnb-base": "14.1.0",
-        "eslint-plugin-import": "2.21.1",
-        "grunt": "1.1.0",
+        "eslint": "7.10.0",
+        "eslint-config-airbnb-base": "14.2.0",
+        "eslint-plugin-import": "2.22.1",
+        "grunt": "1.3.0",
         "grunt-contrib-watch": "1.1.0",
-        "husky": "4.2.5",
-        "jsdom": "16.2.2",
-        "lint-staged": "10.2.9",
-        "mocha": "7.2.0",
+        "husky": "4.3.0",
+        "jsdom": "16.4.0",
+        "lint-staged": "10.4.0",
+        "mocha": "8.1.3",
         "mocha-lcov-reporter": "1.3.0",
-        "nyc": "15.0.1",
-        "smtp-server": "3.6.0"
+        "nyc": "15.1.0",
+        "smtp-server": "3.7.0"
     },
     "bugs": {
         "url": "https://github.com/NodeBB/NodeBB/issues"
     },
     "engines": {
-        "node": ">=8"
+        "node": ">=10"
     },
     "maintainers": [
         {

install/web.js

@@ -81,7 +81,7 @@ web.install = function (port) {
 
 	async.parallel([compileLess, compileJS, copyCSS, loadDefaults], function (err) {
 		if (err) {
-			winston.error(err);
+			winston.error(err.stack);
 		}
 		setupRoutes();
 		launchExpress(port);
@@ -223,14 +223,17 @@ function launch(req, res) {
 }
 
 function compileLess(callback) {
-	fs.readFile(path.join(__dirname, '../public/less/install.less'), function (err, style) {
+	var installSrc = path.join(__dirname, '../public/less/install.less');
+	fs.readFile(installSrc, function (err, style) {
 		if (err) {
-			return winston.error('Unable to read LESS install file: ', err);
+			return winston.error('Unable to read LESS install file: ', err.stack);
 		}
 
-		less.render(style.toString(), function (err, css) {
+		less.render(style.toString(), {
+			filename: path.resolve(installSrc),
+		}, function (err, css) {
 			if (err) {
-				return winston.error('Unable to compile LESS: ', err);
+				return winston.error('Unable to compile LESS: ', err.stack);
 			}
 
 			fs.writeFile(path.join(__dirname, '../public/installer.css'), css.css, callback);

public/.eslintrc

@@ -5,7 +5,6 @@
 		"socket": true,
 		"ajaxify": true,
 		"config": true,
-		"RELATIVE_PATH": true,
 		"utils": true,
 		"overrides": true,
 		"componentHandler": true,
@@ -21,11 +20,13 @@
 		"es6": false
 	},
 	"rules": {
+		"block-scoped-var": "off",
 		"no-dupe-class-members": "off",
 		"no-var": "off",
 		"object-shorthand": "off",
 		"prefer-arrow-callback": "off",
 		"prefer-spread": "off",
+		"prefer-object-spread": "off",
 		"prefer-reflect": "off",
 		"prefer-template": "off"
 	},

public/.jshintrc

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

public/js-enabled.css

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

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

@@ -3,6 +3,7 @@
 	"ip": "IP <strong>%1</strong>",
 	"nodes-responded": "%1 nodes responded within %2ms!",
 	"host": "host",
+	"primary": "primary / run jobs",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "online",

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

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

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

@@ -11,6 +11,7 @@
 	"num-recent-replies": "# of Recent Replies",
 	"ext-link": "External Link",
 	"is-section": "Treat this category as a section",
+	"tag-whitelist": "Tag Whitelist",
 	"upload-image": "Upload Image",
 	"delete-image": "Remove",
 	"category-image": "Category Image",
@@ -26,6 +27,8 @@
 	"enable": "Enable",
 	"disable": "Disable",
 	"edit": "Edit",
+	"analytics": "Analytics",
+	"view-category": "View category",
 
 	"select-category": "Select Category",
 	"set-parent-category": "Set Parent Category",
@@ -63,7 +66,6 @@
 	"alert.create-success": "Category successfully created!",
 	"alert.none-active": "You have no active categories.",
 	"alert.create": "Create a Category",
-	"alert.confirm-moderate": "<strong>Are you sure you wish to grant the moderation privilege to this user group?</strong> This group is public, and any users can join at will.",
 	"alert.confirm-purge": "<p class=\"lead\">Do you really want to purge this category \"%1\"?</p><h5><strong class=\"text-danger\">Warning!</strong> All topics and posts in this category will be purged!</h5> <p class=\"help-block\">Purging a category will remove all topics and posts, and delete the category from the database. If you want to remove a category <em>temporarily</em>, you'll want to \"disable\" the category instead.</p>",
 	"alert.purge-success": "Category purged!",
 	"alert.copy-success": "Settings Copied!",
@@ -75,7 +77,9 @@
 	"alert.user-search": "Search for a user here...",
 	"alert.find-group": "Find a Group",
 	"alert.group-search": "Search for a group here...",
+	"alert.not-enough-whitelisted-tags": "Whitelisted tags are less than minimum tags, you need to create more whitelisted tags!",
 	"collapse-all": "Collapse All",
 	"expand-all": "Expand All",
-	"disable-on-create": "Disable on create"
+	"disable-on-create": "Disable on create",
+	"no-matches": "No matches"
 }

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

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

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

@@ -1,9 +1,9 @@
 {
 	"global": "Global",
-	"global.no-users": "No user-specific global privileges.",
 	"admin": "Admin",
 	"group-privileges": "Group Privileges",
 	"user-privileges": "User Privileges",
+	"edit-privileges": "Edit Privileges",
 	"chat": "Chat",
 	"upload-images": "Upload Images",
 	"upload-files": "Upload Files",
@@ -33,10 +33,20 @@
 	"delete-topics": "Delete Topics",
 	"purge": "Purge",
 	"moderate": "Moderate",
-
 	"admin-dashboard": "Dashboard",
 	"admin-categories": "Categories",
 	"admin-privileges": "Privileges",
 	"admin-users": "Users",
-	"admin-settings": "Settings"
+	"admin-settings": "Settings",
+
+	"alert.confirm-moderate": "<strong>Are you sure you wish to grant the moderation privilege to this user group?</strong> This group is public, and any users can join at will.",
+	"alert.confirm-save": "Please confirm your intention to save these privileges",
+	"alert.saved": "Privilege changes saved and applied",
+	"alert.confirm-discard": "Are you sure you wish to discard your privilege changes?",
+	"alert.discarded": "Privilege changes discarded",
+	"alert.confirm-copyToAll": "Are you sure you wish to apply this privilege set to <strong>all categories</strong>?",
+	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's privilege set to <strong>all categories</strong>?",
+	"alert.confirm-copyToChildren": "Are you sure you wish to apply this privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.no-undo": "<em>This action cannot be undone.</em>"
 }

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

@@ -108,5 +108,5 @@
 
 	"alerts.prompt-email": "Emails: ",
 	"alerts.email-sent-to": "An invitation email has been sent to %1",
-	"alerts.x-users-found": "%1 user(s) found! Search took %2 ms."
+	"alerts.x-users-found": "%1 user(s) found, (%2 seconds)"
 }

public/language/ar/admin/menu.json

@@ -19,7 +19,7 @@
 	"settings/general": "عامة",
 	"settings/homepage": "Home Page",
 	"settings/navigation": "Navigation",
-	"settings/reputation": "السمعة",
+	"settings/reputation": "Reputation & Flags",
 	"settings/email": "البريد الإلكتروني",
 	"settings/user": "Users",
 	"settings/group": "Groups",
@@ -70,7 +70,7 @@
 	"logout": "Log out",
 	"view-forum": "View Forum",
 
-	"search.placeholder": "Search for settings",
+	"search.placeholder": "Press "/" to search for settings",
 	"search.no-results": "No results...",
 	"search.search-forum": "Search the forum for <strong></strong>",
 	"search.keep-typing": "Type more to see results...",

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

@@ -5,6 +5,8 @@
 	"maintenance-mode.message": "Maintenance Message",
 	"headers": "Headers",
 	"headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame",
+	"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
+	"headers.csp-frame-ancestors-help": "'none', 'self'(default) or list of URIs to allow.",
 	"headers.powered-by": "Customise the \"Powered By\" header sent by NodeBB",
 	"headers.acao": "Access-Control-Allow-Origin",
 	"headers.acao-regex": "Access-Control-Allow-Origin Regular Expression",
@@ -20,7 +22,7 @@
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Traffic Management",
-	"traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Enable Traffic Management",
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",

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

@@ -4,10 +4,7 @@
 	"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",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -25,6 +22,8 @@
 	"smtp-transport.username": "Username",
 	"smtp-transport.username-help": "<b>For the Gmail service,</b> enter the full email address here, especially if you are using a Google Apps managed domain.",
 	"smtp-transport.password": "Password",
+	"smtp-transport.pool": "Enable pooled connections",
+	"smtp-transport.pool-help": "Pooling connections prevents NodeBB from creating a new connection for every email. This option only applies if SMTP Transport is enabled.",
 
 	"template": "Edit Email Template",
 	"template.select": "Select Email Template",

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

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

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

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

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

@@ -5,10 +5,16 @@
 	"votes-are-public": "All Votes Are Public",
 	"thresholds": "Activity Thresholds",
 	"min-rep-downvote": "Minimum reputation to downvote posts",
+	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
+	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
 	"min-rep-flag": "Minimum reputation to flag posts",
 	"min-rep-website": "Minimum reputation to add \"Website\" to user profile",
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",
 	"min-rep-signature": "Minimum reputation to add \"Signature\" to user profile",
 	"min-rep-profile-picture": "Minimum reputation to add \"Profile Picture\" to user profile",
-	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile"
+	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile",
+
+	"flags": "Flag Settings",
+	"flags.limit-per-target": "Maximum number of times something can be flagged",
+	"flags.limit-per-target-placeholder": "Default: 0"
 }

public/language/ar/error.json

@@ -26,6 +26,7 @@
     "invalid-pagination-value": "رقم الصفحة غير صحيح ، يجب أن يكون بين %1 و %2 .",
     "username-taken": "اسم المستخدم مأخوذ",
     "email-taken": "البريد الالكتروني مأخوذ",
+    "email-invited": "Email was already invited",
     "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.",
     "email-not-confirmed-chat": "لا يمكنك الدردشة حتى تقوم بتأكيد بريدك الإلكتروني، الرجاء إضغط هنا لتأكيد بريدك اﻹلكتروني.",
     "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.",
@@ -138,8 +139,13 @@
     "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature",
     "not-enough-reputation-min-rep-profile-picture": "You do not have enough reputation to add a profile picture",
     "not-enough-reputation-min-rep-cover-picture": "You do not have enough reputation to add a cover picture",
-    "already-flagged": "لقد بلغت عن هذه المشاركة من قبل.",
+    "post-already-flagged": "You have already flagged this post",
+    "user-already-flagged": "You have already flagged this user",
+    "post-flagged-too-many-times": "This post has been flagged by others already",
+    "user-flagged-too-many-times": "This user has been flagged by others already",
     "self-vote": "You cannot vote on your own post",
+    "too-many-downvotes-today": "You can only downvote %1 times a day",
+    "too-many-downvotes-today-user": "You can only downvote a user %1 times a day",
     "reload-failed": "المنتدى واجه مشكلة أثناء إعادة التحميل: \"%1\".  سيواصل المنتدى خدمة العملاء السابقين لكن يجب عليك إلغاء أي تغيير قمت به قبل إعادة التحميل.",
     "registration-error": "حدث خطأ أثناء التسجيل",
     "parse-error": "حدث خطأ ما أثناء تحليل استجابة الخادم",
@@ -157,10 +163,12 @@
     "invalid-session-text": "يبدو أن فترة التسجيل لم تعد قائمة او هي غير مطابقة مع الخادم. يرجى إعادة تحميل هذه الصفحة.",
     "no-topics-selected": "No topics selected!",
     "cant-move-to-same-topic": "Can't move post to same topic!",
+    "cant-move-topic-to-same-category": "Can't move topic to the same category!",
     "cannot-block-self": "You cannot block yourself!",
     "cannot-block-privileged": "You cannot block administrators or global moderators",
     "cannot-block-guest": "Guest are not able to block other users",
     "already-blocked": "This user is already blocked",
     "already-unblocked": "This user is already unblocked",
-    "no-connection": "There seems to be a problem with your internet connection"
+    "no-connection": "There seems to be a problem with your internet connection",
+    "plugin-not-whitelisted": "Unable to install plugin – only plugins whitelisted by the NodeBB Package Manager can be installed via the ACP"
 }

public/language/ar/flags.json

@@ -1,8 +1,7 @@
 {
 	"state": "الحالة",
-	"reporter": "المُبلغ",
-	"reported-at": "وقت التبليغ",
-	"description": "الوصف",
+	"reports": "Reports",
+	"first-reported": "First Reported",
 	"no-flags": "Hooray! No flags found.",
 	"assignee": "المحال إليه",
 	"update": "تحديث",
@@ -26,12 +25,14 @@
 	"filter-quick-mine": "Assigned to me",
 	"filter-cid-all": "All categories",
 	"apply-filters": "Apply Filters",
+	"more-filters": "More Filters",
 
 	"quick-actions": "اجراءات سريعه",
 	"flagged-user": "Flagged User",
 	"view-profile": "مشاهدة الملف الشخصي",
 	"start-new-chat": "بدء محادثه جديده",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "حذف المشاركة",
 	"purge-post": "Purge Post",
 	"restore-post": "استرجاع المشاركة",
@@ -42,9 +43,11 @@
 	"notes": "Flag Notes",
 	"add-note": "اضافة ملاحظة",
 	"no-notes": "No shared notes.",
+	"delete-note-confirm": "Are you sure you want to delete this flag note?",
+	"note-added": "Note Added",
+	"note-deleted": "Note Deleted",
 
 	"history": "Account & Flag History",
-	"back": "Back to Flags List",
 	"no-history": "No flag history.",
 
 	"state-all": "All states",
@@ -53,7 +56,16 @@
 	"state-resolved": "تم حلها",
 	"state-rejected": "تم رفضها",
 	"no-assignee": "Not Assigned",
-	"note-added": "Note Added",
+
+	"sort": "Sort by",
+	"sort-newest": "Newest first",
+	"sort-oldest": "Oldest first",
+	"sort-reports": "Most reports",
+	"sort-all": "All flag types...",
+	"sort-posts-only": "Posts only...",
+	"sort-downvotes": "Most downvotes",
+	"sort-upvotes": "Most upvotes",
+	"sort-replies": "Most replies",
 
 	"modal-title": "Report Inappropriate Content",
 	"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
@@ -65,5 +77,9 @@
 	"modal-submit-success": "Content has been flagged for moderation.",
 	"modal-submit-confirm": "Confirm Submission",
 	"modal-submit-confirm-text": "You have a custom reason specified already. Are you sure you wish to submit via quick-report?",
-	"modal-submit-confirm-text-help": "Submitting a quick report will overwrite any custom reasons defined."
+	"modal-submit-confirm-text-help": "Submitting a quick report will overwrite any custom reasons defined.",
+
+	"bulk-actions": "Bulk Actions",
+	"bulk-resolve": "Resolve Flag(s)",
+	"bulk-success": "%1 flags updated"
 }

public/language/ar/global.json

@@ -30,6 +30,7 @@
     "header.unread": "غير مقروء",
     "header.tags": "وسم",
     "header.popular": "الأكثر شهرة",
+    "header.top": "Top",
     "header.users": "المستخدمين",
     "header.groups": "المجموعات",
     "header.chats": "المحادثات",
@@ -51,14 +52,17 @@
     "users": "الأعضاء",
     "topics": "المواضيع",
     "posts": "المشاركات",
+    "x-posts": "%1 posts",
     "best": "الأفضل",
     "votes": "Votes",
+    "x-votes": "%1 votes",
     "voters": "Voters",
     "upvoters": "الموافقين",
     "upvoted": "مصوت بالموجب",
     "downvoters": "مصوتين بالسالب",
     "downvoted": "مصوت بالسالب",
     "views": "المشاهدات",
+    "posters": "Posters",
     "reputation": "السمعة",
     "lastpost": "Last post",
     "firstpost": "First post",

public/language/ar/modules.json

@@ -1,6 +1,7 @@
 {
     "chat.chatting_with": "Chat with",
     "chat.placeholder": "أكتب رسالة دردشة هنا، اضغط ENTER للإرسال",
+    "chat.scroll-up-alert": "You are looking at older messages, click here to go to most recent message.",
     "chat.send": "أرسل",
     "chat.no_active": "لا يوجد لديك دردشات نشطة.",
     "chat.user_typing": "%1 يكتب رسالة...",
@@ -58,6 +59,7 @@
     "composer.upload-file": "Upload File",
     "composer.zen_mode": "Zen Mode",
     "composer.select_category": "Select a category",
+    "composer.textarea.placeholder": "Enter your post content here, drag and drop images",
     "bootbox.ok": "OK",
     "bootbox.cancel": "إلغاء",
     "bootbox.confirm": "تأكيد",

public/language/ar/notifications.json

@@ -43,6 +43,9 @@
     "new_register_multiple": "There are <strong>%1</strong> registration requests awaiting review.",
     "flag_assigned_to_you": "تم تخصيص العلامة 1%  لك",
     "post_awaiting_review": "Post awaiting review",
+    "profile-exported": "<strong>%1</strong> profile exported, click to download",
+    "posts-exported": "<strong>%1</strong> posts exported, click to download",
+    "uploads-exported": "<strong>%1</strong> uploads exported, click to download",
     "email-confirmed": "تم التحقق من عنوان البريد الإلكتروني",
     "email-confirmed-message": "شكرًا على إثبات صحة عنوان بريدك الإلكتروني. صار حسابك مفعلًا بالكامل.",
     "email-confirm-error-message": "حدث خطأ أثناء التحقق من عنوان بريدك الإلكتروني. ربما رمز التفعيل خاطئ أو انتهت صلاحيته.",

public/language/ar/reset_password.json

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

public/language/ar/topic.json

@@ -1,7 +1,5 @@
 {
     "topic": "موضوع",
-    "topic_id": "معرف الموضوع",
-    "topic_id_placeholder": "أدخل معرف الموضوع",
     "no_topics_found": "لا توجد مواضيع !",
     "no_posts_found": "لا  توجد مشاركات!",
     "post_is_deleted": "هذه المشاركة محذوفة!",
@@ -36,8 +34,11 @@
     "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>",
+    "flag-post": "Flag this post",
+    "flag-user": "Flag this user",
+    "already-flagged": "Already Flagged",
+    "view-flag-report": "View Flag Report",
+    "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "هذه المشاركة محذوفة. فقط من لهم صلاحية الإشراف على ا لمشاركات يمكنهم معاينتها.",
     "following_topic.message": "ستستلم تنبيها عند كل مشاركة جديدة في هذا الموضوع.",
     "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
@@ -78,7 +79,10 @@
     "thread_tools.purge_confirm": "هل أنت متأكد أنك تريد تطهير هذا الموضوع؟",
     "thread_tools.merge_topics": "Merge Topics",
     "thread_tools.merge": "Merge",
-    "topic_move_success": "تم نقل هذا الموضوع إلى %1 بنجاح",
+    "topic_move_success": "This topic will be moved shortly. Click here to undo.",
+    "topic_move_undone": "Topic move undone",
+    "topic_move_posts_success": "Posts will be moved shortly. Click here to undo.",
+    "topic_move_posts_undone": "Post move undone",
     "post_delete_confirm": "هل أنت متأكد أنك تريد حذف هذه المشاركة؟",
     "post_restore_confirm": "هل أنت متأكد أنك تريد استعادة هذه المشاركة؟",
     "post_purge_confirm": "هل أنت متأكد أنك تريد تطهير هذه المشاركة؟",
@@ -96,11 +100,18 @@
     "fork_topic": "فرع الموضوع",
     "fork_topic_instruction": "إضغط على المشاركات التي تريد تفريعها",
     "fork_no_pids": "لم تختر أي مشاركة",
+    "no-posts-selected": "No posts selected!",
+    "x-posts-selected": "%1 post(s) selected",
+    "x-posts-will-be-moved-to-y": "%1 post(s) will be moved to \"%2\"",
     "fork_pid_count": "1% مشاركة محددة",
     "fork_success": "تم إنشاء فرع للموضوع بنجاح! إضغط هنا لمعاينة الفرع.",
     "delete_posts_instruction": "Click the posts you want to delete/purge",
-    "merge_topics_instruction": "Click the topics you want to merge",
-    "move_posts_instruction": "Click the posts you want to move",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
+    "move_posts_instruction": "Click the posts you want to move then go to target topic and click move.",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "أدخل عنوان موضوعك هنا...",
     "composer.handle_placeholder": "Enter your name/handle here",
@@ -134,6 +145,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/ar/user.json

@@ -1,7 +1,7 @@
 {
     "banned": "محظور",
     "offline": "غير متصل",
-    "deleted": "Deleted",
+    "deleted": "محذوف",
     "username": "إسم المستخدم",
     "joindate": "تاريخ الإنضمام",
     "postcount": "عدد المشاركات",
@@ -111,12 +111,7 @@
     "posts_per_page": "الردود في كل صفحة",
     "max_items_per_page": "أقصى %1",
     "acp_language": "Admin Page Language",
-    "notification_sounds": "تشغيل صوت عند تلقي تنبيه",
-    "notifications_and_sounds": "التنبيهات والأصوات",
-    "incoming-message-sound": "صوت الرسالة الواردة",
-    "outgoing-message-sound": "صوت الرسائل الصادرة",
-    "notification-sound": "صوت التنبيهات",
-    "no-sound": "بدون صوت",
+    "notifications": "Notifications",
     "upvote-notif-freq": "معدل تكرار تنبيهات التصويت للأعلى",
     "upvote-notif-freq.all": "كل التصويتات للأعلى",
     "upvote-notif-freq.first": "First Per Post",
@@ -179,6 +174,9 @@
     "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 (.json)",
+    "consent.export-profile-success": "Exporting profile, you will get a notification when it is complete.",
     "consent.export_uploads": "Export Uploaded Content (.zip)",
-    "consent.export_posts": "Export Posts (.csv)"
+    "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.",
+    "consent.export_posts": "Export Posts (.csv)",
+    "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete."
 }

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

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

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

@@ -11,6 +11,7 @@
 	"num-recent-replies": "Брой на скорошните отговори",
 	"ext-link": "Външна връзка",
 	"is-section": "Използване на тази категория като раздел",
+	"tag-whitelist": "Списък от разрешени етикети",
 	"upload-image": "Качване на изображение",
 	"delete-image": "Премахване",
 	"category-image": "Изображение на категорията",
@@ -26,6 +27,8 @@
 	"enable": "Включване",
 	"disable": "Изключване",
 	"edit": "Редактиране",
+	"analytics": "Анализи",
+	"view-category": "Преглед на категорията",
 
 	"select-category": "Изберете категория",
 	"set-parent-category": "Задайте базова категория",
@@ -63,7 +66,6 @@
 	"alert.create-success": "Категорията е създадена успешно!",
 	"alert.none-active": "Нямате активни категории.",
 	"alert.create": "Създаване на категория",
-	"alert.confirm-moderate": "<strong>Наистина ли искате да дадете правомощието за модериране на тази потребителска група?</strong> Тази група е публична и всеки може свободно да се присъедини към нея.",
 	"alert.confirm-purge": "<p class=\"lead\">Наистина ли искате да изтриете категорията „%1“?</p><h5><strong class=\"text-danger\">Внимание!</strong> Всички теми и публикации в тази категория ще бъдат изтрити!</h5> <p class=\"help-block\">Изтриването на категорията ще премахне всички теми и публикации, и ще изтрие категорията от базата данни. Ако искате да премахнете категорията <em>временно</em>, можете просто да я „изключите“.</p>",
 	"alert.purge-success": "Категорията е изтрита!",
 	"alert.copy-success": "Настройките са копирани!",
@@ -75,7 +77,9 @@
 	"alert.user-search": "Потърсете потребител тук…",
 	"alert.find-group": "Търсене на група",
 	"alert.group-search": "Потърсете група тук…",
+	"alert.not-enough-whitelisted-tags": "Разрешените етикети са по-малко от минимума. Трябва да създадете още разрешени етикети!",
 	"collapse-all": "Свиване на всички",
 	"expand-all": "Разгъване на всички",
-	"disable-on-create": "Изключване при създаване"
+	"disable-on-create": "Изключване при създаване",
+	"no-matches": "Няма съвпадения"
 }

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

@@ -8,6 +8,9 @@
 	"hidden": "Скрита",
 	"private": "Частна",
 	"edit": "Редактиране",
+	"delete": "Изтриване",
+	"privileges": "Правомощия",
+	"download-csv": "CSV",
 	"search-placeholder": "Търсене",
 	"create": "Създаване на група",
 	"description-placeholder": "Кратко описание на групата",

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

@@ -1,9 +1,9 @@
 {
 	"global": "Глобални",
-	"global.no-users": "Няма глобални правомощия за отделни потребители.",
 	"admin": "Администратор",
 	"group-privileges": "Правомощия за групите",
 	"user-privileges": "Правомощия за потребителите",
+	"edit-privileges": "Редактиране на правомощията",
 	"chat": "Разговор",
 	"upload-images": "Качване на изображения",
 	"upload-files": "Качване на файлове",
@@ -33,10 +33,20 @@
 	"delete-topics": "Изтриване на теми",
 	"purge": "Изчистване",
 	"moderate": "Модериране",
-
 	"admin-dashboard": "Табло",
 	"admin-categories": "Категории",
 	"admin-privileges": "Правомощия",
 	"admin-users": "Потребители",
-	"admin-settings": "Настройки"
+	"admin-settings": "Настройки",
+
+	"alert.confirm-moderate": "<strong>Наистина ли искате да дадете правомощието за модериране на тази потребителска група?</strong> Тази група е публична и всеки може свободно да се присъедини към нея.",
+	"alert.confirm-save": "Моля, потвърдете желанието си да запазите тези правомощия",
+	"alert.saved": "Промените по правомощията са запазени и приложени",
+	"alert.confirm-discard": "Наистина ли искате да отхвърлите промените по правомощията?",
+	"alert.discarded": "Промените по правомощията са отхвърлени",
+	"alert.confirm-copyToAll": "Наистина ли искате да приложите този набор от правомощия към <strong>всички категории</strong>?",
+	"alert.confirm-copyToAllGroup": "Наистина ли искате да приложите набора от правомощия на таи група към <strong>всички категории</strong>?",
+	"alert.confirm-copyToChildren": "Наистина ли искате да приложите този набор от правомощия към <strong>всички по-долни (дъщерни) категории</strong>?",
+	"alert.confirm-copyToChildrenGroup": "Наистина ли искате да приложите набора от правомощия на таи група към <strong>всички по-долни (дъщерни) категории</strong>?",
+	"alert.no-undo": "<em>Това действие е необратимо.</em>"
 }

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

@@ -108,5 +108,5 @@
 
 	"alerts.prompt-email": "Е-пощи: ",
 	"alerts.email-sent-to": "Беше изпратено е-писмо за потвърждение до %1",
-	"alerts.x-users-found": "Намерени потребители: %1! Търсенето отне %2 милисекунди."
+	"alerts.x-users-found": "Намерени потребители: %1 (%2 секунди)"
 }

public/language/bg/admin/menu.json

@@ -19,7 +19,7 @@
 	"settings/general": "Общи",
 	"settings/homepage": "Начална страница",
 	"settings/navigation": "Навигация",
-	"settings/reputation": "Репутация",
+	"settings/reputation": "Репутация и доклади",
 	"settings/email": "Е-поща",
 	"settings/user": "Потребители",
 	"settings/group": "Групи",
@@ -70,7 +70,7 @@
 	"logout": "Изход",
 	"view-forum": "Преглед на форума",
 
-	"search.placeholder": "Търсене на настройки",
+	"search.placeholder": "Натиснете „/“ за търсене на настройки",
 	"search.no-results": "Няма резултати…",
 	"search.search-forum": "Търсене във форума за <strong></strong>",
 	"search.keep-typing": "Продължете да пишете, за да видите още резултати…",

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

@@ -5,6 +5,8 @@
 	"maintenance-mode.message": "Съобщение за профилактиката",
 	"headers": "Заглавни части",
 	"headers.allow-from": "Задайте „ALLOW-FROM“, за да поставите NodeBB в „iFrame“",
+	"headers.csp-frame-ancestors": "Задайте заглавката „Content-Security-Policy frame-ancestors“ за да поставите NodeBB „iFrame“",
+	"headers.csp-frame-ancestors-help": "„none“ (нищо), „self“ (себе си – по подразбиране) или списък от позволени адреси.",
 	"headers.powered-by": "Персонализиране на заглавната част „Захранван от“, която се изпраща от NodeBB",
 	"headers.acao": "Произход за разрешаване на управлението на достъпа",
 	"headers.acao-regex": "Регулярен израз за произхода за разрешаване на управлението на достъпа",
@@ -20,7 +22,7 @@
 	"hsts.preload": "Позволяване на предварителното зареждане на заглавката на HSTS",
 	"hsts.help": "Ако това е включено, за този уеб ще бъде настроена заглавка за HSTS. Можете да изберете дали да включите поддомейните и дали за заредите предварително флаговете в заглавката си. Ако не знаете какво да направите, най-добре не избирайте нищо. <a href=\"%1\">Още информация<i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Управление на трафика",
-	"traffic.help": "NodeBB има вграден модул, който автоматично отказва заявките в натоварените моменти. Можете да настроите поведението тук, въпреки че стойностите по подразбиране са добра отправна точка.",
+	"traffic.help": "NodeBB използва модул, който автоматично отказва заявките в натоварените моменти. Можете да настроите поведението тук, въпреки че стойностите по подразбиране са добра отправна точка.",
 	"traffic.enable": "Включване на управлението на трафика",
 	"traffic.event-lag": "Граница на забавяне в цикъла на събитията (в милисекунди)",
 	"traffic.event-lag-help": "Намаляването на тази стойност ще намали времето за изчакване при зареждане на страници, но също така ще предизвика по-често показване на съобщението „прекомерно натоварване“ на повече потребители. (Нужно е рестартиране.)",

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

@@ -4,10 +4,7 @@
 	"address-help": "Следният адрес на е-поща е този, който получателят ще види в полетата „От“ и “Отговор до“.",
 	"from": "Име за полето „От“",
 	"from-help": "Името на изпращача, което да бъде показано в е-писмото.",
-	"sendmail-rate-limit": "Изпращане на <em>X</em> е-писма…",
-	"sendmail-rate-delta": "…на всеки <em>X</em> милисекунди",
-	"sendmail-rate-help": "Задава на програмата за изпращане на е-писма на NodeBB да ограничи броя едновременно изпращани съобщения, за да не се претоварват пощенските сървъри. Тези настройки не се вземат предвид, ако е включена настройката „Транспорт чрез SMTP“ (по-долу).",
-
+	
 	"smtp-transport": "Транспорт чрез SMTP",
 	"smtp-transport.enabled": "Използване на външен сървър за е-поща за изпращане на е-писма",
 	"smtp-transport-help": "Можете да изберете от списък от познати услуги, или да въведете такава ръчно.",
@@ -25,6 +22,8 @@
 	"smtp-transport.username": "Потребителско име",
 	"smtp-transport.username-help": "<b>За услугата на Gmail</b>, въведете пълния адрес на е-пощата тук, особено ако използвате управляван домейн на „Google Apps“.",
 	"smtp-transport.password": "Парола",
+	"smtp-transport.pool": "Включване на групираните връзки",
+	"smtp-transport.pool-help": "Групирането на връзките предотвратява създаването на нова връзка за всяко е-писмо. Тази настройка има ефект, само ако е включено „Транспорт чрез SMTP“.",
 
 	"template": "Редактирана не шаблона за е-писма",
 	"template.select": "Изберете шаблон за е-писма",

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

@@ -2,6 +2,5 @@
 	"notifications": "Известия",
 	"welcome-notification": "Приветствено известие",
 	"welcome-notification-link": "Връзка за приветственото известие",
-	"welcome-notification-uid": "Потр. ид. за приветственото известие",
-	"notification-alert-timeout": "Време за изчакване преди премахване на уведомяването за известие"
+	"welcome-notification-uid": "Потр. ид. за приветственото известие"
 }

public/language/bg/admin/settings/post.json

@@ -42,6 +42,7 @@
 	"unread.cutoff": "Възраст на публикациите, след която те не се показват в непрочетените (в брой дни)",
 	"unread.min-track-last": "Минимален брой публикации в темата, след което да започва следене на последно прочетената",
 	"recent": "Настройки за скорошните",
+	"recent.max-topics": "Максимален брой теми в скорошните",
 	"recent.categoryFilter.disable": "Изключване на филтрирането на темите в пренебрегваните категории на страницата /recent",
 	"signature": "Настройки за подписите",
 	"signature.disable": "Забраняване на подписите",

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

@@ -5,10 +5,16 @@
 	"votes-are-public": "Всички гласувания са публични",
 	"thresholds": "Ограничения на дейността",
 	"min-rep-downvote": "Минимална репутация, необходима за отрицателно гласуване за публикации",
+	"downvotes-per-day": "Отрицателни гласувания за ден (задайте 0 за неограничен брой)",
+	"downvotes-per-user-per-day": "Отрицателни гласувания за потребител за ден (задайте 0 за неограничен брой)",
 	"min-rep-flag": "Минимална репутация, необходима за докладване на публикации",
 	"min-rep-website": "Минимална репутация, необходима за добавяне на полето „Уебсайт“ към профила на потребителя",
 	"min-rep-aboutme": "Минимална репутация, необходима за добавяне на полето „За мен“ към профила на потребителя",
 	"min-rep-signature": "Минимална репутация, необходима за добавяне на полето „Подпис“ към профила на потребителя",
 	"min-rep-profile-picture": "Минимална репутация, необходима за добавяне на профилна снимка към профила на потребителя",
-	"min-rep-cover-picture": "Минимална репутация, необходима за добавяне на снимка на корицата към профила на потребителя"
+	"min-rep-cover-picture": "Минимална репутация, необходима за добавяне на снимка на корицата към профила на потребителя",
+
+	"flags": "Настройки за докладите",
+	"flags.limit-per-target": "Максимален брой докладвания на едно и също нещо",
+	"flags.limit-per-target-placeholder": "По подразбиране: 0"
 }

public/language/bg/error.json

@@ -26,6 +26,7 @@
     "invalid-pagination-value": "Грешен номер на странициране, трябва да бъде между %1 и %2",
     "username-taken": "Потребителското име е заето",
     "email-taken": "Е-пощата е заета",
+    "email-invited": "На тази е-поща вече е била изпратена покана",
     "email-not-confirmed": "Няма да можете да публикувате съобщения, докато е-пощата Ви не бъде потвърдена. Моля, натиснете тук, за да потвърдите е-пощата си.",
     "email-not-confirmed-chat": "Няма да можете да пишете в разговори, докато е-пощата Ви не бъде потвърдена. Моля, натиснете тук, за да потвърдите е-пощата си.",
     "email-not-confirmed-email-sent": "Вашата е-поща все още не е потвърдена. Моля, проверете входящата си кутия за писмото за потвърждение. Няма да можете да публикувате съобщения или да пишете в разговори, докато е-пощата Ви не бъде потвърдена.",
@@ -138,8 +139,13 @@
     "not-enough-reputation-min-rep-signature": "Нямате достатъчно репутация, за да добавите подпис",
     "not-enough-reputation-min-rep-profile-picture": "Нямате достатъчно репутация, за да добавите снимка на профила си",
     "not-enough-reputation-min-rep-cover-picture": "Нямате достатъчно репутация, за да добавите снимка на корицата",
-    "already-flagged": "Вече сте докладвали тази публикация",
+    "post-already-flagged": "Вече сте докладвали тази публикация",
+    "user-already-flagged": "Вече сте докладвали този потребител",
+    "post-flagged-too-many-times": "Тази публикация вече е докладвана от други хора",
+    "user-flagged-too-many-times": "Този потребител вече е докладван от други хора",
     "self-vote": "Не можете да гласувате за собствената си публикация",
+    "too-many-downvotes-today": "Можете да гласувате отрицателно не повече от %1 пъти на ден",
+    "too-many-downvotes-today-user": "Можете да гласувате отрицателно за потребител не повече от %1 пъти на ден",
     "reload-failed": "NodeBB срещна проблем при презареждането: „%1“. NodeBB ще продължи да поддържа съществуващите клиентски ресурси, но Вие трябва да отмените последните си действия преди презареждането.",
     "registration-error": "Грешка при регистрацията",
     "parse-error": "Нещо се обърка при прочитането на отговора на сървъра",
@@ -157,10 +163,12 @@
     "invalid-session-text": "Изглежда сесията Ви на вписване вече е изтекла или не съответства на сървъра. Моля, опреснете страницата.",
     "no-topics-selected": "Няма избрани теми!",
     "cant-move-to-same-topic": "Публикацията не може да бъде преместена в същата тема!",
+    "cant-move-topic-to-same-category": "Темата не може да бъде преместена в същата категория!",
     "cannot-block-self": "Не можете да блокирате себе си!",
     "cannot-block-privileged": "Не можете да блокирате администратори и глобални модератори",
     "cannot-block-guest": "Гостите не могат да блокират други потребители",
     "already-blocked": "Този потребител вече е блокиран",
     "already-unblocked": "Този потребител вече е отблокиран",
-    "no-connection": "Изглежда има проблем с връзката Ви с Интернет"
+    "no-connection": "Изглежда има проблем с връзката Ви с Интернет",
+    "plugin-not-whitelisted": "Добавката не може да бъде инсталирана – само добавки, одобрени от пакетния мениджър на NodeBB могат да бъдат инсталирани чрез ACP"
 }

public/language/bg/flags.json

@@ -1,8 +1,7 @@
 {
 	"state": "Състояние",
-	"reporter": "Докладвал",
-	"reported-at": "Докладвано на",
-	"description": "Описание",
+	"reports": "Доклади",
+	"first-reported": "Първо докладване",
 	"no-flags": "Ура! Няма намерени доклади.",
 	"assignee": "Назначен",
 	"update": "Обновяване",
@@ -26,12 +25,14 @@
 	"filter-quick-mine": "Назначени на мен",
 	"filter-cid-all": "Всички категории",
 	"apply-filters": "Прилагане на филтрите",
+	"more-filters": "Още филтри",
 
 	"quick-actions": "Бързи действия",
 	"flagged-user": "Докладван потребител",
 	"view-profile": "Преглед на профила",
 	"start-new-chat": "Започване на нов разговор",
 	"go-to-target": "Преглед на целта на доклада",
+	"assign-to-me": "Назначаване на мен",
 	"delete-post": "Изтриване на публикацията",
 	"purge-post": "Изчистване на публикацията",
 	"restore-post": "Възстановяване на публикацията",
@@ -42,9 +43,11 @@
 	"notes": "Бележки към доклада",
 	"add-note": "Добавяне на бележка",
 	"no-notes": "Няма споделени бележки.",
+	"delete-note-confirm": "Наистина ли искате да изтриете тази бележка към доклада?",
+	"note-added": "Бележката е добавена",
+	"note-deleted": "Бележката е изтрита",
 
 	"history": "Акаунт и история на докладванията",
-	"back": "Обратно към списъка с доклади",
 	"no-history": "Няма история на доклада.",
 
 	"state-all": "Всички състояния",
@@ -53,7 +56,16 @@
 	"state-resolved": "Разрешен",
 	"state-rejected": "Отхвърлен",
 	"no-assignee": "Без назначение",
-	"note-added": "Бележката е добавена",
+
+	"sort": "Подреждане по",
+	"sort-newest": "Първо най-новите",
+	"sort-oldest": "Първо най-старите",
+	"sort-reports": "Първо тези с най-много доклади",
+	"sort-all": "Всички видове доклади…",
+	"sort-posts-only": "Само публикации…",
+	"sort-downvotes": "Най-много отрицателни гласове",
+	"sort-upvotes": "Най-много положителни гласове",
+	"sort-replies": "Най-много отговори",
 
 	"modal-title": "Докладване на неуместно съдържание",
 	"modal-body": "Моля, посочете причината за докладването на %1 %2 за преглед. Или използвайте някой от бутоните за бързо докладване, ако са приложими.",
@@ -65,5 +77,9 @@
 	"modal-submit-success": "Съдържанието беше докладвано на модераторите.",
 	"modal-submit-confirm": "Потвърждаване на докладването",
 	"modal-submit-confirm-text": "Вече сте описали специалната си причина. Наистина ли искате да изпратите доклада си по бързата процедура?",
-	"modal-submit-confirm-text-help": "Изпращането на доклад по бързата процедура ще премахне описаната от Вас специалната причина."
+	"modal-submit-confirm-text-help": "Изпращането на доклад по бързата процедура ще премахне описаната от Вас специалната причина.",
+
+	"bulk-actions": "Групови действия",
+	"bulk-resolve": "Разрешаване на доклад(и)",
+	"bulk-success": "%1 доклада са обновени"
 }

public/language/bg/global.json

@@ -30,6 +30,7 @@
     "header.unread": "Непрочетени",
     "header.tags": "Етикети",
     "header.popular": "Популярни",
+    "header.top": "Най-харесвани",
     "header.users": "Потребители",
     "header.groups": "Групи",
     "header.chats": "Разговори",
@@ -51,14 +52,17 @@
     "users": "Потребители",
     "topics": "Теми",
     "posts": "Публ.",
+    "x-posts": "%1 публикации",
     "best": "Най-добри",
     "votes": "Гласове",
+    "x-votes": "%1 гласа",
     "voters": "Гласували",
     "upvoters": "Гласували положително",
     "upvoted": "С положителни гласове",
     "downvoters": "Гласували отрицателно",
     "downvoted": "С отрицателни гласове",
     "views": "Прегл.",
+    "posters": "Участници",
     "reputation": "Репутация",
     "lastpost": "Последна публикация",
     "firstpost": "Първа публикация",

public/language/bg/modules.json

@@ -1,6 +1,7 @@
 {
     "chat.chatting_with": "Разговор с",
     "chat.placeholder": "Въведете съобщението тук и натиснете Ентер за изпращане",
+    "chat.scroll-up-alert": "В момента разглеждате по-стари съобщения. Щракнете тук, за да се прехвърлите към най-новото съобщение.",
     "chat.send": "Изпращане",
     "chat.no_active": "Нямате текущи разговори.",
     "chat.user_typing": "%1 пише...",
@@ -58,6 +59,7 @@
     "composer.upload-file": "Качване на файл",
     "composer.zen_mode": "Режим Дзен",
     "composer.select_category": "Изберете категория",
+    "composer.textarea.placeholder": "Въведете съдържанието на публикацията си тук. Можете също да влачите и пускате снимки.",
     "bootbox.ok": "Добре",
     "bootbox.cancel": "Отказ",
     "bootbox.confirm": "Потвърждаване",

public/language/bg/notifications.json

@@ -43,6 +43,9 @@
     "new_register_multiple": "Има <strong>%1</strong> заявки за регистрация, които очакват да бъдат прегледани.",
     "flag_assigned_to_you": "<strong>Докладът %1</strong> беше назначен на Вас",
     "post_awaiting_review": "Публикацията чака да бъде прегледана",
+    "profile-exported": "Профилът на <strong>%1</strong> е изнесен, щракнете за сваляне",
+    "posts-exported": "Публикациите на <strong>%1</strong> са изнесени, щракнете за сваляне",
+    "uploads-exported": "Качванията на <strong>%1</strong> са изнесени, щракнете за сваляне",
     "email-confirmed": "Е-пощата беше потвърдена",
     "email-confirmed-message": "Благодарим Ви, че потвърдихте е-пощата си. Акаунтът Ви е вече напълно активиран.",
     "email-confirm-error-message": "Възникна проблем при потвърждаването на е-пощата Ви. Може кодът да е грешен или давността му да е изтекла.",

public/language/bg/reset_password.json

@@ -7,6 +7,7 @@
     "wrong_reset_code.message": "Полученият код за подновяване беше грешен. Моля, опитайте отново или <a href=\"/reset\">поискайте нов код за подновяване</a>.",
     "new_password": "Нова парола",
     "repeat_password": "Потвърдете паролата",
+    "changing_password": "Промяна на паролата…",
     "enter_email": "Моля, въведете <strong>адреса на е-пощата си</strong> и ще Ви изпратим е-писмо с инструкции за това как да достъпите акаунта си.",
     "enter_email_address": "Въведете адрес на е-поща",
     "password_reset_sent": "Ако посоченият адрес съответства на съществуващ потребителски акаунт, то вече му е изпратено е-писмо за подновяване на паролата. Имайте предвид, че може да бъде изпращано само по едно е-писмо на минута.",

public/language/bg/topic.json

@@ -1,7 +1,5 @@
 {
     "topic": "Тема",
-    "topic_id": "Ид. на темата",
-    "topic_id_placeholder": "Въведете ид. на тема",
     "no_topics_found": "Няма намерени теми!",
     "no_posts_found": "Няма намерени публикации!",
     "post_is_deleted": "Публикацията е изтрита!",
@@ -36,8 +34,11 @@
     "ban-ip": "Блокиране на IP адреса",
     "view-history": "История на редакциите",
     "bookmark_instructions": "Щракнете тук, за да се върнете към последно прочетената публикация в тази тема.",
-    "flag_title": "Докладване на тази публикация до модератор",
-    "merged_message": "Тази тема беше слята в <a href=\"/topic/%1\">%2</a>",
+    "flag-post": "Докладване на тази публикация",
+    "flag-user": "Докладване на този потребител",
+    "already-flagged": "Вече е докладвано",
+    "view-flag-report": "Преглед на доклада",
+    "merged_message": "Тази тема беше слята в <a href=\"%1\">%2</a>",
     "deleted_message": "Темата е изтрита. Само потребители с права за управление на темите могат да я видят.",
     "following_topic.message": "Вече ще получавате известия когато някой публикува коментар в тази тема.",
     "not_following_topic.message": "Ще виждате тази тема в списъка с непрочетени теми, но няма да получавате известия, когато хората публикуват нещо в нея.",
@@ -78,7 +79,10 @@
     "thread_tools.purge_confirm": "Наистина ли искате да изчистите тази тема?",
     "thread_tools.merge_topics": "Сливане на темите",
     "thread_tools.merge": "Сливане",
-    "topic_move_success": "Темата беше преместена успешно в %1",
+    "topic_move_success": "Темата ще бъде преместена след малко. Натиснете тук, за да отмените преместването.",
+    "topic_move_undone": "Преместването на темата беше отменено",
+    "topic_move_posts_success": "Публикациите ще бъдат преместени след малко. Натиснете тук, за да отмените преместването.",
+    "topic_move_posts_undone": "Преместването на публикациите беше отменено",
     "post_delete_confirm": "Наистина ли искате да изтриете тази публикация?",
     "post_restore_confirm": "Наистина ли искате да възстановите тази публикация?",
     "post_purge_confirm": "Наистина ли искате да изчистите тази публикация?",
@@ -96,11 +100,18 @@
     "fork_topic": "Разделяне на темата",
     "fork_topic_instruction": "Натиснете публикациите, които искате да отделите",
     "fork_no_pids": "Няма избрани публикации!",
+    "no-posts-selected": "Няма избрани публикации!",
+    "x-posts-selected": "Избрани публикации: %1",
+    "x-posts-will-be-moved-to-y": "%1 публикации ще бъдат преместени в „%2“",
     "fork_pid_count": "Избрани публикации: %1",
     "fork_success": "Темата е разделена успешно! Натиснете тук, за да преминете към отделената тема.",
     "delete_posts_instruction": "Натиснете публикациите, които искате да изтриете/изчистите",
-    "merge_topics_instruction": "Натиснете темите, които искате да слеете",
-    "move_posts_instruction": "Натиснете публикациите, които искате да преместите",
+    "merge_topics_instruction": "Щракнете върху темите, които искате да слеете, или ги потърсете",
+    "merge-topic-list-title": "Списък от темите, които ще бъдат слети",
+    "merge-options": "Настройки за сливането",
+    "merge-select-main-topic": "Изберете основната тема",
+    "merge-new-title-for-topic": "Ново заглавие за темата",
+    "move_posts_instruction": "Натиснете публикациите, които искате да преместите, а след това идете в желаната тема и натиснете „Преместване“.",
     "change_owner_instruction": "Натиснете публикациите, които искате да прехвърлите на друг потребител",
     "composer.title_placeholder": "Въведете заглавието на темата си тук...",
     "composer.handle_placeholder": "Въведете името тук",
@@ -130,10 +141,13 @@
     "stale.reply_anyway": "Отговаряне в тази тема въпреки това",
     "link_back": "Отговор: [%1](%2)",
     "diffs.title": "История на редакциите",
-    "diffs.description": "Тази публикация има <strong>%1</strong> варианта. Щракнете върху някоя от версиите по-долу, за да видите съдържанието ѝ в съответния момент.",
-    "diffs.no-revisions-description": "Тази публикация има <strong>%1</strong> варианта.",
+    "diffs.description": "Тази публикация има <strong>%1</strong> версии. Щракнете върху някоя от версиите по-долу, за да видите съдържанието ѝ в съответния момент.",
+    "diffs.no-revisions-description": "Тази публикация има <strong>%1</strong> версии.",
     "diffs.current-revision": "текуща версия",
     "diffs.original-revision": "оригинална версия",
+    "diffs.restore": "Възстановяване на тази версия",
+    "diffs.restore-description": "Към историята на редакциите на тази публикация ще бъде добавена нова версия.",
+    "diffs.post-restored": "Публикацията е възстановена успешно до по-ранна версия",
     "timeago_later": "%1 по-късно",
     "timeago_earlier": "%1 по-рано"
 }

public/language/bg/user.json

@@ -111,12 +111,7 @@
     "posts_per_page": "Публикации на страница",
     "max_items_per_page": "Най-много %1",
     "acp_language": "Език на администраторската страница",
-    "notification_sounds": "Изпълняване на звук, когато получите известие",
-    "notifications_and_sounds": "Известия и звуци",
-    "incoming-message-sound": "Звук за входящо съобщение",
-    "outgoing-message-sound": "Звук за изходящо съобщение",
-    "notification-sound": "Звук за известие",
-    "no-sound": "Без звук",
+    "notifications": "Известия",
     "upvote-notif-freq": "Честота на известията за положителни гласове",
     "upvote-notif-freq.all": "Всички положителни гласове",
     "upvote-notif-freq.first": "При първия за публикация",
@@ -179,6 +174,9 @@
     "consent.right_to_data_portability": "Имате право на пренос на данни",
     "consent.right_to_data_portability_description": "Можете да изискате от нас всички събрани за Вас и акаунта Ви данни в машинен формат. Можете да направите това като натиснете съответния бутон по-долу.",
     "consent.export_profile": "Изнасяне на профила (.json)",
+    "consent.export-profile-success": "Изнасяне на профила… Ще получите известие, когато е готово.",
     "consent.export_uploads": "Изнасяне на каченото съдържание (.zip)",
-    "consent.export_posts": "Изнасяне на публикациите (.csv)"
+    "consent.export-uploads-success": "Изнасяне на каченото съдържание… Ще получите известие, когато е готово.",
+    "consent.export_posts": "Изнасяне на публикациите (.csv)",
+    "consent.export-posts-success": "Изнасяне на публикациите… Ще получите известие, когато е готово."
 }

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

@@ -3,6 +3,7 @@
 	"ip": "IP <strong>%1</strong>",
 	"nodes-responded": "%1 nodes responded within %2ms!",
 	"host": "host",
+	"primary": "primary / run jobs",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "online",

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

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

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

@@ -11,6 +11,7 @@
 	"num-recent-replies": "# of Recent Replies",
 	"ext-link": "External Link",
 	"is-section": "Treat this category as a section",
+	"tag-whitelist": "Tag Whitelist",
 	"upload-image": "Upload Image",
 	"delete-image": "Remove",
 	"category-image": "Category Image",
@@ -26,6 +27,8 @@
 	"enable": "Enable",
 	"disable": "Disable",
 	"edit": "Edit",
+	"analytics": "Analytics",
+	"view-category": "View category",
 
 	"select-category": "Select Category",
 	"set-parent-category": "Set Parent Category",
@@ -63,7 +66,6 @@
 	"alert.create-success": "Category successfully created!",
 	"alert.none-active": "You have no active categories.",
 	"alert.create": "Create a Category",
-	"alert.confirm-moderate": "<strong>Are you sure you wish to grant the moderation privilege to this user group?</strong> This group is public, and any users can join at will.",
 	"alert.confirm-purge": "<p class=\"lead\">Do you really want to purge this category \"%1\"?</p><h5><strong class=\"text-danger\">Warning!</strong> All topics and posts in this category will be purged!</h5> <p class=\"help-block\">Purging a category will remove all topics and posts, and delete the category from the database. If you want to remove a category <em>temporarily</em>, you'll want to \"disable\" the category instead.</p>",
 	"alert.purge-success": "Category purged!",
 	"alert.copy-success": "Settings Copied!",
@@ -75,7 +77,9 @@
 	"alert.user-search": "Search for a user here...",
 	"alert.find-group": "Find a Group",
 	"alert.group-search": "Search for a group here...",
+	"alert.not-enough-whitelisted-tags": "Whitelisted tags are less than minimum tags, you need to create more whitelisted tags!",
 	"collapse-all": "Collapse All",
 	"expand-all": "Expand All",
-	"disable-on-create": "Disable on create"
+	"disable-on-create": "Disable on create",
+	"no-matches": "No matches"
 }

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

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

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

@@ -1,9 +1,9 @@
 {
 	"global": "Global",
-	"global.no-users": "No user-specific global privileges.",
 	"admin": "Admin",
 	"group-privileges": "Group Privileges",
 	"user-privileges": "User Privileges",
+	"edit-privileges": "Edit Privileges",
 	"chat": "Chat",
 	"upload-images": "Upload Images",
 	"upload-files": "Upload Files",
@@ -33,10 +33,20 @@
 	"delete-topics": "Delete Topics",
 	"purge": "Purge",
 	"moderate": "Moderate",
-
 	"admin-dashboard": "Dashboard",
 	"admin-categories": "Categories",
 	"admin-privileges": "Privileges",
 	"admin-users": "Users",
-	"admin-settings": "Settings"
+	"admin-settings": "Settings",
+
+	"alert.confirm-moderate": "<strong>Are you sure you wish to grant the moderation privilege to this user group?</strong> This group is public, and any users can join at will.",
+	"alert.confirm-save": "Please confirm your intention to save these privileges",
+	"alert.saved": "Privilege changes saved and applied",
+	"alert.confirm-discard": "Are you sure you wish to discard your privilege changes?",
+	"alert.discarded": "Privilege changes discarded",
+	"alert.confirm-copyToAll": "Are you sure you wish to apply this privilege set to <strong>all categories</strong>?",
+	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's privilege set to <strong>all categories</strong>?",
+	"alert.confirm-copyToChildren": "Are you sure you wish to apply this privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.no-undo": "<em>This action cannot be undone.</em>"
 }

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

@@ -108,5 +108,5 @@
 
 	"alerts.prompt-email": "Emails: ",
 	"alerts.email-sent-to": "An invitation email has been sent to %1",
-	"alerts.x-users-found": "%1 user(s) found! Search took %2 ms."
+	"alerts.x-users-found": "%1 user(s) found, (%2 seconds)"
 }

public/language/bn/admin/menu.json

@@ -19,7 +19,7 @@
 	"settings/general": "General",
 	"settings/homepage": "Home Page",
 	"settings/navigation": "Navigation",
-	"settings/reputation": "Reputation",
+	"settings/reputation": "Reputation & Flags",
 	"settings/email": "Email",
 	"settings/user": "Users",
 	"settings/group": "Groups",
@@ -70,7 +70,7 @@
 	"logout": "Log out",
 	"view-forum": "View Forum",
 
-	"search.placeholder": "Search for settings",
+	"search.placeholder": "Press "/" to search for settings",
 	"search.no-results": "No results...",
 	"search.search-forum": "Search the forum for <strong></strong>",
 	"search.keep-typing": "Type more to see results...",

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

@@ -5,6 +5,8 @@
 	"maintenance-mode.message": "Maintenance Message",
 	"headers": "Headers",
 	"headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame",
+	"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
+	"headers.csp-frame-ancestors-help": "'none', 'self'(default) or list of URIs to allow.",
 	"headers.powered-by": "Customise the \"Powered By\" header sent by NodeBB",
 	"headers.acao": "Access-Control-Allow-Origin",
 	"headers.acao-regex": "Access-Control-Allow-Origin Regular Expression",
@@ -20,7 +22,7 @@
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Traffic Management",
-	"traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Enable Traffic Management",
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",

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

@@ -4,10 +4,7 @@
 	"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": "<em>X</em> ইমেইল পাঠাও... ",
-	"sendmail-rate-delta": "... প্রতি<em>X</em> মিলিসেকেন্ডে",
-	"sendmail-rate-help": "NodeBB মেইলার কে নির্দেশ দিন যে একবারে পাঠানো মেইলের সংখ্যা সিমিত রাখতে যাতে ইমেইল গ্রাহক সার্ভিস ওভারলোডেড না হয়ে যায়। এই অপশন কার্যকর হবে না যদি SMTP Transport চালু থাকে (নিচে দেখুন)। ",
-
+	
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Use an external email server to send emails",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -25,6 +22,8 @@
 	"smtp-transport.username": "Username",
 	"smtp-transport.username-help": "<b>For the Gmail service,</b> enter the full email address here, especially if you are using a Google Apps managed domain.",
 	"smtp-transport.password": "Password",
+	"smtp-transport.pool": "Enable pooled connections",
+	"smtp-transport.pool-help": "Pooling connections prevents NodeBB from creating a new connection for every email. This option only applies if SMTP Transport is enabled.",
 
 	"template": "Edit Email Template",
 	"template.select": "Select Email Template",

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

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

public/language/bn/admin/settings/post.json

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

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

@@ -5,10 +5,16 @@
 	"votes-are-public": "All Votes Are Public",
 	"thresholds": "Activity Thresholds",
 	"min-rep-downvote": "Minimum reputation to downvote posts",
+	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
+	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
 	"min-rep-flag": "Minimum reputation to flag posts",
 	"min-rep-website": "Minimum reputation to add \"Website\" to user profile",
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",
 	"min-rep-signature": "Minimum reputation to add \"Signature\" to user profile",
 	"min-rep-profile-picture": "Minimum reputation to add \"Profile Picture\" to user profile",
-	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile"
+	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile",
+
+	"flags": "Flag Settings",
+	"flags.limit-per-target": "Maximum number of times something can be flagged",
+	"flags.limit-per-target-placeholder": "Default: 0"
 }

public/language/bn/error.json

@@ -26,6 +26,7 @@
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "ইউজারনেম আগেই ব্যবহৃত",
     "email-taken": "ইমেইল আগেই ব্যবহৃত",
+    "email-invited": "Email was already invited",
     "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.",
     "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
     "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.",
@@ -138,8 +139,13 @@
     "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": "You have already flagged this post",
+    "post-already-flagged": "You have already flagged this post",
+    "user-already-flagged": "You have already flagged this user",
+    "post-flagged-too-many-times": "This post has been flagged by others already",
+    "user-flagged-too-many-times": "This user has been flagged by others already",
     "self-vote": "You cannot vote on your own post",
+    "too-many-downvotes-today": "You can only downvote %1 times a day",
+    "too-many-downvotes-today-user": "You can only downvote a user %1 times a day",
     "reload-failed": "\"%1\" রিলোড করতে সমস্যা হয়েছে। রিলোডের পূর্বে যা করা হয়েছিল সেটি আনডু করা সমীচীন। ",
     "registration-error": "নিবন্ধন এরর!",
     "parse-error": "Something went wrong while parsing server response",
@@ -157,10 +163,12 @@
     "invalid-session-text": "It looks like your login session is no longer active, or no longer matches with the server. Please refresh this page.",
     "no-topics-selected": "No topics selected!",
     "cant-move-to-same-topic": "Can't move post to same topic!",
+    "cant-move-topic-to-same-category": "Can't move topic to the same category!",
     "cannot-block-self": "You cannot block yourself!",
     "cannot-block-privileged": "You cannot block administrators or global moderators",
     "cannot-block-guest": "Guest are not able to block other users",
     "already-blocked": "This user is already blocked",
     "already-unblocked": "This user is already unblocked",
-    "no-connection": "There seems to be a problem with your internet connection"
+    "no-connection": "There seems to be a problem with your internet connection",
+    "plugin-not-whitelisted": "Unable to install plugin – only plugins whitelisted by the NodeBB Package Manager can be installed via the ACP"
 }

public/language/bn/flags.json

@@ -1,8 +1,7 @@
 {
 	"state": "State",
-	"reporter": "Reporter",
-	"reported-at": "Reported At",
-	"description": "Description",
+	"reports": "Reports",
+	"first-reported": "First Reported",
 	"no-flags": "Hooray! No flags found.",
 	"assignee": "Assignee",
 	"update": "Update",
@@ -26,12 +25,14 @@
 	"filter-quick-mine": "Assigned to me",
 	"filter-cid-all": "All categories",
 	"apply-filters": "Apply Filters",
+	"more-filters": "More Filters",
 
 	"quick-actions": "Quick Actions",
 	"flagged-user": "Flagged User",
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",
@@ -42,9 +43,11 @@
 	"notes": "Flag Notes",
 	"add-note": "Add Note",
 	"no-notes": "No shared notes.",
+	"delete-note-confirm": "Are you sure you want to delete this flag note?",
+	"note-added": "Note Added",
+	"note-deleted": "Note Deleted",
 
 	"history": "Account & Flag History",
-	"back": "Back to Flags List",
 	"no-history": "No flag history.",
 
 	"state-all": "All states",
@@ -53,7 +56,16 @@
 	"state-resolved": "Resolved",
 	"state-rejected": "Rejected",
 	"no-assignee": "Not Assigned",
-	"note-added": "Note Added",
+
+	"sort": "Sort by",
+	"sort-newest": "Newest first",
+	"sort-oldest": "Oldest first",
+	"sort-reports": "Most reports",
+	"sort-all": "All flag types...",
+	"sort-posts-only": "Posts only...",
+	"sort-downvotes": "Most downvotes",
+	"sort-upvotes": "Most upvotes",
+	"sort-replies": "Most replies",
 
 	"modal-title": "Report Inappropriate Content",
 	"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
@@ -65,5 +77,9 @@
 	"modal-submit-success": "Content has been flagged for moderation.",
 	"modal-submit-confirm": "Confirm Submission",
 	"modal-submit-confirm-text": "You have a custom reason specified already. Are you sure you wish to submit via quick-report?",
-	"modal-submit-confirm-text-help": "Submitting a quick report will overwrite any custom reasons defined."
+	"modal-submit-confirm-text-help": "Submitting a quick report will overwrite any custom reasons defined.",
+
+	"bulk-actions": "Bulk Actions",
+	"bulk-resolve": "Resolve Flag(s)",
+	"bulk-success": "%1 flags updated"
 }

public/language/bn/global.json

@@ -30,6 +30,7 @@
     "header.unread": "অপঠিত",
     "header.tags": "ট্যাগ",
     "header.popular": "জনপ্রিয়",
+    "header.top": "Top",
     "header.users": "ব্যবহারকারীগণ",
     "header.groups": "Groups",
     "header.chats": "কথোপকথন",
@@ -51,14 +52,17 @@
     "users": "ব্যবহারকারীগণ",
     "topics": "টপিক",
     "posts": "পোস্টগুলি",
+    "x-posts": "%1 posts",
     "best": "Best",
     "votes": "Votes",
+    "x-votes": "%1 votes",
     "voters": "Voters",
     "upvoters": "Upvoters",
     "upvoted": "Upvoted",
     "downvoters": "Downvoters",
     "downvoted": "Downvoted",
     "views": "দেখেছেন",
+    "posters": "Posters",
     "reputation": "সন্মাননা",
     "lastpost": "Last post",
     "firstpost": "First post",

public/language/bn/modules.json

@@ -1,6 +1,7 @@
 {
     "chat.chatting_with": "Chat with",
     "chat.placeholder": "এখানে আপনার বার্তা লিখুন। পাঠানোর জন্য Enter চাপুন",
+    "chat.scroll-up-alert": "You are looking at older messages, click here to go to most recent message.",
     "chat.send": "প্রেরন করুন",
     "chat.no_active": "আপনার কোন সচল কথোপকথন নেই",
     "chat.user_typing": "%1 লিখছেন",
@@ -58,6 +59,7 @@
     "composer.upload-file": "Upload File",
     "composer.zen_mode": "Zen Mode",
     "composer.select_category": "Select a category",
+    "composer.textarea.placeholder": "Enter your post content here, drag and drop images",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",

public/language/bn/notifications.json

@@ -43,6 +43,9 @@
     "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",
     "post_awaiting_review": "Post awaiting review",
+    "profile-exported": "<strong>%1</strong> profile exported, click to download",
+    "posts-exported": "<strong>%1</strong> posts exported, click to download",
+    "uploads-exported": "<strong>%1</strong> uploads exported, click to download",
     "email-confirmed": "ইমেইল নিশ্চিত করা হয়েছে",
     "email-confirmed-message": "আপনার ইমেইল যাচাই করার জন্য আপনাকে ধন্যবাদ। আপনার অ্যাকাউন্টটি এখন সম্পূর্ণরূপে সক্রিয়।",
     "email-confirm-error-message": "আপনার ইমেল ঠিকানার বৈধতা যাচাইয়ে একটি সমস্যা হয়েছে। সম্ভবত কোডটি ভুল ছিল অথবা কোডের মেয়াদ শেষ হয়ে গিয়েছে।",

public/language/bn/reset_password.json

@@ -7,6 +7,7 @@
     "wrong_reset_code.message": "প্রাপ্ত রিসেট কোডটি ভুল ছিল। আবার চেষ্টা করুন, অথবা <a href=\"/reset\">একটি নতুন রিসেট কোড</a> অনুরোধ করুন।",
     "new_password": "নতুন পাসওয়ার্ড",
     "repeat_password": "পাসওয়ার্ড নিশ্চিত করুন",
+    "changing_password": "Changing Password",
     "enter_email": "অনুগ্রহপূর্বক আপনার ইমেইল এড্রেস প্রদান করুন, আমরা আপনাকে আপনার পাসওয়ার্ড রিসেট সম্পর্কিত তথ্যাবলী ইমেইলে পাঠিয়ে দিবো। ",
     "enter_email_address": "আপনার ইমেইল এড্রেস",
     "password_reset_sent": "If the specified address corresponds to an existing user account, a password reset email was sent. Please note that only one email will be sent per minute.",

public/language/bn/topic.json

@@ -1,7 +1,5 @@
 {
     "topic": "টপিক",
-    "topic_id": "টপিক নাম্বার ",
-    "topic_id_placeholder": "টপিক নাম্বার দিন ",
     "no_topics_found": "কোন টপিক পাওয়া যায়নি!",
     "no_posts_found": "কোন পোস্ট পাওয়া যায়নি",
     "post_is_deleted": "এই পোস্টটি মুছে ফেলা হয়েছে!",
@@ -36,8 +34,11 @@
     "ban-ip": "Ban IP",
     "view-history": "Edit History",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
-    "flag_title": "মডারেশনের জন্য এই পোস্টটি ফ্ল্যাগ করুন",
-    "merged_message": "This topic has been merged into <a href=\"/topic/%1\">%2</a>",
+    "flag-post": "Flag this post",
+    "flag-user": "Flag this user",
+    "already-flagged": "Already Flagged",
+    "view-flag-report": "View Flag Report",
+    "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "এই টপিকটি মুছে ফেলা হয়েছে। শুধুমাত্র টপিক ব্যবস্থাপনার ক্ষমতাপ্রাপ্ত সদস্যগণ এটি দেখতে পারবেন।",
     "following_topic.message": "এখন থেকে এই টপিকে অন্যকেউ পোস্ট করলে আপনি নোটিফিকেশন পাবেন।",
     "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
@@ -78,7 +79,10 @@
     "thread_tools.purge_confirm": "আপনি নিশ্চিত যে আপনি টপিকটি পার্জ করতে চাচ্ছেন ? ",
     "thread_tools.merge_topics": "Merge Topics",
     "thread_tools.merge": "Merge",
-    "topic_move_success": "টপিকটি %1  এ সরিয়ে নেয়া হয়েছে",
+    "topic_move_success": "This topic will be moved shortly. Click here to undo.",
+    "topic_move_undone": "Topic move undone",
+    "topic_move_posts_success": "Posts will be moved shortly. Click here to undo.",
+    "topic_move_posts_undone": "Post move undone",
     "post_delete_confirm": "আপনি নিশ্চিত যে আপনি এই পোষ্টটি মুছে ফেলতে চান ?",
     "post_restore_confirm": "আপনি নিশ্চিত যে আপনি এই পোষ্টটি পুনরূূদ্ধার করতে চান ? ",
     "post_purge_confirm": "আপনি নিশ্চিত যে আপনি এই পোষ্টটি পার্জ করতে চান ? ",
@@ -96,11 +100,18 @@
     "fork_topic": "টপিক ফর্ক করুন",
     "fork_topic_instruction": "যে পোষ্টটি ফর্ক করতে চান সেটি ক্লিক করুন",
     "fork_no_pids": "কোন পোষ্ট সিলেক্ট করা হয় নি",
+    "no-posts-selected": "No posts selected!",
+    "x-posts-selected": "%1 post(s) selected",
+    "x-posts-will-be-moved-to-y": "%1 post(s) will be moved to \"%2\"",
     "fork_pid_count": "%1 post(s) selected",
     "fork_success": "টপিক ফর্ক করা হয়েছে। ফর্ক করা টপিকে যেতে এখানে ক্লিক করুন",
     "delete_posts_instruction": "Click the posts you want to delete/purge",
-    "merge_topics_instruction": "Click the topics you want to merge",
-    "move_posts_instruction": "Click the posts you want to move",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
+    "move_posts_instruction": "Click the posts you want to move then go to target topic and click move.",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "আপনার টপিকের শিরোনাম দিন",
     "composer.handle_placeholder": "Enter your name/handle here",
@@ -134,6 +145,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/bn/user.json

@@ -111,12 +111,7 @@
     "posts_per_page": "প্রতি পেইজে কতগুলো পোষ্ট থাকবে",
     "max_items_per_page": "Maximum %1",
     "acp_language": "Admin Page Language",
-    "notification_sounds": "নোটিফিকেশনের জন্য নোটিফিকেশন সাউন্ড এনাবল করুন",
-    "notifications_and_sounds": "Notifications & Sounds",
-    "incoming-message-sound": "Incoming message sound",
-    "outgoing-message-sound": "Outgoing message sound",
-    "notification-sound": "Notification sound",
-    "no-sound": "No sound",
+    "notifications": "Notifications",
     "upvote-notif-freq": "Upvote Notification Frequency",
     "upvote-notif-freq.all": "All Upvotes",
     "upvote-notif-freq.first": "First Per Post",
@@ -179,6 +174,9 @@
     "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 (.json)",
+    "consent.export-profile-success": "Exporting profile, you will get a notification when it is complete.",
     "consent.export_uploads": "Export Uploaded Content (.zip)",
-    "consent.export_posts": "Export Posts (.csv)"
+    "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.",
+    "consent.export_posts": "Export Posts (.csv)",
+    "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete."
 }

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

@@ -2,7 +2,7 @@
 	"events": "Události",
 	"no-events": "Žádné nové události",
 	"control-panel": "Ovládací panel událostí",
-	"delete-events": "Delete Events",
+	"delete-events": "Odstranit události",
 	"filters": "Filtry",
 	"filters-apply": "Použít filtry",
 	"filter-type": "Typ události",

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

@@ -1,8 +1,9 @@
 {
-	"you-are-on": "You are on <strong>%1:%2</strong>",
+	"you-are-on": "Jste u <strong>%1:%2</strong>",
 	"ip": "IP <strong>%1</strong>",
 	"nodes-responded": "%1 vazeb odpovědělo během %2ms.",
 	"host": "host",
+	"primary": "primární / spuštěné úlohy",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "připojen",

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

@@ -1,7 +1,7 @@
 {
 	"available": "Dostupné miniaplikace",
 	"explanation": "Vyberte si miniaplikaci z vysouvací nabídky a přetáhněte ji do oblasti šablony miniaplikace nalevo.",
-	"none-installed": "Nebyly nalezeny žádné miniaplikace. Aktivujte rozšíření základních miniaplikací v ovládacím panelu <a href=\"%1\">Rozšíření</a>.",
+	"none-installed": "Nebyly nalezeny žádné miniaplikace! Aktivujte zásuvný modul miniaplikace v ovládacím panelu <a href=\"%1\">zásuvné moduly</a>.",
 	"clone-from": "Klonovat miniaplikaci z",
 	"containers.available": "Dostupné moduly",
 	"containers.explanation": "Přetáhněte na jakoukoliv aktivní miniaplikaci",

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

@@ -11,6 +11,7 @@
 	"num-recent-replies": "# posledních odpovědí",
 	"ext-link": "Externí odkaz",
 	"is-section": "Zacházet s kategorii jako se sekcí",
+	"tag-whitelist": "Seznam povolených značek",
 	"upload-image": "Nahrát obrázek",
 	"delete-image": "Vyjmout",
 	"category-image": "Obrázek kategorie",
@@ -26,6 +27,8 @@
 	"enable": "Povolit",
 	"disable": "Zakázat",
 	"edit": "Upravit",
+	"analytics": "Analytika",
+	"view-category": "Zobrazit kategorii",
 
 	"select-category": "Vyberte kategorii",
 	"set-parent-category": "Nastavit nadřazenou kategorii",
@@ -63,7 +66,6 @@
 	"alert.create-success": "Kategorie byla úspěšně vytvořena.",
 	"alert.none-active": "Nemáte žádné aktivní kategorie.",
 	"alert.create": "Vytvořit kategorii",
-	"alert.confirm-moderate": "<strong>Jste si jist/a, že chcete umožnit oprávnění moderovat této skupině uživatelů?</strong> Tato skupina je veřejná a uživatelé se k ní mohou připojit dle libosti.",
 	"alert.confirm-purge": "<p class=\"lead\">Opravdu chcete vyčistit tuto kategorii \"%1\"?</p><h5><strong class=\"text-danger\">Upozornění</strong>Všechny témata a příspěvky v této kategorii budou smazána.</h5><p class=\"help-block\">Smazání kategorie vyjme všechny témata a příspěvky a odstraní kategorii z databáze. Pokud chcete vyjmout kategorii <em>dočasně</em>, raději místo toho kategorii „zakažte”.</p>",
 	"alert.purge-success": "Kategorie byla vyčištěna.",
 	"alert.copy-success": "Nastavení bylo zkopírováno.",
@@ -75,7 +77,9 @@
 	"alert.user-search": "Najít uživatele…",
 	"alert.find-group": "Najít skupinu",
 	"alert.group-search": "Hledat skupinu…",
+	"alert.not-enough-whitelisted-tags": "Seznam povolených značek je menší než minimální počet povolených značek. Vytvořte proto další povolené značky!",
 	"collapse-all": "Sbalit vše",
 	"expand-all": "Rozbalit vše",
-	"disable-on-create": "Zakázat při vytvoření"
+	"disable-on-create": "Zakázat při vytvoření",
+	"no-matches": "Žádná shoda"
 }

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

@@ -9,7 +9,7 @@
 	"default": "Výchozí systémové",
 	"default-help": "Výchozí systémové znamená, že uživatel nemůže přenastavit celkové nastavení pravidel na fóru pro odesílání přehledů, které je momentálně<strong>%1</strong>",
 	"resend": "Znovu odeslat přehled",
-	"resend-all-confirm": "Are you sure you wish to manually execute this digest run?",
+	"resend-all-confirm": "Jste si jist/a, že chcete ručně spustit tento přehled.",
 	"resent-single": "Manuální znovu poslání přehledu bylo dokončeno",
 	"resent-day": "Znovu odeslat denní přehled",
 	"resent-week": "Znovu odeslat týdenní přehled",

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

@@ -8,6 +8,9 @@
 	"hidden": "Skrytý",
 	"private": "Soukromí",
 	"edit": "Upravit",
+	"delete": "Odstranit",
+	"privileges": "Oprávnění",
+	"download-csv": "CSV",
 	"search-placeholder": "Hledat",
 	"create": "Vytvořit skupinu",
 	"description-placeholder": "Krátký popis skupiny",

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

@@ -1,9 +1,9 @@
 {
 	"global": "Všeobecné",
-	"global.no-users": "Žádné všeobecné uživatelské nastavení.",
-	"admin": "Admin",
+	"admin": "Správce",
 	"group-privileges": "Oprávnění skupiny",
 	"user-privileges": "Oprávnění uživatele",
+	"edit-privileges": "Upravit oprávnění",
 	"chat": "Konverzace",
 	"upload-images": "Nahrát obrázky",
 	"upload-files": "Náhrát soubory",
@@ -33,10 +33,20 @@
 	"delete-topics": "Odstranit témata",
 	"purge": "Vyčistit",
 	"moderate": "Moderace",
+	"admin-dashboard": "Nástěnka",
+	"admin-categories": "Kategorie",
+	"admin-privileges": "Oprávnění",
+	"admin-users": "Uživatelé",
+	"admin-settings": "Nastavení",
 
-	"admin-dashboard": "Dashboard",
-	"admin-categories": "Categories",
-	"admin-privileges": "Privileges",
-	"admin-users": "Users",
-	"admin-settings": "Settings"
+	"alert.confirm-moderate": "<strong>Are you sure you wish to grant the moderation privilege to this user group?</strong> This group is public, and any users can join at will.",
+	"alert.confirm-save": "Please confirm your intention to save these privileges",
+	"alert.saved": "Privilege changes saved and applied",
+	"alert.confirm-discard": "Are you sure you wish to discard your privilege changes?",
+	"alert.discarded": "Privilege changes discarded",
+	"alert.confirm-copyToAll": "Are you sure you wish to apply this privilege set to <strong>all categories</strong>?",
+	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's privilege set to <strong>all categories</strong>?",
+	"alert.confirm-copyToChildren": "Are you sure you wish to apply this privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.no-undo": "<em>This action cannot be undone.</em>"
 }

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

@@ -3,16 +3,16 @@
 	"bg-color": "Barva pozadí",
 	"text-color": "Barva textu",
 	"create-modify": "Vytvořit a upravit značky",
-	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
+	"description": "Pro výběr více značek, vyberte značky kliknutím nebo přetažením, za použití klávesy <code>CTRL</code>.",
 	"create": "Vytvořit značku",
 	"modify": "Upravit značky",
 	"rename": "Přejmenovat značky",
 	"delete": "Odstranit vybrané značky",
 	"search": "Hledat značky...",
-	"settings": "Tags Settings",
+	"settings": "Nastavení značek",
 	"name": "Název značky",
 
-	"alerts.editing": "Editing tag(s)",
+	"alerts.editing": "Upravení značky(ek)",
 	"alerts.confirm-delete": "Chcete odstranit vybranou značku?",
 	"alerts.update-success": "Značka aktualizována."
 }

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

@@ -12,12 +12,12 @@
 	"unban": "Zrušit zákaz uživatele",
 	"reset-lockout": "Obnovit uzamčení",
 	"reset-flags": "Obnovit označení",
-	"delete": "Delete <strong>User(s)</strong>",
-	"delete-content": "Delete User(s) <strong>Content</strong>",
-	"purge": "Delete <strong>User(s)</strong> and <strong>Content</strong>",
+	"delete": "Odstranit <strong>Uživatele</strong>",
+	"delete-content": "Odstranit <strong>Obsah</strong> uživatele",
+	"purge": "Odstranit <strong>uživatele</strong> a <strong>obsah</strong>",
 	"download-csv": "Stáhnout jako CSV",
-	"manage-groups": "Manage Groups",
-	"add-group": "Add Group",
+	"manage-groups": "Spravovat skupiny",
+	"add-group": "Přidat skupinu",
 	"invite": "Pozvat",
 	"new": "Nový uživatel",
 
@@ -97,7 +97,7 @@
 	"alerts.confirm-delete": "<strong>Warning!</strong><p>Do you really want to delete <strong>user(s)</strong>?</p><p>This action is not reversible! Only the user account will be deleted, their posts and topics will remain.</p>",
 	"alerts.delete-success": "Uživatel byl odstraněn.",
 	"alerts.confirm-delete-content": "<strong>Warning!</strong><p>Do you really want to delete these user(s) <strong>content</strong>?</p><p>This action is not reversible! The users' accounts will remain, but their posts and topics will be deleted.</p>",
-	"alerts.delete-content-success": "User(s) Content Deleted!",
+	"alerts.delete-content-success": "Obsah uživatele(ů) odstraněn!",
 	"alerts.confirm-purge": "<strong>Warning!</strong><p>Do you really want to delete <strong>user(s) and their content</strong>?</p><p>This action is not reversible! All user data and content will be erased!</p>",
 	"alerts.create": "Vytvořit uživatele",
 	"alerts.button-create": "Vytvořit",
@@ -108,5 +108,5 @@
 
 	"alerts.prompt-email": "E-maily:",
 	"alerts.email-sent-to": "E-mail s pozvánkou byl odeslán na %1",
-	"alerts.x-users-found": "Počet nalezených uživatelů: %1 (hledání trvalo %2 ms)"
+	"alerts.x-users-found": "%1 user(s) found, (%2 seconds)"
 }

public/language/cs/admin/menu.json

@@ -19,7 +19,7 @@
 	"settings/general": "Všeobecné",
 	"settings/homepage": "Home Page",
 	"settings/navigation": "Navigation",
-	"settings/reputation": "Reputace",
+	"settings/reputation": "Reputation & Flags",
 	"settings/email": "E-mail",
 	"settings/user": "Users",
 	"settings/group": "Groups",
@@ -70,7 +70,7 @@
 	"logout": "Odhlásit",
 	"view-forum": "Zobrazit fórum",
 
-	"search.placeholder": "Hledat nastavení",
+	"search.placeholder": "Press "/" to search for settings",
 	"search.no-results": "Žádné výsledky…",
 	"search.search-forum": "Prohledat fórum pro <strong></strong>",
 	"search.keep-typing": "Pište dále pro zobrazení výsledků…",

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

@@ -5,6 +5,8 @@
 	"maintenance-mode.message": "Zpráva údržby",
 	"headers": "Hlavičky",
 	"headers.allow-from": "Nastavte ALLOW-FROM pro umístění NodeBB do iFrame",
+	"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
+	"headers.csp-frame-ancestors-help": "'none', 'self'(default) or list of URIs to allow.",
 	"headers.powered-by": "Upravte si hlavičku „Powered by” odesílanou NodeBB",
 	"headers.acao": "Access-Control-Allow-Origin",
 	"headers.acao-regex": "Access-Control-Allow-Origin Regular Expression",
@@ -20,7 +22,7 @@
 	"hsts.preload": "Povolit před-načtení hlavičky HSTS",
 	"hsts.help": "Je-li povoleno, bude nastavena pro tyto stránky hlavička HSTS . Můžete si v hlavičce zvolit zahrnutí i poddomén a přednastavených příznaků. Nejste-li si jist/a, ponechte nezaškrtnuté<a href=\"%1\">Více informací <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Správa provozu",
-	"traffic.help": "NodeBB obsahuje modul, který automaticky zamítá požadavky při vysokém vytížení. Toto nastavení můžete zde upravit, ačkoliv výchozí hodnoty jsou zaručením úspěchu.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Povolit správu provozu",
 	"traffic.event-lag": "Hranice prodlevy smyčky události (v milisekundách)",
 	"traffic.event-lag-help": "Snížení této hodnoty sníží čas pro načtení stránky, ale taky zobrazí více uživatelům zprávu o „přetížení stránek”. (je vyžadován restart)",

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

@@ -4,10 +4,7 @@
 	"address-help": "Následující e-mailové adresy budou zobrazeny  příjemci v políčkách „Od” a „Odpovědět”.",
 	"from": "Jméno – od",
 	"from-help": "Zobrazené jméno v e-mailu v – Od",
-	"sendmail-rate-limit": "Odeslat <em>X</em> e-mailů...",
-	"sendmail-rate-delta": "... každých <em>X</em> milisekund",
-	"sendmail-rate-help": "Instruuje poštovní server NodeBB, aby omezil počet zpráv odeslaných najednou, aby nezahltil službu přijímání e-mailů. Tyto možnosti neplatí, je-li povolena funkce přenosu SMTP (níže).",
-
+	
 	"smtp-transport": "Přenos SMTP",
 	"smtp-transport.enabled": "Pro odesílání e-mailů použít externí e-mailový server ",
 	"smtp-transport-help": "Ze seznamu můžete vybrat známé služby nebo zadat vlastní.",
@@ -25,6 +22,8 @@
 	"smtp-transport.username": "Uživatelské jméno",
 	"smtp-transport.username-help": "<b>Pro službu Gmail,</b> zadejte plnou e-mailovou adresu, zvláště, používáte-li spravovanou doménu Google Apps.",
 	"smtp-transport.password": "Heslo",
+	"smtp-transport.pool": "Enable pooled connections",
+	"smtp-transport.pool-help": "Pooling connections prevents NodeBB from creating a new connection for every email. This option only applies if SMTP Transport is enabled.",
 
 	"template": "Upravit šablonu e-mailu",
 	"template.select": "Vybrat šablonu e-mailu",

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

@@ -2,6 +2,5 @@
 	"notifications": "Oznámení",
 	"welcome-notification": "Uvítání",
 	"welcome-notification-link": "Odkaz na uvítání",
-	"welcome-notification-uid": "Uvítání uživatele (UID)",
-	"notification-alert-timeout": "Čas pro zobrazení oznámení"
+	"welcome-notification-uid": "Uvítání uživatele (UID)"
 }

public/language/cs/admin/settings/post.json

@@ -42,6 +42,7 @@
 	"unread.cutoff": "Dny ukončení nepřečtených",
 	"unread.min-track-last": "Minimální počet příspěvků v tématu před posledním čtením",
 	"recent": "Nastavení pro poslední",
+	"recent.max-topics": "Maximum topics on /recent",
 	"recent.categoryFilter.disable": "Zakázat filtrování témat v ignorovaných kategoriích na poslední stránce",
 	"signature": "Nastavení podpisu",
 	"signature.disable": "Zakázat podpisy",

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

@@ -5,10 +5,16 @@
 	"votes-are-public": "Všechna hlasování jsou veřejná",
 	"thresholds": "Omezení aktivity",
 	"min-rep-downvote": "Minimální reputace pro vyjádření nesouhlasu s příspěvkem",
+	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
+	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
 	"min-rep-flag": "Minimální reputace pro označení příspěvků",
 	"min-rep-website": "Minimální reputace pro přidání „Webové stránky” do uživatelského profilu",
 	"min-rep-aboutme": "Minimální reputace pro přidání „O mně” do uživatelského profilu",
 	"min-rep-signature": "Minimální reputace pro přidání „Podpisu” do uživatelského profilu",
 	"min-rep-profile-picture": "Minimální reputace pro přidání „Profilového obrázku” do uživatelského profilu",
-	"min-rep-cover-picture": "Minimální reputace pro přidání „Obrázku uživatele” do uživatelského profilu"
+	"min-rep-cover-picture": "Minimální reputace pro přidání „Obrázku uživatele” do uživatelského profilu",
+
+	"flags": "Flag Settings",
+	"flags.limit-per-target": "Maximum number of times something can be flagged",
+	"flags.limit-per-target-placeholder": "Default: 0"
 }

public/language/cs/error.json

@@ -26,6 +26,7 @@
     "invalid-pagination-value": "Neplatná hodnota stránkování, musí být alespoň %1 a nejvýše %2",
     "username-taken": "Uživatelské jméno je již použito",
     "email-taken": "Tento e-mail je již použit",
+    "email-invited": "Email was already invited",
     "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.",
     "email-not-confirmed-chat": "Nebude schopen konverzovat, dokud nebude váš e-mail potvrzen. Pro jeho potvrzení klikněte zde.",
     "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.",
@@ -138,8 +139,13 @@
     "not-enough-reputation-min-rep-signature": "Pro přidání podpisu nemáte dostatek reputace",
     "not-enough-reputation-min-rep-profile-picture": "Pro přidání profilového obrázku nemáte dostatek reputace",
     "not-enough-reputation-min-rep-cover-picture": "Pro přidání obrázku nemáte dostatek reputace",
-    "already-flagged": "Tento příspěvek jste již označil",
+    "post-already-flagged": "You have already flagged this post",
+    "user-already-flagged": "You have already flagged this user",
+    "post-flagged-too-many-times": "This post has been flagged by others already",
+    "user-flagged-too-many-times": "This user has been flagged by others already",
     "self-vote": "U svého vlastního příspěvku nemůžete hlasovat",
+    "too-many-downvotes-today": "You can only downvote %1 times a day",
+    "too-many-downvotes-today-user": "You can only downvote a user %1 times a day",
     "reload-failed": "Vyskytla se chyba v NodeBB při znovu načtení: \"%1\". NodeBB bude pokračovat v běhu na straně klienta,  nicméně byste měl/a přenastavit zpět to, co jste udělal/a před opětovným načtením.",
     "registration-error": "Chyba při registraci",
     "parse-error": "Při analýze odpovědi serveru nastala chyba",
@@ -157,10 +163,12 @@
     "invalid-session-text": "Zdá se, že vše relace s přihlášením již není aktivní nebo již neodpovídá s relací na serveru. Obnovte prosím tuto stránku.",
     "no-topics-selected": "Žádná vybraná témata.",
     "cant-move-to-same-topic": "Není možné přesunout příspěvek do stejného tématu!",
+    "cant-move-topic-to-same-category": "Can't move topic to the same category!",
     "cannot-block-self": "Nemůžete zablokovat sebe sama!",
     "cannot-block-privileged": "Nemůžete zablokovat správce nebo hlavní moderátory",
     "cannot-block-guest": "Hosté nemohou blokovat ostatní uživatele.",
     "already-blocked": "Tento uživatel již byl zablokován.",
     "already-unblocked": "Tento uživatel již byl odblokován",
-    "no-connection": "Zdá se, že nastal problém s připojením k internetu"
+    "no-connection": "Zdá se, že nastal problém s připojením k internetu",
+    "plugin-not-whitelisted": "Unable to install plugin – only plugins whitelisted by the NodeBB Package Manager can be installed via the ACP"
 }

public/language/cs/flags.json

@@ -1,8 +1,7 @@
 {
 	"state": "Stav",
-	"reporter": "Nahlásil",
-	"reported-at": "Nahlásil v",
-	"description": "Popis",
+	"reports": "Reports",
+	"first-reported": "First Reported",
 	"no-flags": "Hurá, žádné označení.",
 	"assignee": "Nabyvatel",
 	"update": "Aktualizovat",
@@ -26,12 +25,14 @@
 	"filter-quick-mine": "Přiřazeno mě",
 	"filter-cid-all": "Všechny kategorie",
 	"apply-filters": "Použít filtry",
+	"more-filters": "More Filters",
 
 	"quick-actions": "Quick Actions",
 	"flagged-user": "Označený uživatel",
 	"view-profile": "Zobrazit profil",
 	"start-new-chat": "Začít novou konverzaci",
 	"go-to-target": "Zobrazit cílové označení",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",
@@ -42,9 +43,11 @@
 	"notes": "Poznámky označení",
 	"add-note": "Přidat poznámku",
 	"no-notes": "Žádné sdílené poznámky.",
+	"delete-note-confirm": "Are you sure you want to delete this flag note?",
+	"note-added": "Poznámka přidána",
+	"note-deleted": "Note Deleted",
 
 	"history": "Account & Flag History",
-	"back": "Zpět k seznamu označení",
 	"no-history": "Žádná historie označení.",
 
 	"state-all": "Všechny stavy",
@@ -53,7 +56,16 @@
 	"state-resolved": "Vyřešeno",
 	"state-rejected": "Zamítnuto",
 	"no-assignee": "Nepřiřazeno",
-	"note-added": "Poznámka přidána",
+
+	"sort": "Sort by",
+	"sort-newest": "Newest first",
+	"sort-oldest": "Oldest first",
+	"sort-reports": "Most reports",
+	"sort-all": "All flag types...",
+	"sort-posts-only": "Posts only...",
+	"sort-downvotes": "Most downvotes",
+	"sort-upvotes": "Most upvotes",
+	"sort-replies": "Most replies",
 
 	"modal-title": "Nahlásit nevhodný obsah",
 	"modal-body": "Zadejte váš důvod k označení %1 %2 pro kontrolu. Nebo použijte tlačítko je-li dostupné.",
@@ -65,5 +77,9 @@
 	"modal-submit-success": "Obsah byl označen pro moderaci.",
 	"modal-submit-confirm": "Potvrdit hlášení",
 	"modal-submit-confirm-text": "Již jste zadal/a nějaký důvod. Jste si jist/a, že chcete nahlásit pomocí rychlé zprávy?",
-	"modal-submit-confirm-text-help": "Zaslání rychlé zprávy přepíše jiné zadané důvody."
+	"modal-submit-confirm-text-help": "Zaslání rychlé zprávy přepíše jiné zadané důvody.",
+
+	"bulk-actions": "Bulk Actions",
+	"bulk-resolve": "Resolve Flag(s)",
+	"bulk-success": "%1 flags updated"
 }