up themes

fix var names
up markdown
2025-12-26 02:10:36 +01:00 · 2017-07-27 20:00:17 -04:00 · 2017-07-27 19:45:54 -04:00 · 2017-07-27 19:43:40 -04:00 · 2017-07-27 19:42:26 -04:00 · 2017-07-27 19:40:11 -04:00
2284 changed files with 52570 additions and 51059 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,4 @@
 node_modules/
-public/src/nodebb.min.js
 *.sublime-project
 *.sublime-workspace
 .project
@@ -10,11 +9,12 @@ logs/
 /public/uploads
 /public/sounds
 /public/vendor
-/public/nodebb.min.js
-/public/acp.min.js
 /public/src/modules/string.js
 .idea/
 .vscode/
 *.ipr
 *.iws
 /coverage
+/build
+.eslintrc
+test/files
--- a/.eslintrc
+++ b/.eslintrc
@@ -0,0 +1,128 @@
+{
+	"extends": "airbnb-base",
+	"parserOptions": {
+		"sourceType": "script"
+	},
+
+	"rules": {
+		// Customized
+		"handle-callback-err": [ "error","^(e$|(e|(.*(_e|E)))rr)" ],
+		"comma-dangle": ["error", {
+			"arrays": "always-multiline",
+			"objects": "always-multiline",
+			"imports": "always-multiline",
+			"exports": "always-multiline",
+			"functions": "never"
+		}],
+		"no-empty": ["error", { "allowEmptyCatch": true }],
+		"no-underscore-dangle": "off",
+		"newline-per-chained-call": "off",
+		"no-console": "off",
+		"no-mixed-operators": ["error", { "allowSamePrecedence": true }],
+		"strict": ["error", "global"],
+		"consistent-return": "off",
+		"func-names": "off",
+		"no-tabs": "off",
+		"indent": ["error", "tab"],
+		"no-eq-null": "off",
+		"camelcase": "off",
+		"no-new": "off",
+		"no-shadow": "off",
+		"no-use-before-define": ["error", "nofunc"],
+		"no-prototype-builtins": "off",
+		"new-cap": "off",
+		"no-plusplus": ["error", { "allowForLoopAfterthoughts": true }],
+		"import/no-unresolved": "error",
+
+		// ES6
+		"prefer-rest-params": "off",
+		"prefer-spread": "off",
+		"prefer-arrow-callback": "off",
+		"prefer-template": "off",
+		"no-var": "off",
+		"object-shorthand": "off",
+		"vars-on-top": "off",
+
+		// TODO
+		"import/no-extraneous-dependencies": "off",
+		"import/no-dynamic-require": "off",
+		"import/newline-after-import": "off",
+		"no-bitwise": "off",
+		"global-require": "off",
+		"max-len": "off",
+		"no-param-reassign": "off",
+		"no-restricted-syntax": "off",
+		"no-script-url": "off",
+		"default-case": "off",
+		"linebreak-style": "off",
+
+		// "no-multi-assign": "off",
+		// "one-var": "off",
+		// "no-undef": "off",
+		// "max-nested-callbacks": "off",
+		// "no-mixed-requires": "off",
+		// "brace-style": "off",
+		// "max-statements-per-line": "off",
+		// "no-unused-vars": "off",
+		// "no-mixed-spaces-and-tabs": "off",
+		// "no-useless-concat": "off",
+		// "require-jsdoc": "off",
+		// "eqeqeq": "off",
+		// "no-negated-condition": "off",
+		// "one-var-declaration-per-line": "off",
+		// "no-lonely-if": "off",
+		// "radix": "off",
+		// "no-else-return": "off",
+		// "no-useless-escape": "off",
+		// "block-scoped-var": "off",
+		// "operator-assignment": "off",
+		// "yoda": "off",
+		// "no-loop-func": "off",
+		// "no-void": "off",
+		// "valid-jsdoc": "off",
+		// "no-cond-assign": "off",
+		// "no-redeclare": "off",
+		// "no-unreachable": "off",
+		// "no-nested-ternary": "off",
+		// "operator-linebreak": "off",
+		// "guard-for-in": "off",
+		// "no-unneeded-ternary": "off",
+		// "no-sequences": "off",
+		// "no-extend-native": "off",
+		// "no-shadow-restricted-names": "off",
+		// "no-extra-boolean-cast": "off",
+		// "no-path-concat": "off",
+		// "no-unused-expressions": "off",
+		// "no-return-assign": "off",
+		// "no-restricted-modules": "off",
+		// "object-curly-spacing": "off",
+		// "indent": "off",
+		// "padded-blocks": "off",
+		// "eol-last": "off",
+		// "lines-around-directive": "off",
+		// "strict": "off",
+		// "comma-dangle": "off",
+		// "no-multi-spaces": "off",
+		// "quotes": "off",
+		// "keyword-spacing": "off",
+		// "no-mixed-operators": "off",
+		// "comma-spacing": "off",
+		// "no-trailing-spaces": "off",
+		// "key-spacing": "off",
+		// "no-multiple-empty-lines": "off",
+		// "spaced-comment": "off",
+		// "space-in-parens": "off",
+		// "block-spacing": "off",
+		// "quote-props": "off",
+		// "space-unary-ops": "off",
+		// "no-empty": "off",
+		// "dot-notation": "off",
+		// "func-call-spacing": "off",
+		// "array-bracket-spacing": "off",
+		// "object-property-newline": "off",
+		// "no-continue": "off",
+		// "no-extra-semi": "off",
+		// "no-spaced-func": "off",
+		// "no-useless-return": "off"
+	}
+}
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,111 +0,0 @@
-{
-    "extends": "airbnb",
-
-    "rules": {
-        "handle-callback-err": [ "error","^(e$|(e|(.*(_e|E)))rr)" ],
-        "linebreak-style": "off",
-        "import/no-unresolved": "off",
-        "import/no-extraneous-dependencies": "off",
-        "one-var": "off",
-        "no-undef": "off",
-        "max-len": "off",
-        "no-new": "off",
-        "max-nested-callbacks": "off",
-        "no-mixed-requires": "off",
-        "brace-style": "off",
-        "max-statements-per-line": "off",
-        "no-unused-vars": "off",
-        "no-mixed-spaces-and-tabs": "off",
-        "no-useless-concat": "off",
-        "require-jsdoc": "off",
-        "eqeqeq": "off",
-        "camelcase": "off",
-        "no-negated-condition": "off",
-        "one-var-declaration-per-line": "off",
-        "new-cap": "off",
-        "no-lonely-if": "off",
-        "radix": "off",
-        "no-else-return": "off",
-        "no-useless-escape": "off",
-        "block-scoped-var": "off",
-        "operator-assignment": "off",
-        "default-case": "off",
-        "yoda": "off",
-        "no-use-before-define": "off",
-        "no-loop-func": "off",
-        "no-void": "off",
-        "valid-jsdoc": "off",
-        "o-eq-null": "off",
-        "no-cond-assign": "off",
-        "no-eq-null": "off",
-        "no-redeclare": "off",
-        "no-unreachable": "off",
-        "no-nested-ternary": "off",
-        "operator-linebreak": "off",
-        "guard-for-in": "off",
-        "no-unneeded-ternary": "off",
-        "no-sequences": "off",
-        "no-extend-native": "off",
-        "no-shadow-restricted-names": "off",
-        "no-extra-boolean-cast": "off",
-        "no-script-url": "off",
-        "no-path-concat": "off",
-        "no-unused-expressions": "off",
-        "no-restricted-module": "off",
-        "no-return-assign": "off",
-        "no-restricted-modules": "off",
-        "no-tabs": "off",
-        "indent": "off",
-        "func-names": "off",
-        "prefer-arrow-callback": "off",
-        "object-curly-spacing": "off",
-        "no-var": "off",
-        "no-shadow": "off",
-        "prefer-template": "off",
-        "padded-blocks": "off",
-        "eol-last": "off",
-        "lines-around-directive": "off",
-        "no-restricted-syntax": "off",
-        "vars-on-top": "off",
-        "no-prototype-builtins": "off",
-        "object-shorthand": "off",
-        "no-param-reassign": "off",
-        "consistent-return": "off",
-        "strict": "off",
-        "comma-dangle": "off",
-        "no-multi-spaces": "off",
-        "quotes": "off",
-        "keyword-spacing": "off",
-        "no-plusplus": "off",
-        "no-mixed-operators": "off",
-        "comma-spacing": "off",
-        "global-require": "off",
-        "no-trailing-spaces": "off",
-        "key-spacing": "off",
-        "import/newline-after-import": "off",
-        "no-underscore-dangle": "off",
-        "prefer-spread": "off",
-        "no-multiple-empty-lines": "off",
-        "spaced-comment": "off",
-        "prefer-rest-params": "off",
-        "space-in-parens": "off",
-        "block-spacing": "off",
-        "quote-props": "off",
-        "no-console": "off",
-        "space-unary-ops": "off",
-        "import/no-dynamic-require": "off",
-        "no-bitwise": "off",
-        "no-empty": "off",
-        "array-bracket-spacin": "off",
-        "dot-notation": "off",
-        "func-call-spacing": "off",
-        "newline-per-chained-call": "off",
-        "newline-per-chained-call": "off",
-        "array-bracket-spacing": "off",
-        "object-property-newline": "off",
-        "no-continue": "off",
-        "no-extra-semi": "off",
-        "no-spaced-func": "off",
-        "no-useless-return": "off"
-    }
-}
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,6 +1,10 @@
 # Submitting a Pull Request to NodeBB?

-First of all, thank you! Please consider this [style guide](https://docs.nodebb.org/en/latest/contributing/style-guide.html) when submitting your changes. Also, please join our [community](https://community.nodebb.org) to meet other NodeBB developers and designers :) 
+First of all, thank you! Before submission, please run `npm test` to lint and run the automated NodeBB tests. If everything passes, you're good to go. If you have any errors, please fix them and re-run `npm test` to make sure there aren't any others.
+
+## Styleguide and linting
+
+NodeBB mostly conforms to the [AirBnB Javascript style guide](https://github.com/airbnb/javascript#readme). If you're running into a lot of ESlint errors, you may want to install an editor plugin to display them in real time.

 ## Contributor License Agreement

@@ -34,11 +38,9 @@ There is a chance that the issue you are experiencing may have already been fixe
 You can find the NodeBB version number in the Admin Control Panel (ACP), as well as the first line output to the shell when running NodeBB

 ``` plaintext
-info: NodeBB v0.5.2-dev Copyright (C) 2013-2014 NodeBB Inc.
-info: This program comes with ABSOLUTELY NO WARRANTY.
-info: This is free software, and you are welcome to redistribute it under certain conditions.
-info: 
-info: Time: Tue Oct 07 2014 20:25:20 GMT-0400 (EDT)
+3/4 12:38:57 [10752] - info: NodeBB v1.4.5 Copyright (C) 2013-2017 NodeBB Inc.
+3/4 12:38:57 [10752] - info: This program comes with ABSOLUTELY NO WARRANTY.
+3/4 12:38:57 [10752] - info: This is free software, and you are welcome to redistribute it under certain conditions.
 ```

 If you are running NodeBB via git, it is also helpful to let the maintainers know what commit hash you are on. To find the commit hash, execute the following command:
@@ -51,12 +53,13 @@ $ git rev-parse HEAD
 If you have downloaded the `.zip` or `.tar.gz` packages from GitHub (or elsewhere), please let us know.

 ## Provide theme versions if issue is related to the theme/display
+Use `npm ls` to list the versions of the theme you're using. In this example, we're running the Persona theme, which depends on the Vanilla theme.

 ``` bash
-$ npm ls nodebb-theme-vanilla nodebb-theme-lavender
-nodebb@0.7.0-dev /home/julian/Projects/nodebb/forum
-├── nodebb-theme-lavender@0.2.13
-└── nodebb-theme-vanilla@0.2.35
+$ npm ls nodebb-theme-vanilla nodebb-theme-persona
+nodebb@1.4.3 /path/to/nodebb
+-- nodebb-theme-persona@4.2.4
+`-- nodebb-theme-vanilla@5.2.0
 ```

 ## Attempt to use `git bisect`
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,13 +1,24 @@
-Please include the following information when submitting a bug report/issue:
+<!-- 
+	== Github Issues are for bug reports and feature requests only ==
+	== Please visit https://community.nodebb.org for other support ==
+-->

-* NodeBB version and git hash (to find your git hash, execute `git rev-parse HEAD` from the main NodeBB directory)
-* Database (mongo or redis) and it's version.
-* Exact steps to cause this issue
-    1. First I did this...
-    2. Then, I clicked on this item...
-* What you expected
-    * e.g. I expected *abc* to *xyz*
-* What happened instead
-    * e.g. Instead, I got *zyx* and NodeBB set fire to my house
+<!-- ++ Please include the following information when submitting a bug report ++ -->

-Thank you!
+- **NodeBB version:** 
+- **NodeBB git hash:** 
+<!-- (to find your git hash, execute `git rev-parse HEAD` from the main NodeBB directory) -->
+- **Database type:** mongo or redis
+- **Database version:** 
+<!-- `mongod --version` or `redis-server --version` -->
+- **Exact steps to cause this issue:**
+<!--
+	1. First I did this...
+	2. Then, I clicked on this item...
+-->
+- **What you expected:**
+<!-- e.g. I expected *abc* to *xyz* -->
+- **What happened instead:**
+<!-- e.g. Instead, I got *zyx* and NodeBB set fire to my house -->
+
+<!-- Thank you! -->
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+yarn.lock
 npm-debug.log
 node_modules/
 sftp-config.json
@@ -17,6 +18,7 @@ provision.sh
 .DS_Store
 feeds/recent.rss
 .eslintcache
+.svn

 logs/

@@ -26,6 +28,7 @@ pidfile
 /public/templates

 /public/sounds
+/public/uploads

 # compiled files
 /public/stylesheet.css
@@ -57,3 +60,7 @@ tx.exe
 coverage

 build
+*.log
+test/files/normalise.jpg.png
+test/files/normalise-resized.jpg
+package-lock.json
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,7 @@ addons:
    packages:
    - g++-4.8
 node_js:
+  - "7"
  - "6"
  - "4"
 branches:
--- a/.tx/config
+++ b/.tx/config
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,24 +1,28 @@
-"use strict";
+'use strict';

-var fork = require('child_process').fork,
-	env = process.env,
-	worker, updateWorker,
-	incomplete = [],
-	running = 0;
+var fork = require('child_process').fork;
+var env = process.env;
+var worker;
+var updateWorker;
+var initWorker;
+var incomplete = [];
+var running = 0;

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

 module.exports = function (grunt) {
 	var args = [];
+	var initArgs = ['--build'];
 	if (!grunt.option('verbose')) {
 		args.push('--log-level=info');
+		initArgs.push('--log-level=info');
 	}

 	function update(action, filepath, target) {
-		var updateArgs = args.slice(),
-			fromFile = '',
-			compiling = '',
-			time = Date.now();
-		
+		var updateArgs = args.slice();
+		var compiling;
+		var time = Date.now();
+
 		if (target === 'lessUpdated_Client') {
 			compiling = 'clientCSS';
 		} else if (target === 'lessUpdated_Admin') {
@@ -33,7 +37,7 @@ module.exports = function (grunt) {
 			// Do nothing, just restart
 		}

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

@@ -45,11 +49,13 @@ module.exports = function (grunt) {
 			updateWorker.kill('SIGKILL');
 		}
 		updateWorker = fork('app.js', updateArgs, { env: env });
-		++running;
+		running += 1;
 		updateWorker.on('exit', function () {
-			--running;
+			running -= 1;
 			if (running === 0) {
-				worker = fork('app.js', args, { env: env });
+				worker = fork('app.js', args, {
+					env: env,
+				});
 				worker.on('message', function () {
 					if (incomplete.length) {
 						incomplete = [];
@@ -70,11 +76,17 @@ module.exports = function (grunt) {
 					'public/*.less',
 					'node_modules/nodebb-*/*.less', 'node_modules/nodebb-*/**/*.less',
 					'!node_modules/nodebb-*/node_modules/**',
-					'!node_modules/nodebb-*/.git/**'
-				]
+					'!node_modules/nodebb-*/.git/**',
+				],
+				options: {
+					interval: 1000,
+				},
 			},
 			lessUpdated_Admin: {
-				files: ['public/**/*.less']
+				files: ['public/**/*.less'],
+				options: {
+					interval: 1000,
+				},
 			},
 			clientUpdated: {
 				files: [
@@ -82,19 +94,28 @@ module.exports = function (grunt) {
 					'node_modules/nodebb-*/*.js', 'node_modules/nodebb-*/**/*.js',
 					'!node_modules/nodebb-*/node_modules/**',
 					'node_modules/templates.js/lib/templates.js',
-					'!node_modules/nodebb-*/.git/**'
-				]
+					'!node_modules/nodebb-*/.git/**',
+				],
+				options: {
+					interval: 1000,
+				},
 			},
 			serverUpdated: {
-				files: ['*.js', 'install/*.js', 'src/**/*.js']
+				files: ['*.js', 'install/*.js', 'src/**/*.js'],
+				options: {
+					interval: 1000,
+				},
 			},
 			templatesUpdated: {
 				files: [
 					'src/views/**/*.tpl',
 					'node_modules/nodebb-*/*.tpl', 'node_modules/nodebb-*/**/*.tpl',
 					'!node_modules/nodebb-*/node_modules/**',
-					'!node_modules/nodebb-*/.git/**'
-				]
+					'!node_modules/nodebb-*/.git/**',
+				],
+				options: {
+					interval: 1000,
+				},
 			},
 			langUpdated: {
 				files: [
@@ -107,21 +128,33 @@ module.exports = function (grunt) {
 					'!node_modules/nodebb-*/package.json',
 					'!node_modules/nodebb-*/theme.json',
 				],
+				options: {
+					interval: 1000,
+				},
 			},
-		}
+		},
 	});

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

-	if (grunt.option('skip')) {
-		grunt.registerTask('default', ['watch:serverUpdated']);
-	} else {
-		grunt.registerTask('default', ['watch']);
-	}
-	
-
+	grunt.registerTask('default', ['watch']);
 	env.NODE_ENV = 'development';

-	worker = fork('app.js', args, { env: env });
+	if (grunt.option('skip')) {
+		worker = fork('app.js', args, {
+			env: env,
+		});
+	} else {
+		initWorker = fork('app.js', initArgs, {
+			env: env,
+		});
+
+		initWorker.on('exit', function () {
+			worker = fork('app.js', args, {
+				env: env,
+			});
+		});
+	}
+
 	grunt.event.on('watch', update);
-};
+};
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ NodeBB requires the following software to be installed:

 ## Installation

-[Please refer to platform-specific installation documentation](http://docs.nodebb.org/en/latest/installing/os.html)
+[Please refer to platform-specific installation documentation](https://docs.nodebb.org/installing/os)

 ## Securing NodeBB

@@ -71,7 +71,7 @@ It is important to ensure that your NodeBB and database servers are secured. Bea

 ## Upgrading NodeBB

-Detailed upgrade instructions are listed in [Upgrading NodeBB](https://docs.nodebb.org/en/latest/upgrading/index.html)
+Detailed upgrade instructions are listed in [Upgrading NodeBB](https://docs.nodebb.org/configuring/upgrade/)

 ## License

--- a/app.js
+++ b/app.js
@@ -17,11 +17,19 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-"use strict";
-/*global require, global, process*/
+'use strict';
+
+if (require.main !== module) {
+	require.main.require = function (path) {
+		return require(path);
+	};
+}

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

 var url = require('url');
 var async = require('async');
@@ -37,11 +45,11 @@ winston.add(winston.transports.Console, {
 	colorize: true,
 	timestamp: function () {
 		var date = new Date();
-		return (!!nconf.get('json-logging')) ? date.toJSON() :	date.getDate() + '/' + (date.getMonth() + 1) + ' ' + date.toTimeString().substr(0,8) + ' [' + global.process.pid + ']';
+		return nconf.get('json-logging') ? date.toJSON() :	date.getDate() + '/' + (date.getMonth() + 1) + ' ' + date.toTimeString().substr(0, 8) + ' [' + global.process.pid + ']';
 	},
 	level: nconf.get('log-level') || (global.env === 'production' ? 'info' : 'verbose'),
 	json: (!!nconf.get('json-logging')),
-	stringify: (!!nconf.get('json-logging'))
+	stringify: (!!nconf.get('json-logging')),
 });


@@ -75,7 +83,7 @@ if (nconf.get('setup') || nconf.get('install')) {
 } else if (nconf.get('reset')) {
 	async.waterfall([
 		async.apply(require('./src/reset').reset),
-		async.apply(require('./build').buildAll)
+		async.apply(require('./src/meta/build').buildAll),
 	], function (err) {
 		process.exit(err ? 1 : 0);
 	});
@@ -84,7 +92,12 @@ if (nconf.get('setup') || nconf.get('install')) {
 } else if (nconf.get('plugins')) {
 	listPlugins();
 } else if (nconf.get('build')) {
-	require('./build').build(nconf.get('build'));
+	require('./src/meta/build').build(nconf.get('build'));
+} else if (nconf.get('events')) {
+	async.series([
+		async.apply(require('./src/database').init),
+		async.apply(require('./src/events').output),
+	]);
 } else {
 	require('./src/start').start();
 }
@@ -93,14 +106,15 @@ function loadConfig(callback) {
 	winston.verbose('* using configuration stored in: %s', configFile);

 	nconf.file({
-		file: configFile
+		file: configFile,
 	});

 	nconf.defaults({
 		base_dir: __dirname,
 		themes_path: path.join(__dirname, 'node_modules'),
-		views_dir: path.join(__dirname, 'public/templates'),
-		version: pkg.version
+		upload_path: 'public/uploads',
+		views_dir: path.join(__dirname, 'build/public/templates'),
+		version: pkg.version,
 	});

 	if (!nconf.get('isCluster')) {
@@ -113,10 +127,23 @@ function loadConfig(callback) {
 	nconf.set('core_templates_path', path.join(__dirname, 'src/views'));
 	nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-persona/templates'));

+	nconf.set('upload_path', path.resolve(nconf.get('base_dir'), nconf.get('upload_path')));
+
 	if (nconf.get('url')) {
 		nconf.set('url_parsed', url.parse(nconf.get('url')));
 	}

+	// Explicitly cast 'jobsDisabled' as Bool
+	var castAsBool = ['jobsDisabled'];
+	nconf.stores.env.readOnly = false;
+	castAsBool.forEach(function (prop) {
+		var value = nconf.get(prop);
+		if (value) {
+			nconf.set(prop, typeof value === 'boolean' ? value : String(value).toLowerCase() === 'true');
+		}
+	});
+	nconf.stores.env.readOnly = true;
+
 	if (typeof callback === 'function') {
 		callback();
 	}
@@ -126,7 +153,7 @@ function setup() {
 	winston.info('NodeBB Setup Triggered via Command Line');

 	var install = require('./src/install');
-	var build = require('./build');
+	var build = require('./src/meta/build');

 	process.stdout.write('\nWelcome to NodeBB!\n');
 	process.stdout.write('\nThis looks like a new installation, so you\'ll have to answer a few questions about your environment before we can proceed.\n');
@@ -135,14 +162,14 @@ function setup() {
 	async.series([
 		async.apply(install.setup),
 		async.apply(loadConfig),
-		async.apply(build.buildAll)
+		async.apply(build.buildAll),
 	], function (err, data) {
 		// Disregard build step data
 		data = data[0];

 		var separator = '     ';
 		if (process.stdout.columns > 10) {
-			for(var x = 0,cols = process.stdout.columns - 10; x < cols; x++) {
+			for (var x = 0, cols = process.stdout.columns - 10; x < cols; x += 1) {
 				separator += '=';
 			}
 		}
@@ -174,14 +201,19 @@ function upgrade() {
 	var db = require('./src/database');
 	var meta = require('./src/meta');
 	var upgrade = require('./src/upgrade');
-	var build = require('./build');
+	var build = require('./src/meta/build');
+	var tasks = [db.init, meta.configs.init, upgrade.run, build.buildAll];

-	async.series([
-		async.apply(db.init),
-		async.apply(meta.configs.init),
-		async.apply(upgrade.upgrade),
-		async.apply(build.buildAll)
-	], function (err) {
+	if (nconf.get('upgrade') !== true) {
+		// Likely an upgrade script name passed in
+		tasks[2] = async.apply(upgrade.runSingle, nconf.get('upgrade'));
+
+		// Skip build
+		tasks.pop();
+	}
+	// disable mongo timeouts during upgrade
+	nconf.set('mongo:options:socketTimeoutMS', 0);
+	async.series(tasks, function (err) {
 		if (err) {
 			winston.error(err.stack);
 			process.exit(1);
@@ -193,22 +225,39 @@ function upgrade() {

 function activate() {
 	var db = require('./src/database');
-	db.init(function (err) {
+	var plugins = require('./src/plugins');
+	var events = require('./src/events');
+	var plugin = nconf.get('activate');
+	async.waterfall([
+		function (next) {
+			db.init(next);
+		},
+		function (next) {
+			if (plugin.indexOf('nodebb-') !== 0) {
+				// Allow omission of `nodebb-plugin-`
+				plugin = 'nodebb-plugin-' + plugin;
+			}
+			plugins.isInstalled(plugin, next);
+		},
+		function (isInstalled, next) {
+			if (!isInstalled) {
+				return next(new Error('plugin not installed'));
+			}
+
+			winston.info('Activating plugin `%s`', plugin);
+			db.sortedSetAdd('plugins:active', 0, plugin, next);
+		},
+		function (next) {
+			events.log({
+				type: 'plugin-activate',
+				text: plugin,
+			}, next);
+		},
+	], function (err) {
 		if (err) {
-			winston.error(err.stack);
-			process.exit(1);
+			winston.error(err.message);
 		}
-
-		var plugin = nconf.get('activate');
-		if (plugin.indexOf('nodebb-') !== 0) {
-			// Allow omission of `nodebb-plugin-`
-			plugin = 'nodebb-plugin-' + plugin;
-		}
-
-		winston.info('Activating plugin `%s`', plugin);
-		db.sortedSetAdd('plugins:active', 0, plugin, function (err) {
-			process.exit(err ? 1 : 0);
-		});
+		process.exit(err ? 1 : 0);
 	});
 }

--- a/build.js
+++ b/build.js
@@ -1,121 +0,0 @@
-'use strict';
-
-var async = require('async');
-var winston = require('winston');
-
-var buildStart;
-
-var valid = ['js', 'clientCSS', 'acpCSS', 'tpl', 'lang'];
-
-exports.buildAll = function (callback) {
-	exports.build(valid.join(','), callback);
-};
-
-exports.build = function build(targets, callback) {
-	buildStart = Date.now();
-
-	var db = require('./src/database');
-	var meta = require('./src/meta');
-	var plugins = require('./src/plugins');
-
-
-	targets = (targets === true ? valid : targets.split(',').filter(function (target) {
-		return valid.indexOf(target) !== -1;
-	}));
-
-	if (!targets) {
-		winston.error('[build] No valid build targets found. Aborting.');
-		return process.exit(0);
-	}
-
-	async.series([
-		async.apply(db.init),
-		async.apply(meta.themes.setupPaths),
-		async.apply(plugins.prepareForBuild)
-	], function (err) {
-		if (err) {
-			winston.error('[build] Encountered error preparing for build: ' + err.message);
-			return process.exit(1);
-		}
-
-		exports.buildTargets(targets, callback);
-	});
-};
-
-exports.buildTargets = function (targets, callback) {
-	var meta = require('./src/meta');
-	buildStart = buildStart || Date.now();
-
-	var step = function (startTime, target, next) {
-		winston.info('[build] ' + target + ' => Completed in ' + ((Date.now() - startTime) / 1000) + 's');
-		next();
-	};
-
-	async.parallel([
-		function (next) {
-			if (targets.indexOf('js') !== -1) {
-				winston.info('[build] Building javascript');
-				var startTime = Date.now();
-				async.series([
-					async.apply(meta.js.minify, 'nodebb.min.js'),
-					async.apply(meta.js.minify, 'acp.min.js')
-				], step.bind(this, startTime, 'js', next));
-			} else {
-				setImmediate(next);
-			}
-		},
-		function (next) {
-			async.eachSeries(targets, function (target, next) {
-				var startTime;
-				switch(target) {
-					case 'js':
-						setImmediate(next);
-						break;
-					case 'clientCSS':
-						winston.info('[build] Building client-side CSS');
-						startTime = Date.now();
-						meta.css.minify('stylesheet.css', step.bind(this, startTime, target, next));
-						break;
-
-					case 'acpCSS':
-						winston.info('[build] Building admin control panel CSS');
-						startTime = Date.now();
-						meta.css.minify('admin.css', step.bind(this, startTime, target, next));
-						break;
-
-					case 'tpl':
-						winston.info('[build] Building templates');
-						startTime = Date.now();
-						meta.templates.compile(step.bind(this, startTime, target, next));
-						break;
-					
-					case 'lang':
-						winston.info('[build] Building language files');
-						startTime = Date.now();
-						meta.languages.build(step.bind(this, startTime, target, next));
-						break;
-
-					default:
-						winston.warn('[build] Unknown build target: \'' + target + '\'');
-						setImmediate(next);
-						break;
-				}
-			}, next);
-		}
-	], function (err) {
-		if (err) {
-			winston.error('[build] Encountered error during build step: ' + err.message);
-			return process.exit(1);
-		}
-
-		var time = (Date.now() - buildStart) / 1000;
-
-		winston.info('[build] Asset compilation successful. Completed in ' + time + 's.');
-
-		if (typeof callback === 'function') {
-			callback();
-		} else {
-			process.exit(0);
-		}
-	});
-};
--- a/install/data/defaults.json
+++ b/install/data/defaults.json
@@ -17,6 +17,7 @@
    "allowLocalLogin": 1,
    "allowAccountDelete": 1,
    "allowFileUploads": 0,
+    "allowedFileExtensions": "png,jpg,bmp",
    "allowUserHomePage": 1,
    "maximumFileSize": 2048,
    "minimumTitleLength": 3,
@@ -28,12 +29,13 @@
    "maximumAboutMeLength": 1000,
    "maximumProfileImageSize": 256,
    "maximumCoverImageSize": 2048,
-    "profileImageDimension": 128,
+    "profileImageDimension": 200,
    "requireEmailConfirmation": 0,
    "allowProfileImageUploads": 1,
    "teaserPost": "last-reply",
    "allowPrivateGroups": 1,
    "unreadCutoff": 2,
    "bookmarkThreshold": 5,
-    "topicsPerList": 20
+    "topicsPerList": 20,
+    "autoDetectLang": 1
 }
--- a/install/data/footer.json
+++ b/install/data/footer.json
@@ -2,7 +2,7 @@
 	{
 		"widget": "html",
 		"data" : {
-			"html": "<footer id=\"footer\" class=\"container footer\">\r\n\t<div class=\"copyright\">\r\n\t\tCopyright © 2016 <a target=\"_blank\" href=\"https://nodebb.org\">NodeBB Forums</a> | <a target=\"_blank\" href=\"//github.com/NodeBB/NodeBB/graphs/contributors\">Contributors</a>\r\n\t</div>\r\n</footer>",
+			"html": "<footer id=\"footer\" class=\"container footer\">\r\n\t<div>\r\n\t\tPowered by <a target=\"_blank\" href=\"https://nodebb.org\">NodeBB</a> | <a target=\"_blank\" href=\"//github.com/NodeBB/NodeBB/graphs/contributors\">Contributors</a>\r\n\t</div>\r\n</footer>",
 			"title":"",
 			"container":""
 		}
--- a/install/data/navigation.json
+++ b/install/data/navigation.json
@@ -1,71 +1,71 @@
 [
 	{
 		"route": "/categories",
-		"title": "\\[\\[global:header.categories\\]\\]",
+		"title": "[[global:header.categories]]",
 		"enabled": true,
 		"iconClass": "fa-list",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.categories\\]\\]"
+		"text": "[[global:header.categories]]"
 	},
 	{
 		"id": "unread-count",
 		"route": "/unread",
-		"title": "\\[\\[global:header.unread\\]\\]",
+		"title": "[[global:header.unread]]",
 		"enabled": true,
 		"iconClass": "fa-inbox",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.unread\\]\\]",
+		"text": "[[global:header.unread]]",
 		"properties": {
 			"loggedIn": true
 		}
 	},
 	{
 		"route": "/recent",
-		"title": "\\[\\[global:header.recent\\]\\]",
+		"title": "[[global:header.recent]]",
 		"enabled": true,
 		"iconClass": "fa-clock-o",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.recent\\]\\]"
+		"text": "[[global:header.recent]]"
 	},
 	{
 		"route": "/tags",
-		"title": "\\[\\[global:header.tags\\]\\]",
+		"title": "[[global:header.tags]]",
 		"enabled": true,
 		"iconClass": "fa-tags",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.tags\\]\\]"
+		"text": "[[global:header.tags]]"
 	},
 	{
 		"route": "/popular",
-		"title": "\\[\\[global:header.popular\\]\\]",
+		"title": "[[global:header.popular]]",
 		"enabled": true,
 		"iconClass": "fa-fire",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.popular\\]\\]"
+		"text": "[[global:header.popular]]"
 	},
 	{
 		"route": "/users",
-		"title": "\\[\\[global:header.users\\]\\]",
+		"title": "[[global:header.users]]",
 		"enabled": true,
 		"iconClass": "fa-user",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.users\\]\\]"
+		"text": "[[global:header.users]]"
 	},
 	{
 		"route": "/groups",
-		"title": "\\[\\[global:header.groups\\]\\]",
+		"title": "[[global:header.groups]]",
 		"enabled": true,
 		"iconClass": "fa-group",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.groups\\]\\]"
+		"text": "[[global:header.groups]]"
 	},
 	{
 		"route": "/admin",
-		"title": "\\[\\[global:header.admin\\]\\]",
+		"title": "[[global:header.admin]]",
 		"enabled": true,
 		"iconClass": "fa-cogs",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.admin\\]\\]",
+		"text": "[[global:header.admin]]",
 		"properties": {
 			"targetBlank": false,
 			"adminOnly": true
@@ -73,11 +73,11 @@
 	},
 	{
 		"route": "/search",
-		"title": "\\[\\[global:header.search\\]\\]",
+		"title": "[[global:header.search]]",
 		"enabled": true,
 		"iconClass": "fa-search",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.search\\]\\]",
+		"text": "[[global:header.search]]",
 		"properties": {
 			"searchInstalled": true
 		}
--- a/install/databases.js
+++ b/install/databases.js
@@ -1,4 +1,4 @@
-"use strict";
+'use strict';

 var async = require('async');
 var prompt = require('prompt');
@@ -6,7 +6,7 @@ var winston = require('winston');

 var questions = {
 	redis: require('../src/database/redis').questions,
-	mongo: require('../src/database/mongo').questions
+	mongo: require('../src/database/mongo').questions,
 };

 module.exports = function (config, callback) {
@@ -18,7 +18,7 @@ module.exports = function (config, callback) {
 		},
 		function (databaseConfig, next) {
 			saveDatabaseConfig(config, databaseConfig, next);
-		}
+		},
 	], callback);
 };

@@ -55,7 +55,7 @@ function saveDatabaseConfig(config, databaseConfig, callback) {
 			host: databaseConfig['redis:host'],
 			port: databaseConfig['redis:port'],
 			password: databaseConfig['redis:password'],
-			database: databaseConfig['redis:database']
+			database: databaseConfig['redis:database'],
 		};

 		if (config.redis.host.slice(0, 1) === '/') {
@@ -67,16 +67,16 @@ function saveDatabaseConfig(config, databaseConfig, callback) {
 			port: databaseConfig['mongo:port'],
 			username: databaseConfig['mongo:username'],
 			password: databaseConfig['mongo:password'],
-			database: databaseConfig['mongo:database']
+			database: databaseConfig['mongo:database'],
 		};
 	} else {
 		return callback(new Error('unknown database : ' + config.database));
 	}

 	var allQuestions = questions.redis.concat(questions.mongo);
-	for (var x = 0; x < allQuestions.length; x++) {
+	for (var x = 0; x < allQuestions.length; x += 1) {
 		delete config[allQuestions[x].name];
 	}

 	callback(null, config);
-}
+}
--- a/install/web.js
+++ b/install/web.js
@@ -1,4 +1,4 @@
-"use strict";
+'use strict';

 var winston = require('winston');
 var express = require('express');
@@ -17,9 +17,9 @@ winston.add(winston.transports.File, {
 	colorize: true,
 	timestamp: function () {
 		var date = new Date();
-		return date.getDate() + '/' + (date.getMonth() + 1) + ' ' + date.toTimeString().substr(0,5) + ' [' + global.process.pid + ']';
+		return date.getDate() + '/' + (date.getMonth() + 1) + ' ' + date.toTimeString().substr(0, 5) + ' [' + global.process.pid + ']';
 	},
-	level: 'verbose'
+	level: 'verbose',
 });

 var web = {};
@@ -27,7 +27,7 @@ var scripts = [
 	'public/vendor/xregexp/xregexp.js',
 	'public/vendor/xregexp/unicode/unicode-base.js',
 	'public/src/utils.js',
-	'public/src/installer/install.js'
+	'public/src/installer/install.js',
 ];

 web.install = function (port) {
@@ -39,7 +39,7 @@ web.install = function (port) {
 	app.set('view engine', 'tpl');
 	app.set('views', path.join(__dirname, '../src/views'));
 	app.use(bodyParser.urlencoded({
-		extended: true
+		extended: true,
 	}));

 	async.parallel([compileLess, compileJS], function () {
@@ -66,7 +66,7 @@ function welcome(req, res) {
 	var databases = dbs.map(function (el) {
 		return {
 			name: el,
-			questions: require('../src/database/' + el).questions
+			questions: require('../src/database/' + el).questions,
 		};
 	});

@@ -75,10 +75,10 @@ function welcome(req, res) {
 	res.render('install/index', {
 		databases: databases,
 		skipDatabaseSetup: !!nconf.get('database'),
-		error: res.locals.error ? true : false,
-		success: res.locals.success ? true : false,
+		error: !!res.locals.error,
+		success: !!res.locals.success,
 		values: req.body,
-		minimumPasswordLength: defaults.minimumPasswordLength
+		minimumPasswordLength: defaults.minimumPasswordLength,
 	});
 }

@@ -90,7 +90,7 @@ function install(req, res) {
 	}

 	var child = require('child_process').fork('app', ['--setup'], {
-		env: process.env
+		env: process.env,
 	});

 	child.on('close', function (data) {
@@ -110,7 +110,7 @@ function launch(req, res) {

 	var child = require('child_process').spawn('node', ['loader.js'], {
 		detached: true,
-		stdio: ['ignore', 'ignore', 'ignore']
+		stdio: ['ignore', 'ignore', 'ignore'],
 	});

 	process.stdout.write('\nStarting NodeBB\n');
@@ -120,7 +120,7 @@ function launch(req, res) {

 	async.parallel([
 		async.apply(fs.unlink(path.join(__dirname, '../public/installer.css'))),
-		async.apply(fs.unlink(path.join(__dirname, '../public/installer.min.js')))	
+		async.apply(fs.unlink(path.join(__dirname, '../public/installer.min.js'))),
 	], function (err) {
 		if (err) {
 			winston.warn('Unable to remove installer files');
@@ -138,7 +138,7 @@ function compileLess(callback) {
 		}

 		less.render(style.toString(), function (err, css) {
-			if(err) {
+			if (err) {
 				return winston.error('Unable to compile LESS: ', err);
 			}

@@ -157,4 +157,4 @@ function compileJS(callback) {
 	fs.writeFile(path.join(__dirname, '../public/installer.min.js'), result.code, callback);
 }

-module.exports = web;
+module.exports = web;
--- a/loader.js
+++ b/loader.js
@@ -1,29 +1,30 @@
 'use strict';

-var	nconf = require('nconf'),
-	fs = require('fs'),
-	url = require('url'),
-	path = require('path'),
-	fork = require('child_process').fork,
+var	nconf = require('nconf');
+var fs = require('fs');
+var url = require('url');
+var path = require('path');
+var fork = require('child_process').fork;
+var async = require('async');
+var logrotate = require('logrotate-stream');

-	async = require('async'),
-	logrotate = require('logrotate-stream'),
-	file = require('./src/file'),
-	pkg = require('./package.json');
+var file = require('./src/file');
+var pkg = require('./package.json');

 nconf.argv().env().file({
-	file: path.join(__dirname, '/config.json')
+	file: path.join(__dirname, 'config.json'),
 });

-var	pidFilePath = __dirname + '/pidfile',
-	output = logrotate({ file: __dirname + '/logs/output.log', size: '1m', keep: 3, compress: true }),
-	silent = nconf.get('silent') === 'false' ? false : nconf.get('silent') !== false,
-	numProcs,
-	workers = [],
-
-	Loader = {
-		timesStarted: 0
-	};
+var	pidFilePath = path.join(__dirname, 'pidfile');
+var outputLogFilePath = path.join(__dirname, 'logs/output.log');
+var output = logrotate({ file: outputLogFilePath, size: '1m', keep: 3, compress: true });
+var silent = nconf.get('silent') === 'false' ? false : nconf.get('silent') !== false;
+var numProcs;
+var workers = [];
+var Loader = {
+	timesStarted: 0,
+};
+var appPath = path.join(__dirname, 'app.js');

 Loader.init = function (callback) {
 	if (silent) {
@@ -50,11 +51,10 @@ Loader.displayStartupMessages = function (callback) {
 };

 Loader.addWorkerEvents = function (worker) {
-
 	worker.on('exit', function (code, signal) {
 		if (code !== 0) {
 			if (Loader.timesStarted < numProcs * 3) {
-				Loader.timesStarted++;
+				Loader.timesStarted += 1;
 				if (Loader.crashTimer) {
 					clearTimeout(Loader.crashTimer);
 				}
@@ -62,7 +62,7 @@ Loader.addWorkerEvents = function (worker) {
 					Loader.timesStarted = 0;
 				}, 10000);
 			} else {
-				console.log(numProcs * 3 + ' restarts in 10 seconds, most likely an error on startup. Halting.');
+				console.log((numProcs * 3) + ' restarts in 10 seconds, most likely an error on startup. Halting.');
 				process.exit();
 			}
 		}
@@ -78,13 +78,13 @@ Loader.addWorkerEvents = function (worker) {
 	worker.on('message', function (message) {
 		if (message && typeof message === 'object' && message.action) {
 			switch (message.action) {
-				case 'restart':
-					console.log('[cluster] Restarting...');
-					Loader.restart();
+			case 'restart':
+				console.log('[cluster] Restarting...');
+				Loader.restart();
 				break;
-				case 'reload':
-					console.log('[cluster] Reloading...');
-					Loader.reload();
+			case 'reload':
+				console.log('[cluster] Reloading...');
+				Loader.reload();
 				break;
 			}
 		}
@@ -95,7 +95,7 @@ Loader.start = function (callback) {
 	numProcs = getPorts().length;
 	console.log('Clustering enabled: Spinning up ' + numProcs + ' process(es).\n');

-	for (var x = 0; x < numProcs; ++x) {
+	for (var x = 0; x < numProcs; x += 1) {
 		forkWorker(x, x === 0);
 	}

@@ -108,17 +108,17 @@ function forkWorker(index, isPrimary) {
 	var ports = getPorts();
 	var args = [];

-	if(!ports[index]) {
+	if (!ports[index]) {
 		return console.log('[cluster] invalid port for worker : ' + index + ' ports: ' + ports.length);
 	}

 	process.env.isPrimary = isPrimary;
-	process.env.isCluster = ports.length > 1 ? true : false;
+	process.env.isCluster = ports.length > 1;
 	process.env.port = ports[index];

-	var worker = fork('app.js', args, {
+	var worker = fork(appPath, args, {
 		silent: silent,
-		env: process.env
+		env: process.env,
 	});

 	worker.index = index;
@@ -129,7 +129,7 @@ function forkWorker(index, isPrimary) {
 	Loader.addWorkerEvents(worker);

 	if (silent) {
-		var output = logrotate({ file: __dirname + '/logs/output.log', size: '1m', keep: 3, compress: true });
+		var output = logrotate({ file: outputLogFilePath, size: '1m', keep: 3, compress: true });
 		worker.stdout.pipe(output);
 		worker.stderr.pipe(output);
 	}
@@ -142,7 +142,7 @@ function getPorts() {
 		process.exit();
 	}
 	var urlObject = url.parse(_url);
-	var port = nconf.get('port') || nconf.get('PORT') || urlObject.port || 4567;
+	var port = nconf.get('port') || urlObject.port || 4567;
 	if (!Array.isArray(port)) {
 		port = [port];
 	}
@@ -156,7 +156,7 @@ Loader.restart = function () {
 	nconf.remove('file');
 	nconf.use('file', { file: pathToConfig });

-	fs.readFile(pathToConfig, {encoding: 'utf-8'}, function (err, configFile) {
+	fs.readFile(pathToConfig, { encoding: 'utf-8' }, function (err, configFile) {
 		if (err) {
 			console.log('Error reading config : ' + err.message);
 			process.exit();
@@ -175,7 +175,7 @@ Loader.restart = function () {
 Loader.reload = function () {
 	workers.forEach(function (worker) {
 		worker.send({
-			action: 'reload'
+			action: 'reload',
 		});
 	});
 };
@@ -184,7 +184,7 @@ Loader.stop = function () {
 	killWorkers();

 	// Clean up the pidfile
-	fs.unlinkSync(__dirname + '/pidfile');
+	fs.unlinkSync(pidFilePath);
 };

 function killWorkers() {
@@ -222,16 +222,17 @@ fs.open(path.join(__dirname, 'config.json'), 'r', function (err) {

 			require('daemon')({
 				stdout: process.stdout,
-				stderr: process.stderr
+				stderr: process.stderr,
+				cwd: process.cwd(),
 			});

-			fs.writeFile(__dirname + '/pidfile', process.pid);
+			fs.writeFileSync(pidFilePath, process.pid);
 		}

 		async.series([
 			Loader.init,
 			Loader.displayStartupMessages,
-			Loader.start
+			Loader.start,
 		], function (err) {
 			if (err) {
 				console.log('[loader] Error during startup: ' + err.message);
@@ -239,6 +240,6 @@ fs.open(path.join(__dirname, 'config.json'), 'r', function (err) {
 		});
 	} else {
 		// No config detected, kickstart web installer
-		var child = require('child_process').fork('app');
+		require('child_process').fork('app');
 	}
 });
--- a/minifier.js
+++ b/minifier.js
@@ -1,81 +0,0 @@
-"use strict";
-
-var uglifyjs = require('uglify-js');
-var async = require('async');
-var fs = require('fs');
-var file = require('./src/file');
-
-var Minifier = {
-	js: {}
-};
-
-/* Javascript */
-Minifier.js.minify = function (scripts, minify, callback) {
-
-	scripts = scripts.filter(function (file) {
-		return file && file.endsWith('.js');
-	});
-
-	async.filter(scripts, function (script, next) {
-		file.exists(script, function (exists) {
-			if (!exists) {
-				console.warn('[minifier] file not found, ' + script);
-			}
-			next(exists);
-		});
-	}, function (scripts) {
-		if (minify) {
-			minifyScripts(scripts, callback);
-		} else {
-			concatenateScripts(scripts, callback);
-		}
-	});
-};
-
-process.on('message', function (payload) {
-	switch(payload.action) {
-	case 'js':
-		Minifier.js.minify(payload.scripts, payload.minify, function (minified/*, sourceMap*/) {
-			process.send({
-				type: 'end',
-				// sourceMap: sourceMap,
-				minified: minified
-			});
-		});
-		break;
-	}
-});
-
-function minifyScripts(scripts, callback) {
-	// The portions of code involving the source map are commented out as they're broken in UglifyJS2
-	// Follow along here: https://github.com/mishoo/UglifyJS2/issues/700
-	try {
-		var minified = uglifyjs.minify(scripts, {
-				// outSourceMap: "nodebb.min.js.map",
-				compress: false
-			});
-
-		callback(minified.code/*, minified.map*/);
-	} catch(err) {
-		process.send({
-			type: 'error',
-			message: err.message
-		});
-	}
-}
-
-function concatenateScripts(scripts, callback) {
-	async.map(scripts, fs.readFile, function (err, scripts) {
-		if (err) {
-			process.send({
-				type: 'error',
-				message: err.message
-			});
-			return;
-		}
-
-		scripts = scripts.join(require('os').EOL + ';');
-
-		callback(scripts);
-	});
-}
--- a/864
+++ b/864
@@ -1,427 +1,539 @@
 #!/usr/bin/env node

-try {
-	var colors = require('colors'),
-		cproc = require('child_process'),
-		argv = require('minimist')(process.argv.slice(2)),
-		fs = require('fs'),
-		path = require('path'),
-		request = require('request'),
-		semver = require('semver'),
-		prompt = require('prompt'),
-		async = require('async');
-} catch (e) {
-	if (e.code === 'MODULE_NOT_FOUND') {
-		process.stdout.write('NodeBB could not be started because it\'s dependencies have not been installed.\n');
-		process.stdout.write('Please ensure that you have executed "npm install --production" prior to running NodeBB.\n\n');
-		process.stdout.write('For more information, please see: https://docs.nodebb.org/en/latest/installing/os.html\n\n');
-		process.stdout.write('Could not start: ' + e.code + '\n');
+'use strict';

-		process.exit(1);
+var fs = require('fs');
+var path = require('path');
+var cproc = require('child_process');
+
+// check to make sure dependencies are installed
+try {
+	fs.readFileSync(path.join(__dirname, 'node_modules/async/package.json'));
+} catch (e) {
+	if (e.code === 'ENOENT') {
+		process.stdout.write('Dependencies not yet installed.\n');
+		process.stdout.write('Installing them now...\n\n');
+
+		cproc.execSync('npm i --production', {
+			cwd: __dirname,
+			stdio: [0, 1, 2],
+		});
+	} else {
+		throw e;
 	}
 }

-var getRunningPid = function (callback) {
-		fs.readFile(__dirname + '/pidfile', {
-			encoding: 'utf-8'
-		}, function (err, pid) {
-			if (err) {
-				return callback(err);
+var minimist;
+var request;
+var semver;
+var prompt;
+var async;
+
+try {
+	require('colors');
+	minimist = require('minimist');
+	request = require('request');
+	semver = require('semver');
+	prompt = require('prompt');
+	async = require('async');
+} catch (e) {
+	process.stdout.write(
+		'\x1b[31mNodeBB could not be initialised because there was an error while loading dependencies.\n' +
+		'Please run "\x1b[33mnpm install --production\x1b[31m" and try again.\x1b[0m\n\n' +
+		'For more information, please see: https://docs.nodebb.org/en/latest/installing/os.html\n\n'
+	);
+
+	throw e;
+}
+
+var args = minimist(process.argv.slice(2));
+
+var loaderPath = path.join(__dirname, 'loader.js');
+var appPath = path.join(__dirname, 'app.js');
+
+if (args.dev) {
+	process.env.NODE_ENV = 'development';
+}
+
+function getRunningPid(callback) {
+	fs.readFile(path.join(__dirname, 'pidfile'), {
+		encoding: 'utf-8',
+	}, function (err, pid) {
+		if (err) {
+			return callback(err);
+		}
+
+		try {
+			process.kill(parseInt(pid, 10), 0);
+			callback(null, parseInt(pid, 10));
+		} catch (e) {
+			callback(e);
+		}
+	});
+}
+function getCurrentVersion(callback) {
+	fs.readFile(path.join(__dirname, 'package.json'), { encoding: 'utf-8' }, function (err, pkg) {
+		if (err) {
+			return callback(err);
+		}
+
+		try {
+			pkg = JSON.parse(pkg);
+			return callback(null, pkg.version);
+		} catch (err) {
+			return callback(err);
+		}
+	});
+}
+function fork(args) {
+	return cproc.fork(appPath, args, {
+		cwd: __dirname,
+		silent: false,
+	});
+}
+function getInstalledPlugins(callback) {
+	async.parallel({
+		files: async.apply(fs.readdir, path.join(__dirname, 'node_modules')),
+		deps: async.apply(fs.readFile, path.join(__dirname, 'package.json'), { encoding: 'utf-8' }),
+	}, function (err, payload) {
+		if (err) {
+			return callback(err);
+		}
+
+		var isNbbModule = /^nodebb-(?:plugin|theme|widget|rewards)-[\w-]+$/;
+		var moduleName;
+		var isGitRepo;
+
+		payload.files = payload.files.filter(function (file) {
+			return isNbbModule.test(file);
+		});
+
+		try {
+			payload.deps = JSON.parse(payload.deps).dependencies;
+			payload.bundled = [];
+			payload.installed = [];
+		} catch (err) {
+			return callback(err);
+		}
+
+		for (moduleName in payload.deps) {
+			if (isNbbModule.test(moduleName)) {
+				payload.bundled.push(moduleName);
+			}
+		}
+
+		// Whittle down deps to send back only extraneously installed plugins/themes/etc
+		payload.files.forEach(function (moduleName) {
+			try {
+				fs.accessSync(path.join(__dirname, 'node_modules/' + moduleName, '.git'));
+				isGitRepo = true;
+			} catch (e) {
+				isGitRepo = false;
 			}

-			try {
-				process.kill(parseInt(pid, 10), 0);
-				callback(null, parseInt(pid, 10));
-			} catch(e) {
-				callback(e);
+			if (
+				payload.files.indexOf(moduleName) !== -1 &&	// found in `node_modules/`
+				payload.bundled.indexOf(moduleName) === -1 &&	// not found in `package.json`
+				!fs.lstatSync(path.join(__dirname, 'node_modules/' + moduleName)).isSymbolicLink() &&	// is not a symlink
+				!isGitRepo	// .git/ does not exist, so it is not a git repository
+			) {
+				payload.installed.push(moduleName);
 			}
 		});
-	},
-	getCurrentVersion = function (callback) {
-		fs.readFile(path.join(__dirname, 'package.json'), { encoding: 'utf-8' }, function (err, pkg) {
+
+		getModuleVersions(payload.installed, callback);
+	});
+}
+function getModuleVersions(modules, callback) {
+	var versionHash = {};
+
+	async.eachLimit(modules, 50, function (module, next) {
+		fs.readFile(path.join(__dirname, 'node_modules/' + module + '/package.json'), { encoding: 'utf-8' }, function (err, pkg) {
 			if (err) {
-				return callback(err);
+				return next(err);
 			}

 			try {
 				pkg = JSON.parse(pkg);
-				return callback(null, pkg.version);
-			} catch(err) {
-				return callback(err);
-			}
-		});
-	},
-	fork = function (args) {
-		cproc.fork('app.js', args, {
-			cwd: __dirname,
-			silent: false
-		});
-	},
-	getInstalledPlugins = function (callback) {
-		async.parallel({
-			files: async.apply(fs.readdir, path.join(__dirname, 'node_modules')),
-			deps: async.apply(fs.readFile, path.join(__dirname, 'package.json'), { encoding: 'utf-8' })
-		}, function (err, payload) {
-			if (err) {
-				return callback(err);
-			}
-
-			var isNbbModule = /^nodebb-(?:plugin|theme|widget|rewards)-[\w\-]+$/,
-				moduleName, isGitRepo;
-
-			payload.files = payload.files.filter(function (file) {
-				return isNbbModule.test(file);
-			});
-
-			try {
-				payload.deps = JSON.parse(payload.deps).dependencies;
-				payload.bundled = [];
-				payload.installed = [];
+				versionHash[module] = pkg.version;
+				next();
 			} catch (err) {
-				return callback(err);
+				next(err);
 			}
-
-			for (moduleName in payload.deps) {
-				if (isNbbModule.test(moduleName)) {
-					payload.bundled.push(moduleName);
-				}
-			}
-
-			// Whittle down deps to send back only extraneously installed plugins/themes/etc
-			payload.files.forEach(function (moduleName) {
-				try {
-					fs.accessSync(path.join(__dirname, 'node_modules/' + moduleName, '.git'));
-					isGitRepo = true;
-				} catch(e) {
-					isGitRepo = false;
-				}
-
-				if (
-					payload.files.indexOf(moduleName) !== -1	// found in `node_modules/`
-					&& payload.bundled.indexOf(moduleName) === -1	// not found in `package.json`
-					&& !fs.lstatSync(path.join(__dirname, 'node_modules/' + moduleName)).isSymbolicLink()	// is not a symlink
-					&& !isGitRepo	// .git/ does not exist, so it is not a git repository
-				) {
-					payload.installed.push(moduleName);
-				}
-			});
-
-			getModuleVersions(payload.installed, callback);
 		});
-	},
-	getModuleVersions = function (modules, callback) {
-		var versionHash = {};
+	}, function (err) {
+		callback(err, versionHash);
+	});
+}
+function checkPlugins(standalone, callback) {
+	if (standalone) {
+		process.stdout.write('Checking installed plugins and themes for updates... ');
+	}

-		async.eachLimit(modules, 50, function (module, next) {
-			fs.readFile(path.join(__dirname, 'node_modules/' + module + '/package.json'), { encoding: 'utf-8' }, function (err, pkg) {
+	async.waterfall([
+		async.apply(async.parallel, {
+			plugins: async.apply(getInstalledPlugins),
+			version: async.apply(getCurrentVersion),
+		}),
+		function (payload, next) {
+			var toCheck = Object.keys(payload.plugins);
+
+			if (!toCheck.length) {
+				process.stdout.write('OK'.green + '\n'.reset);
+				return next(null, []);	// no extraneous plugins installed
+			}
+
+			request({
+				method: 'GET',
+				url: 'https://packages.nodebb.org/api/v1/suggest?version=' + payload.version + '&package[]=' + toCheck.join('&package[]='),
+				json: true,
+			}, function (err, res, body) {
 				if (err) {
+					process.stdout.write('error'.red + '\n'.reset);
 					return next(err);
 				}
+				process.stdout.write('OK'.green + '\n'.reset);

-				try {
-					pkg = JSON.parse(pkg);
-					versionHash[module] = pkg.version;
-					next();
-				} catch (err) {
-					next(err);
+				if (!Array.isArray(body) && toCheck.length === 1) {
+					body = [body];
 				}
+
+				var current;
+				var suggested;
+				var upgradable = body.map(function (suggestObj) {
+					current = payload.plugins[suggestObj.package];
+					suggested = suggestObj.version;
+
+					if (suggestObj.code === 'match-found' && semver.gt(suggested, current)) {
+						return {
+							name: suggestObj.package,
+							current: current,
+							suggested: suggested,
+						};
+					}
+					return null;
+				}).filter(Boolean);
+
+				next(null, upgradable);
 			});
-		}, function (err) {
-			callback(err, versionHash);
-		});
-	},
-	checkPlugins = function (standalone, callback) {
-		if (standalone) {
-			process.stdout.write('Checking installed plugins and themes for updates... ');
+		},
+	], callback);
+}
+function upgradePlugins(callback) {
+	var standalone = false;
+	if (typeof callback !== 'function') {
+		callback = function () {};
+		standalone = true;
+	}
+
+	checkPlugins(standalone, function (err, found) {
+		if (err) {
+			process.stdout.write('Warning'.yellow + ': An unexpected error occured when attempting to verify plugin upgradability\n'.reset);
+			return callback(err);
 		}

-		async.waterfall([
-			async.apply(async.parallel, {
-				plugins: async.apply(getInstalledPlugins),
-				version: async.apply(getCurrentVersion)
-			}),
-			function (payload, next) {
-				var toCheck = Object.keys(payload.plugins);
-
-				if (!toCheck.length) {
-					process.stdout.write('OK'.green + '\n'.reset);
-					return next(null, []);	// no extraneous plugins installed
-				}
-
-				request({
-					method: 'GET',
-					url: 'https://packages.nodebb.org/api/v1/suggest?version=' + payload.version + '&package[]=' + toCheck.join('&package[]='),
-					json: true
-				}, function (err, res, body) {
-					if (err) {
-						process.stdout.write('error'.red + '\n'.reset);
-						return next(err);
-					}
-					process.stdout.write('OK'.green + '\n'.reset);
-
-					if (!Array.isArray(body) && toCheck.length === 1) {
-						body = [body];
-					}
-
-					var current, suggested,
-						upgradable = body.map(function (suggestObj) {
-							current = payload.plugins[suggestObj.package];
-							suggested = suggestObj.version;
-
-							if (suggestObj.code === 'match-found' && semver.gt(suggested, current)) {
-								return {
-									name: suggestObj.package,
-									current: current,
-									suggested: suggested
-								};
-							} else {
-								return null;
-							}
-						}).filter(Boolean);
-
-					next(null, upgradable);
-				});
+		if (found && found.length) {
+			process.stdout.write('\nA total of ' + String(found.length).bold + ' package(s) can be upgraded:\n');
+			found.forEach(function (suggestObj) {
+				process.stdout.write('  * '.yellow + suggestObj.name.reset + ' (' + suggestObj.current.yellow + ' -> '.reset + suggestObj.suggested.green + ')\n'.reset);
+			});
+			process.stdout.write('\n');
+		} else {
+			if (standalone) {
+				process.stdout.write('\nAll packages up-to-date!'.green + '\n'.reset);
 			}
-		], callback);
-	},
-	upgradePlugins = function (callback) {
-		var standalone = false;
-		if (typeof callback !== 'function') {
-			callback = function () {};
-			standalone = true;
-		};
+			return callback();
+		}

-		checkPlugins(standalone, function (err, found) {
+		prompt.message = '';
+		prompt.delimiter = '';
+
+		prompt.start();
+		prompt.get({
+			name: 'upgrade',
+			description: 'Proceed with upgrade (y|n)?'.reset,
+			type: 'string',
+		}, function (err, result) {
 			if (err) {
-				process.stdout.write('\Warning'.yellow + ': An unexpected error occured when attempting to verify plugin upgradability\n'.reset);
 				return callback(err);
 			}

-			if (found && found.length) {
-				process.stdout.write('\nA total of ' + String(found.length).bold + ' package(s) can be upgraded:\n');
+			if (['y', 'Y', 'yes', 'YES'].indexOf(result.upgrade) !== -1) {
+				process.stdout.write('\nUpgrading packages...');
+				var args = ['i'];
 				found.forEach(function (suggestObj) {
-					process.stdout.write('  * '.yellow + suggestObj.name.reset + ' (' + suggestObj.current.yellow + ' -> '.reset + suggestObj.suggested.green + ')\n'.reset);
+					args.push(suggestObj.name + '@' + suggestObj.suggested);
+				});
+
+				cproc.execFile((process.platform === 'win32') ? 'npm.cmd' : 'npm', args, { stdio: 'ignore' }, function (err) {
+					if (!err) {
+						process.stdout.write(' OK\n'.green);
+					}
+
+					callback(err);
 				});
-				process.stdout.write('\n');
 			} else {
-				if (standalone) {
-					process.stdout.write('\nAll packages up-to-date!'.green + '\n'.reset);
-				}
-				return callback();
+				process.stdout.write('\nPackage upgrades skipped'.yellow + '. Check for upgrades at any time by running "'.reset + './nodebb upgrade-plugins'.green + '".\n'.reset);
+				callback();
 			}
+		});
+	});
+}

-			prompt.message = '';
-			prompt.delimiter = '';
-
-			prompt.start();
-			prompt.get({
-				name: 'upgrade',
-				description: 'Proceed with upgrade (y|n)?'.reset,
-				type: 'string'
-			}, function (err, result) {
-				if (err) {
-					return callback(err);
-				}
-
-				if (['y', 'Y', 'yes', 'YES'].indexOf(result.upgrade) !== -1) {
-					process.stdout.write('\nUpgrading packages...');
-					var args = ['npm', 'i'];
-					found.forEach(function (suggestObj) {
-						args.push(suggestObj.name + '@' + suggestObj.suggested);
-					});
-
-					require('child_process').execFile('/usr/bin/env', args, { stdio: 'ignore' }, function (err) {
-						if (!err) {
-							process.stdout.write(' OK\n'.green);
-						}
-
-						callback(err);
-					});
+var commands = {
+	status: {
+		description: 'View the status of the NodeBB server',
+		usage: 'Usage: ' + './nodebb status'.yellow,
+		handler: function () {
+			getRunningPid(function (err, pid) {
+				if (!err) {
+					process.stdout.write('\nNodeBB Running '.bold + '(pid '.cyan + pid.toString().cyan + ')\n'.cyan);
+					process.stdout.write('\t"' + './nodebb stop'.yellow + '" to stop the NodeBB server\n');
+					process.stdout.write('\t"' + './nodebb log'.yellow + '" to view server output\n');
+					process.stdout.write('\t"' + './nodebb restart'.yellow + '" to restart NodeBB\n\n');
 				} else {
-					process.stdout.write('\nPackage upgrades skipped'.yellow + '. Check for upgrades at any time by running "'.reset + './nodebb upgrade-plugins'.green + '".\n'.reset);
-					callback();
+					process.stdout.write('\nNodeBB is not running\n'.bold);
+					process.stdout.write('\t"' + './nodebb start'.yellow + '" to launch the NodeBB server\n\n'.reset);
 				}
 			});
-		});
-	};
+		},
+	},
+	start: {
+		description: 'Start the NodeBB server',
+		usage: 'Usage: ' + './nodebb start'.yellow,
+		handler: function () {
+			process.stdout.write('\nStarting NodeBB\n'.bold);
+			process.stdout.write('  "' + './nodebb stop'.yellow + '" to stop the NodeBB server\n');
+			process.stdout.write('  "' + './nodebb log'.yellow + '" to view server output\n');
+			process.stdout.write('  "' + './nodebb restart'.yellow + '" to restart NodeBB\n\n'.reset);

-switch(process.argv[2]) {
-	case 'status':
-		getRunningPid(function (err, pid) {
-			if (!err) {
-				process.stdout.write('\nNodeBB Running '.bold + '(pid '.cyan + pid.toString().cyan + ')\n'.cyan);
-				process.stdout.write('\t"' + './nodebb stop'.yellow + '" to stop the NodeBB server\n');
-				process.stdout.write('\t"' + './nodebb log'.yellow + '" to view server output\n');
-				process.stdout.write('\t"' + './nodebb restart'.yellow + '" to restart NodeBB\n\n');
-			} else {
-				process.stdout.write('\nNodeBB is not running\n'.bold);
-				process.stdout.write('\t"' + './nodebb start'.yellow + '" to launch the NodeBB server\n\n'.reset);
+			// Spawn a new NodeBB process
+			cproc.fork(loaderPath, {
+				env: process.env,
+			});
+		},
+	},
+	stop: {
+		description: 'Stop the NodeBB server',
+		usage: 'Usage: ' + './nodebb stop'.yellow,
+		handler: function () {
+			getRunningPid(function (err, pid) {
+				if (!err) {
+					process.kill(pid, 'SIGTERM');
+					process.stdout.write('Stopping NodeBB. Goodbye!\n');
+				} else {
+					process.stdout.write('NodeBB is already stopped.\n');
+				}
+			});
+		},
+	},
+	restart: {
+		description: 'Restart the NodeBB server',
+		usage: 'Usage: ' + './nodebb restart'.yellow,
+		handler: function () {
+			getRunningPid(function (err, pid) {
+				if (!err) {
+					process.kill(pid, 'SIGHUP');
+					process.stdout.write('\nRestarting NodeBB\n'.bold);
+				} else {
+					process.stdout.write('NodeBB could not be restarted, as a running instance could not be found.\n');
+				}
+			});
+		},
+	},
+	log: {
+		description: 'Open the output log (useful for debugging)',
+		usage: 'Usage: ' + './nodebb log'.yellow,
+		handler: function () {
+			process.stdout.write('\nHit '.red + 'Ctrl-C '.bold + 'to exit'.red);
+			process.stdout.write('\n\n'.reset);
+			cproc.spawn('tail', ['-F', './logs/output.log'], {
+				cwd: __dirname,
+				stdio: 'inherit',
+			});
+		},
+	},
+	slog: {
+		description: 'Start the NodeBB server and view the live output log',
+		usage: 'Usage: ' + './nodebb slog'.yellow,
+		handler: function () {
+			process.stdout.write('\nStarting NodeBB with logging output\n'.bold);
+			process.stdout.write('\nHit '.red + 'Ctrl-C '.bold + 'to exit'.red);
+			process.stdout.write('\n\n'.reset);
+
+			// Spawn a new NodeBB process
+			cproc.fork(loaderPath, {
+				env: process.env,
+			});
+			cproc.spawn('tail', ['-F', './logs/output.log'], {
+				cwd: __dirname,
+				stdio: 'inherit',
+			});
+		},
+	},
+	dev: {
+		description: 'Start NodeBB in verbose development mode',
+		usage: 'Usage: ' + './nodebb dev'.yellow,
+		handler: function () {
+			process.env.NODE_ENV = 'development';
+			cproc.fork(loaderPath, ['--no-daemon', '--no-silent'], {
+				env: process.env,
+			});
+		},
+	},
+	build: {
+		description: 'Compile static assets (CSS, Javascript, etc)',
+		usage: 'Usage: ' + './nodebb build'.yellow + ' [js,clientCSS,acpCSS,tpl,lang]'.red + '\n' +
+			'    e.g. ' + './nodebb build js,tpl'.yellow + '\tbuilds JS and templates\n' +
+			'         ' + './nodebb build'.yellow + '\t\tbuilds all targets\n',
+		handler: function () {
+			var arr = ['--build'].concat(process.argv.slice(3));
+			fork(arr);
+		},
+	},
+	setup: {
+		description: 'Run the NodeBB setup script',
+		usage: 'Usage: ' + './nodebb setup'.yellow,
+		handler: function () {
+			var arr = ['--setup'].concat(process.argv.slice(3));
+			fork(arr);
+		},
+	},
+	reset: {
+		description: 'Disable plugins and restore the default theme',
+		usage: 'Usage: ' + './nodebb reset '.yellow + '{-t|-p|-w|-s|-a}'.red + '\n' +
+			'    -t <theme>\tuse specified theme\n' +
+			'    -p <plugin>\tdisable specified plugin\n' +
+			'\n' +
+			'    -t\t\tuse default theme\n' +
+			'    -p\t\tdisable all but core plugins\n' +
+			'    -w\t\twidgets\n' +
+			'    -s\t\tsettings\n' +
+			'    -a\t\tall of the above\n',
+		handler: function () {
+			var arr = ['--reset'].concat(process.argv.slice(3));
+			fork(arr);
+		},
+	},
+	activate: {
+		description: 'Activate a plugin for the next startup of NodeBB',
+		usage: 'Usage: ' + './nodebb activate <plugin>'.yellow,
+		handler: function () {
+			var name = args._[1];
+			if (!name) {
+				process.stdout.write(commands.activate.usage + '\n');
+				process.exit();
 			}
-		});
-		break;
-
-	case 'start':
-		process.stdout.write('\nStarting NodeBB\n'.bold);
-		process.stdout.write('  "' + './nodebb stop'.yellow + '" to stop the NodeBB server\n');
-		process.stdout.write('  "' + './nodebb log'.yellow + '" to view server output\n');
-		process.stdout.write('  "' + './nodebb restart'.yellow + '" to restart NodeBB\n\n'.reset);
-
-		// Spawn a new NodeBB process
-		cproc.fork(__dirname + '/loader.js', {
-			env: process.env
-		});
-		break;
-	
-	case 'slog':
-		process.stdout.write('\nStarting NodeBB with logging output\n'.bold);
-		process.stdout.write('\nHit '.red + 'Ctrl-C '.bold + 'to exit'.red);
-		process.stdout.write('\n\n'.reset);
-
-		// Spawn a new NodeBB process
-		cproc.fork(__dirname + '/loader.js', {
-			env: process.env
-		});
-		cproc.spawn('tail', ['-F', './logs/output.log'], {
-			cwd: __dirname,
-			stdio: 'inherit'
-		});
-		break;
-
-	case 'stop':
-		getRunningPid(function (err, pid) {
-			if (!err) {
-				process.kill(pid, 'SIGTERM');
-				process.stdout.write('Stopping NodeBB. Goodbye!\n');
-			} else {
-				process.stdout.write('NodeBB is already stopped.\n');
+			if (name.startsWith('nodebb-theme')) {
+				fork(['--reset', '-t', name]);
+				return;
 			}
-		});
-		break;
+			var arr = ['--activate=' + name].concat(process.argv.slice(4));
+			fork(arr);
+		},
+	},
+	plugins: {
+		description: 'List all installed plugins',
+		usage: 'Usage: ' + './nodebb plugins'.yellow,
+		handler: function () {
+			var arr = ['--plugins'].concat(process.argv.slice(3));
+			fork(arr);
+		},
+	},
+	upgrade: {
+		description: 'Run NodeBB upgrade scripts, ensure packages are up-to-date',
+		usage: 'Usage: ' + './nodebb upgrade'.yellow,
+		handler: function () {
+			if (process.argv[3]) {
+				process.stdout.write('\nUpdating NodeBB data store schema...\n'.yellow);
+				var arr = ['--upgrade'].concat(process.argv.slice(3));
+				var upgradeProc = fork(arr);

-	case 'restart':
-		getRunningPid(function (err, pid) {
-			if (!err) {
-				process.kill(pid, 'SIGHUP');
-				process.stdout.write('\nRestarting NodeBB\n'.bold);
-			} else {
-				process.stdout.write('NodeBB could not be restarted, as a running instance could not be found.\n');
-			}
-		});
-		break;
-
-	case 'reload':
-		getRunningPid(function (err, pid) {
-			if (!err) {
-				process.kill(pid, 'SIGUSR2');
-			} else {
-				process.stdout.write('NodeBB could not be reloaded, as a running instance could not be found.\n');
-			}
-		});
-		break;
-
-	case 'dev':
-		process.env.NODE_ENV = 'development';
-		cproc.fork(__dirname + '/loader.js', ['--no-daemon', '--no-silent'], {
-			env: process.env
-		});
-		break;
-
-	case 'log':
-		process.stdout.write('\nHit '.red + 'Ctrl-C '.bold + 'to exit'.red);
-		process.stdout.write('\n\n'.reset);
-		cproc.spawn('tail', ['-F', './logs/output.log'], {
-			cwd: __dirname,
-			stdio: 'inherit'
-		});
-		break;
-
-	case 'build':
-		var args = process.argv.slice(0);
-		args[2] = '--' + args[2];
-
-		fork(args);
-		break;
-
-	case 'setup':
-		cproc.fork('app.js', ['--setup'], {
-			cwd: __dirname,
-			silent: false
-		});
-		break;
-
-	case 'reset':
-		var args = process.argv.slice(0);
-		args.unshift('--reset');
-		fork(args);
-		break;
-
-	case 'activate':
-		var args = process.argv.slice(0);
-		args.unshift('--activate=' + process.argv[3]);
-		fork(args);
-		break;
-
-	case 'plugins':
-		var args = process.argv.slice(0);
-		args.unshift('--plugins');
-		fork(args);
-		break;
-
-	case 'upgrade-plugins':
-		upgradePlugins();
-		break;
-
-	case 'upgrade':
-		async.series([
-			function (next) {
-				process.stdout.write('1. '.bold + 'Bringing base dependencies up to date... '.yellow);
-				cproc.exec('npm i --production', { cwd: __dirname, stdio: 'ignore' }, next);
-			},
-			function (next) {
-				process.stdout.write('OK\n'.green);
-				process.stdout.write('2. '.bold + 'Checking installed plugins for updates... '.yellow);
-				upgradePlugins(next);
-			},
-			function (next) {
-				process.stdout.write('3. '.bold + 'Updating NodeBB data store schema...\n'.yellow);
-				var upgradeProc = cproc.fork('app.js', ['--upgrade'], {
-					cwd: __dirname,
-					silent: false
+				return upgradeProc.on('close', function (err) {
+					if (err) {
+						process.stdout.write('\nError'.red + ': ' + err.message + '\n');
+					}
 				});
-
-				upgradeProc.on('close', next);
 			}
-		], function (err) {
-			if (err) {
-				process.stdout.write('\nError'.red + ': ' + err.message + '\n');
-			} else {
-				var message = 'NodeBB Upgrade Complete!';
-				// some consoles will return undefined/zero columns, so just use 2 spaces in upgrade script if we can't get our column count
-				var columns = process.stdout.columns;
-				var spaces = columns ? new Array(Math.floor(columns / 2) - (message.length / 2) + 1).join(' ') : "  ";

-				process.stdout.write('OK\n'.green);
-				process.stdout.write('\n' + spaces + message.green.bold + '\n\n'.reset);
+			async.series([
+				function (next) {
+					process.stdout.write('1. '.bold + 'Bringing base dependencies up to date... '.yellow);
+					cproc.exec('npm i --production', { cwd: __dirname, stdio: 'ignore' }, next);
+				},
+				function (next) {
+					process.stdout.write('OK\n'.green);
+					process.stdout.write('2. '.bold + 'Checking installed plugins for updates... '.yellow);
+					upgradePlugins(next);
+				},
+				function (next) {
+					process.stdout.write('3. '.bold + 'Updating NodeBB data store schema...\n'.yellow);
+					var arr = ['--upgrade'].concat(process.argv.slice(3));
+					var upgradeProc = fork(arr);
+
+					upgradeProc.on('close', next);
+				},
+			], function (err) {
+				if (err) {
+					process.stdout.write('\nError'.red + ': ' + err.message + '\n');
+				} else {
+					var message = 'NodeBB Upgrade Complete!';
+					// some consoles will return undefined/zero columns, so just use 2 spaces in upgrade script if we can't get our column count
+					var columns = process.stdout.columns;
+					var spaces = columns ? new Array(Math.floor(columns / 2) - (message.length / 2) + 1).join(' ') : '  ';
+
+					process.stdout.write('OK\n'.green);
+					process.stdout.write('\n' + spaces + message.green.bold + '\n\n'.reset);
+				}
+			});
+		},
+	},
+	upgradePlugins: {
+		hidden: true,
+		description: '',
+		handler: function () {
+			upgradePlugins();
+		},
+	},
+	events: {
+		description: 'Outputs the last ten (10) administrative events recorded by NodeBB',
+		usage: 'Usage: ' + './nodebb events'.yellow,
+		handler: function () {
+			fork(['--events']);
+		},
+	},
+	help: {
+		description: 'Display the help message for a given command',
+		usage: 'Usage: ' + './nodebb help <command>'.yellow,
+		handler: function () {
+			var command = commands[args._[1]];
+			if (command) {
+				process.stdout.write(command.description + '\n'.reset);
+				process.stdout.write(command.usage + '\n'.reset);
+
+				return;
 			}
-		});
-		break;
+			var keys = Object.keys(commands).filter(function (key) {
+				return !commands[key].hidden;
+			});

-	default:
-		process.stdout.write('\nWelcome to NodeBB\n\n'.bold);
-		process.stdout.write('Usage: ./nodebb {start|slog|stop|reload|restart|log|build|setup|reset|upgrade|dev}\n\n');
-		process.stdout.write('\t' + 'start'.yellow + '\t\tStart the NodeBB server\n');
-		process.stdout.write('\t' + 'slog'.yellow + '\t\tStarts the NodeBB server and displays the live output log\n');
-		process.stdout.write('\t' + 'stop'.yellow + '\t\tStops the NodeBB server\n');
-		process.stdout.write('\t' + 'reload'.yellow + '\t\tRestarts NodeBB\n');
-		process.stdout.write('\t' + 'restart'.yellow + '\t\tRestarts NodeBB\n');
-		process.stdout.write('\t' + 'log'.yellow + '\t\tOpens the logging interface (useful for debugging)\n');
-		process.stdout.write('\t' + 'build'.yellow + '\t\tCompiles javascript, css stylesheets, and templates\n');
-		process.stdout.write('\t' + 'setup'.yellow + '\t\tRuns the NodeBB setup script\n');
-		process.stdout.write('\t' + 'reset'.yellow + '\t\tDisables all plugins, restores the default theme.\n');
-		process.stdout.write('\t' + 'activate'.yellow + '\tActivates a plugin for the next startup of NodeBB.\n');
-		process.stdout.write('\t' + 'plugins'.yellow + '\t\tList all plugins that have been installed.\n');
-		process.stdout.write('\t' + 'upgrade'.yellow + '\t\tRun NodeBB upgrade scripts, ensure packages are up-to-date\n');
-		process.stdout.write('\t' + 'dev'.yellow + '\t\tStart NodeBB in interactive development mode\n');
-		process.stdout.write('\n'.reset);
-		break;
+			process.stdout.write('\nWelcome to NodeBB\n\n'.bold);
+			process.stdout.write('Usage: ./nodebb {' + keys.join('|') + '}\n\n');
+
+			var usage = keys.map(function (key) {
+				var line = '\t' + key.yellow + (key.length < 8 ? '\t\t' : '\t');
+				return line + commands[key].description;
+			}).join('\n');
+
+			process.stdout.write(usage + '\n'.reset);
+		},
+	},
+};
+
+commands['upgrade-plugins'] = commands.upgradePlugins;
+
+if (!commands[args._[0]]) {
+	commands.help.handler();
+} else {
+	commands[args._[0]].handler();
 }
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "nodebb",
  "license": "GPL-3.0",
  "description": "NodeBB Forum",
-  "version": "1.4.3",
+  "version": "1.5.3",
  "homepage": "http://www.nodebb.org",
  "repository": {
    "type": "git",
@@ -11,16 +11,18 @@
  "main": "app.js",
  "scripts": {
    "start": "node loader.js",
-    "lint": "eslint --cache .",
+    "lint": "eslint --cache ./nodebb .",
    "pretest": "npm run lint",
    "test": "istanbul cover node_modules/mocha/bin/_mocha -- -R dot",
    "coveralls": "istanbul cover _mocha --report lcovonly -- -R dot && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage"
  },
  "dependencies": {
-    "async": "~1.5.0",
-    "autoprefixer": "^6.2.3",
-    "bcryptjs": "~2.3.0",
+    "ace-builds": "^1.2.6",
+    "async": "2.4.1",
+    "autoprefixer": "7.1.1",
+    "bcryptjs": "2.4.3",
    "body-parser": "^1.9.0",
+    "bootstrap": "^3.3.7",
    "chart.js": "^2.4.0",
    "colors": "^1.1.0",
    "compression": "^1.1.0",
@@ -28,83 +30,85 @@
    "connect-flash": "^0.1.1",
    "connect-mongo": "1.3.2",
    "connect-multiparty": "^2.0.0",
-    "connect-redis": "~3.1.0",
+    "connect-redis": "3.3.0",
    "cookie-parser": "^1.3.3",
    "cron": "^1.0.5",
+    "cropperjs": "^0.8.1",
    "csurf": "^1.6.1",
    "daemon": "~1.1.0",
    "express": "^4.14.0",
    "express-session": "^1.8.2",
-    "express-useragent": "1.0.4",
-    "html-to-text": "2.1.3",
-    "ip": "1.1.3",
-    "jimp": "0.2.27",
+    "express-useragent": "1.0.7",
+    "html-to-text": "3.3.0",
+    "ip": "1.1.5",
+    "jimp": "0.2.28",
    "jquery": "^3.1.0",
    "json-2-csv": "^2.0.22",
    "less": "^2.0.0",
+    "lodash": "^4.17.4",
    "logrotate-stream": "^0.2.3",
-    "lru-cache": "4.0.1",
+    "lru-cache": "4.0.2",
    "mime": "^1.3.4",
    "minimist": "^1.1.1",
    "mkdirp": "~0.5.0",
-    "mongodb": "2.2.16",
+    "mongodb": "2.2.27",
    "morgan": "^1.3.2",
    "mousetrap": "^1.5.3",
    "nconf": "~0.8.2",
-    "nodebb-plugin-composer-default": "4.3.8",
-    "nodebb-plugin-dbsearch": "1.0.5",
+    "nodebb-plugin-composer-default": "5.0.5",
+    "nodebb-plugin-dbsearch": "2.0.6",
    "nodebb-plugin-emoji-extended": "1.1.1",
-    "nodebb-plugin-emoji-one": "1.1.5",
-    "nodebb-plugin-markdown": "7.0.3",
-    "nodebb-plugin-mentions": "1.1.3",
-    "nodebb-plugin-soundpack-default": "0.1.6",
-    "nodebb-plugin-spam-be-gone": "0.4.10",
+    "nodebb-plugin-emoji-one": "1.2.1",
+    "nodebb-plugin-markdown": "8.0.3",
+    "nodebb-plugin-mentions": "2.1.5",
+    "nodebb-plugin-soundpack-default": "1.0.0",
+    "nodebb-plugin-spam-be-gone": "0.5.0",
    "nodebb-rewards-essentials": "0.0.9",
-    "nodebb-theme-lavender": "3.0.15",
-    "nodebb-theme-persona": "4.1.95",
-    "nodebb-theme-vanilla": "5.1.59",
-    "nodebb-widget-essentials": "2.0.13",
+    "nodebb-theme-lavender": "4.0.5",
+    "nodebb-theme-persona": "5.0.16",
+    "nodebb-theme-slick": "1.1.0",
+    "nodebb-theme-vanilla": "6.0.13",
+    "nodebb-widget-essentials": "3.0.1",
    "nodemailer": "2.6.4",
    "nodemailer-sendmail-transport": "1.0.0",
    "nodemailer-smtp-transport": "^2.4.1",
    "passport": "^0.3.0",
    "passport-local": "1.0.0",
-    "postcss": "^5.0.13",
-    "postcss-clean": "^1.0.0",
+    "postcss": "6.0.1",
+    "postcss-clean": "1.0.2",
    "promise-polyfill": "^6.0.2",
    "prompt": "^1.0.0",
-    "redis": "~2.6.2",
-    "request": "^2.44.0",
-    "rimraf": "~2.5.0",
+    "redis": "2.7.1",
+    "request": "2.81.0",
+    "rimraf": "2.6.1",
    "rss": "^1.0.0",
    "sanitize-html": "^1.13.0",
    "semver": "^5.1.0",
    "serve-favicon": "^2.1.5",
    "sitemap": "^1.4.0",
-    "socket.io": "1.7.2",
-    "socket.io-client": "1.7.2",
-    "socket.io-redis": "3.1.0",
-    "socketio-wildcard": "~0.3.0",
+    "socket.io": "2.0.1",
+    "socket.io-client": "2.0.1",
+    "socket.io-redis": "5.0.1",
+    "socketio-wildcard": "2.0.0",
    "string": "^3.0.0",
-    "templates.js": "0.3.6",
+    "templates.js": "0.3.11",
    "toobusy-js": "^0.5.1",
-    "uglify-js": "^2.6.0",
-    "underscore": "^1.8.3",
-    "underscore.deep": "^0.5.1",
-    "validator": "^6.1.0",
+    "uglify-js": "^3.0.11",
+    "validator": "7.0.0",
    "winston": "^2.1.0",
-    "xregexp": "~3.1.0"
+    "xml": "^1.0.1",
+    "xregexp": "3.2.0",
+    "zxcvbn": "^4.4.2"
  },
  "devDependencies": {
    "coveralls": "^2.11.14",
    "eslint": "^3.12.0",
-    "eslint-config-airbnb": "^13.0.0",
-    "eslint-plugin-import": "^2.0.0",
-    "eslint-plugin-jsx-a11y": "^2.2.3",
-    "eslint-plugin-react": "^6.8.0",
+    "eslint-config-airbnb-base": "^11.1.0",
+    "eslint-plugin-import": "^2.2.0",
    "grunt": "~1.0.0",
    "grunt-contrib-watch": "^1.0.0",
    "istanbul": "^0.4.2",
+    "jsdom": "9.12.0",
    "mocha": "~3.2.0",
    "mocha-lcov-reporter": "^1.2.0",
    "xmlhttprequest": "1.8.0",
@@ -133,4 +137,4 @@
      "url": "https://github.com/barisusakli"
    }
  ]
-}
+}
--- a/public/.eslintrc
+++ b/public/.eslintrc
@@ -0,0 +1,58 @@
+{
+	"globals": {
+		"app": true,
+		"io": true,
+		"socket": true,
+		"ajaxify": true,
+		"config": true,
+		"RELATIVE_PATH": true,
+		"utils": true,
+		"overrides": true,
+		"componentHandler": true,
+		"bootbox": true,
+		"templates": true,
+		"Visibility": true,
+		"Tinycon": true,
+		"Promise": true
+	},
+	"env": {
+		"jquery": true,
+		"amd": true,
+		"browser": true,
+		"es6": false
+	},
+	"rules": {
+		"no-dupe-class-members": "off",
+		"no-var": "off",
+		"object-shorthand": "off",
+		"prefer-arrow-callback": "off",
+		"prefer-spread": "off",
+		"prefer-reflect": "off",
+		"prefer-template": "off"
+	},
+	"parserOptions": {
+		"ecmaVersion": 5,
+		"ecmaFeatures": {
+			"arrowFunctions": false,
+			"classes": false,
+			"defaultParams": false,
+			"destructuring": false,
+			"experimentalObjectRestSpread": false,
+			"blockBindings": false,
+			"forOf": false,
+			"generators": false,
+			"globalReturn": false,
+			"jsx": false,
+			"modules": false,
+			"objectLiteralComputedProperties": false,
+			"objectLiteralDuplicateProperties": false,
+			"objectLiteralShorthandMethods": false,
+			"objectLiteralShorthandProperties": false,
+			"impliedStrict": false,
+			"restParams": false,
+			"spread": false,
+			"superInFunctions": false,
+			"templateStrings": false
+		}
+	}
+}
--- a/public/.jshintrc
+++ b/public/.jshintrc
@@ -0,0 +1,84 @@
+{
+    "maxerr" : 50, // {int} Maximum error before stopping
+
+    // Enforcing
+    "bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.)
+    "camelcase" : false, // true: Identifiers must be in camelCase
+    "curly" : true, // true: Require {} for every new block or scope
+    "eqeqeq" : true, // true: Require triple equals (===) for comparison
+    "forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty()
+    "immed" : false, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
+    "indent" : 4, // {int} Number of spaces to use for indentation
+    "latedef" : false, // true: Require variables/functions to be defined before being used
+    "newcap" : false, // true: Require capitalization of all constructor functions e.g. `new F()`
+    "noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee`
+    "noempty" : true, // true: Prohibit use of empty blocks
+    "nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment)
+    "plusplus" : false, // true: Prohibit use of `++` & `--`
+    "quotmark" : false, // Quotation mark consistency:
+                                // false : do nothing (default)
+                                // true : ensure whatever is used is consistent
+                                // "single" : require single quotes
+                                // "double" : require double quotes
+    "undef" : true, // true: Require all non-global variables to be declared (prevents global leaks)
+    "unused" : true, // true: Require all defined variables be used
+    "strict" : true, // true: Requires all functions run in ES5 Strict Mode
+    "trailing" : false, // true: Prohibit trailing whitespaces
+    "maxparams" : false, // {int} Max number of formal params allowed per function
+    "maxdepth" : false, // {int} Max depth of nested blocks (within functions)
+    "maxstatements" : false, // {int} Max number statements per function
+    "maxcomplexity" : false, // {int} Max cyclomatic complexity per function
+    "maxlen" : false, // {int} Max number of characters per line
+
+    // Relaxing
+    "asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
+    "boss" : false, // true: Tolerate assignments where comparisons would be expected
+    "debug" : false, // true: Allow debugger statements e.g. browser breakpoints.
+    "eqnull" : false, // true: Tolerate use of `== null`
+    "es5" : false, // true: Allow ES5 syntax (ex: getters and setters)
+    "esnext" : false, // true: Allow ES.next (ES6) syntax (ex: `const`)
+    "moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features)
+                                 // (ex: `for each`, multiple try/catch, function expression…)
+    "evil" : false, // true: Tolerate use of `eval` and `new Function()`
+    "expr" : false, // true: Tolerate `ExpressionStatement` as Programs
+    "funcscope" : false, // true: Tolerate defining variables inside control statements"
+    "globalstrict" : false, // true: Allow global "use strict" (also enables 'strict')
+    "iterator" : false, // true: Tolerate using the `__iterator__` property
+    "lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block
+    "laxbreak" : false, // true: Tolerate possibly unsafe line breakings
+    "laxcomma" : false, // true: Tolerate comma-first style coding
+    "loopfunc" : false, // true: Tolerate functions being defined in loops
+    "multistr" : false, // true: Tolerate multi-line strings
+    "proto" : false, // true: Tolerate using the `__proto__` property
+    "scripturl" : false, // true: Tolerate script-targeted URLs
+    "smarttabs" : false, // true: Tolerate mixed tabs/spaces when used for alignment
+    "shadow" : false, // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
+    "sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation
+    "supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;`
+    "validthis" : false, // true: Tolerate using this in a non-constructor function
+
+	"globals": {
+		"app": true,
+		"io": true,
+		"socket": true,
+		"ajaxify": true,
+		"config": true,
+		"RELATIVE_PATH": true,
+		"utils": true,
+		"overrides": true,
+		"componentHandler": true,
+		"bootbox": true,
+		"templates": true,
+		"Visibility": true,
+		"Tinycon": true,
+		"require": true,
+		"define": true,
+        "ace": true,
+		"Sortable": true,
+		"Slideout": true,
+		"NProgress": true
+	},
+
+	"jquery": true,
+    "browser": true
+}
--- a/public/language/ar/admin/advanced/database.json
+++ b/public/language/ar/admin/advanced/database.json
@@ -1,6 +1,7 @@
 {
 	"x-b": "%1 b",
 	"x-mb": "%1 mb",
+	"x-gb": "%1 gb",
 	"uptime-seconds": "Uptime in Seconds",
 	"uptime-days": "Uptime in Days",

--- a/public/language/ar/admin/advanced/errors.json
+++ b/public/language/ar/admin/advanced/errors.json
@@ -8,7 +8,7 @@
 	"clear-error-log": "Clear Error Log",
 	"route": "Route",
 	"count": "Count",
-	"no-routes-not-found": "Hooray! There are no routes that were not found.",
+	"no-routes-not-found": "Hooray! No 404 errors!",
 	"clear404-confirm": "Are you sure you wish to clear the 404 error logs?",
 	"clear404-success": "\"404 Not Found\" errors cleared"
 }
--- a/public/language/ar/admin/appearance/customise.json
+++ b/public/language/ar/admin/appearance/customise.json
@@ -5,5 +5,8 @@

 	"custom-header": "Custom Header",
 	"custom-header.description": "Enter custom HTML here (ex. JavaScript, Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup.",
-	"custom-header.enable": "Enable Custom Header"
+	"custom-header.enable": "Enable Custom Header",
+
+	"custom-css.livereload": "Enable Live Reload",
+	"custom-css.livereload.description": "Enable this to force all sessions on every device under your account to refresh whenever you click save"
 }
--- a/public/language/ar/admin/development/info.json
+++ b/public/language/ar/admin/development/info.json
@@ -1,10 +1,12 @@
 {
 	"you-are-on": "Info - You are on <strong>%1:%2</strong>",
+	"nodes-responded": "%1 nodes responded within %2ms!",
 	"host": "host",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "online",
 	"git": "git",
+	"memory": "memory",
 	"load": "load",
 	"uptime": "uptime",

--- a/public/language/ar/admin/extend/plugins.json
+++ b/public/language/ar/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",

 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
--- a/public/language/ar/admin/general/dashboard.json
+++ b/public/language/ar/admin/general/dashboard.json
@@ -2,24 +2,38 @@
 	"forum-traffic": "Forum Traffic",
 	"page-views": "Page Views",
 	"unique-visitors": "Unique Visitors",
-	"page-views-last-month": "Page views Last Month",
-	"page-views-this-month": "Page views This Month",
-	"page-views-last-day": "Page views in last 24 hours",
+	"users": "Users",
+	"posts": "Posts",
+	"topics": "Topics",
+	"page-views-seven": "Last 7 Days",
+	"page-views-thirty": "Last 30 Days",
+	"page-views-last-day": "Last 24 hours",
+	"page-views-custom": "Custom Date Range",
+	"page-views-custom-start": "Range Start",
+	"page-views-custom-end": "Range End",
+	"page-views-custom-help": "Enter a date range of page views you would like to view. If no date picker is available, the accepted format is <code>YYYY-MM-DD</code>",
+	"page-views-custom-error": "Please enter a valid date range in the format <code>YYYY-MM-DD</code>",

 	"stats.day": "Day",
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
+	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",

 	"notices": "Notices",
+	"restart-not-required": "Restart not required",
+	"restart-required": "Restart required",
+	"search-plugin-installed": "Search Plugin installed",
+	"search-plugin-not-installed": "Search Plugin not installed",
+	"search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality",

 	"control-panel": "System Control",
 	"reload": "Reload",
@@ -52,4 +66,4 @@
 	"graphs.unique-visitors": "Unique Visitors",
 	"graphs.registered-users": "Registered Users",
 	"graphs.anonymous-users": "Anonymous Users"
-}
+}
--- a/public/language/ar/admin/general/languages.json
+++ b/public/language/ar/admin/general/languages.json
@@ -1,5 +1,6 @@
 {
 	"language-settings": "Language Settings",
 	"description": "The default language determines the language settings for all users who are visiting your forum. <br />Individual users can override the default language on their account settings page.",
-	"default-language": "Default Language"
+	"default-language": "Default Language",
+	"auto-detect": "Auto Detect Language Setting for Guests"
 }
--- a/public/language/ar/admin/manage/categories.json
+++ b/public/language/ar/admin/manage/categories.json
@@ -10,6 +10,7 @@
 	"custom-class": "Custom Class",
 	"num-recent-replies": "# of Recent Replies",
 	"ext-link": "External Link",
+	"is-section": "Treat this category as a section",
 	"upload-image": "Upload Image",
 	"delete-image": "Remove",
 	"category-image": "Category Image",
--- a/public/language/ar/admin/manage/flags.json
+++ b/public/language/ar/admin/manage/flags.json
@@ -1,19 +0,0 @@
-{
-	"daily": "Daily flags",
-	"by-user": "Flags by user",
-	"by-user-search": "Search flagged posts by username",
-	"category": "Category",
-	"sort-by": "Sort By",
-	"sort-by.most-flags": "Most Flags",
-	"sort-by.most-recent": "Most Recent",
-	"search": "Search",
-	"dismiss-all": "Dismiss All",
-	"none-flagged": "No flagged posts!",
-	"posted-in": "Posted in %1",
-	"read-more": "Read More",
-	"flagged-x-times": "This post has been flagged %1 time(s):",
-	"dismiss": "Dismiss this Flag",
-	"delete-post": "Delete the Post",
-
-	"alerts.confirm-delete-post": "Do you really want to delete this post?"
-}
--- a/public/language/ar/admin/manage/groups.json
+++ b/public/language/ar/admin/manage/groups.json
@@ -1,6 +1,7 @@
 {
 	"name": "Group Name",
 	"description": "Group Description",
+	"member-count": "Member Count",
 	"system": "System Group",
 	"edit": "Edit",
 	"search-placeholder": "Search",
--- a/public/language/ar/admin/menu.json
+++ b/public/language/ar/admin/menu.json
@@ -13,7 +13,6 @@
 	"manage/users": "Users",
 	"manage/registration": "Registration Queue",
 	"manage/groups": "Groups",
-	"manage/flags": "Flags",
 	"manage/ip-blacklist": "IP Blacklist",

 	"section-settings": "Settings",
--- a/public/language/ar/admin/settings/advanced.json
+++ b/public/language/ar/admin/settings/advanced.json
@@ -6,7 +6,7 @@
 	"headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame",
 	"headers.powered-by": "Customise the \"Powered By\" header sent by NodeBB",
 	"headers.acao": "Access-Control-Allow-Origin",
-	"headers.acao-help": "To deny access to all sites, leave empty or set to <code>null</code>",
+	"headers.acao-help": "To deny access to all sites, leave empty",
 	"headers.acam": "Access-Control-Allow-Methods",
 	"headers.acah": "Access-Control-Allow-Headers",
 	"traffic-management": "Traffic Management",
--- a/public/language/ar/admin/settings/general.json
+++ b/public/language/ar/admin/settings/general.json
@@ -26,5 +26,7 @@
 	"touch-icon.upload": "Upload",
 	"touch-icon.help": "Recommended size and format: 192x192, PNG format only. If no touch icon is specified, NodeBB will fall back to using the favicon.",
 	"outgoing-links": "Outgoing Links",
-	"outgoing-links.warning-page": "Use Outgoing Links Warning Page"
+	"outgoing-links.warning-page": "Use Outgoing Links Warning Page",
+	"search-default-sort-by": "Search default sort by",
+	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page"
 }
--- a/public/language/ar/admin/settings/post.json
+++ b/public/language/ar/admin/settings/post.json
@@ -29,6 +29,8 @@
 	"unread": "Unread Settings",
 	"unread.cutoff": "Unread cutoff days",
 	"unread.min-track-last": "Minimum posts in topic before tracking last read",
+	"recent": "Recent Settings",
+	"recent.categoryFilter.disable": "Disable filtering of topics in ignored categories on the /recent page",
 	"signature": "Signature Settings",
 	"signature.disable": "Disable signatures",
 	"signature.no-links": "Disable links in signatures",
--- a/public/language/ar/admin/settings/reputation.json
+++ b/public/language/ar/admin/settings/reputation.json
@@ -2,6 +2,7 @@
 	"reputation": "Reputation Settings",
 	"disable": "Disable Reputation System",
 	"disable-down-voting": "Disable Down Voting",
+	"votes-are-public": "All Votes Are Public",
 	"thresholds": "Activity Thresholds",
 	"min-rep-downvote": "Minimum reputation to downvote posts",
 	"min-rep-flag": "Minimum reputation to flag posts"
--- a/public/language/ar/admin/settings/uploads.json
+++ b/public/language/ar/admin/settings/uploads.json
@@ -5,11 +5,11 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
-	"allowed-file-extensions-help": "Enter comma-separated list of file extensions here (e.g. <code>pdf,xls,doc</code>).\n\t\t\t\t\tAn empty list means all extensions are allowed.",
+	"allowed-file-extensions-help": "Enter comma-separated list of file extensions here (e.g. <code>pdf,xls,doc</code>). An empty list means all extensions are allowed.",
 	"profile-avatars": "Profile Avatars",
 	"allow-profile-image-uploads": "Allow users to upload profile images",
 	"convert-profile-image-png": "Convert profile image uploads to PNG",
@@ -18,11 +18,11 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
 	"default-covers-help": "Add comma-separated default cover images for accounts that don't have an uploaded cover image"
-}
+}
--- a/public/language/ar/admin/settings/user.json
+++ b/public/language/ar/admin/settings/user.json
@@ -34,9 +34,12 @@
 	"registration.max-invites": "Maximum Invitations per User",
 	"max-invites": "Maximum Invitations per User",
 	"max-invites-help": "0 for no restriction. Admins get infinite invitations<br>Only applicable for \"Invite Only\"",
+	"invite-expiration": "Invite expiration",
+	"invite-expiration-help": "# of days invitations expire in.",
 	"min-username-length": "Minimum Username Length",
 	"max-username-length": "Maximum Username Length",
 	"min-password-length": "Minimum Password Length",
+	"min-password-strength": "Minimum Password Strength",
 	"max-about-me-length": "Maximum About Me Length",
 	"terms-of-use": "Forum Terms of Use <small>(Leave blank to disable)</small>",
 	"user-search": "User Search",
--- a/public/language/ar/email.json
+++ b/public/language/ar/email.json
@@ -32,5 +32,9 @@
    "notif.post.unsub.info": "تم إشعارك بهذه المشاركة بناءً على الخيارات التي سبق وأن حددتها.",
    "test.text1": "هذه رسالة تجريبية للتأكد من صحة إعدادت الرسائل الإلكترونية في منتدى NodeBB خاصتك.",
    "unsub.cta": "انقر هنا لتغيير تلك الإعدادات",
+    "banned.subject": "You have been banned from %1",
+    "banned.text1": "The user %1 has been banned from %2.",
+    "banned.text2": "This ban will last until %1.",
+    "banned.text3": "This is the reason why you have been banned:",
    "closing": "شكرًا لك!"
 }
--- a/public/language/ar/error.json
+++ b/public/language/ar/error.json
@@ -1,5 +1,6 @@
 {
    "invalid-data": "بيانات غير صحيحة",
+    "invalid-json": "Invalid JSON",
    "not-logged-in": "لم تقم بتسجيل الدخول",
    "account-locked": "تم حظر حسابك مؤقتًا.",
    "search-requires-login": "البحث في المنتدى يتطلب حساب - الرجاء تسجيل الدخول أو التسجيل",
@@ -12,6 +13,7 @@
    "invalid-title": "عنوان غير صحيح",
    "invalid-user-data": "بيانات المستخدم غير صحيحة",
    "invalid-password": "كلمة السر غير مقبولة",
+    "invalid-login-credentials": "Invalid login credentials",
    "invalid-username-or-password": "المرجود تحديد اسم مستخدم و كلمة مرور",
    "invalid-search-term": "كلمة البحث غير صحيحة",
    "csrf-invalid": "لم تتمكن من تسجيل الدخول. هنالك أحتمال ان جلستك انتهت. رجاءًا حاول مرة اخرى.",
@@ -30,6 +32,7 @@
    "password-too-long": "كلمة السر طويلة ",
    "user-banned": "المستخدم محظور",
    "user-banned-reason": "Sorry, this account has been banned (Reason: %1)",
+    "user-banned-reason-until": "Sorry, this account has been banned until %1 (Reason: %2)",
    "user-too-new": "عذرا, يجب أن تنتظر 1% ثواني قبل قيامك بأول مشاركة",
    "blacklisted-ip": "نأسف، لقد تم حظرك من استخدام وتصفح المنتدى. إذا كنت تعتقد أن هذا خطأ رجاءًا اتصل بالإدارة. ",
    "ban-expiry-missing": "رجاءًا ضع تاريخ نهاية الحظر. ",
@@ -104,7 +107,7 @@
    "chat-disabled": "نظام المحادثة معطل.",
    "too-many-messages": "لقد أرسلت الكثير من الرسائل، الرجاء اﻹنتظار قليلاً",
    "invalid-chat-message": "الرسالة غير صالحة.",
-    "chat-message-too-long": "الرسالة طويلة.",
+    "chat-message-too-long": "Chat messages can not be longer than %1 characters.",
    "cant-edit-chat-message": "غير مصرح لك بتعديل الرسالة.",
    "cant-remove-last-user": "لأيمكنك إزالت اخر مستخدم.",
    "cant-delete-chat-message": "غير مصرح لك بحذف الرسالة.",
--- a/public/language/ar/flags.json
+++ b/public/language/ar/flags.json
@@ -0,0 +1,60 @@
+{
+	"state": "State",
+	"reporter": "Reporter",
+	"reported-at": "Reported At",
+	"description": "Description",
+	"no-flags": "Hooray! No flags found.",
+	"assignee": "Assignee",
+	"update": "Update",
+	"updated": "Updated",
+	"target-purged": "The content this flag referred to has been purged and is no longer available.",
+
+	"quick-filters": "Quick Filters",
+	"filter-active": "There are one or more filters active in this list of flags",
+	"filter-reset": "Remove Filters",
+	"filters": "Filter Options",
+	"filter-reporterId": "Reporter UID",
+	"filter-targetUid": "Flagged UID",
+	"filter-type": "Flag Type",
+	"filter-type-all": "All Content",
+	"filter-type-post": "Post",
+	"filter-state": "State",
+	"filter-assignee": "Assignee UID",
+	"filter-cid": "Category",
+	"filter-quick-mine": "Assigned to me",
+	"filter-cid-all": "All categories",
+	"apply-filters": "Apply Filters",
+
+	"quick-links": "Quick Links",
+	"flagged-user": "Flagged User",
+	"view-profile": "View Profile",
+	"start-new-chat": "Start New Chat",
+	"go-to-target": "View Flag Target",
+
+	"user-view": "View Profile",
+	"user-edit": "Edit Profile",
+
+	"notes": "Flag Notes",
+	"add-note": "Add Note",
+	"no-notes": "No shared notes.",
+
+	"history": "Flag History",
+	"back": "Back to Flags List",
+	"no-history": "No flag history.",
+
+	"state-all": "All states",
+	"state-open": "New/Open",
+	"state-wip": "Work in Progress",
+	"state-resolved": "Resolved",
+	"state-rejected": "Rejected",
+	"no-assignee": "Not Assigned",
+	"note-added": "Note Added",
+
+	"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.",
+	"modal-reason-spam": "Spam",
+	"modal-reason-offensive": "Offensive",
+	"modal-reason-custom": "Reason for reporting this content...",
+	"modal-submit": "Submit Report",
+	"modal-submit-success": "Content has been flagged for moderation."
+}
--- a/public/language/ar/global.json
+++ b/public/language/ar/global.json
@@ -103,5 +103,7 @@
    "cookies.message": "This website uses cookies to ensure you get the best experience on our website.",
    "cookies.accept": "Got it!",
    "cookies.learn_more": "Learn More",
-    "edited": "Edited"
+    "edited": "Edited",
+    "disabled": "Disabled",
+    "select": "Select"
 }
--- a/public/language/ar/groups.json
+++ b/public/language/ar/groups.json
@@ -27,6 +27,7 @@
    "details.disableJoinRequests": "Disable join requests",
    "details.grant": "منح/سحب المِلكية",
    "details.kick": "طرد",
+    "details.kick_confirm": "Are you sure you want to remove this member from the group?",
    "details.owner_options": "إدارة المجموعة",
    "details.group_name": "اسم المجموعة",
    "details.member_count": "عدد اﻷعضاء",
--- a/public/language/ar/modules.json
+++ b/public/language/ar/modules.json
@@ -20,6 +20,7 @@
    "chat.three_months": "3 أشهر",
    "chat.delete_message_confirm": "هل أنت متأكد من أنك تريد حذف هذه الرسالة؟",
    "chat.add-users-to-room": "Add users to room",
+    "chat.confirm-chat-with-dnd-user": "This user has set their status to DnD(Do not disturb). Do you still want to chat with them?",
    "composer.compose": "اكتب",
    "composer.show_preview": "عرض المعاينة",
    "composer.hide_preview": "إخفاء المعاينة",
--- a/public/language/ar/notifications.json
+++ b/public/language/ar/notifications.json
@@ -10,6 +10,15 @@
    "return_to": "عودة إى %1",
    "new_notification": "تنبيه جديد",
    "you_have_unread_notifications": "لديك تنبيهات غير مقروءة.",
+    "all": "All",
+    "topics": "Topics",
+    "replies": "Replies",
+    "chat": "Chats",
+    "follows": "Follows",
+    "upvote": "Upvotes",
+    "new-flags": "New Flags",
+    "my-flags": "Flags assigned to me",
+    "bans": "Bans",
    "new_message_from": "رسالة جديدة من <strong>%1</strong>",
    "upvoted_your_post_in": "<strong>%1</strong> أضاف صوتًا إيجابيا إلى مشاركتك في <strong>%2</strong>.",
    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
@@ -19,6 +28,9 @@
    "user_flagged_post_in": "<strong>%1</strong> أشعَرَ بمشاركة مخلة في <strong>%2</strong>",
    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
+    "user_flagged_user": "<strong>%1</strong> flagged a user profile (%2)",
+    "user_flagged_user_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a user profile (%3)",
+    "user_flagged_user_multiple": "<strong>%1</strong> and %2 others flagged a user profile (%3)",
    "user_posted_to": "<strong>%1</strong> أضاف ردا إلى: <strong>%2</strong>",
    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
@@ -28,6 +40,7 @@
    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
    "new_register": "<strong>%1</strong> sent a registration request.",
    "new_register_multiple": "There are <strong>%1</strong> registration requests awaiting review.",
+    "flag_assigned_to_you": "<strong>Flag %1</strong> has been assigned to you",
    "email-confirmed": "تم التحقق من عنوان البريد الإلكتروني",
    "email-confirmed-message": "شكرًا على إثبات صحة عنوان بريدك الإلكتروني. صار حسابك مفعلًا بالكامل.",
    "email-confirm-error-message": "حدث خطأ أثناء التحقق من عنوان بريدك الإلكتروني. ربما رمز التفعيل خاطئ أو انتهت صلاحيته.",
--- a/public/language/ar/pages.json
+++ b/public/language/ar/pages.json
@@ -6,7 +6,7 @@
    "popular-month": "المواضيع الشائعة هذا الشهر",
    "popular-alltime": "المواضيع الشائعة منذ القدم",
    "recent": "المواضيع الحديثة",
-    "flagged-posts": "Flagged Posts",
+    "flagged-content": "Flagged Content",
    "ip-blacklist": "IP Blacklist",
    "users/online": "اﻷعضاء المتصلون",
    "users/latest": "أحدث اﻷعضاء",
@@ -27,6 +27,8 @@
    "group": "%1 مجموعة",
    "chats": "محادثات",
    "chat": "Chatting with %1",
+    "flags": "Flags",
+    "flag-details": "Flag %1 Details",
    "account/edit": "Editing \"%1\"",
    "account/edit/password": "Editing password of \"%1\"",
    "account/edit/username": "Editing username of \"%1\"",
--- a/public/language/ar/search.json
+++ b/public/language/ar/search.json
@@ -12,6 +12,7 @@
    "reply-count": "عدد المشاركات",
    "at-least": "على اﻷقل",
    "at-most": "على اﻷكثر",
+    "relevance": "Relevance",
    "post-time": "تاريخ المشاركة",
    "newer-than": "أحدث من",
    "older-than": "أقدم من",
--- a/public/language/ar/topic.json
+++ b/public/language/ar/topic.json
@@ -13,7 +13,9 @@
    "notify_me": "تلق تنبيهات بالردود الجديدة في هذا الموضوع",
    "quote": "اقتبس",
    "reply": "رد",
-    "replies_to_this_post": "Replies: %1",
+    "replies_to_this_post": "%1 Replies",
+    "one_reply_to_this_post": "1 Reply",
+    "last_reply_time": "Last reply",
    "reply-as-topic": "رد بموضوع",
    "guest-login-reply": "يجب عليك تسجيل الدخول للرد",
    "edit": "تعديل",
@@ -25,28 +27,11 @@
    "link": "رابط",
    "share": "نشر",
    "tools": "أدوات",
-    "flag": "تبليغ",
    "locked": "مقفل",
    "pinned": "مثبت",
    "moved": "منقول",
    "bookmark_instructions": "اضغط هنا للعودة لأخر مشاركة مقروءة في الموضوع",
    "flag_title": "إشعار بمشاركة مخلة.",
-    "flag_success": "تم الإشعار بهذه المشاركة على أنها مخلة",
-    "flag_manage_title": "Flagged post in %1",
-    "flag_manage_history": "Action History",
-    "flag_manage_no_history": "No event history to report",
-    "flag_manage_assignee": "Assignee",
-    "flag_manage_state": "State",
-    "flag_manage_state_open": "New/Open",
-    "flag_manage_state_wip": "Work in Progress",
-    "flag_manage_state_resolved": "Resolved",
-    "flag_manage_state_rejected": "Rejected",
-    "flag_manage_notes": "Shared Notes",
-    "flag_manage_update": "Update Flag Status",
-    "flag_manage_history_assignee": "Assigned to %1",
-    "flag_manage_history_state": "Updated state to %1",
-    "flag_manage_history_notes": "Updated flag notes",
-    "flag_manage_saved": "Flag Details Updated",
    "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.",
@@ -74,6 +59,7 @@
    "thread_tools.unlock": "إلغاء إقفال الموضوع",
    "thread_tools.move": "نقل الموضوع",
    "thread_tools.move_all": "نقل الكل",
+    "thread_tools.select_category": "Select Category",
    "thread_tools.fork": "إنشاء فرع الموضوع",
    "thread_tools.delete": "حذف الموضوع",
    "thread_tools.delete-posts": "مشاركات محذوفة",
@@ -87,7 +73,6 @@
    "post_restore_confirm": "هل أنت متأكد أنك تريد استعادة هذه المشاركة؟",
    "post_purge_confirm": "هل أنت متأكد أنك تريد تطهير هذه المشاركة؟",
    "load_categories": "تحميل الفئات",
-    "disabled_categories_note": "الفئات المعطلة رمادية",
    "confirm_move": "انقل",
    "confirm_fork": "فرع",
    "bookmark": "Bookmark",
@@ -99,7 +84,6 @@
    "move_post": "نقل المشاركة",
    "post_moved": "تم نقل المشاركة",
    "fork_topic": "فرع الموضوع",
-    "topic_will_be_moved_to": "هذا الموضوع سوف ينقل إلى فئة",
    "fork_topic_instruction": "إضغط على المشاركات التي تريد تفريعها",
    "fork_no_pids": "لم تختر أي مشاركة",
    "fork_pid_count": "1% مشاركة محددة",
@@ -131,8 +115,5 @@
    "stale.warning": "The topic you are replying to is quite old. Would you like to create a new topic instead, and reference this one in your reply?",
    "stale.create": "موضوع جديد",
    "stale.reply_anyway": "الرد على هذا الموضوع ",
-    "link_back": "رد:  [%1](%2)",
-    "spam": "سبام",
-    "offensive": "مسيئ",
-    "custom-flag-reason": "أدخل سبب التبليغ"
+    "link_back": "رد:  [%1](%2)"
 }
--- a/public/language/ar/user.json
+++ b/public/language/ar/user.json
@@ -33,6 +33,7 @@
    "chat": "محادثة",
    "chat_with": "Continue chat with %1",
    "new_chat_with": "Start new chat with %1",
+    "flag-profile": "Flag Profile",
    "follow": "تابع",
    "unfollow": "إلغاء المتابعة",
    "more": "المزيد",
@@ -59,11 +60,14 @@
    "username_taken_workaround": "اسم المستخدم الذي اخترته سبق أخذه، لذا تم تغييره قليلا. أن الآن مسجل تحت الاسم <strong>%1</strong>",
    "password_same_as_username": "Your password is the same as your username, please select another password.",
    "password_same_as_email": "Your password is the same as your email, please select another password.",
+    "weak_password": "Weak password.",
    "upload_picture": "ارفع الصورة",
    "upload_a_picture": "رفع صورة",
    "remove_uploaded_picture": "Remove Uploaded Picture",
    "upload_cover_picture": "Upload cover picture",
    "remove_cover_picture_confirm": "Are you sure you want to remove the cover picture?",
+    "crop_picture": "Crop picture",
+    "upload_cropped_picture": "Crop and upload",
    "settings": "خيارات",
    "show_email": "أظهر بريدي الإلكتروني",
    "show_fullname": "أظهر اسمي الكامل",
@@ -127,5 +131,6 @@
    "info.username-history": "Username History",
    "info.email-history": "Email History",
    "info.moderation-note": "Moderation Note",
-    "info.moderation-note.success": "Moderation note saved"
+    "info.moderation-note.success": "Moderation note saved",
+    "info.moderation-note.add": "Add note"
 }
--- a/public/language/bg/admin/advanced/database.json
+++ b/public/language/bg/admin/advanced/database.json
@@ -1,6 +1,7 @@
 {
 	"x-b": "%1 Б",
 	"x-mb": "%1 МБ",
+	"x-gb": "%1 ГБ",
 	"uptime-seconds": "Активно време в секунди",
 	"uptime-days": "Активно време в дни",

--- a/public/language/bg/admin/advanced/errors.json
+++ b/public/language/bg/admin/advanced/errors.json
@@ -8,7 +8,7 @@
 	"clear-error-log": "Изчистване на журнала за грешки",
 	"route": "Маршрут",
 	"count": "Брой",
-	"no-routes-not-found": "Ура! Няма неоткрити маршрути.",
+	"no-routes-not-found": "Ура! Няма грешки от вида „404“!",
 	"clear404-confirm": "Наистина ли искате да изчистите журналите за грешки от вида 404?",
 	"clear404-success": "Грешките от вида „Страницата не е намерена (Грешка 404)“ бяха изчистени."
 }
--- a/public/language/bg/admin/appearance/customise.json
+++ b/public/language/bg/admin/appearance/customise.json
@@ -5,5 +5,8 @@

 	"custom-header": "Персонализирана заглавна част",
 	"custom-header.description": "Въведете своя персонализиран код HTML тук (напр. JavaScript, елементи „meta“ и т.н.), те ще бъдат добавени към секцията <code>&lt;head&gt;</code> в кода на Вашия форум.",
-	"custom-header.enable": "Включване на персонализирана заглавна част"
+	"custom-header.enable": "Включване на персонализирана заглавна част",
+
+	"custom-css.livereload": "Включване на моменталното презареждане",
+	"custom-css.livereload.description": "Ако включите това, всички сесии на всяко устройство, където използвате акаунта си, ще се презареждат, когато натискате „Запазване“."
 }
--- a/public/language/bg/admin/development/info.json
+++ b/public/language/bg/admin/development/info.json
@@ -1,10 +1,12 @@
 {
 	"you-are-on": "Информация — Вие сте на <strong>%1:%2</strong>",
+	"nodes-responded": "%1 възела отговориха в рамките на %2мсек!",
 	"host": "сървър",
 	"pid": "ид. на процеса",
 	"nodejs": "nodejs",
 	"online": "на линия",
 	"git": "git",
+	"memory": "памет",
 	"load": "натоварване",
 	"uptime": "активно време",

--- a/public/language/bg/admin/extend/plugins.json
+++ b/public/language/bg/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Пренареждане на добавките",
 	"order-active": "Подреждане на включените добавки",
 	"dev-interested": "Искате ли да пишете добавки за NodeBB?",
-	"docs-info": "Документацията за създаване на добавки може да бъде открита в <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">страницата с документация на NodeBB</a>.",
+	"docs-info": "Пълната документация относно създаването на добавки може да бъде намерена в <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">портала за документация на NodeBB</a>.",

 	"order.description": "Някои добавки работят най-добре, ако бъдат инсталирани преди или след други добавки.",
 	"order.explanation": "Добавките се зареждат в реда, посочен тук, от горе надолу.",
-	
+
 	"plugin-item.themes": "Теми",
 	"plugin-item.deactivate": "Изключване",
 	"plugin-item.activate": "Включване",
--- a/public/language/bg/admin/general/dashboard.json
+++ b/public/language/bg/admin/general/dashboard.json
@@ -2,24 +2,38 @@
 	"forum-traffic": "Трафик на форума",
 	"page-views": "Преглеждания на страниците",
 	"unique-visitors": "Уникални посетители",
-	"page-views-last-month": "Преглеждания на страниците през последния месец",
-	"page-views-this-month": "Преглеждания на страниците този месец",
-	"page-views-last-day": "Преглеждания на страниците през последните 24 часа",
+	"users": "Потребители",
+	"posts": "Публикации",
+	"topics": "Теми",
+	"page-views-seven": "Последните 7 дни",
+	"page-views-thirty": "Последните 30 дни",
+	"page-views-last-day": "Последните 24 часа",
+	"page-views-custom": "Интервал по избор",
+	"page-views-custom-start": "Начална дата",
+	"page-views-custom-end": "Крайна дата",
+	"page-views-custom-help": "Въведете интервал от дати, за които искате да видите преглежданията на страниците. Ако не се появи календар за избор, можете да въведете датите във формат: <code>ГГГГ-ММ-ДД</code>",
+	"page-views-custom-error": "Моля, въведете правилен интервал от дати във формата: <code>ГГГГ-ММ-ДД</code>",

 	"stats.day": "Ден",
 	"stats.week": "Седмица",
 	"stats.month": "Месец",
 	"stats.all": "От началото",
-	
+
 	"updates": "Обновления",
 	"running-version": "Вие използвате <strong>NodeBB версия <span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Стремете се винаги да използвате най-новата версия на NodeBB, за да се възползвате от последните подобрения на сигурността и поправки на проблеми.",
 	"up-to-date": "<p>Вие използвате <strong>най-новата версия</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>Има нова версия (версия %1). Ако имате възможност, <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">обновете NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>Това е остаряла версия за предварителен преглед на NodeBB. Има нова версия (версия %1). Ако имате възможност, <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">обновете NodeBB</a>.</p>",
+	"upgrade-available": "<p>Има нова версия (версия %1). Ако имате възможност, <a href=\"https://docs.nodebb.org/configuring/upgrade/\">обновете NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>Това е остаряла предварителна версия на NodeBB. Има нова версия (версия %1). Ако имате възможност, <a href=\"https://docs.nodebb.org/configuring/upgrade/\">обновете NodeBB</a>.</p>",
 	"prerelease-warning": "<p>Това е версия за <strong>предварителен преглед</strong> на NodeBB. Възможно е да има неочаквани неизправности. <i class=\"fa fa-exclamation-triangle\"></i></p>",
+	"running-in-development": "<span>Форумът работи в режим за разработчици, така че може да бъде уязвим. Моля, свържете се със системния си администратор.</span>",

 	"notices": "Забележки",
+	"restart-not-required": "Не се изисква рестартиране",
+	"restart-required": "Изисква се рестартиране",
+	"search-plugin-installed": "Добавката за търсене е инсталирана",
+	"search-plugin-not-installed": "Добавката за търсене не е инсталирана",
+	"search-plugin-tooltip": "Инсталирайте добавка за търсене от страницата с добавките, за да включите функционалността за търсене",

 	"control-panel": "Системен контрол",
 	"reload": "Презареждане",
@@ -52,4 +66,4 @@
 	"graphs.unique-visitors": "Уникални посетители",
 	"graphs.registered-users": "Регистрирани потребители",
 	"graphs.anonymous-users": "Анонимни потребители"
-}
+}
--- a/public/language/bg/admin/general/languages.json
+++ b/public/language/bg/admin/general/languages.json
@@ -1,5 +1,6 @@
 {
 	"language-settings": "Езикови настройки",
 	"description": "Езикът по подразбиране определя езиковите настройки за всички потребители, които посещават Вашия форум. <br />Отделните потребители могат да сменят езика си от страницата с настройки на профила си.",
-	"default-language": "Език по подразбиране"
+	"default-language": "Език по подразбиране",
+	"auto-detect": "Автоматично разпознаване на езика за гостите"
 }
--- a/public/language/bg/admin/manage/categories.json
+++ b/public/language/bg/admin/manage/categories.json
@@ -10,6 +10,7 @@
 	"custom-class": "Персонализиран клас",
 	"num-recent-replies": "Брой на скорошните отговори",
 	"ext-link": "Външна връзка",
+	"is-section": "Използване на тази категория като раздел",
 	"upload-image": "Качване на изображение",
 	"delete-image": "Премахване",
 	"category-image": "Изображение на категорията",
@@ -59,7 +60,7 @@
 	"alert.copy-success": "Настройките са копирани!",
 	"alert.set-parent-category": "Задаване на базова категория",
 	"alert.updated": "Обновени категории",
-	"alert.updated-success": "Category IDs %1 successfully updated.",
+	"alert.updated-success": "Категориите с идентификатори %1 са обновени успешно.",
 	"alert.upload-image": "Качване на изображение за категорията",
 	"alert.find-user": "Търсене на потребител",
 	"alert.user-search": "Потърсете потребител тук…",
--- a/public/language/bg/admin/manage/flags.json
+++ b/public/language/bg/admin/manage/flags.json
@@ -1,19 +0,0 @@
-{
-	"daily": "Дневни доклади",
-	"by-user": "Доклади по потребител",
-	"by-user-search": "Търсене на докладвани публикации по потребителско име",
-	"category": "Категория",
-	"sort-by": "Подреждане по",
-	"sort-by.most-flags": "Най-много доклади",
-	"sort-by.most-recent": "Най-скорошни",
-	"search": "Търсене",
-	"dismiss-all": "Премахване на всички",
-	"none-flagged": "Няма докладвани публикации!",
-	"posted-in": "Публикувано в %1",
-	"read-more": "Прочетете повече",
-	"flagged-x-times": "Тази публикация е докладвана %1 път(и):",
-	"dismiss": "Премахване на този доклад",
-	"delete-post": "Изтриване на публикацията",
-
-	"alerts.confirm-delete-post": "Наистина ли искате да изтриете тази публикация?"
-}
--- a/public/language/bg/admin/manage/groups.json
+++ b/public/language/bg/admin/manage/groups.json
@@ -1,6 +1,7 @@
 {
 	"name": "Име на групата",
 	"description": "Описание на групата",
+	"member-count": "Брой на членовете",
 	"system": "Системна група",
 	"edit": "Редактиране",
 	"search-placeholder": "Търсене",
--- a/public/language/bg/admin/menu.json
+++ b/public/language/bg/admin/menu.json
@@ -13,7 +13,6 @@
 	"manage/users": "Потребители",
 	"manage/registration": "Регистрационна опашка",
 	"manage/groups": "Групи",
-	"manage/flags": "Доклади",
 	"manage/ip-blacklist": "Черен списък за IP адреси",

 	"section-settings": "Настройки",
--- a/public/language/bg/admin/settings/advanced.json
+++ b/public/language/bg/admin/settings/advanced.json
@@ -6,7 +6,7 @@
 	"headers.allow-from": "Задайте „ALLOW-FROM“, за да поставите NodeBB в „iFrame“",
 	"headers.powered-by": "Персонализиране на заглавната част „Захранван от“, която се изпраща от NodeBB",
 	"headers.acao": "Произход за разрешаване на управлението на достъпа",
-	"headers.acao-help": "За да забраните достъпа до всички уеб сайтове, оставете празно или задайте <code>null</code>",
+	"headers.acao-help": "За да забраните достъпа до всички уеб сайтове, оставете празно",
 	"headers.acam": "Методи за разрешаване на управлението на достъпа",
 	"headers.acah": "Заглавки за разрешаване на управлението на достъпа",
 	"traffic-management": "Управление на трафика",
--- a/public/language/bg/admin/settings/general.json
+++ b/public/language/bg/admin/settings/general.json
@@ -26,5 +26,7 @@
 	"touch-icon.upload": "Качване",
 	"touch-icon.help": "Препоръчителен размер и формат: 192x192, само във формат „PNG“. Ако не е посочена иконка за начален екран на мобилно устройство, NodeBB ще използва иконката на уеб сайта.",
 	"outgoing-links": "Изходящи връзки",
-	"outgoing-links.warning-page": "Показване на предупредителна страница при щракване върху външни връзки"
+	"outgoing-links.warning-page": "Показване на предупредителна страница при щракване върху външни връзки",
+	"search-default-sort-by": "Подредба по подразбиране при търсене",
+	"outgoing-links.whitelist": "Домейни, за които да не се показва предупредителната страница"
 }
--- a/public/language/bg/admin/settings/post.json
+++ b/public/language/bg/admin/settings/post.json
@@ -29,6 +29,8 @@
 	"unread": "Настройки за непрочетените",
 	"unread.cutoff": "Възраст на публикациите, след която те не се показват в непрочетените (в брой дни)",
 	"unread.min-track-last": "Минимален брой публикации в темата, след което да започва следене на последно прочетената",
+	"recent": "Настройки за скорошните",
+	"recent.categoryFilter.disable": "Изключване на филтрирането на темите в пренебрегваните категории на страницата /recent",
 	"signature": "Настройки за подписите",
 	"signature.disable": "Забраняване на подписите",
 	"signature.no-links": "Забраняване на поставянето на връзки в подписите",
--- a/public/language/bg/admin/settings/reputation.json
+++ b/public/language/bg/admin/settings/reputation.json
@@ -2,6 +2,7 @@
 	"reputation": "Настройки за репутацията",
 	"disable": "Изключване на системата за репутация",
 	"disable-down-voting": "Забрана на отрицателното гласуване",
+	"votes-are-public": "Всички гласувания са публични",
 	"thresholds": "Ограничения на дейността",
 	"min-rep-downvote": "Минимална репутация, необходима за отрицателно гласуване за публикации",
 	"min-rep-flag": "Минимална репутация, необходима за докладване на публикации"
--- a/public/language/bg/admin/settings/uploads.json
+++ b/public/language/bg/admin/settings/uploads.json
@@ -9,7 +9,7 @@
 	"allow-topic-thumbnails": "Позволяване на потребителите да качват миниатюрни изображения за темите",
 	"topic-thumb-size": "Размер на миниатюрите за темите",
 	"allowed-file-extensions": "Разрешени файлови разширения",
-	"allowed-file-extensions-help": "Въведете файловите разширения тук, разделени със запетаи (напр. <code>pdf,xls,doc</code>).\n\\t\\t\\t\\t\\tАко списъкът е празен, всички файлови разширения ще бъдат разрешени.",
+	"allowed-file-extensions-help": "Въведете файловите разширения, разделени със запетаи (пример: <code>pdf,xls,doc</code>). Ако списъкът е празен, всички файлови разширения ще бъдат разрешени.",
 	"profile-avatars": "Профилни изображения",
 	"allow-profile-image-uploads": "Позволяване на потребителите да качват профилни изображения",
 	"convert-profile-image-png": "Превръщане на качените профилни изображения във формата „PNG“",
@@ -25,4 +25,4 @@
 	"profile-covers": "Корици на профила",
 	"default-covers": "Стандартни изображения за корицата",
 	"default-covers-help": "Добавете стандартни изображения на корицата (разделени със запетаи) за акаунтите, които нямат качено такова."
-}
+}
--- a/public/language/bg/admin/settings/user.json
+++ b/public/language/bg/admin/settings/user.json
@@ -34,9 +34,12 @@
 	"registration.max-invites": "Максимален брой покани на потребител",
 	"max-invites": "Максимален брой покани на потребител",
 	"max-invites-help": "0 = няма ограничение. Администраторите могат да разпращат неограничен брой покани.<br>Тази стойност се използва, само ако е избран режимът „Само с покана“.",
+	"invite-expiration": "Давност на поканите",
+	"invite-expiration-help": "Брой дни, след които поканите вече не важат.",
 	"min-username-length": "Минимална дължина на потребителското име",
 	"max-username-length": "Максимална дължина на потребителското име",
 	"min-password-length": "Минимална дължина на паролата",
+	"min-password-strength": "Минимална сложност на паролата",
 	"max-about-me-length": "Максимална дължина на информацията на потребителите за себе си",
 	"terms-of-use": "Условия за ползване на форума <small>(Оставете празно и няма да има такива)</small>",
 	"user-search": "Търсене на потребители",
--- a/public/language/bg/email.json
+++ b/public/language/bg/email.json
@@ -32,5 +32,9 @@
    "notif.post.unsub.info": "Това известие за публикация беше изпратено до Вас поради настройките Ви за абонаментите.",
    "test.text1": "Това е пробно е-писмо, за да потвърдим, че изпращачът на е-поща е правилно настроен за Вашия NodeBB.",
    "unsub.cta": "Натиснете тук, за да промените тези настройки",
+    "banned.subject": "Вие бяхте блокиран(а) от %1",
+    "banned.text1": "Потребителят %1 беше блокиран от %2.",
+    "banned.text2": "Това блокиране ще е в сила до %1.",
+    "banned.text3": "Това е причината, поради която бяхте блокиран(а):",
    "closing": "Благодарим Ви!"
 }
--- a/public/language/bg/error.json
+++ b/public/language/bg/error.json
@@ -1,5 +1,6 @@
 {
    "invalid-data": "Грешни данни",
+    "invalid-json": "Неправилен JSON",
    "not-logged-in": "Изглежда не сте се вписали в системата.",
    "account-locked": "Вашият акаунт беше заключен временно",
    "search-requires-login": "Търсенето изисква регистриран акаунт! Моля, впишете се или се регистрирайте!",
@@ -12,6 +13,7 @@
    "invalid-title": "Грешно заглавие!",
    "invalid-user-data": "Грешни потребителски данни",
    "invalid-password": "Грешна парола",
+    "invalid-login-credentials": "Неправилни данни за удостоверяване",
    "invalid-username-or-password": "Моля, въведете потребителско име и парола",
    "invalid-search-term": "Грешен текст за търсене",
    "csrf-invalid": "Не успяхме да Ви впишем, най-вероятно защото сесията Ви е изтекла. Моля, опитайте отново",
@@ -30,6 +32,7 @@
    "password-too-long": "Паролата е твърде дълга",
    "user-banned": "Потребителят е блокиран",
    "user-banned-reason": "За съжаление, този акаунт е блокиран (Причина: %1)",
+    "user-banned-reason-until": "За съжаление, този акаунт е блокиран до %1 (Причина: %2)",
    "user-too-new": "Съжаляваме, но трябва да изчакате поне %1 секунда/и, преди да направите първата си публикация",
    "blacklisted-ip": "Съжаляваме, но Вашият IP адрес е забранен за ползване в тази общност. Ако смятате, че това е грешка, моля, свържете се с администратор.",
    "ban-expiry-missing": "Моля, задайте крайна дата за това блокиране",
@@ -104,7 +107,7 @@
    "chat-disabled": "Системата за разговори е изключена",
    "too-many-messages": "Изпратили сте твърде много съобщения. Моля, изчакайте малко.",
    "invalid-chat-message": "Неправилно съобщение",
-    "chat-message-too-long": "Съобщението е твърде дълго",
+    "chat-message-too-long": "Съобщенията в разговор не може да бъдат по-дълги от %1 знака.",
    "cant-edit-chat-message": "Нямате право да редактирате това съобщение",
    "cant-remove-last-user": "Не можете да премахнете последния потребител",
    "cant-delete-chat-message": "Нямате право да изтриете това съобщение",
--- a/public/language/bg/flags.json
+++ b/public/language/bg/flags.json
@@ -0,0 +1,60 @@
+{
+	"state": "Състояние",
+	"reporter": "Докладвал",
+	"reported-at": "Докладвано на",
+	"description": "Описание",
+	"no-flags": "Ура! Няма намерени доклади.",
+	"assignee": "Назначен",
+	"update": "Обновяване",
+	"updated": "Обновено",
+	"target-purged": "Съдържанието, за което се отнася този доклад, е било изтрито и вече не е налично.",
+
+	"quick-filters": "Бързи филтри",
+	"filter-active": "В този списък с доклади има един или повече филтри",
+	"filter-reset": "Премахване на филтрите",
+	"filters": "Настройки на филтрите",
+	"filter-reporterId": "Потр. ид. на докладвалия",
+	"filter-targetUid": "Потр. ид. на докладвания",
+	"filter-type": "Вид на доклада",
+	"filter-type-all": "Всичко",
+	"filter-type-post": "Публикация",
+	"filter-state": "Състояние",
+	"filter-assignee": "Потр. ид. на назначения",
+	"filter-cid": "Категория",
+	"filter-quick-mine": "Назначени на мен",
+	"filter-cid-all": "Всички категории",
+	"apply-filters": "Прилагане на филтрите",
+
+	"quick-links": "Бързи връзки",
+	"flagged-user": "Докладван потребител",
+	"view-profile": "Преглед на профила",
+	"start-new-chat": "Започване на нов разговор",
+	"go-to-target": "Преглед на целта на доклада",
+
+	"user-view": "Преглед на профила",
+	"user-edit": "Редактиране на профила",
+
+	"notes": "Бележки към доклада",
+	"add-note": "Добавяне на бележка",
+	"no-notes": "Няма споделени бележки.",
+
+	"history": "История на доклада",
+	"back": "Обратно към списъка с доклади",
+	"no-history": "Няма история на доклада.",
+
+	"state-all": "Всички състояния",
+	"state-open": "Нов/отворен",
+	"state-wip": "В процес на работа",
+	"state-resolved": "Разрешен",
+	"state-rejected": "Отхвърлен",
+	"no-assignee": "Без назначение",
+	"note-added": "Бележката е добавена",
+
+	"modal-title": "Докладване на неуместно съдържание",
+	"modal-body": "Моля, посочете причината за докладването на %1 %2 за преглед. Или използвайте някой от бутоните за бързо докладване, ако са приложими.",
+	"modal-reason-spam": "Спам",
+	"modal-reason-offensive": "Обидно",
+	"modal-reason-custom": "Причина за докладването на това съдържание…",
+	"modal-submit": "Изпращане на доклада",
+	"modal-submit-success": "Съдържанието беше докладвано на модераторите."
+}
--- a/public/language/bg/global.json
+++ b/public/language/bg/global.json
@@ -103,5 +103,7 @@
    "cookies.message": "Този уеб сайт използва бисквитки, за да предостави услугите си по възможно най-добрия начин.",
    "cookies.accept": "Разбрано!",
    "cookies.learn_more": "Научете повече",
-    "edited": "Редактирано"
+    "edited": "Редактирано",
+    "disabled": "Изключено",
+    "select": "Избиране"
 }
--- a/public/language/bg/groups.json
+++ b/public/language/bg/groups.json
@@ -27,6 +27,7 @@
    "details.disableJoinRequests": "Забраняване на заявките за присъединяване",
    "details.grant": "Даване/отнемане на собственост",
    "details.kick": "Изгонване",
+    "details.kick_confirm": "Наистина ли искате да премахнете този член на групата?",
    "details.owner_options": "Администрация на групата",
    "details.group_name": "Име на групата",
    "details.member_count": "Брой на членовете",
--- a/public/language/bg/modules.json
+++ b/public/language/bg/modules.json
@@ -20,6 +20,7 @@
    "chat.three_months": "3 месеца",
    "chat.delete_message_confirm": "Наистина ли искате да изтриете това съобщение?",
    "chat.add-users-to-room": "Добавяне на потребители към стаята",
+    "chat.confirm-chat-with-dnd-user": "Този потребител е в състояние „не ме безпокойте“. Наистина ли искате да разговаряте с него?",
    "composer.compose": "Писане",
    "composer.show_preview": "Показване на прегледа",
    "composer.hide_preview": "Скриване на прегледа",
--- a/public/language/bg/notifications.json
+++ b/public/language/bg/notifications.json
@@ -10,6 +10,15 @@
    "return_to": "Връщане към %1",
    "new_notification": "Ново известие",
    "you_have_unread_notifications": "Имате непрочетени известия",
+    "all": "Всички",
+    "topics": "Теми",
+    "replies": "Отговори",
+    "chat": "Разговори",
+    "follows": "Следвания",
+    "upvote": "Положителни гласове",
+    "new-flags": "Нови докладвания",
+    "my-flags": "Докладвания, назначени на мен",
+    "bans": "Блокирания",
    "new_message_from": "Ново съобщение от <strong>%1</strong>",
    "upvoted_your_post_in": "<strong>%1</strong> гласува положително за Ваша публикация в <strong>%2</strong>.",
    "upvoted_your_post_in_dual": "<strong>%1</strong> и <strong>%2</strong> гласуваха положително за Ваша публикация в <strong>%3</strong>.",
@@ -19,6 +28,9 @@
    "user_flagged_post_in": "<strong>%1</strong> докладва Ваша публикация в <strong>%2</strong>",
    "user_flagged_post_in_dual": "<strong>%1</strong> и <strong>%2</strong> докладваха Ваша публикация в <strong>%3</strong>",
    "user_flagged_post_in_multiple": "<strong>%1</strong> и %2 други докладваха Ваша публикация в <strong>%3</strong>",
+    "user_flagged_user": "<strong>%1</strong> докладва потребителски профил (%2)",
+    "user_flagged_user_dual": "<strong>%1</strong> и <strong>%2</strong> докладваха потребителски профил (%3)",
+    "user_flagged_user_multiple": "<strong>%1</strong> и още %2 потребители докладваха потребителски профил (%3)",
    "user_posted_to": "<strong>%1</strong> публикува отговор на: <strong>%2</strong>",
    "user_posted_to_dual": "<strong>%1</strong> и <strong>%2</strong> публикуваха отговори на: <strong>%3</strong>",
    "user_posted_to_multiple": "<strong>%1</strong> и %2 други публикуваха отговори на: <strong>%3</strong>",
@@ -28,6 +40,7 @@
    "user_started_following_you_multiple": "<strong>%1</strong> и %2 започнаха да Ви следват.",
    "new_register": "<strong>%1</strong> изпрати заявка за регистрация.",
    "new_register_multiple": "Има <strong>%1</strong> заявки за регистрация, които очакват да бъдат прегледани.",
+    "flag_assigned_to_you": "<strong>Докладът %1</strong> беше назначен на Вас",
    "email-confirmed": "Е-пощата беше потвърдена",
    "email-confirmed-message": "Благодарим Ви, че потвърдихте е-пощата си. Акаунтът Ви е вече напълно активиран.",
    "email-confirm-error-message": "Възникна проблем при потвърждаването на е-пощата Ви. Може кодът да е грешен или давността му да е изтекла.",
--- a/public/language/bg/pages.json
+++ b/public/language/bg/pages.json
@@ -6,7 +6,7 @@
    "popular-month": "Популярните теми този месец",
    "popular-alltime": "Популярните теми за всички времена",
    "recent": "Скорошни теми",
-    "flagged-posts": "Докладвани публикации",
+    "flagged-content": "Докладвано съдържание",
    "ip-blacklist": "Черен списък за IP адреси",
    "users/online": "Потребители на линия",
    "users/latest": "Последни потребители",
@@ -27,6 +27,8 @@
    "group": "Група %1",
    "chats": "Разговори",
    "chat": "Разговаря с %1",
+    "flags": "Доклади",
+    "flag-details": "Подробности за доклад %1",
    "account/edit": "Редактиране на „%1“",
    "account/edit/password": "Редактиране на паролата на „%1“",
    "account/edit/username": "Редактиране на потребителското име на „%1“",
--- a/public/language/bg/search.json
+++ b/public/language/bg/search.json
@@ -12,6 +12,7 @@
    "reply-count": "Брой на отговорите",
    "at-least": "Поне",
    "at-most": "Най-много",
+    "relevance": "Уместност",
    "post-time": "Време на публикуване",
    "newer-than": "По-нови от",
    "older-than": "По-стари от",
--- a/public/language/bg/topic.json
+++ b/public/language/bg/topic.json
@@ -13,7 +13,9 @@
    "notify_me": "Получавайте известия за новите отговори в тази тема",
    "quote": "Цитат",
    "reply": "Отговор",
-    "replies_to_this_post": "Отговори: %1",
+    "replies_to_this_post": "%1 отговора",
+    "one_reply_to_this_post": "1 отговор",
+    "last_reply_time": "Последен отговор",
    "reply-as-topic": "Отговор в нова тема",
    "guest-login-reply": "Впишете се, за да отговорите",
    "edit": "Редактиране",
@@ -25,28 +27,11 @@
    "link": "Връзка",
    "share": "Споделяне",
    "tools": "Инструменти",
-    "flag": "Докладване",
    "locked": "Заключена",
    "pinned": "Закачена",
    "moved": "Преместена",
    "bookmark_instructions": "Щракнете тук, за да се върнете към последно прочетената публикация в тази тема.",
    "flag_title": "Докладване на тази публикация до модератор",
-    "flag_success": "Тази публикация е била докладвана до модератор.",
-    "flag_manage_title": "Докладвана публикация в %1",
-    "flag_manage_history": "История на дейността",
-    "flag_manage_no_history": "Няма история на събитията",
-    "flag_manage_assignee": "Назначен",
-    "flag_manage_state": "Състояние",
-    "flag_manage_state_open": "Нов/отворен",
-    "flag_manage_state_wip": "В процес на работа",
-    "flag_manage_state_resolved": "Разрешен",
-    "flag_manage_state_rejected": "Отхвърлен",
-    "flag_manage_notes": "Споделени бележки",
-    "flag_manage_update": "Обновяване на състоянието на доклада",
-    "flag_manage_history_assignee": "Разпределен на %1",
-    "flag_manage_history_state": "Състоянието е променено на „%1“",
-    "flag_manage_history_notes": "Бележките към доклада са обновени",
-    "flag_manage_saved": "Подробностите за доклада са обновени",
    "deleted_message": "Темата е изтрита. Само потребители с права за управление на темите могат да я видят.",
    "following_topic.message": "Вече ще получавате известия когато някой публикува коментар в тази тема.",
    "not_following_topic.message": "Ще виждате тази тема в списъка с непрочетени теми, но няма да получавате известия, когато хората публикуват нещо в нея.",
@@ -74,6 +59,7 @@
    "thread_tools.unlock": "Отключване на темата",
    "thread_tools.move": "Преместване на темата",
    "thread_tools.move_all": "Преместване на всички",
+    "thread_tools.select_category": "Избиране на категория",
    "thread_tools.fork": "Разделяне на темата",
    "thread_tools.delete": "Изтриване на темата",
    "thread_tools.delete-posts": "Изтриване на публикациите",
@@ -87,7 +73,6 @@
    "post_restore_confirm": "Наистина ли искате да възстановите тази публикация?",
    "post_purge_confirm": "Наистина ли искате да изчистите тази публикация?",
    "load_categories": "Зареждане на категориите",
-    "disabled_categories_note": "Изключените категории са засивени",
    "confirm_move": "Преместване",
    "confirm_fork": "Разделяне",
    "bookmark": "Отметка",
@@ -99,7 +84,6 @@
    "move_post": "Преместване на публикацията",
    "post_moved": "Публикацията беше преместена!",
    "fork_topic": "Разделяне на темата",
-    "topic_will_be_moved_to": "Тази тема ще бъде преместена в категорията",
    "fork_topic_instruction": "Натиснете публикациите, които искате да отделите",
    "fork_no_pids": "Няма избрани публикации!",
    "fork_pid_count": "Избрани публикации: %1",
@@ -131,8 +115,5 @@
    "stale.warning": "Темата, в която отговаряте, е доста стара. Искате ли вместо това да създадете нова и да направите препратка към тази в отговора си?",
    "stale.create": "Създаване на нова тема",
    "stale.reply_anyway": "Отговаряне в тази тема въпреки това",
-    "link_back": "Отговор: [%1](%2)",
-    "spam": "Спам",
-    "offensive": "Обидно",
-    "custom-flag-reason": "Изберете причина за докладване"
+    "link_back": "Отговор: [%1](%2)"
 }
--- a/public/language/bg/user.json
+++ b/public/language/bg/user.json
@@ -33,6 +33,7 @@
    "chat": "Разговор",
    "chat_with": "Продължаване на разговора с %1",
    "new_chat_with": "Започване на нов разговор с %1",
+    "flag-profile": "Докладване на профила",
    "follow": "Следване",
    "unfollow": "Спиране на следването",
    "more": "Още",
@@ -59,11 +60,14 @@
    "username_taken_workaround": "Потребителското име, което искате, е заето и затова ние го променихме малко. Вие ще се наричате <strong>%1</strong>",
    "password_same_as_username": "Паролата е същата като потребителското Ви име. Моля, изберете друга парола.",
    "password_same_as_email": "Паролата е същата като е-пощата Ви. Моля, изберете друга парола.",
+    "weak_password": "Проста парола.",
    "upload_picture": "Качване на снимка",
    "upload_a_picture": "Качване на снимка",
    "remove_uploaded_picture": "Премахване на качената снимка",
    "upload_cover_picture": "Качване на снимка на корицата",
    "remove_cover_picture_confirm": "Наистина ли искате да премахнете снимката на корицата?",
+    "crop_picture": "Орязване на снимката",
+    "upload_cropped_picture": "Орязване и качване",
    "settings": "Настройки",
    "show_email": "Да се показва е-пощата ми",
    "show_fullname": "Да се показва цялото ми име",
@@ -127,5 +131,6 @@
    "info.username-history": "История на потребителските имена",
    "info.email-history": "Историята на е-пощите",
    "info.moderation-note": "Модераторска бележка",
-    "info.moderation-note.success": "Модераторската бележка е запазена"
+    "info.moderation-note.success": "Модераторската бележка е запазена",
+    "info.moderation-note.add": "Добавяне на бележка"
 }
--- a/public/language/bn/admin/advanced/database.json
+++ b/public/language/bn/admin/advanced/database.json
@@ -1,6 +1,7 @@
 {
 	"x-b": "%1 b",
 	"x-mb": "%1 mb",
+	"x-gb": "%1 gb",
 	"uptime-seconds": "Uptime in Seconds",
 	"uptime-days": "Uptime in Days",

--- a/public/language/bn/admin/advanced/errors.json
+++ b/public/language/bn/admin/advanced/errors.json
@@ -8,7 +8,7 @@
 	"clear-error-log": "Clear Error Log",
 	"route": "Route",
 	"count": "Count",
-	"no-routes-not-found": "Hooray! There are no routes that were not found.",
+	"no-routes-not-found": "Hooray! No 404 errors!",
 	"clear404-confirm": "Are you sure you wish to clear the 404 error logs?",
 	"clear404-success": "\"404 Not Found\" errors cleared"
 }
--- a/public/language/bn/admin/appearance/customise.json
+++ b/public/language/bn/admin/appearance/customise.json
@@ -5,5 +5,8 @@

 	"custom-header": "Custom Header",
 	"custom-header.description": "Enter custom HTML here (ex. JavaScript, Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup.",
-	"custom-header.enable": "Enable Custom Header"
+	"custom-header.enable": "Enable Custom Header",
+
+	"custom-css.livereload": "Enable Live Reload",
+	"custom-css.livereload.description": "Enable this to force all sessions on every device under your account to refresh whenever you click save"
 }
--- a/public/language/bn/admin/development/info.json
+++ b/public/language/bn/admin/development/info.json
@@ -1,10 +1,12 @@
 {
 	"you-are-on": "Info - You are on <strong>%1:%2</strong>",
+	"nodes-responded": "%1 nodes responded within %2ms!",
 	"host": "host",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "online",
 	"git": "git",
+	"memory": "memory",
 	"load": "load",
 	"uptime": "uptime",

--- a/public/language/bn/admin/extend/plugins.json
+++ b/public/language/bn/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",

 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
--- a/public/language/bn/admin/general/dashboard.json
+++ b/public/language/bn/admin/general/dashboard.json
@@ -2,24 +2,38 @@
 	"forum-traffic": "Forum Traffic",
 	"page-views": "Page Views",
 	"unique-visitors": "Unique Visitors",
-	"page-views-last-month": "Page views Last Month",
-	"page-views-this-month": "Page views This Month",
-	"page-views-last-day": "Page views in last 24 hours",
+	"users": "Users",
+	"posts": "Posts",
+	"topics": "Topics",
+	"page-views-seven": "Last 7 Days",
+	"page-views-thirty": "Last 30 Days",
+	"page-views-last-day": "Last 24 hours",
+	"page-views-custom": "Custom Date Range",
+	"page-views-custom-start": "Range Start",
+	"page-views-custom-end": "Range End",
+	"page-views-custom-help": "Enter a date range of page views you would like to view. If no date picker is available, the accepted format is <code>YYYY-MM-DD</code>",
+	"page-views-custom-error": "Please enter a valid date range in the format <code>YYYY-MM-DD</code>",

 	"stats.day": "Day",
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
+	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",

 	"notices": "Notices",
+	"restart-not-required": "Restart not required",
+	"restart-required": "Restart required",
+	"search-plugin-installed": "Search Plugin installed",
+	"search-plugin-not-installed": "Search Plugin not installed",
+	"search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality",

 	"control-panel": "System Control",
 	"reload": "Reload",
@@ -52,4 +66,4 @@
 	"graphs.unique-visitors": "Unique Visitors",
 	"graphs.registered-users": "Registered Users",
 	"graphs.anonymous-users": "Anonymous Users"
-}
+}
--- a/public/language/bn/admin/general/languages.json
+++ b/public/language/bn/admin/general/languages.json
@@ -1,5 +1,6 @@
 {
 	"language-settings": "Language Settings",
 	"description": "The default language determines the language settings for all users who are visiting your forum. <br />Individual users can override the default language on their account settings page.",
-	"default-language": "Default Language"
+	"default-language": "Default Language",
+	"auto-detect": "Auto Detect Language Setting for Guests"
 }
--- a/public/language/bn/admin/manage/categories.json
+++ b/public/language/bn/admin/manage/categories.json
@@ -10,6 +10,7 @@
 	"custom-class": "Custom Class",
 	"num-recent-replies": "# of Recent Replies",
 	"ext-link": "External Link",
+	"is-section": "Treat this category as a section",
 	"upload-image": "Upload Image",
 	"delete-image": "Remove",
 	"category-image": "Category Image",
--- a/public/language/bn/admin/manage/flags.json
+++ b/public/language/bn/admin/manage/flags.json
@@ -1,19 +0,0 @@
-{
-	"daily": "Daily flags",
-	"by-user": "Flags by user",
-	"by-user-search": "Search flagged posts by username",
-	"category": "Category",
-	"sort-by": "Sort By",
-	"sort-by.most-flags": "Most Flags",
-	"sort-by.most-recent": "Most Recent",
-	"search": "Search",
-	"dismiss-all": "Dismiss All",
-	"none-flagged": "No flagged posts!",
-	"posted-in": "Posted in %1",
-	"read-more": "Read More",
-	"flagged-x-times": "This post has been flagged %1 time(s):",
-	"dismiss": "Dismiss this Flag",
-	"delete-post": "Delete the Post",
-
-	"alerts.confirm-delete-post": "Do you really want to delete this post?"
-}
--- a/public/language/bn/admin/manage/groups.json
+++ b/public/language/bn/admin/manage/groups.json
@@ -1,6 +1,7 @@
 {
 	"name": "Group Name",
 	"description": "Group Description",
+	"member-count": "Member Count",
 	"system": "System Group",
 	"edit": "Edit",
 	"search-placeholder": "Search",
--- a/public/language/bn/admin/menu.json
+++ b/public/language/bn/admin/menu.json
@@ -13,7 +13,6 @@
 	"manage/users": "Users",
 	"manage/registration": "Registration Queue",
 	"manage/groups": "Groups",
-	"manage/flags": "Flags",
 	"manage/ip-blacklist": "IP Blacklist",

 	"section-settings": "Settings",
--- a/public/language/bn/admin/settings/advanced.json
+++ b/public/language/bn/admin/settings/advanced.json
@@ -6,7 +6,7 @@
 	"headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame",
 	"headers.powered-by": "Customise the \"Powered By\" header sent by NodeBB",
 	"headers.acao": "Access-Control-Allow-Origin",
-	"headers.acao-help": "To deny access to all sites, leave empty or set to <code>null</code>",
+	"headers.acao-help": "To deny access to all sites, leave empty",
 	"headers.acam": "Access-Control-Allow-Methods",
 	"headers.acah": "Access-Control-Allow-Headers",
 	"traffic-management": "Traffic Management",
--- a/public/language/bn/admin/settings/general.json
+++ b/public/language/bn/admin/settings/general.json
@@ -26,5 +26,7 @@
 	"touch-icon.upload": "Upload",
 	"touch-icon.help": "Recommended size and format: 192x192, PNG format only. If no touch icon is specified, NodeBB will fall back to using the favicon.",
 	"outgoing-links": "Outgoing Links",
-	"outgoing-links.warning-page": "Use Outgoing Links Warning Page"
+	"outgoing-links.warning-page": "Use Outgoing Links Warning Page",
+	"search-default-sort-by": "Search default sort by",
+	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page"
 }
--- a/public/language/bn/admin/settings/post.json
+++ b/public/language/bn/admin/settings/post.json
@@ -29,6 +29,8 @@
 	"unread": "Unread Settings",
 	"unread.cutoff": "Unread cutoff days",
 	"unread.min-track-last": "Minimum posts in topic before tracking last read",
+	"recent": "Recent Settings",
+	"recent.categoryFilter.disable": "Disable filtering of topics in ignored categories on the /recent page",
 	"signature": "Signature Settings",
 	"signature.disable": "Disable signatures",
 	"signature.no-links": "Disable links in signatures",
--- a/public/language/bn/admin/settings/reputation.json
+++ b/public/language/bn/admin/settings/reputation.json
@@ -2,6 +2,7 @@
 	"reputation": "Reputation Settings",
 	"disable": "Disable Reputation System",
 	"disable-down-voting": "Disable Down Voting",
+	"votes-are-public": "All Votes Are Public",
 	"thresholds": "Activity Thresholds",
 	"min-rep-downvote": "Minimum reputation to downvote posts",
 	"min-rep-flag": "Minimum reputation to flag posts"
--- a/public/language/bn/admin/settings/uploads.json
+++ b/public/language/bn/admin/settings/uploads.json
@@ -5,11 +5,11 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
-	"allowed-file-extensions-help": "Enter comma-separated list of file extensions here (e.g. <code>pdf,xls,doc</code>).\n\t\t\t\t\tAn empty list means all extensions are allowed.",
+	"allowed-file-extensions-help": "Enter comma-separated list of file extensions here (e.g. <code>pdf,xls,doc</code>). An empty list means all extensions are allowed.",
 	"profile-avatars": "Profile Avatars",
 	"allow-profile-image-uploads": "Allow users to upload profile images",
 	"convert-profile-image-png": "Convert profile image uploads to PNG",
@@ -18,11 +18,11 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
 	"default-covers-help": "Add comma-separated default cover images for accounts that don't have an uploaded cover image"
-}
+}
--- a/public/language/bn/admin/settings/user.json
+++ b/public/language/bn/admin/settings/user.json
@@ -34,9 +34,12 @@
 	"registration.max-invites": "Maximum Invitations per User",
 	"max-invites": "Maximum Invitations per User",
 	"max-invites-help": "0 for no restriction. Admins get infinite invitations<br>Only applicable for \"Invite Only\"",
+	"invite-expiration": "Invite expiration",
+	"invite-expiration-help": "# of days invitations expire in.",
 	"min-username-length": "Minimum Username Length",
 	"max-username-length": "Maximum Username Length",
 	"min-password-length": "Minimum Password Length",
+	"min-password-strength": "Minimum Password Strength",
 	"max-about-me-length": "Maximum About Me Length",
 	"terms-of-use": "Forum Terms of Use <small>(Leave blank to disable)</small>",
 	"user-search": "User Search",
--- a/public/language/bn/email.json
+++ b/public/language/bn/email.json
@@ -32,5 +32,9 @@
    "notif.post.unsub.info": "আপনার সাবস্ক্রিপশন সেটিংসের কারনে আপনার এই বার্তাটি পাঠানো হয়েছে",
    "test.text1": "আপনি সঠিকভাবে নোডবিবির জন্য মেইলার সেটাপ করেছেন কিনা নিশ্চিত করার জন্য এই টেষ্ট ইমেইল পাঠানো হয়েছে",
    "unsub.cta": "সেটিংসগুলো পরিবর্তন করতে এখানে ক্লিক করুন",
+    "banned.subject": "You have been banned from %1",
+    "banned.text1": "The user %1 has been banned from %2.",
+    "banned.text2": "This ban will last until %1.",
+    "banned.text3": "This is the reason why you have been banned:",
    "closing": "ধন্যবাদ!"
 }
--- a/public/language/bn/error.json
+++ b/public/language/bn/error.json
@@ -1,5 +1,6 @@
 {
    "invalid-data": "ভুল তথ্য",
+    "invalid-json": "Invalid JSON",
    "not-logged-in": "আপনি লগিন করেননি",
    "account-locked": "আপনার অ্যাকাউন্ট সাময়িকভাবে লক করা হয়েছে",
    "search-requires-login": "Searching requires an account - please login or register.",
@@ -12,6 +13,7 @@
    "invalid-title": "ভুল শিরোনাম",
    "invalid-user-data": "ভুল ব্যবহারকারী তথ্য",
    "invalid-password": "ভুল পাসওয়ার্ড",
+    "invalid-login-credentials": "Invalid login credentials",
    "invalid-username-or-password": "অনুগ্রহ পূর্বক ইউজারনেম এবং পাসওয়ার্ড উভয়ই প্রদান করুন",
    "invalid-search-term": "অগ্রহনযোগ্য সার্চ টার্ম",
    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
@@ -30,6 +32,7 @@
    "password-too-long": "Password too long",
    "user-banned": "ব্যবহারকারী নিষিদ্ধ",
    "user-banned-reason": "Sorry, this account has been banned (Reason: %1)",
+    "user-banned-reason-until": "Sorry, this account has been banned until %1 (Reason: %2)",
    "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
    "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
    "ban-expiry-missing": "Please provide an end date for this ban",
@@ -104,7 +107,7 @@
    "chat-disabled": "Chat system disabled",
    "too-many-messages": "You have sent too many messages, please wait awhile.",
    "invalid-chat-message": "Invalid chat message",
-    "chat-message-too-long": "Chat message is too long",
+    "chat-message-too-long": "Chat messages can not be longer than %1 characters.",
    "cant-edit-chat-message": "You are not allowed to edit this message",
    "cant-remove-last-user": "You can't remove the last user",
    "cant-delete-chat-message": "You are not allowed to delete this message",
--- a/public/language/bn/flags.json
+++ b/public/language/bn/flags.json
@@ -0,0 +1,60 @@
+{
+	"state": "State",
+	"reporter": "Reporter",
+	"reported-at": "Reported At",
+	"description": "Description",
+	"no-flags": "Hooray! No flags found.",
+	"assignee": "Assignee",
+	"update": "Update",
+	"updated": "Updated",
+	"target-purged": "The content this flag referred to has been purged and is no longer available.",
+
+	"quick-filters": "Quick Filters",
+	"filter-active": "There are one or more filters active in this list of flags",
+	"filter-reset": "Remove Filters",
+	"filters": "Filter Options",
+	"filter-reporterId": "Reporter UID",
+	"filter-targetUid": "Flagged UID",
+	"filter-type": "Flag Type",
+	"filter-type-all": "All Content",
+	"filter-type-post": "Post",
+	"filter-state": "State",
+	"filter-assignee": "Assignee UID",
+	"filter-cid": "Category",
+	"filter-quick-mine": "Assigned to me",
+	"filter-cid-all": "All categories",
+	"apply-filters": "Apply Filters",
+
+	"quick-links": "Quick Links",
+	"flagged-user": "Flagged User",
+	"view-profile": "View Profile",
+	"start-new-chat": "Start New Chat",
+	"go-to-target": "View Flag Target",
+
+	"user-view": "View Profile",
+	"user-edit": "Edit Profile",
+
+	"notes": "Flag Notes",
+	"add-note": "Add Note",
+	"no-notes": "No shared notes.",
+
+	"history": "Flag History",
+	"back": "Back to Flags List",
+	"no-history": "No flag history.",
+
+	"state-all": "All states",
+	"state-open": "New/Open",
+	"state-wip": "Work in Progress",
+	"state-resolved": "Resolved",
+	"state-rejected": "Rejected",
+	"no-assignee": "Not Assigned",
+	"note-added": "Note Added",
+
+	"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.",
+	"modal-reason-spam": "Spam",
+	"modal-reason-offensive": "Offensive",
+	"modal-reason-custom": "Reason for reporting this content...",
+	"modal-submit": "Submit Report",
+	"modal-submit-success": "Content has been flagged for moderation."
+}
--- a/public/language/bn/global.json
+++ b/public/language/bn/global.json
@@ -103,5 +103,7 @@
    "cookies.message": "This website uses cookies to ensure you get the best experience on our website.",
    "cookies.accept": "Got it!",
    "cookies.learn_more": "Learn More",
-    "edited": "Edited"
+    "edited": "Edited",
+    "disabled": "Disabled",
+    "select": "Select"
 }
--- a/Show More
+++ b/Show More