Merge remote-tracking branch 'upstream/master'

Conflicts: src/favourites.js
2026-01-02 22:00:34 +01:00 · 2015-07-03 13:55:32 +02:00
parent 7c5ba9b7b1 f2bebb12c6
commit da800a9016
325 changed files with 6607 additions and 4945 deletions
--- a/README.md
+++ b/README.md
@@ -12,18 +12,26 @@ Additional functionality is enabled through the use of third-party plugins.

 * [Get NodeBB](http://www.nodebb.org/ "NodeBB")
 * [Demo & Meta Discussion](http://community.nodebb.org)
-* [NodeBB Blog](http://blog.nodebb.org)
 * [Documentation & Installation Instructions](http://docs.nodebb.org)
+* [Help translate NodeBB](https://www.transifex.com/projects/p/nodebb/)
+* [NodeBB Blog](http://blog.nodebb.org)
 * [Join us on IRC](https://kiwiirc.com/client/irc.freenode.net/nodebb) - #nodebb on Freenode
 * [Follow us on Twitter](http://www.twitter.com/NodeBB/ "NodeBB Twitter")
 * [Like us on Facebook](http://www.facebook.com/NodeBB/ "NodeBB Facebook")
-* [Get Plugins](http://community.nodebb.org/category/7/nodebb-plugins "NodeBB Plugins")
-* [Get Themes](http://community.nodebb.org/category/10/nodebb-themes "NodeBB Themes")
-* [Help translate NodeBB](https://www.transifex.com/projects/p/nodebb/)

 ## Screenshots

-[<img src="http://i.imgur.com/FLOUuIqb.png" />](http://i.imgur.com/FLOUuIq.png)&nbsp;[<img src="http://i.imgur.com/Ud1LrfIb.png" />](http://i.imgur.com/Ud1LrfI.png)&nbsp;[<img src="http://i.imgur.com/ZC8W39ab.png" />](http://i.imgur.com/ZC8W39a.png)&nbsp;[<img src="http://i.imgur.com/o90kVPib.png" />](http://i.imgur.com/o90kVPi.png)&nbsp;[<img src="http://i.imgur.com/AaRRrU2b.png" />](http://i.imgur.com/AaRRrU2.png)&nbsp;[<img src="http://i.imgur.com/LmHtPhob.png" />](http://i.imgur.com/LmHtPho.png)&nbsp;[<img src="http://i.imgur.com/paiJPJkb.jpg" />](http://i.imgur.com/paiJPJk.jpg)&nbsp;[<img src="http://i.imgur.com/ZfavPHDb.png" />](http://i.imgur.com/ZfavPHD.png)&nbsp;[<img src="http://i.imgur.com/8OLssij.png" />](http://i.imgur.com/8OLssij.png)&nbsp;[<img src="http://i.imgur.com/JKOc0LZ.png"/>](http://i.imgur.com/JKOc0LZ.png)
+[![](http://i.imgur.com/VCoOFyqb.png)](http://i.imgur.com/VCoOFyq.png)
+[![](http://i.imgur.com/FLOUuIqb.png)](http://i.imgur.com/FLOUuIq.png)
+[![](http://i.imgur.com/Ud1LrfIb.png)](http://i.imgur.com/Ud1LrfI.png)
+[![](http://i.imgur.com/h6yZ66sb.png)](http://i.imgur.com/h6yZ66s.png)
+[![](http://i.imgur.com/o90kVPib.png)](http://i.imgur.com/o90kVPi.png)
+[![](http://i.imgur.com/AaRRrU2b.png)](http://i.imgur.com/AaRRrU2.png)
+[![](http://i.imgur.com/LmHtPhob.png)](http://i.imgur.com/LmHtPho.png)
+[![](http://i.imgur.com/paiJPJkb.jpg)](http://i.imgur.com/paiJPJk.jpg)
+
+[![](http://i.imgur.com/8OLssij.png)](http://i.imgur.com/8OLssij.png)
+[![](http://i.imgur.com/JKOc0LZ.png)](http://i.imgur.com/JKOc0LZ.png)

 ## How can I follow along/contribute?

@@ -38,7 +46,7 @@ Additional functionality is enabled through the use of third-party plugins.
 NodeBB requires the following software to be installed:

 * A version of Node.js at least 0.10 or greater
-* Redis, version 2.6 or greater **or** MongoDB, version 2.6 or greater
+* Redis, version 2.8.9 or greater **or** MongoDB, version 2.6 or greater
 * nginx, version 1.3.13 or greater (**only if** intending to use nginx to proxy requests to a NodeBB)

 ## Installation
@@ -62,4 +70,6 @@ Detailed upgrade instructions are listed in [Upgrading NodeBB](https://docs.node

 ## License

-NodeBB is licensed under the **GNU General Public License v3 (GPL-3)** (http://www.gnu.org/copyleft/gpl.html)
+NodeBB is licensed under the **GNU General Public License v3 (GPL-3)** (http://www.gnu.org/copyleft/gpl.html).
+
+Interested in a sublicense agreement for use of NodeBB in a non-free/restrictive environment? Contact us at sales@nodebb.org.
--- a/app.js
+++ b/app.js
@@ -29,11 +29,11 @@ var fs = require('fs'),
 	async = require('async'),
 	semver = require('semver'),
 	winston = require('winston'),
+	colors = require('colors'),
 	path = require('path'),
 	pkg = require('./package.json'),
 	utils = require('./public/src/utils.js');

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

 winston.remove(winston.transports.Console);
@@ -108,6 +108,7 @@ function loadConfig() {

 function start() {
 	loadConfig();
+	var db = require('./src/database');

 	// nconf defaults, if not set in config
 	if (!nconf.get('upload_path')) {
@@ -116,6 +117,7 @@ function start() {
 	// Parse out the relative_url and other goodies from the configured URL
 	var urlObject = url.parse(nconf.get('url'));
 	var relativePath = urlObject.pathname !== '/' ? urlObject.pathname : '';
+	nconf.set('base_url', urlObject.protocol + '//' + urlObject.host);
 	nconf.set('use_port', !!urlObject.port);
 	nconf.set('relative_path', relativePath);
 	nconf.set('port', urlObject.port || nconf.get('port') || nconf.get('PORT') || 4567);
@@ -175,9 +177,8 @@ function start() {
 	});

 	async.waterfall([
-		function(next) {
-			require('./src/database').init(next);
-		},
+		async.apply(db.init),
+		async.apply(db.checkCompatibility),
 		function(next) {
 			require('./src/meta').configs.init(next);
 		},
@@ -203,7 +204,12 @@ function start() {
 		}
 	], function(err) {
 		if (err) {
-			winston.error(err.stack);
+			if (err.stacktrace !== false) {
+				winston.error(err.stack);
+			} else {
+				winston.error(err.message);
+			}
+
 			process.exit();
 		}
 	});
@@ -274,17 +280,19 @@ function reset() {
 			process.exit();
 		}

-		if (nconf.get('theme')) {
+		if (nconf.get('t')) {
 			resetThemes();
-		} else if (nconf.get('plugin')) {
-			resetPlugin(nconf.get('plugin'));
-		} else if (nconf.get('plugins')) {
-			resetPlugins();
-		} else if (nconf.get('widgets')) {
+		} else if (nconf.get('p')) {
+			if (nconf.get('p') === true) {
+				resetPlugins();
+			} else {
+				resetPlugin(nconf.get('p'));
+			}
+		} else if (nconf.get('w')) {
 			resetWidgets();
-		} else if (nconf.get('settings')) {
+		} else if (nconf.get('s')) {
 			resetSettings();
-		} else if (nconf.get('all')) {
+		} else if (nconf.get('a')) {
 			require('async').series([resetWidgets, resetThemes, resetPlugins, resetSettings], function(err) {
 				if (!err) {
 					winston.info('[reset] Reset complete.');
@@ -294,10 +302,17 @@ function reset() {
 				process.exit();
 			});
 		} else {
-			winston.warn('[reset] Nothing reset.');
-			winston.info('Use ./nodebb reset {theme|plugins|widgets|settings|all}');
-			winston.info(' or');
-			winston.info('Use ./nodebb reset plugin="nodebb-plugin-pluginName"');
+			process.stdout.write('\nNodeBB Reset\n'.bold);
+			process.stdout.write('No arguments passed in, so nothing was reset.\n\n'.yellow);
+			process.stdout.write('Use ./nodebb reset ' + '{-t|-p|-w|-s|-a}\n'.red);
+			process.stdout.write('    -t\tthemes\n');
+			process.stdout.write('    -p\tplugins\n');
+			process.stdout.write('    -w\twidgets\n');
+			process.stdout.write('    -s\tsettings\n');
+			process.stdout.write('    -a\tall of the above\n');
+
+			process.stdout.write('\nPlugin reset flag (-p) can take a single argument\n');
+			process.stdout.write('    e.g. ./nodebb reset -p nodebb-plugin-mentions\n');
 			process.exit();
 		}
 	});
--- a/install/data/defaults.json
+++ b/install/data/defaults.json
@@ -1,106 +1,28 @@
-[
-    {
-        "field": "title",
-        "value": "NodeBB"
-    },
-    {
-        "field": "showSiteTitle",
-        "value": "1"
-    },
-    {
-        "field": "postDelay",
-        "value": 10
-    },
-    {
-        "field": "initialPostDelay",
-        "value": 10
-    },
-    {
-        "field": "newbiePostDelay",
-        "value": 120
-    },
-    {
-        "field": "newbiePostDelayThreshold",
-        "value": 3
-    },
-    {
-        "field": "minimumPostLength",
-        "value": 8
-    },
-    {
-        "field": "maximumPostLength",
-        "value": 32767
-    },
-    {
-        "field": "allowGuestSearching",
-        "value": 0
-    },
-    {
-        "field": "allowTopicsThumbnail",
-        "value": 0
-    },
-    {
-        "field": "allowRegistration",
-        "value": 1
-    },
-    {
-        "field": "allowLocalLogin",
-        "value": 1
-    },
-    {
-        "field": "allowAccountDelete",
-        "value": 1
-    },
-    {
-        "field": "allowFileUploads",
-        "value": 0
-    },
-    {
-        "field": "maximumFileSize",
-        "value": 2048
-    },
-    {
-        "field": "minimumTitleLength",
-        "value": 3
-    },
-    {
-        "field": "maximumTitleLength",
-        "value": 255
-    },
-    {
-        "field": "minimumUsernameLength",
-        "value": 2
-    },
-    {
-        "field": "maximumUsernameLength",
-        "value": 16
-    },
-    {
-        "field": "minimumPasswordLength",
-        "value": 6
-    },
-    {
-        "field": "maximumSignatureLength",
-        "value": 255
-    },
-    {
-        "field": "maximumAboutMeLength",
-        "value": 1000
-    },
-    {
-        "field": "maximumProfileImageSize",
-        "value": 256
-    },
-    {
-        "field": "profileImageDimension",
-        "value": 128
-    },
-    {
-        "field": "requireEmailConfirmation",
-        "value": 0
-    },
-    {
-        "field": "profile:allowProfileImageUploads",
-        "value": 1
-    }
-]
+{
+    "title": "NodeBB",
+    "showSiteTitle": 1,
+    "postDelay": 10,
+    "initialPostDelay": 10,
+    "newbiePostDelay": 120,
+    "newbiePostDelayThreshold": 3,
+    "minimumPostLength": 8,
+    "maximumPostLength": 32767,
+    "allowGuestSearching": 0,
+    "allowTopicsThumbnail": 0,
+    "registrationType": "normal",
+    "allowLocalLogin": 1,
+    "allowAccountDelete": 1,
+    "allowFileUploads": 0,
+    "maximumFileSize": 2048,
+    "minimumTitleLength": 3,
+    "maximumTitleLength": 255,
+    "minimumUsernameLength": 2,
+    "maximumUsernameLength": 16,
+    "minimumPasswordLength": 6,
+    "maximumSignatureLength": 255,
+    "maximumAboutMeLength": 1000,
+    "maximumProfileImageSize": 256,
+    "profileImageDimension": 128,
+    "requireEmailConfirmation": 0,
+    "profile:allowProfileImageUploads": 1
+}
--- a/install/web.js
+++ b/install/web.js
@@ -41,8 +41,7 @@ web.install = function(port) {

 function launchExpress(port) {
 	server = app.listen(port, function() {
-		var host = server.address().address;
-		winston.info('Web installer listening on http://%s:%s', host, port);
+		winston.info('Web installer listening on http://%s:%s', '0.0.0.0', port);
 	});
 }

@@ -104,6 +103,10 @@ function launch(req, res) {
 		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');
 	
 	child.unref();
 	process.exit(0);
--- a/loader.js
+++ b/loader.js
@@ -17,7 +17,7 @@ nconf.argv().env().file({

 var	pidFilePath = __dirname + '/pidfile',
 	output = logrotate({ file: __dirname + '/logs/output.log', size: '1m', keep: 3, compress: true }),
-	silent = nconf.get('silent') !== false,
+	silent = nconf.get('silent') === 'false' ? false : nconf.get('silent') !== false,
 	numProcs,
 	workers = [],

@@ -248,7 +248,7 @@ Loader.notifyWorkers = function(msg, worker_pid) {

 fs.open(path.join(__dirname, 'config.json'), 'r', function(err) {
 	if (!err) {
-		if (nconf.get('daemon') !== false) {
+		if (nconf.get('daemon') !== 'false' && nconf.get('daemon') !== false) {
 			if (fs.existsSync(pidFilePath)) {
 				try {
 					var	pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
--- a/296
+++ b/296
@@ -1,137 +1,167 @@
-#!/bin/bash
+#!/usr/bin/env node

-# $0 script path
-# $1 action
-# $2 subaction
+var colors = require('colors'),
+	cproc = require('child_process'),
+	argv = require('minimist')(process.argv.slice(2)),
+	fs = require('fs'),
+	async = require('async'),
+	touch = require('touch'),
+	npm = require('npm');

-node="$(which nodejs 2>/dev/null)";
-if [ $? -gt 0 ];
-	then node="$(which node)";
-fi
+var getRunningPid = function(callback) {
+		fs.readFile(__dirname + '/pidfile', {
+			encoding: 'utf-8'
+		}, function(err, pid) {
+			if (err) {
+				return callback(err);
+			}

-function pidExists() {
-	if [ -e "pidfile" ];
-		then
-			if ps -p $(cat pidfile) > /dev/null
-				then return 1;
-				else
-					rm ./pidfile;
-					return 0;
-			fi
-		else
-			return 0;
-	fi
+			try {
+				process.kill(parseInt(pid, 10), 0);
+				callback(null, parseInt(pid, 10));
+			} catch(e) {
+				callback(e);
+			}
+		});
+	};
+
+switch(process.argv[2]) {
+	case 'status':
+		getRunningPid(function(err, pid) {
+			if (!err) {
+				process.stdout.write('\nNodeBB Running '.bold + '(pid '.cyan + pid.toString().cyan + ')\n'.cyan);
+				process.stdout.write('\t"' + './nodebb stop'.yellow + '" to stop the NodeBB server\n');
+				process.stdout.write('\t"' + './nodebb log'.yellow + '" to view server output\n');
+				process.stdout.write('\t"' + './nodebb restart'.yellow + '" to restart NodeBB\n\n');
+			} else {
+				process.stdout.write('\nNodeBB is not running\n'.bold);
+				process.stdout.write('\t"' + './nodebb start'.yellow + '" to launch the NodeBB server\n\n');
+			}
+		})
+		break;
+
+	case 'start':
+		process.stdout.write('\nStarting NodeBB\n'.bold);
+		process.stdout.write('  "' + './nodebb stop'.yellow + '" to stop the NodeBB server\n');
+		process.stdout.write('  "' + './nodebb log'.yellow + '" to view server output\n');
+		process.stdout.write('  "' + './nodebb restart'.yellow + '" to restart NodeBB\n\n');
+
+		// Spawn a new NodeBB process
+		cproc.fork(__dirname + '/loader.js', {
+			env: process.env
+		});
+		break;
+
+	case 'stop':
+		getRunningPid(function(err, pid) {
+			if (!err) {
+				process.kill(pid, 'SIGTERM');
+				process.stdout.write('Stopping NodeBB. Goodbye!\n')
+			} else {
+				process.stdout.write('NodeBB is already stopped.\n');
+			}
+		});
+		break;
+
+	case 'restart':
+		getRunningPid(function(err, pid) {
+			if (!err) {
+				process.kill(pid, 'SIGHUP');
+			} else {
+				process.stdout.write('NodeBB could not be restarted, as a running instance could not be found.');
+			}
+		});
+		break;
+
+	case 'reload':
+		getRunningPid(function(err, pid) {
+			if (!err) {
+				process.kill(pid, 'SIGUSR2');
+			} else {
+				process.stdout.write('NodeBB could not be reloaded, as a running instance could not be found.');
+			}
+		});
+		break;
+
+	case 'dev':
+		process.env.NODE_ENV = 'development';
+		cproc.fork(__dirname + '/loader.js', ['--no-daemon', '--no-silent'], {
+			env: process.env
+		});
+		break;
+
+	case 'log':
+		process.stdout.write('\nType '.red + 'Ctrl-C '.bold + 'to exit\n\n'.red);
+		cproc.spawn('tail', ['-F', './logs/output.log'], {
+			cwd: __dirname,
+			stdio: 'inherit'
+		});
+		break;
+
+	case 'setup':
+		cproc.fork('app.js', ['--setup'], {
+			cwd: __dirname,
+			silent: false
+		});
+		break;
+
+	case 'reset':
+		var args = process.argv.slice(0);
+		args.unshift('--reset');
+
+		cproc.fork('app.js', args, {
+			cwd: __dirname,
+			silent: false
+		});
+		break;
+
+	case 'upgrade':
+		async.series([
+			function(next) {
+				process.stdout.write('1. '.bold + 'Bringing base dependencies up to date\n'.yellow);
+				npm.load({
+					loglevel: 'silent'
+				}, function() {
+					npm.commands.install(next);
+				});
+			},
+			function(next) {
+				process.stdout.write('2. '.bold + 'Updating NodeBB data store schema\n'.yellow);
+				var upgradeProc = cproc.fork('app.js', ['--upgrade'], {
+					cwd: __dirname,
+					silent: false
+				});
+
+				upgradeProc.on('close', next)
+			},
+			function(next) {
+				process.stdout.write('3. '.bold + 'Storing upgrade date in "package.json"\n'.yellow);
+				touch(__dirname + '/package.json', {}, next);
+			}
+		], function(err) {
+			if (err) {
+				process.stdout.write('\nError'.red + ': ' + err.message + '\n');
+			} else {
+				var message = 'NodeBB Upgrade Complete!',
+					spaces = new Array(Math.floor(process.stdout.columns / 2) - (message.length / 2) + 1).join(' ');
+				process.stdout.write('\n' + spaces + message.green.bold + '\n\n');
+			}
+		});
+		break;
+
+	default:
+		process.stdout.write('\nWelcome to NodeBB\n\n'.bold);
+		process.stdout.write('Usage: ./nodebb {start|stop|reload|restart|log|setup|reset|upgrade|dev}\n\n');
+		process.stdout.write('\t' + 'start'.yellow + '\tStart the NodeBB server\n');
+		process.stdout.write('\t' + 'stop'.yellow + '\tStops the NodeBB server\n');
+		process.stdout.write('\t' + 'reload'.yellow + '\tRestarts NodeBB\n');
+		process.stdout.write('\t' + 'restart'.yellow + '\tRestarts NodeBB\n');
+		process.stdout.write('\t' + 'log'.yellow + '\tOpens the logging interface (useful for debugging)\n');
+		process.stdout.write('\t' + 'setup'.yellow + '\tRuns the NodeBB setup script\n');
+		process.stdout.write('\t' + 'reset'.yellow + '\tDisables all plugins, restores the default theme.\n');
+		process.stdout.write('\t' + 'upgrade'.yellow + '\tRun NodeBB upgrade scripts, ensure packages are up-to-date\n');
+		process.stdout.write('\t' + 'dev'.yellow + '\tStart NodeBB in interactive development mode\n');
+		process.stdout.write('\t' + 'watch'.yellow + '\tStart NodeBB in development mode and watch for changes\n');
+		process.stdout.write('\n');
+		break;
 }
-
-case "$1" in
-	start)
-		echo "Starting NodeBB";
-		echo "  \"./nodebb stop\" to stop the NodeBB server";
-		echo "  \"./nodebb log\" to view server output";
-
-		# Start the loader daemon
-		"$node" loader "$@"
-		;;
-
-	stop)
-		pidExists;
-		if [ 0 -eq $? ];
-			then
-				echo "NodeBB is already stopped.";
-			else
-				echo "Stopping NodeBB. Goodbye!";
-				kill $(cat pidfile);
-		fi
-		;;
-
-	restart)
-		pidExists;
-		if [ 0 -eq $? ];
-			then
-				echo "NodeBB could not be restarted, as a running instance could not be found.";
-			else
-				echo "Restarting NodeBB.";
-				kill -1 $(cat pidfile);
-		fi
-		;;
-
-	reload)
-		pidExists;
-		if [ 0 -eq $? ];
-			then
-				echo "NodeBB could not be reloaded, as a running instance could not be found.";
-			else
-				echo "Reloading NodeBB.";
-				kill -12 $(cat pidfile);
-		fi
-		;;
-
-	status)
-		pidExists;
-		if [ 0 -eq $? ];
-			then
-				echo "NodeBB is not running";
-				echo "  \"./nodebb start\" to launch the NodeBB server";
-			else
-				echo "NodeBB Running (pid $(cat pidfile))";
-				echo "  \"./nodebb stop\" to stop the NodeBB server";
-				echo "  \"./nodebb log\" to view server output";
-				echo "  \"./nodebb restart\" to restart NodeBB";
-		fi
-		;;
-
-	log)
-		clear;
-		tail -F ./logs/output.log;
-		;;
-
-	upgrade)
-		npm install
-		# ls -d node_modules/nodebb* | xargs -n1 basename | xargs npm install
-		# ls -d node_modules/nodebb* | xargs -n1 basename | xargs npm update
-		npm i nodebb-theme-vanilla nodebb-theme-lavender nodebb-widget-essentials
-		"$node" app --upgrade
-		touch package.json
-		;;
-
-	setup)
-		"$node" app --setup "$@"
-		;;
-
-	reset)
-		"$node" app --reset --$2
-		;;
-
-	dev)
-		echo "Launching NodeBB in \"development\" mode."
-		echo "To run the production build of NodeBB, please use \"forever\"."
-		echo "More Information: https://docs.nodebb.org/en/latest/running/index.html"
-		NODE_ENV=development "$node" loader --no-daemon --no-silent "$@"
-		;;
-
-	watch)
-		echo "***************************************************************************"
-		echo "WARNING: ./nodebb watch will be deprecated soon. Please use grunt: "
-		echo "https://docs.nodebb.org/en/latest/running/index.html#grunt-development"
-		echo "***************************************************************************"
-		NODE_ENV=development supervisor -q --ignore public/templates,public/nodebb.min.js,public/nodebb.min.js.map --extensions 'node|js|tpl|less' -- app "$@"
-		;;
-
-	*)
-		echo "Welcome to NodeBB"
-		echo $"Usage: $0 {start|stop|reload|restart|log|setup|reset|upgrade|dev|watch}"
-		echo ''
-		column -s '	' -t <<< '
-		start	Start the NodeBB server
-		stop	Stops the NodeBB server
-		reload	Restarts NodeBB
-		restart	Restarts NodeBB
-		log	Opens the logging interface (useful for debugging)
-		setup	Runs the NodeBB setup script
-		reset	Disables all plugins, restores the default theme.
-		upgrade	Run NodeBB upgrade scripts, ensure packages are up-to-date
-		dev	Start NodeBB in interactive development mode
-		watch	Start NodeBB in development mode and watch for changes
-		'
-		exit 1
-esac
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
  "name": "nodebb",
-  "license": "GPLv3 or later",
+  "license": "GPL-3.0",
  "description": "NodeBB Forum",
-  "version": "0.7.0-dev",
+  "version": "0.7.1-dev",
  "homepage": "http://www.nodebb.org",
  "repository": {
    "type": "git",
@@ -17,6 +17,7 @@
    "async": "~0.9.0",
    "bcryptjs": "~2.1.0",
    "body-parser": "^1.9.0",
+    "colors": "^1.1.0",
    "compression": "^1.1.0",
    "connect-ensure-login": "^0.1.1",
    "connect-flash": "^0.1.1",
@@ -27,28 +28,29 @@
    "daemon": "~1.1.0",
    "express": "^4.9.5",
    "express-session": "^1.8.2",
-    "gm": "1.17.0",
+    "lwip": "0.0.7",
    "gravatar": "^1.1.0",
    "heapdump": "^0.3.0",
    "less": "^2.0.0",
    "logrotate-stream": "^0.2.3",
    "lru-cache": "^2.6.1",
    "mime": "^1.3.4",
+    "minimist": "^1.1.1",
    "mkdirp": "~0.5.0",
    "mmmagic": "^0.3.13",
    "morgan": "^1.3.2",
    "nconf": "~0.7.1",
-    "nodebb-plugin-dbsearch": "^0.2.5",
-    "nodebb-plugin-emoji-extended": "^0.4.1-4",
-    "nodebb-plugin-markdown": "^2.1.0",
-    "nodebb-plugin-mentions": "^0.11.0",
-    "nodebb-plugin-soundpack-default": "~0.1.1",
+    "nodebb-plugin-dbsearch": "^0.2.12",
+    "nodebb-plugin-emoji-extended": "^0.4.8",
+    "nodebb-plugin-markdown": "^3.0.0",
+    "nodebb-plugin-mentions": "^0.11.4",
+    "nodebb-plugin-soundpack-default": "^0.1.1",
    "nodebb-plugin-spam-be-gone": "^0.4.0",
-    "nodebb-theme-lavender": "^1.0.28",
-    "nodebb-theme-vanilla": "^1.0.120",
-    "nodebb-theme-persona": "^0.1.39",
-    "nodebb-widget-essentials": "^1.0.0",
    "nodebb-rewards-essentials": "^0.0.1",
+    "nodebb-theme-lavender": "^1.0.42",
+    "nodebb-theme-persona": "^0.2.0",
+    "nodebb-theme-vanilla": "^1.1.0",
+    "nodebb-widget-essentials": "^1.0.2",
    "npm": "^2.1.4",
    "passport": "^0.2.1",
    "passport-local": "1.0.0",
@@ -64,9 +66,11 @@
    "socket.io-redis": "^0.1.3",
    "socketio-wildcard": "~0.1.1",
    "string": "^3.0.0",
-    "templates.js": "^0.2.2",
+    "templates.js": "^0.2.6",
+    "touch": "0.0.3",
    "uglify-js": "git+https://github.com/julianlam/UglifyJS2.git",
    "underscore": "~1.8.3",
+    "underscore.deep": "^0.5.1",
    "validator": "^3.30.0",
    "winston": "^0.9.0",
    "xregexp": "~2.0.0"
--- a/public/language/ar/category.json
+++ b/public/language/ar/category.json
@@ -1,11 +1,11 @@
 {
    "new_topic_button": "موضوع جديد",
-    "guest-login-post": "المرجو تسجيل الدخول أوَّلا",
+    "guest-login-post": "يجب عليك تسجيل الدخول للرد",
    "no_topics": "<strong>لا توجد مواضيع في هذه الفئة</strong>لم لا تحاول إنشاء موضوع؟<br />",
    "browsing": "تصفح",
    "no_replies": "لم يرد أحد",
    "share_this_category": "انشر هذه الفئة",
-    "watch": "Watch",
+    "watch": "متابعة",
    "ignore": "تجاهل",
    "watch.message": "You are now watching updates from this category",
    "ignore.message": "You are now ignoring updates from this category"
--- a/public/language/ar/email.json
+++ b/public/language/ar/email.json
@@ -1,5 +1,5 @@
 {
-    "password-reset-requested": "تم طلب إعادة تعيين كلمة السر - %1!",
+    "password-reset-requested": "تم طلب إعادة تعيين كلمة المرور - %1!",
    "welcome-to": "مرحبًا بك في %1",
    "greeting_no_name": "مرحبًا",
    "greeting_with_name": "مرحبًا بك يا %1",
--- a/public/language/ar/error.json
+++ b/public/language/ar/error.json
@@ -1,8 +1,8 @@
 {
    "invalid-data": "بيانات غير صالحة",
    "not-logged-in": "لم تقم بتسجيل الدخول",
-    "account-locked": "تم إقفال حسابكم مؤقتًا.",
-    "search-requires-login": "البحث في المنتدى يستلزم توفرك على حساب! المرجو تسجيل دخولك أو إنشاء حساب!",
+    "account-locked": "تم حظر حسابك مؤقتًا.",
+    "search-requires-login": "Searching requires an account - please login or register.",
    "invalid-cid": "قائمة غير موجودة",
    "invalid-tid": "موضوع غير متواجد",
    "invalid-pid": "رد غير موجود",
@@ -25,7 +25,7 @@
    "username-too-short": "اسم المستخدم قصير.",
    "username-too-long": "اسم المستخدم طويل",
    "user-banned": "المستخدم محظور",
-    "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
+    "user-too-new": "عذرا, يجب أن تنتظر 1% ثواني قبل قيامك بأول مشاركة",
    "no-category": "قائمة غير موجودة",
    "no-topic": "موضوع غير موجود",
    "no-post": "رد غير موجود",
@@ -68,9 +68,10 @@
    "invalid-file": "ملف غير مقبول",
    "uploads-are-disabled": "رفع الملفات غير مفعل",
    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
    "cant-chat-with-yourself": "لايمكنك فتح محادثة مع نفسك",
    "chat-restricted": "هذا المستخدم عطل المحادثات الواردة عليه. يجب أن يتبعك حتى تتمكن من فتح محادثة معه.",
-    "too-many-messages": "You have sent too many messages, please wait awhile.",
+    "too-many-messages": "لقد أرسلت الكثير من الرسائل، الرجاء اﻹنتظار قليلاً",
    "reputation-system-disabled": "نظام السمعة معطل",
    "downvoting-disabled": "التصويتات السلبية معطلة",
    "not-enough-reputation-to-downvote": "ليس لديك سمعة تكفي لإضافة صوت سلبي لهذا الموضوع",
@@ -78,6 +79,6 @@
    "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"
+    "wrong-login-type-email": "الرجاء استعمال بريدك اﻹلكتروني للدخول",
+    "wrong-login-type-username": "الرجاء استعمال اسم المستخدم الخاص بك للدخول"
 }
--- a/public/language/ar/global.json
+++ b/public/language/ar/global.json
@@ -27,7 +27,7 @@
    "header.tags": "وسم",
    "header.popular": "الأكثر شهرة",
    "header.users": "المستخدمين",
-    "header.groups": "Groups",
+    "header.groups": "المجموعات",
    "header.chats": "المحادثات",
    "header.notifications": "التنبيهات",
    "header.search": "بحث",
@@ -75,7 +75,7 @@
    "updated.title": "تم تحديث المنتدى",
    "updated.message": "لقد تم تحديث المنتدى إلى آخر نسخة للتو. المرجو إعادة تحميل الصفحة.",
    "privacy": "الخصوصية",
-    "follow": "Follow",
-    "unfollow": "Unfollow",
+    "follow": "متابعة",
+    "unfollow": "إلغاء المتابعة",
    "delete_all": "حذف الكل"
 }
--- a/public/language/ar/groups.json
+++ b/public/language/ar/groups.json
@@ -18,10 +18,10 @@
    "details.private": "خاص",
    "details.grant": "منح/سحب المِلكية",
    "details.kick": "طرد",
-    "details.owner_options": "تدبير المجموعة",
+    "details.owner_options": "إدارة المجموعة",
    "details.group_name": "اسم المجموعة",
-    "details.member_count": "Member Count",
-    "details.creation_date": "Creation Date",
+    "details.member_count": "عدد اﻷعضاء",
+    "details.creation_date": "تاريخ الإنشاء",
    "details.description": "الوصف",
    "details.badge_preview": "معاينة الوسام",
    "details.change_icon": "تغيير الأيقونة",
--- a/public/language/ar/login.json
+++ b/public/language/ar/login.json
@@ -7,5 +7,5 @@
    "alternative_logins": "تسجيلات الدخول البديلة",
    "failed_login_attempt": "فشلت محاولة تسجيل الدخول، يرجى المحاولة مرة أخرى.",
    "login_successful": "قمت بتسجيل الدخول بنجاح!",
-    "dont_have_account": "لم تفتح حسابك بعد؟"
+    "dont_have_account": "لا تملك حساب؟"
 }
--- a/public/language/ar/modules.json
+++ b/public/language/ar/modules.json
@@ -16,8 +16,8 @@
    "chat.thirty_days": "30 يومًا",
    "chat.three_months": "3 أشهر",
    "composer.compose": "Compose",
-    "composer.show_preview": "Show Preview",
-    "composer.hide_preview": "Hide Preview",
+    "composer.show_preview": "عرض المعاينة",
+    "composer.hide_preview": "إخفاء المعاينة",
    "composer.user_said_in": "%1 كتب في  %2",
    "composer.user_said": "%1 كتب:",
    "composer.discard": "هل أنت متأكد أنك تريد التخلي عن التغييرات؟",
--- a/public/language/ar/notifications.json
+++ b/public/language/ar/notifications.json
@@ -1,5 +1,5 @@
 {
-    "title": "تنبيهات",
+    "title": "التنبيهات",
    "no_notifs": "ليس لديك أية تنبيهات جديدة",
    "see_all": "معاينة كل التنبيهات",
    "mark_all_read": "اجعل كل التنبيهات مقروءة",
--- a/public/language/ar/pages.json
+++ b/public/language/ar/pages.json
@@ -1,11 +1,11 @@
 {
    "home": "الصفحة الرئيسية",
-    "unread": "المواضيع غير المقروءة",
+    "unread": "المواضيع الغير مقروءة",
    "popular": "المواضيع الأكثر شهرة",
    "recent": "المواضيع الحديثة",
-    "users": "المستخدمون المسجلون",
+    "users": "اﻷعضاء المسجلون",
    "notifications": "التنبيهات",
-    "tags": "Tags",
+    "tags": "الكلمات الدلالية",
    "tag": "Topics tagged under \"%1\"",
    "user.edit": "تعديل \"%1\"",
    "user.following": "المستخدمون الذين يتبعهم %1",
@@ -15,7 +15,7 @@
    "user.groups": "%1's Groups",
    "user.favourites": "مفضلات %1",
    "user.settings": "خيارات المستخدم",
-    "user.watched": "Topics watched by %1",
+    "user.watched": "المواضيع المتابعة من قبل %1 ",
    "maintenance.text": "جاري صيانة %1. المرجو العودة لاحقًا.",
    "maintenance.messageIntro": "بالإضافة إلى ذلك، قام مدبر النظام بترك هذه الرسالة:"
 }
--- a/public/language/ar/recent.json
+++ b/public/language/ar/recent.json
@@ -5,15 +5,15 @@
    "month": "شهر",
    "year": "سنة",
    "alltime": "دائمًا",
-    "no_recent_topics": "لاوجود لمشاركات جديدة",
+    "no_recent_topics": "لايوجد مواضيع جديدة",
    "no_popular_topics": "There are no popular topics.",
-    "there-is-a-new-topic": "There is a new topic.",
-    "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.",
-    "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.",
-    "there-are-new-topics": "There are %1 new topics.",
-    "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.",
-    "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.",
-    "there-is-a-new-post": "There is a new post.",
-    "there-are-new-posts": "There are %1 new posts.",
-    "click-here-to-reload": "Click here to reload."
+    "there-is-a-new-topic": "يوجد موضوع جديد",
+    "there-is-a-new-topic-and-a-new-post": "يوجد موضوع جديد و رد جديد",
+    "there-is-a-new-topic-and-new-posts": "يوجد موضوع جديد و %1 ردود جديدة ",
+    "there-are-new-topics": "يوجد %1 مواضيع جديدة",
+    "there-are-new-topics-and-a-new-post": "يوجد %1 مواضيع جديدة و رد جديد",
+    "there-are-new-topics-and-new-posts": "يوجد %1 مواضيع جديدة و %2 مشاركات جديدة",
+    "there-is-a-new-post": "يوجد مشاركة جديدة",
+    "there-are-new-posts": "يوجد %1 مشاركات جديدة",
+    "click-here-to-reload": "إضغط هنا لإعادة التحميل"
 }
--- a/public/language/ar/register.json
+++ b/public/language/ar/register.json
@@ -1,18 +1,18 @@
 {
    "register": "تسجيل",
-    "help.email": "افتراضيا، سيتم إخفاء بريدك الإلكتروني من الجمهور.",
+    "help.email": "افتراضيا، سيتم إخفاء بريدك الإلكتروني من العامة.",
    "help.username_restrictions": "اسم مستخدم فريدة من نوعها بين1% و2% حرفا. يمكن للآخرين ذكرك @ <'span id='your-username> اسم المستخدم </span>.",
-    "help.minimum_password_length": "كلمتك السر يجب أن تكون على الأقل متألفة من 1% أحرف",
+    "help.minimum_password_length": "كلمة المرور يجب أن تكون على الأقل بها 1% أحرف",
    "email_address": "عنوان البريد الإلكتروني",
    "email_address_placeholder": "ادخل عنوان البريد الإلكتروني",
    "username": "اسم المستخدم",
    "username_placeholder": "أدخل اسم المستخدم",
-    "password": "كلمة السر",
-    "password_placeholder": "أدخل كلمة السر",
-    "confirm_password": "تأكيد كلمة السر",
-    "confirm_password_placeholder": "تأكيد كلمة السر",
+    "password": "كلمة المرور",
+    "password_placeholder": "أدخل كلمة المرور",
+    "confirm_password": "تأكيد كلمة المرور",
+    "confirm_password_placeholder": "تأكيد كلمة المرور",
    "register_now_button": "قم بالتسجيل الآن",
    "alternative_registration": "طريقة تسجيل بديلة",
-    "terms_of_use": "قوانين الاستخدام",
-    "agree_to_terms_of_use": "أوافق على قوانين الاستخدام"
+    "terms_of_use": "شروط الاستخدام",
+    "agree_to_terms_of_use": "أوافق على شروط الاستخدام"
 }
--- a/public/language/ar/reset_password.json
+++ b/public/language/ar/reset_password.json
@@ -1,12 +1,12 @@
 {
-    "reset_password": "إعادة تعيين كلمة السر",
-    "update_password": "تحديث كلمة السر",
-    "password_changed.title": "تم تغير كلمة السر",
-    "password_changed.message": "<p>تم تغير كلمة السر بنجاح. يرجى <a href='/login'>إعادة الدخول</a></p>",
+    "reset_password": "إعادة تعيين كلمة المرور",
+    "update_password": "تحديث كلمة المرور",
+    "password_changed.title": "تم تغير كلمة المرور",
+    "password_changed.message": "<p>تم تغير كلمة المرور بنجاح، الرجاء <a href='/login'>إعادة الدخول</a></p>",
    "wrong_reset_code.title": "رمز إعادة التعيين غير صحيح",
    "wrong_reset_code.message": "رمز إعادة التعين غير صحيح، يرجى المحاولة مرة أخرى أو <a href='/reset'>اطلب رمزا جديدا</a>",
-    "new_password": "كلمة السر الجديدة",
-    "repeat_password": "تأكيد كلمة السر",
+    "new_password": "كلمة المرور الجديدة",
+    "repeat_password": "تأكيد كلمة المرور",
    "enter_email": "يرجى إدخال <strong>عنوان البريد الإلكتروني</strong> الخاص بك وسوف نرسل لك رسالة بالبريد الالكتروني مع تعليمات حول كيفية إستعادة حسابك.",
    "enter_email_address": "ادخل عنوان البريد الإلكتروني",
    "password_reset_sent": "إعادة تعيين كلمة السر أرسلت",
--- a/public/language/ar/search.json
+++ b/public/language/ar/search.json
@@ -1,40 +1,40 @@
 {
    "results_matching": "%1 نتيجة (نتائج) موافقة ل \"%2\", (%3 ثواني)",
    "no-matches": "No matches found",
-    "advanced-search": "Advanced Search",
-    "in": "In",
-    "titles": "Titles",
-    "titles-posts": "Titles and Posts",
+    "advanced-search": "بحث متقدم",
+    "in": "في",
+    "titles": "العناوين",
+    "titles-posts": "العناوين والمشاركات",
    "posted-by": "Posted by",
-    "in-categories": "In Categories",
-    "search-child-categories": "Search child categories",
-    "reply-count": "Reply Count",
-    "at-least": "At least",
-    "at-most": "At most",
-    "post-time": "Post time",
-    "newer-than": "Newer than",
-    "older-than": "Older than",
-    "any-date": "Any date",
-    "yesterday": "Yesterday",
-    "one-week": "One week",
-    "two-weeks": "Two weeks",
-    "one-month": "One month",
-    "three-months": "Three months",
-    "six-months": "Six months",
-    "one-year": "One year",
+    "in-categories": "في الفئات",
+    "search-child-categories": "بحث في الفئات الفرعية",
+    "reply-count": "عدد المشاركات",
+    "at-least": "على اﻷقل",
+    "at-most": "على اﻷكثر",
+    "post-time": "تاريخ المشاركة",
+    "newer-than": "أحدث من",
+    "older-than": "أقدم من",
+    "any-date": "أي وقت",
+    "yesterday": "أمس",
+    "one-week": "أسبوع",
+    "two-weeks": "أسبوعان",
+    "one-month": "شهر",
+    "three-months": "ثلاثة أشهر",
+    "six-months": "ستة أشهر",
+    "one-year": "عام",
    "sort-by": "Sort by",
-    "last-reply-time": "Last reply time",
-    "topic-title": "Topic title",
-    "number-of-replies": "Number of replies",
-    "number-of-views": "Number of views",
-    "topic-start-date": "Topic start date",
-    "username": "Username",
-    "category": "Category",
+    "last-reply-time": "تاريخ آخر رد",
+    "topic-title": "عنوان الموضوع",
+    "number-of-replies": "عدد الردود",
+    "number-of-views": "عدد المشاهدات",
+    "topic-start-date": "تاريخ بدأ الموضوع",
+    "username": "اسم المستخدم",
+    "category": "فئة",
    "descending": "In descending order",
    "ascending": "In ascending order",
-    "save-preferences": "Save preferences",
-    "clear-preferences": "Clear preferences",
-    "search-preferences-saved": "Search preferences saved",
-    "search-preferences-cleared": "Search preferences cleared",
-    "show-results-as": "Show results as"
+    "save-preferences": "حفظ التفضيلات",
+    "clear-preferences": "ازالة التفضيلات",
+    "search-preferences-saved": "تم حفظ تفضيلات البحث",
+    "search-preferences-cleared": "تم ازالة تفضيلات البحث",
+    "show-results-as": "عرض النتائج كـ"
 }
--- a/public/language/ar/tags.json
+++ b/public/language/ar/tags.json
@@ -1,7 +1,7 @@
 {
-    "no_tag_topics": "لاوجود لمواضيع تحمل هذا الوسم.",
-    "tags": "بطاقات",
+    "no_tag_topics": "لا يوجد مواضيع بهذه الكلمة الدلالية.",
+    "tags": "الكلمات الدلالية",
    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
-    "enter_tags_here_short": "أدخل البطاقات...",
-    "no_tags": "لاتوجد هناك بطاقات بعد."
+    "enter_tags_here_short": "أدخل الكلمات الدلالية...",
+    "no_tags": "لا يوجد كلمات دلالية بعد."
 }
--- a/public/language/ar/topic.json
+++ b/public/language/ar/topic.json
@@ -5,6 +5,7 @@
    "no_topics_found": "لا توجد مواضيع !",
    "no_posts_found": "لا  توجد مشاركات!",
    "post_is_deleted": "هذه المشاركة محذوفة!",
+    "topic_is_deleted": "هذا الموضوع محذوف",
    "profile": "الملف الشخصي",
    "posted_by": "كتب من طرف %1",
    "posted_by_guest": "كتب من طرف زائر",
@@ -12,21 +13,21 @@
    "notify_me": "تلق تنبيهات بالردود الجديدة في هذا الموضوع",
    "quote": "اقتبس",
    "reply": "رد",
-    "guest-login-reply": "Log in to reply",
+    "guest-login-reply": "يجب عليك تسجيل الدخول للرد",
    "edit": "تعديل",
    "delete": "حذف",
    "purge": "تطهير",
    "restore": "استعادة",
-    "move": "انقل",
+    "move": "نقل",
    "fork": "فرع",
    "link": "رابط",
    "share": "نشر",
    "tools": "أدوات",
-    "flag": "اشعار بمشاركة مخلة",
+    "flag": "تبليغ",
    "locked": "مقفل",
-    "bookmark_instructions": "انقر هنا للإكمال أو أغلق للإلغاء.",
+    "bookmark_instructions": "إضغط هنا للعودة إلى آخر موضع أو غلق للإلغاء",
    "flag_title": "إشعار بمشاركة مخلة.",
-    "flag_confirm": "هل تريد حقًّا أن تشعر بهذه المشاركة على أنها مخلة؟",
+    "flag_confirm": "هل تريد حقًّا التبليغ بهذه المشاركة؟",
    "flag_success": "تم الإشعار بهذه المشاركة على أنها مخلة",
    "deleted_message": "هذه المشاركة محذوفة. فقط من لهم صلاحية الإشراف على ا لمشاركات يمكنهم معاينتها.",
    "following_topic.message": "ستستلم تنبيها عند كل مشاركة جديدة في هذا الموضوع.",
@@ -75,7 +76,7 @@
    "fork_no_pids": "لم تختر أي مشاركة",
    "fork_success": "تم إنشاء فرع للموضوع بنجاح! إضغط هنا لمعاينة الفرع.",
    "composer.title_placeholder": "أدخل عنوان موضوعك هنا...",
-    "composer.handle_placeholder": "Name",
+    "composer.handle_placeholder": "اﻹسم",
    "composer.discard": "نبذ التغييرات",
    "composer.submit": "حفظ",
    "composer.replying_to": "الرد على %1",
@@ -95,5 +96,5 @@
    "oldest_to_newest": "من الأقدم إلى الأحدث",
    "newest_to_oldest": "من الأحدث إلى الأقدم",
    "most_votes": "الأكثر تصويتًا",
-    "most_posts": "Most posts"
+    "most_posts": "اﻷكثر رداً"
 }
--- a/public/language/ar/unread.json
+++ b/public/language/ar/unread.json
@@ -3,7 +3,7 @@
    "no_unread_topics": "ليس هناك أي موضوع غير مقروء",
    "load_more": "حمل المزيد",
    "mark_as_read": "حدد غير مقروء",
-    "selected": "المختارة",
+    "selected": "المحددة",
    "all": "الكل",
    "topics_marked_as_read.success": "تم تحديد المواضيع على أنها مقروءة!"
 }
--- a/public/language/ar/user.json
+++ b/public/language/ar/user.json
@@ -1,9 +1,9 @@
 {
    "banned": "محظور",
-    "offline": "ليس موجود حالياً",
+    "offline": "غير متصل",
    "username": "إسم المستخدم",
-    "joindate": "Join Date",
-    "postcount": "Post Count",
+    "joindate": "تاريخ الإنضمام",
+    "postcount": "عدد المشاركات",
    "email": "البريد الإلكتروني",
    "confirm_email": "تأكيد عنوان البريد الإلكتروني",
    "delete_account": "حذف الحساب",
@@ -15,25 +15,26 @@
    "joined": "تاريخ التسجيل",
    "lastonline": "تاريخ آخر دخول",
    "profile": "الملف الشخصي",
-    "profile_views": "عدد مشاهدات الملف الشخصي",
+    "profile_views": "عدد المشاهدات",
    "reputation": "السمعة",
-    "favourites": "المفضلات",
-    "watched": "Watched",
+    "favourites": "التفضيلات",
+    "watched": "متابع",
    "followers": "المتابعون",
    "following": "يتابع",
+    "aboutme": "معلومة عنك او السيرة الذاتية",
    "signature": "توقيع",
    "gravatar": "Gravatar",
    "birthday": "عيد ميلاد",
    "chat": "محادثة",
    "follow": "تابع",
    "unfollow": "إلغاء المتابعة",
-    "more": "More",
+    "more": "المزيد",
    "profile_update_success": "تم تحديث الملف الشخصي بنجاح",
    "change_picture": "تغيير الصورة",
    "edit": "تعديل",
    "uploaded_picture": "الصورة المرفوعة",
    "upload_new_picture": "رفع صورة جديدة",
-    "upload_new_picture_from_url": "رفع صورة جديدة بواسطة رابط",
+    "upload_new_picture_from_url": "رفع صورة جديدة من رابط",
    "current_password": "كلمة السر الحالية",
    "change_password": "تغيير كلمة السر",
    "change_password_error": "كلمة سر غير صحيحة",
@@ -60,7 +61,7 @@
    "digest_monthly": "شهريًّا",
    "send_chat_notifications": "استلام رسالة إلكترونية عند ورود محادثة وأنا غير متصل.",
    "send_post_notifications": "Send an email when replies are made to topics I am subscribed to",
-    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
+    "settings-require-reload": "تغيير بعض اﻹعدادات يتطلب تحديث الصفحة. إضغط هنا لتحديث الصفحة",
    "has_no_follower": "هذا المستخدم ليس لديه أي متابع :(",
    "follows_no_one": "هذا المستخدم لا يتابع أحد :(",
    "has_no_posts": "هذا المستخدم لم يكتب أي شيء بعد.",
@@ -71,13 +72,13 @@
    "paginate_description": "Paginate topics and posts instead of using infinite scroll",
    "topics_per_page": "المواضيع في كل صفحة",
    "posts_per_page": "الردود في كل صفحة",
-    "notification_sounds": "Play a sound when you receive a notification",
+    "notification_sounds": "تشغيل صوت عند تلقي تنبيه",
    "browsing": "خيارات التصفح",
-    "open_links_in_new_tab": "Open outgoing links in new tab",
+    "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",
-    "follow_topics_you_reply_to": "Follow topics that you reply to",
-    "follow_topics_you_create": "Follow topics you create",
+    "follow_topics_you_reply_to": "متابعة المواضيع التي تقوم بالرد فيها",
+    "follow_topics_you_create": "متابعة المواضيع التي تنشئها",
    "grouptitle": "Select the group title you would like to display",
-    "no-group-title": "No group title"
+    "no-group-title": "لا يوجد عنوان للمجموعة"
 }
--- a/public/language/ar/users.json
+++ b/public/language/ar/users.json
@@ -1,12 +1,12 @@
 {
-    "latest_users": "أحدث المستخدمين",
-    "top_posters": "أكثر المشتركين",
+    "latest_users": "أحدث الأعضاء",
+    "top_posters": "اﻷكثر مشاركة",
    "most_reputation": "أعلى سمعة",
    "search": "بحث",
    "enter_username": "أدخل اسم مستخدم للبحث",
    "load_more": "حمل المزيد",
    "users-found-search-took": "%1 user(s) found! Search took %2 seconds.",
    "filter-by": "Filter By",
-    "online-only": "Online only",
-    "picture-only": "Picture only"
+    "online-only": "المتصلون فقط",
+    "picture-only": "صورة فقط"
 }
--- a/public/language/bg/error.json
+++ b/public/language/bg/error.json
@@ -2,7 +2,7 @@
    "invalid-data": "Невалидни данни",
    "not-logged-in": "Изглежда не сте влезли в системата.",
    "account-locked": "Вашият акаунт беше заключен временно",
-    "search-requires-login": "Търсенето изисква регистриран акаунт! Моля, влезте или се регистрирайте!",
+    "search-requires-login": "Търсенето изисква акаунт – моля, влезте или се регистрирайте.",
    "invalid-cid": "Невалиден идентификатор на категория",
    "invalid-tid": "Невалиден идентификатор на тема",
    "invalid-pid": "Невалиден идентификатор на публикация",
@@ -68,6 +68,7 @@
    "invalid-file": "Грешен файл",
    "uploads-are-disabled": "Качването не е разрешено",
    "signature-too-long": "Съжаляваме, но подписът Ви трябва да съдържа не повече от %1 символ(а).",
+    "about-me-too-long": "Съжаляваме, но информацията за Вас трябва да съдържа не повече от %1 символ(а).",
    "cant-chat-with-yourself": "Не можете да пишете чат съобщение на себе си!",
    "chat-restricted": "Този потребител е ограничил чат съобщенията до себе си. Той трябва първо да Ви последва, преди да можете да си пишете с него.",
    "too-many-messages": "Изпратили сте твърде много съобщения. Моля, изчакайте малко.",
--- a/public/language/bg/topic.json
+++ b/public/language/bg/topic.json
@@ -5,6 +5,7 @@
    "no_topics_found": "Няма открити теми!",
    "no_posts_found": "Няма открити публикации!",
    "post_is_deleted": "Тази публикация е изтрита!",
+    "topic_is_deleted": "Тази тема е изтрита!",
    "profile": "Профил",
    "posted_by": "Публикувано от %1",
    "posted_by_guest": "Публикувано от гост",
--- a/public/language/bg/user.json
+++ b/public/language/bg/user.json
@@ -21,6 +21,7 @@
    "watched": "Наблюдавани",
    "followers": "Последователи",
    "following": "Следва",
+    "aboutme": "За мен",
    "signature": "Подпис",
    "gravatar": "Граватар",
    "birthday": "Рождена дата",
--- a/public/language/bn/error.json
+++ b/public/language/bn/error.json
@@ -2,7 +2,7 @@
    "invalid-data": "ভুল তথ্য",
    "not-logged-in": "আপনি লগিন করেননি",
    "account-locked": "আপনার অ্যাকাউন্ট সাময়িকভাবে লক করা হয়েছে",
-    "search-requires-login": "অনুসন্ধান করার জন্য একটি অ্যাকাউন্ট প্রয়োজন! অনুগ্রহপূর্বক প্রবেশ করুন অথবা নিবন্ধন করুন!",
+    "search-requires-login": "Searching requires an account - please login or register.",
    "invalid-cid": "ভুল বিভাগ নাম্বার",
    "invalid-tid": "ভুল টপিক নাম্বার",
    "invalid-pid": "ভুল পোস্ট নাম্বার",
@@ -68,6 +68,7 @@
    "invalid-file": "ভুল ফাইল",
    "uploads-are-disabled": "আপলোড নিষ্ক্রিয় করা",
    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
    "cant-chat-with-yourself": "আপনি নিজের সাথে চ্যাট করতে পারবেন না!",
    "chat-restricted": "এই সদস্য তার বার্তালাপ সংরক্ষিত রেখেছেন। এই সদস্য আপনাকে ফলো করার পরই কেবলমাত্র আপনি তার সাথে চ্যাট করতে পারবেন",
    "too-many-messages": "You have sent too many messages, please wait awhile.",
--- a/public/language/bn/topic.json
+++ b/public/language/bn/topic.json
@@ -5,6 +5,7 @@
    "no_topics_found": "কোন টপিক পাওয়া যায়নি!",
    "no_posts_found": "কোন পোস্ট পাওয়া যায়নি",
    "post_is_deleted": "এই পোস্টটি মুছে ফেলা হয়েছে!",
+    "topic_is_deleted": "This topic is deleted!",
    "profile": "প্রোফাইল ",
    "posted_by": "পোস্ট করেছেন %1",
    "posted_by_guest": "অতিথি পোস্ট ",
--- a/public/language/bn/user.json
+++ b/public/language/bn/user.json
@@ -21,6 +21,7 @@
    "watched": "Watched",
    "followers": "যাদের অনুসরণ করছেন",
    "following": "যারা আপনাকে অনুসরণ করছে",
+    "aboutme": "About me",
    "signature": "স্বাক্ষর",
    "gravatar": "গ্রাভাতার",
    "birthday": "জন্মদিন",
--- a/public/language/cs/error.json
+++ b/public/language/cs/error.json
@@ -2,7 +2,7 @@
    "invalid-data": "Neplatná data",
    "not-logged-in": "Zdá se, že nejste přihlášen(a)",
    "account-locked": "Váš účet byl dočasně uzamčen",
-    "search-requires-login": "Chcete-li vyhledávat, musíte mít účet. Přihlašte se nebo zaregistrujte, prosím.",
+    "search-requires-login": "Searching requires an account - please login or register.",
    "invalid-cid": "Neplatné ID kategorie",
    "invalid-tid": "Neplatné ID tématu",
    "invalid-pid": "Neplatné ID příspěvku",
@@ -68,6 +68,7 @@
    "invalid-file": "Neplatný soubor",
    "uploads-are-disabled": "Nahrávání je zakázáno",
    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
    "cant-chat-with-yourself": "Nemůžete chatovat sami se sebou!",
    "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
    "too-many-messages": "You have sent too many messages, please wait awhile.",
--- a/public/language/cs/topic.json
+++ b/public/language/cs/topic.json
@@ -5,6 +5,7 @@
    "no_topics_found": "Nebyla nalezena žádná témata!",
    "no_posts_found": "Nebyly nalezeny žádné příspěvky!",
    "post_is_deleted": "Tento příspěvek je vymazán!",
+    "topic_is_deleted": "This topic is deleted!",
    "profile": "Profil",
    "posted_by": "Posted by %1",
    "posted_by_guest": "Posted by Guest",
--- a/public/language/cs/user.json
+++ b/public/language/cs/user.json
@@ -21,6 +21,7 @@
    "watched": "Watched",
    "followers": "Sledují ho",
    "following": "Sleduje",
+    "aboutme": "About me",
    "signature": "Podpis",
    "gravatar": "Gravatar",
    "birthday": "Datum narození",
--- a/public/language/de/error.json
+++ b/public/language/de/error.json
@@ -2,7 +2,7 @@
    "invalid-data": "Daten ungültig",
    "not-logged-in": "Du bist nicht angemeldet.",
    "account-locked": "Dein Account wurde vorübergehend gesperrt.",
-    "search-requires-login": "Die Suche erfordert ein Konto! Bitte log dich ein oder registriere dich!",
+    "search-requires-login": "Searching requires an account - please login or register.",
    "invalid-cid": "Ungültige Kategorie-ID",
    "invalid-tid": "Ungültige Themen-ID",
    "invalid-pid": "Ungültige Beitrags-ID",
@@ -68,6 +68,7 @@
    "invalid-file": "Datei ungültig",
    "uploads-are-disabled": "Uploads sind deaktiviert",
    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
    "cant-chat-with-yourself": "Du kannst nicht mit dir selber chatten!",
    "chat-restricted": "Dieser Benutzer hat seine Chatfunktion eingeschränkt. Du kannst nur mit diesem Benutzer chatten, wenn er dir folgt.",
    "too-many-messages": "Du hast zu viele Nachrichten versandt, bitte warte eine Weile.",
--- a/public/language/de/topic.json
+++ b/public/language/de/topic.json
@@ -5,6 +5,7 @@
    "no_topics_found": "Keine passenden Themen gefunden.",
    "no_posts_found": "Keine Beiträge gefunden!",
    "post_is_deleted": "Dieser Beitrag wurde gelöscht!",
+    "topic_is_deleted": "This topic is deleted!",
    "profile": "Profil",
    "posted_by": "Geschrieben von %1",
    "posted_by_guest": "Verfasst von einem Gast",
--- a/public/language/de/user.json
+++ b/public/language/de/user.json
@@ -21,6 +21,7 @@
    "watched": "Beobachtet",
    "followers": "Folger",
    "following": "Folgt",
+    "aboutme": "About me",
    "signature": "Signatur",
    "gravatar": "Gravatar",
    "birthday": "Geburtstag",
@@ -75,7 +76,7 @@
    "browsing": "Stöbereinstellungen",
    "open_links_in_new_tab": "Ausgehende Links in neuem Tab öffnen",
    "enable_topic_searching": "Suchen innerhalb von Themen aktivieren",
-    "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",
+    "topic_search_help": "Wenn aktiviert, ersetzt die im-Thema-Suche die Standardsuche des Browsers. Dadurch kannst du im ganzen Thema suchen, nicht nur im sichtbaren Abschnitt.",
    "follow_topics_you_reply_to": "Themen folgen, in denen auf dich geantwortet wird",
    "follow_topics_you_create": "Themen folgen, die du erstellst",
    "grouptitle": "Wähle den anzuzeigenden Gruppen Titel aus",
--- a/public/language/el/error.json
+++ b/public/language/el/error.json
@@ -2,7 +2,7 @@
    "invalid-data": "Άκυρα Δεδομένα",
    "not-logged-in": "Φαίνεται πως δεν είσαι συνδεδεμένος/η.",
    "account-locked": "Ο λογαριασμός σου έχει κλειδωθεί προσωρινά",
-    "search-requires-login": "Πρέπει να είσαι συνδεδεμένος/η για να αναζητήσεις! Παρακαλώ συνδέσου ή εγγράψου!",
+    "search-requires-login": "Searching requires an account - please login or register.",
    "invalid-cid": "Άκυρο ID Κατηγορίας",
    "invalid-tid": "Άκυρο ID Θέματος",
    "invalid-pid": "Άκυρο ID Δημοσίευσης",
@@ -68,6 +68,7 @@
    "invalid-file": "Άκυρο Αρχείο",
    "uploads-are-disabled": "Το ανέβασμα αρχείων έχει απενεργοποιηθεί",
    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
    "cant-chat-with-yourself": "Δεν μπορείς να συνομιλήσεις με τον εαυτό σου!",
    "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
    "too-many-messages": "You have sent too many messages, please wait awhile.",
--- a/public/language/el/topic.json
+++ b/public/language/el/topic.json
@@ -5,6 +5,7 @@
    "no_topics_found": "Δεν βρέθηκαν θέματα!",
    "no_posts_found": "Δεν βρέθηκαν δημοσιεύσεις!",
    "post_is_deleted": "Αυτή η δημοσίευση έχει διαγραφεί!",
+    "topic_is_deleted": "This topic is deleted!",
    "profile": "Προφίλ",
    "posted_by": "Δημοσιεύτηκε από τον/την %1",
    "posted_by_guest": "Δημοσιεύτηκε από Επισκέπτη",
--- a/public/language/el/user.json
+++ b/public/language/el/user.json
@@ -21,6 +21,7 @@
    "watched": "Watched",
    "followers": "Ακόλουθοι",
    "following": "Ακολουθά",
+    "aboutme": "About me",
    "signature": "Υπογραφή",
    "gravatar": "Gravatar",
    "birthday": "Γενέθλια",
--- a/public/language/en@pirate/error.json
+++ b/public/language/en@pirate/error.json
@@ -2,7 +2,7 @@
    "invalid-data": "Invalid Data",
    "not-logged-in": "You don't seem to be logged in.",
    "account-locked": "Your account has been locked temporarily",
-    "search-requires-login": "Searching requires an account! Please login or register!",
+    "search-requires-login": "Searching requires an account - please login or register.",
    "invalid-cid": "Invalid Category ID",
    "invalid-tid": "Invalid Topic ID",
    "invalid-pid": "Invalid Post ID",
@@ -68,6 +68,7 @@
    "invalid-file": "Invalid File",
    "uploads-are-disabled": "Uploads are disabled",
    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
    "cant-chat-with-yourself": "You can't chat with yourself!",
    "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
    "too-many-messages": "You have sent too many messages, please wait awhile.",
--- a/public/language/en@pirate/topic.json
+++ b/public/language/en@pirate/topic.json
@@ -5,6 +5,7 @@
    "no_topics_found": "No topics found!",
    "no_posts_found": "No posts found!",
    "post_is_deleted": "This post is deleted!",
+    "topic_is_deleted": "This topic is deleted!",
    "profile": "Profile",
    "posted_by": "Posted by %1",
    "posted_by_guest": "Posted by Guest",
--- a/public/language/en@pirate/user.json
+++ b/public/language/en@pirate/user.json
@@ -21,6 +21,7 @@
    "watched": "Watched",
    "followers": "Followers",
    "following": "Following",
+    "aboutme": "About me",
    "signature": "Signature",
    "gravatar": "Gravatar",
    "birthday": "Birthday",
--- a/public/language/en_GB/email.json
+++ b/public/language/en_GB/email.json
@@ -2,13 +2,19 @@
 	"password-reset-requested": "Password Reset Requested - %1!",
 	"welcome-to": "Welcome to %1",

+	"invite": "Invitation from %1",
+
 	"greeting_no_name": "Hello",
 	"greeting_with_name": "Hello %1",

 	"welcome.text1": "Thank you for registering with %1!",
 	"welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.",
+	"welcome.text3": "An administrator has accepted your registration application. You can login with your username/password now.",
 	"welcome.cta": "Click here to confirm your email address",

+	"invitation.text1": "%1 has invited you to join %2",
+	"invitation.ctr": "Click here to create your account.",
+
 	"reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
 	"reset.text2": "To continue with the password reset, please click on the following link:",
 	"reset.cta": "Click here to reset your password",
--- a/public/language/en_GB/error.json
+++ b/public/language/en_GB/error.json
@@ -3,7 +3,7 @@

 	"not-logged-in": "You don't seem to be logged in.",
 	"account-locked": "Your account has been locked temporarily",
-	"search-requires-login": "Searching requires an account! Please login or register!",
+	"search-requires-login": "Searching requires an account - please login or register.",

 	"invalid-cid": "Invalid Category ID",
 	"invalid-tid": "Invalid Topic ID",
@@ -65,6 +65,7 @@
 	"already-unfavourited": "You have already unfavourited this post",

 	"cant-ban-other-admins": "You can't ban other admins!",
+	"cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",

 	"invalid-image-type": "Invalid image type. Allowed types are: %1",
 	"invalid-image-extension": "Invalid image extension",
@@ -88,8 +89,8 @@
 	"invalid-file": "Invalid File",
 	"uploads-are-disabled": "Uploads are disabled",

-	"signature-too-long" : "Sorry, your signature cannot be longer than %1 characters.",
-	"about-me-too-long" : "Sorry, your about me cannot be longer than %1 characters.",
+	"signature-too-long" : "Sorry, your signature cannot be longer than %1 character(s).",
+	"about-me-too-long" : "Sorry, your about me cannot be longer than %1 character(s).",

 	"cant-chat-with-yourself": "You can't chat with yourself!",
 	"chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
@@ -99,6 +100,7 @@
 	"downvoting-disabled": "Downvoting is disabled",
 	"not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",
 	"not-enough-reputation-to-flag": "You do not have enough reputation to flag this post",
+	"already-flagged": "You have already flagged this post",

 	"reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.",

--- a/public/language/en_GB/global.json
+++ b/public/language/en_GB/global.json
@@ -64,6 +64,7 @@
 	"reputation": "Reputation",

 	"read_more": "read more",
+	"more": "More",

 	"posted_ago_by_guest": "posted %1 by Guest",
 	"posted_ago_by": "posted %1 by %2",
--- a/public/language/en_GB/groups.json
+++ b/public/language/en_GB/groups.json
@@ -7,6 +7,8 @@

 	"pending.accept": "Accept",
 	"pending.reject": "Reject",
+	"pending.accept_all": "Accept All",
+	"pending.reject_all": "Reject All",

 	"cover-instructions": "Drag and Drop a photo, drag to position, and hit <strong>Save</strong>",
 	"cover-change": "Change",
--- a/public/language/en_GB/notifications.json
+++ b/public/language/en_GB/notifications.json
@@ -22,6 +22,7 @@
 	"user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
 	"user_mentioned_you_in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
 	"user_started_following_you": "<strong>%1</strong> started following you.",
+	"new_register": "<strong>%1</strong> sent a registration request.",

 	"email-confirmed": "Email Confirmed",
 	"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
--- a/public/language/en_GB/register.json
+++ b/public/language/en_GB/register.json
@@ -14,5 +14,6 @@
 	"register_now_button": "Register Now",
 	"alternative_registration": "Alternative Registration",
 	"terms_of_use": "Terms of Use",
-	"agree_to_terms_of_use": "I agree to the Terms of Use"
+	"agree_to_terms_of_use": "I 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."
 }
--- a/public/language/en_GB/user.json
+++ b/public/language/en_GB/user.json
@@ -7,8 +7,12 @@

 	"email": "Email",
 	"confirm_email": "Confirm Email",
+	"ban_account": "Ban Account",
+	"ban_account_confirm": "Do you really want to ban this user?",
+	"unban_account": "Unban Account",
 	"delete_account": "Delete Account",
 	"delete_account_confirm": "Are you sure you want to delete your account? <br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your username to confirm that you wish to destroy this account.",
+	"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 />",

 	"fullname": "Full Name",
 	"website": "Website",
--- a/public/language/en_GB/users.json
+++ b/public/language/en_GB/users.json
@@ -8,5 +8,7 @@
 	"users-found-search-took": "%1 user(s) found! Search took %2 seconds.",
 	"filter-by": "Filter By",
 	"online-only": "Online only",
-	"picture-only": "Picture only"
+	"picture-only": "Picture only",
+	"invite": "Invite",
+	"invitation-email-sent": "An invitation email has been sent to %1"
 }
--- a/public/language/en_US/error.json
+++ b/public/language/en_US/error.json
@@ -2,7 +2,7 @@
    "invalid-data": "Invalid Data",
    "not-logged-in": "You don't seem to be logged in.",
    "account-locked": "Your account has been locked temporarily",
-    "search-requires-login": "Searching requires an account! Please login or register!",
+    "search-requires-login": "Searching requires an account - please login or register.",
    "invalid-cid": "Invalid Category ID",
    "invalid-tid": "Invalid Topic ID",
    "invalid-pid": "Invalid Post ID",
@@ -68,6 +68,7 @@
    "invalid-file": "Invalid File",
    "uploads-are-disabled": "Uploads are disabled",
    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
    "cant-chat-with-yourself": "You can't chat with yourself!",
    "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
    "too-many-messages": "You have sent too many messages, please wait awhile.",
--- a/public/language/en_US/topic.json
+++ b/public/language/en_US/topic.json
@@ -5,6 +5,7 @@
    "no_topics_found": "No topics found!",
    "no_posts_found": "No posts found!",
    "post_is_deleted": "This post is deleted!",
+    "topic_is_deleted": "This topic is deleted!",
    "profile": "Profile",
    "posted_by": "Posted by %1",
    "posted_by_guest": "Posted by Guest",
--- a/public/language/en_US/user.json
+++ b/public/language/en_US/user.json
@@ -21,6 +21,7 @@
    "watched": "Watched",
    "followers": "Followers",
    "following": "Following",
+    "aboutme": "About me",
    "signature": "Signature",
    "gravatar": "Gravatar",
    "birthday": "Birthday",
--- a/public/language/es/error.json
+++ b/public/language/es/error.json
@@ -21,11 +21,11 @@
    "email-not-confirmed-chat": "No puedes usar el chat hasta que confirmes tu dirección de correo electrónico, por favor haz click aquí para confirmar tu correo.",
    "no-email-to-confirm": "Este foro requiere confirmación de su email, por favor pulse aquí para introducir un email",
    "email-confirm-failed": "No se ha podido confirmar su email, por favor inténtelo de nuevo más tarde.",
-    "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
+    "confirm-email-already-sent": "El email de confirmación ya ha sido enviado, por favor espera %1 minuto(s) para enviar otro.",
    "username-too-short": "Nombre de usuario es demasiado corto",
    "username-too-long": "Nombre de usuario demasiado largo",
    "user-banned": "Usuario baneado",
-    "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
+    "user-too-new": "Lo sentimos, es necesario que esperes %1 segundo(s) antes poder hacer tu primera publicación",
    "no-category": "La categoría no existe",
    "no-topic": "El tema no existe",
    "no-post": "La publicación no existe",
@@ -36,17 +36,17 @@
    "no-emailers-configured": "No se ha cargado ningún plugin de email, así que no se pudo enviar el email de prueba.",
    "category-disabled": "Categoría deshabilitada",
    "topic-locked": "Tema bloqueado",
-    "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
+    "post-edit-duration-expired": "Sólo puedes editar mensajes durante %1 segundo(s) después de haberlo escrito",
    "still-uploading": "Por favor, espera a que terminen las subidas.",
-    "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
-    "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
-    "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
-    "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 character(s).",
-    "too-many-posts": "You can only post once every %1 second(s) - please wait before posting again",
-    "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
-    "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",
-    "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 character(s)",
-    "file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
+    "content-too-short": "Por favor introduzca una publicación más larga. Las publicaciones deben contener al menos %1 caractere(s).",
+    "content-too-long": "Por favor introduzca un mensaje más corto. Los mensajes no pueden exceder los %1 caractere(s).",
+    "title-too-short": "Por favor introduzca un título más largo. Los títulos deben contener al menos %1 caractere(s).",
+    "title-too-long": "Por favor, introduce un título más corto, que no sobrepase los %1 caractere(s).",
+    "too-many-posts": "Solo puedes publicar una vez cada %1 segundo(s) - por favor espere antes de volver a publicar",
+    "too-many-posts-newbie": "Como nuevo usuario, solo puedes publicar una vez cada %1 segundo(s) hasta hayas ganado una reputación de %2 - por favor espera antes de volver a publicar",
+    "tag-too-short": "Por favor introduce una etiqueta más larga. Las etiquetas deben contener por lo menos %1 caractere(s)",
+    "tag-too-long": "Por favor introduce una etiqueta más corta. Las etiquetas no pueden exceder los %1 caractere(s)",
+    "file-too-big": "El tamaño de fichero máximo es de %1 kB - por favor, suba un fichero más pequeño",
    "cant-vote-self-post": "No puedes votar tus propios posts",
    "already-favourited": "Ya ha marcado esta publicación como favorita",
    "already-unfavourited": "Ya ha desmarcado esta publicación como favorita",
@@ -63,11 +63,12 @@
    "post-already-restored": "Esta publicación ya ha sido restaurada",
    "topic-already-deleted": "Este tema ya ha sido borrado",
    "topic-already-restored": "Este tema ya ha sido restaurado",
-    "cant-purge-main-post": "You can't purge the main post, please delete the topic instead",
+    "cant-purge-main-post": "No puedes purgar el mensaje principal, por favor utiliza borrar tema",
    "topic-thumbnails-are-disabled": "Las miniaturas de los temas están deshabilitadas.",
    "invalid-file": "Archivo no válido",
    "uploads-are-disabled": "Las subidas están deshabilitadas.",
-    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+    "signature-too-long": "Lo sentimos, pero tu firma no puede ser más larga de %1 caractere(s).",
+    "about-me-too-long": "Lo sentimos, pero tu descripción no puede ser más larga de %1 caractere(s).",
    "cant-chat-with-yourself": "¡No puedes conversar contigo mismo!",
    "chat-restricted": "Este usuario tiene restringidos los mensajes de chat. Los usuarios deben seguirte antes de que pueda charlar con ellos",
    "too-many-messages": "Has enviado demasiados mensajes, por favor espera un poco.",
--- a/public/language/es/register.json
+++ b/public/language/es/register.json
@@ -1,5 +1,5 @@
 {
-    "register": "Registrase",
+    "register": "Registrarse",
    "help.email": "Por defecto, tu cuenta de correo electrónico estará oculta al publico.",
    "help.username_restrictions": "El nombre de usuario debe tener entre %1 y %2 carácteres. Los miembros pueden responderte escribiendo @<span id='yourUsername'>usuario</span>.",
    "help.minimum_password_length": "Tu contraseña debe tener al menos %1 carácteres.",
@@ -11,7 +11,7 @@
    "password_placeholder": "Introduce tu contraseña",
    "confirm_password": "Confirmar contraseña",
    "confirm_password_placeholder": "Confirmar contraseña",
-    "register_now_button": "Registrarme ahora",
+    "register_now_button": "Registrarse ahora",
    "alternative_registration": "Métodos de registro alternativos",
    "terms_of_use": "Términos y Condiciones de uso",
    "agree_to_terms_of_use": "Acepto los Términos y Condiciones de uso"
--- a/public/language/es/topic.json
+++ b/public/language/es/topic.json
@@ -5,6 +5,7 @@
    "no_topics_found": "¡No se encontraron temas!",
    "no_posts_found": "¡No se encontraron publicaciones!",
    "post_is_deleted": "¡Esta publicación está eliminada!",
+    "topic_is_deleted": "¡Este tema ha sido eliminado!",
    "profile": "Perfil",
    "posted_by": "Publicado por %1",
    "posted_by_guest": "Publicado por Invitado",
--- a/public/language/es/user.json
+++ b/public/language/es/user.json
@@ -21,6 +21,7 @@
    "watched": "Visto",
    "followers": "Seguidores",
    "following": "Siguiendo",
+    "aboutme": "Sobre mí",
    "signature": "Firma",
    "gravatar": "Gravatar",
    "birthday": "Cumpleaños",
@@ -29,11 +30,11 @@
    "unfollow": "Dejar de seguir",
    "more": "Más",
    "profile_update_success": "¡El perfil ha sido actualizado correctamente!",
-    "change_picture": "Cambiar imágen",
+    "change_picture": "Cambiar imagen",
    "edit": "Editar",
-    "uploaded_picture": "Imágen subida",
-    "upload_new_picture": "Subir nueva imágen",
-    "upload_new_picture_from_url": "Cargar imágen desde una URL",
+    "uploaded_picture": "Imagen subida",
+    "upload_new_picture": "Subir nueva imagen",
+    "upload_new_picture_from_url": "Cargar imagen desde una URL",
    "current_password": "Contraseña actual",
    "change_password": "Cambiar contraseña",
    "change_password_error": "¡Contraseña no válida!",
@@ -68,16 +69,16 @@
    "has_no_watched_topics": "Este usuario todavía no ha visto ninguna publicación.",
    "email_hidden": "Correo electrónico oculto",
    "hidden": "oculto",
-    "paginate_description": "Paginate topics and posts instead of using infinite scroll",
+    "paginate_description": "Paginar hilos y mensajes en lugar de usar desplazamiento infinito",
    "topics_per_page": "Temas por página",
    "posts_per_page": "Post por página",
-    "notification_sounds": "Play a sound when you receive a notification",
+    "notification_sounds": "Reproducir un sonido al recibir una notificación",
    "browsing": "Preferencias de navegación.",
-    "open_links_in_new_tab": "Open outgoing links in new tab",
+    "open_links_in_new_tab": "Abrir los enlaces externos en una nueva pestaña",
    "enable_topic_searching": "Activar la búsqueda \"in-topic\"",
-    "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",
-    "follow_topics_you_reply_to": "Follow topics that you reply to",
-    "follow_topics_you_create": "Follow topics you create",
+    "topic_search_help": "Si está activada, la búsqueda 'in-topic' sustituirá el comportamiento por defecto del navegador y le permitirá buscar en el tema al completo, en vez de hacer una búsqueda únicamente sobre el contenido mostrado en pantalla",
+    "follow_topics_you_reply_to": "Seguir los temas en las que respondes",
+    "follow_topics_you_create": "Seguir publicaciones que creas",
    "grouptitle": "Selecciona el título del grupo que deseas visualizar",
    "no-group-title": "Sin título de grupo"
 }
--- a/public/language/et/email.json
+++ b/public/language/et/email.json
@@ -1,28 +1,28 @@
 {
    "password-reset-requested": "Parooli muutmise taotlus - %1!",
-    "welcome-to": "Tere tulemast %1",
+    "welcome-to": "Tere tulemast foorumisse %1",
    "greeting_no_name": "Tere",
    "greeting_with_name": "Tere %1",
-    "welcome.text1": "Thank you for registering with %1!",
-    "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.",
-    "welcome.cta": "Click here to confirm your email address",
-    "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
-    "reset.text2": "To continue with the password reset, please click on the following link:",
-    "reset.cta": "Click here to reset your password",
-    "reset.notify.subject": "Password successfully changed",
-    "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.",
-    "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.",
-    "digest.notifications": "You have unread notifications from %1:",
-    "digest.latest_topics": "Latest topics from %1",
-    "digest.cta": "Click here to visit %1",
-    "digest.unsub.info": "This digest was sent to you due to your subscription settings.",
-    "digest.no_topics": "There have been no active topics in the past %1",
-    "notif.chat.subject": "New chat message received from %1",
-    "notif.chat.cta": "Click here to continue the conversation",
-    "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
-    "notif.post.cta": "Click here to read the full topic",
-    "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.",
-    "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
-    "unsub.cta": "Click here to alter those settings",
-    "closing": "Thanks!"
+    "welcome.text1": "Täname et oled registreerinud foorumisse %1!",
+    "welcome.text2": "Konto täielikuks aktiveerimiseks peame me kinnitama, et registreerimisel kasutatud e-mail kuulub teile.",
+    "welcome.cta": "Vajuta siia, et kinnitada oma e-maili aadress",
+    "reset.text1": "Meile laekus päring parooli muutmiseks. Kui päring ei ole teie poolt esitatud või te ei soovi parooli muuta, siis võite antud kirja ignoreerida.",
+    "reset.text2": "Selleks, et jätkata parooli muutmisega vajuta järgnevale lingile:",
+    "reset.cta": "Vajuta siia, et taotleda uut parooli",
+    "reset.notify.subject": "Parool edukalt muudetud",
+    "reset.notify.text1": "Teavitame sind, et sinu parool %1 foorumis on edukalt muudetud.",
+    "reset.notify.text2": "Kui te ei ole lubanud seda, siis teavitage koheselt administraatorit.",
+    "digest.notifications": "Sul on lugemata teateid %1 poolt:",
+    "digest.latest_topics": "Viimased teemad %1 poolt",
+    "digest.cta": "Vajuta siia et külastada %1",
+    "digest.unsub.info": "See uudiskiri on saadetud teile tellimuse seadistuse tõttu.",
+    "digest.no_topics": "Viimase %1 jooksul ei ole olnud ühtegi aktiivset teemat",
+    "notif.chat.subject": "Sulle on saabunud uus sõnum kasutajalt %1",
+    "notif.chat.cta": "Vajuta siia, et jätkata vestlusega",
+    "notif.chat.unsub.info": "See chat teavitus on saadetud teile tellimuse seadistuse tõttu.",
+    "notif.post.cta": "Vajuta siia, et lugeda teemat täies mahus",
+    "notif.post.unsub.info": "See postituse teavitus on saadetud teile tellimuse seadistuse tõttu.",
+    "test.text1": "See on test e-mail kinnitamaks, et emailer on korrektselt seadistatud sinu NodeBB jaoks.",
+    "unsub.cta": "Vajuta siia, et muuta neid seadeid",
+    "closing": "Aitäh!"
 }
--- a/public/language/et/error.json
+++ b/public/language/et/error.json
@@ -2,7 +2,7 @@
    "invalid-data": "Vigased andmed",
    "not-logged-in": "Sa ei ole sisse logitud",
    "account-locked": "Su kasutaja on ajutiselt lukustatud",
-    "search-requires-login": "Foorumis otsimiseks on vaja kasutajat! Palun logi sisse või registreeru kasutajaks!",
+    "search-requires-login": "Searching requires an account - please login or register.",
    "invalid-cid": "Vigane kategooria ID",
    "invalid-tid": "Vigane teema ID",
    "invalid-pid": "Vigane postituse ID",
@@ -68,6 +68,7 @@
    "invalid-file": "Vigane fail",
    "uploads-are-disabled": "Üleslaadimised on keelatud",
    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
    "cant-chat-with-yourself": "Sa ei saa endaga vestelda!",
    "chat-restricted": "Kasutaja on piiranud sõnumite saatmist. Privaatsõnumi saatmiseks peab kasutaja sind jälgima",
    "too-many-messages": "Oled saatnud liiga palju sõnumeid, oota natukene.",
--- a/public/language/et/topic.json
+++ b/public/language/et/topic.json
@@ -5,6 +5,7 @@
    "no_topics_found": "Teemasid ei leitud!",
    "no_posts_found": "Postitusi ei leitud!",
    "post_is_deleted": "See postitus on kustutatud!",
+    "topic_is_deleted": "This topic is deleted!",
    "profile": "Profiil",
    "posted_by": "Postitas %1",
    "posted_by_guest": "Postitatud külalise ppolt",
--- a/public/language/et/user.json
+++ b/public/language/et/user.json
@@ -21,6 +21,7 @@
    "watched": "Vaadatud",
    "followers": "Jälgijad",
    "following": "Jälgimised",
+    "aboutme": "About me",
    "signature": "Allkiri",
    "gravatar": "Gravatar",
    "birthday": "Sünnipäev",
--- a/public/language/fa_IR/email.json
+++ b/public/language/fa_IR/email.json
@@ -1,5 +1,5 @@
 {
-    "password-reset-requested": "درخواست گذرواژه مجدد- %1!",
+    "password-reset-requested": "درخواست بازیابی گذرواژه- %1!",
    "welcome-to": "به 1% خوش آمدید",
    "greeting_no_name": "سلام",
    "greeting_with_name": "سلام 1%",
--- a/public/language/fa_IR/error.json
+++ b/public/language/fa_IR/error.json
@@ -1,8 +1,8 @@
 {
-    "invalid-data": "اطلاعات نامعتبر است.",
+    "invalid-data": "داده(های) نامعتبر",
    "not-logged-in": "به نظر میرسد که با حساب کاربری وارد نشده اید.",
    "account-locked": "حساب کاربری شما موقتاً مسدود شده است.",
-    "search-requires-login": "جستجو نیاز به حساب کاربری دارد! لطفا وارد شوید و یا ثبت نام کنید!",
+    "search-requires-login": "Searching requires an account - please login or register.",
    "invalid-cid": "شناسه دسته نامعتبر است.",
    "invalid-tid": "شناسه جستار نامعتبر است.",
    "invalid-pid": "شناسه دیدگاه نامعتبر است.",
@@ -21,11 +21,11 @@
    "email-not-confirmed-chat": "شما تا قبل از تایید رایانامه قادر به گفتگو نیستید، لطفا برای تایید رایانامه خود اینجا کلیک کنید",
    "no-email-to-confirm": "این انجمن نیاز به تایید رایانامه دارد، لطفا برای وارد کردن رایانامه اینجا کلیک کنید",
    "email-confirm-failed": "ما نتوانستیم رایانامه شما را تایید کنیم، لطفا بعدا دوباره سعی کنید",
-    "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
+    "confirm-email-already-sent": "رایانامه فعال‌سازی پیش‌تر فرستاده شده، لطفا %1 دقیقه صبر کنید تا رایانامه دیگری بفرستید.",
    "username-too-short": "نام کاربری خیلی کوتاه است.",
    "username-too-long": "نام کاربری بسیار طولانیست",
    "user-banned": "کاربر محروم شد.",
-    "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
+    "user-too-new": "با عرض پوزش، شما باید %1 ثانیه پیش از فرستادن دیدگاه نخست خود صبر کنید",
    "no-category": "دسته بندی وجود ندارد",
    "no-topic": "جستار وجود ندارد.",
    "no-post": "دیدگاه وجود ندارد",
@@ -36,9 +36,9 @@
    "no-emailers-configured": "افزونه ایمیلی بارگیری نشده است، پس رایانامه امتحانی نمیتواند فرستاده شود",
    "category-disabled": "دسته غیر‌فعال شد.",
    "topic-locked": "جستار بسته شد.",
-    "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
+    "post-edit-duration-expired": "شما تنها می توانید %1 ثانیه پس از فرستادن دیدگاه آن‌را ویرایش کنید",
    "still-uploading": "خواهشمندیم تا پایان بارگذاری‌ها شکیبا باشید.",
-    "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
+    "content-too-short": "خواهشمندیم دیدگاه بلندتری بنویسید. دیدگاه‌ها دست‌کم باید 1% نویسه داشته باشند.",
    "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
    "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
    "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 character(s).",
@@ -63,11 +63,12 @@
    "post-already-restored": "دیدگاه پیش‌تر بازگردانی شده است.",
    "topic-already-deleted": "جستار پیش‌تر حذف شده است",
    "topic-already-restored": "جستار پیش‌تر بازگردانی شده است",
-    "cant-purge-main-post": "You can't purge the main post, please delete the topic instead",
+    "cant-purge-main-post": "شما نمی‌توانید دیدگاه اصلی را پاک کنید، لطفا جستار را به جای آن پاک کنید.",
    "topic-thumbnails-are-disabled": "چهرک‌های جستار غیرفعال شده است.",
    "invalid-file": "فایل نامعتبر است.",
    "uploads-are-disabled": "امکان بارگذاری غیرفعال شده است.",
    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
    "cant-chat-with-yourself": "شما نمی‌توانید با خودتان گفتگو کنید!",
    "chat-restricted": "این کاربر پیام های گفتگوی خود را محدود کرده است . آنها بایدشما را دنبال کنند تا اینکه شما بتوانید به آنها پیامی بفرستید",
    "too-many-messages": "شما پیامهای خیلی زیادی فرستاده اید، لطفا مدتی صبر نمایید",
--- a/public/language/fa_IR/global.json
+++ b/public/language/fa_IR/global.json
@@ -27,7 +27,7 @@
    "header.tags": "برچسب‌ها",
    "header.popular": "دوست‌داشتنی‌ها",
    "header.users": "کاربران",
-    "header.groups": "گروه ها",
+    "header.groups": "گروه‌ها",
    "header.chats": "گفتگوها",
    "header.notifications": "آگاه‌سازی‌ها",
    "header.search": "جستجو",
--- a/public/language/fa_IR/groups.json
+++ b/public/language/fa_IR/groups.json
@@ -1,5 +1,5 @@
 {
-    "groups": "گروه ها",
+    "groups": "گروه‌ها",
    "view_group": "مشاهده گروه",
    "owner": "مالک گروه",
    "new_group": "ساخت گروه جدید",
@@ -30,7 +30,7 @@
    "details.userTitleEnabled": "نمایش نشان",
    "details.private_help": "اگر فعال باشد، پیوستن به گروه مستلزم موافقت صاحب گروه است",
    "details.hidden": "پنهان",
-    "details.hidden_help": "اگر فعال باشد، ایم گروه در فهرست گروه ها پیدا نمیشود، و کاربر باید دستی دعوت شود",
+    "details.hidden_help": "اگر فعال باشد، این گروه در فهرست گروه‌ها پیدا نمی‌شود و کاربران باید دستی فراخوانده شوند",
    "event.updated": "جزییات گروه با موفقیت به روز گردید",
    "event.deleted": "گروه \"%1\" حدف شد"
 }
--- a/public/language/fa_IR/language.json
+++ b/public/language/fa_IR/language.json
@@ -1,5 +1,5 @@
 {
-    "name": "Persian (Iran)",
+    "name": "فارسی",
    "code": "fa_IR",
    "dir": "rtl"
 }
--- a/public/language/fa_IR/pages.json
+++ b/public/language/fa_IR/pages.json
@@ -12,7 +12,7 @@
    "user.followers": "کاربرانی که %1 را دنبال می‌کنند",
    "user.posts": "دیدگاه‌های %1",
    "user.topics": "%1 این جستار را ساخت.",
-    "user.groups": "گروه های %1",
+    "user.groups": "گروه‌های %1",
    "user.favourites": "دیدگاه‌های پسندیدهٔ %1",
    "user.settings": "تنظیمات کاربر",
    "user.watched": "جستارهای پاییده شده توسط %1",
--- a/public/language/fa_IR/search.json
+++ b/public/language/fa_IR/search.json
@@ -1,5 +1,5 @@
 {
-    "results_matching": "%1 نتیجه (ها) مطابق با \"%2\" ,(%3  ثانیه)",
+    "results_matching": "%1 نتیجهٔ هم‌خوان با \"%2\"، (%3  ثانیه)",
    "no-matches": "هیچ موردی یافت نشد",
    "advanced-search": "جستجوی پیشرفته",
    "in": "در",
--- a/public/language/fa_IR/success.json
+++ b/public/language/fa_IR/success.json
@@ -1,5 +1,5 @@
 {
-    "success": "موفقیت",
+    "success": "موفقیت‌آمیز",
    "topic-post": "دیدگاه شما باموفقیت فرستاده شد.",
    "authentication-successful": "اعتبارسنجی موفق",
    "settings-saved": "تنظیمات اندوخته شد."
--- a/public/language/fa_IR/topic.json
+++ b/public/language/fa_IR/topic.json
@@ -5,6 +5,7 @@
    "no_topics_found": "هیچ جستاری یافت نشد!",
    "no_posts_found": "دیدگاهی یافت نشد!",
    "post_is_deleted": "این دیدگاه پاک شده!",
+    "topic_is_deleted": "This topic is deleted!",
    "profile": "نمایه",
    "posted_by": "ارسال شده توسط %1",
    "posted_by_guest": "ارسال شده توسط مهمان",
--- a/public/language/fa_IR/user.json
+++ b/public/language/fa_IR/user.json
@@ -21,6 +21,7 @@
    "watched": "پاییده شده",
    "followers": "دنبال‌کننده‌ها",
    "following": "دنبال‌شونده‌ها",
+    "aboutme": "About me",
    "signature": "امضا",
    "gravatar": "گراواتار",
    "birthday": "روز تولد",
--- a/public/language/fi/error.json
+++ b/public/language/fi/error.json
@@ -2,7 +2,7 @@
    "invalid-data": "Virheellinen data",
    "not-logged-in": "Et taida olla kirjautuneena sisään.",
    "account-locked": "Käyttäjätilisi on lukittu väliaikaisesti",
-    "search-requires-login": "Hakeminen vaatii käyttäjätilin! Kirjaudu sisään tai rekisteröidy!",
+    "search-requires-login": "Searching requires an account - please login or register.",
    "invalid-cid": "Virheellinen kategorian ID",
    "invalid-tid": "Virheellinen aiheen ID",
    "invalid-pid": "Virheellinen viestin ID",
@@ -68,6 +68,7 @@
    "invalid-file": "Virheellinen tiedosto",
    "uploads-are-disabled": "Et voi lähettää tiedostoa",
    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
    "cant-chat-with-yourself": "Et voi keskustella itsesi kanssa!",
    "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
    "too-many-messages": "You have sent too many messages, please wait awhile.",
--- a/public/language/fi/topic.json
+++ b/public/language/fi/topic.json
@@ -5,6 +5,7 @@
    "no_topics_found": "Aiheita ei löytynyt!",
    "no_posts_found": "Viestejä ei löytynyt!",
    "post_is_deleted": "Tämä viesti poistettiin!",
+    "topic_is_deleted": "This topic is deleted!",
    "profile": "Profiili",
    "posted_by": "%1 kirjoitti",
    "posted_by_guest": "Vieras kirjoitti",
--- a/public/language/fi/user.json
+++ b/public/language/fi/user.json
@@ -21,6 +21,7 @@
    "watched": "Seurattu",
    "followers": "Seuraajat",
    "following": "Seuratut",
+    "aboutme": "About me",
    "signature": "Allekirjoitus",
    "gravatar": "Gravatar",
    "birthday": "Syntymäpäivä",
--- a/public/language/fr/error.json
+++ b/public/language/fr/error.json
@@ -2,7 +2,7 @@
    "invalid-data": "Données invalides",
    "not-logged-in": "Vous ne semblez pas être connecté.",
    "account-locked": "Votre compte a été temporairement suspendu",
-    "search-requires-login": "Vous devez avoir un compte pour effectuer une recherche ! Veuillez vous identifier ou vous inscrire !",
+    "search-requires-login": "Rechercher nécessite d'avoir un compte. Veuillez vous identifier ou vous enregistrer.",
    "invalid-cid": "ID de catégorie invalide",
    "invalid-tid": "ID de sujet invalide",
    "invalid-pid": "ID de message invalide",
@@ -68,6 +68,7 @@
    "invalid-file": "Fichier invalide",
    "uploads-are-disabled": "Les envois sont désactivés",
    "signature-too-long": "La signature ne peut dépasser %1 caractère(s).",
+    "about-me-too-long": "Votre texte \"à propos de moi\" ne peut dépasser %1 caractère(s).",
    "cant-chat-with-yourself": "Vous ne pouvez chatter avec vous même !",
    "chat-restricted": "Cet utilisateur a restreint les ses messages de chat. Il doit d'abord vous suivre avant de pouvoir discuter avec lui.",
    "too-many-messages": "Vous avez envoyé trop de messages, veuillez patienter un instant.",
--- a/public/language/fr/groups.json
+++ b/public/language/fr/groups.json
@@ -32,5 +32,5 @@
    "details.hidden": "Masqué",
    "details.hidden_help": "Si cette case est cochée, ce groupe n'est pas affiché dans la liste des groupes, et les utilisateurs devront être invités manuellement.",
    "event.updated": "Les détails du groupe ont été mis à jour",
-    "event.deleted": "Le groupe é%1\" a été supprimé"
+    "event.deleted": "Le groupe \"%1\" a été supprimé"
 }
--- a/public/language/fr/topic.json
+++ b/public/language/fr/topic.json
@@ -5,6 +5,7 @@
    "no_topics_found": "Aucun sujet n'a été trouvé !",
    "no_posts_found": "Aucun message trouvé !",
    "post_is_deleted": "Ce message a été supprimé !",
+    "topic_is_deleted": "Ce sujet a été supprimé !",
    "profile": "Profil",
    "posted_by": "Posté par %1",
    "posted_by_guest": "Posté par un invité",
--- a/public/language/fr/user.json
+++ b/public/language/fr/user.json
@@ -21,6 +21,7 @@
    "watched": "Suivis",
    "followers": "Abonnés",
    "following": "Abonnements",
+    "aboutme": "À propos de moi",
    "signature": "Signature",
    "gravatar": "Gravatar",
    "birthday": "Anniversaire",
--- a/public/language/he/error.json
+++ b/public/language/he/error.json
@@ -2,7 +2,7 @@
    "invalid-data": "נתונים שגויים",
    "not-logged-in": "נראה שאינך מחובר למערכת.",
    "account-locked": "חשבונך נחסם באופן זמני",
-    "search-requires-login": "החיפוש דורש משתמש רשום! יש להיכנס למערכת או להירשם!",
+    "search-requires-login": "Searching requires an account - please login or register.",
    "invalid-cid": "זהוי קטגוריה שגוי",
    "invalid-tid": "זהוי נושא שגוי",
    "invalid-pid": "זהוי פוסט שגוי",
@@ -68,6 +68,7 @@
    "invalid-file": "קובץ לא תקין",
    "uploads-are-disabled": "העלאת קבצים אינה מאופשרת",
    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
    "cant-chat-with-yourself": "לא ניתן לעשות צ'אט עם עצמך!",
    "chat-restricted": "משתמש זה חסם את הודעות הצ'אט שלו ממשתמשים זרים. המשתמש חייב לעקוב אחריך לפני שתוכל לשוחח איתו בצ'אט",
    "too-many-messages": "שלחת יותר מדי הודעות, אנא המתן לזמן מה.",
--- a/public/language/he/topic.json
+++ b/public/language/he/topic.json
@@ -5,6 +5,7 @@
    "no_topics_found": "לא נמצאו נושאים!",
    "no_posts_found": "לא נמצאו פוסטים!",
    "post_is_deleted": "פוסט זה נמחק!",
+    "topic_is_deleted": "This topic is deleted!",
    "profile": "פרופיל",
    "posted_by": "הפוסט הועלה על ידי %1",
    "posted_by_guest": "פורסם על-ידי אורח",
--- a/public/language/he/user.json
+++ b/public/language/he/user.json
@@ -21,6 +21,7 @@
    "watched": "נצפה",
    "followers": "עוקבים",
    "following": "עוקב אחרי",
+    "aboutme": "About me",
    "signature": "חתימה",
    "gravatar": "אווטר",
    "birthday": "יום הולדת",
--- a/public/language/hu/error.json
+++ b/public/language/hu/error.json
@@ -2,7 +2,7 @@
    "invalid-data": "Érvénytelen adat",
    "not-logged-in": "Úgy tűnik, nem vagy bejelentkezve.",
    "account-locked": "A fiókod ideiglenesen zárolva lett.",
-    "search-requires-login": "A kereső használatához szükséges egy fiók! Kérlek jelenltkezz be vagy regisztrálj!",
+    "search-requires-login": "Searching requires an account - please login or register.",
    "invalid-cid": "Érvénytelen kategória azonosító",
    "invalid-tid": "Érvénytelen téma azonosító",
    "invalid-pid": "Érvénytelen hozzászólás azonosító",
@@ -68,6 +68,7 @@
    "invalid-file": "Érvénytelen fájl",
    "uploads-are-disabled": "A feltöltés nem engedélyezett",
    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
    "cant-chat-with-yourself": "Nem cseveghetsz magaddal!",
    "chat-restricted": "Ez a felhasználó korlátozta a chat beállításait. Csak akkor cseveghetsz vele, miután felvett a követettek közé téged",
    "too-many-messages": "Túl sok üzenetet küldtél, kérlek várj egy picit.",
--- a/public/language/hu/search.json
+++ b/public/language/hu/search.json
@@ -1,14 +1,14 @@
 {
    "results_matching": "%1 eredmény(ek) erre \"%2\" (%3 másodperc alatt)",
    "no-matches": "No matches found",
-    "advanced-search": "Advanced Search",
+    "advanced-search": "Bővített keresés",
    "in": "In",
-    "titles": "Titles",
-    "titles-posts": "Titles and Posts",
-    "posted-by": "Posted by",
-    "in-categories": "In Categories",
-    "search-child-categories": "Search child categories",
-    "reply-count": "Reply Count",
+    "titles": "Címek",
+    "titles-posts": "Címek és Bejegyzések",
+    "posted-by": "Szerző",
+    "in-categories": "Kategória",
+    "search-child-categories": "Keresés az alkategóriák közt",
+    "reply-count": "Válaszok száma",
    "at-least": "At least",
    "at-most": "At most",
    "post-time": "Post time",
--- a/public/language/hu/topic.json
+++ b/public/language/hu/topic.json
@@ -5,6 +5,7 @@
    "no_topics_found": "Téma nem található!",
    "no_posts_found": "Hozzászólások nem találhatóak!",
    "post_is_deleted": "A bejegyzés törlésre került!",
+    "topic_is_deleted": "This topic is deleted!",
    "profile": "Profil",
    "posted_by": "Szerző %1",
    "posted_by_guest": "Szerző Vendég",
--- a/public/language/hu/user.json
+++ b/public/language/hu/user.json
@@ -21,6 +21,7 @@
    "watched": "Megfigyeli",
    "followers": "Követők",
    "following": "Követve",
+    "aboutme": "About me",
    "signature": "Aláírás",
    "gravatar": "Gravatar",
    "birthday": "Szülinap",
--- a/public/language/id/error.json
+++ b/public/language/id/error.json
@@ -2,7 +2,7 @@
    "invalid-data": "Data Salah",
    "not-logged-in": "Kamu terlihat belum login",
    "account-locked": "Akun kamu dikunci sementara",
-    "search-requires-login": "Pencarian butuh sebuah akun, silakan login atau register terlebih dulu",
+    "search-requires-login": "Searching requires an account - please login or register.",
    "invalid-cid": "ID Kategori Salah",
    "invalid-tid": "ID Topik Salah",
    "invalid-pid": "ID Post Salah",
@@ -68,6 +68,7 @@
    "invalid-file": "File Salah",
    "uploads-are-disabled": "Upload ditiadakan",
    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
    "cant-chat-with-yourself": "Kamu tidak dapat chat dengan akun sendiri",
    "chat-restricted": "Pengguna ini telah membatasi percakapa mereka. Mereka harus mengikutimu sebelum kamu dapat melakukan percakapan dengan mereka ",
    "too-many-messages": "You have sent too many messages, please wait awhile.",
--- a/public/language/id/topic.json
+++ b/public/language/id/topic.json
@@ -5,6 +5,7 @@
    "no_topics_found": "Tidak topik yang ditemukan!",
    "no_posts_found": "Tidak ada posting yang ditemukan!",
    "post_is_deleted": "Posting ini telah dihapus!",
+    "topic_is_deleted": "This topic is deleted!",
    "profile": "Profil",
    "posted_by": "Dibuat oleh %1",
    "posted_by_guest": "Dibuat oleh Tamu",
--- a/public/language/id/user.json
+++ b/public/language/id/user.json
@@ -21,6 +21,7 @@
    "watched": "Watched",
    "followers": "Pengikut",
    "following": "Mengikuti",
+    "aboutme": "About me",
    "signature": "Tanda Pengenal",
    "gravatar": "Gravatar",
    "birthday": "Hari Lahir",
--- a/public/language/it/error.json
+++ b/public/language/it/error.json
@@ -2,7 +2,7 @@
    "invalid-data": "Dati non validi",
    "not-logged-in": "Non sembri essere loggato.",
    "account-locked": "Il tuo account è stato bloccato temporaneamente",
-    "search-requires-login": "La ricerca richiede un account! Si prega di loggarsi o registrarsi!",
+    "search-requires-login": "Searching requires an account - please login or register.",
    "invalid-cid": "ID Categoria non valido",
    "invalid-tid": "ID Topic non valido",
    "invalid-pid": "ID Post non valido",
@@ -68,6 +68,7 @@
    "invalid-file": "File non valido",
    "uploads-are-disabled": "Uploads disabilitati",
    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
    "cant-chat-with-yourself": "Non puoi chattare con te stesso!",
    "chat-restricted": "Questo utente ha ristretto i suoi messaggi in chat alle persone che segue. Per poter chattare con te ti deve prima seguire.",
    "too-many-messages": "Hai inviato troppi messaggi, aspetta un attimo.",
--- a/public/language/it/topic.json
+++ b/public/language/it/topic.json
@@ -5,6 +5,7 @@
    "no_topics_found": "Nessuna discussione trovata!",
    "no_posts_found": "Nessun post trovato!",
    "post_is_deleted": "Questo post è eliminato!",
+    "topic_is_deleted": "This topic is deleted!",
    "profile": "Profilo",
    "posted_by": "scritto da %1",
    "posted_by_guest": "Scritto da Ospite",
--- a/public/language/it/user.json
+++ b/public/language/it/user.json
@@ -21,6 +21,7 @@
    "watched": "Osservati",
    "followers": "Da chi è seguito",
    "following": "Chi segue",
+    "aboutme": "About me",
    "signature": "Firma",
    "gravatar": "Gravatar",
    "birthday": "Data di nascita",
--- a/public/language/ja/error.json
+++ b/public/language/ja/error.json
@@ -2,7 +2,7 @@
    "invalid-data": "無効なデータ",
    "not-logged-in": "ログインしていていないようです。",
    "account-locked": "Your account has been locked temporarily",
-    "search-requires-login": "Searching requires an account! Please login or register!",
+    "search-requires-login": "Searching requires an account - please login or register.",
    "invalid-cid": "無効な板ID",
    "invalid-tid": "無効なスレッドID",
    "invalid-pid": "無効なポストID",
@@ -68,6 +68,7 @@
    "invalid-file": "無効なファイル",
    "uploads-are-disabled": "アップロードが無効された",
    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
    "cant-chat-with-yourself": "自分にチャットすることはできません！",
    "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
    "too-many-messages": "You have sent too many messages, please wait awhile.",
--- a/public/language/ja/topic.json
+++ b/public/language/ja/topic.json
@@ -5,6 +5,7 @@
    "no_topics_found": "スレッドが見つかりません！",
    "no_posts_found": "ポストはありません！",
    "post_is_deleted": "このポストが削除されます！",
+    "topic_is_deleted": "This topic is deleted!",
    "profile": "プロフィール",
    "posted_by": "%1 のポスト",
    "posted_by_guest": "Posted by Guest",
--- a/public/language/ja/user.json
+++ b/public/language/ja/user.json
@@ -21,6 +21,7 @@
    "watched": "Watched",
    "followers": "フォロワー",
    "following": "フォロー中",
+    "aboutme": "About me",
    "signature": "署名",
    "gravatar": "Gravatar",
    "birthday": "誕生日",
--- a/public/language/ko/error.json
+++ b/public/language/ko/error.json
@@ -2,7 +2,7 @@
    "invalid-data": "올바르지 않은 정보입니다.",
    "not-logged-in": "로그인하지 않았습니다.",
    "account-locked": "임시로 잠긴 계정입니다.",
-    "search-requires-login": "검색을 위해서는 계정이 필요합니다. 로그인하거나 회원가입 해 주십시오.",
+    "search-requires-login": "Searching requires an account - please login or register.",
    "invalid-cid": "올바르지 않은 카테고리 ID입니다.",
    "invalid-tid": "올바르지 않은 주제 ID입니다.",
    "invalid-pid": "올바르지 않은 게시물 ID입니다.",
@@ -68,6 +68,7 @@
    "invalid-file": "올바르지 않은 파일입니다.",
    "uploads-are-disabled": "업로드는 비활성화되어 있습니다.",
    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
    "cant-chat-with-yourself": "자신과는 채팅할 수 없습니다.",
    "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
    "too-many-messages": "You have sent too many messages, please wait awhile.",
--- a/public/language/ko/topic.json
+++ b/public/language/ko/topic.json
@@ -5,6 +5,7 @@
    "no_topics_found": "주제를 찾을 수 없습니다.",
    "no_posts_found": "게시물을 찾을 수 없습니다.",
    "post_is_deleted": "이 게시물은 삭제되었습니다.",
+    "topic_is_deleted": "This topic is deleted!",
    "profile": "프로필",
    "posted_by": "%1님이 작성했습니다.",
    "posted_by_guest": "익명 사용자가 작성했습니다.",
--- a/public/language/ko/user.json
+++ b/public/language/ko/user.json
@@ -21,6 +21,7 @@
    "watched": "Watched",
    "followers": "이 사용자를 팔로우",
    "following": "이 사용자가 팔로우",
+    "aboutme": "About me",
    "signature": "서명",
    "gravatar": "그라바타",
    "birthday": "생일",
--- a/public/language/lt/error.json
+++ b/public/language/lt/error.json
@@ -2,7 +2,7 @@
    "invalid-data": "Klaidingi duomenys",
    "not-logged-in": "Atrodo, kad jūs neesate prisijungęs.",
    "account-locked": "Jūsų paskyra buvo laikinai užrakinta",
-    "search-requires-login": "Norint naudotis paieška, būtina paskyra! Prašome prisijungti arba užsiregistruoti.",
+    "search-requires-login": "Searching requires an account - please login or register.",
    "invalid-cid": "Klaidingas kategorijos ID",
    "invalid-tid": "Klaidingas temos ID",
    "invalid-pid": "Klaidingas pranešimo ID",
@@ -68,6 +68,7 @@
    "invalid-file": "Klaidingas failas",
    "uploads-are-disabled": "Įkėlimai neleidžiami",
    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
    "cant-chat-with-yourself": "Jūs negalite susirašinėti su savimi!",
    "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
    "too-many-messages": "Išsiuntėte per daug pranešimų, kurį laiką prašome palaukti.",
--- a/public/language/lt/topic.json
+++ b/public/language/lt/topic.json
@@ -5,6 +5,7 @@
    "no_topics_found": "Temų nerasta!",
    "no_posts_found": "Įrašų nerasta!",
    "post_is_deleted": "Šis įrašas ištrintas!",
+    "topic_is_deleted": "This topic is deleted!",
    "profile": "Profilis",
    "posted_by": "Parašė %1",
    "posted_by_guest": "Parašė svečias",
--- a/Show More
+++ b/Show More