fixed #3218

Conflicts:
	src/database/mongo.js

.tx/config

@@ -7,6 +7,7 @@ source_file = public/language/en_GB/category.json
 source_lang = en_GB
 trans.ar = public/language/ar/category.json
 trans.bn = public/language/bn/category.json
+trans.bg = public/language/bg/category.json
 trans.cs = public/language/cs/category.json
 trans.de = public/language/de/category.json
 trans.el = public/language/el/category.json
@@ -47,6 +48,7 @@ source_file = public/language/en_GB/login.json
 source_lang = en_GB
 trans.ar = public/language/ar/login.json
 trans.bn = public/language/bn/login.json
+trans.bg = public/language/bg/login.json
 trans.cs = public/language/cs/login.json
 trans.de = public/language/de/login.json
 trans.el = public/language/el/login.json
@@ -86,6 +88,7 @@ source_file = public/language/en_GB/recent.json
 source_lang = en_GB
 trans.ar = public/language/ar/recent.json
 trans.bn = public/language/bn/recent.json
+trans.bg = public/language/bg/recent.json
 trans.cs = public/language/cs/recent.json
 trans.de = public/language/de/recent.json
 trans.el = public/language/el/recent.json
@@ -125,6 +128,7 @@ source_file = public/language/en_GB/unread.json
 source_lang = en_GB
 trans.ar = public/language/ar/unread.json
 trans.bn = public/language/bn/unread.json
+trans.bg = public/language/bg/unread.json
 trans.cs = public/language/cs/unread.json
 trans.de = public/language/de/unread.json
 trans.el = public/language/el/unread.json
@@ -164,6 +168,7 @@ source_file = public/language/en_GB/modules.json
 source_lang = en_GB
 trans.ar = public/language/ar/modules.json
 trans.bn = public/language/bn/modules.json
+trans.bg = public/language/bg/modules.json
 trans.cs = public/language/cs/modules.json
 trans.de = public/language/de/modules.json
 trans.el = public/language/el/modules.json
@@ -203,6 +208,7 @@ source_file = public/language/en_GB/register.json
 source_lang = en_GB
 trans.ar = public/language/ar/register.json
 trans.bn = public/language/bn/register.json
+trans.bg = public/language/bg/register.json
 trans.cs = public/language/cs/register.json
 trans.de = public/language/de/register.json
 trans.el = public/language/el/register.json
@@ -242,6 +248,7 @@ source_file = public/language/en_GB/user.json
 source_lang = en_GB
 trans.ar = public/language/ar/user.json
 trans.bn = public/language/bn/user.json
+trans.bg = public/language/bg/user.json
 trans.cs = public/language/cs/user.json
 trans.de = public/language/de/user.json
 trans.el = public/language/el/user.json
@@ -281,6 +288,7 @@ source_file = public/language/en_GB/global.json
 source_lang = en_GB
 trans.ar = public/language/ar/global.json
 trans.bn = public/language/bn/global.json
+trans.bg = public/language/bg/global.json
 trans.cs = public/language/cs/global.json
 trans.de = public/language/de/global.json
 trans.el = public/language/el/global.json
@@ -320,6 +328,7 @@ source_file = public/language/en_GB/notifications.json
 source_lang = en_GB
 trans.ar = public/language/ar/notifications.json
 trans.bn = public/language/bn/notifications.json
+trans.bg = public/language/bg/notifications.json
 trans.cs = public/language/cs/notifications.json
 trans.de = public/language/de/notifications.json
 trans.el = public/language/el/notifications.json
@@ -359,6 +368,7 @@ source_file = public/language/en_GB/reset_password.json
 source_lang = en_GB
 trans.ar = public/language/ar/reset_password.json
 trans.bn = public/language/bn/reset_password.json
+trans.bg = public/language/bg/reset_password.json
 trans.cs = public/language/cs/reset_password.json
 trans.de = public/language/de/reset_password.json
 trans.el = public/language/el/reset_password.json
@@ -398,6 +408,7 @@ source_file = public/language/en_GB/users.json
 source_lang = en_GB
 trans.ar = public/language/ar/users.json
 trans.bn = public/language/bn/users.json
+trans.bg = public/language/bg/users.json
 trans.cs = public/language/cs/users.json
 trans.de = public/language/de/users.json
 trans.el = public/language/el/users.json
@@ -437,6 +448,7 @@ source_file = public/language/en_GB/language.json
 source_lang = en_GB
 trans.ar = public/language/ar/language.json
 trans.bn = public/language/bn/language.json
+trans.bg = public/language/bg/language.json
 trans.cs = public/language/cs/language.json
 trans.de = public/language/de/language.json
 trans.el = public/language/el/language.json
@@ -476,6 +488,7 @@ source_file = public/language/en_GB/pages.json
 source_lang = en_GB
 trans.ar = public/language/ar/pages.json
 trans.bn = public/language/bn/pages.json
+trans.bg = public/language/bg/pages.json
 trans.cs = public/language/cs/pages.json
 trans.de = public/language/de/pages.json
 trans.el = public/language/el/pages.json
@@ -515,6 +528,7 @@ source_file = public/language/en_GB/topic.json
 source_lang = en_GB
 trans.ar = public/language/ar/topic.json
 trans.bn = public/language/bn/topic.json
+trans.bg = public/language/bg/topic.json
 trans.cs = public/language/cs/topic.json
 trans.de = public/language/de/topic.json
 trans.el = public/language/el/topic.json
@@ -554,6 +568,7 @@ source_file = public/language/en_GB/success.json
 source_lang = en_GB
 trans.ar = public/language/ar/success.json
 trans.bn = public/language/bn/success.json
+trans.bg = public/language/bg/success.json
 trans.cs = public/language/cs/success.json
 trans.de = public/language/de/success.json
 trans.el = public/language/el/success.json
@@ -593,6 +608,7 @@ source_file = public/language/en_GB/error.json
 source_lang = en_GB
 trans.ar = public/language/ar/error.json
 trans.bn = public/language/bn/error.json
+trans.bg = public/language/bg/error.json
 trans.cs = public/language/cs/error.json
 trans.de = public/language/de/error.json
 trans.el = public/language/el/error.json
@@ -632,6 +648,7 @@ source_file = public/language/en_GB/tags.json
 source_lang = en_GB
 trans.ar = public/language/ar/tags.json
 trans.bn = public/language/bn/tags.json
+trans.bg = public/language/bg/tags.json
 trans.cs = public/language/cs/tags.json
 trans.de = public/language/de/tags.json
 trans.el = public/language/el/tags.json
@@ -671,6 +688,7 @@ source_file = public/language/en_GB/email.json
 source_lang = en_GB
 trans.ar = public/language/ar/email.json
 trans.bn = public/language/bn/email.json
+trans.bg = public/language/bg/email.json
 trans.cs = public/language/cs/email.json
 trans.de = public/language/de/email.json
 trans.el = public/language/el/email.json
@@ -710,6 +728,7 @@ source_file = public/language/en_GB/search.json
 source_lang = en_GB
 trans.ar = public/language/ar/search.json
 trans.bn = public/language/bn/search.json
+trans.bg = public/language/bg/search.json
 trans.cs = public/language/cs/search.json
 trans.de = public/language/de/search.json
 trans.el = public/language/el/search.json
@@ -749,6 +768,7 @@ source_file = public/language/en_GB/groups.json
 source_lang = en_GB
 trans.ar = public/language/ar/groups.json
 trans.bn = public/language/bn/groups.json
+trans.bg = public/language/bg/groups.json
 trans.cs = public/language/cs/groups.json
 trans.de = public/language/de/groups.json
 trans.el = public/language/el/groups.json

CONTRIBUTING.md

@@ -13,6 +13,11 @@ If you are writing contributions as part of employment from another company / in
 
 Chances are somebody has run into this problem before. After consulting our [documentation](https://docs.nodebb.org/en/latest/installing/os.html), please head over to our [community support forum](https://community.nodebb.org) for advice.
 
+# Found a Security Vulnerability?
+
+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.
 
 # Issues & Bugs
 
@@ -20,11 +25,6 @@ Thanks for reporting an issue with NodeBB! Please follow these guidelines in ord
 
 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.
@@ -50,6 +50,15 @@ $ git rev-parse HEAD
 
 If you have downloaded the `.zip` or `.tar.gz` packages from GitHub (or elsewhere), please let us know.
 
+## Provide theme versions if issue is related to the theme/display
+
+``` bash
+$ npm ls nodebb-theme-vanilla nodebb-theme-lavender
+nodebb@0.7.0-dev /home/julian/Projects/nodebb/forum
+├── nodebb-theme-lavender@0.2.13
+└── nodebb-theme-vanilla@0.2.35
+```
+
 ## 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`.

Gruntfile.js

@@ -0,0 +1,78 @@
+"use strict";
+
+var fork = require('child_process').fork,
+	env = process.env,
+	worker,
+	incomplete = [];
+
+
+module.exports = function(grunt) {
+	function update(action, filepath, target) {
+		var args = [],
+			fromFile = '',
+			compiling = '',
+			time = Date.now();
+
+		if (!grunt.option('verbose')) {
+			args.push('--log-level=info');
+		}
+		
+		if (target === 'lessUpdated') {
+			fromFile = ['js','tpl'];
+			compiling = 'less';
+		} else if (target === 'clientUpdated') {
+			fromFile = ['less','tpl'];
+			compiling = 'js';
+		} else if (target === 'templatesUpdated') {
+			fromFile = ['js','less'];
+			compiling = 'tpl';
+		} else if (target === 'serverUpdated') {
+			fromFile = ['less','js','tpl'];
+		}
+
+		fromFile = fromFile.filter(function(ext) {
+			return incomplete.indexOf(ext) === -1;
+		});
+
+		args.push('--from-file=' + fromFile.join(','));
+		incomplete.push(compiling);
+
+		worker.kill();
+		worker = fork('app.js', args, { env: env });
+
+		worker.on('message', function() {
+			if (incomplete.length) {
+				incomplete = [];
+
+				if (grunt.option('verbose')) {
+					grunt.log.writeln('NodeBB restarted in ' + (Date.now() - time) + ' ms');
+				}
+			}
+		});
+	}
+
+	grunt.initConfig({
+		watch: {
+			lessUpdated: {
+				files: ['public/**/*.less', 'node_modules/nodebb-*/*.less', 'node_modules/nodebb-*/*/*.less', 'node_modules/nodebb-*/*/*/*.less', 'node_modules/nodebb-*/*/*/*/*.less']
+			},
+			clientUpdated: {
+				files: ['public/src/**/*.js', 'node_modules/nodebb-*/*.js', 'node_modules/nodebb-*/*/*.js', 'node_modules/nodebb-*/*/*/*.js', 'node_modules/nodebb-*/*/*/*/*.js', 'node_modules/templates.js/lib/templates.js']
+			},
+			serverUpdated: {
+				files: ['*.js', 'install/*.js', 'src/**/*.js']
+			},
+			templatesUpdated: {
+				files: ['src/views/**/*.tpl', 'node_modules/nodebb-*/*.tpl', 'node_modules/nodebb-*/*/*.tpl', 'node_modules/nodebb-*/*/*/*.tpl', 'node_modules/nodebb-*/*/*/*/*.tpl', 'node_modules/nodebb-*/*/*/*/*/*.tpl']
+			}
+		}
+	});
+
+	grunt.loadNpmTasks('grunt-contrib-watch');
+	grunt.registerTask('default', ['watch']);
+
+	env.NODE_ENV = 'development';
+
+	worker = fork('app.js', [], { env: env });
+	grunt.event.on('watch', update);
+};

README.md

@@ -25,9 +25,6 @@ Additional functionality is enabled through the use of third-party plugins.
 
 [<img src="http://i.imgur.com/FLOUuIqb.png" />](http://i.imgur.com/FLOUuIq.png)&nbsp;[<img src="http://i.imgur.com/Ud1LrfIb.png" />](http://i.imgur.com/Ud1LrfI.png)&nbsp;[<img src="http://i.imgur.com/ZC8W39ab.png" />](http://i.imgur.com/ZC8W39a.png)&nbsp;[<img src="http://i.imgur.com/o90kVPib.png" />](http://i.imgur.com/o90kVPi.png)&nbsp;[<img src="http://i.imgur.com/AaRRrU2b.png" />](http://i.imgur.com/AaRRrU2.png)&nbsp;[<img src="http://i.imgur.com/LmHtPhob.png" />](http://i.imgur.com/LmHtPho.png)&nbsp;[<img src="http://i.imgur.com/paiJPJkb.jpg" />](http://i.imgur.com/paiJPJk.jpg)&nbsp;[<img src="http://i.imgur.com/ZfavPHDb.png" />](http://i.imgur.com/ZfavPHD.png)&nbsp;[<img src="http://i.imgur.com/8OLssij.png" />](http://i.imgur.com/8OLssij.png)&nbsp;[<img src="http://i.imgur.com/JKOc0LZ.png"/>](http://i.imgur.com/JKOc0LZ.png)
 
-Credit: [Convoe](http://www.convoe.com), [Kano](http://www.kano.me), [Manchester United Forum](http://manutdforums.com/).
-
-
 ## How can I follow along/contribute?
 
 * Our feature roadmap is hosted on the project wiki's [Version History / Roadmap](https://github.com/NodeBB/NodeBB/wiki/Version-History-%26-Roadmap)
@@ -41,7 +38,7 @@ Credit: [Convoe](http://www.convoe.com), [Kano](http://www.kano.me), [Manchester
 NodeBB requires the following software to be installed:
 
 * A version of Node.js at least 0.10 or greater
-* Redis, version 2.6 or greater **or** MongoDB, version 2.6 or greater
+* Redis, version 2.8.9 or greater **or** MongoDB, version 2.6 or greater
 * nginx, version 1.3.13 or greater (**only if** intending to use nginx to proxy requests to a NodeBB)
 
 ## Installation

app.js

@@ -21,7 +21,7 @@
 /*global require, global, process*/
 
 var nconf = require('nconf');
-nconf.argv().env();
+nconf.argv().env('__');
 
 var fs = require('fs'),
 	os = require('os'),
@@ -43,7 +43,7 @@ winston.add(winston.transports.Console, {
 		var date = new Date();
 		return date.getDate() + '/' + (date.getMonth() + 1) + ' ' + date.toTimeString().substr(0,5) + ' [' + global.process.pid + ']';
 	},
-	level: global.env === 'production' ? 'info' : 'verbose'
+	level: (global.env === 'production' || nconf.get('log-level') === 'info') ? 'info' : 'verbose'
 });
 
 if(os.platform() === 'linux') {
@@ -54,14 +54,6 @@ if(os.platform() === 'linux') {
 	});
 }
 
-if (!process.send) {
-	// 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'),
 	configExists;
@@ -73,8 +65,10 @@ configExists = fs.existsSync(configFile);
 
 if (!nconf.get('setup') && !nconf.get('install') && !nconf.get('upgrade') && !nconf.get('reset') && configExists) {
 	start();
-} else if (nconf.get('setup') || nconf.get('install') || !configExists) {
+} else if (nconf.get('setup') || nconf.get('install')) {
 	setup();
+} else if (!configExists) {
+	require('./install/web').install(nconf.get('port'));
 } else if (nconf.get('upgrade')) {
 	upgrade();
 } else if (nconf.get('reset')) {
@@ -89,7 +83,8 @@ function loadConfig() {
 	nconf.defaults({
 		base_dir: __dirname,
 		themes_path: path.join(__dirname, 'node_modules'),
-		views_dir: path.join(__dirname, 'public/templates')
+		views_dir: path.join(__dirname, 'public/templates'),
+		version: pkg.version
 	});
 
 	if (!nconf.get('isCluster')) {
@@ -101,10 +96,19 @@ function loadConfig() {
 	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'));
+
+	if (!process.send) {
+		// If run using `node app`, log GNU copyright info along with server info
+		winston.info('NodeBB v' + nconf.get('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('');
+	}
 }
 
 function start() {
 	loadConfig();
+	var db = require('./src/database');
 
 	// nconf defaults, if not set in config
 	if (!nconf.get('upload_path')) {
@@ -116,11 +120,11 @@ function start() {
 	nconf.set('use_port', !!urlObject.port);
 	nconf.set('relative_path', relativePath);
 	nconf.set('port', urlObject.port || nconf.get('port') || nconf.get('PORT') || 4567);
-	nconf.set('upload_url', relativePath + '/uploads/');
+	nconf.set('upload_url', '/uploads/');
 
 	if (nconf.get('isPrimary') === 'true') {
 		winston.info('Time: %s', (new Date()).toString());
-		winston.info('Initializing NodeBB v%s', pkg.version);
+		winston.info('Initializing NodeBB v%s', nconf.get('version'));
 		winston.verbose('* using configuration stored in: %s', configFile);
 
 		var host = nconf.get(nconf.get('database') + ':host'),
@@ -130,111 +134,122 @@ function start() {
 		winston.verbose('* using themes stored in: %s', nconf.get('themes_path'));
 	}
 
-
+	process.on('SIGTERM', shutdown);
-	var webserver = require('./src/webserver');
+	process.on('SIGINT', shutdown);
-
+	process.on('SIGHUP', restart);
-	require('./src/database').init(function(err) {
+	process.on('message', function(message) {
-		if (err) {
+		if (typeof message !== 'object') {
-			winston.error(err.stack);
+			return;
-			process.exit();
 		}
 		var meta = require('./src/meta');
-		meta.configs.init(function () {
+		var emitter = require('./src/emitter');
-			var templates = require('templates.js'),
+		switch (message.action) {
-				sockets = require('./src/socket.io'),
+			case 'reload':
-				plugins = require('./src/plugins'),
+				meta.reload();
-				upgrade = require('./src/upgrade');
+			break;
+			case 'js-propagate':
+				meta.js.cache = message.cache;
+				meta.js.map = message.map;
+				meta.js.hash = message.hash;
+				emitter.emit('meta:js.compiled');
+				winston.verbose('[cluster] Client-side javascript and mapping propagated to worker %s', process.pid);
+			break;
+			case 'css-propagate':
+				meta.css.cache = message.cache;
+				meta.css.acpCache = message.acpCache;
+				meta.css.hash = message.hash;
+				emitter.emit('meta:css.compiled');
+				winston.verbose('[cluster] Stylesheets propagated to worker %s', process.pid);
+			break;
+			case 'templates:compiled':
+				emitter.emit('templates:compiled');
+			break;
+		}
+	});
 
-			templates.setGlobal('relative_path', nconf.get('relative_path'));
+	process.on('uncaughtException', function(err) {
+		winston.error(err.stack);
+		console.log(err.stack);
 
-			upgrade.check(function(schema_ok) {
+		require('./src/meta').js.killMinifier();
-				if (schema_ok || nconf.get('check-schema') === false) {
+		shutdown(1);
-					webserver.init();
+	});
-					sockets.init(webserver.server);
 
-					if (nconf.get('isPrimary') === 'true' && !nconf.get('jobsDisabled')) {
+	async.waterfall([
-						require('./src/notifications').init();
+		async.apply(db.init),
-						require('./src/user').startJobs();
+		async.apply(db.checkCompatibility),
-					}
+		function(next) {
+			require('./src/meta').configs.init(next);
+		},
+		function(next) {
+			require('./src/upgrade').check(next);
+		},
+		function(schema_ok, next) {
+			if (!schema_ok && nconf.get('check-schema') !== false) {
+				winston.warn('Your NodeBB schema is out-of-date. Please run the following command to bring your dataset up to spec:');
+				winston.warn('    ./nodebb upgrade');
+				process.exit();
+				return;
+			}
+			var webserver = require('./src/webserver');
+			require('./src/socket.io').init(webserver.server);
 
-					async.waterfall([
+			if (nconf.get('isPrimary') === 'true' && !nconf.get('jobsDisabled')) {
-						async.apply(meta.themes.setupPaths),
+				require('./src/notifications').init();
-						async.apply(plugins.ready),
+				require('./src/user').startJobs();
-						async.apply(meta.templates.compile),
+			}
-						async.apply(webserver.listen)
-					], function(err) {
-						if (err) {
-							winston.error(err.stack);
-							process.exit();
-						}
 
-						if (process.send) {
+			webserver.listen();
-							process.send({
+		}
-								action: 'ready'
+	], function(err) {
-							});
+		if (err) {
-						}
+			if (err.stacktrace !== false) {
-					});
+				winston.error(err.stack);
+			} else {
+				winston.error(err.message);
+			}
 
-					process.on('SIGTERM', shutdown);
+			process.exit();
-					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;
-								meta.js.hash = message.hash;
-								winston.verbose('[cluster] Client-side javascript and mapping propagated to worker %s', process.pid);
-							break;
-							case 'css-propagate':
-								meta.css.cache = message.cache;
-								meta.css.acpCache = message.acpCache;
-								meta.css.hash = message.hash;
-								winston.verbose('[cluster] Stylesheets propagated to worker %s', process.pid);
-							break;
-						}
-					});
-
-					process.on('uncaughtException', function(err) {
-						winston.error(err.stack);
-						console.log(err.stack);
-
-						meta.js.killMinifier();
-						shutdown(1);
-					});
-				} else {
-					winston.warn('Your NodeBB schema is out-of-date. Please run the following command to bring your dataset up to spec:');
-					winston.warn('    ./nodebb upgrade');
-					process.exit();
-				}
-			});
-		});
 	});
 }
 
 function setup() {
 	loadConfig();
 
-	if (nconf.get('setup')) {
+	winston.info('NodeBB Setup Triggered via Command Line');
-		winston.info('NodeBB Setup Triggered via Command Line');
-	} else {
-		winston.warn('Configuration not found, starting NodeBB setup');
-	}
 
 	var install = require('./src/install');
 
-	winston.info('Welcome to NodeBB!');
+	process.stdout.write('\nWelcome to NodeBB!\n');
-	winston.info('This looks like a new installation, so you\'ll have to answer a few questions about your environment before we can proceed.');
+	process.stdout.write('\nThis looks like a new installation, so you\'ll have to answer a few questions about your environment before we can proceed.\n');
-	winston.info('Press enter to accept the default setting (shown in brackets).');
+	process.stdout.write('Press enter to accept the default setting (shown in brackets).\n');
+
+	install.setup(function (err, data) {
+		var separator = '     ';
+		if (process.stdout.columns > 10) {
+			for(var x=0,cols=process.stdout.columns-10;x<cols;x++) {
+				separator += '=';
+			}
+		}
+		process.stdout.write('\n' + separator + '\n\n');
 
-	install.setup(function (err) {
 		if (err) {
 			winston.error('There was a problem completing NodeBB setup: ', err.message);
 		} else {
-			winston.info('NodeBB Setup Completed. Run \'./nodebb start\' to manually start your NodeBB server.');
+			if (data.hasOwnProperty('password')) {
+				process.stdout.write('An administrative user was automatically created for you:\n');
+				process.stdout.write('    Username: ' + data.username + '\n');
+				process.stdout.write('    Password: ' + data.password + '\n');
+				process.stdout.write('\n');
+			}
+			process.stdout.write('NodeBB Setup Completed. Run \'./nodebb start\' to manually start your NodeBB server.\n');
+
+			// If I am a child process, notify the parent of the returned data before exiting (useful for notifying
+			// hosts of auto-generated username/password during headless setups)
+			if (process.send) {
+				process.send(data);
+			}
 		}
 
 		process.exit();
@@ -323,7 +338,7 @@ function resetThemes(callback) {
 
 function resetPlugin(pluginId) {
 	var db = require('./src/database');
-	db.setRemove('plugins:active', pluginId, function(err) {
+	db.sortedSetRemove('plugins:active', pluginId, function(err) {
 		if (err) {
 			winston.error('[reset] Could not disable plugin: %s encountered error %s', pluginId, err.message);
 		} else {

bcrypt.js

@@ -9,7 +9,7 @@ process.on('message', function(msg) {
 	if (msg.type === 'hash') {
 		hashPassword(msg.password, msg.rounds);
 	} else if (msg.type === 'compare') {
-		compare(msg.password, msg.hash);
+		bcrypt.compare(msg.password, msg.hash, done);
 	}
 });
 
@@ -21,23 +21,14 @@ function hashPassword(password, rounds) {
 		function(salt, next) {
 			bcrypt.hash(password, salt, next);
 		}
-	], function(err, hash) {
+	], done);
-		if (err) {
-			process.send({err: err.message});
-			return process.disconnect();
-		}
-		process.send({result: hash});
-		process.disconnect();
-	});
 }
 
-function compare(password, hash) {
+function done(err, result) {
-	bcrypt.compare(password, hash, function(err, res) {
+	if (err) {
-		if (err) {
+		process.send({err: err.message});
-			process.send({err: err.message});
+		return process.disconnect();
-			return process.disconnect();
+	}
-		}
+	process.send({result: result});
-		process.send({result: res});
+	process.disconnect();
-		process.disconnect();
- 	});
 }

install/data/categories.json

@@ -9,7 +9,7 @@
     },
     {
         "name": "General Discussion",
-        "description": "A place to talk about whateeeever you want",
+        "description": "A place to talk about whatever you want",
         "bgColor": "#59b3d0",
         "color": "#fff",
         "icon" : "fa-comments-o",

install/data/defaults.json

@@ -83,6 +83,10 @@
         "field": "maximumSignatureLength",
         "value": 255
     },
+    {
+        "field": "maximumAboutMeLength",
+        "value": 1000
+    },
     {
         "field": "maximumProfileImageSize",
         "value": 256
@@ -94,5 +98,9 @@
     {
         "field": "requireEmailConfirmation",
         "value": 0
+    },
+    {
+        "field": "profile:allowProfileImageUploads",
+        "value": 1
     }
 ]

install/data/footer.json

@@ -0,0 +1,10 @@
+[
+	{
+		"widget": "html",
+		"data" : {
+			"html": "<footer id=\"footer\" class=\"container footer\">\r\n\t<div class=\"copyright\">\r\n\t\tCopyright © 2014 <a target=\"_blank\" href=\"https://nodebb.org\">NodeBB Forums</a> | <a target=\"_blank\" href=\"//github.com/NodeBB/NodeBB/graphs/contributors\">Contributors</a>\r\n\t</div>\r\n</footer>",
+			"title":"",
+			"container":""
+		}
+	}
+]

install/data/navigation.json

@@ -0,0 +1,79 @@
+[
+	{
+		"id": "unread-count",
+		"route": "/unread",
+		"title": "\\[\\[global:header.unread\\]\\]",
+		"enabled": true,
+		"iconClass": "fa-inbox",
+		"textClass": "visible-xs-inline",
+		"text": "\\[\\[global:header.unread\\]\\]",
+		"properties": {
+			"loggedIn": true
+		}
+	},
+	{
+		"route": "/recent",
+		"title": "\\[\\[global:header.recent\\]\\]",
+		"enabled": true,
+		"iconClass": "fa-clock-o",
+		"textClass": "visible-xs-inline",
+		"text": "\\[\\[global:header.recent\\]\\]"
+	},
+	{
+		"route": "/tags",
+		"title": "\\[\\[global:header.tags\\]\\]",
+		"enabled": true,
+		"iconClass": "fa-tags",
+		"textClass": "visible-xs-inline",
+		"text": "\\[\\[global:header.tags\\]\\]"
+	},
+	{
+		"route": "/popular",
+		"title": "\\[\\[global:header.popular\\]\\]",
+		"enabled": true,
+		"iconClass": "fa-fire",
+		"textClass": "visible-xs-inline",
+		"text": "\\[\\[global:header.popular\\]\\]"
+	},
+	{
+		"route": "/users",
+		"title": "\\[\\[global:header.users\\]\\]",
+		"enabled": true,
+		"iconClass": "fa-user",
+		"textClass": "visible-xs-inline",
+		"text": "\\[\\[global:header.users\\]\\]"
+	},
+	{
+		"route": "/groups",
+		"title": "\\[\\[global:header.groups\\]\\]",
+		"enabled": true,
+		"iconClass": "fa-group",
+		"textClass": "visible-xs-inline",
+		"text": "\\[\\[global:header.groups\\]\\]"
+	},
+	{
+		"route": "/admin",
+		"title": "\\[\\[global:header.admin\\]\\]",
+		"enabled": true,
+		"iconClass": "fa-cogs",
+		"textClass": "visible-xs-inline",
+		"text": "\\[\\[global:header.admin\\]\\]",
+		"properties": {
+			"target": "_top",
+			"adminOnly": true
+		}
+	},
+	{
+		"route": "/search",
+		"title": "\\[\\[global:header.search\\]\\]",
+		"enabled": true,
+		"iconClass": "fa-search",
+		"textClass": "visible-xs-inline",
+		"text": "\\[\\[global:header.search\\]\\]",
+		"properties": {
+			"installed": {
+				"search": true
+			}
+		}
+	}
+]

install/data/welcome.md

@@ -0,0 +1,10 @@
+# Welcome to your brand new NodeBB forum!
+
+This is what a topic and post looks like. As an administator, you can edit the post\'s title and content.
+To customise your forum, go to the [Administrator Control Panel](../../admin). You can modify all aspects of your forum there, including installation of third-party plugins.
+
+## Additional Resources
+
+* [NodeBB Documentation](https://docs.nodebb.org)
+* [Community Support Forum](https://community.nodebb.org)
+* [Project repository](https://github.com/nodebb/nodebb)

install/web.js

@@ -0,0 +1,145 @@
+"use strict";
+
+var winston = require('winston'),
+	express = require('express'),
+	bodyParser = require('body-parser'),
+	fs = require('fs'),
+	path = require('path'),
+	less = require('less'),
+	async = require('async'),
+	uglify = require('uglify-js'),
+	nconf = require('nconf'),
+	app = express(),
+	server;
+
+var web = {},
+	scripts = [
+		'public/vendor/xregexp/xregexp.js',
+		'public/vendor/xregexp/unicode/unicode-base.js',
+		'public/src/utils.js',
+		'public/src/installer/install.js'
+	];
+
+web.install = function(port) {
+	port = port || 4567;
+	winston.info('Launching web installer on port', port);
+
+	app.use(express.static('public', {}));
+	app.engine('tpl', require('templates.js').__express);
+	app.set('view engine', 'tpl');
+	app.set('views', path.join(__dirname, '../src/views'));
+	app.use(bodyParser.urlencoded({
+		extended: true
+	})); 
+
+	async.parallel([compileLess, compileJS], function() {
+		setupRoutes();
+		launchExpress(port);
+	});
+};
+
+
+function launchExpress(port) {
+	server = app.listen(port, function() {
+		var host = server.address().address;
+		winston.info('Web installer listening on http://%s:%s', host, port);
+	});
+}
+
+function setupRoutes() {
+	app.get('/', welcome);
+	app.post('/', install);
+	app.post('/launch', launch);
+}
+
+function welcome(req, res) {
+	var dbs = ['redis', 'mongo'],
+		databases = [];
+
+	dbs.forEach(function(el) {
+		databases.push({
+			name: el,
+			questions: require('../src/database/' + el).questions
+		});
+	});
+
+	res.render('install/index', {
+		databases: databases,
+		skipDatabaseSetup: !!nconf.get('database'),
+		error: res.locals.error ? true : false,
+		success: res.locals.success ? true : false,
+		values: req.body
+	});
+}
+
+function install(req, res) {
+	for (var i in req.body) {
+		if (req.body.hasOwnProperty(i) && !process.env.hasOwnProperty(i)) {
+			process.env[i.replace(':', '__')] = req.body[i];
+		}
+	}
+
+	var child = require('child_process').fork('app', ['--setup'], {
+		env: process.env
+	});
+
+	child.on('close', function(data) {
+		if (data === 0) {
+			res.locals.success = true;
+		} else {
+			res.locals.error = true;
+		}
+
+		welcome(req, res);
+	});
+}
+
+function launch(req, res) {
+	var pidFilePath = __dirname + '../pidfile';
+	res.json({});
+	server.close();
+
+	var child = require('child_process').spawn('node', ['loader.js'], {
+		detached: true,
+		stdio: ['ignore', 'ignore', 'ignore']
+	});
+
+	
+	child.unref();
+	process.exit(0);
+	
+}
+
+function compileLess(callback) {
+	if ((nconf.get('from-file') || '').indexOf('less') !== -1) {
+		winston.info('LESS compilation skipped');
+		return callback(false);
+	}
+
+	fs.readFile(path.join(__dirname, '../public/less/install.less'), function(err, style) {
+		less.render(style.toString(), function(err, css) {
+			if(err) {
+				return winston.error('Unable to compile LESS: ', err);
+			}
+
+			fs.writeFile(path.join(__dirname, '../public/stylesheet.css'), css.css, callback);
+		});
+	});
+}
+
+function compileJS(callback) {
+	if ((nconf.get('from-file') || '').indexOf('js') !== -1) {
+		winston.info('Client-side JS compilation skipped');
+		return callback(false);
+	}
+
+	var scriptPath = path.join(__dirname, '..'),
+		result = uglify.minify(scripts.map(function(script) {
+			return path.join(scriptPath, script);
+		}));
+
+
+	fs.writeFile(path.join(__dirname, '../public/nodebb.min.js'), result.code, callback);
+}
+
+module.exports = web;

loader.js

@@ -9,11 +9,15 @@ var	nconf = require('nconf'),
 	async = require('async'),
 	logrotate = require('logrotate-stream'),
 
-	pkg = require('./package.json'),
+	pkg = require('./package.json');
 
-	pidFilePath = __dirname + '/pidfile',
+nconf.argv().env().file({
+	file: path.join(__dirname, '/config.json')
+});
+
+var	pidFilePath = __dirname + '/pidfile',
 	output = logrotate({ file: __dirname + '/logs/output.log', size: '1m', keep: 3, compress: true }),
-	silent = process.env.NODE_ENV !== 'development',
+	silent = nconf.get('silent') === 'false' ? false : nconf.get('silent') !== false,
 	numProcs,
 	workers = [],
 
@@ -82,7 +86,7 @@ Loader.addWorkerEvents = function(worker) {
 		if (message && typeof message === 'object' && message.action) {
 			switch (message.action) {
 				case 'ready':
-					if (Loader.js.cache) {
+					if (Loader.js.cache && !worker.isPrimary) {
 						worker.send({
 							action: 'js-propagate',
 							cache: Loader.js.cache,
@@ -91,7 +95,7 @@ Loader.addWorkerEvents = function(worker) {
 						});
 					}
 
-					if (Loader.css.cache) {
+					if (Loader.css.cache && !worker.isPrimary) {
 						worker.send({
 							action: 'css-propagate',
 							cache: Loader.css.cache,
@@ -99,6 +103,8 @@ Loader.addWorkerEvents = function(worker) {
 							hash: Loader.css.hash
 						});
 					}
+
+
 				break;
 				case 'restart':
 					console.log('[cluster] Restarting...');
@@ -132,6 +138,11 @@ Loader.addWorkerEvents = function(worker) {
 						hash: message.hash
 					}, worker.pid);
 				break;
+				case 'templates:compiled':
+					Loader.notifyWorkers({
+						action: 'templates:compiled',
+					}, worker.pid);
+				break;
 			}
 		}
 	});
@@ -181,7 +192,12 @@ function forkWorker(index, isPrimary) {
 }
 
 function getPorts() {
-	var urlObject = url.parse(nconf.get('url'));
+	var _url = nconf.get('url');
+	if (!_url) {
+		console.log('[cluster] url is undefined, please check your config.json');
+		process.exit();
+	}
+	var urlObject = url.parse(_url);
 	var port = nconf.get('port') || nconf.get('PORT') || urlObject.port || 4567;
 	if (!Array.isArray(port)) {
 		port = [port];
@@ -230,35 +246,38 @@ Loader.notifyWorkers = function(msg, worker_pid) {
 	});
 };
 
-nconf.argv().file({
+fs.open(path.join(__dirname, 'config.json'), 'r', function(err) {
-	file: path.join(__dirname, '/config.json')
+	if (!err) {
-});
+		if (nconf.get('daemon') !== 'false' && nconf.get('daemon') !== false) {
+			if (fs.existsSync(pidFilePath)) {
+				try {
+					var	pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
+					process.kill(pid, 0);
+					process.exit();
+				} catch (e) {
+					fs.unlinkSync(pidFilePath);
+				}
+			}
 
-if (nconf.get('daemon') !== false) {
+			require('daemon')({
-	if (fs.existsSync(pidFilePath)) {
+				stdout: process.stdout,
-		try {
+				stderr: process.stderr
-			var	pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
+			});
-			process.kill(pid, 0);
+
-			process.exit();
+			fs.writeFile(__dirname + '/pidfile', process.pid);
-		} catch (e) {
-			fs.unlinkSync(pidFilePath);
 		}
-	}
 
-	require('daemon')({
+		async.series([
-		stdout: process.stdout,
+			Loader.init,
-		stderr: process.stderr
+			Loader.displayStartupMessages,
-	});
+			Loader.start
-
+		], function(err) {
-	fs.writeFile(__dirname + '/pidfile', process.pid);
+			if (err) {
-}
+				console.log('[loader] Error during startup: ' + err.message);
-
+			}
-async.series([
+		});
-	Loader.init,
+	} else {
-	Loader.displayStartupMessages,
+		// No config detected, kickstart web installer
-	Loader.start
+		var child = require('child_process').fork('app');
-], function(err) {
-	if (err) {
-		console.log('[loader] Error during startup: ' + err.message);
 	}
 });

minifier.js

@@ -6,6 +6,7 @@ var uglifyjs = require('uglify-js'),
 	fs = require('fs'),
 	path = require('path'),
 	crypto = require('crypto'),
+	utils = require('./public/src/utils'),
 
 	Minifier = {
 		js: {}
@@ -14,7 +15,7 @@ var uglifyjs = require('uglify-js'),
 /* Javascript */
 Minifier.js.minify = function (scripts, minify, callback) {
 	scripts = scripts.filter(function(file) {
-		return fs.existsSync(file);
+		return fs.existsSync(file) && file.endsWith('.js');
 	});
 
 	if (minify) {

nodebb

@@ -106,13 +106,14 @@ 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 "$node" loader --no-daemon "$@"
+		NODE_ENV=development "$node" loader --no-daemon --no-silent "$@"
 		;;
 
 	watch)
-		echo "Launching NodeBB in \"development\" mode."
+		echo "***************************************************************************"
-		echo "To run the production build of NodeBB, please use \"forever\"."
+		echo "WARNING: ./nodebb watch will be deprecated soon. Please use grunt: "
-		echo "More Information: https://docs.nodebb.org/en/latest/running/index.html"
+		echo "https://docs.nodebb.org/en/latest/running/index.html#grunt-development"
+		echo "***************************************************************************"
 		NODE_ENV=development supervisor -q --ignore public/templates,public/nodebb.min.js,public/nodebb.min.js.map --extensions 'node|js|tpl|less' -- app "$@"
 		;;
 

package.json

@@ -2,7 +2,7 @@
   "name": "nodebb",
   "license": "GPLv3 or later",
   "description": "NodeBB Forum",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "homepage": "http://www.nodebb.org",
   "repository": {
     "type": "git",
@@ -10,8 +10,7 @@
   },
   "main": "app.js",
   "scripts": {
-    "start": "./nodebb start",
+    "start": "node loader.js",
-    "stop": "./nodebb stop",
     "test": "mocha ./tests -t 10000"
   },
   "dependencies": {
@@ -33,41 +32,49 @@
     "heapdump": "^0.3.0",
     "less": "^2.0.0",
     "logrotate-stream": "^0.2.3",
+    "lru-cache": "^2.6.1",
+    "mime": "^1.3.4",
     "mkdirp": "~0.5.0",
+    "mmmagic": "^0.3.13",
     "morgan": "^1.3.2",
     "nconf": "~0.7.1",
-    "nodebb-plugin-dbsearch": "^0.1.0",
+    "nodebb-plugin-dbsearch": "^0.2.12",
-    "nodebb-plugin-markdown": "^0.8.0",
+    "nodebb-plugin-emoji-extended": "^0.4.8",
-    "nodebb-plugin-mentions": "^0.9.0",
+    "nodebb-plugin-markdown": "^2.1.7",
-    "nodebb-plugin-soundpack-default": "~0.1.1",
+    "nodebb-plugin-mentions": "^0.11.4",
+    "nodebb-plugin-soundpack-default": "^0.1.1",
     "nodebb-plugin-spam-be-gone": "^0.4.0",
-    "nodebb-theme-lavender": "^0.2.0",
+    "nodebb-theme-lavender": "^1.0.42",
-    "nodebb-theme-vanilla": "^0.2.0",
+    "nodebb-theme-vanilla": "^1.0.130",
-    "nodebb-widget-essentials": "~0.2.0",
+    "nodebb-theme-persona": "^0.1.55",
+    "nodebb-widget-essentials": "^1.0.2",
+    "nodebb-rewards-essentials": "^0.0.1",
     "npm": "^2.1.4",
     "passport": "^0.2.1",
     "passport-local": "1.0.0",
     "prompt": "^0.2.14",
     "request": "^2.44.0",
-    "rimraf": "~2.2.6",
+    "rimraf": "~2.3.2",
     "rss": "^1.0.0",
-    "semver": "^4.0.3",
+    "semver": "^4.3.3",
     "serve-favicon": "^2.1.5",
-    "sitemap": "^0.7.4",
+    "sitemap": "^0.8.1",
     "socket.io": "^1.2.1",
     "socket.io-client": "^1.2.1",
     "socket.io-redis": "^0.1.3",
     "socketio-wildcard": "~0.1.1",
     "string": "^3.0.0",
-    "templates.js": "^0.1.15",
+    "templates.js": "^0.2.3",
     "uglify-js": "git+https://github.com/julianlam/UglifyJS2.git",
-    "underscore": "~1.7.0",
+    "underscore": "~1.8.3",
-    "validator": "~3.28.0",
+    "validator": "^3.30.0",
     "winston": "^0.9.0",
     "xregexp": "~2.0.0"
   },
   "devDependencies": {
-    "mocha": "~1.13.0"
+    "mocha": "~1.13.0",
+    "grunt": "~0.4.5",
+    "grunt-contrib-watch": "^0.6.1"
   },
   "bugs": {
     "url": "https://github.com/NodeBB/NodeBB/issues"

public/language/ar/category.json

@@ -1,8 +1,12 @@
 {
     "new_topic_button": "موضوع جديد",
+    "guest-login-post": "المرجو تسجيل الدخول أوَّلا",
     "no_topics": "<strong>لا توجد مواضيع في هذه الفئة</strong>لم لا تحاول إنشاء موضوع؟<br />",
     "browsing": "تصفح",
     "no_replies": "لم يرد أحد",
     "share_this_category": "انشر هذه الفئة",
-    "ignore": "تجاهل"
+    "watch": "Watch",
+    "ignore": "تجاهل",
+    "watch.message": "You are now watching updates from this category",
+    "ignore.message": "You are now ignoring updates from this category"
 }

public/language/ar/email.json

@@ -9,6 +9,9 @@
     "reset.text1": "لقد توصلنا بطلب إعادة تعيين كلمة السرالخاصة بك، ربما لكونك قد نسيتها, إن لم يكن الأمر كذلك، المرجو تجاهل هذه الرسالة.",
     "reset.text2": "لمواصلة طلب إعاة تعيين كلمة السر، المرجو تتبع هذا الرابط.",
     "reset.cta": "انقر هنا لإعادة تعيين كلمة السر الخاصة بك.",
+    "reset.notify.subject": "تم تغيير كلمة المرور بنجاح",
+    "reset.notify.text1": "نحيطك علما أن كلمة مرورك قد تم تغييرها في %1",
+    "reset.notify.text2": "إن لم يكن لديك علم بهذا، المرجو إشعار مدبر النظام بأسرع مايمكن.",
     "digest.notifications": "لديك تنبيهات غير مقروءة من طرف %1:",
     "digest.latest_topics": "آخر المستجدات من %1",
     "digest.cta": "انقر هنا لمشاهدة %1",
@@ -17,8 +20,8 @@
     "notif.chat.subject": "هناك محادثة جديدة من %1",
     "notif.chat.cta": "انقر هنا لمتابعة المحادثة",
     "notif.chat.unsub.info": "تم إرسال هذا الإشعار بوجودة محادثة جديدة وفقا لخيارات تسجيلك.",
-    "notif.post.cta": "Click here to read the full topic",
+    "notif.post.cta": "انقر هنا لقراءة الموضوع بأكمله",
-    "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.",
+    "notif.post.unsub.info": "تم إشعارك بهذه المشاركة بناءً على الخيارات التي سبق وأن حددتها.",
     "test.text1": "هذه رسالة تجريبية للتأكد من صحة إعدادت الرسائل الإلكترونية في منتدى NodeBB خاصتك.",
     "unsub.cta": "انقر هنا لتغيير تلك الإعدادات",
     "closing": "شكرًا لك!"

public/language/ar/error.json

@@ -2,7 +2,7 @@
     "invalid-data": "بيانات غير صالحة",
     "not-logged-in": "لم تقم بتسجيل الدخول",
     "account-locked": "تم إقفال حسابكم مؤقتًا.",
-    "search-requires-login": "البحث في المنتدى يستلزم توفرك على حساب! المرجو تسجيل دخولك أو إنشاء حساب!",
+    "search-requires-login": "Searching requires an account - please login or register.",
     "invalid-cid": "قائمة غير موجودة",
     "invalid-tid": "موضوع غير متواجد",
     "invalid-pid": "رد غير موجود",
@@ -18,11 +18,14 @@
     "username-taken": "اسم المستخدم مأخوذ",
     "email-taken": "البريد الالكتروني مأخوذ",
     "email-not-confirmed": "عنوان بريدك الإلكتروني غير مفعل بعد. انقر هنا لتفعيله من فضلك.",
-    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed",
+    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
+    "no-email-to-confirm": "هذا المنتدى يستلزم تفعيل بريدك الإلكتروني، انقر هنا من فضلك لإدخاله.",
+    "email-confirm-failed": "لم نستطع تفعيل بريدك الإلكتروني، المرجو المحاولة لاحقًا.",
+    "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
     "username-too-short": "اسم المستخدم قصير.",
     "username-too-long": "اسم المستخدم طويل",
     "user-banned": "المستخدم محظور",
-    "user-too-new": "عذرًا، يجب الانتظار %1 ثواني قبل إضافة ردك الأول.",
+    "user-too-new": "عذرا, يجب أن تنتظر 1% ثواني قبل قيامك بأول مشاركة",
     "no-category": "قائمة غير موجودة",
     "no-topic": "موضوع غير موجود",
     "no-post": "رد غير موجود",
@@ -33,19 +36,24 @@
     "no-emailers-configured": "لا يمكن إرسال رسالة إلكترونية تجريبية لعدم وجود قوالب خاصة بالرسائل الإلكترونية،",
     "category-disabled": "قائمة معطلة",
     "topic-locked": "الموضوع مقفول",
+    "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
     "still-uploading": "الرجاء انتظار الرفع",
-    "content-too-short": "المرجو إدخال موضوع أطول من هذا. يجب أن تتوفر المواضيع على %1 حروف على الأقل.",
+    "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
-    "title-too-short": "المرجو إدخال عنوان أطول من هذا. يجب أن تتوفر العناوين على %1 حروف على الأقل.",
+    "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
-    "title-too-long": "المرجو إدخال عنوان أقصر من هذا. يجب ألا تتجاوز العناوين %1 حرفًا.",
+    "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
-    "too-many-posts": "يمكنك إنشاء المواضيع بمعدل موضوع واحد كل %1 ثانية - المرجو الانتظار قليلا.",
+    "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 character(s).",
-    "too-many-posts-newbie": "بصفتك مستخدمًا جديدًا، يمكنك إنشاء المواضيع بمعدل موضوع واحد كل %1 ثانية حتى تحصل على سمعة %2 - المرجو الانتظار قليلا.",
+    "too-many-posts": "You can only post once every %1 second(s) - please wait before posting again",
-    "file-too-big": "حجم الملفات الأقصى المسموح به هو %1 كب - المرجو رفع ملف أقل حجمًا",
+    "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
+    "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",
+    "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 character(s)",
+    "file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
     "cant-vote-self-post": "لايمكنك التصويت لردك",
     "already-favourited": "لقد سبق وأضفت هذا الرد إلى المفضلة",
     "already-unfavourited": "لقد سبق وحذفت هذا الرد من المفضلة",
     "cant-ban-other-admins": "لايمكن حظر مدبر نظام آخر.",
     "invalid-image-type": "Invalid image type. Allowed types are: %1",
     "invalid-image-extension": "Invalid image extension",
+    "invalid-file-type": "Invalid file type. Allowed types are: %1",
     "group-name-too-short": "اسم المجموعة قصير",
     "group-already-exists": "المجموعة موجودة مسبقا",
     "group-name-change-not-allowed": "لايسمح بتغيير أسماء المجموعات",
@@ -55,11 +63,12 @@
     "post-already-restored": "سبق وتم إلغاء حذف هذا الرد",
     "topic-already-deleted": "سبق وتم حذف هذا الموضوع",
     "topic-already-restored": "سبق وتم إلغاء حذف هذا الرد",
+    "cant-purge-main-post": "You can't purge the main post, please delete the topic instead",
     "topic-thumbnails-are-disabled": "الصور المصغرة غير مفعلة.",
     "invalid-file": "ملف غير مقبول",
     "uploads-are-disabled": "رفع الملفات غير مفعل",
-    "upload-error": "مشكلة في الرفع: 1%",
+    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
-    "signature-too-long": "عذرا، توقيعك يجب ألا يتجاوز %1 حرفًا",
+    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
     "cant-chat-with-yourself": "لايمكنك فتح محادثة مع نفسك",
     "chat-restricted": "هذا المستخدم عطل المحادثات الواردة عليه. يجب أن يتبعك حتى تتمكن من فتح محادثة معه.",
     "too-many-messages": "You have sent too many messages, please wait awhile.",
@@ -69,5 +78,7 @@
     "not-enough-reputation-to-flag": "ليس لديك سمعة تكفي للإشعار بموضوع مخل",
     "reload-failed": "المنتدى واجه مشكلة أثناء إعادة التحميل: \"%1\".  سيواصل المنتدى خدمة العملاء السابقين لكن يجب عليك إلغاء أي تغيير قمت به قبل إعادة التحميل.",
     "registration-error": "حدث خطأ أثناء التسجيل",
-    "parse-error": "Something went wrong while parsing server response"
+    "parse-error": "Something went wrong while parsing server response",
+    "wrong-login-type-email": "الرجاء استعمال بريدك اﻹلكتروني للدخول",
+    "wrong-login-type-username": "الرجاء استعمال اسم المستخدم الخاص بك للدخول"
 }

public/language/ar/global.json

@@ -27,7 +27,7 @@
     "header.tags": "وسم",
     "header.popular": "الأكثر شهرة",
     "header.users": "المستخدمين",
-    "header.groups": "Groups",
+    "header.groups": "المجموعات",
     "header.chats": "المحادثات",
     "header.notifications": "التنبيهات",
     "header.search": "بحث",
@@ -75,7 +75,7 @@
     "updated.title": "تم تحديث المنتدى",
     "updated.message": "لقد تم تحديث المنتدى إلى آخر نسخة للتو. المرجو إعادة تحميل الصفحة.",
     "privacy": "الخصوصية",
-    "follow": "Follow",
+    "follow": "متابعة",
-    "unfollow": "Unfollow",
+    "unfollow": "إلغاء المتابعة",
     "delete_all": "حذف الكل"
 }

public/language/ar/groups.json

@@ -1,21 +1,36 @@
 {
     "groups": "المجموعات",
     "view_group": "معاينة المجموعة",
-    "owner": "Group Owner",
+    "owner": "مالك المجموعة",
-    "new_group": "Create New Group",
+    "new_group": "أنشئ مجموعة جديدة",
-    "no_groups_found": "There are no groups to see",
+    "no_groups_found": "لاوجدود لمجموعات يمكن معاينتها",
-    "cover-instructions": "Drag and Drop a photo, drag to position, and hit <strong>Save</strong>",
+    "pending.accept": "موافق",
-    "cover-change": "Change",
+    "pending.reject": "رفض",
-    "cover-save": "Save",
+    "cover-instructions": "اسحب وأسقِط صورة، اسحبها للموضع المرغوب، وانقر على <strong>حفظ</strong>",
-    "cover-saving": "Saving",
+    "cover-change": "تغيير",
+    "cover-save": "حفظ",
+    "cover-saving": "جاري الحفظ",
     "details.title": "تفاصيل المجموعة",
     "details.members": "لائحة الأعضاء",
-    "details.pending": "Pending Members",
+    "details.pending": "المستخدمون في الانتظار",
     "details.has_no_posts": "أعضاء هذه المجموعة لم يضيفوا أية مشاركة",
     "details.latest_posts": "آخر المشاركات",
-    "details.private": "Private Group",
+    "details.private": "خاص",
-    "details.public": "Public Group",
+    "details.grant": "منح/سحب المِلكية",
-    "details.owner_options": "Group Administration",
+    "details.kick": "طرد",
-    "event.updated": "Group details have been updated",
+    "details.owner_options": "إدارة المجموعة",
-    "event.deleted": "The group \"%1\" has been deleted"
+    "details.group_name": "اسم المجموعة",
+    "details.member_count": "عدد اﻷعضاء",
+    "details.creation_date": "تاريخ الإنشاء",
+    "details.description": "الوصف",
+    "details.badge_preview": "معاينة الوسام",
+    "details.change_icon": "تغيير الأيقونة",
+    "details.change_colour": "تغيير اللون",
+    "details.badge_text": "نص الوسام",
+    "details.userTitleEnabled": "إظهار الوسام",
+    "details.private_help": "في حالة تفعيل الخيار، الانضمام إلى المجموعة يستلزم قبول مالكها",
+    "details.hidden": "مخفي",
+    "details.hidden_help": "في حالة تفعيل الخيار، لن تظهر المجموعة للعموم والإنضمام إليها سيتلزم دعوة يدوية.",
+    "event.updated": "تم تحديث بيانات المجموعة",
+    "event.deleted": "تم حذف المجموعة %1"
 }

public/language/ar/login.json

@@ -1,5 +1,7 @@
 {
-    "username": "اسم المستخدم / عنوان البريد الإلكتروني",
+    "username-email": "اسم المستخدم / البريد الإلكتروني",
+    "username": "اسم المستخدم",
+    "email": "البريد الإلكتروني",
     "remember_me": "تذكرني؟",
     "forgot_password": "نسيت كلمة المرور؟",
     "alternative_logins": "تسجيلات الدخول البديلة",

public/language/ar/modules.json

@@ -15,7 +15,12 @@
     "chat.seven_days": "7 أيام",
     "chat.thirty_days": "30 يومًا",
     "chat.three_months": "3 أشهر",
+    "composer.compose": "Compose",
+    "composer.show_preview": "عرض المعاينة",
+    "composer.hide_preview": "إخفاء المعاينة",
     "composer.user_said_in": "%1 كتب في  %2",
     "composer.user_said": "%1 كتب:",
-    "composer.discard": "هل أنت متأكد أنك تريد التخلي عن التغييرات؟"
+    "composer.discard": "هل أنت متأكد أنك تريد التخلي عن التغييرات؟",
+    "composer.submit_and_lock": "Submit and Lock",
+    "composer.toggle_dropdown": "Toggle Dropdown"
 }

public/language/ar/notifications.json

@@ -1,7 +1,8 @@
 {
-    "title": "تنبيهات",
+    "title": "التنبيهات",
     "no_notifs": "ليس لديك أية تنبيهات جديدة",
     "see_all": "معاينة كل التنبيهات",
+    "mark_all_read": "اجعل كل التنبيهات مقروءة",
     "back_to_home": "عودة إلى %1",
     "outgoing_link": "رابط خارجي",
     "outgoing_link_message": "أنت تغادر %1 حاليا.",
@@ -21,7 +22,6 @@
     "user_started_following_you": "<strong>%1</strong> صار يتابعك.",
     "email-confirmed": "تم التحقق من عنوان البريد الإلكتروني",
     "email-confirmed-message": "شكرًا على إثبات صحة عنوان بريدك الإلكتروني. صار حسابك مفعلًا بالكامل.",
-    "email-confirm-error": "حدث خطأ ما...",
     "email-confirm-error-message": "حدث خطأ أثناء التحقق من عنوان بريدك الإلكتروني. ربما رمز التفعيل خاطئ أو انتهت صلاحيته.",
     "email-confirm-sent": "تم إرسال بريد التفعيل."
 }

public/language/ar/pages.json

@@ -1,18 +1,21 @@
 {
     "home": "الصفحة الرئيسية",
-    "unread": "المواضيع غير المقروءة",
+    "unread": "المواضيع الغير مقروءة",
     "popular": "المواضيع الأكثر شهرة",
     "recent": "المواضيع الحديثة",
-    "users": "المستخدمون المسجلون",
+    "users": "اﻷعضاء المسجلون",
     "notifications": "التنبيهات",
-    "tags": "المواضيع المرتبطة بالوسم %1",
+    "tags": "Tags",
+    "tag": "Topics tagged under \"%1\"",
     "user.edit": "تعديل \"%1\"",
     "user.following": "المستخدمون الذين يتبعهم %1",
     "user.followers": "المستخدمون الذين يتبعون %1",
     "user.posts": "ردود  %1",
     "user.topics": "مواضيع %1",
+    "user.groups": "%1's Groups",
     "user.favourites": "مفضلات %1",
     "user.settings": "خيارات المستخدم",
+    "user.watched": "Topics watched by %1",
     "maintenance.text": "جاري صيانة %1. المرجو العودة لاحقًا.",
     "maintenance.messageIntro": "بالإضافة إلى ذلك، قام مدبر النظام بترك هذه الرسالة:"
 }

public/language/ar/recent.json

@@ -5,14 +5,15 @@
     "month": "شهر",
     "year": "سنة",
     "alltime": "دائمًا",
-    "no_recent_topics": "لاوجود لمشاركات جديدة",
+    "no_recent_topics": "لايوجد مواضيع جديدة",
-    "there-is-a-new-topic": "There is a new topic.",
+    "no_popular_topics": "There are no popular topics.",
-    "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.",
+    "there-is-a-new-topic": "يوجد موضوع جديد",
-    "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.",
+    "there-is-a-new-topic-and-a-new-post": "يوجد موضوع جديد و رد جديد",
-    "there-are-new-topics": "There are %1 new topics.",
+    "there-is-a-new-topic-and-new-posts": "يوجد موضوع جديد و %1 ردود جديدة ",
-    "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.",
+    "there-are-new-topics": "يوجد %1 مواضيع جديدة",
-    "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.",
+    "there-are-new-topics-and-a-new-post": "يوجد %1 مواضيع جديدة و رد جديد",
-    "there-is-a-new-post": "There is a new post.",
+    "there-are-new-topics-and-new-posts": "يوجد %1 مواضيع جديدة و %2 مشاركات جديدة",
-    "there-are-new-posts": "There are %1 new posts.",
+    "there-is-a-new-post": "يوجد مشاركة جديدة",
-    "click-here-to-reload": "Click here to reload."
+    "there-are-new-posts": "يوجد %1 مشاركات جديدة",
+    "click-here-to-reload": "إضغط هنا لإعادة التحميل"
 }

public/language/ar/register.json

@@ -13,6 +13,6 @@
     "confirm_password_placeholder": "تأكيد كلمة السر",
     "register_now_button": "قم بالتسجيل الآن",
     "alternative_registration": "طريقة تسجيل بديلة",
-    "terms_of_use": "قوانين الاستخدام",
+    "terms_of_use": "شروط الاستخدام",
-    "agree_to_terms_of_use": "أوافق على قوانين الاستخدام"
+    "agree_to_terms_of_use": "أوافق على شروط الاستخدام"
 }

public/language/ar/reset_password.json

@@ -10,5 +10,8 @@
     "enter_email": "يرجى إدخال <strong>عنوان البريد الإلكتروني</strong> الخاص بك وسوف نرسل لك رسالة بالبريد الالكتروني مع تعليمات حول كيفية إستعادة حسابك.",
     "enter_email_address": "ادخل عنوان البريد الإلكتروني",
     "password_reset_sent": "إعادة تعيين كلمة السر أرسلت",
-    "invalid_email": "بريد إلكتروني غير صالح أو غير موجود"
+    "invalid_email": "بريد إلكتروني غير صالح أو غير موجود",
+    "password_too_short": "The password entered is too short, please pick a different password.",
+    "passwords_do_not_match": "The two passwords you've entered do not match.",
+    "password_expired": "Your password has expired, please choose a new password"
 }

public/language/ar/search.json

@@ -1,7 +1,40 @@
 {
     "results_matching": "%1 نتيجة (نتائج) موافقة ل \"%2\", (%3 ثواني)",
     "no-matches": "No matches found",
-    "in": "In",
+    "advanced-search": "بحث متقدم",
-    "by": "By",
+    "in": "في",
-    "posted-by": "Posted by"
+    "titles": "العناوين",
+    "titles-posts": "العناوين والمشاركات",
+    "posted-by": "Posted by",
+    "in-categories": "في الفئات",
+    "search-child-categories": "بحث في الفئات الفرعية",
+    "reply-count": "Reply Count",
+    "at-least": "At least",
+    "at-most": "At most",
+    "post-time": "تاريخ المشاركة",
+    "newer-than": "أحدث من",
+    "older-than": "أقدم من",
+    "any-date": "أي وقت",
+    "yesterday": "أمس",
+    "one-week": "أسبوع",
+    "two-weeks": "أسبوعان",
+    "one-month": "شهر",
+    "three-months": "ثلاثة أشهر",
+    "six-months": "ستة أشهر",
+    "one-year": "عام",
+    "sort-by": "Sort by",
+    "last-reply-time": "تاريخ آخر رد",
+    "topic-title": "عنوان الموضوع",
+    "number-of-replies": "عدد الردود",
+    "number-of-views": "عدد المشاهدات",
+    "topic-start-date": "تاريخ بدأ الموضوع",
+    "username": "اسم المستخدم",
+    "category": "فئة",
+    "descending": "In descending order",
+    "ascending": "In ascending order",
+    "save-preferences": "حفظ التفضيلات",
+    "clear-preferences": "Clear preferences",
+    "search-preferences-saved": "تم حفظ تفضيلات البحث",
+    "search-preferences-cleared": "Search preferences cleared",
+    "show-results-as": "عرض النتائج كـ"
 }

public/language/ar/tags.json

@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "لاوجود لمواضيع تحمل هذا الوسم.",
     "tags": "بطاقات",
-    "enter_tags_here": "أدخل البطاقات هنا. اضغط ENTER بعد كل بطاقة.",
+    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "أدخل البطاقات...",
     "no_tags": "لاتوجد هناك بطاقات بعد."
 }

public/language/ar/topic.json

@@ -5,6 +5,7 @@
     "no_topics_found": "لا توجد مواضيع !",
     "no_posts_found": "لا  توجد مشاركات!",
     "post_is_deleted": "هذه المشاركة محذوفة!",
+    "topic_is_deleted": "هذا الموضوع محذوف",
     "profile": "الملف الشخصي",
     "posted_by": "كتب من طرف %1",
     "posted_by_guest": "كتب من طرف زائر",
@@ -12,20 +13,21 @@
     "notify_me": "تلق تنبيهات بالردود الجديدة في هذا الموضوع",
     "quote": "اقتبس",
     "reply": "رد",
+    "guest-login-reply": "يجب عليك تسجيل الدخول للرد",
     "edit": "تعديل",
     "delete": "حذف",
     "purge": "تطهير",
     "restore": "استعادة",
-    "move": "انقل",
+    "move": "نقل",
     "fork": "فرع",
     "link": "رابط",
     "share": "نشر",
     "tools": "أدوات",
-    "flag": "اشعار بمشاركة مخلة",
+    "flag": "تبليغ",
     "locked": "مقفل",
-    "bookmark_instructions": "انقر هنا للإكمال أو أغلق للإلغاء.",
+    "bookmark_instructions": "إضغط هنا للعودة إلى آخر موضع أو غلق للإلغاء",
     "flag_title": "إشعار بمشاركة مخلة.",
-    "flag_confirm": "هل تريد حقًّا أن تشعر بهذه المشاركة على أنها مخلة؟",
+    "flag_confirm": "هل تريد حقًّا التبليغ بهذه المشاركة؟",
     "flag_success": "تم الإشعار بهذه المشاركة على أنها مخلة",
     "deleted_message": "هذه المشاركة محذوفة. فقط من لهم صلاحية الإشراف على ا لمشاركات يمكنهم معاينتها.",
     "following_topic.message": "ستستلم تنبيها عند كل مشاركة جديدة في هذا الموضوع.",
@@ -94,5 +96,5 @@
     "oldest_to_newest": "من الأقدم إلى الأحدث",
     "newest_to_oldest": "من الأحدث إلى الأقدم",
     "most_votes": "الأكثر تصويتًا",
-    "most_posts": "Most posts"
+    "most_posts": "اﻷكثر رداً"
 }

public/language/ar/unread.json

@@ -3,7 +3,7 @@
     "no_unread_topics": "ليس هناك أي موضوع غير مقروء",
     "load_more": "حمل المزيد",
     "mark_as_read": "حدد غير مقروء",
-    "selected": "المختارة",
+    "selected": "المحددة",
     "all": "الكل",
     "topics_marked_as_read.success": "تم تحديد المواضيع على أنها مقروءة!"
 }

public/language/ar/user.json

@@ -1,9 +1,9 @@
 {
     "banned": "محظور",
-    "offline": "ليس موجود حالياً",
+    "offline": "غير متصل",
     "username": "إسم المستخدم",
-    "joindate": "Join Date",
+    "joindate": "تاريخ الإنضمام",
-    "postcount": "Post Count",
+    "postcount": "عدد المشاركات",
     "email": "البريد الإلكتروني",
     "confirm_email": "تأكيد عنوان البريد الإلكتروني",
     "delete_account": "حذف الحساب",
@@ -15,24 +15,26 @@
     "joined": "تاريخ التسجيل",
     "lastonline": "تاريخ آخر دخول",
     "profile": "الملف الشخصي",
-    "profile_views": "عدد مشاهدات الملف الشخصي",
+    "profile_views": "عدد المشاهدات",
     "reputation": "السمعة",
-    "favourites": "المفضلات",
+    "favourites": "التفضيلات",
-    "watched": "Watched",
+    "watched": "متابع",
     "followers": "المتابعون",
     "following": "يتابع",
+    "aboutme": "About me",
     "signature": "توقيع",
     "gravatar": "Gravatar",
     "birthday": "عيد ميلاد",
     "chat": "محادثة",
     "follow": "تابع",
     "unfollow": "إلغاء المتابعة",
+    "more": "المزيد",
     "profile_update_success": "تم تحديث الملف الشخصي بنجاح",
     "change_picture": "تغيير الصورة",
     "edit": "تعديل",
     "uploaded_picture": "الصورة المرفوعة",
     "upload_new_picture": "رفع صورة جديدة",
-    "upload_new_picture_from_url": "رفع صورة جديدة بواسطة رابط",
+    "upload_new_picture_from_url": "رفع صورة جديدة من رابط",
     "current_password": "كلمة السر الحالية",
     "change_password": "تغيير كلمة السر",
     "change_password_error": "كلمة سر غير صحيحة",
@@ -47,7 +49,6 @@
     "upload_picture": "ارفع الصورة",
     "upload_a_picture": "رفع صورة",
     "image_spec": "لايمكنك رفع إلا الصور ذات الصيغ PNG أو JPG أو GIF.",
-    "max": "الحد الأقصى",
     "settings": "خيارات",
     "show_email": "أظهر بريدي الإلكتروني",
     "show_fullname": "أظهر اسمي الكامل",
@@ -60,6 +61,7 @@
     "digest_monthly": "شهريًّا",
     "send_chat_notifications": "استلام رسالة إلكترونية عند ورود محادثة وأنا غير متصل.",
     "send_post_notifications": "Send an email when replies are made to topics I am subscribed to",
+    "settings-require-reload": "تغيير بعض اﻹعدادات يتطلب تحديث الصفحة. إضغط هنا لتحديث الصفحة",
     "has_no_follower": "هذا المستخدم ليس لديه أي متابع :(",
     "follows_no_one": "هذا المستخدم لا يتابع أحد :(",
     "has_no_posts": "هذا المستخدم لم يكتب أي شيء بعد.",
@@ -67,14 +69,16 @@
     "has_no_watched_topics": "This user didn't watch any topics yet.",
     "email_hidden": "البريد الإلكتروني مخفي",
     "hidden": "مخفي",
-    "paginate_description": "عرض المواضيع والردود موزعة على صفحات عوض صفحة واحدة.",
+    "paginate_description": "Paginate topics and posts instead of using infinite scroll",
     "topics_per_page": "المواضيع في كل صفحة",
     "posts_per_page": "الردود في كل صفحة",
-    "notification_sounds": "تشغيل ملف صوتي عند استلام التنبيهات.",
+    "notification_sounds": "تشغيل صوت عند تلقي تنبيه",
     "browsing": "خيارات التصفح",
-    "open_links_in_new_tab": "فتح الروابط الخارجية في تبويب جديد؟",
+    "open_links_in_new_tab": "فتح الروابط الخارجية في نافدة جديدة",
     "enable_topic_searching": "تفعيل خاصية البحث داخل المواضيع",
-    "topic_search_help": "في حالة تفعيلها، ستعوض خاصيةُ البحث داخل المواضيع خاصيةَ البحث الخاصة بالمتصفح، فتمكنك بالتالي بالبحث في الموضوع بأكمله دون الاقتصار على مايظهر في الشاشة فحسب.",
+    "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
-    "follow_topics_you_reply_to": "متابعة المشاركات التي ترد عليها",
+    "follow_topics_you_reply_to": "متابعة المواضيع التي تقوم بالرد فيها",
-    "follow_topics_you_create": "متابعة المشاركات التي تكتبها"
+    "follow_topics_you_create": "متابعة المواضيع التي تنشئها",
+    "grouptitle": "Select the group title you would like to display",
+    "no-group-title": "No group title"
 }

public/language/ar/users.json

@@ -1,12 +1,12 @@
 {
-    "latest_users": "أحدث المستخدمين",
+    "latest_users": "أحدث الأعضاء",
-    "top_posters": "أكثر المشتركين",
+    "top_posters": "اﻷكثر مشاركة",
     "most_reputation": "أعلى سمعة",
     "search": "بحث",
     "enter_username": "أدخل اسم مستخدم للبحث",
     "load_more": "حمل المزيد",
-    "users-found-search-took": "تم إيجاد %1 مستخدمـ(ين)! استغرق البحث %2 ميليثانية.",
+    "users-found-search-took": "%1 user(s) found! Search took %2 seconds.",
     "filter-by": "Filter By",
-    "online-only": "Online only",
+    "online-only": "المتصلون فقط",
     "picture-only": "Picture only"
 }

public/language/bg/category.json

@@ -0,0 +1,12 @@
+{
+    "new_topic_button": "Нова тема",
+    "guest-login-post": "Влезте, за да можете да публикувате",
+    "no_topics": "<strong>Все още няма теми в тази категория.</strong><br />Защо не създадеш една?",
+    "browsing": "Разглежда",
+    "no_replies": "Все още никой не е отговорил",
+    "share_this_category": "Споделяне на тази категория",
+    "watch": "Следене",
+    "ignore": "Игнориране",
+    "watch.message": "Вече следите обновленията в тази категория",
+    "ignore.message": "Вече не следите обновленията в тази категория"
+}

public/language/bg/email.json

@@ -0,0 +1,28 @@
+{
+    "password-reset-requested": "Изпратена е заявка за подновяване на паролата – %1!",
+    "welcome-to": "Добре дошли в %1",
+    "greeting_no_name": "Здравейте",
+    "greeting_with_name": "Здравейте, %1",
+    "welcome.text1": "Благодарим Ви, че се регистрирахте с %1",
+    "welcome.text2": "За да активирате напълно Вашия акаунт, трябва да потвърдите е-пощата, с която сте се регистрирали.",
+    "welcome.cta": "Натиснете тук, за да потвърдите Вашата е-поща.",
+    "reset.text1": "Получихме заявка за подновяване на Вашата парола, най-вероятно защото сте я забравили. Ако това не е така, моля не обръщайте внимание на това е-писмо.",
+    "reset.text2": "За да продължите с процедурата по подновяване на паролата, моля последвайте следната връзка:",
+    "reset.cta": "Натиснете тук, за да подновите  паролата си",
+    "reset.notify.subject": "Паролата беше променена успешно",
+    "reset.notify.text1": "Известяваме Ви, че на %1, Вашата парола беше променена успешно.",
+    "reset.notify.text2": "Ако не сте поискали това, моля, свържете се незабавно с администратор.",
+    "digest.notifications": "Имате непрочетени известия от %1:",
+    "digest.latest_topics": "Последни теми от %1",
+    "digest.cta": "Натиснете тук, за да посетите %1",
+    "digest.unsub.info": "Това резюме беше изпратено до Вас поради настройките Ви за абонаментите.",
+    "digest.no_topics": "Не е имало дейност по темите в последните %1",
+    "notif.chat.subject": "Получено е ново чат съобщение от %1",
+    "notif.chat.cta": "Натиснете тук, за да продължите разговора",
+    "notif.chat.unsub.info": "Това известие за чата беше изпратено до Вас поради настройките Ви за абонаментите.",
+    "notif.post.cta": "Натиснете тук, за да прочетете цялата тема",
+    "notif.post.unsub.info": "Това известие за публикация беше изпратено до Вас поради настройките Ви за абонаментите.",
+    "test.text1": "Това е пробно е-писмо, за да потвърдим, че изпращачът на е-поща е правилно настроен за Вашия NodeBB.",
+    "unsub.cta": "Натиснете тук, за да промените тези настройки",
+    "closing": "Благодарим Ви!"
+}

public/language/bg/error.json

@@ -0,0 +1,84 @@
+{
+    "invalid-data": "Невалидни данни",
+    "not-logged-in": "Изглежда не сте влезли в системата.",
+    "account-locked": "Вашият акаунт беше заключен временно",
+    "search-requires-login": "Търсенето изисква акаунт – моля, влезте или се регистрирайте.",
+    "invalid-cid": "Невалиден идентификатор на категория",
+    "invalid-tid": "Невалиден идентификатор на тема",
+    "invalid-pid": "Невалиден идентификатор на публикация",
+    "invalid-uid": "Невалиден идентификатор на потребител",
+    "invalid-username": "Невалидно потребителско име",
+    "invalid-email": "Невалидна е-поща",
+    "invalid-title": "Невалидно заглавие!",
+    "invalid-user-data": "Невалидни потребителски данни",
+    "invalid-password": "Невалидна парола",
+    "invalid-username-or-password": "Моля, посочете потребителско име и парола",
+    "invalid-search-term": "Невалиден текст за търсене",
+    "invalid-pagination-value": "Невалиден номер на страница",
+    "username-taken": "Потребителското име е заето",
+    "email-taken": "Е-пощата е заета",
+    "email-not-confirmed": "Вашата е-поща все още не е потвърдена. Моля, натиснете тук, за да потвърдите е-пощата си.",
+    "email-not-confirmed-chat": "Няма да можете да пишете в чата, докато е-пощата Ви не бъде потвърдена. Моля, натиснете тук, за да потвърдите е-пощата си.",
+    "no-email-to-confirm": "Този форум изисква потвърдена е-поща. Моля, натиснете тук, за да въведете е-поща",
+    "email-confirm-failed": "Не успяхме да потвърдим е-пощата Ви. Моля, опитайте отново по-късно.",
+    "confirm-email-already-sent": "Е-писмото за потвърждение вече е изпратено. Моля, почакайте още %1 минута/и, преди да изпратите ново.",
+    "username-too-short": "Потребителското име е твърде кратко",
+    "username-too-long": "Потребителското име е твърде дълго",
+    "user-banned": "Потребителят е блокиран",
+    "user-too-new": "Съжаляваме, но трябва да изчакате поне %1 секунда/и, преди да направите първата си публикация",
+    "no-category": "Категорията не съществува",
+    "no-topic": "Темата не съществува",
+    "no-post": "Публикацията не съществува",
+    "no-group": "Групата не съществува",
+    "no-user": "Потребителят не съществува",
+    "no-teaser": "Резюмето не съществува",
+    "no-privileges": "Нямате достатъчно права за това действие.",
+    "no-emailers-configured": "Добавките за е-поща не са заредени, така че не може да бъде изпратено пробно е-писмо",
+    "category-disabled": "Категорията е изключена",
+    "topic-locked": "Темата е заключена",
+    "post-edit-duration-expired": "Можете да редактирате публикациите си до %1 секунда/и, след като ги пуснете",
+    "still-uploading": "Моля, изчакайте качването да приключи.",
+    "content-too-short": "Моля, въведете по-дълъг текст на публикацията. Публикациите трябва да съдържат поне %1 символ(а).",
+    "content-too-long": "Моля, въведете по-кратък текст на публикацията. Публикациите трябва да съдържат не повече от %1 символ(а).",
+    "title-too-short": "Моля, въведете по-дълго заглавие. Заглавията трябва да съдържат поне %1 символ(а).",
+    "title-too-long": "Моля, въведете по-кратко заглавие. Заглавията трябва да съдържат не повече от %1 символ(а).",
+    "too-many-posts": "Можете да публикувате веднъж на %1 секунда/и – моля, изчакайте малко, преди да опитате да публикувате отново",
+    "too-many-posts-newbie": "Като нов потребител, Вие можете да публикувате веднъж на %1 секунда/и, докато не натрупате %2 репутация – моля, изчакайте малко, преди да опитате да публикувате отново",
+    "tag-too-short": "Моля, въведете по-дълъг етикет. Етикетите трябва да съдържат поне %1 символ(а)",
+    "tag-too-long": "Моля, въведете по-кратък етикет. Етикетите трябва да съдържат не повече от %1 символ(а)",
+    "file-too-big": "Максималният разрешен размер на файл е %1 КБ – моля, качете по-малък файл",
+    "cant-vote-self-post": "Не можете да гласувате за собствената си публикация",
+    "already-favourited": "Вече сте отбелязали тази публикация като любима",
+    "already-unfavourited": "Вече сте премахнали тази публикация от любимите си",
+    "cant-ban-other-admins": "Не можете да блокирате другите администратори!",
+    "invalid-image-type": "Грешен тип на изображение. Позволените типове са: %1",
+    "invalid-image-extension": "Грешно разширение на изображението",
+    "invalid-file-type": "Грешен тип на файл. Позволените типове са: %1",
+    "group-name-too-short": "Името на групата е твърде кратко",
+    "group-already-exists": "Вече съществува такава група",
+    "group-name-change-not-allowed": "Промяната на името на групата не е разрешено",
+    "group-already-member": "Вече сте част от тази група",
+    "group-needs-owner": "Тази група се нуждае от поне един собственик",
+    "post-already-deleted": "Тази публикация вече е изтрита",
+    "post-already-restored": "Тази публикация вече е възстановена",
+    "topic-already-deleted": "Тази тема вече е изтрита",
+    "topic-already-restored": "Тази тема вече е възстановена",
+    "cant-purge-main-post": "Не можете да изчистите първоначалната публикация. Моля, вместо това изтрийте темата.",
+    "topic-thumbnails-are-disabled": "Иконките на темите са изключени.",
+    "invalid-file": "Грешен файл",
+    "uploads-are-disabled": "Качването не е разрешено",
+    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
+    "cant-chat-with-yourself": "Не можете да пишете чат съобщение на себе си!",
+    "chat-restricted": "Този потребител е ограничил чат съобщенията до себе си. Той трябва първо да Ви последва, преди да можете да си пишете с него.",
+    "too-many-messages": "Изпратили сте твърде много съобщения. Моля, изчакайте малко.",
+    "reputation-system-disabled": "Системата за репутация е изключена.",
+    "downvoting-disabled": "Отрицателното гласуване е изключено",
+    "not-enough-reputation-to-downvote": "Нямате достатъчно репутация, за да гласувате отрицателно за тази публикация",
+    "not-enough-reputation-to-flag": "Нямате достатъчно репутация, за да докладвате тази публикация",
+    "reload-failed": "NodeBB срещна проблем при презареждането: „%1“. NodeBB ще продължи да поддържа съществуващите клиентски ресурси, но Вие трябва да отмените последните си действия преди презареждането.",
+    "registration-error": "Грешка при регистрацията",
+    "parse-error": "Нещо се обърка при прочитането на отговора на сървъра",
+    "wrong-login-type-email": "Моля, използвайте е-пощата си, за да влезете",
+    "wrong-login-type-username": "Моля, използвайте потребителското си име, за да влезете"
+}

public/language/bg/global.json

@@ -0,0 +1,81 @@
+{
+    "home": "Начало",
+    "search": "Търсене",
+    "buttons.close": "Затваряне",
+    "403.title": "Достъпът е отказан",
+    "403.message": "Изглежда сте посетили страница, до която нямате достъп.",
+    "403.login": "Може би трябва да <a href='%1/login'>опитате да влезете</a>?",
+    "404.title": "Не е открита",
+    "404.message": "Изглежда сте се опитали да посетите страница, която не съществува. Върнете се към <a href='%1/'>началната страница</a>.",
+    "500.title": "Вътрешна грешка.",
+    "500.message": "Опа! Изглежда нещо се обърка!",
+    "register": "Регистриране",
+    "login": "Влизане",
+    "please_log_in": "Моля, влезте",
+    "logout": "Изход",
+    "posting_restriction_info": "Публикуването в момента е позволено само за регистрираните потребители. Натиснете тук, за да влезете.",
+    "welcome_back": "Добре дошли отново",
+    "you_have_successfully_logged_in": "Вие влязохте успешно",
+    "save_changes": "Запазване на промените",
+    "close": "Затваряне",
+    "pagination": "Страници",
+    "pagination.out_of": "%1 от %2",
+    "pagination.enter_index": "Въведете номер",
+    "header.admin": "Администратор",
+    "header.recent": "Скорошни",
+    "header.unread": "Непрочетени",
+    "header.tags": "Етикети",
+    "header.popular": "Популярни",
+    "header.users": "Потребители",
+    "header.groups": "Групи",
+    "header.chats": "Чатове",
+    "header.notifications": "Известия",
+    "header.search": "Търсене",
+    "header.profile": "Профил",
+    "notifications.loading": "Зареждане на известията",
+    "chats.loading": "Зареждане на чатовете",
+    "motd.welcome": "Добре дошли в NodeBB, системата за дискусии на бъдещето.",
+    "previouspage": "Предишна страница",
+    "nextpage": "Следваща страница",
+    "alert.success": "Готово",
+    "alert.error": "Грешка",
+    "alert.banned": "Блокиран",
+    "alert.banned.message": "Вие току-що бяхте блокиран. Сега ще излезете от системата.",
+    "alert.unfollow": "Вие вече не следвате %1!",
+    "alert.follow": "Вие следвате %1!",
+    "online": "На линия",
+    "users": "Потребители",
+    "topics": "Теми",
+    "posts": "Публикации",
+    "views": "Преглеждания",
+    "reputation": "Репутация",
+    "read_more": "още",
+    "posted_ago_by_guest": "публикувано %1 от гост",
+    "posted_ago_by": "публикувано %1 от %2",
+    "posted_ago": "публикувано %1",
+    "posted_in_ago_by_guest": "публикувано в %1 %2 от гост",
+    "posted_in_ago_by": "публикувано в %1 %2 от %3",
+    "posted_in_ago": "публикувано в %1 %2",
+    "replied_ago": "отговори %1",
+    "user_posted_ago": "%1 публикува %2",
+    "guest_posted_ago": "гост публикува %1",
+    "last_edited_by_ago": "последно редактирано от %1 %2",
+    "norecentposts": "Няма скорошни публикации",
+    "norecenttopics": "Няма скорошни теми",
+    "recentposts": "Скорошни публикации",
+    "recentips": "Наскоро ползвани IP адреси",
+    "away": "Отсъстващ",
+    "dnd": "Отпочиващ",
+    "invisible": "Невидим",
+    "offline": "Извън линия",
+    "email": "Е-поща",
+    "language": "Език",
+    "guest": "Гост",
+    "guests": "Гости",
+    "updated.title": "Форумът е актуализиран",
+    "updated.message": "Този форум току-що беше актуализиран до най-новата версия. Натиснете тук, за да опресните страницата.",
+    "privacy": "Поверителност",
+    "follow": "Следване",
+    "unfollow": "Прекратяване на следването",
+    "delete_all": "Изтриване на всичко"
+}

public/language/bg/groups.json

@@ -0,0 +1,36 @@
+{
+    "groups": "Групи",
+    "view_group": "Преглед на групата",
+    "owner": "Собственик на групата",
+    "new_group": "Създаване на нова група",
+    "no_groups_found": "Няма групи",
+    "pending.accept": "Приемане",
+    "pending.reject": "Отхвърляне",
+    "cover-instructions": "Плъзнете снимка, наместете я в предпочитаната позиция и натистнете <strong>Запазване</strong>",
+    "cover-change": "Промяна",
+    "cover-save": "Запазване",
+    "cover-saving": "Запазване",
+    "details.title": "Подробности за групата",
+    "details.members": "Списък на членовете",
+    "details.pending": "Кандидатстващи членове",
+    "details.has_no_posts": "Членовете на тази група не са публикували нищо.",
+    "details.latest_posts": "Скорошни публикации",
+    "details.private": "Частна",
+    "details.grant": "Даване/отнемане на собственост",
+    "details.kick": "Изгонване",
+    "details.owner_options": "Администрация на групата",
+    "details.group_name": "Име на групата",
+    "details.member_count": "Брой на членовете",
+    "details.creation_date": "Дата на създаване",
+    "details.description": "Описание",
+    "details.badge_preview": "Преглед на емблемата",
+    "details.change_icon": "Промяна на иконката",
+    "details.change_colour": "Промяна на цвета",
+    "details.badge_text": "Текст на емблемата",
+    "details.userTitleEnabled": "Показване на емблемата",
+    "details.private_help": "Ако е включено, присъединяването към група изисква одобрението на собственика ѝ",
+    "details.hidden": "Скрита",
+    "details.hidden_help": "Ако е включено, тази група няма да бъде извеждана в списъка от групи и потребителите ще трябва да бъдат поканени лично",
+    "event.updated": "Подробностите за групата бяха обновени",
+    "event.deleted": "Групата „%1“ беше изтрита"
+}

public/language/bg/language.json

@@ -0,0 +1,5 @@
+{
+    "name": "Български",
+    "code": "bg",
+    "dir": "ltr"
+}

public/language/bg/login.json

@@ -0,0 +1,11 @@
+{
+    "username-email": "Потребителско име / е-поща",
+    "username": "Потребителско име",
+    "email": "Е-поща",
+    "remember_me": "Запомнете ме?",
+    "forgot_password": "Забравена парола?",
+    "alternative_logins": "Други начини за влизане",
+    "failed_login_attempt": "Неуспешно влизане. Моля, опитайте отново.",
+    "login_successful": "Вие влязохте успешно!",
+    "dont_have_account": "Нямате акаунт?"
+}

public/language/bg/modules.json

@@ -0,0 +1,26 @@
+{
+    "chat.chatting_with": "Чат с <span id=\"chat-with-name\"></span>",
+    "chat.placeholder": "Въведете чат съобщението тук и натиснете Ентер за изпращане",
+    "chat.send": "Изпращане",
+    "chat.no_active": "Нямате текущи чатове.",
+    "chat.user_typing": "%1 пише...",
+    "chat.user_has_messaged_you": "%1 Ви написа съобщение.",
+    "chat.see_all": "Вижте всички чатове",
+    "chat.no-messages": "Моля, изберете получател, за да видите историята на чат съобщенията",
+    "chat.recent-chats": "Скорошни чатове",
+    "chat.contacts": "Контакти",
+    "chat.message-history": "История на съобщенията",
+    "chat.pop-out": "Отделяне на чата в прозорец",
+    "chat.maximize": "Уголемяване",
+    "chat.seven_days": "7 дни",
+    "chat.thirty_days": "30 дни",
+    "chat.three_months": "3 месеца",
+    "composer.compose": "Писане",
+    "composer.show_preview": "Показване на прегледа",
+    "composer.hide_preview": "Скриване на прегледа",
+    "composer.user_said_in": "%1 каза в %2:",
+    "composer.user_said": "%1 каза:",
+    "composer.discard": "Сигурни ли сте, че искате да отхвърлите тази публикация?",
+    "composer.submit_and_lock": "Публикуване и заключване",
+    "composer.toggle_dropdown": "Превключване на падащото меню"
+}

public/language/bg/notifications.json

@@ -0,0 +1,27 @@
+{
+    "title": "Известия",
+    "no_notifs": "Нямате нови известия",
+    "see_all": "Вижте всички известия",
+    "mark_all_read": "Отбелязване на всички известия като прочетени",
+    "back_to_home": "Назад към %1",
+    "outgoing_link": "Външна връзка",
+    "outgoing_link_message": "Вие напускате %1.",
+    "continue_to": "Продължаване към %1",
+    "return_to": "Връщане към %1",
+    "new_notification": "Ново известие",
+    "you_have_unread_notifications": "Имате непрочетени известия",
+    "new_message_from": "Ново съобщение от <strong>%1</strong>",
+    "upvoted_your_post_in": "<strong>%1</strong> гласува положително за Ваша публикация в <strong>%2</strong>.",
+    "moved_your_post": "<strong>%1</strong> премести Ваша публикация.",
+    "moved_your_topic": "<strong>%1</strong> премести Ваша тема.",
+    "favourited_your_post_in": "<strong>%1</strong> отбеляза Ваша публикация в <strong>%2</strong> като любима.",
+    "user_flagged_post_in": "<strong>%1</strong> докладва Ваша публикация в <strong>%2</strong>",
+    "user_posted_to": "<strong>%1</strong> публикува отговор на: <strong>%2</strong>",
+    "user_posted_topic": "<strong>%1</strong> публикува нова тема: <strong>%2</strong>",
+    "user_mentioned_you_in": "<strong>%1</strong> Ви спомена в <strong>%2</strong>",
+    "user_started_following_you": "<strong>%1</strong> започна да Ви следва.",
+    "email-confirmed": "Е-пощата беше потвърдена",
+    "email-confirmed-message": "Благодарим Ви, че потвърдихте е-пощата си. Акаунтът Ви е вече напълно активиран.",
+    "email-confirm-error-message": "Възникна проблем при потвърждаването на е-пощата Ви. Може кодът да е грешен или давността му да е изтекла.",
+    "email-confirm-sent": "Изпратено е е-писмо за потвърждение."
+}

public/language/bg/pages.json

@@ -0,0 +1,21 @@
+{
+    "home": "Начало",
+    "unread": "Непрочетени теми",
+    "popular": "Популярни теми",
+    "recent": "Скорошни теми",
+    "users": "Регистрирани потребители",
+    "notifications": "Известия",
+    "tags": "Етикети",
+    "tag": "Теми, отбелязани като „%1“",
+    "user.edit": "Редактиране на „%1“",
+    "user.following": "Хора, които %1 следва",
+    "user.followers": "Хора, които следват %1",
+    "user.posts": "Публикации от %1",
+    "user.topics": "Теми, създадени от %1",
+    "user.groups": "Групите на %1",
+    "user.favourites": "Любимите публикации на %1",
+    "user.settings": "Настройки на потребителя",
+    "user.watched": "Теми, следени от %1",
+    "maintenance.text": "%1 в момента е в профилактика. Моля, върнете се по-късно.",
+    "maintenance.messageIntro": "В допълнение, администраторът е оставил това съобщение:"
+}

public/language/bg/recent.json

@@ -0,0 +1,19 @@
+{
+    "title": "Скорошни",
+    "day": "Ден",
+    "week": "Седмица",
+    "month": "Месец",
+    "year": "Година",
+    "alltime": "Цялото време",
+    "no_recent_topics": "Няма скорошни теми.",
+    "no_popular_topics": "Няма популярни теми.",
+    "there-is-a-new-topic": "Има нова тема.",
+    "there-is-a-new-topic-and-a-new-post": "Има нова тема и нова публикация.",
+    "there-is-a-new-topic-and-new-posts": "Има нова тема и %1 нови публикации.",
+    "there-are-new-topics": "Има %1 нови теми.",
+    "there-are-new-topics-and-a-new-post": "Има %1 нови теми и нова публикация.",
+    "there-are-new-topics-and-new-posts": "Има %1 нови теми и %2 нови публикации.",
+    "there-is-a-new-post": "Има нова публикация",
+    "there-are-new-posts": "Има %1 нови публикации.",
+    "click-here-to-reload": "Натиснете тук, за да презаредите."
+}

public/language/bg/register.json

@@ -0,0 +1,18 @@
+{
+    "register": "Регистрация",
+    "help.email": "По подразбиране, Вашата е-поща ще бъде скрита за останалите.",
+    "help.username_restrictions": "Уникално потребителско име с дължина между %1 и %2 символа. Другите ще могат да Ви споменават чрез @<span id='yourUsername'>потребител</span>.",
+    "help.minimum_password_length": "Дължината на паролата Ви трябва да е поне %1 символа.",
+    "email_address": "Е-поща",
+    "email_address_placeholder": "Въведете адрес на е-поща",
+    "username": "Потребителско име",
+    "username_placeholder": "Въведете потребителско име",
+    "password": "Парола",
+    "password_placeholder": "Въведете парола",
+    "confirm_password": "Потвърдете паролата",
+    "confirm_password_placeholder": "Потвърдете паролата",
+    "register_now_button": "Регистриране",
+    "alternative_registration": "Друг начин за регистриране",
+    "terms_of_use": "Условия за ползване",
+    "agree_to_terms_of_use": "Съгласен съм с условията за ползване"
+}

public/language/bg/reset_password.json

@@ -0,0 +1,17 @@
+{
+    "reset_password": "Подновяване на паролата",
+    "update_password": "Обновяване на паролата",
+    "password_changed.title": "Паролата беше променена",
+    "password_changed.message": "<p>Паролата беше подновена. Моля, <a href=\"/login\">влезте отново</a>.",
+    "wrong_reset_code.title": "Грешен код за подновяване",
+    "wrong_reset_code.message": "Полученият код за подновяване беше грешен. Моля, опитайте отново или <a href=\"/reset\">поискайте нов код за подновяване</a>.",
+    "new_password": "Нова парола",
+    "repeat_password": "Потвърдете паролата",
+    "enter_email": "Моля, въведете Вашата <strong>е-поща</strong> и ние ще Ви изпратим е-писмо с инструкции за това как да достъпите акаунта си.",
+    "enter_email_address": "Въведете адрес на е-поща",
+    "password_reset_sent": "Информацията за подновяване на паролата беше изпратена",
+    "invalid_email": "Грешна е-поща / е-пощата не съществува!",
+    "password_too_short": "Паролата е твърде кратка. Моля, изберете друга парола.",
+    "passwords_do_not_match": "Двете пароли, които въведохте, са различни.",
+    "password_expired": "Паролата Ви е с изтекла давност. Моля, изберете нова парола"
+}

public/language/bg/search.json

@@ -0,0 +1,40 @@
+{
+    "results_matching": "%1 резултат(а), отговарящи на „%2“, (%3 секунди)",
+    "no-matches": "Няма съвпадения",
+    "advanced-search": "Разширено търсене",
+    "in": "В",
+    "titles": "Заглавия",
+    "titles-posts": "Заглавия и публикации",
+    "posted-by": "Публикувано от",
+    "in-categories": "В категории",
+    "search-child-categories": "Претърсване на подкатегориите",
+    "reply-count": "Брой на отговорите",
+    "at-least": "Поне",
+    "at-most": "Най-много",
+    "post-time": "Време на публикуване",
+    "newer-than": "По-нови от",
+    "older-than": "По-стари от",
+    "any-date": "Която и да е дата",
+    "yesterday": "Вчера",
+    "one-week": "Една седмица",
+    "two-weeks": "Две седмици",
+    "one-month": "Един месец",
+    "three-months": "Три месеца",
+    "six-months": "Шест месеца",
+    "one-year": "Една година",
+    "sort-by": "Подреждане по",
+    "last-reply-time": "Време на последния отговор",
+    "topic-title": "Заглавие на темата",
+    "number-of-replies": "Брой на отговорите",
+    "number-of-views": "Брой на преглежданията",
+    "topic-start-date": "Начална дата на темата",
+    "username": "Потребителско име",
+    "category": "Категория",
+    "descending": "В низходящ ред",
+    "ascending": "Във възходящ ред",
+    "save-preferences": "Запазване на предпочитанията",
+    "clear-preferences": "Изчистване на предпочитанията",
+    "search-preferences-saved": "Предпочитанията за търсене бяха запазени",
+    "search-preferences-cleared": "Предпочитанията за търсене бяха изчистени",
+    "show-results-as": "Показване на резултатите като"
+}

public/language/bg/success.json

@@ -0,0 +1,6 @@
+{
+    "success": "Готово",
+    "topic-post": "Вие публикувахте успешно.",
+    "authentication-successful": "Успешно удостоверяване",
+    "settings-saved": "Настройките са записани!"
+}

public/language/bg/tags.json

@@ -0,0 +1,7 @@
+{
+    "no_tag_topics": "Няма теми с този етикет.",
+    "tags": "Етикети",
+    "enter_tags_here": "Въведете етикетите тук, всеки може да е с дължина между %1 и %2 символа.",
+    "enter_tags_here_short": "Въведете етикети...",
+    "no_tags": "Все още няма етикети."
+}

public/language/bg/topic.json

@@ -0,0 +1,100 @@
+{
+    "topic": "Тема",
+    "topic_id": "Идентификатора на темата",
+    "topic_id_placeholder": "Въведете идентификатор на темата",
+    "no_topics_found": "Няма открити теми!",
+    "no_posts_found": "Няма открити публикации!",
+    "post_is_deleted": "Тази публикация е изтрита!",
+    "topic_is_deleted": "Тази тема е изтрита!",
+    "profile": "Профил",
+    "posted_by": "Публикувано от %1",
+    "posted_by_guest": "Публикувано от гост",
+    "chat": "Чат",
+    "notify_me": "Получавайте известия за новите отговори в тази тема",
+    "quote": "Цитат",
+    "reply": "Отговор",
+    "guest-login-reply": "Влезте, за да отговорите",
+    "edit": "Редактиране",
+    "delete": "Изтриване",
+    "purge": "Изчистване",
+    "restore": "Възстановяване",
+    "move": "Преместване",
+    "fork": "Разделяне",
+    "link": "Връзка",
+    "share": "Споделяне",
+    "tools": "Инструменти",
+    "flag": "Докладване",
+    "locked": "Заключена",
+    "bookmark_instructions": "Натиснете, за да се върнете на последната си позиция или затворете, за да отхвърлите.",
+    "flag_title": "Докладване на тази публикация до модератор",
+    "flag_confirm": "Сигурни ли сте, че искате да докладвате тази публикация?",
+    "flag_success": "Тази публикация е била докладвана до модератор.",
+    "deleted_message": "Тази тема е била изтрита. Само потребители с права за управление на темите могат да я видят.",
+    "following_topic.message": "Вече ще получавате известия когато някой публикува коментар в тази тема.",
+    "not_following_topic.message": "Вече няма да получавате известия за тази тема.",
+    "login_to_subscribe": "Моля, регистрирайте се или влезте, за да се абонирате за тази тема.",
+    "markAsUnreadForAll.success": "Темата е отбелязана като непрочетена за всички.",
+    "watch": "Наблюдаване",
+    "unwatch": "Спиране на наблюдаването",
+    "watch.title": "Получавайте известия за новите отговори в тази тема",
+    "unwatch.title": "Спрете да наблюдавате тази тема",
+    "share_this_post": "Споделете тази публикация",
+    "thread_tools.title": "Инструменти за темата",
+    "thread_tools.markAsUnreadForAll": "Отбелязване като непрочетена",
+    "thread_tools.pin": "Закачане на темата",
+    "thread_tools.unpin": "Откачане на темата",
+    "thread_tools.lock": "Заключване на темата",
+    "thread_tools.unlock": "Отключване на темата",
+    "thread_tools.move": "Преместване на темата",
+    "thread_tools.move_all": "Преместване на всички",
+    "thread_tools.fork": "Разделяне на темата",
+    "thread_tools.delete": "Изтриване на темата",
+    "thread_tools.delete_confirm": "Сигурни ли сте, че искате да изтриете тази тема?",
+    "thread_tools.restore": "Възстановяване на темата",
+    "thread_tools.restore_confirm": "Сигурни ли сте, че искате да възстановите тази тема?",
+    "thread_tools.purge": "Изчистване на темата",
+    "thread_tools.purge_confirm": "Сигурни ли сте, че искате да изчистите тази тема?",
+    "topic_move_success": "Темата беше преместена успешно в %1",
+    "post_delete_confirm": "Сигурни ли сте, че искате да изтриете тази публикация?",
+    "post_restore_confirm": "Сигурни ли сте, че искате да възстановите тази публикация?",
+    "post_purge_confirm": "Сигурни ли сте, че искате да изчистите тази публикация?",
+    "load_categories": "Зареждане на категориите",
+    "disabled_categories_note": "Изключените категории са засивени",
+    "confirm_move": "Преместване",
+    "confirm_fork": "Разделяне",
+    "favourite": "Любима",
+    "favourites": "Любими",
+    "favourites.has_no_favourites": "Нямате любими, отбележете няколко публикации, за да ги видите тук!",
+    "loading_more_posts": "Зареждане на още публикации",
+    "move_topic": "Преместване на темата",
+    "move_topics": "Преместване на темите",
+    "move_post": "Преместване на публикацията",
+    "post_moved": "Публикацията беше преместена!",
+    "fork_topic": "Разделяне на темата",
+    "topic_will_be_moved_to": "Тази тема ще бъде преместена в категорията",
+    "fork_topic_instruction": "Натиснете публикациите, които искате да отделите",
+    "fork_no_pids": "Няма избрани публикации!",
+    "fork_success": "Темата е разделена успешно! Натиснете тук, за да преминете към отделената тема.",
+    "composer.title_placeholder": "Въведете заглавието на темата си тук...",
+    "composer.handle_placeholder": "Име",
+    "composer.discard": "Отхвърляне",
+    "composer.submit": "Публикуване",
+    "composer.replying_to": "Отговор на %1",
+    "composer.new_topic": "Нова тема",
+    "composer.uploading": "качване...",
+    "composer.thumb_url_label": "Поставете адреса на иконка за темата",
+    "composer.thumb_title": "Добавете иконка към тази тема",
+    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
+    "composer.thumb_file_label": "Или качете файл",
+    "composer.thumb_remove": "Изчистване на полетата",
+    "composer.drag_and_drop_images": "Плъзнете снимките тук",
+    "more_users_and_guests": "Още %1 потребител(и) и %2 гост(и)",
+    "more_users": "Още %1 потребител(и)",
+    "more_guests": "Още %1 гост(и)",
+    "users_and_others": "%1 и %2 други",
+    "sort_by": "Подреждане по",
+    "oldest_to_newest": "Първо най-старите",
+    "newest_to_oldest": "Първо най-новите",
+    "most_votes": "Най-много гласове",
+    "most_posts": "Най-много публикации"
+}

public/language/bg/unread.json

@@ -0,0 +1,9 @@
+{
+    "title": "Непрочетени",
+    "no_unread_topics": "Няма непрочетени теми.",
+    "load_more": "Зареждане на още",
+    "mark_as_read": "Отбелязване като прочетени",
+    "selected": "Избраните",
+    "all": "Всички",
+    "topics_marked_as_read.success": "Темите бяха отбелязани като прочетени!"
+}

public/language/bg/user.json

@@ -0,0 +1,84 @@
+{
+    "banned": "Блокиран",
+    "offline": "Извън линия",
+    "username": "Потребителско име",
+    "joindate": "Дата на присъединяване",
+    "postcount": "Брой публикации",
+    "email": "Е-поща",
+    "confirm_email": "Потвърдете е-пощата",
+    "delete_account": "Изтриване на акаунта",
+    "delete_account_confirm": "Сигурни ли сте, че искате да изтриете акаунта си? <br /><strong>Това действие е необратимо и няма да можете да възстановите нищо от данните си</strong><br /><br />Въведете потребителското си име, за да потвърдите, че искате да унищожите този акаунт.",
+    "fullname": "Цяло име",
+    "website": "Уеб сайт",
+    "location": "Местоположение",
+    "age": "Възраст",
+    "joined": "Присъединил се",
+    "lastonline": "Последно на линия",
+    "profile": "Профил",
+    "profile_views": "Преглеждания на профила",
+    "reputation": "Репутация",
+    "favourites": "Любими",
+    "watched": "Наблюдавани",
+    "followers": "Последователи",
+    "following": "Следва",
+    "aboutme": "За мен",
+    "signature": "Подпис",
+    "gravatar": "Граватар",
+    "birthday": "Рождена дата",
+    "chat": "Чат",
+    "follow": "Следване",
+    "unfollow": "Спиране на следването",
+    "more": "Още",
+    "profile_update_success": "Профилът беше обновен успешно!",
+    "change_picture": "Промяна на снимката",
+    "edit": "Редактиране",
+    "uploaded_picture": "Качена снимка",
+    "upload_new_picture": "Качване на нова снимка",
+    "upload_new_picture_from_url": "Качване на нова снимка от адрес",
+    "current_password": "Текуща парола",
+    "change_password": "Промяна на паролата",
+    "change_password_error": "Грешна парола!",
+    "change_password_error_wrong_current": "Текущата Ви парола е грешна!",
+    "change_password_error_length": "Паролата е твърде кратка!",
+    "change_password_error_match": "Паролите са различни!",
+    "change_password_error_privileges": "Нямате права да промените тази парола.",
+    "change_password_success": "Паролата ви е обновена!",
+    "confirm_password": "Потвърдете паролата",
+    "password": "Парола",
+    "username_taken_workaround": "Потребителското име, което искате, е заето и затова ние го променихме леко. Вие ще се наричате <strong>%1</strong>",
+    "upload_picture": "Качване на снимка",
+    "upload_a_picture": "Качване на снимка",
+    "image_spec": "Можете да качвате само PNG, JPG, или GIF файлове",
+    "settings": "Настройки",
+    "show_email": "Да се показва е-пощата ми",
+    "show_fullname": "Да се показва цялото ми име",
+    "restrict_chats": "Разрешаване на чат съобщенията само от потребители, които следвам",
+    "digest_label": "Абониране за резюмета",
+    "digest_description": "Абониране за новини по е-пощата относно този форум (нови известия и теми) според избрания график",
+    "digest_off": "Изключено",
+    "digest_daily": "Ежедневно",
+    "digest_weekly": "Ежеседмично",
+    "digest_monthly": "Ежемесечно",
+    "send_chat_notifications": "Изпращане на е-писмо, ако получа ново чат съобщения, а не съм на линия",
+    "send_post_notifications": "Изпращане на е-писмо, когато се появи отговор в темите, за които съм абониран/а.",
+    "settings-require-reload": "Някои промени в настройките изискват презареждане. Натиснете тук, за да презаредите страницата.",
+    "has_no_follower": "Този потребител няма последователи :(",
+    "follows_no_one": "Този потребител не следва никого :(",
+    "has_no_posts": "Този потребител не е публикувал нищо все още.",
+    "has_no_topics": "Този потребител не е създавал теми досега.",
+    "has_no_watched_topics": "Този потребител не е наблюдавал нито една тема все още.",
+    "email_hidden": "Е-пощата е скрита",
+    "hidden": "скрито",
+    "paginate_description": "Разделяне на темите и публикациите на страници, вместо да се превърта безкрайно",
+    "topics_per_page": "Теми на страница",
+    "posts_per_page": "Публикации на страница",
+    "notification_sounds": "Изпълняване на звук, когато получите известие",
+    "browsing": "Настройки за страниците",
+    "open_links_in_new_tab": "Отваряне на външните връзки в нов подпрозорец",
+    "enable_topic_searching": "Включване на търсенето в темите",
+    "topic_search_help": "Ако е включено, търсенето в темата ще замени стандартното поведение на браузъра при търсене в страницата и ще Ви позволи да претърсвате цялата тема, а не само това, което се вижда на екрана",
+    "follow_topics_you_reply_to": "Следване на темите, на които отговаряте",
+    "follow_topics_you_create": "Следване на темите, които създавате",
+    "grouptitle": "Изберете заглавието на групата, което искате да се показва",
+    "no-group-title": "Няма заглавие на група"
+}

public/language/bg/users.json

@@ -0,0 +1,12 @@
+{
+    "latest_users": "Последни потребители",
+    "top_posters": "С най-много публикации",
+    "most_reputation": "С най-много репутация",
+    "search": "Търсене",
+    "enter_username": "Въведете потребителско име, което да потърсите",
+    "load_more": "Зареждане на още",
+    "users-found-search-took": "Намерени са %1 потребител(и)! Търсенето отне %2 секунди.",
+    "filter-by": "Филтриране",
+    "online-only": "Само тези на линия",
+    "picture-only": "Само със снимка"
+}

public/language/bn/category.json

@@ -1,8 +1,12 @@
 {
     "new_topic_button": "নতুন টপিক",
+    "guest-login-post": "Log in to post",
     "no_topics": "<strong>এই বিভাগে কোন টপিক নেই! </strong><br /> আপনি চাইলে একটি পোষ্ট করতে পারেন।",
     "browsing": "ব্রাউজিং",
     "no_replies": "কোন রিপ্লাই নেই",
     "share_this_category": "এই বিভাগটি অন্যের সাথে ভাগাভাগি করুন",
-    "ignore": "উপেক্ষা করুন"
+    "watch": "Watch",
+    "ignore": "উপেক্ষা করুন",
+    "watch.message": "You are now watching updates from this category",
+    "ignore.message": "You are now ignoring updates from this category"
 }

public/language/bn/email.json

@@ -9,6 +9,9 @@
     "reset.text1": "আমরা আপনার পাসওয়ার্ড রিসেট করার অনুরোধ পেয়েছি, সম্ভবত আপনি আপনার পাসওয়ার্ড ভুলে গিয়েছেন বলেই। তবে যদি তা না হয়ে থাকে, তাহলে এই মেইলকে উপেক্ষা করতে পারেন।",
     "reset.text2": "পাসওয়ার্ড রিসেট করতে নিচের লিংকে ক্লিক করুন",
     "reset.cta": "পাসওয়ার্ড রিসেট করতে এখানে ক্লিক করুন",
+    "reset.notify.subject": "Password successfully changed",
+    "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.",
+    "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.",
     "digest.notifications": "%1 থেকে আনরিড নোটিফিকেশন আছে।",
     "digest.latest_topics": "%1 এর সর্বশেষ টপিকসমূহ",
     "digest.cta": "%1 ভিজিট করতে এখানে ক্লিক করুন",

public/language/bn/error.json

@@ -2,7 +2,7 @@
     "invalid-data": "ভুল তথ্য",
     "not-logged-in": "আপনি লগিন করেননি",
     "account-locked": "আপনার অ্যাকাউন্ট সাময়িকভাবে লক করা হয়েছে",
-    "search-requires-login": "অনুসন্ধান করার জন্য একটি অ্যাকাউন্ট প্রয়োজন! অনুগ্রহপূর্বক প্রবেশ করুন অথবা নিবন্ধন করুন!",
+    "search-requires-login": "Searching requires an account - please login or register.",
     "invalid-cid": "ভুল বিভাগ নাম্বার",
     "invalid-tid": "ভুল টপিক নাম্বার",
     "invalid-pid": "ভুল পোস্ট নাম্বার",
@@ -18,11 +18,14 @@
     "username-taken": "ইউজারনেম আগেই ব্যবহৃত",
     "email-taken": "ইমেইল আগেই ব্যবহৃত",
     "email-not-confirmed": "আপনার ইমেইল এড্রেস নিশ্চিত করা হয় নি, নিশ্চিত করতে এখানে ক্লিক করুন।",
-    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed",
+    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
+    "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
+    "email-confirm-failed": "We could not confirm your email, please try again later.",
+    "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
     "username-too-short": "খুব ছোট ইউজারনেম",
     "username-too-long": "ইউজারনেম বড় হয়ে গিয়েছে",
     "user-banned": "ব্যবহারকারী নিষিদ্ধ",
-    "user-too-new": "দুঃখিত! প্রথম পোষ্ট করার জন্য আপনাকে %1 সেকেন্ড অপেক্ষা করতে হবে।",
+    "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
     "no-category": "বিভাগটি খুজে পাওয়া যায় নি",
     "no-topic": "এই টপিক নেই",
     "no-post": "এই পোষ্ট নেই",
@@ -33,19 +36,24 @@
     "no-emailers-configured": "কোন ইমেল প্লাগইন লোড করা নেই, কাজেই টেস্ট মেইল পাঠানো সম্ভব হচ্ছে না",
     "category-disabled": "বিভাগটি নিষ্ক্রিয়",
     "topic-locked": "টপিক বন্ধ",
+    "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
     "still-uploading": "আপলোড সম্পূর্ণ জন্য অনুগ্রহ করে অপেক্ষা করুন",
-    "content-too-short": "অনুগ্রহকরে অপেক্ষকৃত বড় পোষ্ট করুন। একটি পোষ্টে নূন্যতম %1 অক্ষর থাকতে হবে।",
+    "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
-    "title-too-short": "অনুগ্রহপূর্বক বড় শিরোনাম ব্যাবহার করুন। শিরোনামের জন্য নূন্যতম %1 অক্ষর ব্যাবহার করতে হবে।",
+    "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
-    "title-too-long": "অনুগ্রহ করে সংক্ষিপ্ত শিরোনাম লিখুন। শিরোনাম %1 অক্ষরের বেশি হতে পারবে না।",
+    "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
-    "too-many-posts": "আপনি প্রতি %1 সেকেন্ডে একবার পোষ্ট করতে পারবেন। পরবর্তী পোষ্ট করার জন্য অপেক্ষা করুন। ",
+    "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 character(s).",
-    "too-many-posts-newbie": "নতুন সদস্য হিসাবে %2 সন্মানণা পাওয়া পর্যন্ত আপনি প্রতি %1 সেকেন্ডে একবার পোষ্ট করতে পারবেন। পরবর্তী পোষ্ট করার জন্য অপেক্ষা করুন। ",
+    "too-many-posts": "You can only post once every %1 second(s) - please wait before posting again",
-    "file-too-big": "সর্বোচ্চ গৃহীত ফাইলসাইজ হচ্ছে %1 kb - অনুগ্রহপূর্বক ছোট ফাইল আপলোড করুন",
+    "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
+    "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",
+    "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 character(s)",
+    "file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
     "cant-vote-self-post": "আপনি নিজের পোস্টে ভোট দিতে পারবেন না।",
     "already-favourited": "আপনি ইতিমধ্যে এই পোষ্টটি পছন্দের তালিকায় যোগ করেছেন",
     "already-unfavourited": "আপনি ইতিমধ্যে এই পোষ্টটি আপনার পছন্দের তালিকা থেকে সরিয়ে ফেলেছেন",
     "cant-ban-other-admins": "আপনি অন্য এ্যাডমিনদের নিষিদ্ধ করতে পারেন না!",
     "invalid-image-type": "Invalid image type. Allowed types are: %1",
     "invalid-image-extension": "Invalid image extension",
+    "invalid-file-type": "Invalid file type. Allowed types are: %1",
     "group-name-too-short": "গ্রুপের নাম খুব ছোট",
     "group-already-exists": "গ্রুপ ইতিমধ্যেই বিদ্যমান",
     "group-name-change-not-allowed": "গ্রুপের নাম পরিবর্তনের অনুমতি নেই",
@@ -55,11 +63,12 @@
     "post-already-restored": "এই পোষ্টটি ইতিমধ্যে পুনরোদ্ধার করা হয়েছে",
     "topic-already-deleted": "এই টপিকটি ইতিমধ্যে ডিলিট করা হয়েছে",
     "topic-already-restored": "এই টপিকটি ইতিমধ্যে পুনরোদ্ধার করা হয়েছে",
+    "cant-purge-main-post": "You can't purge the main post, please delete the topic instead",
     "topic-thumbnails-are-disabled": "টপিক থাম্বনেল নিষ্ক্রিয় করা। ",
     "invalid-file": "ভুল ফাইল",
     "uploads-are-disabled": "আপলোড নিষ্ক্রিয় করা",
-    "upload-error": "আপলোড ত্রুটিঃ %1",
+    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
-    "signature-too-long": "দুঃখিত, আপনার সাক্ষর %1 অক্ষরের বেশী হতে পারবে না। ",
+    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
     "cant-chat-with-yourself": "আপনি নিজের সাথে চ্যাট করতে পারবেন না!",
     "chat-restricted": "এই সদস্য তার বার্তালাপ সংরক্ষিত রেখেছেন। এই সদস্য আপনাকে ফলো করার পরই কেবলমাত্র আপনি তার সাথে চ্যাট করতে পারবেন",
     "too-many-messages": "You have sent too many messages, please wait awhile.",
@@ -69,5 +78,7 @@
     "not-enough-reputation-to-flag": "এই পোষ্টকে ফ্লাগ করার জন্য আপনার পর্যাপ্ত সম্মাননা নেই",
     "reload-failed": "\"%1\" রিলোড করতে সমস্যা হয়েছে। রিলোডের পূর্বে যা করা হয়েছিল সেটি আনডু করা সমীচীন। ",
     "registration-error": "নিবন্ধন এরর!",
-    "parse-error": "Something went wrong while parsing server response"
+    "parse-error": "Something went wrong while parsing server response",
+    "wrong-login-type-email": "Please use your email to login",
+    "wrong-login-type-username": "Please use your username to login"
 }

public/language/bn/groups.json

@@ -4,6 +4,8 @@
     "owner": "Group Owner",
     "new_group": "Create New Group",
     "no_groups_found": "There are no groups to see",
+    "pending.accept": "Accept",
+    "pending.reject": "Reject",
     "cover-instructions": "Drag and Drop a photo, drag to position, and hit <strong>Save</strong>",
     "cover-change": "Change",
     "cover-save": "Save",
@@ -13,9 +15,22 @@
     "details.pending": "Pending Members",
     "details.has_no_posts": "এই গ্রুপের সদস্যরা এখনো কোন পোষ্ট করেন নি",
     "details.latest_posts": "সর্বশেষ পোষ্টসমূহ",
-    "details.private": "Private Group",
+    "details.private": "Private",
-    "details.public": "Public Group",
+    "details.grant": "Grant/Rescind Ownership",
+    "details.kick": "Kick",
     "details.owner_options": "Group Administration",
+    "details.group_name": "Group Name",
+    "details.member_count": "Member Count",
+    "details.creation_date": "Creation Date",
+    "details.description": "Description",
+    "details.badge_preview": "Badge Preview",
+    "details.change_icon": "Change Icon",
+    "details.change_colour": "Change Colour",
+    "details.badge_text": "Badge Text",
+    "details.userTitleEnabled": "Show Badge",
+    "details.private_help": "If enabled, joining of groups requires approval from a group owner",
+    "details.hidden": "Hidden",
+    "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
     "event.updated": "Group details have been updated",
     "event.deleted": "The group \"%1\" has been deleted"
 }

public/language/bn/login.json

@@ -1,5 +1,7 @@
 {
-    "username": "ইউজারনেম / ইমেইল",
+    "username-email": "Username / Email",
+    "username": "Username",
+    "email": "Email",
     "remember_me": "মনে রাখুন",
     "forgot_password": "পাসওয়ার্ড ভুলে গিয়েছেন?",
     "alternative_logins": "বিকল্প প্রবেশ",

public/language/bn/modules.json

@@ -15,7 +15,12 @@
     "chat.seven_days": "৭ দিন",
     "chat.thirty_days": "৩০ দিন",
     "chat.three_months": "৩ মাস",
+    "composer.compose": "Compose",
+    "composer.show_preview": "Show Preview",
+    "composer.hide_preview": "Hide Preview",
     "composer.user_said_in": "%1 বলেছেন %2:",
     "composer.user_said": "%1 বলেছেনঃ",
-    "composer.discard": "আপনি কি নিশ্চিত যে আপনি এই পোস্ট বাতিল করতে ইচ্ছুক?"
+    "composer.discard": "আপনি কি নিশ্চিত যে আপনি এই পোস্ট বাতিল করতে ইচ্ছুক?",
+    "composer.submit_and_lock": "Submit and Lock",
+    "composer.toggle_dropdown": "Toggle Dropdown"
 }

public/language/bn/notifications.json

@@ -2,6 +2,7 @@
     "title": "বিজ্ঞপ্তিগুলো",
     "no_notifs": "আপনার নতুন কোন বিজ্ঞপ্তি নেই",
     "see_all": "সকল বিজ্ঞপ্তিগুলো দেখুন",
+    "mark_all_read": "Mark all notifications read",
     "back_to_home": "ফিরুন %1",
     "outgoing_link": "বহির্গামী লিঙ্ক",
     "outgoing_link_message": "আপনি এখন %1 ত্যাগ করছেন",
@@ -21,7 +22,6 @@
     "user_started_following_you": "<strong>%1</strong> আপনাকে অনুসরন করা শুরু করেছেন।",
     "email-confirmed": "ইমেইল নিশ্চিত করা হয়েছে",
     "email-confirmed-message": "আপনার ইমেইল যাচাই করার জন্য আপনাকে ধন্যবাদ। আপনার অ্যাকাউন্টটি এখন সম্পূর্ণরূপে সক্রিয়।",
-    "email-confirm-error": "একটি ত্রুটি ঘটেছে...",
     "email-confirm-error-message": "আপনার ইমেল ঠিকানার বৈধতা যাচাইয়ে একটি সমস্যা হয়েছে। সম্ভবত কোডটি ভুল ছিল অথবা কোডের মেয়াদ শেষ হয়ে গিয়েছে।",
     "email-confirm-sent": "নিশ্চিতকরণ ইমেইল পাঠানো হয়েছে।"
 }

public/language/bn/pages.json

@@ -5,14 +5,17 @@
     "recent": "সাম্প্রতিক টপিক",
     "users": "নিবন্ধিত সদস্যগণ",
     "notifications": "বিজ্ঞপ্তি",
-    "tags": "\"%1\" এ ট্যগকৃত টপিকসমূহ",
+    "tags": "Tags",
+    "tag": "Topics tagged under \"%1\"",
     "user.edit": "সম্পাদনা \"%1\"",
     "user.following": "%1 যাদের অনুসরণ করেন",
     "user.followers": "যারা %1 কে অনুসরণ করেন",
     "user.posts": "%1 এর পোস্ট সমুহ",
     "user.topics": "%1 এর টপিক সমুহ",
+    "user.groups": "%1's Groups",
     "user.favourites": "%1'র প্রিয় পোস্টগুলো",
     "user.settings": "সদস্য সেটিংস",
+    "user.watched": "Topics watched by %1",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
     "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }

public/language/bn/recent.json

@@ -6,6 +6,7 @@
     "year": "বছর",
     "alltime": "সবসময় ",
     "no_recent_topics": "কোন সাম্প্রতিক টপিক নেই। ",
+    "no_popular_topics": "There are no popular topics.",
     "there-is-a-new-topic": "There is a new topic.",
     "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.",
     "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.",

public/language/bn/reset_password.json

@@ -10,5 +10,8 @@
     "enter_email": "অনুগ্রহপূর্বক আপনার ইমেইল এড্রেস প্রদান করুন, আমরা আপনাকে আপনার পাসওয়ার্ড রিসেট সম্পর্কিত তথ্যাবলী ইমেইলে পাঠিয়ে দিবো। ",
     "enter_email_address": "আপনার ইমেইল এড্রেস",
     "password_reset_sent": "পাসওয়ার্ড রিসেট মেইল পাঠানো হয়েছে",
-    "invalid_email": "ভুল ইমেইল / ইমেইল ডেটাবেইজে নেই"
+    "invalid_email": "ভুল ইমেইল / ইমেইল ডেটাবেইজে নেই",
+    "password_too_short": "The password entered is too short, please pick a different password.",
+    "passwords_do_not_match": "The two passwords you've entered do not match.",
+    "password_expired": "Your password has expired, please choose a new password"
 }

public/language/bn/search.json

@@ -1,7 +1,40 @@
 {
     "results_matching": "\"%2\" এর সাথে মিলিয়ে %1 ফলাফল পাওয়া গেছে,  ( %3 seconds সময় লেগেছে )",
     "no-matches": "No matches found",
+    "advanced-search": "Advanced Search",
     "in": "In",
-    "by": "By",
+    "titles": "Titles",
-    "posted-by": "Posted by"
+    "titles-posts": "Titles and Posts",
+    "posted-by": "Posted by",
+    "in-categories": "In Categories",
+    "search-child-categories": "Search child categories",
+    "reply-count": "Reply Count",
+    "at-least": "At least",
+    "at-most": "At most",
+    "post-time": "Post time",
+    "newer-than": "Newer than",
+    "older-than": "Older than",
+    "any-date": "Any date",
+    "yesterday": "Yesterday",
+    "one-week": "One week",
+    "two-weeks": "Two weeks",
+    "one-month": "One month",
+    "three-months": "Three months",
+    "six-months": "Six months",
+    "one-year": "One year",
+    "sort-by": "Sort by",
+    "last-reply-time": "Last reply time",
+    "topic-title": "Topic title",
+    "number-of-replies": "Number of replies",
+    "number-of-views": "Number of views",
+    "topic-start-date": "Topic start date",
+    "username": "Username",
+    "category": "Category",
+    "descending": "In descending order",
+    "ascending": "In ascending order",
+    "save-preferences": "Save preferences",
+    "clear-preferences": "Clear preferences",
+    "search-preferences-saved": "Search preferences saved",
+    "search-preferences-cleared": "Search preferences cleared",
+    "show-results-as": "Show results as"
 }

public/language/bn/tags.json

@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "এই ট্যাগ সম্বলিত কোন টপিক নেই",
     "tags": "ট্যাগসমূহ",
-    "enter_tags_here": "এখানে আপনার ট্যাগ টাইপ করুন, প্রত্যেকটি ট্যাগের পর Enter চাপুন",
+    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "ট্যাগ বসান",
     "no_tags": "এখন পর্যন্ত কোন ট্যাগ নেই"
 }

public/language/bn/topic.json

@@ -5,6 +5,7 @@
     "no_topics_found": "কোন টপিক পাওয়া যায়নি!",
     "no_posts_found": "কোন পোস্ট পাওয়া যায়নি",
     "post_is_deleted": "এই পোস্টটি মুছে ফেলা হয়েছে!",
+    "topic_is_deleted": "This topic is deleted!",
     "profile": "প্রোফাইল ",
     "posted_by": "পোস্ট করেছেন %1",
     "posted_by_guest": "অতিথি পোস্ট ",
@@ -12,6 +13,7 @@
     "notify_me": "এই টপিকে নতুন উত্তর আসলে জানুন",
     "quote": "উদ্ধৃতি",
     "reply": "উত্তর",
+    "guest-login-reply": "Log in to reply",
     "edit": "সম্পাদণা",
     "delete": "মুছে ফেলুন",
     "purge": "পার্জ",

public/language/bn/user.json

@@ -21,12 +21,14 @@
     "watched": "Watched",
     "followers": "যাদের অনুসরণ করছেন",
     "following": "যারা আপনাকে অনুসরণ করছে",
+    "aboutme": "About me",
     "signature": "স্বাক্ষর",
     "gravatar": "গ্রাভাতার",
     "birthday": "জন্মদিন",
     "chat": "বার্তালাপ",
     "follow": "অনুসরন করুন",
     "unfollow": "অনুসরন করা থেকে বিরত থাকুন",
+    "more": "More",
     "profile_update_success": "প্রোফাইল আপডেট সফল হয়েছে",
     "change_picture": "ছবি পরিবর্তন",
     "edit": "সম্পাদনা",
@@ -47,7 +49,6 @@
     "upload_picture": "ছবি আপলোড করুন",
     "upload_a_picture": "ছবি (একটি) আপলোড করুন",
     "image_spec": "আপনি কেবলমাত্র PNG, JPG অথবা GIF ফাইল আপলোড করতে পারবেন",
-    "max": "সর্বোচ্চ",
     "settings": "সেটিংস",
     "show_email": "আমার ইমেইল দেখাও",
     "show_fullname": "আমার সম্পূর্ণ নাম দেখাও",
@@ -60,6 +61,7 @@
     "digest_monthly": "মাসিক",
     "send_chat_notifications": "যদি আমি অনলাইনে না থাকি, সেক্ষেত্রে নতুন চ্যাট মেসেজ আসলে আমাকে ইমেইল করুন",
     "send_post_notifications": "Send an email when replies are made to topics I am subscribed to",
+    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
     "has_no_follower": "এই সদস্যের কোন ফলোয়ার নেই :(",
     "follows_no_one": "এই সদস্য কাউকে ফলো করছেন না :(",
     "has_no_posts": "এই সদস্য এখনো কোন পোষ্ট করেন নি",
@@ -67,14 +69,16 @@
     "has_no_watched_topics": "This user didn't watch any topics yet.",
     "email_hidden": "ইমেইল গোপন রাখা হয়েছে",
     "hidden": "গোপন করা হয়েছে",
-    "paginate_description": "ইনফাইনাইট স্ক্রলের বদলে টপিক এবং পোষ্টের জন্য পেজিনেশন ব্যাবহার করুন",
+    "paginate_description": "Paginate topics and posts instead of using infinite scroll",
     "topics_per_page": "প্রতি পেজে কতগুলো টপিক থাকবে",
     "posts_per_page": "প্রতি পেইজে কতগুলো পোষ্ট থাকবে",
-    "notification_sounds": "নতুন নোটিফিকেশনের জন্য নোটিফিকেশন সাউন্ড বাজাও।",
+    "notification_sounds": "Play a sound when you receive a notification",
     "browsing": "Browsing সেটিংস",
-    "open_links_in_new_tab": "বাইরের URL গুলো নতুন ট্যাবে খোলা হবে ?",
+    "open_links_in_new_tab": "Open outgoing links in new tab",
     "enable_topic_searching": "In-Topic সার্চ সক্রীয় করো",
-    "topic_search_help": "যদি এনাবল করা হয়ে থাকে,  In-topic সার্চিং ব্রাউজারের ডিফল্ট সার্চের বদলে পুরো টপিকজুড়ে সার্চ করার সুবিধা দিবে, যা কেবলমাত্র বর্তমান স্কৃণে দেখানো অংশের মধ্যে সীমাবদ্ধ থাকবে না। ",
+    "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
-    "follow_topics_you_reply_to": "আপনার উত্তর দেয়া টপিকগুলো ফলো করুন",
+    "follow_topics_you_reply_to": "Follow topics that you reply to",
-    "follow_topics_you_create": "আপনার তৈরীকরা টপিকসমূহ ফলো করুন"
+    "follow_topics_you_create": "Follow topics you create",
+    "grouptitle": "Select the group title you would like to display",
+    "no-group-title": "No group title"
 }

public/language/bn/users.json

@@ -5,7 +5,7 @@
     "search": "খুঁজুন",
     "enter_username": "ইউজারনেম এর ভিত্তিতে সার্চ করুন",
     "load_more": "আরো লোড করুন",
-    "users-found-search-took": "%1 সদস্য(দের) খুঁজে পাওয়া গিয়েছে! সময় লেগেছে %2 ms.",
+    "users-found-search-took": "%1 user(s) found! Search took %2 seconds.",
     "filter-by": "Filter By",
     "online-only": "Online only",
     "picture-only": "Picture only"

public/language/cs/category.json

@@ -1,8 +1,12 @@
 {
     "new_topic_button": "Nové téma",
+    "guest-login-post": "Log in to post",
     "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",
-    "ignore": "Ignorovat"
+    "watch": "Watch",
+    "ignore": "Ignorovat",
+    "watch.message": "You are now watching updates from this category",
+    "ignore.message": "You are now ignoring updates from this category"
 }

public/language/cs/email.json

@@ -9,6 +9,9 @@
     "reset.text1": "Obdrželi jsme požadavek na obnovu hesla, pravděpodobně kvůli tomu, že jste ho zapomněli. Pokud to není tento případ, ignorujte, prosím, tento email.",
     "reset.text2": "Přejete-li si pokračovat v obnově vašeho hesla, klikněte, prosím, na následující odkaz:",
     "reset.cta": "Klikněte zde, chcete-li obnovit vaše heslo",
+    "reset.notify.subject": "Password successfully changed",
+    "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.",
+    "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.",
     "digest.notifications": "Máte tu nepřečtená oznámení od %1:",
     "digest.latest_topics": "Nejnovější témata od %1",
     "digest.cta": "Kliknutím zde navštívíte %1",

public/language/cs/error.json

@@ -2,7 +2,7 @@
     "invalid-data": "Neplatná data",
     "not-logged-in": "Zdá se, že nejste přihlášen(a)",
     "account-locked": "Váš účet byl dočasně uzamčen",
-    "search-requires-login": "Chcete-li vyhledávat, musíte mít účet. Přihlašte se nebo zaregistrujte, prosím.",
+    "search-requires-login": "Searching requires an account - please login or register.",
     "invalid-cid": "Neplatné ID kategorie",
     "invalid-tid": "Neplatné ID tématu",
     "invalid-pid": "Neplatné ID příspěvku",
@@ -18,11 +18,14 @@
     "username-taken": "Uživatelské jméno je již použito",
     "email-taken": "Email je již použit",
     "email-not-confirmed": "Vaše emailová adresa zatím nebyla potvrzena. Kliknutím zde svůj email potvrdíte.",
-    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed",
+    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
+    "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
+    "email-confirm-failed": "We could not confirm your email, please try again later.",
+    "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
     "username-too-short": "Uživatelské jméno je příliš krátké",
     "username-too-long": "Uživatelské jméno je příliš dlouhé",
     "user-banned": "Uživatel byl zakázán",
-    "user-too-new": "Pardon, ale je potřeba vyčkat %1 sekund, než-li budete moci vytvořit svůj první příspěvek.",
+    "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
     "no-category": "Kategorie neexistuje",
     "no-topic": "Téma neexistuje",
     "no-post": "Příspěvek neexistuje",
@@ -33,19 +36,24 @@
     "no-emailers-configured": "Protože není zaveden žádný emailový plugin, není možné odeslat testovací email.",
     "category-disabled": "Kategorie zakázána",
     "topic-locked": "Téma uzamčeno",
+    "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
     "still-uploading": "Vyčkejte, prosím, nežli se vše kompletně nahraje.",
-    "content-too-short": "Vložte, prosím, delší příspěvek. Příspěvky by měly obsahovat nejméně %1 znaků.",
+    "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
-    "title-too-short": "Vložte, prosím, delší titulek. Titulky by měly obsahovat nejméně %1 znaků.",
+    "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
-    "title-too-long": "Vložte, prosím, kratší titulek. Titulky by neměly být delší, než-li %1 znaků.",
+    "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
-    "too-many-posts": "Své příspěvky můžete odesílat po %1 sekundách - vyčkejte, prosím, před dalším odesláním",
+    "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 character(s).",
-    "too-many-posts-newbie": "Jako nový uživatel můžete své příspěvky odesílat po %1 sekundách, dokud nedosáhnete %2 reputace - vyčkejte, prosím, před dalším odesláním",
+    "too-many-posts": "You can only post once every %1 second(s) - please wait before posting again",
-    "file-too-big": "Maximální povolená velikost souboru je %1 kbs - nahrávejte, prosím, menší soubory",
+    "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
+    "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",
+    "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 character(s)",
+    "file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
     "cant-vote-self-post": "Nemůžete hlasovat pro svůj vlastní příspěvek",
     "already-favourited": "You have already favourited this post",
     "already-unfavourited": "You have already unfavourited this post",
     "cant-ban-other-admins": "Nemůžete zakazovat ostatní administrátory!",
     "invalid-image-type": "Invalid image type. Allowed types are: %1",
     "invalid-image-extension": "Invalid image extension",
+    "invalid-file-type": "Invalid file type. Allowed types are: %1",
     "group-name-too-short": "Název skupiny je příliš krátký",
     "group-already-exists": "Skupina už exstuje",
     "group-name-change-not-allowed": "Změna názvu skupiny není povolena",
@@ -55,11 +63,12 @@
     "post-already-restored": "Tento příspěvek byl již obnoven",
     "topic-already-deleted": "Toto téma bylo již vymazáno",
     "topic-already-restored": "Toto téma bylo již obnoveno",
+    "cant-purge-main-post": "You can't purge the main post, please delete the topic instead",
     "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.",
     "invalid-file": "Neplatný soubor",
     "uploads-are-disabled": "Nahrávání je zakázáno",
-    "upload-error": "Chyba při nahrávání : %1",
+    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
-    "signature-too-long": "Pardon, ale váš podpis nemůže být delší, než-li %1 znaků.",
+    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
     "cant-chat-with-yourself": "Nemůžete chatovat sami se sebou!",
     "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
     "too-many-messages": "You have sent too many messages, please wait awhile.",
@@ -69,5 +78,7 @@
     "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.",
     "registration-error": "Chyba při registraci",
-    "parse-error": "Something went wrong while parsing server response"
+    "parse-error": "Something went wrong while parsing server response",
+    "wrong-login-type-email": "Please use your email to login",
+    "wrong-login-type-username": "Please use your username to login"
 }

public/language/cs/groups.json

@@ -4,6 +4,8 @@
     "owner": "Group Owner",
     "new_group": "Create New Group",
     "no_groups_found": "There are no groups to see",
+    "pending.accept": "Accept",
+    "pending.reject": "Reject",
     "cover-instructions": "Drag and Drop a photo, drag to position, and hit <strong>Save</strong>",
     "cover-change": "Change",
     "cover-save": "Save",
@@ -13,9 +15,22 @@
     "details.pending": "Pending Members",
     "details.has_no_posts": "Členové této skupiny dosud neodeslali ani jeden příspěvek.",
     "details.latest_posts": "Nejnovější příspěvky",
-    "details.private": "Private Group",
+    "details.private": "Private",
-    "details.public": "Public Group",
+    "details.grant": "Grant/Rescind Ownership",
+    "details.kick": "Kick",
     "details.owner_options": "Group Administration",
+    "details.group_name": "Group Name",
+    "details.member_count": "Member Count",
+    "details.creation_date": "Creation Date",
+    "details.description": "Description",
+    "details.badge_preview": "Badge Preview",
+    "details.change_icon": "Change Icon",
+    "details.change_colour": "Change Colour",
+    "details.badge_text": "Badge Text",
+    "details.userTitleEnabled": "Show Badge",
+    "details.private_help": "If enabled, joining of groups requires approval from a group owner",
+    "details.hidden": "Hidden",
+    "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
     "event.updated": "Group details have been updated",
     "event.deleted": "The group \"%1\" has been deleted"
 }

public/language/cs/login.json

@@ -1,5 +1,7 @@
 {
-    "username": "Uživatelské jméno / Email",
+    "username-email": "Username / Email",
+    "username": "Username",
+    "email": "Email",
     "remember_me": "Zapamatovat si mě?",
     "forgot_password": "Zapomněli jste heslo?",
     "alternative_logins": "Další způsoby přihlášení",

public/language/cs/modules.json

@@ -15,7 +15,12 @@
     "chat.seven_days": "7 dní",
     "chat.thirty_days": "30 dní",
     "chat.three_months": "3 měsíce",
+    "composer.compose": "Compose",
+    "composer.show_preview": "Show Preview",
+    "composer.hide_preview": "Hide Preview",
     "composer.user_said_in": "%1 said in %2:",
     "composer.user_said": "%1 said:",
-    "composer.discard": "Are you sure you wish to discard this post?"
+    "composer.discard": "Are you sure you wish to discard this post?",
+    "composer.submit_and_lock": "Submit and Lock",
+    "composer.toggle_dropdown": "Toggle Dropdown"
 }

public/language/cs/notifications.json

@@ -2,6 +2,7 @@
     "title": "Upozornění",
     "no_notifs": "You have no new notifications",
     "see_all": "See all Notifications",
+    "mark_all_read": "Mark all notifications read",
     "back_to_home": "Back to %1",
     "outgoing_link": "Odkaz mimo fórum",
     "outgoing_link_message": "You are now leaving %1.",
@@ -21,7 +22,6 @@
     "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...",
     "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.",
     "email-confirm-sent": "Confirmation email sent."
 }

public/language/cs/pages.json

@@ -5,14 +5,17 @@
     "recent": "Recent Topics",
     "users": "Registered Users",
     "notifications": "Notifications",
-    "tags": "Topics tagged under \"%1\"",
+    "tags": "Tags",
+    "tag": "Topics tagged under \"%1\"",
     "user.edit": "Editing \"%1\"",
     "user.following": "People %1 Follows",
     "user.followers": "People who Follow %1",
     "user.posts": "Posts made by %1",
     "user.topics": "Topics created by %1",
+    "user.groups": "%1's Groups",
     "user.favourites": "%1's Favourite Posts",
     "user.settings": "User Settings",
+    "user.watched": "Topics watched by %1",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
     "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }

public/language/cs/recent.json

@@ -6,6 +6,7 @@
     "year": "Year",
     "alltime": "All Time",
     "no_recent_topics": "There are no recent topics.",
+    "no_popular_topics": "There are no popular topics.",
     "there-is-a-new-topic": "There is a new topic.",
     "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.",
     "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.",

public/language/cs/reset_password.json

@@ -10,5 +10,8 @@
     "enter_email": "Zadejte svou <strong>emailovou adresu</strong> a my Vám pošleme informace, jak můžete obnovit své heslo.",
     "enter_email_address": "Zadejte emailovou adresu",
     "password_reset_sent": "Obnova hesla odeslána",
-    "invalid_email": "Špatný email / Email neexistuje!"
+    "invalid_email": "Špatný email / Email neexistuje!",
+    "password_too_short": "The password entered is too short, please pick a different password.",
+    "passwords_do_not_match": "The two passwords you've entered do not match.",
+    "password_expired": "Your password has expired, please choose a new password"
 }

public/language/cs/search.json

@@ -1,7 +1,40 @@
 {
     "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
     "no-matches": "No matches found",
+    "advanced-search": "Advanced Search",
     "in": "In",
-    "by": "By",
+    "titles": "Titles",
-    "posted-by": "Posted by"
+    "titles-posts": "Titles and Posts",
+    "posted-by": "Posted by",
+    "in-categories": "In Categories",
+    "search-child-categories": "Search child categories",
+    "reply-count": "Reply Count",
+    "at-least": "At least",
+    "at-most": "At most",
+    "post-time": "Post time",
+    "newer-than": "Newer than",
+    "older-than": "Older than",
+    "any-date": "Any date",
+    "yesterday": "Yesterday",
+    "one-week": "One week",
+    "two-weeks": "Two weeks",
+    "one-month": "One month",
+    "three-months": "Three months",
+    "six-months": "Six months",
+    "one-year": "One year",
+    "sort-by": "Sort by",
+    "last-reply-time": "Last reply time",
+    "topic-title": "Topic title",
+    "number-of-replies": "Number of replies",
+    "number-of-views": "Number of views",
+    "topic-start-date": "Topic start date",
+    "username": "Username",
+    "category": "Category",
+    "descending": "In descending order",
+    "ascending": "In ascending order",
+    "save-preferences": "Save preferences",
+    "clear-preferences": "Clear preferences",
+    "search-preferences-saved": "Search preferences saved",
+    "search-preferences-cleared": "Search preferences cleared",
+    "show-results-as": "Show results as"
 }

public/language/cs/tags.json

@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "Není zde žádné téma s tímto tagem.",
     "tags": "Tagy",
-    "enter_tags_here": "Zde vložte tagy. Po každém vložení tagu zmáčkněte enter.",
+    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "Vložte tagy ...",
     "no_tags": "Zatím tu není žádný tag."
 }

public/language/cs/topic.json

@@ -5,6 +5,7 @@
     "no_topics_found": "Nebyla nalezena žádná témata!",
     "no_posts_found": "Nebyly nalezeny žádné příspěvky!",
     "post_is_deleted": "Tento příspěvek je vymazán!",
+    "topic_is_deleted": "This topic is deleted!",
     "profile": "Profil",
     "posted_by": "Posted by %1",
     "posted_by_guest": "Posted by Guest",
@@ -12,6 +13,7 @@
     "notify_me": "Sledovat toto téma",
     "quote": "Citovat",
     "reply": "Odpovědět",
+    "guest-login-reply": "Log in to reply",
     "edit": "Upravit",
     "delete": "Smazat",
     "purge": "Purge",

public/language/cs/user.json

@@ -21,12 +21,14 @@
     "watched": "Watched",
     "followers": "Sledují ho",
     "following": "Sleduje",
+    "aboutme": "About me",
     "signature": "Podpis",
     "gravatar": "Gravatar",
     "birthday": "Datum narození",
     "chat": "Chat",
     "follow": "Follow",
     "unfollow": "Unfollow",
+    "more": "More",
     "profile_update_success": "Profil byl úspěšně aktualizován!",
     "change_picture": "Změnit obrázek",
     "edit": "Upravit",
@@ -47,7 +49,6 @@
     "upload_picture": "Nahrát obrázek",
     "upload_a_picture": "Nahrát obrázek",
     "image_spec": "You may only upload PNG, JPG, or GIF files",
-    "max": "max.",
     "settings": "Nastavení",
     "show_email": "Zobrazovat můj email v profilu",
     "show_fullname": "Show My Full Name",
@@ -60,6 +61,7 @@
     "digest_monthly": "Monthly",
     "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
     "send_post_notifications": "Send an email when replies are made to topics I am subscribed to",
+    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
     "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.",
@@ -67,14 +69,16 @@
     "has_no_watched_topics": "This user didn't watch any topics yet.",
     "email_hidden": "Skrytý email",
     "hidden": "skrytý",
-    "paginate_description": "Paginate topics and posts instead of using infinite scroll.",
+    "paginate_description": "Paginate topics and posts instead of using infinite scroll",
     "topics_per_page": "Topics per Page",
     "posts_per_page": "Posts per Page",
-    "notification_sounds": "Play a sound when you receive a notification.",
+    "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",
     "enable_topic_searching": "Enable In-Topic Searching",
-    "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.",
+    "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
-    "follow_topics_you_reply_to": "Follow topics that you reply to.",
+    "follow_topics_you_reply_to": "Follow topics that you reply to",
-    "follow_topics_you_create": "Follow topics you create."
+    "follow_topics_you_create": "Follow topics you create",
+    "grouptitle": "Select the group title you would like to display",
+    "no-group-title": "No group title"
 }

public/language/cs/users.json

@@ -5,7 +5,7 @@
     "search": "Vyhledávat",
     "enter_username": "Zadej uživatelské jméno k hledání",
     "load_more": "Načíst další",
-    "users-found-search-took": "Nazelezeno: %1 uživetel(ů)! Vyhledání trvalo %2 ms.",
+    "users-found-search-took": "%1 user(s) found! Search took %2 seconds.",
     "filter-by": "Filter By",
     "online-only": "Online only",
     "picture-only": "Picture only"

public/language/de/category.json

@@ -1,8 +1,12 @@
 {
     "new_topic_button": "Neues Thema",
-    "no_topics": "<strong>Es gibt noch keine Themen in dieser Kategorie.</strong><br />Warum beginnst du nicht das erste?",
+    "guest-login-post": "Anmelden um einen Beitrag zu erstellen",
+    "no_topics": "<strong>Es gibt noch keine Themen in dieser Kategorie.</strong><br />Warum beginnst du nicht eins?",
     "browsing": "Aktiv",
     "no_replies": "Niemand hat geantwortet",
     "share_this_category": "Teile diese Kategorie",
-    "ignore": "Ignorieren"
+    "watch": "Beobachten",
+    "ignore": "Ignorieren",
+    "watch.message": "Du beobachtest jetzt Änderungen in dieser Kategorie",
+    "ignore.message": "Du ignorierst jetzt Änderungen in dieser Kategorie"
 }

public/language/de/email.json

@@ -1,16 +1,19 @@
 {
     "password-reset-requested": "Zurücksetzung des Passworts beantragt - %1!",
-    "welcome-to": "Willkommen zu %1",
+    "welcome-to": "Willkommen bei %1",
     "greeting_no_name": "Hallo",
     "greeting_with_name": "Hallo %1",
-    "welcome.text1": "Vielen Dank für die Registrierung mit %1!",
+    "welcome.text1": "Vielen Dank für die Registrierung bei %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",
+    "reset.notify.subject": "Passwort erfolgreich geändert",
+    "reset.notify.text1": "Wir benachrichtigen dich das am %1, dein Passwort erfolgreich geändert wurde.",
+    "reset.notify.text2": "Wenn du das nicht autorisiert hast, bitte benachrichtige umgehend einen Administrator.",
     "digest.notifications": "Du hast ungelesene Benachrichtigungen von %1:",
-    "digest.latest_topics": "Aktuellste Themen vom %1",
+    "digest.latest_topics": "Neueste Themen vom %1",
     "digest.cta": "Klicke hier, um %1 zu besuchen",
     "digest.unsub.info": "Diese Zusammenfassung wurde dir aufgrund deiner Abonnement-Einstellungen gesendet.",
     "digest.no_topics": "Es gab keine aktiven Themen in den letzten %1",

public/language/de/error.json

@@ -2,7 +2,7 @@
     "invalid-data": "Daten ungültig",
     "not-logged-in": "Du bist nicht angemeldet.",
     "account-locked": "Dein Account wurde vorübergehend gesperrt.",
-    "search-requires-login": "Die Suche erfordert ein Konto! Bitte log dich ein oder registrieren dich!",
+    "search-requires-login": "Searching requires an account - please login or register.",
     "invalid-cid": "Ungültige Kategorie-ID",
     "invalid-tid": "Ungültige Themen-ID",
     "invalid-pid": "Ungültige Beitrags-ID",
@@ -18,11 +18,14 @@
     "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-chat": "Der Chat ist deaktiviert bis Du deine E-Mail bestätigt hast",
+    "email-not-confirmed-chat": "Deine E-Mail wurde noch nicht bestätigt. Bitte klicke hier, um deine E-Mail zu bestätigen.",
+    "no-email-to-confirm": "Dieses Forum setzt E-Mail-Bestätigung voraus, bitte klick hier um eine E-Mail-Adresse einzugeben",
+    "email-confirm-failed": "Wir konnten deine E-Mail-Adresse nicht bestätigen, bitte versuch es später noch einmal",
+    "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
     "username-too-short": "Benutzername ist zu kurz",
     "username-too-long": "Der Benutzername ist zu lang",
     "user-banned": "Der Benutzer ist gesperrt",
-    "user-too-new": "Entschuldigung, du musst %1 Sekunden warten, bevor du deinen ersten Beitrag verfassen kannst!",
+    "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
     "no-category": "Die Kategorie existiert nicht",
     "no-topic": "Das Thema existiert nicht",
     "no-post": "Der Beitrag existiert nicht",
@@ -33,19 +36,24 @@
     "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",
+    "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
     "still-uploading": "Bitte warte bis der Vorgang abgeschlossen ist.",
-    "content-too-short": "Bitte gib einen längeren Beitrag ein. Beiträge sollten mindestens %1 Zeichen enthalten.",
+    "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
-    "title-too-short": "Bitte gib einen längeren Titel ein. Titel sollten mindestens %1 Zeichen enthalten.",
+    "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
-    "title-too-long": "Der Titel darf maximal %1 Zeichen enthalten.",
+    "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
-    "too-many-posts": "Du kannst maximal alle %1 Sekunden einen Beitrag erstellen - bitte warte, bevor du einen neuen Beitrag erstellst",
+    "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 character(s).",
-    "too-many-posts-newbie": "Als neuer Benutzer kannst du nur alle %1 Sekunden einen Beitrag verfassen, bis du %2 Reputationspunkte hast - Bitte warte etwas, bevor du erneut einen Beitrag verfasst",
+    "too-many-posts": "You can only post once every %1 second(s) - please wait before posting again",
-    "file-too-big": "Die maximale Dateigröße beträgt %1 kbs - bitte lade eine kleinere Datei hoch",
+    "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
-    "cant-vote-self-post": "Du kannst deinen eigenen Beitrag nicht bewerten.",
+    "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",
+    "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 character(s)",
+    "file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
+    "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",
     "cant-ban-other-admins": "Du kannst andere Administratoren nicht sperren!",
     "invalid-image-type": "Falsche Bildart. Erlaubte Arten sind: %1",
     "invalid-image-extension": "Ungültige Dateinamenerweiterung",
+    "invalid-file-type": "Ungültiger Dateityp. Erlaubte Typen sind: %1",
     "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",
@@ -55,11 +63,12 @@
     "post-already-restored": "Dieser Beitrag ist bereits wiederhergestellt worden",
     "topic-already-deleted": "Dieses Thema ist bereits gelöscht worden",
     "topic-already-restored": "Dieses Thema ist bereits wiederhergestellt worden",
+    "cant-purge-main-post": "Du kannst den Hauptbeitrag nicht löschen, bitte lösche stattdessen das Thema",
     "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": "Sorry, your signature cannot be longer than %1 character(s).",
-    "signature-too-long": "Entschuldigung, deine Signatur darf maximal %1 Zeichen enthalten.",
+    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
     "cant-chat-with-yourself": "Du kannst nicht mit dir selber chatten!",
     "chat-restricted": "Dieser Benutzer hat seine Chatfunktion eingeschränkt. Du kannst nur mit diesem Benutzer chatten, wenn er dir folgt.",
     "too-many-messages": "Du hast zu viele Nachrichten versandt, bitte warte eine Weile.",
@@ -69,5 +78,7 @@
     "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.",
     "registration-error": "Registrierungsfehler",
-    "parse-error": "Ein Fehler ist beim Parsen der Server-Antwort aufgetreten"
+    "parse-error": "Beim auswerten der Serverantwort ist etwas schiefgegangen",
+    "wrong-login-type-email": "Bitte nutze deine E-Mail-Adresse zum einloggen",
+    "wrong-login-type-username": "Bitte nutze deinen Benutzernamen zum einloggen"
 }

public/language/de/groups.json

@@ -4,18 +4,33 @@
     "owner": "Gruppenbesitzer",
     "new_group": "Neue Gruppe erstellen",
     "no_groups_found": "Es sind keine Gruppen vorhanden",
-    "cover-instructions": "Drag and Drop ein Foto, bewege es in Position, dann drücke <strong>Speichern</strong>",
+    "pending.accept": "Annehmen",
+    "pending.reject": "Abweisen",
+    "cover-instructions": "Foto auf eine Position bewegen, und <strong>Speichern</strong> drücken",
     "cover-change": "Ändern",
     "cover-save": "Speichern",
-    "cover-saving": "Am speichern",
+    "cover-saving": "Speicherung läuft",
     "details.title": "Gruppendetails",
     "details.members": "Mitgliederliste",
-    "details.pending": "Ausstehende Mitglieder",
+    "details.pending": "Mitglieder in Schwebe",
     "details.has_no_posts": "Die Mitglieder dieser Gruppe haben keine Beiträge verfasst.",
-    "details.latest_posts": "Aktuelle Beiträge",
+    "details.latest_posts": "Neueste Beiträge",
-    "details.private": "Private Gruppe",
+    "details.private": "Privat",
-    "details.public": "Öffentliche Gruppe",
+    "details.grant": "Gewähre/widerrufe Besitz",
+    "details.kick": "Kick",
     "details.owner_options": "Gruppenadministration",
+    "details.group_name": "Gruppenname",
+    "details.member_count": "Mitgliederanzahl",
+    "details.creation_date": "Erstelldatum",
+    "details.description": "Beschreibung",
+    "details.badge_preview": "Abzeichenvorschau",
+    "details.change_icon": "Symbol ändern",
+    "details.change_colour": "Farbe ändern",
+    "details.badge_text": "Text für das Abzeichen",
+    "details.userTitleEnabled": "Abzeichen anzeigen",
+    "details.private_help": "Wenn aktiviert, setzt ein Gruppenbeitritt die Zustimmung eines Gruppenbesitzers voraus",
+    "details.hidden": "Versteckt",
+    "details.hidden_help": "Wenn aktiviert, wird diese Gruppe in der Gruppenliste nicht zu finden sein, und Benutzer werden manuell eingeladen werden müssen.",
     "event.updated": "Gruppendetails wurden aktualisiert",
-    "event.deleted": "Die Gruppe \"% 1\" wurde gelöscht"
+    "event.deleted": "Die Gruppe \"%1\" wurde gelöscht."
 }

public/language/de/login.json

@@ -1,8 +1,10 @@
 {
-    "username": "Nutzername / E-Mail Adresse",
+    "username-email": "Benutzername / E-Mail-Adresse",
+    "username": "Benutzername",
+    "email": "E-Mail",
     "remember_me": "Eingeloggt bleiben?",
     "forgot_password": "Passwort vergessen?",
-    "alternative_logins": "Login Alternativen",
+    "alternative_logins": "Alternative Logins",
     "failed_login_attempt": " Anmeldeversuch fehlgeschlagen, versuche es erneut.",
     "login_successful": "Du hast dich erfolgreich eingeloggt!",
     "dont_have_account": "Sie haben noch kein Konto?"

public/language/de/modules.json

@@ -15,7 +15,12 @@
     "chat.seven_days": "7 Tage",
     "chat.thirty_days": "30 Tage",
     "chat.three_months": "3 Monate",
+    "composer.compose": "Verfassen",
+    "composer.show_preview": "Vorschau anzeigen",
+    "composer.hide_preview": "Vorschau ausblenden",
     "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?"
+    "composer.discard": "Bist du sicher, dass du diesen Beitrag verwerfen möchtest?",
+    "composer.submit_and_lock": "Einreichen und Sperren",
+    "composer.toggle_dropdown": "Menu aus-/einblenden"
 }

public/language/de/notifications.json

@@ -2,6 +2,7 @@
     "title": "Benachrichtigungen",
     "no_notifs": "Du hast keine neuen Benachrichtigungen",
     "see_all": "Alle Benachrichtigungen ansehen",
+    "mark_all_read": "Alle Benachrichtigungen als gelesen markieren",
     "back_to_home": "Zurück zu %1",
     "outgoing_link": "Externer Link",
     "outgoing_link_message": "Du verlässt nun %1.",
@@ -21,7 +22,6 @@
     "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 ...",
     "email-confirm-error-message": "Es gab ein Problem bei der Validierung Ihrer E-Mail-Adresse. Möglicherweise ist der Code ungültig oder abgelaufen.",
     "email-confirm-sent": "Bestätigungs-E-Mail gesendet."
 }

public/language/de/pages.json

@@ -5,14 +5,17 @@
     "recent": "Neueste Themen",
     "users": "Registrierte User",
     "notifications": "Benachrichtigungen",
-    "tags": "Themen markiert unter \"%1\"",
+    "tags": "Markierungen",
+    "tag": "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.groups": "%1's Gruppen",
     "user.favourites": "Von %1 favorisierte Beiträge",
     "user.settings": "Benutzer-Einstellungen",
+    "user.watched": "Themen angeschaut von %1",
     "maintenance.text": "%1 befindet sich derzeit in der Wartung. Bitte komm später wieder.",
     "maintenance.messageIntro": "Zusätzlich hat der Administrator diese Nachricht hinterlassen:"
 }

public/language/de/recent.json

@@ -6,6 +6,7 @@
     "year": "Jahr",
     "alltime": "Gesamter Zeitraum",
     "no_recent_topics": "Es gibt keine aktuellen Themen.",
+    "no_popular_topics": "Es gibt keine beliebten Themen.",
     "there-is-a-new-topic": "Es gibt ein neues Thema.",
     "there-is-a-new-topic-and-a-new-post": "Es gibt ein neues Thema und einen neuen Beitrag.",
     "there-is-a-new-topic-and-new-posts": "Es gibt ein neues Thema und %1 neue Beiträge.",
@@ -14,5 +15,5 @@
     "there-are-new-topics-and-new-posts": "Es gibt %1 neue Themen und %2 neue Beiträge.",
     "there-is-a-new-post": "Es gibt einen neuen Beitrag.",
     "there-are-new-posts": "Es gibt %1 neue Beiträge.",
-    "click-here-to-reload": "Hier klicken um neu zu laden."
+    "click-here-to-reload": "Hier klicken um zu aktualisieren."
 }

public/language/de/reset_password.json

@@ -10,5 +10,8 @@
     "enter_email": "Bitte gib Deine <strong>E-Mail Adresse</strong> ein und wir senden Dir eine Anleitung, wie Du Dein Passwort zurücksetzen kannst.",
     "enter_email_address": "E-Mail Adresse eingeben",
     "password_reset_sent": "Passwortzurücksetzung beantragt.",
-    "invalid_email": "Ungültige E-Mail / Adresse existiert nicht!"
+    "invalid_email": "Ungültige E-Mail / Adresse existiert nicht!",
+    "password_too_short": "Das eingegebene Passwort ist zu kurz, bitte wähle ein anderes Passwort.",
+    "passwords_do_not_match": "Die eingegebenen Passwörter stimmen nicht überein.",
+    "password_expired": "Dein Passwort ist abgelaufen, bitte wähle ein neues Passwort"
 }

public/language/de/search.json

@@ -1,7 +1,40 @@
 {
-    "results_matching": "%1 Ergebniss(e) stimmen mit \"%2\" überein, (%3 Sekunden)",
+    "results_matching": "%1 Ergebnis(se) stimmen mit \"%2\" überein, (%3 Sekunden)",
     "no-matches": "Keine Ergebnisse gefunden",
+    "advanced-search": "Erweiterte Suche",
     "in": "In",
-    "by": "Bei",
+    "titles": "Titel",
-    "posted-by": "Geschrieben von"
+    "titles-posts": "Titel und Beiträge",
+    "posted-by": "Geschrieben von",
+    "in-categories": "In Kategorien",
+    "search-child-categories": "Suche in Unterkategorien",
+    "reply-count": "Anzahl Antworten",
+    "at-least": "Mindestens",
+    "at-most": "Höchstens",
+    "post-time": "Verfaßt am",
+    "newer-than": "Neuer als",
+    "older-than": "Älter als",
+    "any-date": "Beliebiger Zeitpunkt",
+    "yesterday": "Gestern",
+    "one-week": "Eine Woche",
+    "two-weeks": "Zwei Wochen",
+    "one-month": "Ein Monat",
+    "three-months": "Drei Monate",
+    "six-months": "Sechs Monate",
+    "one-year": "Ein Jahr",
+    "sort-by": "Sortieren nach",
+    "last-reply-time": "Zeitpunkt der letzten Antwort",
+    "topic-title": "Thementitel",
+    "number-of-replies": "Anzahl an Antworten",
+    "number-of-views": "Anzahl der Aufrufe",
+    "topic-start-date": "Erstelldatum des Themas",
+    "username": "Benutzername",
+    "category": "Kategorie",
+    "descending": "In absteigender Reihenfolge",
+    "ascending": "In aufsteigender Reihenfolge",
+    "save-preferences": "Einstellungen speichern",
+    "clear-preferences": "Einstellungen löschen",
+    "search-preferences-saved": "Sucheinstellungen gespeichert",
+    "search-preferences-cleared": "Sucheinstellungen gelöscht",
+    "show-results-as": "Ergebnisse anzeigen als"
 }

public/language/de/tags.json

@@ -1,7 +1,7 @@
 {
-    "no_tag_topics": "Es gibt keine Themen mit diesem Tag.",
+    "no_tag_topics": "Es gibt keine Themen mit diesem Stichwort.",
-    "tags": "Tags",
+    "tags": "Stichwörter",
-    "enter_tags_here": "Gib hier Tags ein und drück die Eingabetaste nach jedem Tag.",
+    "enter_tags_here": "Gib hier Stichwörter ein. %1-%2 Zeichen. Drücke Enter nach jedem Stichwort",
-    "enter_tags_here_short": "Gib Tags ein...",
+    "enter_tags_here_short": "Gib Stichwörter ein...",
-    "no_tags": "Es gibt bisher keine Tags."
+    "no_tags": "Es gibt bisher keine Stichwörter."
 }

public/language/de/topic.json

@@ -5,6 +5,7 @@
     "no_topics_found": "Keine passenden Themen gefunden.",
     "no_posts_found": "Keine Beiträge gefunden!",
     "post_is_deleted": "Dieser Beitrag wurde gelöscht!",
+    "topic_is_deleted": "This topic is deleted!",
     "profile": "Profil",
     "posted_by": "Geschrieben von %1",
     "posted_by_guest": "Verfasst von einem Gast",
@@ -12,9 +13,10 @@
     "notify_me": "Erhalte eine Benachrichtigung bei neuen Antworten zu diesem Thema.",
     "quote": "zitieren",
     "reply": "antworten",
+    "guest-login-reply": "Anmelden zum Antworten",
     "edit": "bearbeiten",
     "delete": "löschen",
-    "purge": "bereinigen",
+    "purge": "säubern",
     "restore": "Wiederherstellen",
     "move": "verschieben",
     "fork": "Aufspalten",
@@ -50,12 +52,12 @@
     "thread_tools.delete_confirm": "Bist du sicher, dass du dieses Thema löschen möchtest?",
     "thread_tools.restore": "Thema wiederherstellen",
     "thread_tools.restore_confirm": "Bist du sicher, dass du dieses Thema wiederherstellen möchtest?",
-    "thread_tools.purge": "Thema bereinigen",
+    "thread_tools.purge": "Thema säubern",
-    "thread_tools.purge_confirm": "Bist du sicher, dass du dieses Thema bereinigen möchtest?",
+    "thread_tools.purge_confirm": "Bist du sicher, dass du dieses Thema säubern 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?",
-    "post_purge_confirm": "Sind Sie sicher, das Sie diesen Beitrag bereinigen möchten?",
+    "post_purge_confirm": "Sind Sie sicher, das Sie diesen Beitrag säubern möchten?",
     "load_categories": "Kategorien laden",
     "disabled_categories_note": "Deaktivierte Kategorien sind ausgegraut.",
     "confirm_move": "Verschieben",

public/language/de/user.json

@@ -21,12 +21,14 @@
     "watched": "Beobachtet",
     "followers": "Folger",
     "following": "Folgt",
+    "aboutme": "About me",
     "signature": "Signatur",
     "gravatar": "Gravatar",
     "birthday": "Geburtstag",
     "chat": "Chat",
     "follow": "Folgen",
     "unfollow": "Nicht mehr folgen",
+    "more": "Mehr",
     "profile_update_success": "Profil erfolgreich aktualisiert!",
     "change_picture": "Profilbild ändern",
     "edit": "Ändern",
@@ -47,7 +49,6 @@
     "upload_picture": "Bild hochladen",
     "upload_a_picture": "Ein Bild hochladen",
     "image_spec": "Sie dürfen nur Dateien vom Typ PNG, JPG oder GIF hochladen",
-    "max": "max.",
     "settings": "Einstellungen",
     "show_email": "Zeige meine E-Mail Adresse an.",
     "show_fullname": "Zeige meinen kompletten Namen an",
@@ -60,6 +61,7 @@
     "digest_monthly": "Monatlich",
     "send_chat_notifications": "Sende eine E-Mail, wenn eine neue Chat-Nachricht eingeht und ich nicht online bin",
     "send_post_notifications": "Sende eine E-Mail wenn auf Themen die ich abonniert habe geantwortet wird",
+    "settings-require-reload": "Manche Einstellungsänderung benötigt ein aktualisieren. Drücke hier um die Seite neu zu laden.",
     "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.",
@@ -67,14 +69,16 @@
     "has_no_watched_topics": "Diese Person beobachtet keine Themen",
     "email_hidden": "E-Mail Adresse versteckt",
     "hidden": "versteckt",
-    "paginate_description": "Themen und Beiträge auf Seiten aufteilen statt unendliches Scrollen verwenden.",
+    "paginate_description": "Themen und Beiträge in Seiten aufteilen, anstelle unendlich zu scrollen",
     "topics_per_page": "Themen pro Seite",
     "posts_per_page": "Beiträge pro Seite",
-    "notification_sounds": "Ton abspielen, wenn ich eine Benachrichtigung erhalte.",
+    "notification_sounds": "Ton abspielen, wenn du eine Benachrichtigung erhältst",
-    "browsing": "Browser Einstellungen",
+    "browsing": "Stöbereinstellungen",
-    "open_links_in_new_tab": "Externe Links in neuem Tab öffnen?",
+    "open_links_in_new_tab": "Ausgehende Links in neuem Tab öffnen",
     "enable_topic_searching": "Suchen innerhalb von Themen aktivieren",
-    "topic_search_help": "Falls aktiviert, wird die Suche im Thema das Standardsuchverhalten des Browsers überschreiben und es Ihnen erlauben, das ganze Thema statt dessen, was sich auf dem Bildschirm befindet, zu durchsuchen.",
+    "topic_search_help": "Wenn aktiviert, ersetzt die im-Thema-Suche die Standardsuche des Browsers. Dadurch kannst du im ganzen Thema suchen, nicht nur im sichtbaren Abschnitt.",
-    "follow_topics_you_reply_to": "Folge Themen, auf die du antwortest.",
+    "follow_topics_you_reply_to": "Themen folgen, in denen auf dich geantwortet wird",
-    "follow_topics_you_create": "Folge Themen, die du erstellst."
+    "follow_topics_you_create": "Themen folgen, die du erstellst",
+    "grouptitle": "Wähle den anzuzeigenden Gruppen Titel aus",
+    "no-group-title": "Kein Gruppentitel"
 }

public/language/el/category.json

@@ -1,8 +1,12 @@
 {
     "new_topic_button": "Νέο Θέμα",
+    "guest-login-post": "Log in to post",
     "no_topics": "<strong>Δεν υπάρχουν θέματα σε αυτή την κατηγορία.</strong><br />Γιατί δεν δοκιμάζεις να δημοσιεύσεις ένα εσύ;",
     "browsing": "περιηγούνται",
     "no_replies": "Κανείς δεν έχει απαντήσει",
     "share_this_category": "Μοιράσου αυτή την κατηγορία",
-    "ignore": "Αγνόηση"
+    "watch": "Watch",
+    "ignore": "Αγνόηση",
+    "watch.message": "You are now watching updates from this category",
+    "ignore.message": "You are now ignoring updates from this category"
 }