closes #2323

updated version for 0.5.3
fix null parents
2025-12-17 05:50:25 +01:00 · 2014-10-30 14:30:10 -04:00 · 2014-10-27 17:36:26 -04:00 · 2014-10-27 02:58:20 -04:00 · 2014-10-27 01:49:57 -04:00 · 2014-10-27 00:59:52 -04:00
899 changed files with 25757 additions and 9203 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@ node_modules/
 sftp-config.json
 config.json
 public/src/nodebb.min.js
-public/config.json
+!src/views/config.json
 public/css/*.css
 *.sublime-project
 *.sublime-workspace
@@ -26,3 +26,11 @@ pidfile
 # templates
 /public/templates
 /public/sounds
+
+/public/uploads
+
+# compiled files
+/public/stylesheet.css
+/public/admin.css
+/public/nodebb.min.js
+/public/nodebb.min.js.map
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,41 @@
+# Issues & Bugs
+
+Thanks for reporting an issue with NodeBB! Please follow these guidelines in order to streamline the debugging process. The more guidelines you follow, the easier it will be for us to reproduce your problem.
+
+In general, if we can't reproduce it, we can't fix it!
+
+> #### **Important**
+> If you believe you have identified a security vulnerability with NodeBB, report it as soon as possible via email to **security@nodebb.org**.
+> A member of the NodeBB security team will respond to the issue.
+> Please do not post it to the public bug tracker.
+
+## Try the latest version of NodeBB
+
+There is a chance that the issue you are experiencing may have already been fixed.
+
+## Provide the NodeBB version number and git hash
+
+You can find the NodeBB version number in the Admin Control Panel (ACP), as well as the first line output to the shell when running NodeBB
+
+``` plaintext
+info: NodeBB v0.5.2-dev Copyright (C) 2013-2014 NodeBB Inc.
+info: This program comes with ABSOLUTELY NO WARRANTY.
+info: This is free software, and you are welcome to redistribute it under certain conditions.
+info: 
+info: Time: Tue Oct 07 2014 20:25:20 GMT-0400 (EDT)
+```
+
+If you are running NodeBB via git, it is also helpful to let the maintainers know what commit hash you are on. To find the commit hash, execute the following command:
+
+``` bash
+$ cd /path/to/my/nodebb
+$ git rev-parse HEAD
+```
+
+If you have downloaded the `.zip` or `.tar.gz` packages from GitHub (or elsewhere), please let us know.
+
+## Attempt to use `git bisect`
+
+If you have installed NodeBB via GitHub clone, are familiar with utilising git, and are willing to help us narrow down the specific commit that causes a bug, consider running `git bisect`.
+
+A full guide can be found here: [Debugging with Git/Binary Search](http://git-scm.com/book/en/Git-Tools-Debugging-with-Git#Binary-Search)
--- a/NOTES.md
+++ b/NOTES.md
@@ -1,15 +0,0 @@
-## 0.4x Refactor Notes
-
-Please remove this file after 0.4x (or perhaps organize it so that we can see the history of breaking changes)
-
-### Immediate Deprecation Notices
-
-* `action:ajaxifying` is no longer triggered on body but on window instead, in line with other similar hooks.
-* `filter:server.create_routes` and `filter:admin.create_routes` will have limited support (ajaxify works, but first-load will not). Please have a look at [this plugin](https://github.com/psychobunny/nodebb-plugin-kitchen-sink/blob/master/library.js#L16-L22) for an example on how to create routes in plugins from now on.
-
-### Upcoming Deprecation Warnings
-
-* `filter:footer.build` will be deprecated for 0.4x in favour of the widget system (WIP)
-* templates.setGlobal (server-side only) deprecated in favour of using res.locals
-* `plugins/fireHook` route will be deprecated for 0.4x
-* synchronous hooks will be deprecated for 0.4x - we're reducing complexity by removing the `callbacked: true` property in `plugin.json` - just use callbacks.
--- a/app.js
+++ b/app.js
@@ -17,7 +17,6 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-
 "use strict";
 /*global require, global, process*/

@@ -29,6 +28,7 @@ var fs = require('fs'),
 	semver = require('semver'),
 	winston = require('winston'),
 	path = require('path'),
+	cluster = require('cluster'),
 	pkg = require('./package.json'),
 	utils = require('./public/src/utils.js');

@@ -37,7 +37,8 @@ global.env = process.env.NODE_ENV || 'production';

 winston.remove(winston.transports.Console);
 winston.add(winston.transports.Console, {
-	colorize: true
+	colorize: true,
+	timestamp: true
 });

 winston.add(winston.transports.File, {
@@ -58,11 +59,13 @@ if(os.platform() === 'linux') {
 	});
 }

-// Log GNU copyright info along with server info
-winston.info('NodeBB v' + pkg.version + ' Copyright (C) 2013-2014 NodeBB Inc.');
-winston.info('This program comes with ABSOLUTELY NO WARRANTY.');
-winston.info('This is free software, and you are welcome to redistribute it under certain conditions.');
-winston.info('');
+if (!cluster.isWorker) {
+	// If run using `node app`, log GNU copyright info along with server info
+	winston.info('NodeBB v' + pkg.version + ' Copyright (C) 2013-2014 NodeBB Inc.');
+	winston.info('This program comes with ABSOLUTELY NO WARRANTY.');
+	winston.info('This is free software, and you are welcome to redistribute it under certain conditions.');
+	winston.info('');
+}

 // Alternate configuration file support
 var	configFile = path.join(__dirname, '/config.json'),
@@ -73,7 +76,7 @@ if (nconf.get('config')) {
 }
 configExists = fs.existsSync(configFile);

-if (!nconf.get('help') && !nconf.get('setup') && !nconf.get('install') && !nconf.get('upgrade') && !nconf.get('reset') && configExists) {
+if (!nconf.get('setup') && !nconf.get('install') && !nconf.get('upgrade') && !nconf.get('reset') && configExists) {
 	start();
 } else if (nconf.get('setup') || nconf.get('install') || !configExists) {
 	setup();
@@ -81,8 +84,6 @@ if (!nconf.get('help') && !nconf.get('setup') && !nconf.get('install') && !nconf
 	upgrade();
 } else if (nconf.get('reset')) {
 	reset();
-} else {
-	displayHelp();
 }

 function loadConfig() {
@@ -99,23 +100,25 @@ function loadConfig() {

 	// Ensure themes_path is a full filepath
 	nconf.set('themes_path', path.resolve(__dirname, nconf.get('themes_path')));
+	nconf.set('core_templates_path', path.join(__dirname, 'src/views'));
 	nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-vanilla/templates'));
 }

 function start() {
 	loadConfig();

-	winston.info('Time: ' + new Date());
-	winston.info('Initializing NodeBB v' + pkg.version);
-	winston.info('* using configuration stored in: ' + configFile);
-	var host = nconf.get(nconf.get('database') + ':host'),
-		storeLocation = host ? 'at ' + host + (host.indexOf('/') === -1 ? ':' + nconf.get(nconf.get('database') + ':port') : '') : '';
+	if (!cluster.isWorker || process.env.cluster_setup === 'true') {
+		winston.info('Time: ' + new Date());
+		winston.info('Initializing NodeBB v' + pkg.version);
+		winston.info('* using configuration stored in: ' + configFile);
+	}

-	winston.info('* using ' + nconf.get('database') +' store ' + storeLocation);
-	winston.info('* using themes stored in: ' + nconf.get('themes_path'));
+	if (cluster.isWorker && process.env.cluster_setup === 'true') {
+		var host = nconf.get(nconf.get('database') + ':host'),
+			storeLocation = host ? 'at ' + host + (host.indexOf('/') === -1 ? ':' + nconf.get(nconf.get('database') + ':port') : '') : '';

-	if (process.env.NODE_ENV === 'development') {
-		winston.info('Base Configuration OK.');
+		winston.info('* using ' + nconf.get('database') +' store ' + storeLocation);
+		winston.info('* using themes stored in: ' + nconf.get('themes_path'));
 	}

 	require('./src/database').init(function(err) {
@@ -136,19 +139,42 @@ function start() {
 			upgrade.check(function(schema_ok) {
 				if (schema_ok || nconf.get('check-schema') === false) {
 					sockets.init(webserver.server);
-					plugins.init();

 					nconf.set('url', nconf.get('base_url') + (nconf.get('use_port') ? ':' + nconf.get('port') : '') + nconf.get('relative_path'));

 					plugins.ready(function() {
-						webserver.init();
+						webserver.init(function() {
+							webserver.listen(function() {
+								process.send({
+									action: 'ready'
+								});
+							});
+						});
 					});

 					process.on('SIGTERM', shutdown);
 					process.on('SIGINT', shutdown);
 					process.on('SIGHUP', restart);
+					process.on('message', function(message) {
+						switch(message.action) {
+							case 'reload':
+								meta.reload();
+							break;
+							case 'js-propagate':
+								meta.js.cache = message.cache;
+								meta.js.map = message.map;
+								winston.info('[cluster] Client-side javascript and mapping propagated to worker ' + cluster.worker.id);
+							break;
+							case 'css-propagate':
+								meta.css.cache = message.cache;
+								meta.css.acpCache = message.acpCache;
+								winston.info('[cluster] Stylesheets propagated to worker ' + cluster.worker.id);
+							break;
+						}
+					});
+
 					process.on('uncaughtException', function(err) {
-						winston.error(err.message);
+						winston.error(err.stack);
 						console.log(err.stack);

 						meta.js.killMinifier();
@@ -156,10 +182,12 @@ function start() {
 					});
 				} else {
 					winston.warn('Your NodeBB schema is out-of-date. Please run the following command to bring your dataset up to spec:');
-					winston.warn('    node app --upgrade');
-					winston.warn('To ignore this error (not recommended):');
-					winston.warn('    node app --no-check-schema');
-					process.exit();
+					winston.warn('    ./nodebb upgrade');
+					if (cluster.isWorker) {
+						cluster.worker.kill();
+					} else {
+						process.exit();
+					}
 				}
 			});
 		});
@@ -313,6 +341,8 @@ function shutdown(code) {
 	winston.info('[app] Shutdown (SIGTERM/SIGINT) Initialised.');
 	require('./src/database').close();
 	winston.info('[app] Database connection closed.');
+	require('./src/webserver').server.close();
+	winston.info('[app] Web server closed to connections.');

 	winston.info('[app] Shutdown complete.');
 	process.exit(code || 0);
@@ -328,16 +358,4 @@ function restart() {
 		winston.error('[app] Could not restart server. Shutting down.');
 		shutdown(1);
 	}
-}
-
-function displayHelp() {
-	winston.info('Usage: node app [options] [arguments]');
-	winston.info('       [NODE_ENV=development | NODE_ENV=production] node app [--start] [arguments]');
-	winston.info('');
-	winston.info('Options:');
-	winston.info('  --help              displays this usage information');
-	winston.info('  --setup             configure your environment and setup NodeBB');
-	winston.info('  --upgrade           upgrade NodeBB, first read: https://docs.nodebb.org/en/latest/upgrading/');
-	winston.info('  --reset             soft resets NodeBB; disables all plugins and restores selected theme to Vanilla');
-	winston.info('  --start             manually start NodeBB (default when no options are given)');
-}
+}
--- a/bcrypt.js
+++ b/bcrypt.js
@@ -0,0 +1,29 @@
+
+'use strict';
+
+var bcrypt = require('bcryptjs'),
+	async = require('async'),
+	action = process.argv[2];
+
+switch(action) {
+	case 'compare':
+			bcrypt.compare(process.argv[3], process.argv[4], function(err, res) {
+				process.stdout.write(res ? 'true' : 'false');
+			});
+		break;
+
+	case 'hash':
+			async.waterfall([
+				async.apply(bcrypt.genSalt, parseInt(process.argv[3], 10)),
+				function(salt, next) {
+					bcrypt.hash(process.argv[4], salt, next);
+				}
+			], function(err, hash) {
+				if (!err) {
+					process.stdout.write(hash);
+				} else {
+					process.stderr.write(err.message);
+				}
+			});
+		break;
+}
--- a/install/data/categories.json
+++ b/install/data/categories.json
@@ -2,7 +2,7 @@
    {
        "name": "Announcements",
        "description": "Announcements regarding our community",
-        "bgColor": "#0059B2",
+        "bgColor": "#fda34b",
        "color": "#fff",
        "icon" : "fa-bullhorn",
        "order": 1
@@ -10,89 +10,25 @@
    {
        "name": "General Discussion",
        "description": "A place to talk about whateeeever you want",
-        "bgColor": "#0059B2",
+        "bgColor": "#59b3d0",
        "color": "#fff",
-        "icon" : "fa-comment",
+        "icon" : "fa-comments-o",
        "order": 2
    },
-    {
-        "name": "NodeBB Development",
-        "description": "NodeBB development news and announcements",
-        "bgColor": "#0059B2",
-        "color": "#fff",
-        "icon" : "fa-github",
-        "order": 3
-    },
    {
        "name": "Blogs",
        "description": "Blog posts from individual members",
-        "bgColor": "#0059B2",
+        "bgColor": "#86ba4b",
        "color": "#fff",
-        "icon" : "fa-pencil",
+        "icon" : "fa-newspaper-o",
        "order": 4
    },
    {
-        "name": "Feature Requests",
-        "description": "Got a feature request you'd like to see? Give us a shout here.",
-        "bgColor": "#ab1290",
+        "name": "Comments & Feedback",
+        "description": "Got a question? Ask away!",
+        "bgColor": "#e95c5a",
        "color": "#fff",
-        "icon" : "fa-lightbulb-o",
-        "order": 5
-    },
-    {
-        "name": "Bug Reports",
-        "description": "Having trouble with NodeBB? Let us know...",
-        "bgColor": "#ab1290",
-        "color": "#fff",
-        "icon" : "fa-cogs",
-        "order": 6
-    },
-    {
-        "name": "NodeBB Plugins",
-        "description": "Enhance your NodeBB with plugins!",
-        "bgColor": "#ab1290",
-        "color": "#fff",
-        "icon" : "fa-plus-square",
-        "order": 7
-    },
-    {
-        "name": "NodeBB Link Exchange",
-        "description": "Link exchange",
-        "bgColor": "#ab1290",
-        "color": "#fff",
-        "icon" : "fa-exchange",
-        "order": 8
-    },
-    {
-        "name": "News",
-        "description": "News from around the world",
-        "bgColor": "#004C66",
-        "color": "#fff",
-        "icon" : "fa-globe",
-        "order": 9
-    },
-    {
-        "name": "Movies",
-        "description": "Discuss the latest movies here",
-        "bgColor": "#004C66",
-        "color": "#fff",
-        "icon" : "fa-film",
-        "order": 10
-    },
-    {
-        "name": "Games",
-        "description": "Discuss the latest games here",
-        "bgColor": "#004C66",
-        "color": "#fff",
-        "icon" : "fa-crosshairs",
-        "order": 11
-    },
-    {
-        "name": "Random",
-        "description": "Anything and (almost) everything welcome!",
-        "bgColor": "#004C66",
-        "color": "#fff",
-        "icon" : "fa-beer",
-        "order": 12
+        "icon" : "fa-question",
+        "order": 3
    }
 ]
--- a/install/data/defaults.json
+++ b/install/data/defaults.json
@@ -11,6 +11,10 @@
        "field": "postDelay",
        "value": 10
    },
+    {
+        "field": "initialPostDelay",
+        "value": 10
+    },
    {
        "field": "minimumPostLength",
        "value": 8
@@ -31,6 +35,10 @@
        "field": "allowLocalLogin",
        "value": 1
    },
+    {
+        "field": "allowAccountDelete",
+        "value": 1
+    },
    {
        "field": "allowFileUploads",
        "value": 0
@@ -68,11 +76,11 @@
        "value": 256
    },
    {
-        "field": "chatMessagesToDisplay",
-        "value": 50
+        "field": "profileImageDimension",
+        "value": 128
    },
    {
        "field": "requireEmailConfirmation",
        "value": 0
    }
-]
+]
--- a/install/databases.js
+++ b/install/databases.js
@@ -12,7 +12,7 @@ function success(err, config, callback) {
 		return callback(new Error('aborted'));
 	}

-	var database = (config.redis || config.mongo || config.level) ? config.secondary_database : config.database;
+	var database = (config.redis || config.mongo) ? config.secondary_database : config.database;

 	function dbQuestionsSuccess(err, databaseConfig) {
 		if (!databaseConfig) {
@@ -39,15 +39,11 @@ function success(err, config, callback) {
 				password: databaseConfig['mongo:password'],
 				database: databaseConfig['mongo:database']
 			};
-		} else if (database === 'level') {
-			config.level = {
-				database: databaseConfig['level:database']
-			};
 		} else {
 			return callback(new Error('unknown database : ' + database));
 		}

-		var allQuestions = questions.redis.concat(questions.mongo.concat(questions.level));
+		var allQuestions = questions.redis.concat(questions.mongo);
 		for(var x=0;x<allQuestions.length;x++) {
 			delete config[allQuestions[x].name];
 		}
@@ -67,12 +63,6 @@ function success(err, config, callback) {
 		} else {
 			prompt.get(questions.mongo, dbQuestionsSuccess);
 		}
-	} else if(database === 'level') {
-		if (config['level:database']) {
-			dbQuestionsSuccess(null, config);
-		} else {
-			prompt.get(questions.level, dbQuestionsSuccess);
-		}
 	} else {
 		return callback(new Error('unknown database : ' + database));
 	}
--- a/loader.js
+++ b/loader.js
@@ -2,81 +2,234 @@

 var	nconf = require('nconf'),
 	fs = require('fs'),
+	path = require('path'),
+	cluster = require('cluster'),
+	async = require('async'),
+	logrotate = require('logrotate-stream'),
+
+	pkg = require('./package.json'),
+
 	pidFilePath = __dirname + '/pidfile',
-	output = fs.openSync(__dirname + '/logs/output.log', 'a'),
-	start = function() {
-		var	fork = require('child_process').fork,
-			nbb_start = function() {
-				if (timesStarted > 3) {
-					console.log('\n[loader] Experienced three start attempts in 10 seconds, most likely an error on startup. Halting.');
-					return nbb_stop();
-				}
+	output = logrotate({ file: __dirname + '/logs/output.log', size: '1m', keep: 3, compress: true }),
+	silent = process.env.NODE_ENV !== 'development' ? true : false,
+	numProcs,

-				timesStarted++;
-				if (startTimer) {
-					clearTimeout(startTimer);
-				}
-				startTimer = setTimeout(resetTimer, 1000*10);
+	Loader = {
+		timesStarted: 0,
+		shutdown_queue: [],
+		js: {
+			cache: undefined,
+			map: undefined
+		},
+		css: {
+			cache: undefined,
+			acpCache: undefined
+		}
+	};

-				nbb = fork('./app', process.argv.slice(2), {
-					env: process.env
-				});
+Loader.init = function(callback) {
+	cluster.setupMaster({
+		exec: "app.js",
+		silent: silent
+	});
+	Loader.primaryWorker = 1;

-				nbb.on('message', function(message) {
-					if (message && typeof message === 'object' && message.action) {
-						if (message.action === 'restart') {
-							nbb_restart();
+	if (silent) {
+		console.log = function(value) {
+			output.write(value + '\n');
+		};
+	}
+
+	process.on('SIGHUP', Loader.restart);
+	callback();
+};
+
+Loader.displayStartupMessages = function(callback) {
+	console.log('');
+	console.log('NodeBB v' + pkg.version + ' Copyright (C) 2013-2014 NodeBB Inc.');
+	console.log('This program comes with ABSOLUTELY NO WARRANTY.');
+	console.log('This is free software, and you are welcome to redistribute it under certain conditions.');
+	console.log('For the full license, please visit: http://www.gnu.org/copyleft/gpl.html');
+	console.log('');
+	callback();
+};
+
+Loader.addClusterEvents = function(callback) {
+	cluster.on('fork', function(worker) {
+		worker.on('message', function(message) {
+			if (message && typeof message === 'object' && message.action) {
+				var otherWorkers;
+
+				switch (message.action) {
+					case 'ready':
+						if (Loader.js.cache) {
+							worker.send({
+								action: 'js-propagate',
+								cache: Loader.js.cache,
+								map: Loader.js.map
+							});
 						}
-					}
-				});

-				nbb.on('exit', function(code, signal) {
-					if (code) {
-						nbb_start();
-					} else {
-						nbb_stop();
-					}
-				});
-			},
-			nbb_stop = function() {
-				if (startTimer) {
-					clearTimeout(startTimer);
+						if (Loader.css.cache) {
+							worker.send({
+								action: 'css-propagate',
+								cache: Loader.css.cache,
+								acpCache: Loader.css.acpCache
+							});
+						}
+
+						// Kill an instance in the shutdown queue
+						var workerToKill = Loader.shutdown_queue.pop();
+						if (workerToKill) {
+							cluster.workers[workerToKill].kill();
+						}
+					break;
+					case 'restart':
+						console.log('[cluster] Restarting...');
+						Loader.restart(function(err) {
+							console.log('[cluster] Restarting...');
+						});
+					break;
+					case 'reload':
+						console.log('[cluster] Reloading...');
+						Loader.reload();
+					break;
+					case 'js-propagate':
+						Loader.js.cache = message.cache;
+						Loader.js.map = message.map;
+
+						otherWorkers = Object.keys(cluster.workers).filter(function(worker_id) {
+							return parseInt(worker_id, 10) !== parseInt(worker.id, 10);
+						});
+
+						otherWorkers.forEach(function(worker_id) {
+							cluster.workers[worker_id].send({
+								action: 'js-propagate',
+								cache: message.cache,
+								map: message.map
+							});
+						});
+					break;
+					case 'css-propagate':
+						Loader.css.cache = message.cache;
+						Loader.css.acpCache = message.acpCache;
+
+						otherWorkers = Object.keys(cluster.workers).filter(function(worker_id) {
+							return parseInt(worker_id, 10) !== parseInt(worker.id, 10);
+						});
+
+						otherWorkers.forEach(function(worker_id) {
+							cluster.workers[worker_id].send({
+								action: 'css-propagate',
+								cache: message.cache,
+								acpCache: message.acpCache
+							});
+						});
+					break;
+					case 'listening':
+						if (message.primary) {
+							Loader.primaryWorker = parseInt(worker.id, 10);
+						}
+					break;
+					case 'user:connect':
+					case 'user:disconnect':
+					case 'config:update':
+						Loader.notifyWorkers(message);
+					break;
 				}
+			}
+		});
+	});

-				nbb.kill();
-				if (fs.existsSync(pidFilePath)) {
-					var	pid = parseInt(fs.readFileSync(pidFilePath, { encoding: 'utf-8' }), 10);
-					if (process.pid === pid) {
-						fs.unlinkSync(pidFilePath);
-					}
+	cluster.on('listening', function(worker) {
+		console.log('[cluster] Child Process (' + worker.process.pid + ') listening for connections.');
+	});
+
+	cluster.on('exit', function(worker, code, signal) {
+		if (code !== 0) {
+			if (Loader.timesStarted < numProcs*3) {
+				Loader.timesStarted++;
+				if (Loader.crashTimer) {
+					clearTimeout(Loader.crashTimer);
 				}
-			},
-			nbb_restart = function() {
-				nbb.removeAllListeners('exit').on('exit', function() {
-					nbb_start();
+				Loader.crashTimer = setTimeout(function() {
+					Loader.timesStarted = 0;
 				});
-				nbb.kill();
-			},
-			resetTimer = function() {
-				clearTimeout(startTimer);
-				timesStarted = 0;
-			},
-			timesStarted = 0,
-			startTimer;
+			} else {
+				console.log(numProcs*3 + ' restarts in 10 seconds, most likely an error on startup. Halting.');
+				process.exit();
+			}
+		}

-		process.on('SIGINT', nbb_stop);
-		process.on('SIGTERM', nbb_stop);
-		process.on('SIGHUP', nbb_restart);
+		console.log('[cluster] Child Process (' + worker.process.pid + ') has exited (code: ' + code + ')');
+		if (!worker.suicide) {
+			console.log('[cluster] Spinning up another process...');

-		nbb_start();
-	},
-	nbb;
+			var wasPrimary = parseInt(worker.id, 10) === Loader.primaryWorker;
+			cluster.fork({
+				handle_jobs: wasPrimary
+			});
+		}
+	});

-nconf.argv();
+	cluster.on('disconnect', function(worker) {
+		console.log('[cluster] Child Process (' + worker.process.pid + ') has disconnected');
+	});
+
+	callback();
+}
+
+Loader.start = function(callback) {
+	var output = logrotate({ file: __dirname + '/logs/output.log', size: '1m', keep: 3, compress: true }),
+		worker;
+
+	console.log('Clustering enabled: Spinning up ' + numProcs + ' process(es).\n');
+
+	for(var x=0;x<numProcs;x++) {
+		// Only the first worker sets up templates/sounds/jobs/etc
+		worker = cluster.fork({
+			cluster_setup: x === 0,
+			handle_jobs: x === 0
+		});
+
+		// Logging
+		if (silent) {
+			worker.process.stdout.pipe(output);
+		}
+	}
+
+	if (callback) callback();
+};
+
+Loader.restart = function(callback) {
+	// Slate existing workers for termination -- welcome to death row.
+	Loader.shutdown_queue = Loader.shutdown_queue.concat(Object.keys(cluster.workers));
+	Loader.start();
+};
+
+Loader.reload = function() {
+	Object.keys(cluster.workers).forEach(function(worker_id) {
+		cluster.workers[worker_id].send({
+			action: 'reload'
+		});
+	});
+};
+
+Loader.notifyWorkers = function (msg) {
+	Object.keys(cluster.workers).forEach(function(id) {
+		cluster.workers[id].send(msg);
+	});
+}
+
+
+nconf.argv().file({
+	file: path.join(__dirname, '/config.json')
+});
+
+numProcs = nconf.get('cluster') || 1;
+numProcs = (numProcs === true) ? require('os').cpus().length : numProcs;

-// Start the daemon!
 if (nconf.get('daemon') !== false) {
-	// Check for a still-active NodeBB process
 	if (fs.existsSync(pidFilePath)) {
 		try {
 			var	pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
@@ -87,13 +240,18 @@ if (nconf.get('daemon') !== false) {
 		}
 	}

-	// Daemonize and record new pid
-	require('daemon')({
-		stdout: output
-	});
-	fs.writeFile(__dirname + '/pidfile', process.pid);
+	require('daemon')();

-	start();
-} else {
-	start();
+	fs.writeFile(__dirname + '/pidfile', process.pid);
 }
+
+async.series([
+	Loader.init,
+	Loader.displayStartupMessages,
+	Loader.addClusterEvents,
+	Loader.start
+], function(err) {
+	if (err) {
+		console.log('[loader] Error during startup: ' + err.message);
+	}
+});
--- a/minifier.js
+++ b/minifier.js
@@ -8,23 +8,24 @@ var uglifyjs = require('uglify-js'),
 	crypto = require('crypto'),

 	Minifier = {
-		js: {},
-		css: {}
+		js: {}
 	};

 /* Javascript */
-Minifier.js.minify = function (scripts, minify, callback) {
-	var options = {};
+Minifier.js.minify = function (scripts, relativePath, minify, callback) {
+	var options = {
+		compress: false,
+		sourceMapURL: '/nodebb.min.js.map',
+		outSourceMap: 'nodebb.min.js.map',
+		sourceRoot: relativePath
+	};

 	scripts = scripts.filter(function(file) {
 		return fs.existsSync(file);
 	});

 	if (!minify) {
-		options.sourceMapURL = '/nodebb.min.js.map';
-		options.outSourceMap = 'nodebb.min.js.map';
 		options.mangle = false;
-		options.compress = false;
 		options.prefix = 1;
 	}

@@ -56,17 +57,10 @@ Minifier.js.minify = function (scripts, minify, callback) {
 process.on('message', function(payload) {
 	switch(payload.action) {
 	case 'js':
-		Minifier.js.minify(payload.scripts, payload.minify, function(data) {
-			process.stdout.write(data.js);
+		Minifier.js.minify(payload.scripts, payload.relativePath, payload.minify, function(data) {
 			process.send({
 				type: 'end',
-				payload: 'script'
-			});
-
-			process.stderr.write(data.map);
-			process.send({
-				type: 'end',
-				payload: 'mapping'
+				data: data
 			});
 		});
 		break;
--- a/7
+++ b/7
@@ -28,11 +28,6 @@ case "$1" in
 		echo "  \"./nodebb stop\" to stop the NodeBB server";
 		echo "  \"./nodebb log\" to view server output";

-		if [ -f "./logs/output.log" ];	# Preserve the last output log
-			then
-				mv ./logs/output.log ./logs/output.1.log;
-		fi;
-
 		# Start the loader daemon
 		"$node" loader -d "$@"
 		;;
@@ -107,7 +102,7 @@ case "$1" in
 		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 supervisor -q --ignore public/templates --extensions 'node|js|tpl|less' -- app "$@"
+		NODE_ENV=development supervisor -q --ignore public/templates,public/nodebb.min.js,public/nodebb.min.js.map --extensions 'node|js|tpl|less' -- app "$@"
 		;;

 	*)
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "nodebb",
  "license": "GPLv3 or later",
  "description": "NodeBB Forum",
-  "version": "0.5.0",
+  "version": "0.5.3",
  "homepage": "http://www.nodebb.org",
  "repository": {
    "type": "git",
@@ -17,48 +17,51 @@
  "dependencies": {
    "async": "~0.9.0",
    "bcryptjs": "~2.0.1",
+    "body-parser": "^1.9.0",
+    "compression": "^1.1.0",
+    "connect-ensure-login": "^0.1.1",
    "connect-flash": "^0.1.1",
-    "cron": "~1.0.4",
+    "connect-multiparty": "^1.2.4",
+    "cookie-parser": "^1.3.3",
+    "cron": "^1.0.5",
+    "csurf": "^1.6.1",
    "daemon": "~1.1.0",
-    "express": "4.6.1",
-    "cookie-parser": "^1.0.1",
-    "body-parser": "^1.0.1",
-    "serve-favicon": "^2.0.1",
-    "express-session": "^1.0.2",
-    "csurf": "^1.1.0",
-    "compression": "^1.0.1",
-    "connect-multiparty": "^1.0.1",
-    "morgan": "^1.0.0",
+    "express": "^4.9.5",
+    "express-session": "^1.8.2",
    "gm": "1.16.0",
-    "gravatar": "1.0.6",
-    "less": "~1.7.3",
+    "gravatar": "^1.1.0",
+    "less": "^1.7.5",
+    "logrotate-stream": "^0.2.3",
    "mkdirp": "~0.5.0",
+    "morgan": "^1.3.2",
    "nconf": "~0.6.7",
-    "nodebb-plugin-dbsearch": "0.0.13",
-    "nodebb-plugin-markdown": "~0.5.0",
-    "nodebb-plugin-mentions": "~0.5.0",
+    "nodebb-plugin-dbsearch": "0.0.15",
+    "nodebb-plugin-markdown": "^0.7.0",
+    "nodebb-plugin-mentions": "~0.6.0",
    "nodebb-plugin-soundpack-default": "~0.1.1",
-    "nodebb-theme-lavender": "~0.0.74",
-    "nodebb-theme-vanilla": "~0.0.111",
-    "nodebb-widget-essentials": "~0.1.0",
-    "npm": "^1.4.6",
-    "passport": "~0.2.0",
+    "nodebb-theme-lavender": "~0.1.0",
+    "nodebb-theme-vanilla": "~0.1.0",
+    "nodebb-widget-essentials": "~0.1.1",
+    "npm": "^2.1.4",
+    "passport": "^0.2.1",
    "passport-local": "1.0.0",
-    "prompt": "~0.2.11",
-    "request": "~2.38.0",
+    "prompt": "^0.2.14",
+    "request": "^2.44.0",
    "rimraf": "~2.2.6",
-    "rss": "~0.3.2",
-    "semver": "~2.3.1",
-    "sitemap": "~0.7.3",
-    "socket.io": "~0.9.16",
+    "rss": "^1.0.0",
+    "semver": "^4.0.3",
+    "serve-favicon": "^2.1.5",
+    "sitemap": "^0.7.4",
+    "socket.io": "^0.9.17",
+    "socket.io-client": "^0.9.17",
    "socket.io-wildcard": "~0.1.1",
-    "string": "~1.9.0",
+    "string": "^2.1.0",
+    "templates.js": "0.1.2",
    "uglify-js": "git+https://github.com/julianlam/UglifyJS2.git",
-    "underscore": "~1.6.0",
-    "validator": "~3.16.1",
-    "winston": "~0.7.2",
-    "xregexp": "~2.0.0",
-    "templates.js": "0.0.13"
+    "underscore": "~1.7.0",
+    "validator": "~3.21.0",
+    "winston": "^0.8.0",
+    "xregexp": "~2.0.0"
  },
  "devDependencies": {
    "mocha": "~1.13.0"
--- a/public/images/admin/connect-tile.png
+++ b/public/images/admin/connect-tile.png
--- a/public/images/logo.png
+++ b/public/images/logo.png
--- a/public/language/ar/category.json
+++ b/public/language/ar/category.json
@@ -3,5 +3,6 @@
    "no_topics": "<strong>لا توجد مواضيع في هذه الفئة</strong>لماذا لا تحاول نشر موضوع؟<br />",
    "browsing": "تصفح",
    "no_replies": "لم يرد أحد",
-    "share_this_category": "انشر هذه الفئة"
+    "share_this_category": "انشر هذه الفئة",
+    "ignore": "Ignore"
 }
--- a/public/language/ar/email.json
+++ b/public/language/ar/email.json
@@ -9,12 +9,15 @@
    "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",
-    "digest.notifications": "You have some unread notifications from %1:",
+    "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.unsub.cta": "Click here to alter those settings",
    "digest.daily.no_topics": "There have been no active topics in the past day",
+    "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.",
    "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!"
 }
--- a/public/language/ar/error.json
+++ b/public/language/ar/error.json
@@ -12,45 +12,53 @@
    "invalid-title": "Invalid title!",
    "invalid-user-data": "Invalid User Data",
    "invalid-password": "كلمة السر غير مقبولة",
+    "invalid-username-or-password": "Please specify both a username and password",
+    "invalid-search-term": "Invalid search term",
    "invalid-pagination-value": "Invalid pagination value",
    "username-taken": "اسم المستخدم ماخوذ",
    "email-taken": "البريد الالكتروني ماخوذ",
-    "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
+    "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.",
    "username-too-short": "Username too short",
+    "username-too-long": "Username too long",
    "user-banned": "المستخدم محظور",
-    "no-category": "Category doesn't exist",
-    "no-topic": "Topic doesn't exist",
-    "no-post": "Post doesn't exist",
-    "no-group": "Group doesn't exist",
-    "no-user": "المستخدم لا يوجد",
-    "no-teaser": "Teaser doesn't exist",
-    "no-privileges": "You don't have enough privileges for this action.",
+    "user-too-new": "Sorry, you are required to wait %1 seconds before making your first post",
+    "no-category": "Category does not exist",
+    "no-topic": "Topic does not exist",
+    "no-post": "Post does not exist",
+    "no-group": "Group does not exist",
+    "no-user": "User does not exist",
+    "no-teaser": "Teaser does not exist",
+    "no-privileges": "You do not have enough privileges for this action.",
    "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
    "category-disabled": "Category disabled",
    "topic-locked": "الموضوع مقفول",
    "still-uploading": "الرجاء انتظار الرفع",
-    "content-too-short": "Please enter a longer post. At least %1 characters.",
-    "title-too-short": "Please enter a longer title. At least %1 characters.",
+    "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.",
+    "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.",
    "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.",
-    "too-many-posts": "You can only post every %1 seconds.",
-    "file-too-big": "Maximum allowed file size is %1 kbs",
+    "too-many-posts": "You can only post once every %1 seconds - please wait before posting again",
+    "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file",
    "cant-vote-self-post": "You cannot vote for your own post",
-    "already-favourited": "You already favourited this post",
-    "already-unfavourited": "You already unfavourited this post",
+    "already-favourited": "You have already favourited this post",
+    "already-unfavourited": "You have already unfavourited this post",
    "cant-ban-other-admins": "You can't ban other admins!",
    "invalid-image-type": "نوع الصورة ممنوع",
    "group-name-too-short": "Group name too short",
    "group-already-exists": "Group already exists",
    "group-name-change-not-allowed": "Group name change not allowed",
-    "post-already-deleted": "Post already deleted",
-    "post-already-restored": "Post already restored",
-    "topic-already-deleted": "Topic already deleted",
-    "topic-already-restored": "Topic already restored",
+    "post-already-deleted": "This post has already been deleted",
+    "post-already-restored": "This post has already been restored",
+    "topic-already-deleted": "This topic has already been deleted",
+    "topic-already-restored": "This topic has already been restored",
    "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.",
    "invalid-file": "Invalid File",
    "uploads-are-disabled": "Uploads are disabled",
    "upload-error": "مشكلة في الرفع: 1%",
-    "signature-too-long": "Signature can't be longer than %1 characters!",
+    "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.",
    "cant-chat-with-yourself": "You can't chat with yourself!",
-    "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+    "reputation-system-disabled": "Reputation system is disabled.",
+    "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",
+    "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/ar/global.json
+++ b/public/language/ar/global.json
@@ -71,5 +71,6 @@
    "guest": "Guest",
    "guests": "Guests",
    "updated.title": "Forum Updated",
-    "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page."
+    "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page.",
+    "privacy": "Privacy"
 }
--- a/public/language/ar/groups.json
+++ b/public/language/ar/groups.json
@@ -1,4 +1,5 @@
 {
+    "groups": "Groups",
    "view_group": "View Group",
    "details.title": "Group Details",
    "details.members": "Member List",
--- a/public/language/ar/modules.json
+++ b/public/language/ar/modules.json
@@ -12,6 +12,10 @@
    "chat.message-history": "Message History",
    "chat.pop-out": "Pop out chat",
    "chat.maximize": "Maximize",
+    "chat.yesterday": "Yesterday",
+    "chat.seven_days": "7 Days",
+    "chat.thirty_days": "30 Days",
+    "chat.three_months": "3 Months",
    "composer.user_said_in": "%1 said in %2:",
    "composer.user_said": "%1 said:",
    "composer.discard": "Are you sure you wish to discard this post?"
--- a/public/language/ar/notifications.json
+++ b/public/language/ar/notifications.json
@@ -10,11 +10,15 @@
    "new_notification": "New Notification",
    "you_have_unread_notifications": "You have unread notifications.",
    "new_message_from": "New message from <strong>%1</strong>",
-    "upvoted_your_post": "<strong>%1</strong> has upvoted your post.",
-    "favourited_your_post": "<strong>%1</strong> has favourited your post.",
-    "user_flagged_post": "<strong>%1</strong> flagged a post.",
+    "upvoted_your_post_in": "<strong>%1</strong> has upvoted your post in <strong>%2</strong>.",
+    "moved_your_post": "<strong>%1</strong> has moved your post.",
+    "moved_your_topic": "<strong>%1</strong> has moved your topic.",
+    "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
+    "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
    "user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
+    "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.",
    "email-confirmed": "Email Confirmed",
    "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
    "email-confirm-error": "An error occurred...",
--- a/public/language/ar/pages.json
+++ b/public/language/ar/pages.json
@@ -12,5 +12,7 @@
    "user.posts": "Posts made by %1",
    "user.topics": "Topics created by %1",
    "user.favourites": "%1's Favourite Posts",
-    "user.settings": "User Settings"
+    "user.settings": "User Settings",
+    "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
+    "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }
--- a/public/language/ar/recent.json
+++ b/public/language/ar/recent.json
@@ -4,5 +4,6 @@
    "week": "أسبوع",
    "month": "شهر",
    "year": "Year",
+    "alltime": "All Time",
    "no_recent_topics": "There are no recent topics."
 }
--- a/public/language/ar/search.json
+++ b/public/language/ar/search.json
@@ -1,3 +1,4 @@
 {
-    "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+    "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+    "no-matches": "No posts found"
 }
--- a/public/language/ar/tags.json
+++ b/public/language/ar/tags.json
@@ -2,5 +2,6 @@
    "no_tag_topics": "There are no topics with this tag.",
    "tags": "Tags",
    "enter_tags_here": "Enter tags here. Press enter after each tag.",
+    "enter_tags_here_short": "Enter tags...",
    "no_tags": "There are no tags yet."
 }
--- a/public/language/ar/topic.json
+++ b/public/language/ar/topic.json
@@ -18,7 +18,6 @@
    "restore": "Restore",
    "move": "انقل",
    "fork": "فرع",
-    "banned": "محظور",
    "link": "رابط",
    "share": "شارك",
    "tools": "أدوات",
@@ -28,15 +27,17 @@
    "flag_title": "Flag this post for moderation",
    "flag_confirm": "Are you sure you want to flag this post?",
    "flag_success": "This post has been flagged for moderation.",
-    "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
+    "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
    "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
    "not_following_topic.message": "You will no longer receive notifications from this topic.",
    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
    "markAsUnreadForAll.success": "Topic marked as unread for all.",
    "watch": "Watch",
+    "unwatch": "Unwatch",
    "watch.title": "Be notified of new replies in this topic",
+    "unwatch.title": "Stop watching this topic",
    "share_this_post": "Share this Post",
-    "thread_tools.title": "أدوات الموضوع",
+    "thread_tools.title": "Topic Tools",
    "thread_tools.markAsUnreadForAll": "علم غير مقروء",
    "thread_tools.pin": "علق الموضوع",
    "thread_tools.unpin": "Unpin Topic",
@@ -46,11 +47,11 @@
    "thread_tools.move_all": "Move All",
    "thread_tools.fork": "تفرع الموضوع",
    "thread_tools.delete": "حذف الموضوع",
-    "thread_tools.delete_confirm": "Are you sure you want to delete this thread?",
+    "thread_tools.delete_confirm": "Are you sure you want to delete this topic?",
    "thread_tools.restore": "Restore Topic",
-    "thread_tools.restore_confirm": "Are you sure you want to restore this thread?",
+    "thread_tools.restore_confirm": "Are you sure you want to restore this topic?",
    "thread_tools.purge": "Purge Topic",
-    "thread_tools.purge_confirm": "Are you sure you want to purge this thread?",
+    "thread_tools.purge_confirm": "Are you sure you want to purge this topic?",
    "topic_move_success": "This topic has been successfully moved to %1",
    "post_delete_confirm": "Are you sure you want to delete this post?",
    "post_restore_confirm": "Are you sure you want to restore this post?",
@@ -71,7 +72,7 @@
    "topic_will_be_moved_to": "هذا الموضوع سوف ينقل إلى فئة",
    "fork_topic_instruction": "إضغط على الردود لتفريعهم",
    "fork_no_pids": "لم تختار أي رد",
-    "fork_success": "تفريع الموضوع بنجاح!",
+    "fork_success": "Successfully forked topic! Click here to go to the forked topic.",
    "composer.title_placeholder": "Enter your topic title here...",
    "composer.discard": "Discard",
    "composer.submit": "Submit",
--- a/public/language/ar/user.json
+++ b/public/language/ar/user.json
@@ -4,6 +4,8 @@
    "username": "إسم المستخدم",
    "email": "البريد الإلكتروني",
    "confirm_email": "Confirm Email",
+    "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.",
    "fullname": "الاسم الكامل",
    "website": "الموقع الإلكتروني",
    "location": "موقع",
@@ -27,6 +29,7 @@
    "edit": "صحح",
    "uploaded_picture": "صورة تم تحميلها",
    "upload_new_picture": "تحميل صورة جديدة",
+    "upload_new_picture_from_url": "Upload New Picture From URL",
    "current_password": "Current Password",
    "change_password": "تغيير كلمة السر",
    "change_password_error": "Invalid Password!",
@@ -44,12 +47,14 @@
    "max": "max.",
    "settings": "Settings",
    "show_email": "أظهر بريدي الإلكتروني",
+    "show_fullname": "Show My Full Name",
    "digest_label": "Subscribe to Digest",
    "digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule",
    "digest_off": "Off",
    "digest_daily": "Daily",
    "digest_weekly": "Weekly",
    "digest_monthly": "Monthly",
+    "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
    "has_no_follower": "هذا المستخدم ليس لديه أي أتباع :(",
    "follows_no_one": "هذا المستخدم لا يتبع أحد :(",
    "has_no_posts": "This user didn't post anything yet.",
@@ -61,5 +66,7 @@
    "posts_per_page": "Posts per Page",
    "notification_sounds": "Play a sound when you receive a notification.",
    "browsing": "Browsing Settings",
-    "open_links_in_new_tab": "Open outgoing links in new tab?"
+    "open_links_in_new_tab": "Open outgoing links in new tab?",
+    "follow_topics_you_reply_to": "Follow topics that you reply to.",
+    "follow_topics_you_create": "Follow topics you create."
 }
--- a/public/language/ar/users.json
+++ b/public/language/ar/users.json
@@ -5,6 +5,5 @@
    "search": "بحث",
    "enter_username": "أدخل اسم مستخدم للبحث",
    "load_more": "حمل المزيد",
-    "user-not-found": "User not found!",
    "users-found-search-took": "%1 user(s) found! Search took %2 ms."
 }
--- a/public/language/cs/category.json
+++ b/public/language/cs/category.json
@@ -3,5 +3,6 @@
    "no_topics": "<strong>V této kategorii zatím nejsou žádné příspěvky.</strong><br />Můžeš být první!",
    "browsing": "prohlíží",
    "no_replies": "Nikdo ještě neodpověděl",
-    "share_this_category": "Share this category"
+    "share_this_category": "Share this category",
+    "ignore": "Ignore"
 }
--- a/public/language/cs/email.json
+++ b/public/language/cs/email.json
@@ -9,12 +9,15 @@
    "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",
-    "digest.notifications": "You have some unread notifications from %1:",
+    "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.unsub.cta": "Click here to alter those settings",
    "digest.daily.no_topics": "There have been no active topics in the past day",
+    "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.",
    "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!"
 }
--- a/public/language/cs/error.json
+++ b/public/language/cs/error.json
@@ -12,45 +12,53 @@
    "invalid-title": "Invalid title!",
    "invalid-user-data": "Invalid User Data",
    "invalid-password": "Invalid Password",
+    "invalid-username-or-password": "Please specify both a username and password",
+    "invalid-search-term": "Invalid search term",
    "invalid-pagination-value": "Invalid pagination value",
    "username-taken": "Username taken",
    "email-taken": "Email taken",
-    "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
+    "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.",
    "username-too-short": "Username too short",
+    "username-too-long": "Username too long",
    "user-banned": "User banned",
-    "no-category": "Category doesn't exist",
-    "no-topic": "Topic doesn't exist",
-    "no-post": "Post doesn't exist",
-    "no-group": "Group doesn't exist",
-    "no-user": "User doesn't exist",
-    "no-teaser": "Teaser doesn't exist",
-    "no-privileges": "You don't have enough privileges for this action.",
+    "user-too-new": "Sorry, you are required to wait %1 seconds before making your first post",
+    "no-category": "Category does not exist",
+    "no-topic": "Topic does not exist",
+    "no-post": "Post does not exist",
+    "no-group": "Group does not exist",
+    "no-user": "User does not exist",
+    "no-teaser": "Teaser does not exist",
+    "no-privileges": "You do not have enough privileges for this action.",
    "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
    "category-disabled": "Category disabled",
    "topic-locked": "Topic Locked",
    "still-uploading": "Please wait for uploads to complete.",
-    "content-too-short": "Please enter a longer post. At least %1 characters.",
-    "title-too-short": "Please enter a longer title. At least %1 characters.",
+    "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.",
+    "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.",
    "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.",
-    "too-many-posts": "You can only post every %1 seconds.",
-    "file-too-big": "Maximum allowed file size is %1 kbs",
+    "too-many-posts": "You can only post once every %1 seconds - please wait before posting again",
+    "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file",
    "cant-vote-self-post": "You cannot vote for your own post",
-    "already-favourited": "You already favourited this post",
-    "already-unfavourited": "You already unfavourited this post",
+    "already-favourited": "You have already favourited this post",
+    "already-unfavourited": "You have already unfavourited this post",
    "cant-ban-other-admins": "You can't ban other admins!",
    "invalid-image-type": "Invalid image type",
    "group-name-too-short": "Group name too short",
    "group-already-exists": "Group already exists",
    "group-name-change-not-allowed": "Group name change not allowed",
-    "post-already-deleted": "Post already deleted",
-    "post-already-restored": "Post already restored",
-    "topic-already-deleted": "Topic already deleted",
-    "topic-already-restored": "Topic already restored",
+    "post-already-deleted": "This post has already been deleted",
+    "post-already-restored": "This post has already been restored",
+    "topic-already-deleted": "This topic has already been deleted",
+    "topic-already-restored": "This topic has already been restored",
    "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.",
    "invalid-file": "Invalid File",
    "uploads-are-disabled": "Uploads are disabled",
    "upload-error": "Upload Error : %1",
-    "signature-too-long": "Signature can't be longer than %1 characters!",
+    "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.",
    "cant-chat-with-yourself": "You can't chat with yourself!",
-    "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+    "reputation-system-disabled": "Reputation system is disabled.",
+    "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",
+    "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/cs/global.json
+++ b/public/language/cs/global.json
@@ -71,5 +71,6 @@
    "guest": "Guest",
    "guests": "Guests",
    "updated.title": "Forum Updated",
-    "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page."
+    "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page.",
+    "privacy": "Privacy"
 }
--- a/public/language/cs/groups.json
+++ b/public/language/cs/groups.json
@@ -1,4 +1,5 @@
 {
+    "groups": "Groups",
    "view_group": "View Group",
    "details.title": "Group Details",
    "details.members": "Member List",
--- a/public/language/cs/modules.json
+++ b/public/language/cs/modules.json
@@ -12,6 +12,10 @@
    "chat.message-history": "Message History",
    "chat.pop-out": "Pop out chat",
    "chat.maximize": "Maximize",
+    "chat.yesterday": "Yesterday",
+    "chat.seven_days": "7 Days",
+    "chat.thirty_days": "30 Days",
+    "chat.three_months": "3 Months",
    "composer.user_said_in": "%1 said in %2:",
    "composer.user_said": "%1 said:",
    "composer.discard": "Are you sure you wish to discard this post?"
--- a/public/language/cs/notifications.json
+++ b/public/language/cs/notifications.json
@@ -10,11 +10,15 @@
    "new_notification": "New Notification",
    "you_have_unread_notifications": "You have unread notifications.",
    "new_message_from": "New message from <strong>%1</strong>",
-    "upvoted_your_post": "<strong>%1</strong> has upvoted your post.",
-    "favourited_your_post": "<strong>%1</strong> has favourited your post.",
-    "user_flagged_post": "<strong>%1</strong> flagged a post.",
+    "upvoted_your_post_in": "<strong>%1</strong> has upvoted your post in <strong>%2</strong>.",
+    "moved_your_post": "<strong>%1</strong> has moved your post.",
+    "moved_your_topic": "<strong>%1</strong> has moved your topic.",
+    "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
+    "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
    "user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
+    "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.",
    "email-confirmed": "Email Confirmed",
    "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
    "email-confirm-error": "An error occurred...",
--- a/public/language/cs/pages.json
+++ b/public/language/cs/pages.json
@@ -12,5 +12,7 @@
    "user.posts": "Posts made by %1",
    "user.topics": "Topics created by %1",
    "user.favourites": "%1's Favourite Posts",
-    "user.settings": "User Settings"
+    "user.settings": "User Settings",
+    "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
+    "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }
--- a/public/language/cs/recent.json
+++ b/public/language/cs/recent.json
@@ -4,5 +4,6 @@
    "week": "Týden",
    "month": "Měsíc",
    "year": "Year",
+    "alltime": "All Time",
    "no_recent_topics": "There are no recent topics."
 }
--- a/public/language/cs/search.json
+++ b/public/language/cs/search.json
@@ -1,3 +1,4 @@
 {
-    "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+    "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+    "no-matches": "No posts found"
 }
--- a/public/language/cs/tags.json
+++ b/public/language/cs/tags.json
@@ -2,5 +2,6 @@
    "no_tag_topics": "There are no topics with this tag.",
    "tags": "Tags",
    "enter_tags_here": "Enter tags here. Press enter after each tag.",
+    "enter_tags_here_short": "Enter tags...",
    "no_tags": "There are no tags yet."
 }
--- a/public/language/cs/topic.json
+++ b/public/language/cs/topic.json
@@ -18,7 +18,6 @@
    "restore": "Restore",
    "move": "Přesunout",
    "fork": "Rozdělit",
-    "banned": "banned",
    "link": "Odkaz",
    "share": "Sdílet",
    "tools": "Nástroje",
@@ -28,15 +27,17 @@
    "flag_title": "Flag this post for moderation",
    "flag_confirm": "Are you sure you want to flag this post?",
    "flag_success": "This post has been flagged for moderation.",
-    "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
+    "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
    "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
    "not_following_topic.message": "You will no longer receive notifications from this topic.",
    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
    "markAsUnreadForAll.success": "Topic marked as unread for all.",
    "watch": "Watch",
+    "unwatch": "Unwatch",
    "watch.title": "Be notified of new replies in this topic",
+    "unwatch.title": "Stop watching this topic",
    "share_this_post": "Share this Post",
-    "thread_tools.title": "Nástroje",
+    "thread_tools.title": "Topic Tools",
    "thread_tools.markAsUnreadForAll": "Označit jako nepřečtené",
    "thread_tools.pin": "Pin Topic",
    "thread_tools.unpin": "Unpin Topic",
@@ -46,11 +47,11 @@
    "thread_tools.move_all": "Move All",
    "thread_tools.fork": "Fork Topic",
    "thread_tools.delete": "Delete Topic",
-    "thread_tools.delete_confirm": "Are you sure you want to delete this thread?",
+    "thread_tools.delete_confirm": "Are you sure you want to delete this topic?",
    "thread_tools.restore": "Restore Topic",
-    "thread_tools.restore_confirm": "Are you sure you want to restore this thread?",
+    "thread_tools.restore_confirm": "Are you sure you want to restore this topic?",
    "thread_tools.purge": "Purge Topic",
-    "thread_tools.purge_confirm": "Are you sure you want to purge this thread?",
+    "thread_tools.purge_confirm": "Are you sure you want to purge this topic?",
    "topic_move_success": "This topic has been successfully moved to %1",
    "post_delete_confirm": "Are you sure you want to delete this post?",
    "post_restore_confirm": "Are you sure you want to restore this post?",
@@ -71,7 +72,7 @@
    "topic_will_be_moved_to": "Toto téma bude přesunuto do kategorie",
    "fork_topic_instruction": "Vyber příspěvky, které chceš oddělit",
    "fork_no_pids": "Žádné příspěvky nebyly vybrány!",
-    "fork_success": "Téma bylo úspěšně rozděleno!",
+    "fork_success": "Successfully forked topic! Click here to go to the forked topic.",
    "composer.title_placeholder": "Enter your topic title here...",
    "composer.discard": "Discard",
    "composer.submit": "Submit",
--- a/public/language/cs/user.json
+++ b/public/language/cs/user.json
@@ -4,6 +4,8 @@
    "username": "Uživatelské jméno",
    "email": "Email",
    "confirm_email": "Confirm Email",
+    "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.",
    "fullname": "Jméno a příjmení",
    "website": "Webové stránky",
    "location": "Poloha",
@@ -27,6 +29,7 @@
    "edit": "Upravit",
    "uploaded_picture": "Nahraný obrázek",
    "upload_new_picture": "Nahrát nový obrázek",
+    "upload_new_picture_from_url": "Upload New Picture From URL",
    "current_password": "Current Password",
    "change_password": "Změnit heslo",
    "change_password_error": "Invalid Password!",
@@ -44,12 +47,14 @@
    "max": "max.",
    "settings": "Nastavení",
    "show_email": "Zobrazovat můj email v profilu",
+    "show_fullname": "Show My Full Name",
    "digest_label": "Subscribe to Digest",
    "digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule",
    "digest_off": "Off",
    "digest_daily": "Daily",
    "digest_weekly": "Weekly",
    "digest_monthly": "Monthly",
+    "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
    "has_no_follower": "Tohoto uživatele nikdo nesleduje :(",
    "follows_no_one": "Tento uživatel nikoho nesleduje :(",
    "has_no_posts": "This user didn't post anything yet.",
@@ -61,5 +66,7 @@
    "posts_per_page": "Posts per Page",
    "notification_sounds": "Play a sound when you receive a notification.",
    "browsing": "Browsing Settings",
-    "open_links_in_new_tab": "Open outgoing links in new tab?"
+    "open_links_in_new_tab": "Open outgoing links in new tab?",
+    "follow_topics_you_reply_to": "Follow topics that you reply to.",
+    "follow_topics_you_create": "Follow topics you create."
 }
--- a/public/language/cs/users.json
+++ b/public/language/cs/users.json
@@ -5,6 +5,5 @@
    "search": "Vyhledávat",
    "enter_username": "Zadej uživatelské jméno k hledání",
    "load_more": "Načíst další",
-    "user-not-found": "User not found!",
    "users-found-search-took": "%1 user(s) found! Search took %2 ms."
 }
--- a/public/language/de/category.json
+++ b/public/language/de/category.json
@@ -3,5 +3,6 @@
    "no_topics": "<strong>Es gibt noch keine Themen in dieser Kategorie.</strong><br />Warum beginnst du nicht das erste?",
    "browsing": "Aktiv",
    "no_replies": "Niemand hat geantwortet",
-    "share_this_category": "Teile diese Kategorie"
+    "share_this_category": "Teile diese Kategorie",
+    "ignore": "Ignorieren"
 }
--- a/public/language/de/email.json
+++ b/public/language/de/email.json
@@ -9,12 +9,15 @@
    "reset.text1": "Wir haben eine Anfrage auf Zurücksetzung deines Passworts erhalten, wahrscheinlich, weil du es vergessen hast. Falls dies nicht der Fall ist, ignoriere bitte diese E-Mail.",
    "reset.text2": "Klicke bitte auf den folgenden Link, um mit der Zurücksetzung deines Passworts fortzufahren:",
    "reset.cta": "Klicke hier, um dein Passwort zurückzusetzen",
-    "digest.notifications": "Du hast einige ungelesene Benachrichtigungen vom %1:",
+    "digest.notifications": "You have unread notifications from %1:",
    "digest.latest_topics": "Aktuellste Themen vom %1",
    "digest.cta": "Klicke hier, um %1 zu besuchen",
    "digest.unsub.info": "Diese Zusammenfassung wurde dir aufgrund deiner Abonnement-Einstellungen gesendet.",
-    "digest.unsub.cta": "Klicke hier, um diese Einstellungen zu ändern",
    "digest.daily.no_topics": "Es gab heute keine aktiven Themen",
+    "notif.chat.subject": "Neue Chatnachricht von %1 erhalten",
+    "notif.chat.cta": "Klicke hier, um die Unterhaltung fortzusetzen",
+    "notif.chat.unsub.info": "Diese Chat-Benachrichtigung wurde dir aufgrund deiner Abonnement-Einstellungen gesendet.",
    "test.text1": "Dies ist eine Test-E-Mail, um zu überprüfen, ob der E-Mailer deines NodeBB korrekt eingestellt wurde.",
+    "unsub.cta": "Klicke hier, um diese Einstellungen zu ändern.",
    "closing": "Danke!"
 }
--- a/public/language/de/error.json
+++ b/public/language/de/error.json
@@ -12,45 +12,53 @@
    "invalid-title": "Ungültiger Titel",
    "invalid-user-data": "Ungültige Benutzerdaten",
    "invalid-password": "Ungültiges Passwort",
+    "invalid-username-or-password": "Bitte gebe einen Benutzernamen und ein Passwort an",
+    "invalid-search-term": "Ungültige Suchanfrage",
    "invalid-pagination-value": "Die Nummerierung ist ungültig",
    "username-taken": "Der Benutzername ist bereits vergeben",
    "email-taken": "Die E-Mail-Adresse ist bereits vergeben",
-    "email-not-confirmed": "Deine E-Mail wurde noch nicht bestätigt. Bitte klicke hier, um deine E-Mail zu bestätigen.",
+    "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.",
    "username-too-short": "Benutzername ist zu kurz",
+    "username-too-long": "Der Benutzername ist zu lang",
    "user-banned": "Der Benutzer ist gesperrt",
-    "no-category": "Die Kategorie existiert nicht",
-    "no-topic": "Das Thema existiert nicht",
-    "no-post": "Der Beitrag existiert nicht",
-    "no-group": "Die Gruppe existiert nicht",
-    "no-user": "Der Benutzer existiert nicht",
-    "no-teaser": "Kurztext existiert nicht",
-    "no-privileges": "Du verfügst nicht über ausreichende Berechtigungen, um die Aktion durchzuführen.",
+    "user-too-new": "Sorry, you are required to wait %1 seconds before making your first post",
+    "no-category": "Category does not exist",
+    "no-topic": "Topic does not exist",
+    "no-post": "Post does not exist",
+    "no-group": "Group does not exist",
+    "no-user": "User does not exist",
+    "no-teaser": "Teaser does not exist",
+    "no-privileges": "You do not have enough privileges for this action.",
    "no-emailers-configured": "Es wurde keine E-Mail-Plugins geladen, weshalb eine Test-E-Mail nicht gesendet werden konnte.",
    "category-disabled": "Kategorie ist deaktiviert",
    "topic-locked": "Thema ist gesperrt",
    "still-uploading": "Bitte warte bis der Vorgang abgeschlossen ist.",
-    "content-too-short": "Der Beitrag muss mindestens %1 Zeichen enthalten.",
-    "title-too-short": "Der Titel muss mindestens %1 Zeichen enthalten.",
+    "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.",
+    "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.",
    "title-too-long": "Der Titel darf maximal %1 Zeichen enthalten.",
-    "too-many-posts": "Du kannst maximal alle %1 Sekunden einen Beitrag erstellen.",
-    "file-too-big": "Die maximale Dateigröße beträgt %1 kbs",
+    "too-many-posts": "You can only post once every %1 seconds - please wait before posting again",
+    "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file",
    "cant-vote-self-post": "Du kannst deinen eigenen Beitrag nicht bewerten.",
-    "already-favourited": "Dieser Beitrag ist bereits in deinen Favoriten enthalten",
-    "already-unfavourited": "Du hast diesen Beitrag bereits aus deinen Favoriten entfernt",
+    "already-favourited": "You have already favourited this post",
+    "already-unfavourited": "You have already unfavourited this post",
    "cant-ban-other-admins": "Du kannst andere Administratoren nicht sperren!",
    "invalid-image-type": "Ungültiger Bildtyp",
    "group-name-too-short": "Gruppenname zu kurz",
    "group-already-exists": "Gruppe existiert bereits",
    "group-name-change-not-allowed": "Du kannst den Namen der Gruppe nicht ändern",
-    "post-already-deleted": "Beitrag wurde bereits gelöscht",
-    "post-already-restored": "Der Beitrag wurde bereits wiederhergestellt",
-    "topic-already-deleted": "Das Thema wurde bereits gelöscht",
-    "topic-already-restored": "Das Thema wurde bereits wiederhergestellt",
+    "post-already-deleted": "This post has already been deleted",
+    "post-already-restored": "This post has already been restored",
+    "topic-already-deleted": "This topic has already been deleted",
+    "topic-already-restored": "This topic has already been restored",
    "topic-thumbnails-are-disabled": "Vorschaubilder für Themen sind deaktiviert",
    "invalid-file": "Datei ungültig",
    "uploads-are-disabled": "Uploads sind deaktiviert",
    "upload-error": "Upload-Fehler: %1",
-    "signature-too-long": "Die Signatur darf maximal %1 Zeichen enthalten!",
+    "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.",
    "cant-chat-with-yourself": "Du kannst nicht mit dir selber chatten!",
-    "not-enough-reputation-to-downvote": "Deine Reputation ist zu niedrig, um diesen Beitrag negativ zu bewerten."
+    "reputation-system-disabled": "Das Reputationssystem ist deaktiviert.",
+    "downvoting-disabled": "Downvotes sind deaktiviert.",
+    "not-enough-reputation-to-downvote": "Deine Reputation ist zu niedrig, um diesen Beitrag negativ zu bewerten.",
+    "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post",
+    "reload-failed": "Es ist ein Problem während des Reloads von NodeBB aufgetreten: \"%1\". NodeBB wird weiterhin clientseitige Assets bereitstellen, allerdings solltest du das, was du vor dem Reload gemacht hast, rückgängig machen."
 }
--- a/public/language/de/global.json
+++ b/public/language/de/global.json
@@ -71,5 +71,6 @@
    "guest": "Gast",
    "guests": "Gäste",
    "updated.title": "Forum aktualisiert",
-    "updated.message": "Dieses Forum wurde gerade auf die neueste Version aktualisiert. Klicke hier, um die Seite  neuzuladen."
+    "updated.message": "Dieses Forum wurde gerade auf die neueste Version aktualisiert. Klicke hier, um die Seite  neuzuladen.",
+    "privacy": "Privacy"
 }
--- a/public/language/de/groups.json
+++ b/public/language/de/groups.json
@@ -1,4 +1,5 @@
 {
+    "groups": "Groups",
    "view_group": "Gruppe betrachten",
    "details.title": "Gruppendetails",
    "details.members": "Mitgliederliste",
--- a/public/language/de/modules.json
+++ b/public/language/de/modules.json
@@ -12,6 +12,10 @@
    "chat.message-history": "Nachrichtenverlauf",
    "chat.pop-out": "Chat als Pop-out anzeigen",
    "chat.maximize": "Maximieren",
+    "chat.yesterday": "Gestern",
+    "chat.seven_days": "7 Tage",
+    "chat.thirty_days": "30 Tage",
+    "chat.three_months": "3 Monate",
    "composer.user_said_in": "%1 sagte in %2:",
    "composer.user_said": "%1 sagte:",
    "composer.discard": "Bist du sicher, dass du diesen Post verwerfen möchtest?"
--- a/public/language/de/notifications.json
+++ b/public/language/de/notifications.json
@@ -10,11 +10,15 @@
    "new_notification": "Neue Benachrichtigung",
    "you_have_unread_notifications": "Du hast ungelesene Benachrichtigungen.",
    "new_message_from": "Neue Nachricht von <strong>%1</strong>",
-    "upvoted_your_post": "<strong>%1</strong> hat deinen Beitrag positiv bewertet.",
-    "favourited_your_post": "<strong>%1</strong> favorisiert deinen Beitrag.",
-    "user_flagged_post": "<strong>%1</strong> hat einen Beitrag markiert.",
+    "upvoted_your_post_in": "<strong>%1</strong> hat deinen Beitrag in <strong>%2</strong> positiv bewertet.",
+    "moved_your_post": "<strong>%1</strong> hat deinen Beitrag verschoben.",
+    "moved_your_topic": "<strong>%1</strong> hat dein Thema verschoben.",
+    "favourited_your_post_in": "<strong>%1</strong> hat deinen Beitrag in <strong>%2</strong> favorisiert.",
+    "user_flagged_post_in": "<strong>%1</strong> hat einen Beitrag in </strong>%2</strong> gemeldet",
    "user_posted_to": "<strong>%1</strong> hat auf <strong>%2</strong> geantwortet.",
+    "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
    "user_mentioned_you_in": "<strong>%1</strong> erwähnte dich in <strong>%2</strong>",
+    "user_started_following_you": "<strong>%1</strong> folgt dir jetzt.",
    "email-confirmed": "E-Mail bestätigt",
    "email-confirmed-message": "Vielen Dank für Ihre E-Mail-Validierung. Ihr Konto ist nun vollständig aktiviert.",
    "email-confirm-error": "Es ist ein Fehler aufgetreten ...",
--- a/public/language/de/pages.json
+++ b/public/language/de/pages.json
@@ -5,12 +5,14 @@
    "recent": "Neueste Themen",
    "users": "Registrierte User",
    "notifications": "Benachrichtigungen",
-    "tags": "Topics tagged under \"%1\"",
+    "tags": "Themen markiert unter \"%1\"",
    "user.edit": "Bearbeite \"%1\"",
    "user.following": "Nutzer, die %1 folgt",
    "user.followers": "Nutzer, die %1 folgen",
    "user.posts": "Beiträge von %1",
    "user.topics": "Themen von %1",
    "user.favourites": "Von %1 favorisierte Beiträge",
-    "user.settings": "Benutzer-Einstellungen"
+    "user.settings": "Benutzer-Einstellungen",
+    "maintenance.text": "%1 befindet sich derzeit in der Wartung. Bitte komm später wieder.",
+    "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }
--- a/public/language/de/recent.json
+++ b/public/language/de/recent.json
@@ -4,5 +4,6 @@
    "week": "Woche",
    "month": "Monat",
    "year": "Jahr",
+    "alltime": "Gesamter Zeitraum",
    "no_recent_topics": "Es gibt keine aktuellen Themen."
 }
--- a/public/language/de/search.json
+++ b/public/language/de/search.json
@@ -1,3 +1,4 @@
 {
-    "results_matching": "%1 Ergebniss(e) stimmen mit \"%2\" überein, (%3 Sekunden)"
+    "results_matching": "%1 Ergebniss(e) stimmen mit \"%2\" überein, (%3 Sekunden)",
+    "no-matches": "Keine Beiträge gefunden"
 }
--- a/public/language/de/tags.json
+++ b/public/language/de/tags.json
@@ -2,5 +2,6 @@
    "no_tag_topics": "Es gibt keine Themen mit diesem Tag.",
    "tags": "Tags",
    "enter_tags_here": "Gib hier Tags ein und drück die Eingabetaste nach jedem Tag.",
+    "enter_tags_here_short": "Gib Tags ein...",
    "no_tags": "Es gibt bisher keine Tags."
 }
--- a/public/language/de/topic.json
+++ b/public/language/de/topic.json
@@ -18,7 +18,6 @@
    "restore": "Wiederherstellen",
    "move": "verschieben",
    "fork": "Aufspalten",
-    "banned": "gesperrt",
    "link": "Link",
    "share": "Teilen",
    "tools": "Tools",
@@ -34,9 +33,11 @@
    "login_to_subscribe": "Bitte registrieren oder einloggen um dieses Thema zu abonnieren",
    "markAsUnreadForAll.success": "Thema für Alle als ungelesen markiert.",
    "watch": "Beobachten",
+    "unwatch": "Nicht mehr beobachten",
    "watch.title": "Bei neuen Antworten benachrichtigen",
+    "unwatch.title": "Dieses Thema nicht mehr beobachten",
    "share_this_post": "Diesen Beitrag teilen",
-    "thread_tools.title": "Tools",
+    "thread_tools.title": "Themen-Tools",
    "thread_tools.markAsUnreadForAll": "Als ungelesen markieren",
    "thread_tools.pin": "Thema anpinnen",
    "thread_tools.unpin": "Thema nicht mehr anpinnen",
@@ -46,11 +47,11 @@
    "thread_tools.move_all": "Alle verschieben",
    "thread_tools.fork": "Thema aufspalten",
    "thread_tools.delete": "Thema löschen",
-    "thread_tools.delete_confirm": "Sind Sie sicher, dass Sie dieses Thema löschen möchten?",
+    "thread_tools.delete_confirm": "Bist du sicher, dass du dieses Thema löschen möchtest?",
    "thread_tools.restore": "Thema wiederherstellen",
-    "thread_tools.restore_confirm": "Sind Sie sicher, dass Sie dieses Thema wiederherstellen möchten?",
+    "thread_tools.restore_confirm": "Bist du sicher, dass du dieses Thema wiederherstellen möchtest?",
    "thread_tools.purge": "Thema bereinigen",
-    "thread_tools.purge_confirm": "Sind Sie sicher, dass Sie dieses Thema bereinigen möchten?",
+    "thread_tools.purge_confirm": "Bist du sicher, dass du dieses Thema bereinigen möchtest?",
    "topic_move_success": "Thema wurde erfolgreich zu %1 verschoben.",
    "post_delete_confirm": "Sind Sie sicher, dass Sie diesen Beitrag löschen möchten?",
    "post_restore_confirm": "Sind Sie sicher, dass Sie diesen Beitrag wiederherstellen möchten?",
@@ -71,7 +72,7 @@
    "topic_will_be_moved_to": "Dieses Thema wird verschoben nach",
    "fork_topic_instruction": "Klicke auf die Beiträge, die du aufspalten willst",
    "fork_no_pids": "Keine Beiträge ausgewählt!",
-    "fork_success": "Thema erfolgreich aufgespalten!",
+    "fork_success": "Successfully forked topic! Click here to go to the forked topic.",
    "composer.title_placeholder": "Hier den Titel des Themas eingeben...",
    "composer.discard": "Verwerfen",
    "composer.submit": "Absenden",
@@ -87,7 +88,7 @@
    "more_users_and_guests": "%1 weitere(r) Nutzer und %2 Gäste",
    "more_users": "%1 weitere(r) Nutzer",
    "more_guests": "%1 weitere Gäste",
-    "users_and_others": "%1 and %2 others",
+    "users_and_others": "%1 und %2 andere",
    "sort_by": "Sortieren nach",
    "oldest_to_newest": "Älteste zuerst",
    "newest_to_oldest": "Neuster zuerst",
--- a/public/language/de/user.json
+++ b/public/language/de/user.json
@@ -4,6 +4,8 @@
    "username": "Nutzername",
    "email": "E-Mail",
    "confirm_email": "E-Mail bestätigen",
+    "delete_account": "Konto löschen",
+    "delete_account_confirm": "Bist du sicher, dass du dein Konto löschen möchtest? <br /><strong>Diese Aktion kann nicht rückgängig gemacht werden und du kannst deine Daten nicht wiederherstellen</strong><br /><br />Gebe deinen Benutzernamen ein, um zu bestätigen, dass du dieses Konto löschen möchtest.",
    "fullname": "Kompletter Name",
    "website": "Homepage",
    "location": "Wohnort",
@@ -27,6 +29,7 @@
    "edit": "Ändern",
    "uploaded_picture": "Hochgeladene Bilder",
    "upload_new_picture": "Neues Bild hochladen",
+    "upload_new_picture_from_url": "Neues Bild von URL hochladen",
    "current_password": "Aktuelles Passwort",
    "change_password": "Passwort ändern",
    "change_password_error": "Ungültiges Passwort!",
@@ -44,12 +47,14 @@
    "max": "max.",
    "settings": "Einstellungen",
    "show_email": "Zeige meine E-Mail Adresse an.",
+    "show_fullname": "Show My Full Name",
    "digest_label": "Auszug abonnieren",
    "digest_description": "Abonniere E-Mail-Benachrichtigungen für dieses Forum (neue Benachrichtigungen und Themen) nach einem festen Zeitplan.",
    "digest_off": "Aus",
    "digest_daily": "Täglich",
    "digest_weekly": "Wöchentlich",
    "digest_monthly": "Monatlich",
+    "send_chat_notifications": "Sende eine E-Mail, wenn eine neue Chat-Nachricht eingeht und ich nicht online bin",
    "has_no_follower": "Dieser User hat noch keine Follower.",
    "follows_no_one": "Dieser User folgt noch niemandem :(",
    "has_no_posts": "Dieser Nutzer hat noch nichts gepostet.",
@@ -61,5 +66,7 @@
    "posts_per_page": "Beiträge pro Seite",
    "notification_sounds": "Ton abspielen, wenn ich eine Benachrichtigung erhalte.",
    "browsing": "Browser Einstellungen",
-    "open_links_in_new_tab": "Externe Links in neuem Tab öffnen?"
+    "open_links_in_new_tab": "Externe Links in neuem Tab öffnen?",
+    "follow_topics_you_reply_to": "Folge Themen, auf die du antwortest.",
+    "follow_topics_you_create": "Folge Themen, die du erstellst."
 }
--- a/public/language/de/users.json
+++ b/public/language/de/users.json
@@ -5,6 +5,5 @@
    "search": "Suchen",
    "enter_username": "Benutzer durchsuchen",
    "load_more": "mehr laden",
-    "user-not-found": "Benutzer nicht gefunden!",
    "users-found-search-took": "%1 Benutzer gefunden! Die Suche dauerte %2 ms."
 }
--- a/public/language/en@pirate/category.json
+++ b/public/language/en@pirate/category.json
@@ -3,5 +3,6 @@
    "no_topics": "<strong>Thar be no topics in 'tis category.</strong><br />Why don't ye give a go' postin' one?",
    "browsing": "browsin'",
    "no_replies": "No one has replied to ye message",
-    "share_this_category": "Share this category"
+    "share_this_category": "Share this category",
+    "ignore": "Ignore"
 }
--- a/public/language/en@pirate/email.json
+++ b/public/language/en@pirate/email.json
@@ -9,12 +9,15 @@
    "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",
-    "digest.notifications": "You have some unread notifications from %1:",
+    "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.unsub.cta": "Click here to alter those settings",
    "digest.daily.no_topics": "There have been no active topics in the past day",
+    "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.",
    "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!"
 }
--- a/public/language/en@pirate/error.json
+++ b/public/language/en@pirate/error.json
@@ -12,45 +12,53 @@
    "invalid-title": "Invalid title!",
    "invalid-user-data": "Invalid User Data",
    "invalid-password": "Invalid Password",
+    "invalid-username-or-password": "Please specify both a username and password",
+    "invalid-search-term": "Invalid search term",
    "invalid-pagination-value": "Invalid pagination value",
    "username-taken": "Username taken",
    "email-taken": "Email taken",
-    "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
+    "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.",
    "username-too-short": "Username too short",
+    "username-too-long": "Username too long",
    "user-banned": "User banned",
-    "no-category": "Category doesn't exist",
-    "no-topic": "Topic doesn't exist",
-    "no-post": "Post doesn't exist",
-    "no-group": "Group doesn't exist",
-    "no-user": "User doesn't exist",
-    "no-teaser": "Teaser doesn't exist",
-    "no-privileges": "You don't have enough privileges for this action.",
+    "user-too-new": "Sorry, you are required to wait %1 seconds before making your first post",
+    "no-category": "Category does not exist",
+    "no-topic": "Topic does not exist",
+    "no-post": "Post does not exist",
+    "no-group": "Group does not exist",
+    "no-user": "User does not exist",
+    "no-teaser": "Teaser does not exist",
+    "no-privileges": "You do not have enough privileges for this action.",
    "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
    "category-disabled": "Category disabled",
    "topic-locked": "Topic Locked",
    "still-uploading": "Please wait for uploads to complete.",
-    "content-too-short": "Please enter a longer post. At least %1 characters.",
-    "title-too-short": "Please enter a longer title. At least %1 characters.",
+    "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.",
+    "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.",
    "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.",
-    "too-many-posts": "You can only post every %1 seconds.",
-    "file-too-big": "Maximum allowed file size is %1 kbs",
+    "too-many-posts": "You can only post once every %1 seconds - please wait before posting again",
+    "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file",
    "cant-vote-self-post": "You cannot vote for your own post",
-    "already-favourited": "You already favourited this post",
-    "already-unfavourited": "You already unfavourited this post",
+    "already-favourited": "You have already favourited this post",
+    "already-unfavourited": "You have already unfavourited this post",
    "cant-ban-other-admins": "You can't ban other admins!",
    "invalid-image-type": "Invalid image type",
    "group-name-too-short": "Group name too short",
    "group-already-exists": "Group already exists",
    "group-name-change-not-allowed": "Group name change not allowed",
-    "post-already-deleted": "Post already deleted",
-    "post-already-restored": "Post already restored",
-    "topic-already-deleted": "Topic already deleted",
-    "topic-already-restored": "Topic already restored",
+    "post-already-deleted": "This post has already been deleted",
+    "post-already-restored": "This post has already been restored",
+    "topic-already-deleted": "This topic has already been deleted",
+    "topic-already-restored": "This topic has already been restored",
    "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.",
    "invalid-file": "Invalid File",
    "uploads-are-disabled": "Uploads are disabled",
    "upload-error": "Upload Error : %1",
-    "signature-too-long": "Signature can't be longer than %1 characters!",
+    "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.",
    "cant-chat-with-yourself": "You can't chat with yourself!",
-    "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+    "reputation-system-disabled": "Reputation system is disabled.",
+    "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",
+    "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@pirate/global.json
+++ b/public/language/en@pirate/global.json
@@ -71,5 +71,6 @@
    "guest": "Guest",
    "guests": "Guests",
    "updated.title": "Forum Updated",
-    "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page."
+    "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page.",
+    "privacy": "Privacy"
 }
--- a/public/language/en@pirate/groups.json
+++ b/public/language/en@pirate/groups.json
@@ -1,4 +1,5 @@
 {
+    "groups": "Groups",
    "view_group": "View Group",
    "details.title": "Group Details",
    "details.members": "Member List",
--- a/public/language/en@pirate/modules.json
+++ b/public/language/en@pirate/modules.json
@@ -12,6 +12,10 @@
    "chat.message-history": "Message History",
    "chat.pop-out": "Pop out chat",
    "chat.maximize": "Maximize",
+    "chat.yesterday": "Yesterday",
+    "chat.seven_days": "7 Days",
+    "chat.thirty_days": "30 Days",
+    "chat.three_months": "3 Months",
    "composer.user_said_in": "%1 said in %2:",
    "composer.user_said": "%1 said:",
    "composer.discard": "Are you sure you wish to discard this post?"
--- a/public/language/en@pirate/notifications.json
+++ b/public/language/en@pirate/notifications.json
@@ -10,11 +10,15 @@
    "new_notification": "New Notification",
    "you_have_unread_notifications": "You have unread notifications.",
    "new_message_from": "New message from <strong>%1</strong>",
-    "upvoted_your_post": "<strong>%1</strong> has upvoted your post.",
-    "favourited_your_post": "<strong>%1</strong> has favourited your post.",
-    "user_flagged_post": "<strong>%1</strong> flagged a post.",
+    "upvoted_your_post_in": "<strong>%1</strong> has upvoted your post in <strong>%2</strong>.",
+    "moved_your_post": "<strong>%1</strong> has moved your post.",
+    "moved_your_topic": "<strong>%1</strong> has moved your topic.",
+    "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
+    "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
    "user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
+    "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.",
    "email-confirmed": "Email Confirmed",
    "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
    "email-confirm-error": "An error occurred...",
--- a/public/language/en@pirate/pages.json
+++ b/public/language/en@pirate/pages.json
@@ -12,5 +12,7 @@
    "user.posts": "Posts made by %1",
    "user.topics": "Topics created by %1",
    "user.favourites": "%1's Favourite Posts",
-    "user.settings": "User Settings"
+    "user.settings": "User Settings",
+    "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
+    "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }
--- a/public/language/en@pirate/recent.json
+++ b/public/language/en@pirate/recent.json
@@ -4,5 +4,6 @@
    "week": "Week",
    "month": "Month",
    "year": "Year",
+    "alltime": "All Time",
    "no_recent_topics": "There be no recent topics."
 }
--- a/public/language/en@pirate/search.json
+++ b/public/language/en@pirate/search.json
@@ -1,3 +1,4 @@
 {
-    "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+    "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+    "no-matches": "No posts found"
 }
--- a/public/language/en@pirate/tags.json
+++ b/public/language/en@pirate/tags.json
@@ -2,5 +2,6 @@
    "no_tag_topics": "There are no topics with this tag.",
    "tags": "Tags",
    "enter_tags_here": "Enter tags here. Press enter after each tag.",
+    "enter_tags_here_short": "Enter tags...",
    "no_tags": "There are no tags yet."
 }
--- a/public/language/en@pirate/topic.json
+++ b/public/language/en@pirate/topic.json
@@ -18,7 +18,6 @@
    "restore": "Restore",
    "move": "Move",
    "fork": "Fork",
-    "banned": "banned",
    "link": "Link",
    "share": "Share",
    "tools": "Tools",
@@ -28,15 +27,17 @@
    "flag_title": "Flag this post for moderation",
    "flag_confirm": "Are you sure you want to flag this post?",
    "flag_success": "This post has been flagged for moderation.",
-    "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
+    "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
    "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
    "not_following_topic.message": "You will no longer receive notifications from this topic.",
    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
    "markAsUnreadForAll.success": "Topic marked as unread for all.",
    "watch": "Watch",
+    "unwatch": "Unwatch",
    "watch.title": "Be notified of new replies in this topic",
+    "unwatch.title": "Stop watching this topic",
    "share_this_post": "Share this Post",
-    "thread_tools.title": "Thread Tools",
+    "thread_tools.title": "Topic Tools",
    "thread_tools.markAsUnreadForAll": "Mark Unread",
    "thread_tools.pin": "Pin Topic",
    "thread_tools.unpin": "Unpin Topic",
@@ -46,11 +47,11 @@
    "thread_tools.move_all": "Move All",
    "thread_tools.fork": "Fork Topic",
    "thread_tools.delete": "Delete Topic",
-    "thread_tools.delete_confirm": "Are you sure you want to delete this thread?",
+    "thread_tools.delete_confirm": "Are you sure you want to delete this topic?",
    "thread_tools.restore": "Restore Topic",
-    "thread_tools.restore_confirm": "Are you sure you want to restore this thread?",
+    "thread_tools.restore_confirm": "Are you sure you want to restore this topic?",
    "thread_tools.purge": "Purge Topic",
-    "thread_tools.purge_confirm": "Are you sure you want to purge this thread?",
+    "thread_tools.purge_confirm": "Are you sure you want to purge this topic?",
    "topic_move_success": "This topic has been successfully moved to %1",
    "post_delete_confirm": "Are you sure you want to delete this post?",
    "post_restore_confirm": "Are you sure you want to restore this post?",
@@ -71,7 +72,7 @@
    "topic_will_be_moved_to": "This topic will be moved to the category",
    "fork_topic_instruction": "Click the posts you want to fork",
    "fork_no_pids": "No posts selected!",
-    "fork_success": "Succesfully forked topic!",
+    "fork_success": "Successfully forked topic! Click here to go to the forked topic.",
    "composer.title_placeholder": "Enter your topic title here...",
    "composer.discard": "Discard",
    "composer.submit": "Submit",
--- a/public/language/en@pirate/user.json
+++ b/public/language/en@pirate/user.json
@@ -4,6 +4,8 @@
    "username": "User Name",
    "email": "Email",
    "confirm_email": "Confirm Email",
+    "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.",
    "fullname": "Full Name",
    "website": "Website",
    "location": "Location",
@@ -27,6 +29,7 @@
    "edit": "Edit",
    "uploaded_picture": "Uploaded Picture",
    "upload_new_picture": "Upload New Picture",
+    "upload_new_picture_from_url": "Upload New Picture From URL",
    "current_password": "Current Password",
    "change_password": "Change Password",
    "change_password_error": "Invalid Password!",
@@ -44,12 +47,14 @@
    "max": "max.",
    "settings": "Settings",
    "show_email": "Show My Email",
+    "show_fullname": "Show My Full Name",
    "digest_label": "Subscribe to Digest",
    "digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule",
    "digest_off": "Off",
    "digest_daily": "Daily",
    "digest_weekly": "Weekly",
    "digest_monthly": "Monthly",
+    "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
    "has_no_follower": "This user doesn't have any followers :(",
    "follows_no_one": "This user isn't following anyone :(",
    "has_no_posts": "This user didn't post anything yet.",
@@ -61,5 +66,7 @@
    "posts_per_page": "Posts per Page",
    "notification_sounds": "Play a sound when you receive a notification.",
    "browsing": "Browsing Settings",
-    "open_links_in_new_tab": "Open outgoing links in new tab?"
+    "open_links_in_new_tab": "Open outgoing links in new tab?",
+    "follow_topics_you_reply_to": "Follow topics that you reply to.",
+    "follow_topics_you_create": "Follow topics you create."
 }
--- a/public/language/en@pirate/users.json
+++ b/public/language/en@pirate/users.json
@@ -5,6 +5,5 @@
    "search": "Search",
    "enter_username": "Gimme y'er handle",
    "load_more": "Load More",
-    "user-not-found": "User not found!",
    "users-found-search-took": "%1 user(s) found! Search took %2 ms."
 }
--- a/public/language/en_GB/category.json
+++ b/public/language/en_GB/category.json
@@ -5,5 +5,6 @@
 	"browsing": "browsing",
 	"no_replies": "No one has replied",

-	"share_this_category": "Share this category"
+	"share_this_category": "Share this category",
+	"ignore": "Ignore"
 }
--- a/public/language/en_GB/email.json
+++ b/public/language/en_GB/email.json
@@ -13,14 +13,19 @@
 	"reset.text2": "To continue with the password reset, please click on the following link:",
 	"reset.cta": "Click here to reset your password",

-	"digest.notifications": "You have some unread notifications from %1:",
+	"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.unsub.cta": "Click here to alter those settings",
 	"digest.daily.no_topics": "There have been no active topics in the past day",

+	"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.",
+
 	"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!"
 }
--- a/public/language/en_GB/error.json
+++ b/public/language/en_GB/error.json
@@ -15,24 +15,28 @@
 	"invalid-title": "Invalid title",
 	"invalid-user-data": "Invalid User Data",
 	"invalid-password": "Invalid Password",
+	"invalid-username-or-password": "Please specify both a username and password",
+	"invalid-search-term": "Invalid search term",

 	"invalid-pagination-value": "Invalid pagination value",

 	"username-taken": "Username taken",
 	"email-taken": "Email taken",
-	"email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
+	"email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.",

 	"username-too-short": "Username too short",
+	"username-too-long": "Username too long",

 	"user-banned": "User banned",
+	"user-too-new": "Sorry, you are required to wait %1 seconds before making your first post",

-	"no-category": "Category doesn't exist",
-	"no-topic": "Topic doesn't exist",
-	"no-post": "Post doesn't exist",
-	"no-group": "Group doesn't exist",
-	"no-user": "User doesn't exist",
-	"no-teaser": "Teaser doesn't exist",
-	"no-privileges": "You don't have enough privileges for this action.",
+	"no-category": "Category does not exist",
+	"no-topic": "Topic does not exist",
+	"no-post": "Post does not exist",
+	"no-group": "Group does not exist",
+	"no-user": "User does not exist",
+	"no-teaser": "Teaser does not exist",
+	"no-privileges": "You do not have enough privileges for this action.",
 	"no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",

 	"category-disabled": "Category disabled",
@@ -40,16 +44,16 @@
 	"topic-locked": "Topic Locked",

 	"still-uploading": "Please wait for uploads to complete.",
-	"content-too-short": "Please enter a longer post. At least %1 characters.",
-	"title-too-short": "Please enter a longer title. At least %1 characters.",
+	"content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.",
+	"title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.",
 	"title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.",
 	"invalid-title": "Invalid title!",
-	"too-many-posts": "You can only post every %1 seconds.",
-	"file-too-big": "Maximum allowed file size is %1 kbs",
+	"too-many-posts": "You can only post once every %1 seconds - please wait before posting again",
+	"file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file",

 	"cant-vote-self-post": "You cannot vote for your own post",
-	"already-favourited": "You already favourited this post",
-	"already-unfavourited": "You already unfavourited this post",
+	"already-favourited": "You have already favourited this post",
+	"already-unfavourited": "You have already unfavourited this post",

 	"cant-ban-other-admins": "You can't ban other admins!",

@@ -59,21 +63,25 @@
 	"group-already-exists": "Group already exists",
 	"group-name-change-not-allowed": "Group name change not allowed",

-	"post-already-deleted": "Post already deleted",
-	"post-already-restored": "Post already restored",
-
-	"topic-already-deleted": "Topic already deleted",
-	"topic-already-restored": "Topic already restored",
+	"post-already-deleted": "This post has already been deleted",
+	"post-already-restored": "This post has already been restored",

+	"topic-already-deleted": "This topic has already been deleted",
+	"topic-already-restored": "This topic has already been restored",

 	"topic-thumbnails-are-disabled": "Topic thumbnails are disabled.",
 	"invalid-file": "Invalid File",
 	"uploads-are-disabled": "Uploads are disabled",
 	"upload-error": "Upload Error : %1",

-	"signature-too-long" : "Signature can't be longer than %1 characters!",
+	"signature-too-long" : "Sorry, your signature cannot be longer than %1 characters.",

 	"cant-chat-with-yourself": "You can't chat with yourself!",

-	"not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+	"reputation-system-disabled": "Reputation system is disabled.",
+	"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",
+
+	"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
@@ -94,5 +94,7 @@
 	"guests": "Guests",

 	"updated.title": "Forum Updated",
-	"updated.message": "This forum has just been updated to the latest version. Click here to refresh the page."
+	"updated.message": "This forum has just been updated to the latest version. Click here to refresh the page.",
+
+	"privacy": "Privacy"
 }
--- a/public/language/en_GB/groups.json
+++ b/public/language/en_GB/groups.json
@@ -1,4 +1,5 @@
 {
+	"groups": "Groups",
 	"view_group": "View Group",

 	"details.title": "Group Details",
--- a/public/language/en_GB/modules.json
+++ b/public/language/en_GB/modules.json
@@ -12,6 +12,10 @@
 	"chat.message-history": "Message History",
 	"chat.pop-out": "Pop out chat",
 	"chat.maximize": "Maximize",
+	"chat.yesterday": "Yesterday",
+	"chat.seven_days": "7 Days",
+	"chat.thirty_days": "30 Days",
+	"chat.three_months": "3 Months",

 	"composer.user_said_in": "%1 said in %2:",
 	"composer.user_said": "%1 said:",
--- a/public/language/en_GB/notifications.json
+++ b/public/language/en_GB/notifications.json
@@ -12,11 +12,15 @@
 	"you_have_unread_notifications": "You have unread notifications.",

 	"new_message_from": "New message from <strong>%1</strong>",
-	"upvoted_your_post": "<strong>%1</strong> has upvoted your post.",
-	"favourited_your_post": "<strong>%1</strong> has favourited your post.",
-	"user_flagged_post": "<strong>%1</strong> flagged a post.",
+	"upvoted_your_post_in": "<strong>%1</strong> has upvoted your post in <strong>%2</strong>.",
+	"moved_your_post": "<strong>%1</strong> has moved your post.",
+	"moved_your_topic": "<strong>%1</strong> has moved your topic.",
+	"favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
+	"user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
 	"user_posted_to" : "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
+	"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.",

 	"email-confirmed": "Email Confirmed",
 	"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
--- a/public/language/en_GB/pages.json
+++ b/public/language/en_GB/pages.json
@@ -12,5 +12,8 @@
 	"user.posts": "Posts made by %1",
 	"user.topics": "Topics created by %1",
 	"user.favourites": "%1's Favourite Posts",
-	"user.settings": "User Settings"
+	"user.settings": "User Settings",
+
+	"maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
+	"maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }
--- a/public/language/en_GB/recent.json
+++ b/public/language/en_GB/recent.json
@@ -4,5 +4,6 @@
 	"week": "Week",
 	"month": "Month",
 	"year": "Year",
+	"alltime": "All Time",
 	"no_recent_topics": "There are no recent topics."
 }
--- a/public/language/en_GB/search.json
+++ b/public/language/en_GB/search.json
@@ -1,3 +1,4 @@
 {
-	"results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+	"results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+	"no-matches": "No posts found"
 }
--- a/public/language/en_GB/tags.json
+++ b/public/language/en_GB/tags.json
@@ -2,5 +2,6 @@
 	"no_tag_topics": "There are no topics with this tag.",
 	"tags": "Tags",
 	"enter_tags_here": "Enter tags here. Press enter after each tag.",
+	"enter_tags_here_short": "Enter tags...",
 	"no_tags": "There are no tags yet."
 }
--- a/public/language/en_GB/topic.json
+++ b/public/language/en_GB/topic.json
@@ -21,7 +21,6 @@
 	"restore": "Restore",
 	"move": "Move",
 	"fork": "Fork",
-	"banned": "banned",
 	"link": "Link",
 	"share": "Share",
 	"tools": "Tools",
@@ -33,7 +32,7 @@
 	"flag_title": "Flag this post for moderation",
 	"flag_confirm": "Are you sure you want to flag this post?",
 	"flag_success": "This post has been flagged for moderation.",
-	"deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
+	"deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",

 	"following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
 	"not_following_topic.message": "You will no longer receive notifications from this topic.",
@@ -43,10 +42,12 @@
 	"markAsUnreadForAll.success" : "Topic marked as unread for all.",

 	"watch": "Watch",
+	"unwatch": "Unwatch",
 	"watch.title": "Be notified of new replies in this topic",
+	"unwatch.title": "Stop watching this topic",
 	"share_this_post": "Share this Post",

-	"thread_tools.title": "Thread Tools",
+	"thread_tools.title": "Topic Tools",
 	"thread_tools.markAsUnreadForAll": "Mark Unread",
 	"thread_tools.pin": "Pin Topic",
 	"thread_tools.unpin": "Unpin Topic",
@@ -56,11 +57,11 @@
 	"thread_tools.move_all": "Move All",
 	"thread_tools.fork": "Fork Topic",
 	"thread_tools.delete": "Delete Topic",
-	"thread_tools.delete_confirm": "Are you sure you want to delete this thread?",
+	"thread_tools.delete_confirm": "Are you sure you want to delete this topic?",
 	"thread_tools.restore": "Restore Topic",
-	"thread_tools.restore_confirm": "Are you sure you want to restore this thread?",
+	"thread_tools.restore_confirm": "Are you sure you want to restore this topic?",
 	"thread_tools.purge": "Purge Topic",
-	"thread_tools.purge_confirm" : "Are you sure you want to purge this thread?",
+	"thread_tools.purge_confirm" : "Are you sure you want to purge this topic?",

 	"topic_move_success": "This topic has been successfully moved to %1",

@@ -86,7 +87,7 @@
 	"topic_will_be_moved_to": "This topic will be moved to the category",
 	"fork_topic_instruction": "Click the posts you want to fork",
 	"fork_no_pids": "No posts selected!",
-	"fork_success": "Succesfully forked topic!",
+	"fork_success": "Successfully forked topic! Click here to go to the forked topic.",

 	"composer.title_placeholder": "Enter your topic title here...",
 	"composer.discard": "Discard",
--- a/public/language/en_GB/user.json
+++ b/public/language/en_GB/user.json
@@ -5,6 +5,8 @@

 	"email": "Email",
 	"confirm_email": "Confirm Email",
+	"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.",

 	"fullname": "Full Name",
 	"website": "Website",
@@ -30,6 +32,7 @@
 	"edit": "Edit",
 	"uploaded_picture": "Uploaded Picture",
 	"upload_new_picture": "Upload New Picture",
+	"upload_new_picture_from_url": "Upload New Picture From URL",
 	"current_password": "Current Password",
 	"change_password": "Change Password",
 	"change_password_error": "Invalid Password!",
@@ -49,12 +52,14 @@

 	"settings": "Settings",
 	"show_email": "Show My Email",
+	"show_fullname": "Show My Full Name",
 	"digest_label": "Subscribe to Digest",
 	"digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule",
 	"digest_off": "Off",
 	"digest_daily": "Daily",
 	"digest_weekly": "Weekly",
 	"digest_monthly": "Monthly",
+	"send_chat_notifications": "Send an email if a new chat message arrives and I am not online",

 	"has_no_follower": "This user doesn't have any followers :(",
 	"follows_no_one": "This user isn't following anyone :(",
@@ -71,5 +76,8 @@
 	"notification_sounds" : "Play a sound when you receive a notification.",

 	"browsing": "Browsing Settings",
-	"open_links_in_new_tab": "Open outgoing links in new tab?"
+	"open_links_in_new_tab": "Open outgoing links in new tab?",
+
+	"follow_topics_you_reply_to": "Follow topics that you reply to.",
+	"follow_topics_you_create": "Follow topics you create."
 }
--- a/public/language/en_GB/users.json
+++ b/public/language/en_GB/users.json
@@ -5,6 +5,5 @@
 	"search": "Search",
 	"enter_username": "Enter a username to search",
 	"load_more": "Load More",
-	"user-not-found": "User not found!",
 	"users-found-search-took": "%1 user(s) found! Search took %2 ms."
 }
--- a/public/language/en_US/category.json
+++ b/public/language/en_US/category.json
@@ -3,5 +3,6 @@
    "no_topics": "<strong>There are no topics in this category.</strong><br />Why don't you try posting one?",
    "browsing": "browsing",
    "no_replies": "No one has replied",
-    "share_this_category": "Share this category"
+    "share_this_category": "Share this category",
+    "ignore": "Ignore"
 }
--- a/public/language/en_US/email.json
+++ b/public/language/en_US/email.json
@@ -9,12 +9,15 @@
    "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",
-    "digest.notifications": "You have some unread notifications from %1:",
+    "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.unsub.cta": "Click here to alter those settings",
    "digest.daily.no_topics": "There have been no active topics in the past day",
+    "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.",
    "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!"
 }
--- a/public/language/en_US/error.json
+++ b/public/language/en_US/error.json
@@ -12,45 +12,53 @@
    "invalid-title": "Invalid title!",
    "invalid-user-data": "Invalid User Data",
    "invalid-password": "Invalid Password",
+    "invalid-username-or-password": "Please specify both a username and password",
+    "invalid-search-term": "Invalid search term",
    "invalid-pagination-value": "Invalid pagination value",
    "username-taken": "Username taken",
    "email-taken": "Email taken",
-    "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
+    "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.",
    "username-too-short": "Username too short",
+    "username-too-long": "Username too long",
    "user-banned": "User banned",
-    "no-category": "Category doesn't exist",
-    "no-topic": "Topic doesn't exist",
-    "no-post": "Post doesn't exist",
-    "no-group": "Group doesn't exist",
-    "no-user": "User doesn't exist",
-    "no-teaser": "Teaser doesn't exist",
-    "no-privileges": "You don't have enough privileges for this action.",
+    "user-too-new": "Sorry, you are required to wait %1 seconds before making your first post",
+    "no-category": "Category does not exist",
+    "no-topic": "Topic does not exist",
+    "no-post": "Post does not exist",
+    "no-group": "Group does not exist",
+    "no-user": "User does not exist",
+    "no-teaser": "Teaser does not exist",
+    "no-privileges": "You do not have enough privileges for this action.",
    "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
    "category-disabled": "Category disabled",
    "topic-locked": "Topic Locked",
    "still-uploading": "Please wait for uploads to complete.",
-    "content-too-short": "Please enter a longer post. At least %1 characters.",
-    "title-too-short": "Please enter a longer title. At least %1 characters.",
+    "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.",
+    "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.",
    "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.",
-    "too-many-posts": "You can only post every %1 seconds.",
-    "file-too-big": "Maximum allowed file size is %1 kbs",
+    "too-many-posts": "You can only post once every %1 seconds - please wait before posting again",
+    "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file",
    "cant-vote-self-post": "You cannot vote for your own post",
-    "already-favourited": "You already favorited this post",
-    "already-unfavourited": "You already unfavorited this post",
+    "already-favourited": "You have already favourited this post",
+    "already-unfavourited": "You have already unfavourited this post",
    "cant-ban-other-admins": "You can't ban other admins!",
    "invalid-image-type": "Invalid image type",
    "group-name-too-short": "Group name too short",
    "group-already-exists": "Group already exists",
    "group-name-change-not-allowed": "Group name change not allowed",
-    "post-already-deleted": "Post already deleted",
-    "post-already-restored": "Post already restored",
-    "topic-already-deleted": "Topic already deleted",
-    "topic-already-restored": "Topic already restored",
+    "post-already-deleted": "This post has already been deleted",
+    "post-already-restored": "This post has already been restored",
+    "topic-already-deleted": "This topic has already been deleted",
+    "topic-already-restored": "This topic has already been restored",
    "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.",
    "invalid-file": "Invalid File",
    "uploads-are-disabled": "Uploads are disabled",
    "upload-error": "Upload Error : %1",
-    "signature-too-long": "Signature can't be longer than %1 characters!",
+    "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.",
    "cant-chat-with-yourself": "You can't chat with yourself!",
-    "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+    "reputation-system-disabled": "Reputation system is disabled.",
+    "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",
+    "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_US/global.json
+++ b/public/language/en_US/global.json
@@ -71,5 +71,6 @@
    "guest": "Guest",
    "guests": "Guests",
    "updated.title": "Forum Updated",
-    "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page."
+    "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page.",
+    "privacy": "Privacy"
 }
--- a/public/language/en_US/groups.json
+++ b/public/language/en_US/groups.json
@@ -1,4 +1,5 @@
 {
+    "groups": "Groups",
    "view_group": "View Group",
    "details.title": "Group Details",
    "details.members": "Member List",
--- a/public/language/en_US/modules.json
+++ b/public/language/en_US/modules.json
@@ -12,6 +12,10 @@
    "chat.message-history": "Message History",
    "chat.pop-out": "Pop out chat",
    "chat.maximize": "Maximize",
+    "chat.yesterday": "Yesterday",
+    "chat.seven_days": "7 Days",
+    "chat.thirty_days": "30 Days",
+    "chat.three_months": "3 Months",
    "composer.user_said_in": "%1 said in %2:",
    "composer.user_said": "%1 said:",
    "composer.discard": "Are you sure you wish to discard this post?"
--- a/public/language/en_US/notifications.json
+++ b/public/language/en_US/notifications.json
@@ -10,11 +10,15 @@
    "new_notification": "New Notification",
    "you_have_unread_notifications": "You have unread notifications.",
    "new_message_from": "New message from <strong>%1</strong>",
-    "upvoted_your_post": "<strong>%1</strong> has upvoted your post.",
-    "favourited_your_post": "<strong>%1</strong> has favorited your post.",
-    "user_flagged_post": "<strong>%1</strong> flagged a post.",
+    "upvoted_your_post_in": "<strong>%1</strong> has upvoted your post in <strong>%2</strong>.",
+    "moved_your_post": "<strong>%1</strong> has moved your post.",
+    "moved_your_topic": "<strong>%1</strong> has moved your topic.",
+    "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
+    "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
    "user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
+    "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.",
    "email-confirmed": "Email Confirmed",
    "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
    "email-confirm-error": "An error occurred...",
--- a/public/language/en_US/pages.json
+++ b/public/language/en_US/pages.json
@@ -12,5 +12,7 @@
    "user.posts": "Posts made by %1",
    "user.topics": "Topics created by %1",
    "user.favourites": "%1's Favorite Posts",
-    "user.settings": "User Settings"
+    "user.settings": "User Settings",
+    "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
+    "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }
--- a/public/language/en_US/recent.json
+++ b/public/language/en_US/recent.json
@@ -4,5 +4,6 @@
    "week": "Week",
    "month": "Month",
    "year": "Year",
+    "alltime": "All Time",
    "no_recent_topics": "There are no recent topics."
 }
--- a/public/language/en_US/search.json
+++ b/public/language/en_US/search.json
@@ -1,3 +1,4 @@
 {
-    "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+    "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+    "no-matches": "No posts found"
 }
--- a/public/language/en_US/tags.json
+++ b/public/language/en_US/tags.json
@@ -2,5 +2,6 @@
    "no_tag_topics": "There are no topics with this tag.",
    "tags": "Tags",
    "enter_tags_here": "Enter tags here. Press enter after each tag.",
+    "enter_tags_here_short": "Enter tags...",
    "no_tags": "There are no tags yet."
 }
--- a/public/language/en_US/topic.json
+++ b/public/language/en_US/topic.json
@@ -18,7 +18,6 @@
    "restore": "Restore",
    "move": "Move",
    "fork": "Fork",
-    "banned": "banned",
    "link": "Link",
    "share": "Share",
    "tools": "Tools",
@@ -28,15 +27,17 @@
    "flag_title": "Flag this post for moderation",
    "flag_confirm": "Are you sure you want to flag this post?",
    "flag_success": "This post has been flagged for moderation.",
-    "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
+    "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
    "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
    "not_following_topic.message": "You will no longer receive notifications from this topic.",
    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
    "markAsUnreadForAll.success": "Topic marked as unread for all.",
    "watch": "Watch",
+    "unwatch": "Unwatch",
    "watch.title": "Be notified of new replies in this topic",
+    "unwatch.title": "Stop watching this topic",
    "share_this_post": "Share this Post",
-    "thread_tools.title": "Thread Tools",
+    "thread_tools.title": "Topic Tools",
    "thread_tools.markAsUnreadForAll": "Mark Unread",
    "thread_tools.pin": "Pin Topic",
    "thread_tools.unpin": "Unpin Topic",
@@ -46,11 +47,11 @@
    "thread_tools.move_all": "Move All",
    "thread_tools.fork": "Fork Topic",
    "thread_tools.delete": "Delete Topic",
-    "thread_tools.delete_confirm": "Are you sure you want to delete this thread?",
+    "thread_tools.delete_confirm": "Are you sure you want to delete this topic?",
    "thread_tools.restore": "Restore Topic",
-    "thread_tools.restore_confirm": "Are you sure you want to restore this thread?",
+    "thread_tools.restore_confirm": "Are you sure you want to restore this topic?",
    "thread_tools.purge": "Purge Topic",
-    "thread_tools.purge_confirm": "Are you sure you want to purge this thread?",
+    "thread_tools.purge_confirm": "Are you sure you want to purge this topic?",
    "topic_move_success": "This topic has been successfully moved to %1",
    "post_delete_confirm": "Are you sure you want to delete this post?",
    "post_restore_confirm": "Are you sure you want to restore this post?",
@@ -71,7 +72,7 @@
    "topic_will_be_moved_to": "This topic will be moved to the category",
    "fork_topic_instruction": "Click the posts you want to fork",
    "fork_no_pids": "No posts selected!",
-    "fork_success": "Succesfully forked topic!",
+    "fork_success": "Successfully forked topic! Click here to go to the forked topic.",
    "composer.title_placeholder": "Enter your topic title here...",
    "composer.discard": "Discard",
    "composer.submit": "Submit",
--- a/public/language/en_US/user.json
+++ b/public/language/en_US/user.json
@@ -4,6 +4,8 @@
    "username": "User Name",
    "email": "Email",
    "confirm_email": "Confirm Email",
+    "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.",
    "fullname": "Full Name",
    "website": "Website",
    "location": "Location",
@@ -27,6 +29,7 @@
    "edit": "Edit",
    "uploaded_picture": "Uploaded Picture",
    "upload_new_picture": "Upload New Picture",
+    "upload_new_picture_from_url": "Upload New Picture From URL",
    "current_password": "Current Password",
    "change_password": "Change Password",
    "change_password_error": "Invalid Password!",
@@ -44,12 +47,14 @@
    "max": "max.",
    "settings": "Settings",
    "show_email": "Show My Email",
+    "show_fullname": "Show My Full Name",
    "digest_label": "Subscribe to Digest",
    "digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule",
    "digest_off": "Off",
    "digest_daily": "Daily",
    "digest_weekly": "Weekly",
    "digest_monthly": "Monthly",
+    "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
    "has_no_follower": "This user doesn't have any followers :(",
    "follows_no_one": "This user isn't following anyone :(",
    "has_no_posts": "This user didn't post anything yet.",
@@ -61,5 +66,7 @@
    "posts_per_page": "Posts per Page",
    "notification_sounds": "Play a sound when you receive a notification.",
    "browsing": "Browsing Settings",
-    "open_links_in_new_tab": "Open outgoing links in new tab?"
+    "open_links_in_new_tab": "Open outgoing links in new tab?",
+    "follow_topics_you_reply_to": "Follow topics that you reply to.",
+    "follow_topics_you_create": "Follow topics you create."
 }
--- a/public/language/en_US/users.json
+++ b/public/language/en_US/users.json
@@ -5,6 +5,5 @@
    "search": "Search",
    "enter_username": "Enter a username to search",
    "load_more": "Load More",
-    "user-not-found": "User not found!",
    "users-found-search-took": "%1 user(s) found! Search took %2 ms."
 }
--- a/public/language/es/category.json
+++ b/public/language/es/category.json
@@ -3,5 +3,6 @@
    "no_topics": "<strong>No hay temas en esta categoría.</strong><br />¿Por que no te animas y publicas uno?",
    "browsing": "viendo ahora",
    "no_replies": "Nadie ha respondido aún",
-    "share_this_category": "Compartir esta categoría"
+    "share_this_category": "Compartir esta categoría",
+    "ignore": "Ignorar"
 }
--- a/public/language/es/email.json
+++ b/public/language/es/email.json
@@ -1,20 +1,23 @@
 {
-    "password-reset-requested": "Password Reset Requested - %1!",
-    "welcome-to": "Welcome to %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.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",
-    "digest.notifications": "You have some 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.unsub.cta": "Click here to alter those settings",
-    "digest.daily.no_topics": "There have been no active topics in the past day",
-    "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
-    "closing": "Thanks!"
+    "password-reset-requested": "Reinicio de contraseña solicitado - %1!",
+    "welcome-to": "Bienvenido a %1",
+    "greeting_no_name": "Hola",
+    "greeting_with_name": "Hola %1",
+    "welcome.text1": "Gracias por registrarte con %1!",
+    "welcome.text2": "Para activar completamente tu cuenta, necesitamos verificar que la dirección email con la que te registraste te pertenece.",
+    "welcome.cta": "Cliquea aquí para confirmar tu dirección email.",
+    "reset.text1": "Recibimos una solicitud para reiniciar tu contraseña, posiblemente porque la olvidaste. Si no es así, por favor ignora este email.",
+    "reset.text2": "Para continuar con el reinicio de contraseña, por favor cliquea en el siguiente vínculo:",
+    "reset.cta": "Cliquea aquí para reiniciar tu contraseña",
+    "digest.notifications": "You have unread notifications from %1:",
+    "digest.latest_topics": "Últimos temas de %1",
+    "digest.cta": "Cliquea aquí para visitar %1",
+    "digest.unsub.info": "Este compendio te fue enviado debido a tus ajustes de subscripción.",
+    "digest.daily.no_topics": "No han habido temas activos en el día pasado",
+    "notif.chat.subject": "Nuevo mensaje de chat recibido de %1",
+    "notif.chat.cta": "Haz click aquí para continuar la conversación",
+    "notif.chat.unsub.info": "Esta notificación de chat se te envió debido a tus ajustes de suscripción.",
+    "test.text1": "Este es un email de prueba para verificar que el envío de email está ajustado correctamente para tu NodeBB",
+    "unsub.cta": "Haz click aquí para modificar los ajustes.",
+    "closing": "¡Gracias!"
 }
--- a/Show More
+++ b/Show More