Merge branch 'master' into develop

2026-05-06 15:17:26 +02:00 · 2017-12-15 16:02:02 -05:00
parent 41b026b4d6 6bd8740342
commit 4bb46ad669
663 changed files with 6825 additions and 3043 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -2,6 +2,7 @@
 	== Github Issues are for bug reports and feature requests only ==
 	== Please visit https://community.nodebb.org for other support ==
 	== Found a security exploit? Please email us at security@nodebb.org instead for immediate attention ==
+	==   → DO NOT SUBMIT VULNERABILITIES TO THE PUBLIC BUG TRACKER ==
 -->

 <!-- ++ Please include the following information when submitting a bug report ++ -->
--- a/.gitignore
+++ b/.gitignore
@@ -65,4 +65,4 @@ build
 test/files/normalise.jpg.png
 test/files/normalise-resized.jpg
 package-lock.json
-package.json
+/package.json
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ before_install:
  - "sudo service mongod start"
 before_script:
  - sleep 15 # wait for mongodb to be ready
-  - cp package.default.json package.json
+  - cp install/package.json package.json
  - npm install
  - sh -c "if [ '$DB' = 'mongodb' ]; then node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567\\\",\\\"secret\\\":\\\"abcdef\\\",\\\"database\\\":\\\"mongo\\\",\\\"mongo:host\\\":\\\"127.0.0.1\\\",\\\"mongo:port\\\":27017,\\\"mongo:username\\\":\\\"\\\",\\\"mongo:password\\\":\\\"\\\",\\\"mongo:database\\\":0,\\\"redis:host\\\":\\\"127.0.0.1\\\",\\\"redis:port\\\":6379,\\\"redis:password\\\":\\\"\\\",\\\"redis:database\\\":0,\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"abcdef\\\",\\\"admin:password:confirm\\\":\\\"abcdef\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":27017,\\\"database\\\":0}\"; fi"
  - sh -c "if [ '$DB' = 'redis' ]; then node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567\\\",\\\"secret\\\":\\\"abcdef\\\",\\\"database\\\":\\\"redis\\\",\\\"mongo:host\\\":\\\"127.0.0.1\\\",\\\"mongo:port\\\":27017,\\\"mongo:username\\\":\\\"\\\",\\\"mongo:password\\\":\\\"\\\",\\\"mongo:database\\\":0,\\\"redis:host\\\":\\\"127.0.0.1\\\",\\\"redis:port\\\":6379,\\\"redis:password\\\":\\\"\\\",\\\"redis:database\\\":0,\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"abcdef\\\",\\\"admin:password:confirm\\\":\\\"abcdef\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":6379,\\\"database\\\":0}\"; fi"
--- a/2
+++ b/2
@@ -6,7 +6,7 @@ WORKDIR /usr/src/app

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

--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/NodeBB/NodeBB?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Build Status](https://travis-ci.org/NodeBB/NodeBB.svg?branch=master)](https://travis-ci.org/NodeBB/NodeBB)
 [![Coverage Status](https://coveralls.io/repos/github/NodeBB/NodeBB/badge.svg?branch=master)](https://coveralls.io/github/NodeBB/NodeBB?branch=master)
-[![Dependency Status](https://david-dm.org/nodebb/nodebb.svg)](https://david-dm.org/nodebb/nodebb)
+[![Dependency Status](https://david-dm.org/nodebb/nodebb.svg?path=install)](https://david-dm.org/nodebb/nodebb?path=install)
 [![Code Climate](https://codeclimate.com/github/NodeBB/NodeBB/badges/gpa.svg)](https://codeclimate.com/github/NodeBB/NodeBB)
 [![Documentation Status](https://readthedocs.org/projects/nodebb/badge/?version=latest)](https://readthedocs.org/projects/nodebb/?badge=latest)

--- a/app.js
+++ b/app.js
@@ -30,47 +30,16 @@ nconf.argv().env({
 	separator: '__',
 });

-var url = require('url');
 var async = require('async');
 var winston = require('winston');
 var path = require('path');
-var pkg = require('./package.json');
+
 var file = require('./src/file');
-var debug = require('./src/meta/debugFork').debugging;

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

-winston.remove(winston.transports.Console);
-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 + ']';
-	},
-	level: nconf.get('log-level') || (global.env === 'production' ? 'info' : 'verbose'),
-	json: (!!nconf.get('json-logging')),
-	stringify: (!!nconf.get('json-logging')),
-});
-
-if (debug) {
-	var winstonCommon = require('winston/lib/winston/common');
-	// Override to use real console.log etc for VSCode debugger
-	winston.transports.Console.prototype.log = function (level, message, meta, callback) {
-		const output = winstonCommon.log(Object.assign({}, this, {
-			level,
-			message,
-			meta,
-		}));
-
-		console[level in console ? level : 'log'](output);
-
-		setImmediate(callback, null, true);
-	};
-}
-
-
 // Alternate configuration file support
-var	configFile = path.join(__dirname, '/config.json');
+var	configFile = path.join(__dirname, 'config.json');

 if (nconf.get('config')) {
 	configFile = path.resolve(__dirname, nconf.get('config'));
@@ -78,8 +47,10 @@ if (nconf.get('config')) {

 var configExists = file.existsSync(configFile) || (nconf.get('url') && nconf.get('secret') && nconf.get('database'));

-loadConfig();
-versionCheck();
+var prestart = require('./src/prestart');
+prestart.loadConfig(configFile);
+prestart.versionCheck();
+prestart.setupWinston();

 if (!process.send) {
 	// If run using `node app`, log GNU copyright info along with server info
@@ -89,224 +60,40 @@ if (!process.send) {
 	winston.info('');
 }

-
 if (nconf.get('setup') || nconf.get('install')) {
-	setup();
+	require('./src/cli/setup').setup();
 } else if (!configExists) {
 	require('./install/web').install(nconf.get('port'));
 } else if (nconf.get('upgrade')) {
-	upgrade();
+	require('./src/cli/upgrade').upgrade(true);
 } else if (nconf.get('reset')) {
-	async.waterfall([
-		async.apply(require('./src/reset').reset),
-		async.apply(require('./src/meta/build').buildAll),
+	var options = {
+		theme: nconf.get('t'),
+		plugin: nconf.get('p'),
+		widgets: nconf.get('w'),
+		settings: nconf.get('s'),
+		all: nconf.get('a'),
+	};
+
+	async.series([
+		async.apply(require('./src/cli/reset').reset, options),
+		require('./src/meta/build').buildAll,
 	], function (err) {
-		process.exit(err ? 1 : 0);
+		if (err) {
+			throw err;
+		}
+
+		process.exit(0);
 	});
 } else if (nconf.get('activate')) {
-	activate();
+	require('./src/cli/manage').activate(nconf.get('activate'));
 } else if (nconf.get('plugins')) {
-	listPlugins();
+	require('./src/cli/manage').listPlugins();
 } else if (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),
-	]);
+	require('./src/cli/manage').listEvents();
 } else {
 	require('./src/start').start();
 }

-function loadConfig(callback) {
-	winston.verbose('* using configuration stored in: %s', configFile);
-
-	nconf.file({
-		file: configFile,
-	});
-
-	nconf.defaults({
-		base_dir: __dirname,
-		themes_path: path.join(__dirname, 'node_modules'),
-		upload_path: 'public/uploads',
-		views_dir: path.join(__dirname, 'build/public/templates'),
-		version: pkg.version,
-	});
-
-	if (!nconf.get('isCluster')) {
-		nconf.set('isPrimary', 'true');
-		nconf.set('isCluster', 'false');
-	}
-
-	// Ensure themes_path is a full filepath
-	nconf.set('themes_path', path.resolve(__dirname, nconf.get('themes_path')));
-	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();
-	}
-}
-
-function setup() {
-	winston.info('NodeBB Setup Triggered via Command Line');
-
-	var install = require('./src/install');
-	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');
-	process.stdout.write('Press enter to accept the default setting (shown in brackets).\n');
-
-	async.series([
-		async.apply(install.setup),
-		async.apply(loadConfig),
-		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 += 1) {
-				separator += '=';
-			}
-		}
-		process.stdout.write('\n' + separator + '\n\n');
-
-		if (err) {
-			winston.error('There was a problem completing NodeBB setup', err);
-			throw err;
-		} else {
-			if (data.hasOwnProperty('password')) {
-				process.stdout.write('An administrative user was automatically created for you:\n');
-				process.stdout.write('    Username: ' + data.username + '\n');
-				process.stdout.write('    Password: ' + data.password + '\n');
-				process.stdout.write('\n');
-			}
-			process.stdout.write('NodeBB Setup Completed. Run \'./nodebb start\' to manually start your NodeBB server.\n');
-
-			// If I am a child process, notify the parent of the returned data before exiting (useful for notifying
-			// hosts of auto-generated username/password during headless setups)
-			if (process.send) {
-				process.send(data);
-			}
-		}
-
-		process.exit();
-	});
-}
-
-function upgrade() {
-	var db = require('./src/database');
-	var meta = require('./src/meta');
-	var upgrade = require('./src/upgrade');
-	var build = require('./src/meta/build');
-	var tasks = [db.init, meta.configs.init];
-
-	if (nconf.get('upgrade') !== true) {
-		// Likely an upgrade script name passed in
-		tasks.push(async.apply(upgrade.runParticular, nconf.get('upgrade').split(',')));
-	} else {
-		tasks.push(upgrade.run, build.buildAll);
-	}
-	// 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);
-		} else {
-			process.exit(0);
-		}
-	});
-}
-
-function activate() {
-	var db = require('./src/database');
-	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('An error occurred during plugin activation', err);
-			throw err;
-		}
-		process.exit(0);
-	});
-}
-
-function listPlugins() {
-	require('./src/database').init(function (err) {
-		if (err) {
-			winston.error(err.stack);
-			process.exit(1);
-		}
-
-		var db = require('./src/database');
-
-		db.getSortedSetRange('plugins:active', 0, -1, function (err, plugins) {
-			if (err) {
-				winston.error(err.stack);
-				process.exit(1);
-			}
-
-			winston.info('Active plugins: \n\t - ' + plugins.join('\n\t - '));
-			process.exit();
-		});
-	});
-}
-
-function versionCheck() {
-	var version = process.version.slice(1);
-	var range = pkg.engines.node;
-	var semver = require('semver');
-	var compatible = semver.satisfies(version, range);
-
-	if (!compatible) {
-		winston.warn('Your version of Node.js is too outdated for NodeBB. Please update your version of Node.js.');
-		winston.warn('Recommended ' + range.green + ', '.reset + version.yellow + ' provided\n'.reset);
-	}
-}
--- a/install/data/defaults.json
+++ b/install/data/defaults.json
@@ -37,5 +37,6 @@
    "unreadCutoff": 2,
    "bookmarkThreshold": 5,
    "topicsPerList": 20,
-    "autoDetectLang": 1
+    "autoDetectLang": 1,
+    "privileges:flag": 0
 }
--- a/install/databases.js
+++ b/install/databases.js
@@ -12,8 +12,7 @@ var questions = {
 module.exports = function (config, callback) {
 	async.waterfall([
 		function (next) {
-			process.stdout.write('\n');
-			winston.info('Now configuring ' + config.database + ' database:');
+			winston.info('\nNow configuring ' + config.database + ' database:');
 			getDatabaseConfig(config, next);
 		},
 		function (databaseConfig, next) {
--- a/install/package.json
+++ b/install/package.json
@@ -0,0 +1,140 @@
+{
+    "name": "nodebb",
+    "license": "GPL-3.0",
+    "description": "NodeBB Forum",
+    "version": "1.7.2",
+    "homepage": "http://www.nodebb.org",
+    "repository": {
+      "type": "git",
+      "url": "https://github.com/NodeBB/NodeBB/"
+    },
+    "main": "app.js",
+    "scripts": {
+      "start": "node loader.js",
+      "lint": "eslint --cache ./nodebb .",
+      "pretest": "npm run lint",
+      "test": "nyc --reporter=html --reporter=text-summary mocha",
+      "coveralls": "nyc report --reporter=text-lcov | coveralls && rm -r coverage"
+    },
+    "dependencies": {
+      "ace-builds": "^1.2.9",
+      "async": "2.6.0",
+      "autoprefixer": "7.1.6",
+      "bcryptjs": "2.4.3",
+      "benchpressjs": "^1.2.0",
+      "body-parser": "^1.18.2",
+      "bootstrap": "^3.3.7",
+      "chart.js": "^2.7.0",
+      "colors": "^1.1.2",
+      "compression": "^1.7.1",
+      "commander": "^2.11.0",
+      "connect-ensure-login": "^0.1.1",
+      "connect-flash": "^0.1.1",
+      "connect-mongo": "2.0.0",
+      "connect-multiparty": "^2.1.0",
+      "connect-redis": "3.3.2",
+      "cookie-parser": "^1.4.3",
+      "cron": "^1.3.0",
+      "cropperjs": "^1.1.3",
+      "csurf": "^1.9.0",
+      "daemon": "^1.1.0",
+      "express": "^4.16.2",
+      "express-session": "^1.15.6",
+      "express-useragent": "1.0.8",
+      "graceful-fs": "^4.1.11",
+      "html-to-text": "3.3.0",
+      "ipaddr.js": "^1.5.4",
+      "jimp": "0.2.28",
+      "jquery": "^3.2.1",
+      "jsesc": "2.5.1",
+      "json-2-csv": "^2.1.2",
+      "less": "^2.7.2",
+      "lodash": "^4.17.4",
+      "logrotate-stream": "^0.2.5",
+      "lru-cache": "4.1.1",
+      "material-design-lite": "^1.3.0",
+      "mime": "^2.0.3",
+      "mkdirp": "^0.5.1",
+      "mongodb": "2.2.33",
+      "morgan": "^1.9.0",
+      "mousetrap": "^1.6.1",
+      "nconf": "^0.9.1",
+      "nodebb-plugin-composer-default": "6.0.7",
+      "nodebb-plugin-dbsearch": "2.0.9",
+      "nodebb-plugin-emoji": "2.0.7",
+      "nodebb-plugin-emoji-android": "2.0.0",
+      "nodebb-plugin-markdown": "8.2.2",
+      "nodebb-plugin-mentions": "2.2.2",
+      "nodebb-plugin-soundpack-default": "1.0.0",
+      "nodebb-plugin-spam-be-gone": "0.5.1",
+      "nodebb-rewards-essentials": "0.0.9",
+      "nodebb-theme-lavender": "5.0.0",
+      "nodebb-theme-persona": "7.2.7",
+      "nodebb-theme-slick": "1.1.2",
+      "nodebb-theme-vanilla": "8.1.4",
+      "nodebb-widget-essentials": "4.0.1",
+      "nodemailer": "4.4.0",
+      "passport": "^0.4.0",
+      "passport-local": "1.0.0",
+      "postcss": "6.0.14",
+      "postcss-clean": "1.1.0",
+      "promise-polyfill": "^6.0.2",
+      "prompt": "^1.0.0",
+      "redis": "2.8.0",
+      "request": "2.83.0",
+      "rimraf": "2.6.2",
+      "rss": "^1.2.2",
+      "sanitize-html": "^1.14.1",
+      "semver": "^5.4.1",
+      "serve-favicon": "^2.4.5",
+      "sitemap": "^1.13.0",
+      "socket.io": "2.0.4",
+      "socket.io-client": "2.0.4",
+      "socket.io-redis": "5.2.0",
+      "socketio-wildcard": "2.0.0",
+      "spdx-license-list": "^3.0.1",
+      "toobusy-js": "^0.5.1",
+      "uglify-js": "^3.1.5",
+      "validator": "9.1.2",
+      "winston": "^2.4.0",
+      "xml": "^1.0.1",
+      "xregexp": "3.2.0",
+      "zxcvbn": "^4.4.2"
+    },
+    "devDependencies": {
+      "coveralls": "^3.0.0",
+      "eslint": "^4.9.0",
+      "eslint-config-airbnb-base": "^12.1.0",
+      "eslint-plugin-import": "^2.8.0",
+      "grunt": "^1.0.1",
+      "grunt-contrib-watch": "^1.0.0",
+      "jsdom": "^11.3.0",
+      "mocha": "^4.0.1",
+      "mocha-lcov-reporter": "^1.3.0",
+      "nyc": "^11.2.1",
+      "smtp-server": "^3.3.0"
+    },
+    "bugs": {
+      "url": "https://github.com/NodeBB/NodeBB/issues"
+    },
+    "engines": {
+      "node": ">=6"
+    },
+    "maintainers": [
+      {
+        "name": "Andrew Rodrigues",
+        "email": "andrew@nodebb.org",
+        "url": "https://github.com/psychobunny"
+      },
+      {
+        "name": "Julian Lam",
+        "email": "julian@nodebb.org",
+        "url": "https://github.com/julianlam"
+      },
+      {
+        "name": "Barış Soner Uşaklı",
+        "email": "baris@nodebb.org",
+        "url": "https://github.com/barisusakli"
+      }
+    ]
+  }
--- a/install/web.js
+++ b/install/web.js
@@ -5,6 +5,7 @@ var express = require('express');
 var bodyParser = require('body-parser');
 var fs = require('fs');
 var path = require('path');
+var childProcess = require('child_process');
 var less = require('less');
 var async = require('async');
 var uglify = require('uglify-js');
@@ -26,6 +27,7 @@ winston.add(winston.transports.File, {

 var web = {};
 var scripts = [
+	'node_modules/jquery/dist/jquery.js',
 	'public/vendor/xregexp/xregexp.js',
 	'public/vendor/xregexp/unicode/unicode-base.js',
 	'public/src/utils.js',
@@ -53,7 +55,7 @@ web.install = function (port) {
 		extended: true,
 	}));

-	async.parallel([compileLess, compileJS], function (err) {
+	async.parallel([compileLess, compileJS, copyCSS], function (err) {
 		if (err) {
 			winston.error(err);
 		}
@@ -77,10 +79,14 @@ function setupRoutes() {

 function welcome(req, res) {
 	var dbs = ['redis', 'mongo'];
-	var databases = dbs.map(function (el) {
+	var databases = dbs.map(function (databaseName) {
+		var questions = require('../src/database/' + databaseName).questions.filter(function (question) {
+			return question && !question.hideOnWebInstall;
+		});
+
 		return {
-			name: el,
-			questions: require('../src/database/' + el).questions,
+			name: databaseName,
+			questions: questions,
 		};
 	});

@@ -122,24 +128,25 @@ function launch(req, res) {
 	res.json({});
 	server.close();

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

-	process.stdout.write('\nStarting NodeBB\n');
-	process.stdout.write('    "./nodebb stop" to stop the NodeBB server\n');
-	process.stdout.write('    "./nodebb log" to view server output\n');
-	process.stdout.write('    "./nodebb restart" to restart NodeBB\n');
+	console.log('\nStarting NodeBB');
+	console.log('    "./nodebb stop" to stop the NodeBB server');
+	console.log('    "./nodebb log" to view server output');
+	console.log('    "./nodebb restart" to restart NodeBB');

-	async.parallel([
-		function (next) {
-			fs.unlink(path.join(__dirname, '../public/installer.css'), next);
-		},
-		function (next) {
-			fs.unlink(path.join(__dirname, '../public/installer.min.js'), next);
-		},
-	], function (err) {
+	var filesToDelete = [
+		'installer.css',
+		'installer.min.js',
+		'bootstrap.min.css',
+	];
+
+	async.each(filesToDelete, function (filename, next) {
+		fs.unlink(path.join(__dirname, '../public', filename), next);
+	}, function (err) {
 		if (err) {
 			winston.warn('Unable to remove installer files');
 		}
@@ -194,4 +201,15 @@ function compileJS(callback) {
 	});
 }

+function copyCSS(next) {
+	async.waterfall([
+		function (next) {
+			fs.readFile(path.join(__dirname, '../node_modules/bootstrap/dist/css/bootstrap.min.css'), 'utf8', next);
+		},
+		function (src, next) {
+			fs.writeFile(path.join(__dirname, '../public/bootstrap.min.css'), src, next);
+		},
+	], next);
+}
+
 module.exports = web;
--- a/547
+++ b/547
@@ -2,549 +2,4 @@

 'use strict';

-var fs = require('fs');
-var path = require('path');
-var cproc = require('child_process');
-
-var packageInstall = require('./src/meta/package-install');
-
-// check to make sure dependencies are installed
-try {
-	fs.readFileSync(path.join(__dirname, './package.json'));
-	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');
-
-		packageInstall.updatePackageFile();
-		packageInstall.preserveExtraneousPlugins();
-		packageInstall.npmInstallProduction();
-	} else {
-		throw e;
-	}
-}
-
-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/installing/os/\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;
-			}
-
-			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);
-	});
-}
-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 next(err);
-			}
-
-			try {
-				pkg = JSON.parse(pkg);
-				versionHash[module] = pkg.version;
-				next();
-			} catch (err) {
-				next(err);
-			}
-		});
-	}, function (err) {
-		callback(err, versionHash);
-	});
-}
-function checkPlugins(standalone, callback) {
-	if (standalone) {
-		process.stdout.write('Checking installed plugins and themes for updates... ');
-	}
-
-	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;
-				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);
-			});
-		},
-	], 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);
-		}
-
-		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);
-			}
-			return 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 = ['i'];
-				found.forEach(function (suggestObj) {
-					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);
-				});
-			} else {
-				process.stdout.write('\nPackage upgrades skipped'.yellow + '. Check for upgrades at any time by running "'.reset + './nodebb upgrade-plugins'.green + '".\n'.reset);
-				callback();
-			}
-		});
-	});
-}
-
-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('\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);
-
-			// Spawn a new NodeBB process
-			cproc.fork(loaderPath, process.argv.slice(3), {
-				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();
-			}
-			if (name.startsWith('nodebb-theme')) {
-				fork(['--reset', '-t', name]);
-				return;
-			}
-			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);
-
-				return upgradeProc.on('close', function (err) {
-					if (err) {
-						process.stdout.write('Error occurred during upgrade');
-						throw err;
-					}
-				});
-			}
-
-			async.series([
-				function (next) {
-					packageInstall.updatePackageFile();
-					packageInstall.preserveExtraneousPlugins();
-					next();
-				},
-				function (next) {
-					process.stdout.write('1. '.bold + 'Bringing base dependencies up to date... \n'.yellow);
-					packageInstall.npmInstallProduction();
-					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);
-					upgradeProc.on('error', next);
-				},
-			], function (err) {
-				if (err) {
-					process.stdout.write('Error occurred during upgrade');
-					throw err;
-				}
-
-				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;
-			}
-			var keys = Object.keys(commands).filter(function (key) {
-				return !commands[key].hidden;
-			});
-
-			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();
-}
+require('./src/cli');
--- a/nodebb.bat
+++ b/nodebb.bat
@@ -1 +1 @@
-node ./nodebb %*
+@echo off && cd %~dp0 && node ./src/cli %*
--- a/package.default.json
+++ b/package.default.json
@@ -1,137 +0,0 @@
-{
-  "name": "nodebb",
-  "license": "GPL-3.0",
-  "description": "NodeBB Forum",
-  "version": "1.6.1",
-  "homepage": "http://www.nodebb.org",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/NodeBB/NodeBB/"
-  },
-  "main": "app.js",
-  "scripts": {
-    "start": "node loader.js",
-    "lint": "eslint --cache ./nodebb .",
-    "pretest": "npm run lint",
-    "test": "nyc --reporter=html --reporter=text-summary mocha",
-    "coveralls": "nyc report --reporter=text-lcov | coveralls && rm -r coverage"
-  },
-  "dependencies": {
-    "ace-builds": "^1.2.9",
-    "async": "2.5.0",
-    "autoprefixer": "7.1.6",
-    "bcryptjs": "2.4.3",
-    "benchpressjs": "^1.1.2",
-    "body-parser": "^1.18.2",
-    "bootstrap": "^3.3.7",
-    "chart.js": "^2.7.0",
-    "colors": "^1.1.2",
-    "compression": "^1.7.1",
-    "connect-ensure-login": "^0.1.1",
-    "connect-flash": "^0.1.1",
-    "connect-mongo": "2.0.0",
-    "connect-multiparty": "^2.1.0",
-    "connect-redis": "3.3.2",
-    "cookie-parser": "^1.4.3",
-    "cron": "^1.3.0",
-    "cropperjs": "^1.1.3",
-    "csurf": "^1.9.0",
-    "daemon": "^1.1.0",
-    "express": "^4.16.2",
-    "express-session": "^1.15.6",
-    "express-useragent": "1.0.8",
-    "html-to-text": "3.3.0",
-    "ipaddr.js": "^1.5.4",
-    "jimp": "0.2.28",
-    "jquery": "^3.2.1",
-    "jsesc": "2.5.1",
-    "json-2-csv": "^2.1.2",
-    "less": "^2.7.2",
-    "lodash": "^4.17.4",
-    "logrotate-stream": "^0.2.5",
-    "lru-cache": "4.1.1",
-    "mime": "^2.0.3",
-    "minimist": "^1.2.0",
-    "mkdirp": "^0.5.1",
-    "mongodb": "2.2.33",
-    "morgan": "^1.9.0",
-    "mousetrap": "^1.6.1",
-    "nconf": "^0.8.5",
-    "nodebb-plugin-composer-default": "6.0.5",
-    "nodebb-plugin-dbsearch": "2.0.8",
-    "nodebb-plugin-emoji-extended": "1.1.1",
-    "nodebb-plugin-emoji-one": "1.2.1",
-    "nodebb-plugin-markdown": "8.2.0",
-    "nodebb-plugin-mentions": "2.2.0",
-    "nodebb-plugin-soundpack-default": "1.0.0",
-    "nodebb-plugin-spam-be-gone": "0.5.1",
-    "nodebb-rewards-essentials": "0.0.9",
-    "nodebb-theme-lavender": "5.0.0",
-    "nodebb-theme-persona": "7.0.1",
-    "nodebb-theme-slick": "1.1.1",
-    "nodebb-theme-vanilla": "8.0.1",
-    "nodebb-widget-essentials": "4.0.1",
-    "nodemailer": "4.3.0",
-    "passport": "^0.4.0",
-    "passport-local": "1.0.0",
-    "postcss": "6.0.13",
-    "postcss-clean": "1.1.0",
-    "promise-polyfill": "^6.0.2",
-    "prompt": "^1.0.0",
-    "redis": "2.8.0",
-    "request": "2.83.0",
-    "rimraf": "2.6.2",
-    "rss": "^1.2.2",
-    "sanitize-html": "^1.14.1",
-    "semver": "^5.4.1",
-    "serve-favicon": "^2.4.5",
-    "sitemap": "^1.13.0",
-    "socket.io": "2.0.4",
-    "socket.io-client": "2.0.4",
-    "socket.io-redis": "5.2.0",
-    "socketio-wildcard": "2.0.0",
-    "spdx-license-list": "^3.0.1",
-    "toobusy-js": "^0.5.1",
-    "uglify-js": "^3.1.5",
-    "validator": "9.0.0",
-    "winston": "^2.4.0",
-    "xml": "^1.0.1",
-    "xregexp": "3.2.0",
-    "zxcvbn": "^4.4.2"
-  },
-  "devDependencies": {
-    "coveralls": "^3.0.0",
-    "eslint": "^4.9.0",
-    "eslint-config-airbnb-base": "^12.1.0",
-    "eslint-plugin-import": "^2.8.0",
-    "grunt": "^1.0.1",
-    "grunt-contrib-watch": "^1.0.0",
-    "jsdom": "^11.3.0",
-    "mocha": "^4.0.1",
-    "mocha-lcov-reporter": "^1.3.0",
-    "nyc": "^11.2.1"
-  },
-  "bugs": {
-    "url": "https://github.com/NodeBB/NodeBB/issues"
-  },
-  "engines": {
-    "node": ">=6"
-  },
-  "maintainers": [
-    {
-      "name": "Andrew Rodrigues",
-      "email": "andrew@nodebb.org",
-      "url": "https://github.com/psychobunny"
-    },
-    {
-      "name": "Julian Lam",
-      "email": "julian@nodebb.org",
-      "url": "https://github.com/julianlam"
-    },
-    {
-      "name": "Barış Soner Uşaklı",
-      "email": "baris@nodebb.org",
-      "url": "https://github.com/barisusakli"
-    }
-  ]
-}
--- a/public/images/emails/digestheader.jpg
+++ b/public/images/emails/digestheader.jpg
--- a/public/images/emails/digestheader.png
+++ b/public/images/emails/digestheader.png
--- a/public/images/emails/notification.png
+++ b/public/images/emails/notification.png
--- a/public/language/ar/admin/admin.json
+++ b/public/language/ar/admin/admin.json
@@ -1,7 +1,7 @@
 {
-	"alert.confirm-reload": "Are you sure you wish to reload NodeBB?",
-	"alert.confirm-restart": "Are you sure you wish to restart NodeBB?",
+	"alert.confirm-reload": "هل تريد بالتأكيد إعادة تحميل NodeBB؟",
+	"alert.confirm-restart": "هل تريد بالتأكيد إعادة تشغيل NodeBB؟",

-	"acp-title": "%1 | NodeBB Admin Control Panel",
-	"settings-header-contents": "Contents"
+	"acp-title": "لوحة تحكم إدارة NodeBB | %1",
+	"settings-header-contents": "محتويات"
 }
--- a/public/language/ar/admin/advanced/cache.json
+++ b/public/language/ar/admin/advanced/cache.json
@@ -1,11 +1,11 @@
 {
-	"post-cache": "Post Cache",
-	"posts-in-cache": "Posts in Cache",
-	"average-post-size": "Average Post Size",
-	"length-to-max": "Length / Max",
+	"post-cache": "التخزين المؤقت للمشاركات",
+	"posts-in-cache": "المشاركات المخزنة مؤقتاً",
+	"average-post-size": "متوسط حجم المشاركة",
+	"length-to-max": "الطول / أقصى حد",
 	"percent-full": "%1% Full",
-	"post-cache-size": "Post Cache Size",
-	"items-in-cache": "Items in Cache",
-	"control-panel": "Control Panel",
-	"update-settings": "Update Cache Settings"
+	"post-cache-size": "حجم التخزين المؤقت للمشاركات",
+	"items-in-cache": "العناصر في التخزين المؤقت",
+	"control-panel": "لوحة التحكم",
+	"update-settings": "تحديث إعدادات التخزين المؤقت"
 }
--- a/public/language/ar/admin/advanced/database.json
+++ b/public/language/ar/admin/advanced/database.json
@@ -16,7 +16,7 @@
 	"mongo.index-size": "Index Size",
 	"mongo.file-size": "File Size",
 	"mongo.resident-memory": "Resident Memory",
-	"mongo.virtual-memory": "Virtual Memory",
+	"mongo.virtual-memory": "الذاكرة الإفتراضية",
 	"mongo.mapped-memory": "Mapped Memory",
 	"mongo.raw-info": "MongoDB Raw Info",

@@ -25,10 +25,10 @@
 	"redis.connected-clients": "Connected Clients",
 	"redis.connected-slaves": "Connected Slaves",
 	"redis.blocked-clients": "Blocked Clients",
-	"redis.used-memory": "Used Memory",
+	"redis.used-memory": "الذاكرة المستخدمة",
 	"redis.memory-frag-ratio": "Memory Fragmentation Ratio",
-	"redis.total-connections-recieved": "Total Connections Received",
-	"redis.total-commands-processed": "Total Commands Processed",
+	"redis.total-connections-recieved": "إجمالي الاتصالات المستلمة",
+	"redis.total-commands-processed": "إجمالي الأوامر التي تمت معالجتها",
 	"redis.iops": "Instantaneous Ops. Per Second",
 	"redis.keyspace-hits": "Keyspace Hits",
 	"redis.keyspace-misses": "Keyspace Misses",
--- a/public/language/ar/admin/advanced/errors.json
+++ b/public/language/ar/admin/advanced/errors.json
@@ -1,14 +1,14 @@
 {
-	"figure-x": "Figure %1",
-	"error-events-per-day": "<code>%1</code> events per day",
-	"error.404": "404 Not Found",
-	"error.503": "503 Service Unavailable",
-	"manage-error-log": "Manage Error Log",
-	"export-error-log": "Export Error Log (CSV)",
-	"clear-error-log": "Clear Error Log",
-	"route": "Route",
-	"count": "Count",
-	"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"
+	"figure-x": "شكل %1",
+	"error-events-per-day": "<code>%1</code> حدث كل يوم ",
+	"error.404": "404 لم يتم العثور",
+	"error.503": "503 الخدمة غير متوفرة",
+	"manage-error-log": "إدارة سجل الأخطاء",
+	"export-error-log": "تصدير سجل الأخطاء (CSV)",
+	"clear-error-log": "محو سجل الأخطاء",
+	"route": "مسار",
+	"count": "عدد",
+	"no-routes-not-found": "لا توجد اخطاء 404!",
+	"clear404-confirm": "هل تريد بالتأكيد محو سجلات الخطأ 404؟",
+	"clear404-success": "أخطاء \"404 لم يتم العثور\" تم محوها بنجاح"
 }
--- a/public/language/ar/admin/advanced/events.json
+++ b/public/language/ar/admin/advanced/events.json
@@ -1,6 +1,6 @@
 {
-	"events": "Events",
-	"no-events": "There are no events",
-	"control-panel": "Events Control Panel",
-	"delete-events": "Delete Events"
+	"events": "أحداث",
+	"no-events": "لا توجد أحداث",
+	"control-panel": "لوحة تحكم الأحداث",
+	"delete-events": "حذف الأحداث"
 }
--- a/public/language/ar/admin/advanced/logs.json
+++ b/public/language/ar/admin/advanced/logs.json
@@ -1,7 +1,7 @@
 {
-	"logs": "Logs",
-	"control-panel": "Logs Control Panel",
-	"reload": "Reload Logs",
-	"clear": "Clear Logs",
-	"clear-success": "Logs Cleared!"
+	"logs": "السجلات",
+	"control-panel": "لوحة تحكم السجلات",
+	"reload": "إعادة تحميل السجلات",
+	"clear": "محو السجلات",
+	"clear-success": "تم محو السجلات!"
 }
--- a/public/language/ar/admin/appearance/customise.json
+++ b/public/language/ar/admin/appearance/customise.json
@@ -1,12 +1,16 @@
 {
-	"custom-css": "Custom CSS",
-	"custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.",
-	"custom-css.enable": "Enable Custom CSS",
+	"custom-css": "CSS مخصص",
+	"custom-css.description": "أدخل CSS الخاصة بك هنا، والتي سيتم تطبيقها بعد كل القوالب الأخرى.",
+	"custom-css.enable": "تفعيل CSS المخصص",

-	"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-js": "Javascript مخصصة",
+	"custom-js.description": "أدخل Javascript الخاص بك هنا. سيتم تنفيذها بعد تحميل الصفحة بالكامل.",
+	"custom-js.enable": "تفعيل Javascript المخصصة",

-	"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"
+	"custom-header": "ترويسة مخصصة",
+	"custom-header.description": "أدخل HTML الخاصة بك هنا (مثل العلامات الوصفية، وما إلى ذلك)، والتي سيتم إلحاقها الى<code>&lt;head&gt;</code> في تصميم المنتدى. يسمح باستخدام علامات النص البرمجي، ولكن سيتم تعطيلها؛ لتوفر تبويبة\n<a href=\"#custom-header\" data-toggle=\"tab\">Javascript المخصصة</a>",
+	"custom-header.enable": "تفعيل الترويسة المخصصة",
+
+	"custom-css.livereload": "تفعيل إعادة التحميل المباشرة",
+	"custom-css.livereload.description": "فعل هذا الخيار لإجبار جميع الجلسات في الأجهزة التي قمت بتسجيل الدخول فيها  بحسابك على التحديث عند النقر على زر الحفظ"
 }
--- a/public/language/ar/admin/appearance/skins.json
+++ b/public/language/ar/admin/appearance/skins.json
@@ -1,9 +1,9 @@
 {
-	"loading": "Loading Skins...",
-	"homepage": "Homepage",
-	"select-skin": "Select Skin",
-	"current-skin": "Current Skin",
-	"skin-updated": "Skin Updated",
-	"applied-success": "%1 skin was succesfully applied",
-	"revert-success": "Skin reverted to base colours"
+	"loading": "جاري تحميل السمات...",
+	"homepage": "الصفحة الرئيسية",
+	"select-skin": "إختيار السمة",
+	"current-skin": "السمة الحالية",
+	"skin-updated": "تم تحديث السمة",
+	"applied-success": "تم تطبيق السمة %1 بنجاح",
+	"revert-success": "تم إستعادة الألوان الاساسية للسمة"
 }
--- a/public/language/ar/admin/appearance/themes.json
+++ b/public/language/ar/admin/appearance/themes.json
@@ -1,11 +1,11 @@
 {
-    "checking-for-installed": "Checking for installed themes...",
-    "homepage": "Homepage",
-    "select-theme": "Select Theme",
-    "current-theme": "Current Theme",
-    "no-themes": "No installed themes found",
-    "revert-confirm": "Are you sure you wish to restore the default NodeBB theme?",
-    "theme-changed": "Theme Changed",
-    "revert-success": "You have successfully reverted your NodeBB back to it's default theme.",
-    "restart-to-activate": "Please restart your NodeBB to fully activate this theme"
+    "checking-for-installed": "جاري التحقق من القوالب المثبتة...",
+    "homepage": "الصفحة الرئيسية",
+    "select-theme": "إختيار القالب",
+    "current-theme": "القالب المستخدم حالياً",
+    "no-themes": "لم يتم العثور على قوالب مثبتة",
+    "revert-confirm": "هل أنت متأكد من أنك ترغب في استعادة قااب NodeBB الافتراضي؟",
+    "theme-changed": "تم تغيير القالب",
+    "revert-success": "لقد قمت بنجاح بإستعادة القالب الأساسي لـNodeBB",
+    "restart-to-activate": "الرجاء إعادة تشغيل NodeBB لتنشيط هذا القالب بشكل كامل"
 }
--- a/public/language/ar/admin/extend/plugins.json
+++ b/public/language/ar/admin/extend/plugins.json
@@ -1,51 +1,51 @@
 {
-	"installed": "Installed",
-	"active": "Active",
-	"inactive": "Inactive",
-	"out-of-date": "Out of Date",
-	"none-found": "No plugins found.",
-	"none-active": "No Active Plugins",
-	"find-plugins": "Find Plugins",
+	"installed": "منصبة",
+	"active": "مفعلة",
+	"inactive": "معطلة",
+	"out-of-date": "غير محدثة",
+	"none-found": "لم يتم العثور على إضافات",
+	"none-active": "لا توجد إضافات مفعلة",
+	"find-plugins": "العثور على الإضافات",

-	"plugin-search": "Plugin Search",
-	"plugin-search-placeholder": "Search for plugin...",
-	"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/development/plugins/\">NodeBB Docs Portal</a>.",
+	"plugin-search": "البحث عن الإضافات",
+	"plugin-search-placeholder": "جاري البحث عن الإضافات...",
+	"reorder-plugins": "إعادة ترتيب الإضافات",
+	"order-active": "ترتيب الإضافات المفعلة",
+	"dev-interested": "هل انته مهتم ببرمجة إضافات لـNodeBB؟",
+	"docs-info": "دليل كامل حول برمجة الإضافات بالإمكان العثور عليه في <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",
+	"order.description": "بعض الإضافات تعمل بشكل مثالي عندما يتم تفعيلها قبل أو بعد الإضافات الأخرى.",
+	"order.explanation": "يتم تحميل الإضافات حسب الترتيب المحدد هنا، من الأعلى إلى الأسفل",

-	"plugin-item.themes": "Themes",
-	"plugin-item.deactivate": "Deactivate",
-	"plugin-item.activate": "Activate",
-	"plugin-item.install": "Install",
-	"plugin-item.uninstall": "Uninstall",
-	"plugin-item.settings": "Settings",
-	"plugin-item.installed": "Installed",
-	"plugin-item.latest": "Latest",
-	"plugin-item.upgrade": "Upgrade",
-	"plugin-item.more-info": "For more information:",
-	"plugin-item.unknown": "Unknown",
-	"plugin-item.unknown-explanation": "The state of this plugin could not be determined, possibly due to a misconfiguration error.",
+	"plugin-item.themes": "القوالب",
+	"plugin-item.deactivate": "تعطيل",
+	"plugin-item.activate": "تفعيل",
+	"plugin-item.install": "تنصيب",
+	"plugin-item.uninstall": "إلغاء التنصيب",
+	"plugin-item.settings": "الإعدادات",
+	"plugin-item.installed": "المنصبة",
+	"plugin-item.latest": "الأحدث",
+	"plugin-item.upgrade": "ترقية",
+	"plugin-item.more-info": "لمزيد من المعلومات:",
+	"plugin-item.unknown": "غير معروف",
+	"plugin-item.unknown-explanation": "تعذر تحديد حالة هذه الإضافة، ربما بسبب خطأ في الإعدادات.",

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

-	"license.title": "Plugin License Information",
+	"license.title": "معلومات ترخيص الإضافة",
 	"license.intro": "The plugin <strong>%1</strong> is licensed under the %2. Please read and understand the license terms prior to activating this plugin.",
-	"license.cta": "Do you wish to continue with activating this plugin?"
+	"license.cta": "هل ترغب بالاستمرار في تفعيل هذه الإضافة؟"
 }
--- a/public/language/ar/admin/general/dashboard.json
+++ b/public/language/ar/admin/general/dashboard.json
@@ -1,69 +1,69 @@
 {
 	"forum-traffic": "Forum Traffic",
-	"page-views": "Page Views",
-	"unique-visitors": "Unique Visitors",
-	"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>",
+	"page-views": "مشاهدات الصفحات",
+	"unique-visitors": "زائرين فريدين",
+	"users": "أعضاء",
+	"posts": "مشاركات",
+	"topics": "مواضيع",
+	"page-views-seven": "آخر 7 ايام",
+	"page-views-thirty": "آخر 30 يوماً",
+	"page-views-last-day": "آخر 24 ساعة",
+	"page-views-custom": "مدة زمنية مخصصة",
+	"page-views-custom-start": "بداية المدة",
+	"page-views-custom-end": "نهاية المده",
+	"page-views-custom-help": "أدخل نطاقا زمنيا لمرات مشاهدة الصفحات التي ترغب في عرضها. إذا لم يظهر منتقي التاريخ، فإن التنسيق المقبول هو <code>YYYY-MM-DD</code>",
+	"page-views-custom-error": "الرجاء إدخال نطاق تاريخ صالح بالتنسيق <code>YYYY-MM-DD</code>",

-	"stats.day": "Day",
-	"stats.week": "Week",
-	"stats.month": "Month",
-	"stats.all": "All Time",
+	"stats.day": "يوم",
+	"stats.week": "إسبوع",
+	"stats.month": "شهر",
+	"stats.all": "كل الوقت",

-	"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/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>",
+	"updates": "تحديثات",
+	"running-version": "المنتدى يعمل حاليا على <strong>NodeBB الإصدار<span id=\"version\">%1</span></strong>.",
+	"keep-updated": "تأكد دائما من أن NodeBB يعمل على احدث إصدار للحصول على أحدث التصحيحات الأمنية وإصلاحات الأخطاء.",
+	"up-to-date": "<p>المنتدى <strong>يعمل على أحدث إصدار</strong> <i class=\"fa fa-check\"></i></p>",
+	"upgrade-available": "<p>نسخة جديدة (الإصدار %1) تم إصدارها. خذ بعين الاعتبار <a href=\"https://docs.nodebb.org/configuring/upgrade/\">ترقية NodeBB الخاص بك</a>.</p>",
+	"prerelease-upgrade-available": "<p>نسخة ما قبل الإصدار من NodeBB هذه قديمة. إصدار أحدث (الإصدار %1) تم إصداره. خذ بعين الاعتبار <a href=\"https://docs.nodebb.org/configuring/upgrade/\">ترقية NodeBB الخاص بك</a>.</p>",
+	"prerelease-warning": "<p>هذه نسخة <strong>ماقبل الإصدار</strong> من NodeBB. قد تحدث أخطاء غير مقصودة. <i class=\"fa fa-exclamation-triangle\"></i></p>",
+	"running-in-development": "المنتدى قيد التشغيل في وضع \"المطورين\". وقد تكون هناك ثغرات أمنية مفتوحة؛ من فضلك تواصل مع مسؤول نظامك.",

-	"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",
+	"notices": "إشعارات",
+	"restart-not-required": "إعادة التشغيل غير مطلوب",
+	"restart-required": "إعادة التشغيل مطلوبة",
+	"search-plugin-installed": "إضافة البحث منصبة",
+	"search-plugin-not-installed": "إضافة البحث غير منصبة",
+	"search-plugin-tooltip": "نصب إضافة البحث من صفحة الإضافات البرمجية لتنشيط وظيفة البحث",

-	"control-panel": "System Control",
-	"reload": "Reload",
-	"restart": "Restart",
-	"restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.",
-	"maintenance-mode": "Maintenance Mode",
-	"maintenance-mode-title": "Click here to set up maintenance mode for NodeBB",
-	"realtime-chart-updates": "Realtime Chart Updates",
+	"control-panel": "التحكم بالنظام",
+	"reload": "إعادة تحمبل",
+	"restart": "إعادة تشغيل",
+	"restart-warning": "إعادة تحميل او تشغيل NodeBB سوف يؤدي لقطع جميع الإتصالات لبضع ثواني.",
+	"maintenance-mode": "وضع الصيانة",
+	"maintenance-mode-title": "انقر هنا لإعداد وضع الصيانة لـNodeBB",
+	"realtime-chart-updates": "التحديث الفوري للرسم البياني",

-	"active-users": "Active Users",
-	"active-users.users": "Users",
-	"active-users.guests": "Guests",
-	"active-users.total": "Total",
+	"active-users": "المستخدمين النشطين",
+	"active-users.users": "الأعضاء",
+	"active-users.guests": "الزوار",
+	"active-users.total": "المجموع",
 	"active-users.connections": "Connections",

-	"anonymous-registered-users": "Anonymous vs Registered Users",
-	"anonymous": "Anonymous",
-	"registered": "Registered",
+	"anonymous-registered-users": "المجهولين مقابل المستخدمين المسجلين",
+	"anonymous": "مجهول",
+	"registered": "مسجل",

-	"user-presence": "User Presence",
-	"on-categories": "On categories list",
-	"reading-posts": "Reading posts",
-	"browsing-topics": "Browsing topics",
-	"recent": "Recent",
-	"unread": "Unread",
+	"user-presence": "تواجد المستخدمين",
+	"on-categories": "في قائمة الأقسام",
+	"reading-posts": "قراءة المشاركات",
+	"browsing-topics": "تصفح المواضيع",
+	"recent": "الأخيرة",
+	"unread": "غير مقروء",

-	"high-presence-topics": "High Presence Topics",
+	"high-presence-topics": "مواضيع ذات حضور قوي",

-	"graphs.page-views": "Page Views",
-	"graphs.unique-visitors": "Unique Visitors",
-	"graphs.registered-users": "Registered Users",
-	"graphs.anonymous-users": "Anonymous Users"
+	"graphs.page-views": "مشاهدات الصفحة",
+	"graphs.unique-visitors": "زوار فريدين",
+	"graphs.registered-users": "مستخدمين مسجلين",
+	"graphs.anonymous-users": "مستخدمين مجهولين"
 }
--- a/public/language/ar/admin/general/languages.json
+++ b/public/language/ar/admin/general/languages.json
@@ -1,6 +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",
-	"auto-detect": "Auto Detect Language Setting for Guests"
+	"language-settings": "اعدادات اللغة",
+	"description": "تُحدد اللغة الافتراضية إعدادات اللغة لجميع المستخدمين الذين يزورون المنتدى. <br />يمكن للأعضاء تجاوز اللغة الافتراضية من خلال صفحة إعدادات الحساب الخاصة بهم.",
+	"default-language": "اللغة الافتراضية",
+	"auto-detect": "الكشف عن إعدادات اللغة للزوار بشكل آلي"
 }
--- a/public/language/ar/admin/menu.json
+++ b/public/language/ar/admin/menu.json
@@ -1,34 +1,34 @@
 {
-	"section-general": "General",
-	"general/dashboard": "Dashboard",
-	"general/homepage": "Home Page",
-	"general/navigation": "Navigation",
-	"general/languages": "Languages",
-	"general/sounds": "Sounds",
-	"general/social": "Social",
+	"section-general": "عام",
+	"general/dashboard": "اللوحة الرئيسية",
+	"general/homepage": "الصفحة الرئيسية",
+	"general/navigation": "التصفح",
+	"general/languages": "اللغات",
+	"general/sounds": "الأصوات",
+	"general/social": "شبكات التواصل",

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

-	"section-settings": "Settings",
-	"settings/general": "General",
-	"settings/reputation": "Reputation",
-	"settings/email": "Email",
-	"settings/user": "User",
-	"settings/group": "Group",
-	"settings/guest": "Guests",
-	"settings/uploads": "Uploads",
-	"settings/post": "Post",
-	"settings/chat": "Chat",
-	"settings/pagination": "Pagination",
-	"settings/tags": "Tags",
-	"settings/notifications": "Notifications",
+	"section-settings": "إعدادات",
+	"settings/general": "عامة",
+	"settings/reputation": "السمعة",
+	"settings/email": "البريد الإلكتروني",
+	"settings/user": "الأعضاء",
+	"settings/group": "المجموعات",
+	"settings/guest": "الزوار",
+	"settings/uploads": "الرفع",
+	"settings/post": "المشاركة",
+	"settings/chat": "الدردشة",
+	"settings/pagination": "ترقيم الصفحات",
+	"settings/tags": "الكلمات المفتاحية",
+	"settings/notifications": "التنبيهات",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",
@@ -39,7 +39,7 @@
 	"section-appearance": "Appearance",
 	"appearance/themes": "Themes",
 	"appearance/skins": "Skins",
-	"appearance/customise": "Custom HTML & CSS",
+	"appearance/customise": "Custom Content (HTML/JS/CSS)",

 	"section-extend": "Extend",
 	"extend/plugins": "Plugins",
--- a/public/language/ar/admin/settings/notifications.json
+++ b/public/language/ar/admin/settings/notifications.json
@@ -1,5 +1,6 @@
 {
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
-	"welcome-notification-link": "Welcome Notification Link"
+	"welcome-notification-link": "Welcome Notification Link",
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }
--- a/public/language/ar/admin/settings/post.json
+++ b/public/language/ar/admin/settings/post.json
@@ -4,6 +4,7 @@
 	"sorting.oldest-to-newest": "Oldest to Newest",
 	"sorting.newest-to-oldest": "Newest to Oldest",
 	"sorting.most-votes": "Most Votes",
+	"sorting.most-posts": "Most Posts",
 	"sorting.topic-default": "Default Topic Sorting",
 	"restrictions": "Posting Restrictions",
 	"restrictions.post-queue": "Enable post queue",
--- a/public/language/ar/admin/settings/uploads.json
+++ b/public/language/ar/admin/settings/uploads.json
@@ -1,28 +1,28 @@
 {
-	"posts": "Posts",
-	"allow-files": "Allow users to upload regular files",
-	"private": "Make uploaded files private",
-	"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 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>). 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",
-	"default-avatar": "Custom Default Avatar",
-	"upload": "Upload",
-	"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 kibibytes, default: 256 KiB)",
-	"max-cover-image-size": "Maximum Cover Image File Size",
-	"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"
+	"posts": "المشاركات",
+	"allow-files": "السماح للأعضاء بتحميل الملفات الإعتيادية",
+	"private": "جعل الملفات التي تم رفعها خاصة",
+	"max-image-width": "تغيير حجم الصور إلى عرض محدد (بالبكسل)",
+	"max-image-width-help": "(بالبكسل، الافتراضي: 760 بكسل، ضع إلى 0 لتعطيل الخاصية)",
+	"max-file-size": "الحد الأقصى لحجم الملف (بالكيبيبايت)",
+	"max-file-size-help": "(بالكيبيبايت، الافتراضي: 2048)",
+	"allow-topic-thumbnails": "السماح للاعضاء برفع الصور المصغرة للموضوع",
+	"topic-thumb-size": "حجم الصورة المصغرة للموضوع",
+	"allowed-file-extensions": "إمتدادات الملفات المسموح بها",
+	"allowed-file-extensions-help": "أدخل قائمة بامتدادات الملفات مفصولة بفواصل (مثال: <code>pdf,xls,doc</code>). القائمة الفارغة تعني أن كل الامتدادات مسموح بها.",
+	"profile-avatars": "الصورة الرمزية للملف الشخصي",
+	"allow-profile-image-uploads": "السماح للأعضاء برفع الصور الرمزية",
+	"convert-profile-image-png": "تحويل إمتداد الصور الرمزية المرفوعه الى PNG",
+	"default-avatar": "الصورة الرمزية الافتراضية",
+	"upload": "رفع",
+	"profile-image-dimension": "أبعاد الصورة الرمزية",
+	"profile-image-dimension-help": "(بالبكسل، الافتراضي: 128 بكسل)",
+	"max-profile-image-size": "الحد الأقصى لحجم الصورة الرمزية",
+	"max-profile-image-size-help": "(بالكيبيبايت، الافتراضي: 256)",
+	"max-cover-image-size": "الحد الأقصى لحجم صورة الغلاف",
+	"max-cover-image-size-help": "(بالكيبيبايت، الافتراضي: 2,048)",
+	"keep-all-user-images": "الاحتفاظ بالنسخ القديمة من الصور الرمزية وصور الغلاف في السيرفر",
+	"profile-covers": "غلاف الملف الشخصي",
+	"default-covers": "صورة الغلاف الافتراضية",
+	"default-covers-help": "اضف صور الغلاف الافتراضية متبوعة بفواصل لاستخدامها في الحسابات التي لا تحتوي على صور غلاف مرفوعة"
 }
--- a/public/language/ar/admin/settings/user.json
+++ b/public/language/ar/admin/settings/user.json
@@ -1,55 +1,57 @@
 {
-	"authentication": "Authentication",
-	"allow-local-login": "Allow local login",
-	"require-email-confirmation": "Require Email Confirmation",
-	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
-	"allow-login-with": "Allow login with",
-	"allow-login-with.username-email": "Username or Email",
-	"allow-login-with.username": "Username Only",
-	"allow-login-with.email": "Email Only",
-	"account-settings": "Account Settings",
-	"disable-username-changes": "Disable username changes",
-	"disable-email-changes": "Disable email changes",
-	"disable-password-changes": "Disable password changes",
-	"allow-account-deletion": "Allow account deletion",
-	"user-info-private": "Hide user list and data from guests",
-	"hide-fullname": "Hide fullname from users",
-	"hide-email": "Hide email from users",
-	"themes": "Themes",
-	"disable-user-skins": "Prevent users from choosing a custom skin",
-	"account-protection": "Account Protection",
-	"login-attempts": "Login attempts per hour",
-	"login-attempts-help": "If login attempts to a user&apos;s account exceeds this threshold, that account will be locked for a pre-configured amount of time",
-	"lockout-duration": "Account Lockout Duration (minutes)",
-	"login-days": "Days to remember user login sessions",
-	"password-expiry-days": "Force password reset after a set number of days",
-	"registration": "User Registration",
-	"registration-type": "Registration Type",
-	"registration-type.normal": "Normal",
-	"registration-type.admin-approval": "Admin Approval",
-	"registration-type.admin-approval-ip": "Admin Approval for IPs",
-	"registration-type.invite-only": "Invite Only",
-	"registration-type.admin-invite-only": "Admin Invite Only",
-	"registration-type.disabled": "No registration",
-	"registration-type.help": "Normal - Users can register from the /register page.<br/>\nAdmin Approval - User registrations are placed in an <a href=\"%1/admin/manage/registration\">approval queue</a> for administrators.<br/>\nAdmin Approval for IPs - Normal for new users, Admin Approval for IP addresses that already have an account.<br/>\nInvite Only - Users can invite others from the <a href=\"%1/users\" target=\"_blank\">users</a> page.<br/>\nAdmin Invite Only - Only administrators can invite others from <a href=\"%1/users\" target=\"_blank\">users</a> and <a href=\"%1/admin/manage/users\">admin/manage/users</a> pages.<br/>\nNo registration - No user registration.<br/>",
-	"registration.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",
-	"user-search-results-per-page": "Number of results to display",
-	"default-user-settings": "Default User Settings",
-	"show-email": "Show email",
-	"show-fullname": "Show fullname",
-	"restrict-chat": "Only allow chat messages from users I follow",
+	"authentication": "المصادقة",
+	"allow-local-login": "السماح بتسجيل الدخول المحلي",
+	"require-email-confirmation": "يطلب تأكيد البريد الإلكتروني",
+	"email-confirm-interval": "لا يمكن للمستخدم إعادة إرسال رسالة تأكيد البريد الالكتروني حتى مرور",
+	"email-confirm-email2": "دقائق",
+	"allow-login-with": "السماح بتسجيل الدخول باستخدام",
+	"allow-login-with.username-email": "اسم المستخدم أو البريد الالكتروني",
+	"allow-login-with.username": "اسم المستخدم فقط",
+	"allow-login-with.email": "البريد الالكتروني فقط",
+	"account-settings": "إعدادت الحساب",
+	"disable-username-changes": "عدم السماح بتغيير اسم المستخدم",
+	"disable-email-changes": "عدم السماح بتغيير البريد الالكتروني",
+	"disable-password-changes": "عدم السماح بتغيير كلمة المرور",
+	"allow-account-deletion": "السماح بحذف الحساب",
+	"user-info-private": "إخفاء قائمة المستخدم والبيانات عن الزوار",
+	"hide-fullname": "إخفاء الإسم الكامل عن المستخدمين",
+	"hide-email": "إخفاء البريد الإلكتروني عن المستخدمين",
+	"themes": "القوالب",
+	"disable-user-skins": "منع المستخدمين من اختيار سمة مخصص",
+	"account-protection": "حماية الحساب",
+	"admin-relogin-duration": "المدة حتى طلب إعادة تسجيل الدخول للإدارة (دقائق)",
+	"admin-relogin-duration-help": "بعد مرور وقت معين، يتوجب إعادة تسجيل الدخول للوصول إلى قسم الإدارة، قم بتعيين القيمة الى 0 لتعطيل الخيار",
+	"login-attempts": "عدد محاولات تسجيل الدخول في الساعة",
+	"login-attempts-help": "إذا تجاوزت محاولات تسجيل الدخول لمستخدم معين العدد المحدد، فسوف يتم تأمين الحساب ومنعه من الدخول لمدة من الوقت",
+	"lockout-duration": "مدة تأمين الحساب (دقائق)",
+	"login-days": "عدد الأيام لتذكر جلسات تسجيل دخول المستخدم",
+	"password-expiry-days": "فرض عملية تغيير كلمة المرور بعد مرور عدد محدد من الأيام",
+	"registration": "تسجيل المستخدم",
+	"registration-type": "نوع التسجيل",
+	"registration-type.normal": "عادي",
+	"registration-type.admin-approval": "بموافقة الإدارة",
+	"registration-type.admin-approval-ip": "بموافقة الإدارة لعناوين IP",
+	"registration-type.invite-only": "بالدعوات فقط",
+	"registration-type.admin-invite-only": "بالدعوات من قبل الإدارة فقط",
+	"registration-type.disabled": "لا يوجد تسجيل",
+	"registration-type.help": "عادي - بإمكان المستخدمين التسجيل من خلال صفحة /التسجيل.<br/>\nبموافقة الإدارة - يتم وضع قائمة تسجيلات المستخدمين في <a href=\"%1/admin/manage/registration\">قائمة إنتظار موافقة</a> الإدارة.<br/>\nبموافقة الإدارة لعناوين IP - عادي بالنسبة للمستخدمين الجدد، ويتطلب موافقة الإدارة للتسجيل من عناوين IP تم التسجيل بإستخدامها مسبقاً.<br/>\nبالدعوات فقط - بإمكان المستخدمين إرسال دعوات من خلال صفحة <a href=\"%1/users\" target=\"_blank\">الأعضاء</a>.<br/>\nبالدعوات من قبل الإدارة فقط - فقط المراء بإمكانهم إرسال الدعوات من خلال صفحة <a href=\"%1/users\" target=\"_blank\">الأعضاء</a> و صفحات <a href=\"%1/admin/manage/users\">الإدارة/المشرفين/الأعضاء</a>.<br/>\nلا يوجد تسجيل - إغلاق خيار التسجيل بالكامل.<br/>",
+	"registration.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": "بحث الأعضاء",
+	"user-search-results-per-page": "عدد النتائج المراد عرضها",
+	"default-user-settings": "إعدادات الأعضاء الافتراضية",
+	"show-email": "عرض البريد الإلكتروني",
+	"show-fullname": "عرض الاسم الكامل",
+	"restrict-chat": "السماح فقط برسائل الدردشة من المستخدمين الذين أتبعهم",
 	"outgoing-new-tab": "Open outgoing links in new tab",
 	"topic-search": "Enable In-Topic Searching",
 	"digest-freq": "Subscribe to Digest",
--- a/public/language/ar/category.json
+++ b/public/language/ar/category.json
@@ -1,20 +1,20 @@
 {
-    "category": "فئة",
-    "subcategories": "فئة فرعية",
+    "category": "قسم",
+    "subcategories": "قسم فرعي",
    "new_topic_button": "موضوع جديد",
-    "guest-login-post": "سجل بالدخول للرد",
-    "no_topics": "<strong>لا توجد مواضيع في هذه الفئة</strong>لم لا تحاول إنشاء موضوع؟<br />",
+    "guest-login-post": "سجل الدخول للمشاركة",
+    "no_topics": "<strong>لا توجد مواضيع في هذه القسم</strong>لم لا تحاول إنشاء موضوع؟<br />",
    "browsing": "تصفح",
    "no_replies": "لم يرد أحد",
    "no_new_posts": "لا توجد مشاركات جديدة.",
-    "share_this_category": "انشر هذه الفئة",
+    "share_this_category": "شارك هذا القسم",
    "watch": "تابع",
    "ignore": "تجاهل",
    "watching": "متابع",
    "ignoring": "متجاهل",
    "watching.description": "أظهر المواضيع في غير مقروء",
    "ignoring.description": "لا تظهر المواضيع في غير مقروء",
-    "watch.message": "You are now watching updates from this category and all subcategories",
-    "ignore.message": "You are now ignoring updates from this category and all subcategories",
-    "watched-categories": "الفئات المتابعة"
+    "watch.message": "أنت الآن تتابع التحديثات من هذا القسم وجميع الأقسام الفرعية",
+    "ignore.message": "أنت الآن تتجاهل التحديثات من هذا القسم وجميع الأقسام الفرعية",
+    "watched-categories": "الأقسام المُتابعة"
 }
--- a/public/language/ar/email.json
+++ b/public/language/ar/email.json
@@ -30,6 +30,7 @@
    "notif.chat.unsub.info": "تم إرسال هذا الإشعار بوجودة محادثة جديدة وفقا لخيارات تسجيلك.",
    "notif.post.cta": "انقر هنا لقراءة الموضوع بأكمله",
    "notif.post.unsub.info": "تم إشعارك بهذه المشاركة بناءً على الخيارات التي سبق وأن حددتها.",
+    "notif.cta": "Click here to go to forum",
    "test.text1": "هذه رسالة تجريبية للتأكد من صحة إعدادت الرسائل الإلكترونية في منتدى NodeBB خاصتك.",
    "unsub.cta": "انقر هنا لتغيير تلك الإعدادات",
    "banned.subject": "You have been banned from %1",
--- a/public/language/ar/error.json
+++ b/public/language/ar/error.json
@@ -119,11 +119,13 @@
    "not-enough-reputation-to-downvote": "ليس لديك سمعة تكفي لإضافة صوت سلبي لهذا الموضوع",
    "not-enough-reputation-to-flag": "ليس لديك سمعة تكفي للإشعار بموضوع مخل",
    "already-flagged": "لقد بلغت عن هذه المشاركة من قبل.",
+    "self-vote": "You cannot vote on your own post",
    "reload-failed": "المنتدى واجه مشكلة أثناء إعادة التحميل: \"%1\".  سيواصل المنتدى خدمة العملاء السابقين لكن يجب عليك إلغاء أي تغيير قمت به قبل إعادة التحميل.",
    "registration-error": "حدث خطأ أثناء التسجيل",
    "parse-error": "حدث خطأ ما أثناء تحليل استجابة الخادم",
    "wrong-login-type-email": "الرجاء استعمال بريدك اﻹلكتروني للدخول",
    "wrong-login-type-username": "الرجاء استعمال اسم المستخدم الخاص بك للدخول",
+    "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first",
    "invite-maximum-met": "لقد قمت بدعوة الحد الأقصى من الأشخاص (%1 من %2)",
    "no-session-found": "لم دخول مسجل!",
    "not-in-room": "المستخدم غير موجود في الغرفة.",
@@ -132,5 +134,6 @@
    "no-users-selected": "لا يوجد مستخدم محدد.",
    "invalid-home-page-route": "Invalid home page route",
    "invalid-session": "Session Mismatch",
-    "invalid-session-text": "يبدو أن فترة التسجيل لم تعد قائمة او هي غير مطابقة مع الخادم. يرجى إعادة تحميل هذه الصفحة."
+    "invalid-session-text": "يبدو أن فترة التسجيل لم تعد قائمة او هي غير مطابقة مع الخادم. يرجى إعادة تحميل هذه الصفحة.",
+    "no-topics-selected": "No topics selected!"
 }
--- a/public/language/ar/global.json
+++ b/public/language/ar/global.json
@@ -4,7 +4,7 @@
    "buttons.close": "أغلق",
    "403.title": "غير مسموح بالدخول",
    "403.message": "يبدو أنك قد تعثرت على صفحة لا تمتلك الصلاحية للدخول إليها",
-    "403.login": "حاول أن  <a href='%1/login'>تسجل دخولك</a>.",
+    "403.login": "ربما يجب عليك  <a href='%1/login'>تسجل دخولك</a>.",
    "404.title": "لم يتم العثور",
    "404.message": "الصفحة غير موجودة. العودة لـ <a href='%1/'>الرئيسية</a>",
    "500.title": "خطأ داخلي",
@@ -13,19 +13,19 @@
    "400.message": "الرابط غير صحيح. رجاءًا تأكد من الرابط أو ارجع لـ <a href='%1/'>الرئيسية</a>",
    "register": "تسجيل",
    "login": "دخول",
-    "please_log_in": "المرجو تسجيل الدخول",
+    "please_log_in": "الرجاء تسجيل الدخول",
    "logout": "تسجيل الخروج",
    "posting_restriction_info": "إضافة مشاركات جديد حكر على الأعضاء المسجلين، انقر هنا لتسجيل الدخول.",
    "welcome_back": "مرحبًا بعودتك",
    "you_have_successfully_logged_in": "تم سجيل الدخول بنجاح",
    "save_changes": "حفظ التغييرات",
-    "save": "Save",
+    "save": "حفظ",
    "close": "أغلق",
    "pagination": "الصفحات",
    "pagination.out_of": "%1 من %2",
    "pagination.enter_index": "أدخل الرقم التسلسلي",
-    "header.admin": "مدبر نظام",
-    "header.categories": "الفئات",
+    "header.admin": "مدير النظام",
+    "header.categories": "الأقسام",
    "header.recent": "حديث",
    "header.unread": "غير مقروء",
    "header.tags": "وسم",
@@ -37,9 +37,9 @@
    "header.search": "بحث",
    "header.profile": "ملف",
    "header.navigation": "الاستكشاف",
-    "notifications.loading": "تحميل التبليغات",
+    "notifications.loading": "تحميل التنبيهات",
    "chats.loading": "تحميل الدردشات",
-    "motd.welcome": "مرحبا بكم  NodeBB، منصة مناقشة المستقبل",
+    "motd.welcome": "مرحبا بكم في NodeBB، منصة المناقشة المستقبلية.",
    "previouspage": "الصفحة السابقة",
    "nextpage": "الصفحة التالية",
    "alert.success": "نجاح",
@@ -75,7 +75,7 @@
    "norecenttopics": "لاوجود لمواضيع جديدة",
    "recentposts": "آخر المشاركات",
    "recentips": "آخر عناوين ال IP التي سجلت الدخول",
-    "moderator_tools": "Moderator Tools",
+    "moderator_tools": "أدوات المشرف",
    "away": "غير متواجد",
    "dnd": "عدم الإزعاج",
    "invisible": "مخفي",
@@ -85,7 +85,7 @@
    "guest": "زائر",
    "guests": "الزوار",
    "updated.title": "تم تحديث المنتدى",
-    "updated.message": "لقد تم تحديث المنتدى إلى آخر نسخة للتو. المرجو إعادة تحميل الصفحة.",
+    "updated.message": "لقد تم تحديث المنتدى إلى آخر نسخة للتو. إضغط هنا لإعادة تحميل الصفحة.",
    "privacy": "الخصوصية",
    "follow": "متابعة",
    "unfollow": "إلغاء المتابعة",
@@ -97,13 +97,13 @@
    "upload_file": "ارفع ملف",
    "upload": "ارفع",
    "allowed-file-types": "صيغ الملفات المدعومة هي 1%",
-    "unsaved-changes": "لديك تغييرات لم تحفظ. هل أنت متأكد من تغيير الصفحة؟",
+    "unsaved-changes": "لديك تغييرات لم تحفظ. هل أنت متأكد من رغبتك بمغادرة الصفحة؟",
    "reconnecting-message": "يبدو أن اتصالك لـ %1 قد فقد. رجاءًا أنتظر ثم حاول الإتصال مرة اخرى.",
-    "play": "Play",
-    "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",
-    "disabled": "Disabled",
-    "select": "Select"
+    "play": "تشغيل",
+    "cookies.message": "هذا الموقع يستخدم ملفات تعريف الارتباط لضمان حصولك على أفضل تجربة على موقعنا.",
+    "cookies.accept": "فهمت الأمر!",
+    "cookies.learn_more": "أعرف المزيد",
+    "edited": "حُرِر",
+    "disabled": "معطل",
+    "select": "تحديد"
 }
--- a/public/language/ar/login.json
+++ b/public/language/ar/login.json
@@ -5,8 +5,8 @@
    "remember_me": "تذكرني؟",
    "forgot_password": "نسيت كلمة المرور؟",
    "alternative_logins": "تسجيلات الدخول البديلة",
-    "failed_login_attempt": "Login Unsuccessful",
+    "failed_login_attempt": "تسجيل الدخول غير ناجح",
    "login_successful": "قمت بتسجيل الدخول بنجاح!",
    "dont_have_account": "لا تملك حساب؟",
-    "logged-out-due-to-inactivity": "You have been logged out of the Admin Control Panel due to inactivity"
+    "logged-out-due-to-inactivity": "لقد تم تسجيل خروجك من لوحة تحكم بسبب عدم نشاطك"
 }
--- a/public/language/ar/notifications.json
+++ b/public/language/ar/notifications.json
@@ -9,6 +9,7 @@
    "continue_to": "استمر إلى %1",
    "return_to": "عودة إى %1",
    "new_notification": "تنبيه جديد",
+    "new_notification_from": "You have a new Notification from %1",
    "you_have_unread_notifications": "لديك تنبيهات غير مقروءة.",
    "all": "All",
    "topics": "Topics",
@@ -45,5 +46,19 @@
    "email-confirmed": "تم التحقق من عنوان البريد الإلكتروني",
    "email-confirmed-message": "شكرًا على إثبات صحة عنوان بريدك الإلكتروني. صار حسابك مفعلًا بالكامل.",
    "email-confirm-error-message": "حدث خطأ أثناء التحقق من عنوان بريدك الإلكتروني. ربما رمز التفعيل خاطئ أو انتهت صلاحيته.",
-    "email-confirm-sent": "تم إرسال بريد التفعيل."
+    "email-confirm-sent": "تم إرسال بريد التفعيل.",
+    "none": "None",
+    "notification_only": "Notification Only",
+    "email_only": "Email Only",
+    "notification_and_email": "Notification & Email",
+    "notificationType_upvote": "When someone upvotes your post",
+    "notificationType_new-topic": "When someone you follow posts a topic",
+    "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_follow": "When someone starts following you",
+    "notificationType_new-chat": "When you receive a chat message",
+    "notificationType_group-invite": "When you receive a group invite",
+    "notificationType_new-register": "When someone gets added to registration queue",
+    "notificationType_post-queue": "When a new post is queued",
+    "notificationType_new-post-flag": "When a post is flagged",
+    "notificationType_new-user-flag": "When a user is flagged"
 }
--- a/public/language/ar/register.json
+++ b/public/language/ar/register.json
@@ -2,8 +2,8 @@
    "register": "تسجيل",
    "cancel_registration": "إلغاء التسجيل",
    "help.email": "افتراضيا، سيتم إخفاء بريدك الإلكتروني من العامة.",
-    "help.username_restrictions": "اسم مستخدم فريدة من نوعها بين1% و2% حرفا. يمكن للآخرين ذكرك @ <'span id='your-username> اسم المستخدم </span>.",
-    "help.minimum_password_length": "كلمة المرور يجب أن تكون على الأقل بها 1% أحرف",
+    "help.username_restrictions": "اسم مستخدم فريدة من نوعها بين 1% و 2% حرفا. بإمكان الآخرين مناداتك بـ @<span id='yourUsername'>اسم المستخدم</span>.",
+    "help.minimum_password_length": "كلمة المرور يجب أن تتكون على الأقل من 1% أحرف/حروف",
    "email_address": "عنوان البريد الإلكتروني",
    "email_address_placeholder": "ادخل عنوان البريد الإلكتروني",
    "username": "اسم المستخدم",
@@ -16,8 +16,8 @@
    "alternative_registration": "طريقة تسجيل بديلة",
    "terms_of_use": "شروط الاستخدام",
    "agree_to_terms_of_use": "أوافق على شروط الاستخدام",
-    "terms_of_use_error": "You must agree to the Terms of Use",
-    "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator.",
-    "interstitial.intro": "We require some additional information before we can create your account.",
-    "interstitial.errors-found": "We could not complete your registration:"
+    "terms_of_use_error": "يجب عليك الموافقة على شروط الاستخدام",
+    "registration-added-to-queue": "تمت إضافتك في قائمة الإنتضار. ستتلقى رسالة إلكترونية عند الموافقة على تسجيلك من قبل الإدارة.",
+    "interstitial.intro": "نحتاج إلى بعض المعلومات الإضافية قبل أن نتمكن من إنشاء حسابك.",
+    "interstitial.errors-found": "تعذر علينا إتمام عملية التسجيل:"
 }
--- a/public/language/ar/topic.json
+++ b/public/language/ar/topic.json
@@ -68,6 +68,8 @@
    "thread_tools.restore_confirm": "هل أنت متأكد أنك تريد استعادة هذا الموضوع؟",
    "thread_tools.purge": "تطهير الموضوع",
    "thread_tools.purge_confirm": "هل أنت متأكد أنك تريد تطهير هذا الموضوع؟",
+    "thread_tools.merge_topics": "Merge Topics",
+    "thread_tools.merge": "Merge",
    "topic_move_success": "تم نقل هذا الموضوع إلى %1 بنجاح",
    "post_delete_confirm": "هل أنت متأكد أنك تريد حذف هذه المشاركة؟",
    "post_restore_confirm": "هل أنت متأكد أنك تريد استعادة هذه المشاركة؟",
@@ -89,6 +91,7 @@
    "fork_pid_count": "1% مشاركة محددة",
    "fork_success": "تم إنشاء فرع للموضوع بنجاح! إضغط هنا لمعاينة الفرع.",
    "delete_posts_instruction": "Click the posts you want to delete/purge",
+    "merge_topics_instruction": "Click the topics you want to merge",
    "composer.title_placeholder": "أدخل عنوان موضوعك هنا...",
    "composer.handle_placeholder": "اﻹسم",
    "composer.discard": "نبذ التغييرات",
--- a/public/language/ar/user.json
+++ b/public/language/ar/user.json
@@ -7,13 +7,13 @@
    "email": "البريد الإلكتروني",
    "confirm_email": "تأكيد عنوان البريد الإلكتروني",
    "account_info": "معلومات الحساب",
-    "ban_account": "Ban Account",
+    "ban_account": "حظر الحساب",
    "ban_account_confirm": "هل تريد حقاً حظر هاذا العضو؟",
-    "unban_account": "Unban Account",
+    "unban_account": "إزالة حظر الحساب",
    "delete_account": "حذف الحساب",
    "delete_account_confirm": "هل أن متأكد أنك تريد حذف حسابك؟<br /><strong> هذه العملية غير قابلة للإلغاء ولن يكون بالإمكان استعادة بياناتك</strong><br /><br />أدخل اسم المستخدم الخاص بك لتأكيد عملية الحذف",
-    "delete_this_account_confirm": "Are you sure you want to delete this account? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
-    "account-deleted": "Account deleted",
+    "delete_this_account_confirm": "هل انت متأكد من رغبتك بحذف هذا الحساب؟ <br /> <strong>هذا الإجراء لا رجعة فيه ولن تتمكن من استرداد أي بيانات</strong><br /><br />",
+    "account-deleted": "تم حذف الحساب",
    "fullname": "الاسم الكامل",
    "website": "الموقع الإلكتروني",
    "location": "الموقع",
@@ -25,15 +25,15 @@
    "reputation": "السمعة",
    "bookmarks": "Bookmarks",
    "watched": "متابع",
-    "ignored": "Ignored",
+    "ignored": "تم تجاهله",
    "followers": "المتابعون",
    "following": "يتابع",
    "aboutme": "معلومة عنك او السيرة الذاتية",
    "signature": "توقيع",
    "birthday": "عيد ميلاد",
    "chat": "محادثة",
-    "chat_with": "Continue chat with %1",
-    "new_chat_with": "Start new chat with %1",
+    "chat_with": "متابعة الدردشة مع %1",
+    "new_chat_with": "بدء دردشة جديدة مع %1",
    "flag-profile": "Flag Profile",
    "follow": "تابع",
    "unfollow": "إلغاء المتابعة",
@@ -44,7 +44,7 @@
    "change_email": "تغيير البريد اﻹلكتروني",
    "edit": "تعديل",
    "edit-profile": "تعديل الملف الشخصي",
-    "default_picture": "Default Icon",
+    "default_picture": "أيقونة افتراضية",
    "uploaded_picture": "الصورة المرفوعة",
    "upload_new_picture": "رفع صورة جديدة",
    "upload_new_picture_from_url": "رفع صورة جديدة من رابط",
@@ -58,17 +58,17 @@
    "change_password_success": "تم تحديث كلمة السر خاصتك.",
    "confirm_password": "تأكيد كلمة السر",
    "password": "كلمة السر",
-    "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.",
+    "username_taken_workaround": "اسم المستخدم الذي اخترته مستخدم سابقا، لذلك قمنا بتغييره لك قليلا. أنت الآن مسجل بالاسم <strong>%1</strong>",
+    "password_same_as_username": "كلمة المرور مطابقة لاسم المستخدم الخاص بك، يرجى تحديد كلمة مرور أخرى.",
+    "password_same_as_email": "كلمة المرور مطابقة لبريدك الإلكتروني، يرجى تحديد كلمة مرور أخرى.",
+    "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",
+    "remove_uploaded_picture": "إزالة الصورة المرفوعة",
+    "upload_cover_picture": "رفع صورة الغلاف",
+    "remove_cover_picture_confirm": "هل تريد بالتأكيد إزالة صورة الغلاف؟",
+    "crop_picture": "إقتصاص الصورة",
+    "upload_cropped_picture": "إقتصاص ورفع",
    "settings": "خيارات",
    "show_email": "أظهر بريدي الإلكتروني",
    "show_fullname": "أظهر اسمي الكامل",
@@ -79,61 +79,67 @@
    "digest_daily": "يوميا",
    "digest_weekly": "أسبوعيًّا",
    "digest_monthly": "شهريًّا",
-    "send_chat_notifications": "استلام رسالة إلكترونية عند ورود محادثة وأنا غير متصل.",
-    "send_post_notifications": "Send an email when replies are made to topics I am subscribed to",
    "settings-require-reload": "تغيير بعض اﻹعدادات يتطلب تحديث الصفحة. إضغط هنا لتحديث الصفحة",
-    "has_no_follower": "هذا المستخدم ليس لديه أي متابع :(",
+    "has_no_follower": "هذا المستخدم ليس لديه أية متابعين :(",
    "follows_no_one": "هذا المستخدم لا يتابع أحد :(",
-    "has_no_posts": "This user hasn't posted anything yet.",
-    "has_no_topics": "This user hasn't posted any topics yet.",
-    "has_no_watched_topics": "This user hasn't watched any topics yet.",
-    "has_no_ignored_topics": "This user hasn't ignored any topics yet.",
-    "has_no_upvoted_posts": "This user hasn't upvoted any posts yet.",
-    "has_no_downvoted_posts": "This user hasn't downvoted any posts yet.",
-    "has_no_voted_posts": "This user has no voted posts",
+    "has_no_posts": "هذا المستخدم لم يشارك حتى الآن.",
+    "has_no_topics": "هذا المستخدم لم يكتب أي موضوع حتى الآن.",
+    "has_no_watched_topics": "هذا المستخدم لم يقم بمراقبة اية مواضيع حتى الآن.",
+    "has_no_ignored_topics": "هذا المستخدم لم يقم بتجاهل اية مواضيع حتى الآن.",
+    "has_no_upvoted_posts": "هذا المستخدم لم يقم بالتصويت للأعلى لأي مشاركة حتى الآن.",
+    "has_no_downvoted_posts": "هذا المستخدم لم يقم بالتصويت للأسفل لأي مشاركة حتى الآن.",
+    "has_no_voted_posts": "هذا المستخدم لا يمتلك اية مشاركات تم التصويت عليها",
    "email_hidden": "البريد الإلكتروني مخفي",
    "hidden": "مخفي",
-    "paginate_description": "Paginate topics and posts instead of using infinite scroll",
+    "paginate_description": "عرض المواضيع والردود موزعة على صفحات عوضاً عن التمرير اللانهائي.",
    "topics_per_page": "المواضيع في كل صفحة",
    "posts_per_page": "الردود في كل صفحة",
-    "max_items_per_page": "Maximum %1",
+    "max_items_per_page": "أقصى %1",
    "notification_sounds": "تشغيل صوت عند تلقي تنبيه",
-    "notifications_and_sounds": "Notifications & Sounds",
-    "incoming-message-sound": "Incoming message sound",
-    "outgoing-message-sound": "Outgoing message sound",
-    "notification-sound": "Notification sound",
-    "no-sound": "No sound",
+    "notifications_and_sounds": "التنبيهات والأصوات",
+    "incoming-message-sound": "صوت الرسالة الواردة",
+    "outgoing-message-sound": "صوت الرسائل الصادرة",
+    "notification-sound": "صوت التنبيهات",
+    "no-sound": "بدون صوت",
+    "upvote-notif-freq": "معدل تكرار تنبيهات التصويت للأعلى",
+    "upvote-notif-freq.all": "كل التصويتات للأعلى",
+    "upvote-notif-freq.everyTen": "كل عشر تصويتات للأعلى",
+    "upvote-notif-freq.logarithmic": "On 10, 100, 1000...",
+    "upvote-notif-freq.disabled": "معطل",
    "browsing": "خيارات التصفح",
    "open_links_in_new_tab": "فتح الروابط الخارجية في نافدة جديدة",
    "enable_topic_searching": "تفعيل خاصية البحث داخل المواضيع",
-    "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
-    "delay_image_loading": "Delay Image Loading",
-    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
+    "topic_search_help": "إذا قمت بتفعيل ميزة البحث في-الموضوع،  سيتم تجاوز الخيار الافتراضي للمتصفح مما يؤدي للبحث بكامل الموضوع بدلا عن البحث في الجزء الظاهر في الشاشة.",
+    "delay_image_loading": "تأخير عرض الصور",
+    "image_load_delay_help": "إذا تم تمكينه، فلن يتم تحميل الصور في المواضيع حتى يتم تمريرها في الشاشة",
    "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Watch topics that you reply to",
-    "follow_topics_you_create": "Watch topics you create",
+    "follow_topics_you_reply_to": "متابعة المواضيع التي تقوم بالرد عليها",
+    "follow_topics_you_create": "متابعة المواضيع التي تقوم بإنشائها",
    "grouptitle": "عنوان المجموعة",
    "no-group-title": "لا يوجد عنوان للمجموعة",
-    "select-skin": "Select a Skin",
-    "select-homepage": "Select a Homepage",
+    "select-skin": "إختر سمة",
+    "select-homepage": "إختر الصفحة الرئيسية",
    "homepage": "الصفحة الرئيسية",
-    "homepage_description": "Select a page to use as the forum homepage or 'None' to use the default homepage.",
-    "custom_route": "Custom Homepage Route",
-    "custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
-    "sso.title": "Single Sign-on Services",
-    "sso.associated": "Associated with",
-    "sso.not-associated": "Click here to associate with",
-    "info.latest-flags": "Latest Flags",
-    "info.no-flags": "No Flagged Posts Found",
-    "info.ban-history": "Recent Ban History",
-    "info.no-ban-history": "This user has never been banned",
-    "info.banned-until": "Banned until %1",
-    "info.banned-permanently": "Banned permanently",
-    "info.banned-reason-label": "Reason",
-    "info.banned-no-reason": "No reason given.",
-    "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.add": "Add note"
+    "homepage_description": "حدد صفحة لاستخدامها كصفحة رئيسية للمنتدى أو \"لا شيء\" لاستخدام الصفحة الرئيسية الافتراضية.",
+    "custom_route": "مسار الصفحة الرئيسية المخصصة",
+    "custom_route_help": "أدخل اسم مسار هنا، بدون أي شرطة مائلة (على سبيل المثال \"حديثة\" أو \"شائعة\")",
+    "sso.title": "خدمات تسجيل الدخول الموحد",
+    "sso.associated": "مرتبط مع",
+    "sso.not-associated": "انقر هنا لربط مع",
+    "sso.dissociate": "فصل",
+    "sso.dissociate-confirm-title": "تأكيد الفصل",
+    "sso.dissociate-confirm": "هل تريد بالتأكيد فصل حسابك عن %1؟",
+    "info.latest-flags": "أحدث العلامات",
+    "info.no-flags": "لم يتم العثور على مشاركات معلمة",
+    "info.ban-history": "سجل الحظر الأحدث",
+    "info.no-ban-history": "هذا المستخدم لم يتم حظره مطلقا",
+    "info.banned-until": "محظور حتى %1",
+    "info.banned-permanently": "محظور بشكل دائم",
+    "info.banned-reason-label": "سبب",
+    "info.banned-no-reason": "لم يتم إعطاء سبب.",
+    "info.username-history": "سجل اسم المستخدم",
+    "info.email-history": "سجل البريد الإلكتروني",
+    "info.moderation-note": "ملاحظة الإشراف",
+    "info.moderation-note.success": "تم حفظ ملاحظة الإشراف",
+    "info.moderation-note.add": "إضافة ملاحظة"
 }
--- a/public/language/ar/users.json
+++ b/public/language/ar/users.json
@@ -10,12 +10,12 @@
    "filter-by": "Filter By",
    "online-only": "المتصلون فقط",
    "invite": "دعوة",
-    "invitation-email-sent": "An invitation email has been sent to %1",
+    "invitation-email-sent": "تم إرسال دعوة بالبريد الإلكتروني إلى %1",
    "user_list": "قائمة اﻷعضاء",
    "recent_topics": "أحدث المواضيع",
-    "popular_topics": "Popular Topics",
+    "popular_topics": "المواضيع الأكثر شهرة",
    "unread_topics": "المواضيع الغير مقروءة",
-    "categories": "الفئات",
-    "tags": "الكلمات الدلالية",
-    "no-users-found": "No users found!"
+    "categories": "الأقسام",
+    "tags": "الوسوم",
+    "no-users-found": "لم يتم العثور على مستخدمين!"
 }
--- a/public/language/bg/admin/appearance/customise.json
+++ b/public/language/bg/admin/appearance/customise.json
@@ -3,8 +3,12 @@
 	"custom-css.description": "Въведете своите собствени декларации за стилове, те ще бъдат приложени след всички останали стилове.",
 	"custom-css.enable": "Включване на персонализиран CSS",

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

 	"custom-css.livereload": "Включване на моменталното презареждане",
--- a/public/language/bg/admin/menu.json
+++ b/public/language/bg/admin/menu.json
@@ -39,7 +39,7 @@
 	"section-appearance": "Външен вид",
 	"appearance/themes": "Теми",
 	"appearance/skins": "Облици",
-	"appearance/customise": "Персонализиран HTML и CSS",
+	"appearance/customise": "Персонализирано съдържание (HTML/JS/CSS)",

 	"section-extend": "Разширяване",
 	"extend/plugins": "Добавки",
--- a/public/language/bg/admin/settings/notifications.json
+++ b/public/language/bg/admin/settings/notifications.json
@@ -1,5 +1,6 @@
 {
 	"notifications": "Известия",
 	"welcome-notification": "Приветствено известие",
-	"welcome-notification-link": "Връзка за приветственото известие"
+	"welcome-notification-link": "Връзка за приветственото известие",
+	"welcome-notification-uid": "Потр. ид. за приветственото известие"
 }
--- a/public/language/bg/admin/settings/post.json
+++ b/public/language/bg/admin/settings/post.json
@@ -4,6 +4,7 @@
 	"sorting.oldest-to-newest": "Първо най-старите",
 	"sorting.newest-to-oldest": "Първо най-новите",
 	"sorting.most-votes": "Първо тези с най-много гласове",
+	"sorting.most-posts": "Първо тези с най-много публикации",
 	"sorting.topic-default": "Подредба по подразбиране на темите",
 	"restrictions": "Ограничения за публикуването",
 	"restrictions.post-queue": "Включване на опашката за публикации",
--- a/public/language/bg/admin/settings/user.json
+++ b/public/language/bg/admin/settings/user.json
@@ -19,6 +19,8 @@
 	"themes": "Теми",
 	"disable-user-skins": "Потребителите да не могат да избират собствен облик",
 	"account-protection": "Защита на акаунта",
+	"admin-relogin-duration": "Повторно вписване на администратора (в минути)",
+	"admin-relogin-duration-help": "След определено време достъпът до административния раздел ще изисква повторно вписване. Задайте 0, за да изключите това.",
 	"login-attempts": "Брой опити за вписване на час",
 	"login-attempts-help": "Ако опитите за вписване на потребител минат тази граница, акаунтът ще бъде заключен за определено време.",
 	"lockout-duration": "Продължителност на заключването на акаунта (в минути)",
--- a/public/language/bg/email.json
+++ b/public/language/bg/email.json
@@ -30,6 +30,7 @@
    "notif.chat.unsub.info": "Това известие за разговор беше изпратено до Вас поради настройките Ви за абонаментите.",
    "notif.post.cta": "Натиснете тук, за да прочетете цялата тема",
    "notif.post.unsub.info": "Това известие за публикация беше изпратено до Вас поради настройките Ви за абонаментите.",
+    "notif.cta": "Натиснете тук, за да преминете към форума",
    "test.text1": "Това е пробно е-писмо, за да потвърдим, че изпращачът на е-поща е правилно настроен за Вашия NodeBB.",
    "unsub.cta": "Натиснете тук, за да промените тези настройки",
    "banned.subject": "Вие бяхте блокиран(а) от %1",
--- a/public/language/bg/error.json
+++ b/public/language/bg/error.json
@@ -119,11 +119,13 @@
    "not-enough-reputation-to-downvote": "Нямате достатъчно репутация, за да гласувате отрицателно за тази публикация",
    "not-enough-reputation-to-flag": "Нямате достатъчно репутация, за да докладвате тази публикация",
    "already-flagged": "Вече сте докладвали тази публикация",
+    "self-vote": "Не можете да гласувате за собствената си публикация",
    "reload-failed": "NodeBB срещна проблем при презареждането: „%1“. NodeBB ще продължи да поддържа съществуващите клиентски ресурси, но Вие трябва да отмените последните си действия преди презареждането.",
    "registration-error": "Грешка при регистрацията",
    "parse-error": "Нещо се обърка при прочитането на отговора на сървъра",
    "wrong-login-type-email": "Моля, използвайте е-пощата си, за да се впишете",
    "wrong-login-type-username": "Моля, използвайте потребителското си име, за да се впишете",
+    "sso-registration-disabled": "Регистрацията за акаунти от %1 беше забранена, моля, регистрирайте се първо с е-поща",
    "invite-maximum-met": "Вие сте поканили максимално позволения брой хора (%1 от %2).",
    "no-session-found": "Няма намерена сесия на вписване!",
    "not-in-room": "Потребителят не е в стаята",
@@ -132,5 +134,6 @@
    "no-users-selected": "Няма избран(и) потребител(и)",
    "invalid-home-page-route": "Грешен път към началната страница",
    "invalid-session": "Несъответствие в сесията",
-    "invalid-session-text": "Изглежда сесията Ви на вписване вече е изтекла или не съответства на сървъра. Моля, опреснете страницата."
+    "invalid-session-text": "Изглежда сесията Ви на вписване вече е изтекла или не съответства на сървъра. Моля, опреснете страницата.",
+    "no-topics-selected": "Няма избрани теми!"
 }
--- a/public/language/bg/notifications.json
+++ b/public/language/bg/notifications.json
@@ -9,6 +9,7 @@
    "continue_to": "Продължаване към %1",
    "return_to": "Връщане към %1",
    "new_notification": "Ново известие",
+    "new_notification_from": "Имате ново известие от %1",
    "you_have_unread_notifications": "Имате непрочетени известия",
    "all": "Всички",
    "topics": "Теми",
@@ -45,5 +46,19 @@
    "email-confirmed": "Е-пощата беше потвърдена",
    "email-confirmed-message": "Благодарим Ви, че потвърдихте е-пощата си. Акаунтът Ви е вече напълно активиран.",
    "email-confirm-error-message": "Възникна проблем при потвърждаването на е-пощата Ви. Може кодът да е грешен или давността му да е изтекла.",
-    "email-confirm-sent": "Изпратено е е-писмо за потвърждение."
+    "email-confirm-sent": "Изпратено е е-писмо за потвърждение.",
+    "none": "Нищо",
+    "notification_only": "Само известие",
+    "email_only": "Само е-писмо",
+    "notification_and_email": "Известие и е-писмо",
+    "notificationType_upvote": "Когато някой гласува положително за Ваша публикация",
+    "notificationType_new-topic": "Когато някой, когото следвате, публикува тема",
+    "notificationType_new-reply": "Когато бъде публикуван нов отговор в тема, която следвате",
+    "notificationType_follow": "Когато някой започне да Ви следва",
+    "notificationType_new-chat": "Когато получите съобщение в разговор",
+    "notificationType_group-invite": "Когато получите покана за група",
+    "notificationType_new-register": "Когато някой бъде добавен в опашката за регистрация",
+    "notificationType_post-queue": "Когато бъде добавена нова публикация в опашката",
+    "notificationType_new-post-flag": "Когато публикация бъде докладвана",
+    "notificationType_new-user-flag": "Когато потребител бъде докладван"
 }
--- a/public/language/bg/topic.json
+++ b/public/language/bg/topic.json
@@ -68,6 +68,8 @@
    "thread_tools.restore_confirm": "Наистина ли искате да възстановите тази тема?",
    "thread_tools.purge": "Изчистване на темата",
    "thread_tools.purge_confirm": "Наистина ли искате да изчистите тази тема?",
+    "thread_tools.merge_topics": "Сливане на темите",
+    "thread_tools.merge": "Сливане",
    "topic_move_success": "Темата беше преместена успешно в %1",
    "post_delete_confirm": "Наистина ли искате да изтриете тази публикация?",
    "post_restore_confirm": "Наистина ли искате да възстановите тази публикация?",
@@ -89,6 +91,7 @@
    "fork_pid_count": "Избрани публикации: %1",
    "fork_success": "Темата е разделена успешно! Натиснете тук, за да преминете към отделената тема.",
    "delete_posts_instruction": "Натиснете публикациите, които искате да изтриете/изчистите",
+    "merge_topics_instruction": "Натиснете темите, които искате да слеете",
    "composer.title_placeholder": "Въведете заглавието на темата си тук...",
    "composer.handle_placeholder": "Име",
    "composer.discard": "Отхвърляне",
--- a/public/language/bg/user.json
+++ b/public/language/bg/user.json
@@ -79,15 +79,13 @@
    "digest_daily": "Ежедневно",
    "digest_weekly": "Ежеседмично",
    "digest_monthly": "Ежемесечно",
-    "send_chat_notifications": "Изпращане на е-писмо, ако получа ново съобщение в разговор, а не съм на линия",
-    "send_post_notifications": "Изпращане на е-писмо, когато се появи отговор в темите, за които съм абониран(а).",
    "settings-require-reload": "Някои промени в настройките изискват презареждане. Натиснете тук, за да презаредите страницата.",
    "has_no_follower": "Този потребител няма последователи :(",
    "follows_no_one": "Този потребител не следва никого :(",
    "has_no_posts": "Този потребител не е публикувал нищо досега.",
    "has_no_topics": "Този потребител не е създавал теми досега.",
    "has_no_watched_topics": "Този потребител не е следил нито една тема досега.",
-    "has_no_ignored_topics": "Този потребител не е пренебрегнали нито една тема досега.",
+    "has_no_ignored_topics": "Този потребител не е пренебрегнал нито една тема досега.",
    "has_no_upvoted_posts": "Този потребител не е гласувал положително досега.",
    "has_no_downvoted_posts": "Този потребител не е гласувал отрицателно досега.",
    "has_no_voted_posts": "Този потребител не е гласувал досега.",
@@ -103,6 +101,11 @@
    "outgoing-message-sound": "Звук за изходящо съобщение",
    "notification-sound": "Звук за известие",
    "no-sound": "Без звук",
+    "upvote-notif-freq": "Честота на известията за положителни гласове",
+    "upvote-notif-freq.all": "Всички положителни гласове",
+    "upvote-notif-freq.everyTen": "На всеки десет положителни гласа",
+    "upvote-notif-freq.logarithmic": "На 10, 100, 1000…",
+    "upvote-notif-freq.disabled": "Изключено",
    "browsing": "Настройки за страниците",
    "open_links_in_new_tab": "Отваряне на външните връзки в нов подпрозорец",
    "enable_topic_searching": "Включване на търсенето в темите",
@@ -123,6 +126,9 @@
    "sso.title": "Услуги за еднократно вписване",
    "sso.associated": "Свързан с",
    "sso.not-associated": "Натиснете тук, за да свържете с",
+    "sso.dissociate": "Прекъсване на връзката",
+    "sso.dissociate-confirm-title": "Потвърждаване на прекъсването",
+    "sso.dissociate-confirm": "Наистина ли искате да прекъснете връзката на акаунта си от „%1“?",
    "info.latest-flags": "Последни доклади",
    "info.no-flags": "Не са намерени докладвани публикации",
    "info.ban-history": "Скорошна история на блокиранията",
--- a/public/language/bn/admin/appearance/customise.json
+++ b/public/language/bn/admin/appearance/customise.json
@@ -3,8 +3,12 @@
 	"custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.",
 	"custom-css.enable": "Enable Custom CSS",

+	"custom-js": "Custom Javascript",
+	"custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.",
+	"custom-js.enable": "Enable Custom Javascript",
+
 	"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.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup. Script tags are allowed, but are discouraged, as the <a href=\"#custom-header\" data-toggle=\"tab\">Custom Javascript</a> tab is available.",
 	"custom-header.enable": "Enable Custom Header",

 	"custom-css.livereload": "Enable Live Reload",
--- a/public/language/bn/admin/menu.json
+++ b/public/language/bn/admin/menu.json
@@ -39,7 +39,7 @@
 	"section-appearance": "Appearance",
 	"appearance/themes": "Themes",
 	"appearance/skins": "Skins",
-	"appearance/customise": "Custom HTML & CSS",
+	"appearance/customise": "Custom Content (HTML/JS/CSS)",

 	"section-extend": "Extend",
 	"extend/plugins": "Plugins",
--- a/public/language/bn/admin/settings/notifications.json
+++ b/public/language/bn/admin/settings/notifications.json
@@ -1,5 +1,6 @@
 {
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
-	"welcome-notification-link": "Welcome Notification Link"
+	"welcome-notification-link": "Welcome Notification Link",
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }
--- a/public/language/bn/admin/settings/post.json
+++ b/public/language/bn/admin/settings/post.json
@@ -4,6 +4,7 @@
 	"sorting.oldest-to-newest": "Oldest to Newest",
 	"sorting.newest-to-oldest": "Newest to Oldest",
 	"sorting.most-votes": "Most Votes",
+	"sorting.most-posts": "Most Posts",
 	"sorting.topic-default": "Default Topic Sorting",
 	"restrictions": "Posting Restrictions",
 	"restrictions.post-queue": "Enable post queue",
--- a/public/language/bn/admin/settings/user.json
+++ b/public/language/bn/admin/settings/user.json
@@ -19,6 +19,8 @@
 	"themes": "Themes",
 	"disable-user-skins": "Prevent users from choosing a custom skin",
 	"account-protection": "Account Protection",
+	"admin-relogin-duration": "Admin relogin duration (minutes)",
+	"admin-relogin-duration-help": "After a set amount of time accessing the admin section will require re-login, set to 0 to disable",
 	"login-attempts": "Login attempts per hour",
 	"login-attempts-help": "If login attempts to a user&apos;s account exceeds this threshold, that account will be locked for a pre-configured amount of time",
 	"lockout-duration": "Account Lockout Duration (minutes)",
--- a/public/language/bn/email.json
+++ b/public/language/bn/email.json
@@ -30,6 +30,7 @@
    "notif.chat.unsub.info": "আপনার সাবস্ক্রীপশন সেটিংসের কারনে আপনার এই নোটিফিকেশন পাঠানো হয়েছে",
    "notif.post.cta": "পুরো বিষয়টি পড়তে এখানে ক্লিক করুন",
    "notif.post.unsub.info": "আপনার সাবস্ক্রিপশন সেটিংসের কারনে আপনার এই বার্তাটি পাঠানো হয়েছে",
+    "notif.cta": "Click here to go to forum",
    "test.text1": "আপনি সঠিকভাবে নোডবিবির জন্য মেইলার সেটাপ করেছেন কিনা নিশ্চিত করার জন্য এই টেষ্ট ইমেইল পাঠানো হয়েছে",
    "unsub.cta": "সেটিংসগুলো পরিবর্তন করতে এখানে ক্লিক করুন",
    "banned.subject": "You have been banned from %1",
--- a/public/language/bn/error.json
+++ b/public/language/bn/error.json
@@ -119,11 +119,13 @@
    "not-enough-reputation-to-downvote": "আপনার এই পোস্ট downvote করার জন্য পর্যাপ্ত সম্মাননা নেই",
    "not-enough-reputation-to-flag": "এই পোষ্টকে ফ্লাগ করার জন্য আপনার পর্যাপ্ত সম্মাননা নেই",
    "already-flagged": "You have already flagged this post",
+    "self-vote": "You cannot vote on your own post",
    "reload-failed": "\"%1\" রিলোড করতে সমস্যা হয়েছে। রিলোডের পূর্বে যা করা হয়েছিল সেটি আনডু করা সমীচীন। ",
    "registration-error": "নিবন্ধন এরর!",
    "parse-error": "Something went wrong while parsing server response",
    "wrong-login-type-email": "Please use your email to login",
    "wrong-login-type-username": "Please use your username to login",
+    "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first",
    "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
    "no-session-found": "No login session found!",
    "not-in-room": "User not in room",
@@ -132,5 +134,6 @@
    "no-users-selected": "No user(s) selected",
    "invalid-home-page-route": "Invalid home page route",
    "invalid-session": "Session Mismatch",
-    "invalid-session-text": "It looks like your login session is no longer active, or no longer matches with the server. Please refresh this page."
+    "invalid-session-text": "It looks like your login session is no longer active, or no longer matches with the server. Please refresh this page.",
+    "no-topics-selected": "No topics selected!"
 }
--- a/public/language/bn/notifications.json
+++ b/public/language/bn/notifications.json
@@ -9,6 +9,7 @@
    "continue_to": "%1 তে আগান",
    "return_to": "%1 এ ফেরত যান",
    "new_notification": "নতুন বিজ্ঞপ্তি",
+    "new_notification_from": "You have a new Notification from %1",
    "you_have_unread_notifications": "আপনার অপঠিত বিজ্ঞপ্তি আছে।",
    "all": "All",
    "topics": "Topics",
@@ -45,5 +46,19 @@
    "email-confirmed": "ইমেইল নিশ্চিত করা হয়েছে",
    "email-confirmed-message": "আপনার ইমেইল যাচাই করার জন্য আপনাকে ধন্যবাদ। আপনার অ্যাকাউন্টটি এখন সম্পূর্ণরূপে সক্রিয়।",
    "email-confirm-error-message": "আপনার ইমেল ঠিকানার বৈধতা যাচাইয়ে একটি সমস্যা হয়েছে। সম্ভবত কোডটি ভুল ছিল অথবা কোডের মেয়াদ শেষ হয়ে গিয়েছে।",
-    "email-confirm-sent": "নিশ্চিতকরণ ইমেইল পাঠানো হয়েছে।"
+    "email-confirm-sent": "নিশ্চিতকরণ ইমেইল পাঠানো হয়েছে।",
+    "none": "None",
+    "notification_only": "Notification Only",
+    "email_only": "Email Only",
+    "notification_and_email": "Notification & Email",
+    "notificationType_upvote": "When someone upvotes your post",
+    "notificationType_new-topic": "When someone you follow posts a topic",
+    "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_follow": "When someone starts following you",
+    "notificationType_new-chat": "When you receive a chat message",
+    "notificationType_group-invite": "When you receive a group invite",
+    "notificationType_new-register": "When someone gets added to registration queue",
+    "notificationType_post-queue": "When a new post is queued",
+    "notificationType_new-post-flag": "When a post is flagged",
+    "notificationType_new-user-flag": "When a user is flagged"
 }
--- a/public/language/bn/topic.json
+++ b/public/language/bn/topic.json
@@ -68,6 +68,8 @@
    "thread_tools.restore_confirm": "আপনি নিশ্চিত যে আপনি টপিকটি পুনরূদ্ধার করতে চান?",
    "thread_tools.purge": "টপিক পার্জ করুন",
    "thread_tools.purge_confirm": "আপনি নিশ্চিত যে আপনি টপিকটি পার্জ করতে চাচ্ছেন ? ",
+    "thread_tools.merge_topics": "Merge Topics",
+    "thread_tools.merge": "Merge",
    "topic_move_success": "টপিকটি %1  এ সরিয়ে নেয়া হয়েছে",
    "post_delete_confirm": "আপনি নিশ্চিত যে আপনি এই পোষ্টটি মুছে ফেলতে চান ?",
    "post_restore_confirm": "আপনি নিশ্চিত যে আপনি এই পোষ্টটি পুনরূূদ্ধার করতে চান ? ",
@@ -89,6 +91,7 @@
    "fork_pid_count": "%1 post(s) selected",
    "fork_success": "টপিক ফর্ক করা হয়েছে। ফর্ক করা টপিকে যেতে এখানে ক্লিক করুন",
    "delete_posts_instruction": "Click the posts you want to delete/purge",
+    "merge_topics_instruction": "Click the topics you want to merge",
    "composer.title_placeholder": "আপনার টপিকের শিরোনাম দিন",
    "composer.handle_placeholder": "Name",
    "composer.discard": "বাতিল",
--- a/public/language/bn/user.json
+++ b/public/language/bn/user.json
@@ -79,8 +79,6 @@
    "digest_daily": "দৈনিক",
    "digest_weekly": "সাপ্তাহিক",
    "digest_monthly": "মাসিক",
-    "send_chat_notifications": "যদি আমি অনলাইনে না থাকি, সেক্ষেত্রে নতুন চ্যাট মেসেজ আসলে আমাকে ইমেইল করুন",
-    "send_post_notifications": "আমার সাবস্ক্রাইব করা টপিকগুলোতে রিপ্লাই করা হলে আমাকে মেইল করা হোক",
    "settings-require-reload": "কিছু কিছু পরিবর্তনের জন্য রিলোড করা আবশ্যক।  পেজটি রিলোড করতে এখানে ক্লিক করুন",
    "has_no_follower": "এই সদস্যের কোন ফলোয়ার নেই :(",
    "follows_no_one": "এই সদস্য কাউকে ফলো করছেন না :(",
@@ -103,6 +101,11 @@
    "outgoing-message-sound": "Outgoing message sound",
    "notification-sound": "Notification sound",
    "no-sound": "No sound",
+    "upvote-notif-freq": "Upvote Notification Frequency",
+    "upvote-notif-freq.all": "All Upvotes",
+    "upvote-notif-freq.everyTen": "Every Ten Upvotes",
+    "upvote-notif-freq.logarithmic": "On 10, 100, 1000...",
+    "upvote-notif-freq.disabled": "Disabled",
    "browsing": "Browsing সেটিংস",
    "open_links_in_new_tab": "আউটগোয়িং লিংকগুলো নতুন ট্যাবে খুলুন",
    "enable_topic_searching": "In-Topic সার্চ সক্রীয় করো",
@@ -123,6 +126,9 @@
    "sso.title": "Single Sign-on Services",
    "sso.associated": "Associated with",
    "sso.not-associated": "Click here to associate with",
+    "sso.dissociate": "Dissociate",
+    "sso.dissociate-confirm-title": "Confirm Dissociation",
+    "sso.dissociate-confirm": "Are you sure you wish to dissociate your account from %1?",
    "info.latest-flags": "Latest Flags",
    "info.no-flags": "No Flagged Posts Found",
    "info.ban-history": "Recent Ban History",
--- a/public/language/cs/admin/appearance/customise.json
+++ b/public/language/cs/admin/appearance/customise.json
@@ -3,8 +3,12 @@
 	"custom-css.description": "Zadejte vlastní deklarace CSS, které budou použity na všechny ostatních styly.",
 	"custom-css.enable": "Povolit uživatelské CSS",

+	"custom-js": "Custom Javascript",
+	"custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.",
+	"custom-js.enable": "Enable Custom Javascript",
+
 	"custom-header": "Uživatelská hlavička",
-	"custom-header.description": "Zadejte zde uživatelské HTML (např.: javascript, meta značky, atp.), které bude přiřazeno k <code>&lt;head&gt;</code>  části značek vašeho fóra.",
+	"custom-header.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup. Script tags are allowed, but are discouraged, as the <a href=\"#custom-header\" data-toggle=\"tab\">Custom Javascript</a> tab is available.",
 	"custom-header.enable": "Povolit uživatelskou hlavičku",

 	"custom-css.livereload": "Povolit aktuální znovu načtení",
--- a/public/language/cs/admin/menu.json
+++ b/public/language/cs/admin/menu.json
@@ -39,7 +39,7 @@
 	"section-appearance": "Vzhled",
 	"appearance/themes": "Motivy",
 	"appearance/skins": "Vzhledy",
-	"appearance/customise": "Uživatelské HTML a CSS",
+	"appearance/customise": "Custom Content (HTML/JS/CSS)",

 	"section-extend": "Rozšířit",
 	"extend/plugins": "Rozšíření",
--- a/public/language/cs/admin/settings/notifications.json
+++ b/public/language/cs/admin/settings/notifications.json
@@ -1,5 +1,6 @@
 {
 	"notifications": "Oznámení",
 	"welcome-notification": "Uvítání",
-	"welcome-notification-link": "Odkaz na uvítání"
+	"welcome-notification-link": "Odkaz na uvítání",
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }
--- a/public/language/cs/admin/settings/post.json
+++ b/public/language/cs/admin/settings/post.json
@@ -4,6 +4,7 @@
 	"sorting.oldest-to-newest": "Od nejstarších po nejnovější",
 	"sorting.newest-to-oldest": "Od nejnovějších po nejstarší",
 	"sorting.most-votes": "Dle hlasování",
+	"sorting.most-posts": "Most Posts",
 	"sorting.topic-default": "Výchozí třídění tématu",
 	"restrictions": "Omezení příspěvků",
 	"restrictions.post-queue": "Povolit frontu pro příspěvky",
--- a/public/language/cs/admin/settings/user.json
+++ b/public/language/cs/admin/settings/user.json
@@ -19,6 +19,8 @@
 	"themes": "Motivy",
 	"disable-user-skins": "Zabránit uživateli ve výběru vlastního vzhledu",
 	"account-protection": "Ochrana účtu",
+	"admin-relogin-duration": "Admin relogin duration (minutes)",
+	"admin-relogin-duration-help": "After a set amount of time accessing the admin section will require re-login, set to 0 to disable",
 	"login-attempts": "Počet pokusů o přihlášení za hodinu",
 	"login-attempts-help": "Překročí-li pokusy o přihlášení uživatele/ů  tuto hranici, účet bude uzamknut na určený čas",
 	"lockout-duration": "Délka blokování účtu (v minutách)",
--- a/public/language/cs/email.json
+++ b/public/language/cs/email.json
@@ -30,6 +30,7 @@
    "notif.chat.unsub.info": "Toto upozornění na chat vám bylo odesláno na základě vašeho nastavení odběru.",
    "notif.post.cta": "Klikněte zde pro přečtené celého tématu",
    "notif.post.unsub.info": "Toto upozornění na příspěvek vám bylo odesláno na základě vašeho nastavení odběru.",
+    "notif.cta": "Click here to go to forum",
    "test.text1": "Tento testovací e-mail slouží k ověření, že je e-mailer správně nastaven pro práci s NodeBB.",
    "unsub.cta": "Chcete-li změnit tyto nastavení, klikněte zde.",
    "banned.subject": "Byl jste zablokován od %1",
--- a/public/language/cs/error.json
+++ b/public/language/cs/error.json
@@ -119,11 +119,13 @@
    "not-enough-reputation-to-downvote": "Nemáte dostatečnou reputaci pro vyjádření nesouhlasu u tohoto příspěvku",
    "not-enough-reputation-to-flag": "Pro označení tohoto příspěvku nemáte dostatečnou reputaci",
    "already-flagged": "Tento příspěvek jste již označil",
+    "self-vote": "You cannot vote on your own post",
    "reload-failed": "Vyskytla se chyba v NodeBB při znovu načtení: \"%1\". NodeBB bude pokračovat v běhu na straně klienta,  nicméně byste měl/a přenastavit zpět to, co jste udělal/a před opětovným načtením.",
    "registration-error": "Chyba při registraci",
    "parse-error": "Při analýze odpovědi serveru nastala chyba",
    "wrong-login-type-email": "Pro přihlášení použijte vaši e-mailovou adresu",
    "wrong-login-type-username": "Pro přihlášení použijte vaše uživatelské jméno",
+    "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first",
    "invite-maximum-met": "Již jste pozval/a maximálně možný počet lidí (%1 z %2).",
    "no-session-found": "Nebyla nalezena relace s přihlášením.",
    "not-in-room": "Uživatel není přítomen v místnosti",
@@ -132,5 +134,6 @@
    "no-users-selected": "Žádný uživatel/é nebyl/y vybrán/i",
    "invalid-home-page-route": "Neplatná cesta k domovské stránkce",
    "invalid-session": "Nesoulad v relacích",
-    "invalid-session-text": "Zdá se, že vše relace s přihlášením již není aktivní nebo již neodpovídá s relací na serveru. Obnovte prosím tuto stránku."
+    "invalid-session-text": "Zdá se, že vše relace s přihlášením již není aktivní nebo již neodpovídá s relací na serveru. Obnovte prosím tuto stránku.",
+    "no-topics-selected": "No topics selected!"
 }
--- a/public/language/cs/notifications.json
+++ b/public/language/cs/notifications.json
@@ -9,6 +9,7 @@
    "continue_to": "Pokračovat na %1",
    "return_to": "Vrátit se na %1",
    "new_notification": "Nové upozornění",
+    "new_notification_from": "You have a new Notification from %1",
    "you_have_unread_notifications": "Máte nepřečtená upozornění.",
    "all": "Vše",
    "topics": "Témata",
@@ -45,5 +46,19 @@
    "email-confirmed": "E-mail potvrzen",
    "email-confirmed-message": "Děkujeme za ověření vaší e-mailové adresy. Váš účet je nyní aktivní.",
    "email-confirm-error-message": "Nastal problém s ověřením vaší e-mailové adresy. Kód je pravděpodobně neplatný nebo jeho platnost vypršela.",
-    "email-confirm-sent": "Ověřovací e-mail odeslán."
+    "email-confirm-sent": "Ověřovací e-mail odeslán.",
+    "none": "None",
+    "notification_only": "Notification Only",
+    "email_only": "Email Only",
+    "notification_and_email": "Notification & Email",
+    "notificationType_upvote": "When someone upvotes your post",
+    "notificationType_new-topic": "When someone you follow posts a topic",
+    "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_follow": "When someone starts following you",
+    "notificationType_new-chat": "When you receive a chat message",
+    "notificationType_group-invite": "When you receive a group invite",
+    "notificationType_new-register": "When someone gets added to registration queue",
+    "notificationType_post-queue": "When a new post is queued",
+    "notificationType_new-post-flag": "When a post is flagged",
+    "notificationType_new-user-flag": "When a user is flagged"
 }
--- a/public/language/cs/topic.json
+++ b/public/language/cs/topic.json
@@ -68,6 +68,8 @@
    "thread_tools.restore_confirm": "Jste si jist/a, že chcete toto téma obnovit?",
    "thread_tools.purge": "Vyčistit téma",
    "thread_tools.purge_confirm": "Jste si jist/a, že chcete vyčistit toto téma?",
+    "thread_tools.merge_topics": "Merge Topics",
+    "thread_tools.merge": "Merge",
    "topic_move_success": "Toto téma bylo úspěšně přesunuto do %1",
    "post_delete_confirm": "Jste si jist/a, že chcete odstranit tento příspěvek?",
    "post_restore_confirm": "Jste si jist/a, že chcete obnovit tento příspěvek?",
@@ -89,6 +91,7 @@
    "fork_pid_count": "Vybráno %1 příspěvek/ů",
    "fork_success": "Téma úspěšně rozděleno. Pro přejití na rozdělené téma, zde klikněte.",
    "delete_posts_instruction": "Klikněte na příspěvek, který chcete odstranit/vyčistit",
+    "merge_topics_instruction": "Click the topics you want to merge",
    "composer.title_placeholder": "Zadejte název tématu…",
    "composer.handle_placeholder": "Jméno",
    "composer.discard": "Zrušit",
--- a/public/language/cs/user.json
+++ b/public/language/cs/user.json
@@ -79,8 +79,6 @@
    "digest_daily": "Denně",
    "digest_weekly": "Týdně",
    "digest_monthly": "Měsíčně",
-    "send_chat_notifications": "Odeslat e-mail, dorazí-li nová zpráva chatu a já nejsem připojen",
-    "send_post_notifications": "Zaslat e-mail, přibudou-li nové odpovědi k tématu, kde mám přihlášen odběr",
    "settings-require-reload": "Některá nastavení vyžadují znovu načtení. Pro znovu načtení stránky, klikněte zde.",
    "has_no_follower": "Tohoto uživatele nikdo nesleduje :(",
    "follows_no_one": "Tento uživatel nikoho nesleduje :(",
@@ -103,6 +101,11 @@
    "outgoing-message-sound": "Zvuk odchozí zprávy",
    "notification-sound": "Zvuk oznámení",
    "no-sound": "Bez zvuku",
+    "upvote-notif-freq": "Upvote Notification Frequency",
+    "upvote-notif-freq.all": "All Upvotes",
+    "upvote-notif-freq.everyTen": "Every Ten Upvotes",
+    "upvote-notif-freq.logarithmic": "On 10, 100, 1000...",
+    "upvote-notif-freq.disabled": "Disabled",
    "browsing": "Nastavení prohlížení",
    "open_links_in_new_tab": "Otevřít odchozí odkaz v nové záložce",
    "enable_topic_searching": "Povolit vyhledávání v tématu",
@@ -123,6 +126,9 @@
    "sso.title": "Služby jednotného přihlášení",
    "sso.associated": "Přiřazeno k",
    "sso.not-associated": "Zde klikněte pro přiřazení k",
+    "sso.dissociate": "Dissociate",
+    "sso.dissociate-confirm-title": "Confirm Dissociation",
+    "sso.dissociate-confirm": "Are you sure you wish to dissociate your account from %1?",
    "info.latest-flags": "Poslední označené",
    "info.no-flags": "Nebyly nalezeny žádné označené příspěvky",
    "info.ban-history": "Poslední historie blokovaných",
--- a/public/language/da/admin/appearance/customise.json
+++ b/public/language/da/admin/appearance/customise.json
@@ -3,8 +3,12 @@
 	"custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.",
 	"custom-css.enable": "Enable Custom CSS",

+	"custom-js": "Custom Javascript",
+	"custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.",
+	"custom-js.enable": "Enable Custom Javascript",
+
 	"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.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup. Script tags are allowed, but are discouraged, as the <a href=\"#custom-header\" data-toggle=\"tab\">Custom Javascript</a> tab is available.",
 	"custom-header.enable": "Enable Custom Header",

 	"custom-css.livereload": "Enable Live Reload",
--- a/public/language/da/admin/menu.json
+++ b/public/language/da/admin/menu.json
@@ -39,7 +39,7 @@
 	"section-appearance": "Appearance",
 	"appearance/themes": "Themes",
 	"appearance/skins": "Skins",
-	"appearance/customise": "Custom HTML & CSS",
+	"appearance/customise": "Custom Content (HTML/JS/CSS)",

 	"section-extend": "Extend",
 	"extend/plugins": "Plugins",
--- a/public/language/da/admin/settings/notifications.json
+++ b/public/language/da/admin/settings/notifications.json
@@ -1,5 +1,6 @@
 {
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
-	"welcome-notification-link": "Welcome Notification Link"
+	"welcome-notification-link": "Welcome Notification Link",
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }
--- a/public/language/da/admin/settings/post.json
+++ b/public/language/da/admin/settings/post.json
@@ -4,6 +4,7 @@
 	"sorting.oldest-to-newest": "Oldest to Newest",
 	"sorting.newest-to-oldest": "Newest to Oldest",
 	"sorting.most-votes": "Most Votes",
+	"sorting.most-posts": "Most Posts",
 	"sorting.topic-default": "Default Topic Sorting",
 	"restrictions": "Posting Restrictions",
 	"restrictions.post-queue": "Enable post queue",
--- a/public/language/da/admin/settings/user.json
+++ b/public/language/da/admin/settings/user.json
@@ -19,6 +19,8 @@
 	"themes": "Themes",
 	"disable-user-skins": "Prevent users from choosing a custom skin",
 	"account-protection": "Account Protection",
+	"admin-relogin-duration": "Admin relogin duration (minutes)",
+	"admin-relogin-duration-help": "After a set amount of time accessing the admin section will require re-login, set to 0 to disable",
 	"login-attempts": "Login attempts per hour",
 	"login-attempts-help": "If login attempts to a user&apos;s account exceeds this threshold, that account will be locked for a pre-configured amount of time",
 	"lockout-duration": "Account Lockout Duration (minutes)",
--- a/public/language/da/email.json
+++ b/public/language/da/email.json
@@ -30,6 +30,7 @@
    "notif.chat.unsub.info": "Denne chat notifikation blev sendt til dig pga. indstillingerne i dit abonnement.",
    "notif.post.cta": "Klik her for a læse hele emnet",
    "notif.post.unsub.info": "Denne indlægs notifikation var sendt pga. dine abonnering indstillinger.",
+    "notif.cta": "Click here to go to forum",
    "test.text1": "Dette er en test email for at kontrollere, at den udgående email server er opsat korrekt i forhold til din NodeBB installation.",
    "unsub.cta": "Klik her for at ændre disse indstillinger",
    "banned.subject": "You have been banned from %1",
--- a/public/language/da/error.json
+++ b/public/language/da/error.json
@@ -119,11 +119,13 @@
    "not-enough-reputation-to-downvote": "Du har ikke nok omdømme til at nedstemme dette indlæg",
    "not-enough-reputation-to-flag": "Du har ikke nok omdømme til at vurdere dette indlæg",
    "already-flagged": "Du har allerede vurderet dette indlæg",
+    "self-vote": "You cannot vote on your own post",
    "reload-failed": "NodeBB stødte på et problem under genindlæsningen : \"%1\". NodeBB vil fortsætte med en ældre version, og det er nok god ide at genoptage fra lige før du genindlæste siden.",
    "registration-error": "Registeringsfejl",
    "parse-error": "Noget gik galt under fortolknings er serverens respons",
    "wrong-login-type-email": "Brug venligt din email til login",
    "wrong-login-type-username": "Brug venligt dit brugernavn til login",
+    "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first",
    "invite-maximum-met": "Du har inviteret det maksimale antal personer (%1 ud af %2)",
    "no-session-found": "Ingen login session kan findes!",
    "not-in-room": "Bruger er ikke i rummet",
@@ -132,5 +134,6 @@
    "no-users-selected": "No user(s) selected",
    "invalid-home-page-route": "Invalid home page route",
    "invalid-session": "Session Mismatch",
-    "invalid-session-text": "It looks like your login session is no longer active, or no longer matches with the server. Please refresh this page."
+    "invalid-session-text": "It looks like your login session is no longer active, or no longer matches with the server. Please refresh this page.",
+    "no-topics-selected": "No topics selected!"
 }
--- a/public/language/da/notifications.json
+++ b/public/language/da/notifications.json
@@ -9,6 +9,7 @@
    "continue_to": "Fortsæt til %1",
    "return_to": "Returnere til %t",
    "new_notification": "Ny notifikation",
+    "new_notification_from": "You have a new Notification from %1",
    "you_have_unread_notifications": "Du har ulæste notifikationer.",
    "all": "All",
    "topics": "Topics",
@@ -45,5 +46,19 @@
    "email-confirmed": "Email bekræftet",
    "email-confirmed-message": "Tak fordi du validerede din email. Din konto er nu fuldt ud aktiveret.",
    "email-confirm-error-message": "Der var et problem med valideringen af din emailadresse. Bekræftelses koden var muligvis forkert eller udløbet.",
-    "email-confirm-sent": "Bekræftelses email afsendt."
+    "email-confirm-sent": "Bekræftelses email afsendt.",
+    "none": "None",
+    "notification_only": "Notification Only",
+    "email_only": "Email Only",
+    "notification_and_email": "Notification & Email",
+    "notificationType_upvote": "When someone upvotes your post",
+    "notificationType_new-topic": "When someone you follow posts a topic",
+    "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_follow": "When someone starts following you",
+    "notificationType_new-chat": "When you receive a chat message",
+    "notificationType_group-invite": "When you receive a group invite",
+    "notificationType_new-register": "When someone gets added to registration queue",
+    "notificationType_post-queue": "When a new post is queued",
+    "notificationType_new-post-flag": "When a post is flagged",
+    "notificationType_new-user-flag": "When a user is flagged"
 }
--- a/public/language/da/topic.json
+++ b/public/language/da/topic.json
@@ -68,6 +68,8 @@
    "thread_tools.restore_confirm": "Er du sikker på at du ønsker at genoprette denne tråd?",
    "thread_tools.purge": "Udrader tråd",
    "thread_tools.purge_confirm": "Er du sikker på at du vil udrense denne tråd?",
+    "thread_tools.merge_topics": "Merge Topics",
+    "thread_tools.merge": "Merge",
    "topic_move_success": "Denne tråd blev flyttet til %1",
    "post_delete_confirm": "Er du sikker på at du vil slette dette indlæg?",
    "post_restore_confirm": "Er du sikker på at du vil gendanne dette indlæg?",
@@ -89,6 +91,7 @@
    "fork_pid_count": "%1 post(s) selected",
    "fork_success": "Tråden blev fraskilt! Klik her for at gå til den fraskilte tråd.",
    "delete_posts_instruction": "Klik på de indlæg du vil slette/rense",
+    "merge_topics_instruction": "Click the topics you want to merge",
    "composer.title_placeholder": "Angiv din trådtittel her ...",
    "composer.handle_placeholder": "Navn",
    "composer.discard": "Fortryd",
--- a/public/language/da/user.json
+++ b/public/language/da/user.json
@@ -79,8 +79,6 @@
    "digest_daily": "Daglig",
    "digest_weekly": "Ugentlig",
    "digest_monthly": "Månedlig",
-    "send_chat_notifications": "Send en email hvis en ny chat besked er modtaget og jeg ikke er online",
-    "send_post_notifications": "Send en email når der er skrevet svar til indlæg jeg abonnere på",
    "settings-require-reload": "Nogle indstillinger kræver en genindlæsning. Klik her for at genindlæse siden.",
    "has_no_follower": "Denne bruger har ingen følgere :(",
    "follows_no_one": "Denne bruger følger ikke nogen :(",
@@ -103,6 +101,11 @@
    "outgoing-message-sound": "Udgående besked lyd",
    "notification-sound": "Meddelelse lyd",
    "no-sound": "Ingen lyd",
+    "upvote-notif-freq": "Upvote Notification Frequency",
+    "upvote-notif-freq.all": "All Upvotes",
+    "upvote-notif-freq.everyTen": "Every Ten Upvotes",
+    "upvote-notif-freq.logarithmic": "On 10, 100, 1000...",
+    "upvote-notif-freq.disabled": "Disabled",
    "browsing": "Gennemsenings indstillinger",
    "open_links_in_new_tab": "Åben udgående link i en ny tab",
    "enable_topic_searching": "Slå In-Topic søgning til",
@@ -123,6 +126,9 @@
    "sso.title": "Enkeltgangs Sign-on Servicer",
    "sso.associated": "Forbundet med",
    "sso.not-associated": "Klik her for at forbinde med",
+    "sso.dissociate": "Dissociate",
+    "sso.dissociate-confirm-title": "Confirm Dissociation",
+    "sso.dissociate-confirm": "Are you sure you wish to dissociate your account from %1?",
    "info.latest-flags": "Latest Flags",
    "info.no-flags": "No Flagged Posts Found",
    "info.ban-history": "Recent Ban History",
--- a/public/language/de/admin/appearance/customise.json
+++ b/public/language/de/admin/appearance/customise.json
@@ -3,8 +3,12 @@
 	"custom-css.description": "Füge hier deine eigenen CSS-Eigenschaften ein, sie werden als letztes angewendet.",
 	"custom-css.enable": "Benutzerdefiniertes CSS aktivieren",

+	"custom-js": "Benutzerdefiniertes Javascript",
+	"custom-js.description": "Füge dein eigenes Javascipt hier ein.\nEs wird ausgeführt nachdem die Seite komplett geladen wurde.",
+	"custom-js.enable": "Benutzerdefiniertes Javascript aktivieren",
+
 	"custom-header": "Benutzerdefinierter Header",
-	"custom-header.description": "Füge hier dein benutzerdefiniertes HTML (z.B. Javascript, Meta Tags, usw.) ein, welches in den <code>&lt;head&gt;</code> Tag eingefügt werden soll.",
+	"custom-header.description": "Füge dein benutzerdefiniertes HTML hier ein (wie z.B. meta Tags etc.), welche in die <code>&lt;head&gt;</code> Sektion im Markup des Forums eingefügt werden. script Tags sind erlaubt, es wird aber davon abgeraten, da es den <a href=\"#custom-header\" data-toggle=\"tab\">Benutzerdefiniertes Javascript</a> Tab gibt.",
 	"custom-header.enable": "Benutzerdefinierten Header aktivieren",

 	"custom-css.livereload": "Live-Aktualisierung aktivieren",
--- a/public/language/de/admin/manage/post-queue.json
+++ b/public/language/de/admin/manage/post-queue.json
@@ -7,5 +7,5 @@
 	"content": "Inhalt",
 	"posted": "Gepostet",
 	"reply-to": "Auf \"%1\" antworten",
-	"content-editable": "You can click on individual content to edit before posting."
+	"content-editable": "Du kannst auf den einzelnen Inhalt klicken um ihn zu ändern bevor du ihn postest."
 }
--- a/public/language/de/admin/menu.json
+++ b/public/language/de/admin/menu.json
@@ -39,7 +39,7 @@
 	"section-appearance": "Aussehen",
 	"appearance/themes": "Themes",
 	"appearance/skins": "Skins",
-	"appearance/customise": "Benutzerdefiniertes HTML & CSS",
+	"appearance/customise": "Benutzerdefinierter Inhalt (HTML/JS/CSS)",

 	"section-extend": "Erweitert",
 	"extend/plugins": "Plugins",
@@ -65,7 +65,7 @@
 	"logout": "Abmelden",
 	"view-forum": "Forum anzeigen",

-	"search.placeholder": "Search for settings",
+	"search.placeholder": "Nach Einstellungen suchen",
 	"search.no-results": "Keine Ergebnisse...",
 	"search.search-forum": "Suche im Forum nach <strong></strong>",
 	"search.keep-typing": "Gib mehr ein, um die Ergebnisse zu sehen...",
--- a/public/language/de/admin/settings/notifications.json
+++ b/public/language/de/admin/settings/notifications.json
@@ -1,5 +1,6 @@
 {
 	"notifications": "Benachrichtigungen",
 	"welcome-notification": "Wilkommensnachricht",
-	"welcome-notification-link": "Wilkommensnachricht-Link"
+	"welcome-notification-link": "Wilkommensnachricht-Link",
+	"welcome-notification-uid": "Wilkommensbenachrichtigung Benutzer (UID)"
 }
--- a/public/language/de/admin/settings/pagination.json
+++ b/public/language/de/admin/settings/pagination.json
@@ -3,9 +3,9 @@
 	"enable": "Themen in Seiten einteilen anstatt endlos zu scrollen",
 	"topics": "Themen Seitennummerierung",
 	"posts-per-page": "Beiträge pro Seite",
-	"max-posts-per-page": "Maximum posts per page",
+	"max-posts-per-page": "Maximale Anzahl von Beiträgen pro Seite",
 	"categories": "Kategorie Seitennummerierung",
 	"topics-per-page": "Themen pro Seite",
-	"max-topics-per-page": "Maximum topics per page",
+	"max-topics-per-page": "Maximale Anzahl von Themen pro Seite",
 	"initial-num-load": "Ursprüngliche Anzahl an Themen, die bei ungelesen, aktuell und beliebt geladen werden sollen"
 }
--- a/public/language/de/admin/settings/post.json
+++ b/public/language/de/admin/settings/post.json
@@ -4,6 +4,7 @@
 	"sorting.oldest-to-newest": "Von Alt bis Neu",
 	"sorting.newest-to-oldest": "Von Neu zu Alt",
 	"sorting.most-votes": "Meiste Bewertungen",
+	"sorting.most-posts": "Meiste Beiträge",
 	"sorting.topic-default": "Standardmäßige Themensortierung",
 	"restrictions": "Posting beschränkungen",
 	"restrictions.post-queue": "Beitragswarteschlange verwenden",
--- a/public/language/de/admin/settings/user.json
+++ b/public/language/de/admin/settings/user.json
@@ -19,6 +19,8 @@
 	"themes": "Themes",
 	"disable-user-skins": "Verhindere das Benutzer eigene Skins verwenden",
 	"account-protection": "Kontosicherheit",
+	"admin-relogin-duration": "Dauer bis zum erneuten Login (in Minuten)",
+	"admin-relogin-duration-help": "Nach einer gesetzten Zeit erfordert der Zugriff auf die Admin Sektion einen erneuten Login, 0 deaktiviert dies",
 	"login-attempts": "Login-Versuche pro Stunde",
 	"login-attempts-help": "Wenn die loginversuche zu einem Account diese Schwelle überschreiten, wird dieser Account für eine festgelegte Zeit gesperrt",
 	"lockout-duration": "Account Aussperrzeitraum (Minuten)",
--- a/public/language/de/email.json
+++ b/public/language/de/email.json
@@ -30,6 +30,7 @@
    "notif.chat.unsub.info": "Diese Chat-Benachrichtigung wurde dir aufgrund deiner Abonnement-Einstellungen gesendet.",
    "notif.post.cta": "Hier klicken, um das gesamte Thema zu lesen",
    "notif.post.unsub.info": "Diese Mitteilung wurde dir aufgrund deiner Abonnement-Einstellungen gesendet.",
+    "notif.cta": "Klicke hier um das Forum zu besuchen",
    "test.text1": "Dies ist eine Test-E-Mail, um zu überprüfen, ob der E-Mailer deines NodeBB korrekt eingestellt wurde.",
    "unsub.cta": "Klicke hier, um diese Einstellungen zu ändern",
    "banned.subject": "Du wurdest von %1 gebannt.",
--- a/public/language/de/error.json
+++ b/public/language/de/error.json
@@ -11,7 +11,7 @@
    "invalid-uid": "Ungültige Benutzer-ID",
    "invalid-username": "Ungültiger Benutzername",
    "invalid-email": "Ungültige E-Mail-Adresse",
-    "invalid-title": "Invalid title",
+    "invalid-title": "Ungültiger Titel",
    "invalid-user-data": "Ungültige Benutzerdaten",
    "invalid-password": "Ungültiges Passwort",
    "invalid-login-credentials": "Ungültige Zugangsdaten",
@@ -81,7 +81,7 @@
    "cant-ban-other-admins": "Du kannst andere Administratoren nicht sperren!",
    "cant-remove-last-admin": "Du bist der einzige Administrator. Füge zuerst einen anderen Administrator hinzu, bevor du dich selbst als Administrator entfernst",
    "cant-delete-admin": "Bevor du versuchst dieses Konto zu löschen, entferne die zugehörigen Administratorrechte.",
-    "invalid-image": "Invalid image",
+    "invalid-image": "Ungültiges Bild",
    "invalid-image-type": "Falsche Bildart. Erlaubte Arten sind: %1",
    "invalid-image-extension": "Ungültige Dateinamenerweiterung",
    "invalid-file-type": "Ungültiger Dateityp. Erlaubte Typen sind: %1",
@@ -119,11 +119,13 @@
    "not-enough-reputation-to-downvote": "Dein Ansehen ist zu niedrig, um diesen Beitrag negativ zu bewerten.",
    "not-enough-reputation-to-flag": "Dein Ansehen ist zu niedrig, um diesen Beitrag zu melden",
    "already-flagged": "Du hast diesen Beitrag bereits gemeldet",
+    "self-vote": "Du kannst deine eigenen Beiträge nicht bewerten",
    "reload-failed": "Es ist ein Problem während des Reloads von NodeBB aufgetreten: \"%1\". NodeBB wird weiterhin clientseitige Assets bereitstellen, allerdings solltest du das, was du vor dem Reload gemacht hast, rückgängig machen.",
    "registration-error": "Registrierungsfehler",
    "parse-error": "Beim auswerten der Serverantwort ist etwas schiefgegangen",
    "wrong-login-type-email": "Bitte nutze deine E-Mail-Adresse zum einloggen",
    "wrong-login-type-username": "Bitte nutze deinen Benutzernamen zum einloggen",
+    "sso-registration-disabled": "Das Registrieren mit %1-Accounts wurde deaktiviert, bitte registriere dich zuerst mit einer Email-Adresse",
    "invite-maximum-met": "Du hast bereits die maximale Anzahl an Personen eingeladen (%1 von %2).",
    "no-session-found": "Keine Login-Sitzung gefunden!",
    "not-in-room": "Benutzer nicht im Raum",
@@ -132,5 +134,6 @@
    "no-users-selected": "Kein(e) Benutzer ausgewählt",
    "invalid-home-page-route": "Ungültiger Startseitenpfad",
    "invalid-session": "Sitzungsdiskrepanz",
-    "invalid-session-text": "Es scheint als wäre deine Login-Sitzung nicht mehr aktiv oder sie passt nicht mehr mit der des Servers. Bitte aktualisiere diese Seite."
+    "invalid-session-text": "Es scheint als wäre deine Login-Sitzung nicht mehr aktiv oder sie passt nicht mehr mit der des Servers. Bitte aktualisiere diese Seite.",
+    "no-topics-selected": "Keine Beiträge ausgewählt!"
 }
--- a/public/language/de/flags.json
+++ b/public/language/de/flags.json
@@ -54,11 +54,11 @@
 	"modal-body": "Bitte geben Sie den Grund an, weshalb Sie %1 %2 melden wollen. Alternativ können Sie einen der Schnell-Meldungs-Knöpfe verwenden, wenn anwendbar.",
 	"modal-reason-spam": "Spam",
 	"modal-reason-offensive": "Beleidigend",
-	"modal-reason-other": "Other (specify below)",
+	"modal-reason-other": "Anderer (unten Angegeben)",
 	"modal-reason-custom": "Grund für die Meldung dieses Inhalts...",
 	"modal-submit": "Meldung abschicken",
 	"modal-submit-success": "Der Inhalt wurde gemeldet.",
-	"modal-submit-confirm": "Confirm Submission",
-	"modal-submit-confirm-text": "You have a custom reason specified already. Are you sure you wish to submit via quick-report?",
-	"modal-submit-confirm-text-help": "Submitting a quick report will overwrite any custom reasons defined."
+	"modal-submit-confirm": "Einreichung bestätigen",
+	"modal-submit-confirm-text": "Du hast bereits einen benutzerdefinierten Grund angegeben. Bis du sicher, dass du per schnell-funktion abschicken willst?",
+	"modal-submit-confirm-text-help": "Das einreichen per schnell-funktion werden alle näher angegebenen Gründe ignoriert."
 }
--- a/public/language/de/notifications.json
+++ b/public/language/de/notifications.json
@@ -9,6 +9,7 @@
    "continue_to": "Fortfahren zu %1",
    "return_to": "Kehre zurück zu %1",
    "new_notification": "Neue Benachrichtigung",
+    "new_notification_from": "Du hast eine neue Nachricht von %1",
    "you_have_unread_notifications": "Du hast ungelesene Benachrichtigungen.",
    "all": "Alle",
    "topics": "Themen",
@@ -45,5 +46,19 @@
    "email-confirmed": "E-Mail bestätigt",
    "email-confirmed-message": "Vielen Dank für Ihre E-Mail-Validierung. Ihr Konto ist nun vollständig aktiviert.",
    "email-confirm-error-message": "Es gab ein Problem bei der Validierung Ihrer E-Mail-Adresse. Möglicherweise ist der Code ungültig oder abgelaufen.",
-    "email-confirm-sent": "Bestätigungs-E-Mail gesendet."
+    "email-confirm-sent": "Bestätigungs-E-Mail gesendet.",
+    "none": "Keine",
+    "notification_only": "Nur Benachrichtigungen",
+    "email_only": "Nur Emails",
+    "notification_and_email": "Benachrichtigungen & Emails",
+    "notificationType_upvote": "Wenn jemand deinen beitrag positiv bewertet",
+    "notificationType_new-topic": "Wenn jemand dem du folgst einen Beitrag erstellt",
+    "notificationType_new-reply": "Wenn es eine neue Antwort auf ein Thema das du beobachtest gibt",
+    "notificationType_follow": "Wenn dir jemand neues folgt",
+    "notificationType_new-chat": "Wenn du eine Chat Nachricht erhältst",
+    "notificationType_group-invite": "Wenn du eine Gruppeneinladung erhältst",
+    "notificationType_new-register": "Wenn jemand der Registrierungswarteschlange hinzugefügt wird",
+    "notificationType_post-queue": "Wenn ein neuer Beitrag eingereiht wird",
+    "notificationType_new-post-flag": "Wenn ein Beitrag gemeldet wird",
+    "notificationType_new-user-flag": "Wenn ein Benutzer gemeldet wird"
 }
--- a/public/language/de/pages.json
+++ b/public/language/de/pages.json
@@ -44,7 +44,7 @@
    "account/bookmarks": "Lesezeichen von %1",
    "account/settings": "Benutzer-Einstellungen",
    "account/watched": "Von %1 beobachtete Themen",
-    "account/ignored": "Topics ignored by %1",
+    "account/ignored": "Ignorierte Themen von %1",
    "account/upvoted": "Von %1 positiv bewertete Beiträge",
    "account/downvoted": "Von %1 negativ bewertete Beiträge",
    "account/best": "Bestbewertete Beiträge von %1",
--- a/public/language/de/topic.json
+++ b/public/language/de/topic.json
@@ -68,6 +68,8 @@
    "thread_tools.restore_confirm": "Bist du sicher, dass du dieses Thema wiederherstellen möchtest?",
    "thread_tools.purge": "Thema endgültig löschen",
    "thread_tools.purge_confirm": "Bist du sicher, dass du dieses Thema endgültig löschen möchtest?",
+    "thread_tools.merge_topics": "Themen vereinen",
+    "thread_tools.merge": "Vereinen",
    "topic_move_success": "Thema wurde erfolgreich nach %1 verschoben.",
    "post_delete_confirm": "Sind Sie sicher, dass Sie diesen Beitrag löschen möchten?",
    "post_restore_confirm": "Sind Sie sicher, dass Sie diesen Beitrag wiederherstellen möchten?",
@@ -89,6 +91,7 @@
    "fork_pid_count": "%1 Beiträge ausgewählt",
    "fork_success": "Thema erfolgreich aufgespalten! Klicke hier, um zum abgespaltenen Thema zu gelangen.",
    "delete_posts_instruction": "Wähle die zu löschenden Beiträge aus",
+    "merge_topics_instruction": "Wähle die Themen aus, die du vereinen möchtest",
    "composer.title_placeholder": "Hier den Titel des Themas eingeben...",
    "composer.handle_placeholder": "Name",
    "composer.discard": "Verwerfen",
--- a/public/language/de/unread.json
+++ b/public/language/de/unread.json
@@ -10,6 +10,6 @@
    "all-topics": "Alle Themen",
    "new-topics": "Neue Themen",
    "watched-topics": "Beobachtete Themen",
-    "unreplied-topics": "Unreplied Topics",
-    "multiple-categories-selected": "Multiple Selected"
+    "unreplied-topics": "Unbeantwortete Themen",
+    "multiple-categories-selected": "Mehrere ausgewählt"
 }
--- a/public/language/de/user.json
+++ b/public/language/de/user.json
@@ -25,7 +25,7 @@
    "reputation": "Ansehen",
    "bookmarks": "Lesezeichen",
    "watched": "Beobachtet",
-    "ignored": "Ignored",
+    "ignored": "Ignoriert",
    "followers": "Follower",
    "following": "Folge ich",
    "aboutme": "Über mich",
@@ -79,15 +79,13 @@
    "digest_daily": "Täglich",
    "digest_weekly": "Wöchentlich",
    "digest_monthly": "Monatlich",
-    "send_chat_notifications": "Sende eine E-Mail, wenn eine neue Chat-Nachricht eingeht während ich nicht online bin",
-    "send_post_notifications": "Sende eine E-Mail bei Antworten auf Themen die ich abonniert habe.",
    "settings-require-reload": "Einige Einstellungsänderung benötigen eine Aktualisierung. Hier klicken um die Seite neu zu laden.",
    "has_no_follower": "Diesem Benutzer folgt noch niemand. :(",
    "follows_no_one": "Dieser Benutzer folgt noch niemandem. :(",
    "has_no_posts": "Dieser Benutzer hat noch nichts geschrieben.",
    "has_no_topics": "Dieser Benutzer hat noch keine Themen erstellt.",
    "has_no_watched_topics": "Dieser Benutzer beobachtet keine Themen.",
-    "has_no_ignored_topics": "This user hasn't ignored any topics yet.",
+    "has_no_ignored_topics": "Dieser Benutzer ignoriert bisher keine Themen.",
    "has_no_upvoted_posts": "Dieser Benutzer hat bisher keine Beiträge positiv bewertet.",
    "has_no_downvoted_posts": "Dieser Benutzer hat bisher keine Beiträge negativ bewertet.",
    "has_no_voted_posts": "Dieser Benutzer hat keine bewerteten Beiträge.",
@@ -96,13 +94,18 @@
    "paginate_description": "Themen und Beiträge in Seiten aufteilen, anstatt unendlich zu scrollen",
    "topics_per_page": "Themen pro Seite",
    "posts_per_page": "Beiträge pro Seite",
-    "max_items_per_page": "Maximum %1",
+    "max_items_per_page": "Maximal %1",
    "notification_sounds": "Ton abspielen, wenn du eine Benachrichtigung erhältst",
    "notifications_and_sounds": "Benachrichtigungen & Klänge",
    "incoming-message-sound": "Ton bei empfangener Nachricht",
    "outgoing-message-sound": "Ton bei versendeter Nachricht",
    "notification-sound": "Benachrichtigungston ",
    "no-sound": "Kein Ton",
+    "upvote-notif-freq": "Benachrichtigungshäufigkeit für positive Bewertungen",
+    "upvote-notif-freq.all": "Alle positiven Bewertungen",
+    "upvote-notif-freq.everyTen": "Alle 10 positiven Bewertungen",
+    "upvote-notif-freq.logarithmic": "Bei 10, 100, 1000...",
+    "upvote-notif-freq.disabled": "Deaktiviert",
    "browsing": "Browsing",
    "open_links_in_new_tab": "Ausgehende Links in neuem Tab öffnen",
    "enable_topic_searching": "Suchen innerhalb von Themen aktivieren",
@@ -123,6 +126,9 @@
    "sso.title": "Single Sign-on Dienste",
    "sso.associated": "Verbunden mit",
    "sso.not-associated": "Verbinde dich mit",
+    "sso.dissociate": "Trennen",
+    "sso.dissociate-confirm-title": "Trennung bestätigen",
+    "sso.dissociate-confirm": "Bist du sicher, dass du deinen Account von %1 trennen willst?",
    "info.latest-flags": "Neuste Meldungen",
    "info.no-flags": "Keine gemeldeten Beiträge gefunden",
    "info.ban-history": "Sperrungsverlauf",
--- a/public/language/el/admin/appearance/customise.json
+++ b/public/language/el/admin/appearance/customise.json
@@ -3,8 +3,12 @@
 	"custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.",
 	"custom-css.enable": "Enable Custom CSS",

+	"custom-js": "Custom Javascript",
+	"custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.",
+	"custom-js.enable": "Enable Custom Javascript",
+
 	"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.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup. Script tags are allowed, but are discouraged, as the <a href=\"#custom-header\" data-toggle=\"tab\">Custom Javascript</a> tab is available.",
 	"custom-header.enable": "Enable Custom Header",

 	"custom-css.livereload": "Enable Live Reload",
--- a/public/language/el/admin/menu.json
+++ b/public/language/el/admin/menu.json
@@ -39,7 +39,7 @@
 	"section-appearance": "Appearance",
 	"appearance/themes": "Themes",
 	"appearance/skins": "Skins",
-	"appearance/customise": "Custom HTML & CSS",
+	"appearance/customise": "Custom Content (HTML/JS/CSS)",

 	"section-extend": "Extend",
 	"extend/plugins": "Plugins",
--- a/Show More
+++ b/Show More