Revert "bumping to 0.5.2 for dev purposes"

This reverts commit e6824fd727.

.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,9 @@ pidfile
 # templates
 /public/templates
 /public/sounds
+
+# compiled files
+/public/stylesheet.css
+/public/admin.css
+/public/nodebb.min.js
+/public/nodebb.min.js.map

.tx/config

@@ -613,4 +613,112 @@ trans.tr = public/language/tr/tags.json
 trans.vi = public/language/vi/tags.json
 trans.zh_CN = public/language/zh_CN/tags.json
 trans.zh_TW = public/language/zh_TW/tags.json
+type = KEYVALUEJSON
+
+[nodebb.email]
+source_file = public/language/en_GB/email.json
+source_lang = en_GB
+trans.ar = public/language/ar/email.json
+trans.cs = public/language/cs/email.json
+trans.de = public/language/de/email.json
+trans.en_US = public/language/en_US/email.json
+trans.en@pirate = public/language/en@pirate/email.json
+trans.es = public/language/es/email.json
+trans.et = public/language/et/email.json
+trans.fa_IR = public/language/fa_IR/email.json
+trans.fi = public/language/fi/email.json
+trans.fr = public/language/fr/email.json
+trans.he = public/language/he/email.json
+trans.hu = public/language/hu/email.json
+trans.it = public/language/it/email.json
+trans.ja = public/language/ja/email.json
+trans.ko = public/language/ko/email.json
+trans.lt = public/language/lt/email.json
+trans.ms = public/language/ms/email.json
+trans.nb = public/language/nb/email.json
+trans.nl = public/language/nl/email.json
+trans.pl = public/language/pl/email.json
+trans.pt_BR = public/language/pt_BR/email.json
+trans.ru = public/language/ru/email.json
+trans.ro = public/language/ro/email.json
+trans.sc = public/language/sc/email.json
+trans.sk = public/language/sk/email.json
+trans.sv = public/language/sv/email.json
+trans.th = public/language/th/email.json
+trans.tr = public/language/tr/email.json
+trans.vi = public/language/vi/email.json
+trans.zh_CN = public/language/zh_CN/email.json
+trans.zh_TW = public/language/zh_TW/email.json
+type = KEYVALUEJSON
+
+[nodebb.search]
+source_file = public/language/en_GB/search.json
+source_lang = en_GB
+trans.ar = public/language/ar/search.json
+trans.cs = public/language/cs/search.json
+trans.de = public/language/de/search.json
+trans.en_US = public/language/en_US/search.json
+trans.en@pirate = public/language/en@pirate/search.json
+trans.es = public/language/es/search.json
+trans.et = public/language/et/search.json
+trans.fa_IR = public/language/fa_IR/search.json
+trans.fi = public/language/fi/search.json
+trans.fr = public/language/fr/search.json
+trans.he = public/language/he/search.json
+trans.hu = public/language/hu/search.json
+trans.it = public/language/it/search.json
+trans.ja = public/language/ja/search.json
+trans.ko = public/language/ko/search.json
+trans.lt = public/language/lt/search.json
+trans.ms = public/language/ms/search.json
+trans.nb = public/language/nb/search.json
+trans.nl = public/language/nl/search.json
+trans.pl = public/language/pl/search.json
+trans.pt_BR = public/language/pt_BR/search.json
+trans.ru = public/language/ru/search.json
+trans.ro = public/language/ro/search.json
+trans.sc = public/language/sc/search.json
+trans.sk = public/language/sk/search.json
+trans.sv = public/language/sv/search.json
+trans.th = public/language/th/search.json
+trans.tr = public/language/tr/search.json
+trans.vi = public/language/vi/search.json
+trans.zh_CN = public/language/zh_CN/search.json
+trans.zh_TW = public/language/zh_TW/search.json
+type = KEYVALUEJSON
+
+[nodebb.groups]
+source_file = public/language/en_GB/groups.json
+source_lang = en_GB
+trans.ar = public/language/ar/groups.json
+trans.cs = public/language/cs/groups.json
+trans.de = public/language/de/groups.json
+trans.en_US = public/language/en_US/groups.json
+trans.en@pirate = public/language/en@pirate/groups.json
+trans.es = public/language/es/groups.json
+trans.et = public/language/et/groups.json
+trans.fa_IR = public/language/fa_IR/groups.json
+trans.fi = public/language/fi/groups.json
+trans.fr = public/language/fr/groups.json
+trans.he = public/language/he/groups.json
+trans.hu = public/language/hu/groups.json
+trans.it = public/language/it/groups.json
+trans.ja = public/language/ja/groups.json
+trans.ko = public/language/ko/groups.json
+trans.lt = public/language/lt/groups.json
+trans.ms = public/language/ms/groups.json
+trans.nb = public/language/nb/groups.json
+trans.nl = public/language/nl/groups.json
+trans.pl = public/language/pl/groups.json
+trans.pt_BR = public/language/pt_BR/groups.json
+trans.ru = public/language/ru/groups.json
+trans.ro = public/language/ro/groups.json
+trans.sc = public/language/sc/groups.json
+trans.sk = public/language/sk/groups.json
+trans.sv = public/language/sv/groups.json
+trans.th = public/language/th/groups.json
+trans.tr = public/language/tr/groups.json
+trans.vi = public/language/vi/groups.json
+trans.zh_CN = public/language/zh_CN/groups.json
+trans.zh_TW = public/language/zh_TW/groups.json
 type = KEYVALUEJSON

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.

README.md

@@ -1,7 +1,8 @@
 # <img alt="NodeBB" src="http://i.imgur.com/mYxPPtB.png" />
-[![Build Status](https://travis-ci.org/NodeBB/NodeBB.svg?branch=master)](https://travis-ci.org/nodebb/nodebb)
+[![Build Status](https://travis-ci.org/NodeBB/NodeBB.svg?branch=master)](https://travis-ci.org/NodeBB/NodeBB)
 [![Dependency Status](https://david-dm.org/nodebb/nodebb.svg)](https://david-dm.org/nodebb/nodebb)
-[![Code Climate](https://codeclimate.com/github/designcreateplay/NodeBB.png)](https://codeclimate.com/github/designcreateplay/NodeBB)
+[![Code Climate](https://codeclimate.com/github/NodeBB/NodeBB/badges/gpa.svg)](https://codeclimate.com/github/NodeBB/NodeBB)
+[![Documentation Status](https://readthedocs.org/projects/nodebb/badge/?version=latest)](https://readthedocs.org/projects/nodebb/?badge=latest)
 
 **NodeBB Forum Software** is powered by Node.js and built on a Redis database. It utilizes web sockets for instant interactions and real-time notifications. NodeBB is compatible down to IE8 and has many modern features out of the box such as social network integration and streaming discussions.
 

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');
 
@@ -99,10 +99,12 @@ 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());
@@ -136,17 +138,44 @@ 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() {
+							// If this callback is called, this means that loader.js is used
+							process.on('message', function(msg) {
+								if (msg === 'bind') {
+									webserver.listen();
+								}
+							});
+							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] Stylesheet propagated to worker ' + cluster.worker.id);
+							break;
+						}
+					});
+					
 					process.on('uncaughtException', function(err) {
 						winston.error(err.message);
 						console.log(err.stack);
@@ -313,6 +342,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);

bcrypt.js

@@ -0,0 +1,30 @@
+
+'use strict';
+
+
+var bcrypt = require('bcryptjs');
+
+process.on('message', function(m) {
+	if (m.type === 'hash') {
+		hash(m.rounds, m.password);
+	} else if (m.type === 'compare') {
+		compare(m.password, m.hash);
+	}
+});
+
+function hash(rounds, password) {
+	bcrypt.genSalt(rounds, function(err, salt) {
+		if (err) {
+			return process.send({type:'hash', err: {message: err.message}});
+		}
+		bcrypt.hash(password, salt, function(err, hash) {
+			process.send({type:'hash', err: err ? {message: err.message} : null, hash: hash, password: password});
+		});
+	});
+}
+
+function compare(password, hash) {
+	bcrypt.compare(password, hash, function(err, res) {
+		process.send({type:'compare', err: err ? {message: err.message} : null, hash: hash, password: password, result: res});
+	});
+}

install/data/defaults.json

@@ -3,10 +3,18 @@
         "field": "title",
         "value": "NodeBB"
     },
+    {
+        "field": "showSiteTitle",
+        "value": "1"
+    },
     {
         "field": "postDelay",
         "value": 10
     },
+    {
+        "field": "initialPostDelay",
+        "value": 10
+    },
     {
         "field": "minimumPostLength",
         "value": 8
@@ -27,6 +35,10 @@
         "field": "allowLocalLogin",
         "value": 1
     },
+    {
+        "field": "allowAccountDelete",
+        "value": 1
+    },
     {
         "field": "allowFileUploads",
         "value": 0
@@ -64,11 +76,11 @@
         "value": 256
     },
     {
-        "field": "chatMessagesToDisplay",
-        "value": 50
+        "field": "profileImageDimension",
+        "value": 128
     },
     {
         "field": "requireEmailConfirmation",
         "value": 0
     }
-]
+]

loader.js

@@ -2,81 +2,209 @@
 
 var	nconf = require('nconf'),
 	fs = require('fs'),
+	path = require('path'),
+	cluster = require('cluster'),
+	async = require('async'),
+	logrotate = require('logrotate-stream'),
 	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,
+	numCPUs,
+	Loader = {
+		timesStarted: 0,
+		shutdown_queue: [],
+		js: {
+			cache: undefined,
+			map: undefined
+		},
+		css: {
+			cache: undefined,
+			acpCache: undefined
+		}
+	};
 
-				timesStarted++;
-				if (startTimer) {
-					clearTimeout(startTimer);
-				}
-				startTimer = setTimeout(resetTimer, 1000*10);
+Loader.init = function() {
+	cluster.setupMaster({
+		exec: "app.js",
+		silent: silent
+	});
 
-				nbb = fork('./app', process.argv.slice(2), {
-					env: process.env
-				});
+	if (silent) {
+		console.log = function(value) {
+			output.write(value + '\n');
+		};
+	}
 
-				nbb.on('message', function(message) {
-					if (message && typeof message === 'object' && message.action) {
-						if (message.action === 'restart') {
-							nbb_restart();
+	cluster.on('fork', function(worker) {
+		worker.on('message', function(message) {
+			if (message && typeof message === 'object' && message.action) {
+				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
+							});
+						}
+
+						worker.send('bind');
+
+						// 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;
+
+						var 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;
+
+						var 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':
+						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.');
+	});
+
+	function notifyWorkers(msg) {
+		Object.keys(cluster.workers).forEach(function(id) {
+			cluster.workers[id].send(msg);
+		});
+	}
+
+	cluster.on('exit', function(worker, code, signal) {
+		if (code !== 0) {
+			if (Loader.timesStarted < numCPUs*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(numCPUs*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();
+	process.on('SIGHUP', Loader.restart);
+
+	Loader.start();
+};
+
+Loader.start = function() {
+	var worker;
+
+	Loader.primaryWorker = 1;
+
+	for(var x=0;x<numCPUs;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);
+		}
+	}
+}
+
+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'
+		});
+	});
+};
+
+
+
+
+nconf.argv().file({
+	file: path.join(__dirname, '/config.json')
+});
+
+numCPUs = nconf.get('cluster') || 1;
+numCPUs = (numCPUs === true) ? require('os').cpus().length : numCPUs;
 
-// 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 +215,9 @@ 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);
 }
+
+Loader.init();

minifier.js

@@ -13,8 +13,10 @@ var uglifyjs = require('uglify-js'),
 	};
 
 /* Javascript */
-Minifier.js.minify = function (scripts, minify, callback) {
-	var options = {};
+Minifier.js.minify = function (scripts, relativePath, minify, callback) {
+	var options = {
+		compress: false
+	};
 
 	scripts = scripts.filter(function(file) {
 		return fs.existsSync(file);
@@ -23,8 +25,8 @@ Minifier.js.minify = function (scripts, minify, callback) {
 	if (!minify) {
 		options.sourceMapURL = '/nodebb.min.js.map';
 		options.outSourceMap = 'nodebb.min.js.map';
+		options.sourceRoot = relativePath;
 		options.mangle = false;
-		options.compress = false;
 		options.prefix = 1;
 	}
 
@@ -56,7 +58,7 @@ 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) {
+		Minifier.js.minify(payload.scripts, payload.relativePath, payload.minify, function(data) {
 			process.stdout.write(data.js);
 			process.send({
 				type: 'end',

nodebb

@@ -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 "$@"
 		;;

package.json

@@ -2,7 +2,7 @@
   "name": "nodebb",
   "license": "GPLv3 or later",
   "description": "NodeBB Forum",
-  "version": "0.5.0-1",
+  "version": "0.5.1",
   "homepage": "http://www.nodebb.org",
   "repository": {
     "type": "git",
@@ -17,30 +17,31 @@
   "dependencies": {
     "async": "~0.9.0",
     "bcryptjs": "~2.0.1",
+    "body-parser": "^1.0.1",
+    "compression": "^1.0.1",
+    "connect-ensure-login": "^0.1.1",
     "connect-flash": "^0.1.1",
+    "connect-multiparty": "^1.0.1",
+    "cookie-parser": "^1.0.1",
     "cron": "~1.0.4",
+    "csurf": "^1.1.0",
     "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",
     "gm": "1.16.0",
     "gravatar": "1.0.6",
     "less": "~1.7.3",
+    "logrotate-stream": "^0.2.3",
     "mkdirp": "~0.5.0",
+    "morgan": "^1.0.0",
     "nconf": "~0.6.7",
     "nodebb-plugin-dbsearch": "0.0.13",
-    "nodebb-plugin-markdown": "~0.5.0",
-    "nodebb-plugin-mentions": "~0.5.0",
+    "nodebb-plugin-markdown": "~0.6.3",
+    "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",
+    "nodebb-theme-lavender": "~0.1.0",
+    "nodebb-theme-vanilla": "~0.1.0",
+    "nodebb-widget-essentials": "~0.1.1",
     "npm": "^1.4.6",
     "passport": "~0.2.0",
     "passport-local": "1.0.0",
@@ -49,16 +50,18 @@
     "rimraf": "~2.2.6",
     "rss": "~0.3.2",
     "semver": "~2.3.1",
+    "serve-favicon": "^2.0.1",
     "sitemap": "~0.7.3",
-    "socket.io": "~0.9.16",
+    "socket.io": "0.9.17",
+    "socket.io-client": "0.9.17",
     "socket.io-wildcard": "~0.1.1",
     "string": "~1.9.0",
+    "templates.js": "0.0.14",
     "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.8"
+    "xregexp": "~2.0.0"
   },
   "devDependencies": {
     "mocha": "~1.13.0"
@@ -67,7 +70,7 @@
     "url": "https://github.com/NodeBB/NodeBB/issues"
   },
   "engines": {
-    "node": ">=0.8"
+    "node": ">=0.10"
   },
   "maintainers": [
     {

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"
 }

public/language/ar/email.json

@@ -0,0 +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.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!"
+}

public/language/ar/error.json

@@ -12,12 +12,15 @@
     "invalid-title": "Invalid title!",
     "invalid-user-data": "Invalid User Data",
     "invalid-password": "كلمة السر غير مقبولة",
+    "invalid-username-or-password": "Please specify both a username and password",
     "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.",
     "username-too-short": "Username too short",
+    "username-too-long": "Username too long",
     "user-banned": "المستخدم محظور",
+    "user-too-new": "You need 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",
@@ -25,6 +28,7 @@
     "no-user": "المستخدم لا يوجد",
     "no-teaser": "Teaser doesn't exist",
     "no-privileges": "You don't 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": "الرجاء انتظار الرفع",
@@ -51,5 +55,9 @@
     "upload-error": "مشكلة في الرفع: 1%",
     "signature-too-long": "Signature can't 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": "Yo 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."
 }

public/language/ar/footer.json

@@ -1,7 +0,0 @@
-{
-    "stats.online": "حالياً على الموقع",
-    "stats.users": "مستخدمين",
-    "stats.topics": "مواضيع",
-    "stats.posts": "مشاركات",
-    "success": "نجاح"
-}

public/language/ar/global.json

@@ -13,7 +13,7 @@
     "please_log_in": "Please Log In",
     "logout": "تسجيل الخروج",
     "posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.",
-    "welcome_back": "Welcome Back ",
+    "welcome_back": "Welcome Back",
     "you_have_successfully_logged_in": "You have successfully logged in",
     "save_changes": "حفظ التغييرات",
     "close": "أغلق",

public/language/ar/groups.json

@@ -0,0 +1,7 @@
+{
+    "view_group": "View Group",
+    "details.title": "Group Details",
+    "details.members": "Member List",
+    "details.has_no_posts": "This group's members have not made any posts.",
+    "details.latest_posts": "Latest Posts"
+}

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?"

public/language/ar/notifications.json

@@ -4,18 +4,20 @@
     "see_all": "See all Notifications",
     "back_to_home": "Back to %1",
     "outgoing_link": "رابط خارجي",
-    "outgoing_link_message": "أنت الأن ترحل",
-    "continue_to": "أكمل إلى",
-    "return_to": "Return to",
+    "outgoing_link_message": "You are now leaving %1.",
+    "continue_to": "Continue to %1",
+    "return_to": "Return to %1",
     "new_notification": "New Notification",
     "you_have_unread_notifications": "You have unread notifications.",
-    "user_made_post": "<strong>%1</strong> made a new post",
     "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_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...",

public/language/ar/pages.json

@@ -5,6 +5,7 @@
     "recent": "Recent Topics",
     "users": "Registered Users",
     "notifications": "Notifications",
+    "tags": "Topics tagged under \"%1\"",
     "user.edit": "Editing \"%1\"",
     "user.following": "People %1 Follows",
     "user.followers": "People who Follow %1",

public/language/ar/recent.json

@@ -4,5 +4,6 @@
     "week": "أسبوع",
     "month": "شهر",
     "year": "Year",
+    "alltime": "All Time",
     "no_recent_topics": "There are no recent topics."
 }

public/language/ar/search.json

@@ -0,0 +1,4 @@
+{
+    "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+    "no-matches": "No posts found"
+}

public/language/ar/topic.json

@@ -71,7 +71,7 @@
     "topic_will_be_moved_to": "هذا الموضوع سوف ينقل إلى فئة",
     "fork_topic_instruction": "إضغط على الردود لتفريعهم",
     "fork_no_pids": "لم تختار أي رد",
-    "fork_success": "تفريع الموضوع بنجاح!",
+    "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
     "composer.title_placeholder": "Enter your topic title here...",
     "composer.discard": "Discard",
     "composer.submit": "Submit",
@@ -87,6 +87,7 @@
     "more_users_and_guests": "%1 more user(s) and %2 guest(s)",
     "more_users": "%1 more user(s)",
     "more_guests": "%1 more guest(s)",
+    "users_and_others": "%1 and %2 others",
     "sort_by": "Sort by",
     "oldest_to_newest": "Oldest to Newest",
     "newest_to_oldest": "Newest to Oldest",

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": "موقع",
@@ -50,6 +52,7 @@
     "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 +64,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."
 }

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"
 }

public/language/cs/email.json

@@ -0,0 +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.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!"
+}

public/language/cs/error.json

@@ -12,12 +12,15 @@
     "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-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.",
     "username-too-short": "Username too short",
+    "username-too-long": "Username too long",
     "user-banned": "User banned",
+    "user-too-new": "You need 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",
@@ -25,6 +28,7 @@
     "no-user": "User doesn't exist",
     "no-teaser": "Teaser doesn't exist",
     "no-privileges": "You don't 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.",
@@ -51,5 +55,9 @@
     "upload-error": "Upload Error : %1",
     "signature-too-long": "Signature can't 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": "Yo 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."
 }

public/language/cs/footer.json

@@ -1,7 +0,0 @@
-{
-    "stats.online": "Online",
-    "stats.users": "Uživatelé",
-    "stats.topics": "Témata",
-    "stats.posts": "Příspěvky",
-    "success": "úspěch"
-}

public/language/cs/global.json

@@ -13,7 +13,7 @@
     "please_log_in": "Please Log In",
     "logout": "Odhlásit se",
     "posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.",
-    "welcome_back": "Welcome Back ",
+    "welcome_back": "Welcome Back",
     "you_have_successfully_logged_in": "You have successfully logged in",
     "save_changes": "Uložit změny",
     "close": "Zrušit",

public/language/cs/groups.json

@@ -0,0 +1,7 @@
+{
+    "view_group": "View Group",
+    "details.title": "Group Details",
+    "details.members": "Member List",
+    "details.has_no_posts": "This group's members have not made any posts.",
+    "details.latest_posts": "Latest Posts"
+}

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?"

public/language/cs/notifications.json

@@ -4,18 +4,20 @@
     "see_all": "See all Notifications",
     "back_to_home": "Back to %1",
     "outgoing_link": "Odkaz mimo fórum",
-    "outgoing_link_message": "Nyní opouštíte fórum",
-    "continue_to": "Přejít na",
-    "return_to": "Return to",
+    "outgoing_link_message": "You are now leaving %1.",
+    "continue_to": "Continue to %1",
+    "return_to": "Return to %1",
     "new_notification": "New Notification",
     "you_have_unread_notifications": "You have unread notifications.",
-    "user_made_post": "<strong>%1</strong> made a new post",
     "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_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...",

public/language/cs/pages.json

@@ -5,6 +5,7 @@
     "recent": "Recent Topics",
     "users": "Registered Users",
     "notifications": "Notifications",
+    "tags": "Topics tagged under \"%1\"",
     "user.edit": "Editing \"%1\"",
     "user.following": "People %1 Follows",
     "user.followers": "People who Follow %1",

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."
 }

public/language/cs/search.json

@@ -0,0 +1,4 @@
+{
+    "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+    "no-matches": "No posts found"
+}

public/language/cs/topic.json

@@ -71,7 +71,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": "Succesfully forked topic! Click here to go to the forked topic.",
     "composer.title_placeholder": "Enter your topic title here...",
     "composer.discard": "Discard",
     "composer.submit": "Submit",
@@ -87,6 +87,7 @@
     "more_users_and_guests": "%1 more user(s) and %2 guest(s)",
     "more_users": "%1 more user(s)",
     "more_guests": "%1 more guest(s)",
+    "users_and_others": "%1 and %2 others",
     "sort_by": "Sort by",
     "oldest_to_newest": "Oldest to Newest",
     "newest_to_oldest": "Newest to Oldest",

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",
@@ -50,6 +52,7 @@
     "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 +64,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."
 }

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"
 }

public/language/de/email.json

@@ -0,0 +1,23 @@
+{
+    "password-reset-requested": "Zurücksetzung des Passworts beantragt - %1!",
+    "welcome-to": "Willkommen zu %1",
+    "greeting_no_name": "Hallo",
+    "greeting_with_name": "Hallo %1",
+    "welcome.text1": "Vielen Dank für die Registrierung mit %1!",
+    "welcome.text2": "Um dein Konto vollständig zu aktivieren, müssen wir überprüfen, ob du Besitzer der E-Mail-Adresse bist, mit der du dich registriert hast.",
+    "welcome.cta": "Klicke hier, um deine E-Mail-Adresse zu bestätigen.",
+    "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.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.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!"
+}

public/language/de/error.json

@@ -12,12 +12,15 @@
     "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-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.",
     "username-too-short": "Benutzername ist zu kurz",
+    "username-too-long": "Der Benutzername ist zu lang",
     "user-banned": "Der Benutzer ist gesperrt",
+    "user-too-new": "Du musst %1 Sekunden warten, bevor du deinen ersten Beitrag verfassen kannst!",
     "no-category": "Die Kategorie existiert nicht",
     "no-topic": "Das Thema existiert nicht",
     "no-post": "Der Beitrag existiert nicht",
@@ -25,6 +28,7 @@
     "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.",
+    "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.",
@@ -51,5 +55,9 @@
     "upload-error": "Upload-Fehler: %1",
     "signature-too-long": "Die Signatur darf maximal %1 Zeichen enthalten!",
     "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": "Deine Reputation ist nicht gut genug, um diesen Beitrag zu melden.",
+    "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."
 }

public/language/de/footer.json

@@ -1,7 +0,0 @@
-{
-    "stats.online": "Online",
-    "stats.users": "Benutzer",
-    "stats.topics": "Themen",
-    "stats.posts": "Beiträge",
-    "success": "Erfolg"
-}

public/language/de/groups.json

@@ -0,0 +1,7 @@
+{
+    "view_group": "Gruppe betrachten",
+    "details.title": "Gruppendetails",
+    "details.members": "Mitgliederliste",
+    "details.has_no_posts": "Die Mitglieder dieser Gruppe haben keine Beiträge verfasst.",
+    "details.latest_posts": "Aktuelle Beiträge"
+}

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?"

public/language/de/notifications.json

@@ -4,18 +4,20 @@
     "see_all": "Alle Benachrichtigungen ansehen",
     "back_to_home": "Zurück zu %1",
     "outgoing_link": "Externer Link",
-    "outgoing_link_message": "Du verlässt nun",
-    "continue_to": "Gehe weiter zu",
-    "return_to": "Zurück zu",
+    "outgoing_link_message": "Du verlässt nun %1.",
+    "continue_to": "Fortfahren zu %1",
+    "return_to": "Kehre zurück zu %1",
     "new_notification": "Neue Benachrichtigung",
     "you_have_unread_notifications": "Du hast ungelesene Benachrichtigungen.",
-    "user_made_post": "<strong>%1</strong> hat einen Beitrag erstellt.",
     "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_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 ...",

public/language/de/pages.json

@@ -5,6 +5,7 @@
     "recent": "Neueste Themen",
     "users": "Registrierte User",
     "notifications": "Benachrichtigungen",
+    "tags": "Themen markiert unter \"%1\"",
     "user.edit": "Bearbeite \"%1\"",
     "user.following": "Nutzer, die %1 folgt",
     "user.followers": "Nutzer, die %1 folgen",

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."
 }

public/language/de/search.json

@@ -0,0 +1,4 @@
+{
+    "results_matching": "%1 Ergebniss(e) stimmen mit \"%2\" überein, (%3 Sekunden)",
+    "no-matches": "Keine Beiträge gefunden"
+}

public/language/de/tags.json

@@ -1,6 +1,6 @@
 {
-    "no_tag_topics": "There are no topics with this tag.",
+    "no_tag_topics": "Es gibt keine Themen mit diesem Tag.",
     "tags": "Tags",
-    "enter_tags_here": "Enter tags here. Press enter after each tag.",
-    "no_tags": "There are no tags yet."
+    "enter_tags_here": "Gib hier Tags ein und drück die Eingabetaste nach jedem Tag.",
+    "no_tags": "Es gibt bisher keine Tags."
 }

public/language/de/topic.json

@@ -71,7 +71,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": "Thema erfolgreich abgespalten! Klicke hier, um zum abgespalteten Thema zu gelangen.",
     "composer.title_placeholder": "Hier den Titel des Themas eingeben...",
     "composer.discard": "Verwerfen",
     "composer.submit": "Absenden",
@@ -87,6 +87,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 und %2 andere",
     "sort_by": "Sortieren nach",
     "oldest_to_newest": "Älteste zuerst",
     "newest_to_oldest": "Neuster zuerst",

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 widerherstellen</strong><br /><br />Gebe deinen Benutzernamen ein, um zu bestätigen, dass du dieses Konto terminieren möchtest.",
     "fullname": "Kompletter Name",
     "website": "Homepage",
     "location": "Wohnort",
@@ -50,6 +52,7 @@
     "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 +64,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."
 }

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"
 }

public/language/en@pirate/email.json

@@ -0,0 +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.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!"
+}

public/language/en@pirate/error.json

@@ -12,12 +12,15 @@
     "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-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.",
     "username-too-short": "Username too short",
+    "username-too-long": "Username too long",
     "user-banned": "User banned",
+    "user-too-new": "You need 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",
@@ -25,6 +28,7 @@
     "no-user": "User doesn't exist",
     "no-teaser": "Teaser doesn't exist",
     "no-privileges": "You don't 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.",
@@ -51,5 +55,9 @@
     "upload-error": "Upload Error : %1",
     "signature-too-long": "Signature can't 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": "Yo 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."
 }

public/language/en@pirate/footer.json

@@ -1,7 +0,0 @@
-{
-    "stats.online": "Online",
-    "stats.users": "Mates",
-    "stats.topics": "Topics",
-    "stats.posts": "Messages",
-    "success": "success"
-}

public/language/en@pirate/global.json

@@ -13,7 +13,7 @@
     "please_log_in": "Please Log In",
     "logout": "Logout",
     "posting_restriction_info": "Postin' be currently restricted to registered members only, click here to log in.",
-    "welcome_back": "Welcome to Port",
+    "welcome_back": "Welcome Back",
     "you_have_successfully_logged_in": "Ye have successfully logged in",
     "save_changes": "Save yer Changes",
     "close": "Shoot down",

public/language/en@pirate/groups.json

@@ -0,0 +1,7 @@
+{
+    "view_group": "View Group",
+    "details.title": "Group Details",
+    "details.members": "Member List",
+    "details.has_no_posts": "This group's members have not made any posts.",
+    "details.latest_posts": "Latest Posts"
+}

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?"

public/language/en@pirate/notifications.json

@@ -4,18 +4,20 @@
     "see_all": "Spy wit' ye eye all ye notifications",
     "back_to_home": "Back to %1",
     "outgoing_link": "Go offshore",
-    "outgoing_link_message": "Ye be goin' offshore",
-    "continue_to": "Continue to",
-    "return_to": "Return to",
+    "outgoing_link_message": "You are now leaving %1.",
+    "continue_to": "Continue to %1",
+    "return_to": "Return to %1",
     "new_notification": "New Notification",
     "you_have_unread_notifications": "You have unread notifications.",
-    "user_made_post": "<strong>%1</strong> made a new post",
     "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_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...",

public/language/en@pirate/pages.json

@@ -5,6 +5,7 @@
     "recent": "Recent Topics",
     "users": "Registered Users",
     "notifications": "Notifications",
+    "tags": "Topics tagged under \"%1\"",
     "user.edit": "Editing \"%1\"",
     "user.following": "People %1 Follows",
     "user.followers": "People who Follow %1",

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."
 }

public/language/en@pirate/search.json

@@ -0,0 +1,4 @@
+{
+    "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+    "no-matches": "No posts found"
+}

public/language/en@pirate/topic.json

@@ -71,7 +71,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": "Succesfully forked topic! Click here to go to the forked topic.",
     "composer.title_placeholder": "Enter your topic title here...",
     "composer.discard": "Discard",
     "composer.submit": "Submit",
@@ -87,6 +87,7 @@
     "more_users_and_guests": "%1 more user(s) and %2 guest(s)",
     "more_users": "%1 more user(s)",
     "more_guests": "%1 more guest(s)",
+    "users_and_others": "%1 and %2 others",
     "sort_by": "Sort by",
     "oldest_to_newest": "Oldest to Newest",
     "newest_to_oldest": "Newest to Oldest",

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",
@@ -50,6 +52,7 @@
     "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 +64,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."
 }

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"
 }

public/language/en_GB/email.json

@@ -17,10 +17,15 @@
 	"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!"
 }

public/language/en_GB/error.json

@@ -15,6 +15,8 @@
 	"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",
 
@@ -23,8 +25,10 @@
 	"email-not-confirmed": "Your email is not confirmed, 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": "You need to wait %1 seconds before making your first post!",
 
 	"no-category": "Category doesn't exist",
 	"no-topic": "Topic doesn't exist",
@@ -75,5 +79,10 @@
 
 	"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": "Yo 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."
 }

public/language/en_GB/modules.json

@@ -12,8 +12,12 @@
 	"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:\n",
-	"composer.user_said": "%1 said:\n",
+	"composer.user_said_in": "%1 said in %2:",
+	"composer.user_said": "%1 said:",
 	"composer.discard": "Are you sure you wish to discard this post?"
 }

public/language/en_GB/notifications.json

@@ -12,11 +12,14 @@
 	"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_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.",

public/language/en_GB/pages.json

@@ -5,6 +5,7 @@
 	"recent": "Recent Topics",
 	"users": "Registered Users",
 	"notifications": "Notifications",
+	"tags": "Topics tagged under \"%1\"",
 	"user.edit": "Editing \"%1\"",
 	"user.following": "People %1 Follows",
 	"user.followers": "People who Follow %1",

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."
 }

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"
 }

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."
 }

public/language/en_GB/topic.json

@@ -33,7 +33,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 +43,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 +58,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 +88,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": "Succesfully forked topic! Click here to go to the forked topic.",
 
 	"composer.title_placeholder": "Enter your topic title here...",
 	"composer.discard": "Discard",
@@ -105,6 +107,7 @@
 	"more_users_and_guests": "%1 more user(s) and %2 guest(s)",
 	"more_users": "%1 more user(s)",
 	"more_guests": "%1 more guest(s)",
+	"users_and_others": "%1 and %2 others",
 
 	"sort_by": "Sort by",
 	"oldest_to_newest": "Oldest to Newest",

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!",
@@ -55,6 +58,7 @@
 	"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 +75,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."
 }

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"
 }

public/language/en_US/email.json

@@ -0,0 +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.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!"
+}

public/language/en_US/error.json

@@ -12,12 +12,15 @@
     "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-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.",
     "username-too-short": "Username too short",
+    "username-too-long": "Username too long",
     "user-banned": "User banned",
+    "user-too-new": "You need 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",
@@ -25,6 +28,7 @@
     "no-user": "User doesn't exist",
     "no-teaser": "Teaser doesn't exist",
     "no-privileges": "You don't 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.",
@@ -51,5 +55,9 @@
     "upload-error": "Upload Error : %1",
     "signature-too-long": "Signature can't 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": "Yo 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."
 }

public/language/en_US/footer.json

@@ -1,7 +0,0 @@
-{
-    "stats.online": "Online",
-    "stats.users": "Users",
-    "stats.topics": "Topics",
-    "stats.posts": "Posts",
-    "success": "success"
-}

public/language/en_US/groups.json

@@ -0,0 +1,7 @@
+{
+    "view_group": "View Group",
+    "details.title": "Group Details",
+    "details.members": "Member List",
+    "details.has_no_posts": "This group's members have not made any posts.",
+    "details.latest_posts": "Latest Posts"
+}

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?"

public/language/en_US/notifications.json

@@ -4,18 +4,20 @@
     "see_all": "See all Notifications",
     "back_to_home": "Back to %1",
     "outgoing_link": "Outgoing Link",
-    "outgoing_link_message": "You are now leaving",
-    "continue_to": "Continue to",
-    "return_to": "Return to",
+    "outgoing_link_message": "You are now leaving %1.",
+    "continue_to": "Continue to %1",
+    "return_to": "Return to %1",
     "new_notification": "New Notification",
     "you_have_unread_notifications": "You have unread notifications.",
-    "user_made_post": "<strong>%1</strong> made a new post",
     "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_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...",

public/language/en_US/pages.json

@@ -5,6 +5,7 @@
     "recent": "Recent Topics",
     "users": "Registered Users",
     "notifications": "Notifications",
+    "tags": "Topics tagged under \"%1\"",
     "user.edit": "Editing \"%1\"",
     "user.following": "People %1 Follows",
     "user.followers": "People who Follow %1",

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."
 }

public/language/en_US/search.json

@@ -0,0 +1,4 @@
+{
+    "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+    "no-matches": "No posts found"
+}

public/language/en_US/topic.json

@@ -71,7 +71,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": "Succesfully forked topic! Click here to go to the forked topic.",
     "composer.title_placeholder": "Enter your topic title here...",
     "composer.discard": "Discard",
     "composer.submit": "Submit",
@@ -87,6 +87,7 @@
     "more_users_and_guests": "%1 more user(s) and %2 guest(s)",
     "more_users": "%1 more user(s)",
     "more_guests": "%1 more guest(s)",
+    "users_and_others": "%1 and %2 others",
     "sort_by": "Sort by",
     "oldest_to_newest": "Oldest to Newest",
     "newest_to_oldest": "Newest to Oldest",

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",
@@ -50,6 +52,7 @@
     "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 +64,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."
 }

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"
 }

public/language/es/email.json

@@ -0,0 +1,23 @@
+{
+    "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": "Tienes algunas notificaciónes de %1 sin leer:",
+    "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!"
+}

public/language/es/error.json

@@ -12,12 +12,15 @@
     "invalid-title": "Título no válido!",
     "invalid-user-data": "Datos de Usuario no válidos",
     "invalid-password": "Contraseña no válida",
+    "invalid-username-or-password": "Por favor especifica tanto un usuario como contraseña",
     "invalid-pagination-value": "Valor de paginación no válido.",
     "username-taken": "Nombre de usuario ya escogido",
     "email-taken": "El correo electrónico ya está escogido.",
     "email-not-confirmed": "Tu correo electrónico está sin confirmar, por favor haz click aquí para confirmar tu email.",
     "username-too-short": "El nombre de usuario es demasiado corto",
+    "username-too-long": "Nombre de usuario demasiado largo",
     "user-banned": "Usuario expulsado",
+    "user-too-new": "Necesitas esperar %1 segundos antes de hacer tu primera publicación.",
     "no-category": "La categoría no existe",
     "no-topic": "El tema no existe.",
     "no-post": "La publicación no existe",
@@ -25,6 +28,7 @@
     "no-user": "El usuario no existe",
     "no-teaser": "El extracto del tema no existe.",
     "no-privileges": "No tienes los privilegios necesarios para esa acción.",
+    "no-emailers-configured": "Ningún plugin para email fue cargado, así que no se pudo enviar email de prueba.",
     "category-disabled": "Categoría deshabilitada.",
     "topic-locked": "Tema bloqueado.",
     "still-uploading": "Por favor, espera a que terminen las subidas.",
@@ -51,5 +55,9 @@
     "upload-error": "Error de subida: %1",
     "signature-too-long": "Las firmas no pueden ser más largas de %1 caracteres!",
     "cant-chat-with-yourself": "No puedes conversar contigo mismo!",
-    "not-enough-reputation-to-downvote": "No tienes suficiente reputación para votar negativo este post"
+    "reputation-system-disabled": "El sistema de reputación está deshabilitado.",
+    "downvoting-disabled": "La votación negativa está deshabilitada.",
+    "not-enough-reputation-to-downvote": "No tienes suficiente reputación para votar negativo este post",
+    "not-enough-reputation-to-flag": "No tienes suficiente reputación para marcar esta publicación",
+    "reload-failed": "NodeBB encontró un problema mientras refrescar: \"%1\". NodeBB intentará cargar el resto de contenido, aunque deberías deshacer lo que hiciste antes de refrescar."
 }

public/language/es/footer.json

@@ -1,7 +0,0 @@
-{
-    "stats.online": "Online",
-    "stats.users": "Gente",
-    "stats.topics": "Temas",
-    "stats.posts": "Posts",
-    "success": "éxito!"
-}

public/language/es/groups.json

@@ -0,0 +1,7 @@
+{
+    "view_group": "Ver Grupo",
+    "details.title": "Detalles de Grupo",
+    "details.members": "Lista de Miembros",
+    "details.has_no_posts": "Los miembros de este grupo no han hecho ninguna publicación.",
+    "details.latest_posts": "Últimas Publicaciones"
+}

public/language/es/modules.json

@@ -12,6 +12,10 @@
     "chat.message-history": "Historial de mensajes",
     "chat.pop-out": "Mostrar en ventana independiente",
     "chat.maximize": "Maximizar",
+    "chat.yesterday": "Ayer",
+    "chat.seven_days": "7 Días",
+    "chat.thirty_days": "30 Días",
+    "chat.three_months": "3 Meses",
     "composer.user_said_in": "%1 dijo en %2:",
     "composer.user_said": "%1 dijo:",
     "composer.discard": "¿Estás seguro de que deseas descargar este post?"

public/language/es/notifications.json

@@ -4,18 +4,20 @@
     "see_all": "Ver todas las notificaciones",
     "back_to_home": "Volver a %1",
     "outgoing_link": "Enlace Externo",
-    "outgoing_link_message": "Estas saliendo del sitio",
-    "continue_to": "Continuar",
-    "return_to": "Volver a",
+    "outgoing_link_message": "Ahora estás saliendo %1.",
+    "continue_to": "Continuar a %1",
+    "return_to": "Regresar a %1",
     "new_notification": "Nueva Notificación",
     "you_have_unread_notifications": "Tienes notificaciones sin leer.",
-    "user_made_post": "<strong>%1</strong> hizo una nueva publicación",
     "new_message_from": "Nuevo mensaje de <strong>%1</strong>",
-    "upvoted_your_post": "<strong>%1</strong> ha marcado como favorita tu respuesta.",
-    "favourited_your_post": "<strong>%1</strong> ha marcado como favorita tu respuesta.",
-    "user_flagged_post": "<strong>%1</strong> ha marcado como indebida una respuesta.",
+    "upvoted_your_post_in": "<strong>%1</strong> ha votado como relevante tu respuesta en <strong>%2</strong>.",
+    "moved_your_post": "<strong>%1<strong> ha movido su publicación.",
+    "moved_your_topic": "<strong>%1<strong> ha movido su tema.",
+    "favourited_your_post_in": "<strong>%1</strong> ha marcado como favorito su publicación en <strong>%2</strong>.",
+    "user_flagged_post_in": "<strong>%1</strong> ha marcado como indebida una respuesta en <strong>%2</strong>",
     "user_posted_to": "<strong>%1</strong> ha publicado una respuesta a: <strong>%2</strong>",
     "user_mentioned_you_in": "<strong>%1</strong> te mencionó en <strong>%2</strong>",
+    "user_started_following_you": "<strong>%1</strong> comenzó a seguirte.",
     "email-confirmed": "Correo electrónico confirmado",
     "email-confirmed-message": "Gracias por validar tu correo electrónico. Tu cuenta ya está completamente activa.",
     "email-confirm-error": "Un error ocurrió...",

public/language/es/pages.json

@@ -5,6 +5,7 @@
     "recent": "Temas Recientes",
     "users": "Usuarios Registrado",
     "notifications": "Notificaciones",
+    "tags": "Temas etiquetados bajo \"%1\"",
     "user.edit": "Editando \"%1\"",
     "user.following": "Gente que sigue %1 ",
     "user.followers": "Seguidores de %1",

public/language/es/recent.json

@@ -4,5 +4,6 @@
     "week": "Semana",
     "month": "Mes",
     "year": "Año",
+    "alltime": "Siempre",
     "no_recent_topics": "No hay publicaciones recientes"
 }

public/language/es/search.json

@@ -0,0 +1,4 @@
+{
+    "results_matching": "%1 resuldado(s) coinciden con \"%2\". (%3 segundos)",
+    "no-matches": "No se encontraron publicaciones"
+}