updated shrinkwrap file

Merge branch 'master' into v0.9.x
0.9.3
2025-12-16 13:30:23 +01:00 · 2015-12-19 11:09:16 -05:00 · 2015-12-19 11:06:50 -05:00 · 2015-12-19 11:06:38 -05:00 · 2015-12-19 17:21:09 +02:00 · 2015-12-19 09:31:03 -05:00
835 changed files with 20492 additions and 10430 deletions
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -0,0 +1,8 @@
+# Save as .codeclimate.yml (note leading .) in project root directory
+languages:
+  Ruby: true
+  JavaScript: true
+  PHP: true
+exclude_paths:
+- "public/vendor/*"
+- "tests/*"
--- a/.gitignore
+++ b/.gitignore
@@ -40,4 +40,8 @@ pidfile

 ## File-based project format:
 *.ipr
-*.iws
+*.iws
+
+## Transifex
+tx.exe
+.transifexrc
--- a/.jshintrc
+++ b/.jshintrc
@@ -24,7 +24,7 @@
                                // "single" : require single quotes
                                // "double" : require double quotes
    "undef" : true, // true: Require all non-global variables to be declared (prevents global leaks)
-    "unused" : false, // true: Require all defined variables be used TODO: Set this to true, update codebase.
+    "unused" : true, // true: Require all defined variables be used
    "strict" : true, // true: Requires all functions run in ES5 Strict Mode
    "trailing" : false, // true: Prohibit trailing whitespaces
    "maxparams" : false, // {int} Max number of formal params allowed per function
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,17 @@ before_install:
 before_script:
    - "until nc -z localhost 27017; do echo Waiting for MongoDB; sleep 1; done"
 language: node_js
+env:
+  - CXX=g++-4.8
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - g++-4.8
 node_js:
+    - "4.1"
+    - "4.0"
    - "0.11"
    - "0.10"
 branches:
--- a/.tx/config
+++ b/.tx/config
@@ -19,6 +19,7 @@ trans.et = public/language/et/category.json
 trans.fa_IR = public/language/fa_IR/category.json
 trans.fi = public/language/fi/category.json
 trans.fr = public/language/fr/category.json
+trans.gl = public/language/gl/category.json
 trans.he = public/language/he/category.json
 trans.hu = public/language/hu/category.json
 trans.id = public/language/id/category.json
@@ -36,6 +37,7 @@ trans.ro = public/language/ro/category.json
 trans.rw = public/language/rw/category.json
 trans.sc = public/language/sc/category.json
 trans.sk = public/language/sk/category.json
+trans.sl = public/language/sl/category.json
 trans.sr = public/language/sr/category.json
 trans.sv = public/language/sv/category.json
 trans.th = public/language/th/category.json
@@ -63,6 +65,7 @@ trans.et = public/language/et/login.json
 trans.fa_IR = public/language/fa_IR/login.json
 trans.fi = public/language/fi/login.json
 trans.fr = public/language/fr/login.json
+trans.gl = public/language/gl/login.json
 trans.he = public/language/he/login.json
 trans.hu = public/language/hu/login.json
 trans.id = public/language/id/login.json
@@ -80,6 +83,7 @@ trans.ro = public/language/ro/login.json
 trans.rw = public/language/rw/login.json
 trans.sc = public/language/sc/login.json
 trans.sk = public/language/sk/login.json
+trans.sl = public/language/sl/login.json
 trans.sr = public/language/sr/login.json
 trans.sv = public/language/sv/login.json
 trans.th = public/language/th/login.json
@@ -107,6 +111,7 @@ trans.et = public/language/et/recent.json
 trans.fa_IR = public/language/fa_IR/recent.json
 trans.fi = public/language/fi/recent.json
 trans.fr = public/language/fr/recent.json
+trans.gl = public/language/gl/recent.json
 trans.he = public/language/he/recent.json
 trans.hu = public/language/hu/recent.json
 trans.id = public/language/id/recent.json
@@ -124,6 +129,7 @@ trans.ro = public/language/ro/recent.json
 trans.rw = public/language/rw/recent.json
 trans.sc = public/language/sc/recent.json
 trans.sk = public/language/sk/recent.json
+trans.sl = public/language/sl/recent.json
 trans.sr = public/language/sr/recent.json
 trans.sv = public/language/sv/recent.json
 trans.th = public/language/th/recent.json
@@ -151,6 +157,7 @@ trans.et = public/language/et/unread.json
 trans.fa_IR = public/language/fa_IR/unread.json
 trans.fi = public/language/fi/unread.json
 trans.fr = public/language/fr/unread.json
+trans.gl = public/language/gl/unread.json
 trans.he = public/language/he/unread.json
 trans.hu = public/language/hu/unread.json
 trans.id = public/language/id/unread.json
@@ -168,6 +175,7 @@ trans.ro = public/language/ro/unread.json
 trans.rw = public/language/rw/unread.json
 trans.sc = public/language/sc/unread.json
 trans.sk = public/language/sk/unread.json
+trans.sl = public/language/sl/unread.json
 trans.sr = public/language/sr/unread.json
 trans.sv = public/language/sv/unread.json
 trans.th = public/language/th/unread.json
@@ -195,6 +203,7 @@ trans.et = public/language/et/modules.json
 trans.fa_IR = public/language/fa_IR/modules.json
 trans.fi = public/language/fi/modules.json
 trans.fr = public/language/fr/modules.json
+trans.gl = public/language/gl/modules.json
 trans.he = public/language/he/modules.json
 trans.hu = public/language/hu/modules.json
 trans.id = public/language/id/modules.json
@@ -212,6 +221,7 @@ trans.ro = public/language/ro/modules.json
 trans.rw = public/language/rw/modules.json
 trans.sc = public/language/sc/modules.json
 trans.sk = public/language/sk/modules.json
+trans.sl = public/language/sl/modules.json
 trans.sr = public/language/sr/modules.json
 trans.sv = public/language/sv/modules.json
 trans.th = public/language/th/modules.json
@@ -239,6 +249,7 @@ trans.et = public/language/et/register.json
 trans.fa_IR = public/language/fa_IR/register.json
 trans.fi = public/language/fi/register.json
 trans.fr = public/language/fr/register.json
+trans.gl = public/language/gl/register.json
 trans.he = public/language/he/register.json
 trans.hu = public/language/hu/register.json
 trans.id = public/language/id/register.json
@@ -256,6 +267,7 @@ trans.ro = public/language/ro/register.json
 trans.rw = public/language/rw/register.json
 trans.sc = public/language/sc/register.json
 trans.sk = public/language/sk/register.json
+trans.sl = public/language/sl/register.json
 trans.sr = public/language/sr/register.json
 trans.sv = public/language/sv/register.json
 trans.th = public/language/th/register.json
@@ -283,6 +295,7 @@ trans.et = public/language/et/user.json
 trans.fa_IR = public/language/fa_IR/user.json
 trans.fi = public/language/fi/user.json
 trans.fr = public/language/fr/user.json
+trans.gl = public/language/gl/user.json
 trans.he = public/language/he/user.json
 trans.hu = public/language/hu/user.json
 trans.id = public/language/id/user.json
@@ -300,6 +313,7 @@ trans.ro = public/language/ro/user.json
 trans.rw = public/language/rw/user.json
 trans.sc = public/language/sc/user.json
 trans.sk = public/language/sk/user.json
+trans.sl = public/language/sl/user.json
 trans.sr = public/language/sr/user.json
 trans.sv = public/language/sv/user.json
 trans.th = public/language/th/user.json
@@ -327,6 +341,7 @@ trans.et = public/language/et/global.json
 trans.fa_IR = public/language/fa_IR/global.json
 trans.fi = public/language/fi/global.json
 trans.fr = public/language/fr/global.json
+trans.gl = public/language/gl/global.json
 trans.he = public/language/he/global.json
 trans.hu = public/language/hu/global.json
 trans.id = public/language/id/global.json
@@ -344,6 +359,7 @@ trans.ro = public/language/ro/global.json
 trans.rw = public/language/rw/global.json
 trans.sc = public/language/sc/global.json
 trans.sk = public/language/sk/global.json
+trans.sl = public/language/sl/global.json
 trans.sr = public/language/sr/global.json
 trans.sv = public/language/sv/global.json
 trans.th = public/language/th/global.json
@@ -371,6 +387,7 @@ trans.et = public/language/et/notifications.json
 trans.fa_IR = public/language/fa_IR/notifications.json
 trans.fi = public/language/fi/notifications.json
 trans.fr = public/language/fr/notifications.json
+trans.gl = public/language/gl/notifications.json
 trans.he = public/language/he/notifications.json
 trans.hu = public/language/hu/notifications.json
 trans.id = public/language/id/notifications.json
@@ -388,6 +405,7 @@ trans.ro = public/language/ro/notifications.json
 trans.rw = public/language/rw/notifications.json
 trans.sc = public/language/sc/notifications.json
 trans.sk = public/language/sk/notifications.json
+trans.sl = public/language/sl/notifications.json
 trans.sr = public/language/sr/notifications.json
 trans.sv = public/language/sv/notifications.json
 trans.th = public/language/th/notifications.json
@@ -415,6 +433,7 @@ trans.et = public/language/et/reset_password.json
 trans.fa_IR = public/language/fa_IR/reset_password.json
 trans.fi = public/language/fi/reset_password.json
 trans.fr = public/language/fr/reset_password.json
+trans.gl = public/language/gl/reset_password.json
 trans.he = public/language/he/reset_password.json
 trans.hu = public/language/hu/reset_password.json
 trans.id = public/language/id/reset_password.json
@@ -432,6 +451,7 @@ trans.ro = public/language/ro/reset_password.json
 trans.rw = public/language/rw/reset_password.json
 trans.sc = public/language/sc/reset_password.json
 trans.sk = public/language/sk/reset_password.json
+trans.sl = public/language/sl/reset_password.json
 trans.sr = public/language/sr/reset_password.json
 trans.sv = public/language/sv/reset_password.json
 trans.th = public/language/th/reset_password.json
@@ -459,6 +479,7 @@ trans.et = public/language/et/users.json
 trans.fa_IR = public/language/fa_IR/users.json
 trans.fi = public/language/fi/users.json
 trans.fr = public/language/fr/users.json
+trans.gl = public/language/gl/users.json
 trans.he = public/language/he/users.json
 trans.hu = public/language/hu/users.json
 trans.id = public/language/id/users.json
@@ -476,6 +497,7 @@ trans.ro = public/language/ro/users.json
 trans.rw = public/language/rw/users.json
 trans.sc = public/language/sc/users.json
 trans.sk = public/language/sk/users.json
+trans.sl = public/language/sl/users.json
 trans.sr = public/language/sr/users.json
 trans.sv = public/language/sv/users.json
 trans.th = public/language/th/users.json
@@ -503,6 +525,7 @@ trans.et = public/language/et/language.json
 trans.fa_IR = public/language/fa_IR/language.json
 trans.fi = public/language/fi/language.json
 trans.fr = public/language/fr/language.json
+trans.gl = public/language/gl/language.json
 trans.he = public/language/he/language.json
 trans.hu = public/language/hu/language.json
 trans.id = public/language/id/language.json
@@ -520,6 +543,7 @@ trans.ro = public/language/ro/language.json
 trans.rw = public/language/rw/language.json
 trans.sc = public/language/sc/language.json
 trans.sk = public/language/sk/language.json
+trans.sl = public/language/sl/language.json
 trans.sr = public/language/sr/language.json
 trans.sv = public/language/sv/language.json
 trans.th = public/language/th/language.json
@@ -547,6 +571,7 @@ trans.et = public/language/et/pages.json
 trans.fa_IR = public/language/fa_IR/pages.json
 trans.fi = public/language/fi/pages.json
 trans.fr = public/language/fr/pages.json
+trans.gl = public/language/gl/pages.json
 trans.he = public/language/he/pages.json
 trans.hu = public/language/hu/pages.json
 trans.id = public/language/id/pages.json
@@ -564,6 +589,7 @@ trans.ro = public/language/ro/pages.json
 trans.rw = public/language/rw/pages.json
 trans.sc = public/language/sc/pages.json
 trans.sk = public/language/sk/pages.json
+trans.sl = public/language/sl/pages.json
 trans.sr = public/language/sr/pages.json
 trans.sv = public/language/sv/pages.json
 trans.th = public/language/th/pages.json
@@ -591,6 +617,7 @@ trans.et = public/language/et/topic.json
 trans.fa_IR = public/language/fa_IR/topic.json
 trans.fi = public/language/fi/topic.json
 trans.fr = public/language/fr/topic.json
+trans.gl = public/language/gl/topic.json
 trans.he = public/language/he/topic.json
 trans.hu = public/language/hu/topic.json
 trans.id = public/language/id/topic.json
@@ -608,6 +635,7 @@ trans.ro = public/language/ro/topic.json
 trans.rw = public/language/rw/topic.json
 trans.sc = public/language/sc/topic.json
 trans.sk = public/language/sk/topic.json
+trans.sl = public/language/sl/topic.json
 trans.sr = public/language/sr/topic.json
 trans.sv = public/language/sv/topic.json
 trans.th = public/language/th/topic.json
@@ -635,6 +663,7 @@ trans.et = public/language/et/success.json
 trans.fa_IR = public/language/fa_IR/success.json
 trans.fi = public/language/fi/success.json
 trans.fr = public/language/fr/success.json
+trans.gl = public/language/gl/success.json
 trans.he = public/language/he/success.json
 trans.hu = public/language/hu/success.json
 trans.id = public/language/id/success.json
@@ -652,6 +681,7 @@ trans.ro = public/language/ro/success.json
 trans.rw = public/language/rw/success.json
 trans.sc = public/language/sc/success.json
 trans.sk = public/language/sk/success.json
+trans.sl = public/language/sl/success.json
 trans.sr = public/language/sr/success.json
 trans.sv = public/language/sv/success.json
 trans.th = public/language/th/success.json
@@ -679,6 +709,7 @@ trans.et = public/language/et/error.json
 trans.fa_IR = public/language/fa_IR/error.json
 trans.fi = public/language/fi/error.json
 trans.fr = public/language/fr/error.json
+trans.gl = public/language/gl/error.json
 trans.he = public/language/he/error.json
 trans.hu = public/language/hu/error.json
 trans.id = public/language/id/error.json
@@ -696,6 +727,7 @@ trans.ro = public/language/ro/error.json
 trans.rw = public/language/rw/error.json
 trans.sc = public/language/sc/error.json
 trans.sk = public/language/sk/error.json
+trans.sl = public/language/sl/error.json
 trans.sr = public/language/sr/error.json
 trans.sv = public/language/sv/error.json
 trans.th = public/language/th/error.json
@@ -723,6 +755,7 @@ trans.et = public/language/et/tags.json
 trans.fa_IR = public/language/fa_IR/tags.json
 trans.fi = public/language/fi/tags.json
 trans.fr = public/language/fr/tags.json
+trans.gl = public/language/gl/tags.json
 trans.he = public/language/he/tags.json
 trans.hu = public/language/hu/tags.json
 trans.id = public/language/id/tags.json
@@ -740,6 +773,7 @@ trans.ro = public/language/ro/tags.json
 trans.rw = public/language/rw/tags.json
 trans.sc = public/language/sc/tags.json
 trans.sk = public/language/sk/tags.json
+trans.sl = public/language/sl/tags.json
 trans.sr = public/language/sr/tags.json
 trans.sv = public/language/sv/tags.json
 trans.th = public/language/th/tags.json
@@ -767,6 +801,7 @@ trans.et = public/language/et/email.json
 trans.fa_IR = public/language/fa_IR/email.json
 trans.fi = public/language/fi/email.json
 trans.fr = public/language/fr/email.json
+trans.gl = public/language/gl/email.json
 trans.he = public/language/he/email.json
 trans.hu = public/language/hu/email.json
 trans.id = public/language/id/email.json
@@ -784,6 +819,7 @@ trans.ro = public/language/ro/email.json
 trans.rw = public/language/rw/email.json
 trans.sc = public/language/sc/email.json
 trans.sk = public/language/sk/email.json
+trans.sl = public/language/sl/email.json
 trans.sr = public/language/sr/email.json
 trans.sv = public/language/sv/email.json
 trans.th = public/language/th/email.json
@@ -811,6 +847,7 @@ trans.et = public/language/et/search.json
 trans.fa_IR = public/language/fa_IR/search.json
 trans.fi = public/language/fi/search.json
 trans.fr = public/language/fr/search.json
+trans.gl = public/language/gl/search.json
 trans.he = public/language/he/search.json
 trans.hu = public/language/hu/search.json
 trans.id = public/language/id/search.json
@@ -828,6 +865,7 @@ trans.ro = public/language/ro/search.json
 trans.rw = public/language/rw/search.json
 trans.sc = public/language/sc/search.json
 trans.sk = public/language/sk/search.json
+trans.sl = public/language/sl/search.json
 trans.sr = public/language/sr/search.json
 trans.sv = public/language/sv/search.json
 trans.th = public/language/th/search.json
@@ -855,6 +893,7 @@ trans.et = public/language/et/groups.json
 trans.fa_IR = public/language/fa_IR/groups.json
 trans.fi = public/language/fi/groups.json
 trans.fr = public/language/fr/groups.json
+trans.gl = public/language/gl/groups.json
 trans.he = public/language/he/groups.json
 trans.hu = public/language/hu/groups.json
 trans.id = public/language/id/groups.json
@@ -872,6 +911,7 @@ trans.ro = public/language/ro/groups.json
 trans.rw = public/language/rw/groups.json
 trans.sc = public/language/sc/groups.json
 trans.sk = public/language/sk/groups.json
+trans.sl = public/language/sl/groups.json
 trans.sr = public/language/sr/groups.json
 trans.sv = public/language/sv/groups.json
 trans.th = public/language/th/groups.json
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,7 +4,7 @@ First of all, thank you! Please consider this [style guide](https://docs.nodebb.

 ## Contributor License Agreement

-Thank you for considering contributing to NodeBB. **Before we can accept any pull requests, please take a moment to read and sign our [license agreement](https://www.clahub.com/agreements/NodeBB/NodeBB)**. In summary, signing this document means that 1) you own the code that you are contributing and 2) you give permission to NodeBB Inc. to license the code to others. This agreement applies to any repository under the NodeBB organization.
+Thank you for considering contributing to NodeBB. **Before you are able to submit a pull request, please take a moment to read our [contributor license agreement](https://gist.github.com/psychobunny/65946d7aa8854b12fab9)** and agree to it on the pull request page on GitHub. In summary, signing this document means that 1) you own the code that you are contributing and 2) you give permission to NodeBB Inc. to license the code to others. This agreement applies to any repository under the NodeBB organization.

 If you are writing contributions as part of employment from another company / individual, then your employer will need to sign a separate agreement. Please [contact us](mailto:accounts@nodebb.org) so that we can send this additional agreement to your employer.

--- a/9
+++ b/9
@@ -1,8 +1,15 @@
-FROM node:0.10-onbuild
+# The base image is the latest 4.x node (LTS) on jessie (debian)
+# -onbuild will install the node dependencies found in the project package.json
+# and copy its content in /usr/src/app, its WORKDIR
+FROM node:4-onbuild

 ENV NODE_ENV=production \
    daemon=false \
    silent=false

+# nodebb setup will ask you for connection information to a redis (default), mongodb then run the forum
+# nodebb upgrade is not included and might be desired
 CMD node app --setup && npm start
+
+# the default port for NodeBB is exposed outside the container
 EXPOSE 4567
--- a/app.js
+++ b/app.js
@@ -23,15 +23,14 @@
 var nconf = require('nconf');
 nconf.argv().env('__');

-var fs = require('fs'),
-	os = require('os'),
-	url = require('url'),
+var url = require('url'),
 	async = require('async'),
 	semver = require('semver'),
 	winston = require('winston'),
 	colors = require('colors'),
 	path = require('path'),
 	pkg = require('./package.json'),
+	file = require('./src/file'),
 	utils = require('./public/src/utils.js');

 global.env = process.env.NODE_ENV || 'production';
@@ -46,36 +45,46 @@ winston.add(winston.transports.Console, {
 	level: nconf.get('log-level') || (global.env === 'production' ? 'info' : 'verbose')
 });

-if(os.platform() === 'linux') {
-	require('child_process').exec('/usr/bin/which convert', function(err, stdout, stderr) {
-		if(err || !stdout) {
-			winston.warn('Couldn\'t find convert. Did you install imagemagick?');
-		}
-	});
-}

 // Alternate configuration file support
-var	configFile = path.join(__dirname, '/config.json'),
-	configExists;
+var	configFile = path.join(__dirname, '/config.json');

 if (nconf.get('config')) {
 	configFile = path.resolve(__dirname, nconf.get('config'));
 }
-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')) {
+var configExists = file.existsSync(configFile);
+
+loadConfig();
+
+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('');
+}
+
+
+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')) {
-	reset();
+	require('./src/reset').reset();
+} else if (nconf.get('activate')) {
+	activate();
+} else if (nconf.get('plugins')) {
+	listPlugins();
+} else {
+	start();
 }

 function loadConfig() {
+	winston.verbose('* using configuration stored in: %s', configFile);
+
 	nconf.file({
 		file: configFile
 	});
@@ -96,18 +105,10 @@ 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-persona/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
@@ -127,7 +128,7 @@ function start() {
 	if (nconf.get('isPrimary') === 'true') {
 		winston.info('Time: %s', (new Date()).toString());
 		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'),
 			storeLocation = host ? 'at ' + host + (host.indexOf('/') === -1 ? ':' + nconf.get(nconf.get('database') + ':port') : '') : '';
@@ -225,8 +226,6 @@ function start() {
 }

 function setup() {
-	loadConfig();
-
 	winston.info('NodeBB Setup Triggered via Command Line');

 	var install = require('./src/install');
@@ -267,8 +266,6 @@ function setup() {
 }

 function upgrade() {
-	loadConfig();
-
 	require('./src/database').init(function(err) {
 		if (err) {
 			winston.error(err.stack);
@@ -280,116 +277,28 @@ function upgrade() {
 	});
 }

-function reset() {
-	loadConfig();
-
+function activate() {
 	require('./src/database').init(function(err) {
-		if (err) {
-			winston.error(err.message);
-			process.exit();
-		}
+		var plugin = nconf.get('activate'),
+			db = require('./src/database');

-		if (nconf.get('t')) {
-			resetThemes();
-		} else if (nconf.get('p')) {
-			if (nconf.get('p') === true) {
-				resetPlugins();
-			} else {
-				resetPlugin(nconf.get('p'));
-			}
-		} else if (nconf.get('w')) {
-			resetWidgets();
-		} else if (nconf.get('s')) {
-			resetSettings();
-		} else if (nconf.get('a')) {
-			require('async').series([resetWidgets, resetThemes, resetPlugins, resetSettings], function(err) {
-				if (!err) {
-					winston.info('[reset] Reset complete.');
-				} else {
-					winston.error('[reset] Errors were encountered while resetting your forum settings: %s', err.message);
-				}
-				process.exit();
-			});
-		} else {
-			process.stdout.write('\nNodeBB Reset\n'.bold);
-			process.stdout.write('No arguments passed in, so nothing was reset.\n\n'.yellow);
-			process.stdout.write('Use ./nodebb reset ' + '{-t|-p|-w|-s|-a}\n'.red);
-			process.stdout.write('    -t\tthemes\n');
-			process.stdout.write('    -p\tplugins\n');
-			process.stdout.write('    -w\twidgets\n');
-			process.stdout.write('    -s\tsettings\n');
-			process.stdout.write('    -a\tall of the above\n');
+		winston.info('Activating plugin %s', plugin);

-			process.stdout.write('\nPlugin reset flag (-p) can take a single argument\n');
-			process.stdout.write('    e.g. ./nodebb reset -p nodebb-plugin-mentions\n');
-			process.exit();
-		}
+		db.sortedSetAdd('plugins:active', 0, plugin, start);
 	});
 }

-function resetSettings(callback) {
-	var meta = require('./src/meta');
-	meta.configs.set('allowLocalLogin', 1, function(err) {
-		winston.info('[reset] Settings reset to default');
-		if (typeof callback === 'function') {
-			callback(err);
-		} else {
+function listPlugins() {
+	require('./src/database').init(function(err) {
+		var db = require('./src/database');
+
+		db.getSortedSetRange('plugins:active', 0, -1, function(err, plugins) {
+			winston.info('Active plugins: \n\t - ' + plugins.join('\n\t - '));
 			process.exit();
-		}
+		});
 	});
 }

-function resetThemes(callback) {
-	var meta = require('./src/meta');
-
-	meta.themes.set({
-		type: 'local',
-		id: 'nodebb-theme-persona'
-	}, function(err) {
-		winston.info('[reset] Theme reset to Persona');
-		if (typeof callback === 'function') {
-			callback(err);
-		} else {
-			process.exit();
-		}
-	});
-}
-
-function resetPlugin(pluginId) {
-	var db = require('./src/database');
-	db.sortedSetRemove('plugins:active', pluginId, function(err) {
-		if (err) {
-			winston.error('[reset] Could not disable plugin: %s encountered error %s', pluginId, err.message);
-		} else {
-			winston.info('[reset] Plugin `%s` disabled', pluginId);
-		}
-
-		process.exit();
-	});
-}
-
-function resetPlugins(callback) {
-	var db = require('./src/database');
-	db.delete('plugins:active', function(err) {
-		winston.info('[reset] All Plugins De-activated');
-		if (typeof callback === 'function') {
-			callback(err);
-		} else {
-			process.exit();
-		}
-	});
-}
-
-function resetWidgets(callback) {
-	require('./src/widgets').reset(function(err) {
-		winston.info('[reset] All Widgets moved to Draft Zone');
-		if (typeof callback === 'function') {
-			callback(err);
-		} else {
-			process.exit();
-		}
-	});
-}

 function shutdown(code) {
 	winston.info('[app] Shutdown (SIGTERM/SIGINT) Initialised.');
--- a/install/data/defaults.json
+++ b/install/data/defaults.json
@@ -15,6 +15,7 @@
    "allowLocalLogin": 1,
    "allowAccountDelete": 1,
    "allowFileUploads": 0,
+    "allowUserHomePage": 1,
    "maximumFileSize": 2048,
    "minimumTitleLength": 3,
    "maximumTitleLength": 255,
@@ -24,6 +25,7 @@
    "maximumSignatureLength": 255,
    "maximumAboutMeLength": 1000,
    "maximumProfileImageSize": 256,
+    "maximumCoverImageSize": 2048,
    "profileImageDimension": 128,
    "requireEmailConfirmation": 0,
    "profile:allowProfileImageUploads": 1,
--- a/install/data/footer.json
+++ b/install/data/footer.json
@@ -2,7 +2,7 @@
 	{
 		"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>",
+			"html": "<footer id=\"footer\" class=\"container footer\">\r\n\t<div class=\"copyright\">\r\n\t\tCopyright © 2015 <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":""
 		}
--- a/loader.js
+++ b/loader.js
@@ -8,7 +8,7 @@ var	nconf = require('nconf'),

 	async = require('async'),
 	logrotate = require('logrotate-stream'),
-
+	file = require('./src/file'),
 	pkg = require('./package.json');

 nconf.argv().env().file({
@@ -243,7 +243,7 @@ Loader.notifyWorkers = function(msg, worker_pid) {
 fs.open(path.join(__dirname, 'config.json'), 'r', function(err) {
 	if (!err) {
 		if (nconf.get('daemon') !== 'false' && nconf.get('daemon') !== false) {
-			if (fs.existsSync(pidFilePath)) {
+			if (file.existsSync(pidFilePath)) {
 				try {
 					var	pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
 					process.kill(pid, 0);
--- a/minifier.js
+++ b/minifier.js
@@ -4,6 +4,7 @@ var uglifyjs = require('uglify-js'),
 	less = require('less'),
 	async = require('async'),
 	fs = require('fs'),
+	file = require('./src/file'),
 	crypto = require('crypto'),
 	utils = require('./public/src/utils'),

@@ -14,16 +15,16 @@ var uglifyjs = require('uglify-js'),
 /* Javascript */
 Minifier.js.minify = function (scripts, minify, callback) {
 	scripts = scripts.filter(function(file) {
-		return fs.existsSync(file) && file.endsWith('.js');
+		return file && file.endsWith('.js');
 	});

-	if (minify) {
-		minifyScripts(scripts, function() {
-			callback.apply(this, arguments);
-		});
-	} else {
-		concatenateScripts(scripts, callback);
-	}
+	async.filter(scripts, file.exists, function(scripts) {
+		if (minify) {
+			minifyScripts(scripts, callback);
+		} else {
+			concatenateScripts(scripts, callback);
+		}
+	});
 };

 process.on('message', function(payload) {
@@ -65,6 +66,7 @@ function concatenateScripts(scripts, callback) {
 				type: 'error',
 				payload: err
 			});
+			return;
 		}

 		scripts = scripts.join(require('os').EOL + ';');
--- a/40
+++ b/40
@@ -4,8 +4,7 @@ var colors = require('colors'),
 	cproc = require('child_process'),
 	argv = require('minimist')(process.argv.slice(2)),
 	fs = require('fs'),
-	async = require('async'),
-	touch = require('touch');
+	async = require('async');

 var getRunningPid = function(callback) {
 		fs.readFile(__dirname + '/pidfile', {
@@ -24,6 +23,13 @@ var getRunningPid = function(callback) {
 		});
 	};

+function fork(args) {
+	cproc.fork('app.js', args, {
+		cwd: __dirname,
+		silent: false
+	});
+}
+
 switch(process.argv[2]) {
 	case 'status':
 		getRunningPid(function(err, pid) {
@@ -108,11 +114,19 @@ switch(process.argv[2]) {
 	case 'reset':
 		var args = process.argv.slice(0);
 		args.unshift('--reset');
+		fork(args);
+		break;

-		cproc.fork('app.js', args, {
-			cwd: __dirname,
-			silent: false
-		});
+	case 'activate':
+		var args = process.argv.slice(0);
+		args.unshift('--activate');
+		fork(args);
+		break;
+
+	case 'plugins':
+		var args = process.argv.slice(0);
+		args.unshift('--plugins');
+		fork(args);
 		break;

 	case 'upgrade':
@@ -130,17 +144,15 @@ switch(process.argv[2]) {
 				});

 				upgradeProc.on('close', next)
-			},
-			function(next) {
-				process.stdout.write('3. '.bold + 'Storing upgrade date in "package.json"... '.yellow);
-				touch(__dirname + '/package.json', {}, next);
 			}
 		], function(err) {
 			if (err) {
 				process.stdout.write('\nError'.red + ': ' + err.message + '\n');
 			} else {
-				var message = 'NodeBB Upgrade Complete!',
-					spaces = new Array(Math.floor(process.stdout.columns / 2) - (message.length / 2) + 1).join(' ');
+				var message = 'NodeBB Upgrade Complete!';
+				// some consoles will return undefined/zero columns, so just use 2 spaces in upgrade script if we can't get our column count
+				var columns = process.stdout.columns;
+				var spaces = columns ? new Array(Math.floor(columns / 2) - (message.length / 2) + 1).join(' ') : "  ";

 				process.stdout.write('OK\n'.green);
 				process.stdout.write('\n' + spaces + message.green.bold + '\n\n'.reset);
@@ -158,9 +170,11 @@ switch(process.argv[2]) {
 		process.stdout.write('\t' + 'log'.yellow + '\tOpens the logging interface (useful for debugging)\n');
 		process.stdout.write('\t' + 'setup'.yellow + '\tRuns the NodeBB setup script\n');
 		process.stdout.write('\t' + 'reset'.yellow + '\tDisables all plugins, restores the default theme.\n');
+		process.stdout.write('\t' + 'activate'.yellow + '\tActivate a plugin on start up.\n');
+		process.stdout.write('\t' + 'plugins'.yellow + '\tList all plugins that have been installed.\n');
 		process.stdout.write('\t' + 'upgrade'.yellow + '\tRun NodeBB upgrade scripts, ensure packages are up-to-date\n');
 		process.stdout.write('\t' + 'dev'.yellow + '\tStart NodeBB in interactive development mode\n');
 		process.stdout.write('\t' + 'watch'.yellow + '\tStart NodeBB in development mode and watch for changes\n');
 		process.stdout.write('\n'.reset);
 		break;
-}
+}
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "nodebb",
  "license": "GPL-3.0",
  "description": "NodeBB Forum",
-  "version": "0.8.1",
+  "version": "0.9.3",
  "homepage": "http://www.nodebb.org",
  "repository": {
    "type": "git",
@@ -14,8 +14,8 @@
    "test": "mocha ./tests -t 10000"
  },
  "dependencies": {
-    "async": "~1.4.2",
-    "bcryptjs": "~2.2.1",
+    "async": "~1.5.0",
+    "bcryptjs": "~2.3.0",
    "body-parser": "^1.9.0",
    "colors": "^1.1.0",
    "compression": "^1.1.0",
@@ -28,30 +28,30 @@
    "daemon": "~1.1.0",
    "express": "^4.9.5",
    "express-session": "^1.8.2",
-    "gravatar": "^1.1.0",
    "heapdump": "^0.3.0",
+    "html-to-text": "1.5.0",
+    "jimp": "0.2.20",
    "less": "^2.0.0",
    "logrotate-stream": "^0.2.3",
-    "lru-cache": "^2.6.1",
-    "lwip": "0.0.7",
+    "lru-cache": "3.2.0",
    "mime": "^1.3.4",
    "minimist": "^1.1.1",
    "mkdirp": "~0.5.0",
-    "mmmagic": "^0.4.0",
    "morgan": "^1.3.2",
-    "nconf": "~0.7.1",
-    "nodebb-plugin-composer-default": "1.0.14",
-    "nodebb-plugin-dbsearch": "0.2.16",
-    "nodebb-plugin-emoji-extended": "0.4.13",
-    "nodebb-plugin-markdown": "4.0.5",
-    "nodebb-plugin-mentions": "1.0.2",
-    "nodebb-plugin-soundpack-default": "0.1.4",
-    "nodebb-plugin-spam-be-gone": "0.4.2",
-    "nodebb-rewards-essentials": "0.0.5",
-    "nodebb-theme-lavender": "2.0.1",
-    "nodebb-theme-persona": "3.0.12",
-    "nodebb-theme-vanilla": "4.0.7",
-    "nodebb-widget-essentials": "2.0.1",
+    "nconf": "~0.8.2",
+    "nodebb-plugin-composer-default": "1.0.26",
+    "nodebb-plugin-dbsearch": "0.3.0",
+    "nodebb-plugin-emoji-extended": "0.4.17",
+    "nodebb-plugin-markdown": "4.0.9",
+    "nodebb-plugin-mentions": "1.0.12",
+    "nodebb-plugin-soundpack-default": "0.1.5",
+    "nodebb-plugin-spam-be-gone": "0.4.5",
+    "nodebb-rewards-essentials": "0.0.6",
+    "nodebb-theme-lavender": "3.0.2",
+    "nodebb-theme-persona": "4.0.45",
+    "nodebb-theme-vanilla": "5.0.17",
+    "nodebb-widget-essentials": "2.0.5",
+    "nodemailer": "0.7.1",
    "npm": "^2.1.4",
    "passport": "^0.3.0",
    "passport-local": "1.0.0",
@@ -61,20 +61,20 @@
    "rss": "^1.0.0",
    "semver": "^5.0.1",
    "serve-favicon": "^2.1.5",
-    "sitemap": "^1.0.0",
+    "sitemap": "^1.4.0",
    "socket.io": "^1.2.1",
    "socket.io-client": "^1.2.1",
-    "socket.io-redis": "^0.1.3",
-    "socketio-wildcard": "~0.1.1",
+    "socket.io-redis": "^0.2.0",
+    "socketio-wildcard": "~0.2.0",
    "string": "^3.0.0",
-    "templates.js": "0.2.10",
-    "touch": "1.0.0",
-    "uglify-js": "^2.4.24",
+    "templates.js": "0.3.1",
+    "toobusy-js": "^0.4.2",
+    "uglify-js": "^2.6.0",
    "underscore": "~1.8.3",
    "underscore.deep": "^0.5.1",
    "validator": "^4.0.5",
-    "winston": "^1.0.1",
-    "xregexp": "~2.0.0"
+    "winston": "^2.1.0",
+    "xregexp": "~3.0.0"
  },
  "devDependencies": {
    "mocha": "~1.13.0",
--- a/public/503.html
+++ b/public/503.html
@@ -0,0 +1,160 @@
+<html>
+<head>
+	<title>Excessive Load Warning</title>
+	<link href='http://fonts.googleapis.com/css?family=Ubuntu:400,500,700' rel='stylesheet' type='text/css'>
+	<style type="text/css">
+	body {
+		background: #00A9EA;
+		color: white;
+		font-family: 'Ubuntu', sans-serif;
+		text-align: center;
+		-webkit-transform-style: preserve-3d;
+		-moz-transform-style: preserve-3d;
+		transform-style: preserve-3d;
+	}
+
+	h1 {
+		font-size: 250px;
+		color: #fff;
+		opacity: 0.5;
+		margin: 10px;
+		cursor: pointer;
+		-moz-user-select: none;
+		-khtml-user-select: none;
+		-webkit-user-select: none;
+	}
+
+	p {
+		font-size: 20px;
+	}
+
+	p strong {
+		font-size: 28px;
+	}
+
+	.center {
+		position: relative;
+		top: 50%;
+		-webkit-transform: translateY(50%);
+		-ms-transform: translateY(50%);
+		transform: translateY(50%);
+	}
+
+	@-webkit-keyframes bounce {
+		0%, 20%, 53%, 80%, 100% {
+			-webkit-transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+			transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+			-webkit-transform: translate3d(0,0,0);
+			transform: translate3d(0,0,0);
+		}
+
+		40%, 43% {
+			-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+			transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+			-webkit-transform: translate3d(0, -30px, 0);
+			transform: translate3d(0, -30px, 0);
+		}
+
+		70% {
+			-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+			transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+			-webkit-transform: translate3d(0, -15px, 0);
+			transform: translate3d(0, -15px, 0);
+		}
+
+		90% {
+			-webkit-transform: translate3d(0,-4px,0);
+			transform: translate3d(0,-4px,0);
+		}
+	}
+
+	@keyframes bounce {
+		0%, 20%, 53%, 80%, 100% {
+			-webkit-transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+			transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+			-webkit-transform: translate3d(0,0,0);
+			transform: translate3d(0,0,0);
+		}
+
+		40%, 43% {
+			-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+			transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+			-webkit-transform: translate3d(0, -30px, 0);
+			transform: translate3d(0, -30px, 0);
+		}
+
+		70% {
+			-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+			transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+			-webkit-transform: translate3d(0, -15px, 0);
+			transform: translate3d(0, -15px, 0);
+		}
+
+		90% {
+			-webkit-transform: translate3d(0,-4px,0);
+			transform: translate3d(0,-4px,0);
+		}
+	}
+
+	.bounce {
+		-webkit-animation-name: bounce;
+		animation-name: bounce;
+		-webkit-transform-origin: center bottom;
+		-ms-transform-origin: center bottom;
+		transform-origin: center bottom;
+	}
+
+	.animated {
+		-webkit-animation-duration: 1s;
+		animation-duration: 1s;
+		-webkit-animation-fill-mode: both;
+		animation-fill-mode: both;
+	}
+
+	.animated.infinite {
+		-webkit-animation-iteration-count: infinite;
+		animation-iteration-count: infinite;
+	}
+
+	.animated.hinge {
+		-webkit-animation-duration: 2s;
+		animation-duration: 2s;
+	}
+
+	.hide {
+		display: none;
+	}
+	</style>
+	<script type="text/javascript">
+	window.onload = function() {
+		var count = 0,
+			bounce = document.getElementById('click-me');
+		bounce.onclick = function() {
+			count++;
+			bounce.className = '';
+			setTimeout(function() {
+				bounce.className = 'animated bounce';
+			}, 50);
+
+			if (count > 5) {
+				document.getElementById('hide').className = '';
+			}
+		};
+	}
+	</script>
+</head>
+<body>
+	<div class="wrapper">
+		<div class="center">
+			<h1 id="click-me" class="animated bounce">503</h1>
+			<p>
+				<strong>This forum is temporarily unavailable due to excessive load.</strong> <br />
+				We shouldn't be down for long. Please check back shortly. Sorry for the inconvenience!
+			</p>
+			<p id="hide" class="hide">
+				<small>Alright. You can stop clicking... it's not going to make the site come back sooner!</small>
+			</p>
+		</div>
+	</div>
+</body>
+</html>
--- a/public/language/ar/category.json
+++ b/public/language/ar/category.json
@@ -11,5 +11,6 @@
    "watch": "متابعة",
    "ignore": "تجاهل",
    "watch.message": "أنت اﻷن متابع لتحديثات هذه الفئة",
-    "ignore.message": "أنت اﻷن تتجاهل تحديثات هذه الفئة"
+    "ignore.message": "أنت اﻷن تتجاهل تحديثات هذه الفئة",
+    "watched-categories": "Watched categories"
 }
--- a/public/language/ar/error.json
+++ b/public/language/ar/error.json
@@ -33,7 +33,6 @@
    "no-user": "اسم مستخدم غير موجود",
    "no-teaser": "مقتطف غير موجود",
    "no-privileges": "لاتملك الصلاحيات اللازمة للقيام بهذه العملية",
-    "no-emailers-configured": "لا يمكن إرسال رسالة إلكترونية تجريبية لعدم وجود قوالب خاصة بالرسائل الإلكترونية،",
    "category-disabled": "قائمة معطلة",
    "topic-locked": "الموضوع مقفول",
    "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
@@ -49,7 +48,6 @@
    "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
    "too-many-tags": "Too many tags. Topics can't have more than %1 tag(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": "لايمكن حظر مدبر نظام آخر.",
@@ -60,7 +58,8 @@
    "group-name-too-short": "اسم المجموعة قصير",
    "group-already-exists": "المجموعة موجودة مسبقا",
    "group-name-change-not-allowed": "لايسمح بتغيير أسماء المجموعات",
-    "group-already-member": "أنت بالفعل عضو في هذه المجموعة ",
+    "group-already-member": "Already part of this group",
+    "group-not-member": "Not a member of this group",
    "group-needs-owner": "هذه المجموعة تتطلب مالك واحد على اﻷقل",
    "group-already-invited": "This user has already been invited",
    "group-already-requested": "Your membership request has already been submitted",
@@ -79,6 +78,7 @@
    "too-many-messages": "لقد أرسلت الكثير من الرسائل، الرجاء اﻹنتظار قليلاً",
    "invalid-chat-message": "Invalid chat message",
    "chat-message-too-long": "Chat message is too long",
+    "cant-edit-chat-message": "You are not allowed to edit this message",
    "reputation-system-disabled": "نظام السمعة معطل",
    "downvoting-disabled": "التصويتات السلبية معطلة",
    "not-enough-reputation-to-downvote": "ليس لديك سمعة تكفي لإضافة صوت سلبي لهذا الموضوع",
--- a/public/language/ar/global.json
+++ b/public/language/ar/global.json
@@ -56,9 +56,11 @@
    "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": "posted in %1",
+    "posted_in_by": "posted in %1 by %2",
    "posted_in_ago": "كتب في %1 %2",
+    "posted_in_ago_by": "كتب في %1 %2 من طرف %3",
+    "posted_in_ago_by_guest": "كتب في %1 %2 من طرف زائر",
    "replied_ago": "رد %1",
    "user_posted_ago": "%1 كتب %2",
    "guest_posted_ago": "كتب زائر %1",
@@ -80,5 +82,6 @@
    "privacy": "الخصوصية",
    "follow": "متابعة",
    "unfollow": "إلغاء المتابعة",
-    "delete_all": "حذف الكل"
+    "delete_all": "حذف الكل",
+    "map": "Map"
 }
--- a/public/language/ar/groups.json
+++ b/public/language/ar/groups.json
@@ -15,8 +15,6 @@
    "invited.notification_title": "You have been invited to join <strong>%1</strong>",
    "request.notification_title": "Group Membership Request from <strong>%1</strong>",
    "request.notification_text": "<strong>%1</strong> has requested to become a member of <strong>%2</strong>",
-    "cover-instructions": "اسحب وأسقِط صورة، اسحبها للموضع المرغوب، وانقر على <strong>حفظ</strong>",
-    "cover-change": "تغيير",
    "cover-save": "حفظ",
    "cover-saving": "جاري الحفظ",
    "details.title": "تفاصيل المجموعة",
--- a/public/language/ar/modules.json
+++ b/public/language/ar/modules.json
@@ -5,7 +5,7 @@
    "chat.no_active": "لا يوجد لديك دردشات نشطة.",
    "chat.user_typing": "%1 يكتب رسالة...",
    "chat.user_has_messaged_you": "%1 أرسل لك رسالة.",
-    "chat.see_all": "See all chats",
+    "chat.see_all": "عرض كل المحادثات",
    "chat.no-messages": "المرجو اختيار مرسل إليه لمعاينة تاريخ الدردشات",
    "chat.recent-chats": "آخر الدردشات",
    "chat.contacts": "الأصدقاء",
@@ -15,6 +15,7 @@
    "chat.seven_days": "7 أيام",
    "chat.thirty_days": "30 يومًا",
    "chat.three_months": "3 أشهر",
+    "chat.delete_message_confirm": "Are you sure you wish to delete this message?",
    "composer.compose": "اكتب",
    "composer.show_preview": "عرض المعاينة",
    "composer.hide_preview": "إخفاء المعاينة",
@@ -23,7 +24,11 @@
    "composer.discard": "هل أنت متأكد أنك تريد التخلي عن التغييرات؟",
    "composer.submit_and_lock": "Submit and Lock",
    "composer.toggle_dropdown": "Toggle Dropdown",
+    "composer.uploading": "Uploading %1",
    "bootbox.ok": "OK",
-    "bootbox.cancel": "Cancel",
-    "bootbox.confirm": "Confirm"
+    "bootbox.cancel": "إلغاء",
+    "bootbox.confirm": "تأكيد",
+    "cover.dragging_title": "Cover Photo Positioning",
+    "cover.dragging_message": "Drag the cover photo to the desired position and click \"Save\"",
+    "cover.saved": "Cover photo image and position saved"
 }
--- a/public/language/ar/notifications.json
+++ b/public/language/ar/notifications.json
@@ -1,7 +1,7 @@
 {
    "title": "التنبيهات",
    "no_notifs": "ليس لديك أية تنبيهات جديدة",
-    "see_all": "See all notifications",
+    "see_all": "عرض كل التنبيهات",
    "mark_all_read": "اجعل كل التنبيهات مقروءة",
    "back_to_home": "عودة إلى %1",
    "outgoing_link": "رابط خارجي",
@@ -12,14 +12,23 @@
    "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> نقل موضوعك.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
+    "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
+    "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
    "favourited_your_post_in": "<strong>%1</strong> أضاف مشاركتك في <strong>%2</strong> إلى مفضلته.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
    "user_flagged_post_in": "<strong>%1</strong> أشعَرَ بمشاركة مخلة في <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
    "user_posted_to": "<strong>%1</strong> أضاف ردا إلى: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</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> صار يتابعك.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
    "new_register": "<strong>%1</strong> sent a registration request.",
    "email-confirmed": "تم التحقق من عنوان البريد الإلكتروني",
    "email-confirmed-message": "شكرًا على إثبات صحة عنوان بريدك الإلكتروني. صار حسابك مفعلًا بالكامل.",
--- a/public/language/ar/pages.json
+++ b/public/language/ar/pages.json
@@ -6,8 +6,8 @@
    "popular-month": "Popular topics this month",
    "popular-alltime": "All time popular topics",
    "recent": "المواضيع الحديثة",
-    "users/online": "Online Users",
-    "users/latest": "Latest Users",
+    "users/online": "اﻷعضاء المتصلون",
+    "users/latest": "أحدث اﻷعضاء",
    "users/sort-posts": "Users with the most posts",
    "users/sort-reputation": "Users with the most reputation",
    "users/map": "User Map",
@@ -18,12 +18,15 @@
    "register": "Register an account",
    "login": "Login to your account",
    "reset": "Reset your account password",
-    "categories": "Categories",
-    "groups": "Groups",
+    "categories": "الفئات",
+    "groups": "المجموعات",
    "group": "%1 group",
    "chats": "Chats",
    "chat": "Chatting with %1",
    "account/edit": "Editing \"%1\"",
+    "account/edit/password": "Editing password of \"%1\"",
+    "account/edit/username": "Editing username of \"%1\"",
+    "account/edit/email": "Editing email of \"%1\"",
    "account/following": "People %1 follows",
    "account/followers": "People who follow %1",
    "account/posts": "Posts made by %1",
@@ -33,5 +36,6 @@
    "account/settings": "User Settings",
    "account/watched": "Topics watched by %1",
    "maintenance.text": "جاري صيانة %1. المرجو العودة لاحقًا.",
-    "maintenance.messageIntro": "بالإضافة إلى ذلك، قام مدبر النظام بترك هذه الرسالة:"
+    "maintenance.messageIntro": "بالإضافة إلى ذلك، قام مدبر النظام بترك هذه الرسالة:",
+    "throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
 }
--- a/public/language/ar/topic.json
+++ b/public/language/ar/topic.json
@@ -25,9 +25,8 @@
    "tools": "أدوات",
    "flag": "تبليغ",
    "locked": "مقفل",
-    "bookmark_instructions": "إضغط هنا للعودة إلى آخر موضع أو غلق للإلغاء",
+    "bookmark_instructions": "Click here to return to the last unread post in this thread.",
    "flag_title": "إشعار بمشاركة مخلة.",
-    "flag_confirm": "هل تريد حقًّا التبليغ بهذه المشاركة؟",
    "flag_success": "تم الإشعار بهذه المشاركة على أنها مخلة",
    "deleted_message": "هذه المشاركة محذوفة. فقط من لهم صلاحية الإشراف على ا لمشاركات يمكنهم معاينتها.",
    "following_topic.message": "ستستلم تنبيها عند كل مشاركة جديدة في هذا الموضوع.",
@@ -96,5 +95,13 @@
    "oldest_to_newest": "من الأقدم إلى الأحدث",
    "newest_to_oldest": "من الأحدث إلى الأقدم",
    "most_votes": "الأكثر تصويتًا",
-    "most_posts": "اﻷكثر رداً"
+    "most_posts": "اﻷكثر رداً",
+    "stale.title": "Create new topic instead?",
+    "stale.warning": "The topic you are replying to is quite old. Would you like to create a new topic instead, and reference this one in your reply?",
+    "stale.create": "Create a new topic",
+    "stale.reply_anyway": "Reply to this topic anyway",
+    "stale.link_back": "Re: [%1](%2)",
+    "spam": "Spam",
+    "offensive": "Offensive",
+    "custom-flag-reason": "Enter a flagging reason"
 }
--- a/public/language/ar/user.json
+++ b/public/language/ar/user.json
@@ -28,15 +28,18 @@
    "following": "يتابع",
    "aboutme": "معلومة عنك او السيرة الذاتية",
    "signature": "توقيع",
-    "gravatar": "Gravatar",
    "birthday": "عيد ميلاد",
    "chat": "محادثة",
+    "chat_with": "Chat with %1",
    "follow": "تابع",
    "unfollow": "إلغاء المتابعة",
    "more": "المزيد",
    "profile_update_success": "تم تحديث الملف الشخصي بنجاح",
    "change_picture": "تغيير الصورة",
+    "change_username": "Change Username",
+    "change_email": "Change Email",
    "edit": "تعديل",
+    "default_picture": "Default Icon",
    "uploaded_picture": "الصورة المرفوعة",
    "upload_new_picture": "رفع صورة جديدة",
    "upload_new_picture_from_url": "رفع صورة جديدة من رابط",
@@ -51,10 +54,11 @@
    "confirm_password": "تأكيد كلمة السر",
    "password": "كلمة السر",
    "username_taken_workaround": "اسم المستخدم الذي اخترته سبق أخذه، لذا تم تغييره قليلا. أن الآن مسجل تحت الاسم <strong>%1</strong>",
+    "password_same_as_username": "Your password is the same as your username, please select another password.",
    "upload_picture": "ارفع الصورة",
    "upload_a_picture": "رفع صورة",
    "remove_uploaded_picture": "Remove Uploaded Picture",
-    "image_spec": "لايمكنك رفع إلا الصور ذات الصيغ PNG أو JPG أو GIF.",
+    "image_spec": "You may only upload PNG, JPG, or BMP files",
    "settings": "خيارات",
    "show_email": "أظهر بريدي الإلكتروني",
    "show_fullname": "أظهر اسمي الكامل",
@@ -87,5 +91,13 @@
    "follow_topics_you_create": "متابعة المواضيع التي تنشئها",
    "grouptitle": "حدد عنوان المجموعة الذي تريد عرضه",
    "no-group-title": "لا يوجد عنوان للمجموعة",
-    "select-skin": "Select a Skin"
+    "select-skin": "Select a Skin",
+    "select-homepage": "Select a Homepage",
+    "homepage": "Homepage",
+    "homepage_description": "Select a page to use as the forum homepage or 'None' to use the default homepage.",
+    "custom_route": "Custom Homepage Route",
+    "custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
+    "sso.title": "Single Sign-on Services",
+    "sso.associated": "Associated with",
+    "sso.not-associated": "Click here to associate with"
 }
--- a/public/language/ar/users.json
+++ b/public/language/ar/users.json
@@ -9,7 +9,7 @@
    "filter-by": "Filter By",
    "online-only": "المتصلون فقط",
    "picture-only": "صورة فقط",
-    "invite": "Invite",
+    "invite": "دعوة",
    "invitation-email-sent": "An invitation email has been sent to %1",
    "user_list": "قائمة اﻷعضاء",
    "recent_topics": "أحدث المواضيع",
--- a/public/language/bg/category.json
+++ b/public/language/bg/category.json
@@ -11,5 +11,6 @@
    "watch": "Следене",
    "ignore": "Игнориране",
    "watch.message": "Вече следите обновленията в тази категория",
-    "ignore.message": "Вече не следите обновленията в тази категория"
+    "ignore.message": "Вече не следите обновленията в тази категория",
+    "watched-categories": "Следени категории"
 }
--- a/public/language/bg/error.json
+++ b/public/language/bg/error.json
@@ -33,7 +33,6 @@
    "no-user": "Потребителят не съществува",
    "no-teaser": "Резюмето не съществува",
    "no-privileges": "Нямате достатъчно права за това действие.",
-    "no-emailers-configured": "Добавките за е-поща не са заредени, така че не може да бъде изпратено пробно е-писмо",
    "category-disabled": "Категорията е изключена",
    "topic-locked": "Темата е заключена",
    "post-edit-duration-expired": "Можете да редактирате публикациите си до %1 секунда/и, след като ги пуснете",
@@ -49,7 +48,6 @@
    "not-enough-tags": "Недостатъчно етикети. Темите трябва да имат поне %1 етикет(а)",
    "too-many-tags": "Твърде много етикети. Темите не могат да имат повече от %1 етикет(а)",
    "file-too-big": "Максималният разрешен размер на файл е %1 КБ – моля, качете по-малък файл",
-    "cant-vote-self-post": "Не можете да гласувате за собствената си публикация",
    "already-favourited": "Вече сте отбелязали тази публикация като любима",
    "already-unfavourited": "Вече сте премахнали тази публикация от любимите си",
    "cant-ban-other-admins": "Не можете да блокирате другите администратори!",
@@ -60,7 +58,8 @@
    "group-name-too-short": "Името на групата е твърде кратко",
    "group-already-exists": "Вече съществува такава група",
    "group-name-change-not-allowed": "Промяната на името на групата не е разрешено",
-    "group-already-member": "Вече сте част от тази група",
+    "group-already-member": "Вече членувате в тази група",
+    "group-not-member": "Не членувате в тази група",
    "group-needs-owner": "Тази група се нуждае от поне един собственик",
    "group-already-invited": "Този потребител вече е бил поканен",
    "group-already-requested": "Вашата заявка за членство вече е била изпратена",
@@ -77,8 +76,9 @@
    "cant-chat-with-yourself": "Не можете да пишете съобщение на себе си!",
    "chat-restricted": "Този потребител е ограничил съобщенията до себе си. Той трябва първо да Ви последва, преди да можете да си пишете с него.",
    "too-many-messages": "Изпратили сте твърде много съобщения. Моля, изчакайте малко.",
-    "invalid-chat-message": "Invalid chat message",
-    "chat-message-too-long": "Chat message is too long",
+    "invalid-chat-message": "Невалидно съобщение",
+    "chat-message-too-long": "Съобщението е твърде дълго",
+    "cant-edit-chat-message": "Нямате право да редактирате това съобщение",
    "reputation-system-disabled": "Системата за репутация е изключена.",
    "downvoting-disabled": "Отрицателното гласуване е изключено",
    "not-enough-reputation-to-downvote": "Нямате достатъчно репутация, за да гласувате отрицателно за тази публикация",
--- a/public/language/bg/global.json
+++ b/public/language/bg/global.json
@@ -56,9 +56,11 @@
    "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": "публикувано в %1",
+    "posted_in_by": "публикувано в %1 от %2",
    "posted_in_ago": "публикувано в %1 %2",
+    "posted_in_ago_by": "публикувано в %1 %2 от %3",
+    "posted_in_ago_by_guest": "публикувано в %1 %2 от гост",
    "replied_ago": "отговори %1",
    "user_posted_ago": "%1 публикува %2",
    "guest_posted_ago": "гост публикува %1",
@@ -80,5 +82,6 @@
    "privacy": "Поверителност",
    "follow": "Следване",
    "unfollow": "Прекратяване на следването",
-    "delete_all": "Изтриване на всичко"
+    "delete_all": "Изтриване на всичко",
+    "map": "Карта"
 }
--- a/public/language/bg/groups.json
+++ b/public/language/bg/groups.json
@@ -12,11 +12,9 @@
    "invited.none": "В момента няма поканени членове",
    "invited.uninvite": "Отмяна на поканата",
    "invited.search": "Потърсете потребител, когото да поканите в тази група",
-    "invited.notification_title": "You have been invited to join <strong>%1</strong>",
-    "request.notification_title": "Group Membership Request from <strong>%1</strong>",
-    "request.notification_text": "<strong>%1</strong> has requested to become a member of <strong>%2</strong>",
-    "cover-instructions": "Плъзнете снимка, наместете я в предпочитаната позиция и натистнете <strong>Запазване</strong>",
-    "cover-change": "Промяна",
+    "invited.notification_title": "Вие бяхте поканен/а да се присъедините към <strong>%1</strong>",
+    "request.notification_title": "Заявка за членство в групата от <strong>%1</strong>",
+    "request.notification_text": "<strong>%1</strong> поиска да стане член на <strong>%2</strong>",
    "cover-save": "Запазване",
    "cover-saving": "Запазване",
    "details.title": "Подробности за групата",
--- a/public/language/bg/modules.json
+++ b/public/language/bg/modules.json
@@ -15,15 +15,20 @@
    "chat.seven_days": "7 дни",
    "chat.thirty_days": "30 дни",
    "chat.three_months": "3 месеца",
+    "chat.delete_message_confirm": "Сигурен/а ли сте, че искате да изтриете това съобщение?",
    "composer.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": "Публикуване и заключване",
    "composer.toggle_dropdown": "Превключване на падащото меню",
+    "composer.uploading": "Качване на %1",
    "bootbox.ok": "Добре",
    "bootbox.cancel": "Отказ",
-    "bootbox.confirm": "Потвърждаване"
+    "bootbox.confirm": "Потвърждаване",
+    "cover.dragging_title": "Наместване на снимката",
+    "cover.dragging_message": "Преместете снимката на желаното положение и натиснете „Запазване“",
+    "cover.saved": "Снимката и мястото ѝ бяха запазени"
 }
--- a/public/language/bg/notifications.json
+++ b/public/language/bg/notifications.json
@@ -12,14 +12,23 @@
    "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> премести Ваша тема.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> и <strong>%2</strong> гласуваха положително за Ваша публикация в <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> и %2 други гласуваха положително за Ваша публикация в <strong>%3</strong>.",
+    "moved_your_post": "<strong>%1</strong> премести публикацията Ви в <strong>%2</strong>",
+    "moved_your_topic": "<strong>%1</strong> премести <strong>%2</strong>",
    "favourited_your_post_in": "<strong>%1</strong> отбеляза Ваша публикация в <strong>%2</strong> като любима.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> и <strong>%2</strong> отбелязаха Ваша публикация в <strong>%3</strong> като любима.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> и %2 други отбелязаха Ваша публикация в <strong>%3</strong> като любима.",
    "user_flagged_post_in": "<strong>%1</strong> докладва Ваша публикация в <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> и <strong>%2</strong> докладваха Ваша публикация в <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> и %2 други докладваха Ваша публикация в <strong>%3</strong>",
    "user_posted_to": "<strong>%1</strong> публикува отговор на: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> и <strong>%2</strong> публикуваха отговори на: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> и %2 други публикуваха отговори на: <strong>%3</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> започна да Ви следва.",
+    "user_started_following_you_dual": "<strong>%1</strong> и <strong>%2</strong> започнаха да Ви следват.",
+    "user_started_following_you_multiple": "<strong>%1</strong> и %2 започнаха да Ви следват.",
    "new_register": "<strong>%1</strong> изпрати заявка за регистрация.",
    "email-confirmed": "Е-пощата беше потвърдена",
    "email-confirmed-message": "Благодарим Ви, че потвърдихте е-пощата си. Акаунтът Ви е вече напълно активиран.",
--- a/public/language/bg/pages.json
+++ b/public/language/bg/pages.json
@@ -24,6 +24,9 @@
    "chats": "Разговори",
    "chat": "Разговаря с %1",
    "account/edit": "Редактиране на „%1“",
+    "account/edit/password": "Редактиране на паролата на „%1“",
+    "account/edit/username": "Редактиране на потребителското име на „%1“",
+    "account/edit/email": "Редактиране на е-пощата на „%1“",
    "account/following": "Хора, които %1 следва",
    "account/followers": "Хора, които следват %1",
    "account/posts": "Публикации от %1",
@@ -33,5 +36,6 @@
    "account/settings": "Потребителски настройки",
    "account/watched": "Теми, следени от %1",
    "maintenance.text": "%1 в момента е в профилактика. Моля, върнете се по-късно.",
-    "maintenance.messageIntro": "В допълнение, администраторът е оставил това съобщение:"
+    "maintenance.messageIntro": "В допълнение, администраторът е оставил това съобщение:",
+    "throttled.text": "%1 в момента е недостъпен, поради прекомерно натоварване. Моля, върнете се отново по-късно."
 }
--- a/public/language/bg/topic.json
+++ b/public/language/bg/topic.json
@@ -25,9 +25,8 @@
    "tools": "Инструменти",
    "flag": "Докладване",
    "locked": "Заключена",
-    "bookmark_instructions": "Натиснете, за да се върнете на последната си позиция или затворете, за да отхвърлите.",
+    "bookmark_instructions": "Натиснете тук, за да се върнете на последната непрочетена публикация в тази тема.",
    "flag_title": "Докладване на тази публикация до модератор",
-    "flag_confirm": "Сигурни ли сте, че искате да докладвате тази публикация?",
    "flag_success": "Тази публикация е била докладвана до модератор.",
    "deleted_message": "Тази тема е била изтрита. Само потребители с права за управление на темите могат да я видят.",
    "following_topic.message": "Вече ще получавате известия когато някой публикува коментар в тази тема.",
@@ -49,15 +48,15 @@
    "thread_tools.move_all": "Преместване на всички",
    "thread_tools.fork": "Разделяне на темата",
    "thread_tools.delete": "Изтриване на темата",
-    "thread_tools.delete_confirm": "Сигурни ли сте, че искате да изтриете тази тема?",
+    "thread_tools.delete_confirm": "Сигурен/а ли сте, че искате да изтриете тази тема?",
    "thread_tools.restore": "Възстановяване на темата",
-    "thread_tools.restore_confirm": "Сигурни ли сте, че искате да възстановите тази тема?",
+    "thread_tools.restore_confirm": "Сигурен/а ли сте, че искате да възстановите тази тема?",
    "thread_tools.purge": "Изчистване на темата",
-    "thread_tools.purge_confirm": "Сигурни ли сте, че искате да изчистите тази тема?",
+    "thread_tools.purge_confirm": "Сигурен/а ли сте, че искате да изчистите тази тема?",
    "topic_move_success": "Темата беше преместена успешно в %1",
-    "post_delete_confirm": "Сигурни ли сте, че искате да изтриете тази публикация?",
-    "post_restore_confirm": "Сигурни ли сте, че искате да възстановите тази публикация?",
-    "post_purge_confirm": "Сигурни ли сте, че искате да изчистите тази публикация?",
+    "post_delete_confirm": "Сигурен/а ли сте, че искате да изтриете тази публикация?",
+    "post_restore_confirm": "Сигурен/а ли сте, че искате да възстановите тази публикация?",
+    "post_purge_confirm": "Сигурен/а ли сте, че искате да изчистите тази публикация?",
    "load_categories": "Зареждане на категориите",
    "disabled_categories_note": "Изключените категории са засивени",
    "confirm_move": "Преместване",
@@ -96,5 +95,13 @@
    "oldest_to_newest": "Първо най-старите",
    "newest_to_oldest": "Първо най-новите",
    "most_votes": "Най-много гласове",
-    "most_posts": "Най-много публикации"
+    "most_posts": "Най-много публикации",
+    "stale.title": "Създаване на нова тема вместо това?",
+    "stale.warning": "Темата, в която отговаряте, е доста стара. Искате ли вместо това да създадете нова и да направите препратка към тази в отговора си?",
+    "stale.create": "Създаване на нова тема",
+    "stale.reply_anyway": "Отговаряне в тази тема въпреки това",
+    "stale.link_back": "Отговор: [%1](%2)",
+    "spam": "Спам",
+    "offensive": "Обидно",
+    "custom-flag-reason": "Изберете причина за докладване"
 }
--- a/public/language/bg/user.json
+++ b/public/language/bg/user.json
@@ -10,9 +10,9 @@
    "ban_account_confirm": "Наистина ли искате да блокирате този потребител?",
    "unban_account": "Отблокиране на акаунта",
    "delete_account": "Изтриване на акаунта",
-    "delete_account_confirm": "Сигурни ли сте, че искате да изтриете акаунта си? <br /><strong>Това действие е необратимо и няма да можете да възстановите нищо от данните си</strong><br /><br />Въведете потребителското си име, за да потвърдите, че искате да унищожите този акаунт.",
-    "delete_this_account_confirm": "Сигурни ли сте, че искате да изтриете този акаунт? <br /><strong>Това действие е необратимо и няма да можете да възстановите нищо от данните</strong><br /><br />",
-    "account-deleted": "Account deleted",
+    "delete_account_confirm": "Сигурен/а ли сте, че искате да изтриете акаунта си? <br /><strong>Това действие е необратимо и няма да можете да възстановите нищо от данните си</strong><br /><br />Въведете потребителското си име, за да потвърдите, че искате да унищожите този акаунт.",
+    "delete_this_account_confirm": "Сигурен/а ли сте, че искате да изтриете този акаунт? <br /><strong>Това действие е необратимо и няма да можете да възстановите нищо от данните</strong><br /><br />",
+    "account-deleted": "Акаунтът е изтрит",
    "fullname": "Цяло име",
    "website": "Уеб сайт",
    "location": "Местоположение",
@@ -28,15 +28,18 @@
    "following": "Следва",
    "aboutme": "За мен",
    "signature": "Подпис",
-    "gravatar": "Граватар",
    "birthday": "Рождена дата",
    "chat": "Разговор",
+    "chat_with": "Разговор с %1",
    "follow": "Следване",
    "unfollow": "Спиране на следването",
    "more": "Още",
    "profile_update_success": "Профилът беше обновен успешно!",
    "change_picture": "Промяна на снимката",
+    "change_username": "Промяна на потребителското име",
+    "change_email": "Промяна на е-пощата",
    "edit": "Редактиране",
+    "default_picture": "Иконка по подразбиране",
    "uploaded_picture": "Качена снимка",
    "upload_new_picture": "Качване на нова снимка",
    "upload_new_picture_from_url": "Качване на нова снимка от адрес",
@@ -51,10 +54,11 @@
    "confirm_password": "Потвърдете паролата",
    "password": "Парола",
    "username_taken_workaround": "Потребителското име, което искате, е заето и затова ние го променихме малко. Вие ще се наричате <strong>%1</strong>",
+    "password_same_as_username": "Паролата е същата като потребителското Ви име. Моля, изберете друга парола.",
    "upload_picture": "Качване на снимка",
    "upload_a_picture": "Качване на снимка",
-    "remove_uploaded_picture": "Remove Uploaded Picture",
-    "image_spec": "Можете да качвате само PNG, JPG, или GIF файлове",
+    "remove_uploaded_picture": "Премахване на качената снимка",
+    "image_spec": "Можете да качвате само файлове във форматите PNG, JPG или BMP",
    "settings": "Настройки",
    "show_email": "Да се показва е-пощата ми",
    "show_fullname": "Да се показва цялото ми име",
@@ -87,5 +91,13 @@
    "follow_topics_you_create": "Следване на темите, които създавате",
    "grouptitle": "Изберете заглавието на групата, което искате да се показва",
    "no-group-title": "Няма заглавие на група",
-    "select-skin": "Изберете облик"
+    "select-skin": "Изберете облик",
+    "select-homepage": "Изберете начална страница",
+    "homepage": "Начална страница",
+    "homepage_description": "Изберете страница, която да използвате като начална за форума, или „Нищо“, за да използвате тази по подразбиране.",
+    "custom_route": "Път до персонализираната начална страница",
+    "custom_route_help": "Въведете името на пътя тук, без наклонена черта пред него (пример: „recent“ или „popular“)",
+    "sso.title": "Услуги за еднократно вписване",
+    "sso.associated": "Свързан с",
+    "sso.not-associated": "Натиснете тук, за да свържете с"
 }
--- a/public/language/bn/category.json
+++ b/public/language/bn/category.json
@@ -1,15 +1,16 @@
 {
-    "category": "Category",
-    "subcategories": "Subcategories",
+    "category": "বিভাগ",
+    "subcategories": "উপবিভাগ",
    "new_topic_button": "নতুন টপিক",
-    "guest-login-post": "Log in to post",
-    "no_topics": "<strong>এই বিভাগে কোন টপিক নেই! </strong><br /> আপনি চাইলে একটি পোষ্ট করতে পারেন।",
+    "guest-login-post": "উত্তর দিতে লগিন করুন",
+    "no_topics": "<strong>এই বিভাগে কোন আলোচনা নেই! </strong><br /> আপনি চাইলে নতুন আলোচনা শুরু করতে পারেন।",
    "browsing": "ব্রাউজিং",
    "no_replies": "কোন রিপ্লাই নেই",
-    "no_new_posts": "No new posts.",
+    "no_new_posts": "নতুন কোন পোস্ট নাই",
    "share_this_category": "এই বিভাগটি অন্যের সাথে ভাগাভাগি করুন",
-    "watch": "Watch",
+    "watch": "নজর রাখুন",
    "ignore": "উপেক্ষা করুন",
-    "watch.message": "You are now watching updates from this category",
-    "ignore.message": "You are now ignoring updates from this category"
+    "watch.message": "আপনি এই বিভাগটিতে নজর রাখছেন",
+    "ignore.message": "আপনি এই বিভাগটির উপেক্ষা করছেন ",
+    "watched-categories": "প্রেক্ষিত বিভাগসমূহ"
 }
--- a/public/language/bn/email.json
+++ b/public/language/bn/email.json
@@ -1,21 +1,21 @@
 {
    "password-reset-requested": "পাসওয়ার্ড রিসেটের জন্য অনুরোধ করা হয়েছে - %1!",
    "welcome-to": "%1 এ স্বাগতম",
-    "invite": "Invitation from %1",
+    "invite": "%1 থেকে আমন্ত্রণ",
    "greeting_no_name": "স্বাগতম",
    "greeting_with_name": "স্বাগতম %1",
    "welcome.text1": "%1 এ নিবন্ধন করার জন্য আপনাকে ধন্যবাদ!",
    "welcome.text2": "আপনার একাউন্ট এ্যাক্টিভেট করার জন্য, আপনি যে ইমেইল এড্রেস ব্যাবহার করে নিবন্ধন করেছেন তা যাচাই করতে হবে",
    "welcome.text3": "An administrator has accepted your registration application. You can login with your username/password now.",
    "welcome.cta": "আপনার ইমেইল এড্রেস নিশ্চিত করার জন্য এখানে ক্লিক করুন",
-    "invitation.text1": "%1 has invited you to join %2",
-    "invitation.ctr": "Click here to create your account.",
+    "invitation.text1": "%1 আপনাকে %2 তে যোগ দিতে আমন্ত্রণ জানিয়েছেন ",
+    "invitation.ctr": "আপনার একাউন্ট খুলতে এখানে ক্লিক করুন",
    "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.",
+    "reset.notify.subject": "পাসওয়ার্ড পরিবর্তন সফল হয়েছে",
+    "reset.notify.text1": "আপনাকে জানাচ্ছি যে %1 এ আপনার পাসওয়ার্ড পরিবর্তন হয়েছে",
+    "reset.notify.text2": "এটা আপনার অজান্তে হলে এখনই প্রশাসককে আবহিত করুন",
    "digest.notifications": "%1 থেকে আনরিড নোটিফিকেশন আছে।",
    "digest.latest_topics": "%1 এর সর্বশেষ টপিকসমূহ",
    "digest.cta": "%1 ভিজিট করতে এখানে ক্লিক করুন",
@@ -24,8 +24,8 @@
    "notif.chat.subject": "%1 এর থেকে নতুন মেসেজ এসেছে।",
    "notif.chat.cta": "কথপোকথন চালিয়ে যেতে এখানে ক্লিক করুন",
    "notif.chat.unsub.info": "আপনার সাবস্ক্রীপশন সেটিংসের কারনে আপনার এই নোটিফিকেশন পাঠানো হয়েছে",
-    "notif.post.cta": "Click here to read the full topic",
-    "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.",
+    "notif.post.cta": "পুরো বিষয়টি পড়তে এখানে ক্লিক করুন",
+    "notif.post.unsub.info": "আপনার সাবস্ক্রিপশন সেটিংসের কারনে আপনার এই বার্তাটি পাঠানো হয়েছে",
    "test.text1": "আপনি সঠিকভাবে নোডবিবির জন্য মেইলার সেটাপ করেছেন কিনা নিশ্চিত করার জন্য এই টেষ্ট ইমেইল পাঠানো হয়েছে",
    "unsub.cta": "সেটিংসগুলো পরিবর্তন করতে এখানে ক্লিক করুন",
    "closing": "ধন্যবাদ!"
--- a/public/language/bn/error.json
+++ b/public/language/bn/error.json
@@ -33,7 +33,6 @@
    "no-user": "এই নামে কোন সদস্য নেই",
    "no-teaser": "টিজারটি খুজে পাওয়া যায় নি",
    "no-privileges": "এই কাজটির জন্য আপনার পর্যাপ্ত অধিকার নেই",
-    "no-emailers-configured": "কোন ইমেল প্লাগইন লোড করা নেই, কাজেই টেস্ট মেইল পাঠানো সম্ভব হচ্ছে না",
    "category-disabled": "বিভাগটি নিষ্ক্রিয়",
    "topic-locked": "টপিক বন্ধ",
    "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
@@ -49,7 +48,6 @@
    "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
    "too-many-tags": "Too many tags. Topics can't have more than %1 tag(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": "আপনি অন্য এ্যাডমিনদের নিষিদ্ধ করতে পারেন না!",
@@ -60,7 +58,8 @@
    "group-name-too-short": "গ্রুপের নাম খুব ছোট",
    "group-already-exists": "গ্রুপ ইতিমধ্যেই বিদ্যমান",
    "group-name-change-not-allowed": "গ্রুপের নাম পরিবর্তনের অনুমতি নেই",
-    "group-already-member": "You are already part of this group",
+    "group-already-member": "Already part of this group",
+    "group-not-member": "Not a member of this group",
    "group-needs-owner": "This group requires at least one owner",
    "group-already-invited": "This user has already been invited",
    "group-already-requested": "Your membership request has already been submitted",
@@ -79,6 +78,7 @@
    "too-many-messages": "You have sent too many messages, please wait awhile.",
    "invalid-chat-message": "Invalid chat message",
    "chat-message-too-long": "Chat message is too long",
+    "cant-edit-chat-message": "You are not allowed to edit this message",
    "reputation-system-disabled": "সম্মাননা ব্যাবস্থা নিস্ক্রীয় রাখা হয়েছে",
    "downvoting-disabled": "ঋণাত্মক ভোট নিস্ক্রীয় রাখা হয়েছে।",
    "not-enough-reputation-to-downvote": "আপনার এই পোস্ট downvote করার জন্য পর্যাপ্ত সম্মাননা নেই",
--- a/public/language/bn/global.json
+++ b/public/language/bn/global.json
@@ -22,7 +22,7 @@
    "pagination.out_of": "%2 এর মাঝে %1",
    "pagination.enter_index": "সূচক লিখুন",
    "header.admin": "অ্যাডমিন",
-    "header.categories": "Categories",
+    "header.categories": "বিভাগ",
    "header.recent": "সাম্প্রতিক",
    "header.unread": "অপঠিত",
    "header.tags": "ট্যাগ",
@@ -52,13 +52,15 @@
    "views": "দেখেছেন",
    "reputation": "সন্মাননা",
    "read_more": "আরো পড়ুন",
-    "more": "More",
+    "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": "%3 %1 বিভাগে পোস্ট করেছেন %2",
+    "posted_in": "posted in %1",
+    "posted_in_by": "posted in %1 by %2",
    "posted_in_ago": "%1 বিভাগে পোস্ট করা হয়েছে %2 আগে",
+    "posted_in_ago_by": "%3 %1 বিভাগে পোস্ট করেছেন %2",
+    "posted_in_ago_by_guest": "%1 বিভাগে অতিথি পোস্ট করেছেন %2",
    "replied_ago": "উত্তর দেয়া হয়েছে %1 ",
    "user_posted_ago": "%1 পোস্ট করেছেন %2",
    "guest_posted_ago": "অতিথি পোস্ট করেছেন %1",
@@ -80,5 +82,6 @@
    "privacy": "নিরাপত্তা",
    "follow": "Follow",
    "unfollow": "Unfollow",
-    "delete_all": "সব মুছে ফেলুন"
+    "delete_all": "সব মুছে ফেলুন",
+    "map": "ম্যাপ"
 }
--- a/public/language/bn/groups.json
+++ b/public/language/bn/groups.json
@@ -15,8 +15,6 @@
    "invited.notification_title": "You have been invited to join <strong>%1</strong>",
    "request.notification_title": "Group Membership Request from <strong>%1</strong>",
    "request.notification_text": "<strong>%1</strong> has requested to become a member of <strong>%2</strong>",
-    "cover-instructions": "Drag and Drop a photo, drag to position, and hit <strong>Save</strong>",
-    "cover-change": "Change",
    "cover-save": "Save",
    "cover-saving": "Saving",
    "details.title": "গ্রুপের বিস্তারিত",
--- a/public/language/bn/login.json
+++ b/public/language/bn/login.json
@@ -1,7 +1,7 @@
 {
-    "username-email": "Username / Email",
-    "username": "Username",
-    "email": "Email",
+    "username-email": "ইউজারনেম / ইমেইল",
+    "username": "ইউজারনেম",
+    "email": "ইমেইল",
    "remember_me": "মনে রাখুন",
    "forgot_password": "পাসওয়ার্ড ভুলে গিয়েছেন?",
    "alternative_logins": "বিকল্প প্রবেশ",
--- a/public/language/bn/modules.json
+++ b/public/language/bn/modules.json
@@ -15,6 +15,7 @@
    "chat.seven_days": "৭ দিন",
    "chat.thirty_days": "৩০ দিন",
    "chat.three_months": "৩ মাস",
+    "chat.delete_message_confirm": "Are you sure you wish to delete this message?",
    "composer.compose": "Compose",
    "composer.show_preview": "Show Preview",
    "composer.hide_preview": "Hide Preview",
@@ -23,7 +24,11 @@
    "composer.discard": "আপনি কি নিশ্চিত যে আপনি এই পোস্ট বাতিল করতে ইচ্ছুক?",
    "composer.submit_and_lock": "Submit and Lock",
    "composer.toggle_dropdown": "Toggle Dropdown",
+    "composer.uploading": "Uploading %1",
    "bootbox.ok": "OK",
    "bootbox.cancel": "Cancel",
-    "bootbox.confirm": "Confirm"
+    "bootbox.confirm": "Confirm",
+    "cover.dragging_title": "Cover Photo Positioning",
+    "cover.dragging_message": "Drag the cover photo to the desired position and click \"Save\"",
+    "cover.saved": "Cover photo image and position saved"
 }
--- a/public/language/bn/notifications.json
+++ b/public/language/bn/notifications.json
@@ -12,14 +12,23 @@
    "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> আপনার টপিক সরিয়ে নিয়েছেন। ",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
+    "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
+    "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
    "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
    "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
    "user_posted_to": "<strong>%1</strong> একটি উত্তর দিয়েছেন: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
    "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
-    "user_mentioned_you_in": "<strong>%1</strong>, <strong>%2</strong> এ আপনার নাম উল্লেখ করেছেন",
    "user_started_following_you": "<strong>%1</strong> আপনাকে অনুসরন করা শুরু করেছেন।",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
    "new_register": "<strong>%1</strong> sent a registration request.",
    "email-confirmed": "ইমেইল নিশ্চিত করা হয়েছে",
    "email-confirmed-message": "আপনার ইমেইল যাচাই করার জন্য আপনাকে ধন্যবাদ। আপনার অ্যাকাউন্টটি এখন সম্পূর্ণরূপে সক্রিয়।",
--- a/public/language/bn/pages.json
+++ b/public/language/bn/pages.json
@@ -13,17 +13,20 @@
    "users/map": "User Map",
    "users/search": "User Search",
    "notifications": "বিজ্ঞপ্তি",
-    "tags": "Tags",
+    "tags": "ট্যাগসমূহ",
    "tag": "Topics tagged under \"%1\"",
    "register": "Register an account",
    "login": "Login to your account",
    "reset": "Reset your account password",
-    "categories": "Categories",
+    "categories": "বিভাগ",
    "groups": "Groups",
    "group": "%1 group",
    "chats": "Chats",
    "chat": "Chatting with %1",
    "account/edit": "Editing \"%1\"",
+    "account/edit/password": "Editing password of \"%1\"",
+    "account/edit/username": "Editing username of \"%1\"",
+    "account/edit/email": "Editing email of \"%1\"",
    "account/following": "People %1 follows",
    "account/followers": "People who follow %1",
    "account/posts": "Posts made by %1",
@@ -33,5 +36,6 @@
    "account/settings": "User Settings",
    "account/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:"
+    "maintenance.messageIntro": "Additionally, the administrator has left this message:",
+    "throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
 }
--- a/public/language/bn/register.json
+++ b/public/language/bn/register.json
@@ -15,5 +15,5 @@
    "alternative_registration": "বিকল্প নিবন্ধন",
    "terms_of_use": "নিয়মাবলী",
    "agree_to_terms_of_use": "আমি নিয়মাবলী মেনে চলতে সম্মতি জানালাম",
-    "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator."
+    "registration-added-to-queue": "আপনার নিবন্ধনটি এ্যাপ্লুভাল তালিকায় যুক্ত হয়েছে। একজন এডমিনিস্ট্রেটর কর্তৃক নিবন্ধন গৃহীত হলে আপনি একটি মেইল পাবেন। "
 }
--- a/public/language/bn/search.json
+++ b/public/language/bn/search.json
@@ -1,40 +1,40 @@
 {
    "results_matching": "\"%2\" এর সাথে মিলিয়ে %1 ফলাফল পাওয়া গেছে,  ( %3 seconds সময় লেগেছে )",
-    "no-matches": "No matches found",
-    "advanced-search": "Advanced Search",
-    "in": "In",
-    "titles": "Titles",
-    "titles-posts": "Titles and Posts",
-    "posted-by": "Posted by",
-    "in-categories": "In Categories",
-    "search-child-categories": "Search child categories",
-    "reply-count": "Reply Count",
-    "at-least": "At least",
-    "at-most": "At most",
-    "post-time": "Post time",
+    "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": "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",
+    "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": "Clear preferences",
    "search-preferences-saved": "Search preferences saved",
    "search-preferences-cleared": "Search preferences cleared",
-    "show-results-as": "Show results as"
+    "show-results-as": "ফলাফল দেখানো হোক : "
 }
--- a/public/language/bn/topic.json
+++ b/public/language/bn/topic.json
@@ -25,9 +25,8 @@
    "tools": "টুলস",
    "flag": "ফ্ল্যাগ",
    "locked": "বন্ধ",
-    "bookmark_instructions": "আপনার সর্বশেষ অবস্থানে ফিরে যাবার জন্য এখানে ক্লিক করুন অথবা অগ্রাহ্য করতে চাইলে বন্ধ করুন",
+    "bookmark_instructions": "Click here to return to the last unread post in this thread.",
    "flag_title": "মডারেশনের জন্য এই পোস্টটি ফ্ল্যাগ করুন",
-    "flag_confirm": "আপনি কি নিশ্চিত যে এই পোস্টটিকে আপনি ফ্ল্যাগ করতে চান? ",
    "flag_success": "এই পোস্টটি মডারেশনের জন্য ফ্ল্যাগ করা হয়েছে।",
    "deleted_message": "এই টপিকটি মুছে ফেলা হয়েছে। শুধুমাত্র টপিক ব্যবস্থাপনার ক্ষমতাপ্রাপ্ত সদস্যগণ এটি দেখতে পারবেন।",
    "following_topic.message": "এখন থেকে এই টপিকে অন্যকেউ পোস্ট করলে আপনি নোটিফিকেশন পাবেন।",
@@ -96,5 +95,13 @@
    "oldest_to_newest": "পুরাতন থেকে নতুন",
    "newest_to_oldest": "নতুন থেকে পুরাতন",
    "most_votes": "সর্বোচ্চ ভোট",
-    "most_posts": "Most posts"
+    "most_posts": "Most posts",
+    "stale.title": "Create new topic instead?",
+    "stale.warning": "The topic you are replying to is quite old. Would you like to create a new topic instead, and reference this one in your reply?",
+    "stale.create": "Create a new topic",
+    "stale.reply_anyway": "Reply to this topic anyway",
+    "stale.link_back": "Re: [%1](%2)",
+    "spam": "Spam",
+    "offensive": "Offensive",
+    "custom-flag-reason": "Enter a flagging reason"
 }
--- a/public/language/bn/user.json
+++ b/public/language/bn/user.json
@@ -2,17 +2,17 @@
    "banned": "নিষিদ্ধ",
    "offline": "অফলাইন",
    "username": "সদস্যের নাম",
-    "joindate": "Join Date",
-    "postcount": "Post Count",
+    "joindate": "নিবন্ধন তারিখ",
+    "postcount": "সর্বমোট পোষ্ট",
    "email": "ইমেইল",
    "confirm_email": "ইমেইল নিশ্চিত করুন",
-    "ban_account": "Ban Account",
-    "ban_account_confirm": "Do you really want to ban this user?",
-    "unban_account": "Unban Account",
+    "ban_account": "একাউন্ট নিষিদ্ধ করুন",
+    "ban_account_confirm": "আপনি কি নিশ্চিত যে এই সদস্যকে নিষিদ্ধ করতে চান ?",
+    "unban_account": "নিষেদ্ধাজ্ঞা তুলে নিন",
    "delete_account": "একাউন্ট মুছে ফেলুন",
    "delete_account_confirm": "আপনি কি নিশ্চিত যে আপনি আপনার একাউন্ট মুছে ফেলতে চান ?  <br /><strong>এই কাজটির ফলে আপনার কোন তথ্য পুনরূদ্ধার করা সম্ভব নয়  </strong><br /><br /> নিশ্চিত করতে আপনার ইউজারনেম প্রবেশ করান। ",
    "delete_this_account_confirm": "Are you sure you want to delete this account? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
-    "account-deleted": "Account deleted",
+    "account-deleted": "একাউন্ট মুছে ফেলা হয়েছে",
    "fullname": "পুর্ণ নাম",
    "website": "ওয়েবসাইট",
    "location": "স্থান",
@@ -23,20 +23,23 @@
    "profile_views": "প্রোফাইল দেখেছেন",
    "reputation": "সন্মাননা",
    "favourites": "পছন্দের তালিকা",
-    "watched": "Watched",
+    "watched": "দেখা হয়েছে",
    "followers": "যাদের অনুসরণ করছেন",
    "following": "যারা আপনাকে অনুসরণ করছে",
-    "aboutme": "About me",
+    "aboutme": "আমার সম্পর্কে: ",
    "signature": "স্বাক্ষর",
-    "gravatar": "গ্রাভাতার",
    "birthday": "জন্মদিন",
    "chat": "বার্তালাপ",
+    "chat_with": "চ্যাট উইথ %1",
    "follow": "অনুসরন করুন",
    "unfollow": "অনুসরন করা থেকে বিরত থাকুন",
-    "more": "More",
+    "more": "আরো...",
    "profile_update_success": "প্রোফাইল আপডেট সফল হয়েছে",
    "change_picture": "ছবি পরিবর্তন",
+    "change_username": "ইউজারনেম পরিবর্তন করুন",
+    "change_email": "ইমেইল পরিবর্তন করুন",
    "edit": "সম্পাদনা",
+    "default_picture": "ডিফল্ট আইকন",
    "uploaded_picture": "ছবি আপলোড করুন",
    "upload_new_picture": "নতুন ছবি আপলোড করুন",
    "upload_new_picture_from_url": "URL থেকে নতুন ছবি আপলোড করুন",
@@ -51,10 +54,11 @@
    "confirm_password": "পাসওয়ার্ড নিশ্চিত করুন",
    "password": "পাসওয়ার্ড",
    "username_taken_workaround": "আপনি যে ইউজারনেম চাচ্ছিলেন সেটি ইতিমধ্যে নেয়া হয়ে গেছে, কাজেই আমরা এটি কিঞ্চিং পরিবর্তন করেছি। আপনি এখন <strong>%1</strong> হিসেবে পরিচিত",
+    "password_same_as_username": "Your password is the same as your username, please select another password.",
    "upload_picture": "ছবি আপলোড করুন",
    "upload_a_picture": "ছবি (একটি) আপলোড করুন",
-    "remove_uploaded_picture": "Remove Uploaded Picture",
-    "image_spec": "আপনি কেবলমাত্র PNG, JPG অথবা GIF ফাইল আপলোড করতে পারবেন",
+    "remove_uploaded_picture": "আপলোড করা ছবিটি সরিয়ে নাও",
+    "image_spec": "আপনি শুধুমাত্র PNG, JPG অথবা BMP ফাইল আপলোড করতে পারবেন",
    "settings": "সেটিংস",
    "show_email": "আমার ইমেইল দেখাও",
    "show_fullname": "আমার সম্পূর্ণ নাম দেখাও",
@@ -66,26 +70,34 @@
    "digest_weekly": "সাপ্তাহিক",
    "digest_monthly": "মাসিক",
    "send_chat_notifications": "যদি আমি অনলাইনে না থাকি, সেক্ষেত্রে নতুন চ্যাট মেসেজ আসলে আমাকে ইমেইল করুন",
-    "send_post_notifications": "Send an email when replies are made to topics I am subscribed to",
-    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
+    "send_post_notifications": "আমার সাবস্ক্রাইব করা টপিকগুলোতে রিপ্লাই করা হলে আমাকে মেইল করা হোক",
+    "settings-require-reload": "কিছু কিছু পরিবর্তনের জন্য রিলোড করা আবশ্যক।  পেজটি রিলোড করতে এখানে ক্লিক করুন",
    "has_no_follower": "এই সদস্যের কোন ফলোয়ার নেই :(",
    "follows_no_one": "এই সদস্য কাউকে ফলো করছেন না :(",
-    "has_no_posts": "This user hasn't posted anything yet.",
-    "has_no_topics": "This user hasn't posted any topics yet.",
-    "has_no_watched_topics": "This user hasn't watched any topics yet.",
+    "has_no_posts": "এই সদস্য এখন পর্যন্ত কোন পোস্ট করেন নি",
+    "has_no_topics": "এই সদস্য এখনো কোন টপিক করেন নি",
+    "has_no_watched_topics": "এই সদস্য এখনো কোন টপিক দেখেন  নি",
    "email_hidden": "ইমেইল গোপন রাখা হয়েছে",
    "hidden": "গোপন করা হয়েছে",
-    "paginate_description": "Paginate topics and posts instead of using infinite scroll",
+    "paginate_description": "ইনফাইনাইট স্ক্রলের বদলে টপিক ও পোস্টের জন্য পেজিনেশন ব্যাবহার করা হোক",
    "topics_per_page": "প্রতি পেজে কতগুলো টপিক থাকবে",
    "posts_per_page": "প্রতি পেইজে কতগুলো পোষ্ট থাকবে",
-    "notification_sounds": "Play a sound when you receive a notification",
+    "notification_sounds": "নোটিফিকেশনের জন্য নোটিফিকেশন সাউন্ড এনাবল করুন",
    "browsing": "Browsing সেটিংস",
-    "open_links_in_new_tab": "Open outgoing links in new tab",
+    "open_links_in_new_tab": "আউটগোয়িং লিংকগুলো নতুন ট্যাবে খুলুন",
    "enable_topic_searching": "In-Topic সার্চ সক্রীয় করো",
    "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
    "follow_topics_you_reply_to": "Follow topics that you reply to",
    "follow_topics_you_create": "Follow topics you create",
    "grouptitle": "Select the group title you would like to display",
    "no-group-title": "No group title",
-    "select-skin": "Select a Skin"
+    "select-skin": "Select a Skin",
+    "select-homepage": "Select a Homepage",
+    "homepage": "Homepage",
+    "homepage_description": "Select a page to use as the forum homepage or 'None' to use the default homepage.",
+    "custom_route": "Custom Homepage Route",
+    "custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
+    "sso.title": "Single Sign-on Services",
+    "sso.associated": "Associated with",
+    "sso.not-associated": "Click here to associate with"
 }
--- a/public/language/bn/users.json
+++ b/public/language/bn/users.json
@@ -5,17 +5,17 @@
    "search": "খুঁজুন",
    "enter_username": "ইউজারনেম এর ভিত্তিতে সার্চ করুন",
    "load_more": "আরো লোড করুন",
-    "users-found-search-took": "%1 user(s) found! Search took %2 seconds.",
-    "filter-by": "Filter By",
-    "online-only": "Online only",
-    "picture-only": "Picture only",
-    "invite": "Invite",
-    "invitation-email-sent": "An invitation email has been sent to %1",
-    "user_list": "User List",
-    "recent_topics": "Recent Topics",
-    "popular_topics": "Popular Topics",
-    "unread_topics": "Unread Topics",
-    "categories": "Categories",
-    "tags": "Tags",
-    "map": "Map"
+    "users-found-search-took": "%1 জন সদস্য(দের)  খুঁজে পাওয়া গেছে। খুঁজতে সময় লেগেছে %2 সেকেন্ড ",
+    "filter-by": "ফিল্টার করার ধরন",
+    "online-only": "শুধুমাত্র অনলাইন",
+    "picture-only": "শুধুমাত্র ছবি",
+    "invite": "ইনভাইট",
+    "invitation-email-sent": "%1 কে একটি ইনভাইটেশন ইমেইল পাঠানো হয়েছে",
+    "user_list": "সদস্য তালিকা",
+    "recent_topics": "সাম্প্রতিক টপিক",
+    "popular_topics": "জনপ্রিয় টপিক",
+    "unread_topics": "অপঠিত টপিক",
+    "categories": "বিভাগ",
+    "tags": "ট্যাগসমূহ",
+    "map": "ম্যাপ"
 }
--- a/public/language/cs/category.json
+++ b/public/language/cs/category.json
@@ -11,5 +11,6 @@
    "watch": "Watch",
    "ignore": "Ignorovat",
    "watch.message": "You are now watching updates from this category",
-    "ignore.message": "You are now ignoring updates from this category"
+    "ignore.message": "You are now ignoring updates from this category",
+    "watched-categories": "Watched categories"
 }
--- a/public/language/cs/error.json
+++ b/public/language/cs/error.json
@@ -33,7 +33,6 @@
    "no-user": "Uživatel neexistuje",
    "no-teaser": "Teaser does not exist",
    "no-privileges": "Na tuto akci nemáte dostatečná práva",
-    "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",
@@ -49,7 +48,6 @@
    "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
    "too-many-tags": "Too many tags. Topics can't have more than %1 tag(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!",
@@ -60,7 +58,8 @@
    "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",
-    "group-already-member": "You are already part of this group",
+    "group-already-member": "Already part of this group",
+    "group-not-member": "Not a member of this group",
    "group-needs-owner": "This group requires at least one owner",
    "group-already-invited": "This user has already been invited",
    "group-already-requested": "Your membership request has already been submitted",
@@ -79,6 +78,7 @@
    "too-many-messages": "You have sent too many messages, please wait awhile.",
    "invalid-chat-message": "Invalid chat message",
    "chat-message-too-long": "Chat message is too long",
+    "cant-edit-chat-message": "You are not allowed to edit this message",
    "reputation-system-disabled": "Systém reputací je zakázán.",
    "downvoting-disabled": "Downvoting is disabled",
    "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",
--- a/public/language/cs/global.json
+++ b/public/language/cs/global.json
@@ -56,9 +56,11 @@
    "posted_ago_by_guest": "posted %1 by Guest",
    "posted_ago_by": "posted %1 by %2",
    "posted_ago": "posted %1",
-    "posted_in_ago_by_guest": "posted in %1 %2 by Guest",
-    "posted_in_ago_by": "posted in %1 %2 by %3",
+    "posted_in": "posted in %1",
+    "posted_in_by": "posted in %1 by %2",
    "posted_in_ago": "posted in %1 %2",
+    "posted_in_ago_by": "posted in %1 %2 by %3",
+    "posted_in_ago_by_guest": "posted in %1 %2 by Guest",
    "replied_ago": "replied %1",
    "user_posted_ago": "%1 posted %2",
    "guest_posted_ago": "Guest posted %1",
@@ -80,5 +82,6 @@
    "privacy": "Privacy",
    "follow": "Follow",
    "unfollow": "Unfollow",
-    "delete_all": "Vymazat vše"
+    "delete_all": "Vymazat vše",
+    "map": "Map"
 }
--- a/public/language/cs/groups.json
+++ b/public/language/cs/groups.json
@@ -15,8 +15,6 @@
    "invited.notification_title": "You have been invited to join <strong>%1</strong>",
    "request.notification_title": "Group Membership Request from <strong>%1</strong>",
    "request.notification_text": "<strong>%1</strong> has requested to become a member of <strong>%2</strong>",
-    "cover-instructions": "Drag and Drop a photo, drag to position, and hit <strong>Save</strong>",
-    "cover-change": "Change",
    "cover-save": "Save",
    "cover-saving": "Saving",
    "details.title": "podrobnosti skupiny",
--- a/public/language/cs/modules.json
+++ b/public/language/cs/modules.json
@@ -15,6 +15,7 @@
    "chat.seven_days": "7 dní",
    "chat.thirty_days": "30 dní",
    "chat.three_months": "3 měsíce",
+    "chat.delete_message_confirm": "Are you sure you wish to delete this message?",
    "composer.compose": "Compose",
    "composer.show_preview": "Show Preview",
    "composer.hide_preview": "Hide Preview",
@@ -23,7 +24,11 @@
    "composer.discard": "Are you sure you wish to discard this post?",
    "composer.submit_and_lock": "Submit and Lock",
    "composer.toggle_dropdown": "Toggle Dropdown",
+    "composer.uploading": "Uploading %1",
    "bootbox.ok": "OK",
    "bootbox.cancel": "Cancel",
-    "bootbox.confirm": "Confirm"
+    "bootbox.confirm": "Confirm",
+    "cover.dragging_title": "Cover Photo Positioning",
+    "cover.dragging_message": "Drag the cover photo to the desired position and click \"Save\"",
+    "cover.saved": "Cover photo image and position saved"
 }
--- a/public/language/cs/notifications.json
+++ b/public/language/cs/notifications.json
@@ -12,14 +12,23 @@
    "you_have_unread_notifications": "You have unread notifications.",
    "new_message_from": "New message from <strong>%1</strong>",
    "upvoted_your_post_in": "<strong>%1</strong> has upvoted your post in <strong>%2</strong>.",
-    "moved_your_post": "<strong>%1</strong> has moved your post.",
-    "moved_your_topic": "<strong>%1</strong> has moved your topic.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
+    "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
+    "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
    "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
    "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
    "user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
    "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
-    "user_mentioned_you_in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
    "user_started_following_you": "<strong>%1</strong> started following you.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
    "new_register": "<strong>%1</strong> sent a registration request.",
    "email-confirmed": "Email Confirmed",
    "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
--- a/public/language/cs/pages.json
+++ b/public/language/cs/pages.json
@@ -24,6 +24,9 @@
    "chats": "Chats",
    "chat": "Chatting with %1",
    "account/edit": "Editing \"%1\"",
+    "account/edit/password": "Editing password of \"%1\"",
+    "account/edit/username": "Editing username of \"%1\"",
+    "account/edit/email": "Editing email of \"%1\"",
    "account/following": "People %1 follows",
    "account/followers": "People who follow %1",
    "account/posts": "Posts made by %1",
@@ -33,5 +36,6 @@
    "account/settings": "User Settings",
    "account/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:"
+    "maintenance.messageIntro": "Additionally, the administrator has left this message:",
+    "throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
 }
--- a/public/language/cs/topic.json
+++ b/public/language/cs/topic.json
@@ -25,9 +25,8 @@
    "tools": "Nástroje",
    "flag": "Flag",
    "locked": "Locked",
-    "bookmark_instructions": "Click here to return to your last position or close to discard.",
+    "bookmark_instructions": "Click here to return to the last unread post in this thread.",
    "flag_title": "Flag this post for moderation",
-    "flag_confirm": "Are you sure you want to flag this post?",
    "flag_success": "This post has been flagged for moderation.",
    "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
    "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
@@ -96,5 +95,13 @@
    "oldest_to_newest": "Oldest to Newest",
    "newest_to_oldest": "Newest to Oldest",
    "most_votes": "Most votes",
-    "most_posts": "Most posts"
+    "most_posts": "Most posts",
+    "stale.title": "Create new topic instead?",
+    "stale.warning": "The topic you are replying to is quite old. Would you like to create a new topic instead, and reference this one in your reply?",
+    "stale.create": "Create a new topic",
+    "stale.reply_anyway": "Reply to this topic anyway",
+    "stale.link_back": "Re: [%1](%2)",
+    "spam": "Spam",
+    "offensive": "Offensive",
+    "custom-flag-reason": "Enter a flagging reason"
 }
--- a/public/language/cs/user.json
+++ b/public/language/cs/user.json
@@ -28,15 +28,18 @@
    "following": "Sleduje",
    "aboutme": "O mně",
    "signature": "Podpis",
-    "gravatar": "Gravatar",
    "birthday": "Datum narození",
    "chat": "Chat",
+    "chat_with": "Chat with %1",
    "follow": "Sledovat",
    "unfollow": "Nesledovat",
    "more": "Více",
    "profile_update_success": "Profil byl úspěšně aktualizován!",
    "change_picture": "Změnit obrázek",
+    "change_username": "Change Username",
+    "change_email": "Change Email",
    "edit": "Upravit",
+    "default_picture": "Default Icon",
    "uploaded_picture": "Nahraný obrázek",
    "upload_new_picture": "Nahrát nový obrázek",
    "upload_new_picture_from_url": "Nahrát nový obrázek z URL",
@@ -51,10 +54,11 @@
    "confirm_password": "Potvrzení hesla",
    "password": "Heslo",
    "username_taken_workaround": "The username you requested was already taken, so we have altered it slightly. You are now known as <strong>%1</strong>",
+    "password_same_as_username": "Your password is the same as your username, please select another password.",
    "upload_picture": "Nahrát obrázek",
    "upload_a_picture": "Nahrát obrázek",
    "remove_uploaded_picture": "Remove Uploaded Picture",
-    "image_spec": "Nahrávat lze pouze soubory PNG, JPG a GIF",
+    "image_spec": "You may only upload PNG, JPG, or BMP files",
    "settings": "Nastavení",
    "show_email": "Zobrazovat můj email v profilu",
    "show_fullname": "Zobrazovat celé jméno",
@@ -87,5 +91,13 @@
    "follow_topics_you_create": "Follow topics you create",
    "grouptitle": "Select the group title you would like to display",
    "no-group-title": "No group title",
-    "select-skin": "Select a Skin"
+    "select-skin": "Select a Skin",
+    "select-homepage": "Select a Homepage",
+    "homepage": "Homepage",
+    "homepage_description": "Select a page to use as the forum homepage or 'None' to use the default homepage.",
+    "custom_route": "Custom Homepage Route",
+    "custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
+    "sso.title": "Single Sign-on Services",
+    "sso.associated": "Associated with",
+    "sso.not-associated": "Click here to associate with"
 }
--- a/public/language/da/category.json
+++ b/public/language/da/category.json
@@ -11,5 +11,6 @@
    "watch": "Overvåg",
    "ignore": "Ignorer",
    "watch.message": "Du overvåger nu opdateringer fra denne kategori",
-    "ignore.message": "Du ignorere nu opdateringer fra denne kategori"
+    "ignore.message": "Du ignorere nu opdateringer fra denne kategori",
+    "watched-categories": "Fulgte kategorier"
 }
--- a/public/language/da/error.json
+++ b/public/language/da/error.json
@@ -33,7 +33,6 @@
    "no-user": "Brugeren eksisterer ikke",
    "no-teaser": "Teaser eksisterer ikke",
    "no-privileges": "Du har ikke nok rettigheder til at udføre denne handling",
-    "no-emailers-configured": "Ingen email plugin er blevet indlæst, så en test email kunne ikke sendes",
    "category-disabled": "Kategorien er deaktiveret",
    "topic-locked": "Tråden er låst",
    "post-edit-duration-expired": "Du kan kun redigere indlæg i %1 sekund(er) efter indlæg",
@@ -49,7 +48,6 @@
    "not-enough-tags": "Ikke nok tags. Tråde skal have mindst %1 tag(s)",
    "too-many-tags": "For mange tags. Tråde kan ikke have mere end %1 tag(s)",
    "file-too-big": "Maksimum filstørrelse er %1 kB - venligst overfør en mindre fil",
-    "cant-vote-self-post": "Du kan ikke stemme på dit eget indlæg",
    "already-favourited": "Du har allerede føjet dette indlæg til dine favoritter",
    "already-unfavourited": "Du har allerede fjernet dette indlæg fra dine favoritter",
    "cant-ban-other-admins": "Du kan ikke udlukke andre administatrorer!",
@@ -60,7 +58,8 @@
    "group-name-too-short": "Gruppe navn for kort",
    "group-already-exists": "Gruppen eksisterer allerede",
    "group-name-change-not-allowed": "Ændring af gruppe navn er ikke tilladt",
-    "group-already-member": "Du er allerede en del af denne gruppe",
+    "group-already-member": "Allerede medlem af denne gruppe",
+    "group-not-member": "Ikke medlem af denne gruppe",
    "group-needs-owner": "Denne grupper kræver mindst én ejer",
    "group-already-invited": "Denne bruger er allerede blevet inviteret",
    "group-already-requested": "Din medlemskabs anmodning er allerede blevet afsendt",
@@ -79,6 +78,7 @@
    "too-many-messages": "Du har sendt for mange beskeder, vent venligt lidt.",
    "invalid-chat-message": "Ugyldig chat besked",
    "chat-message-too-long": "Chat beskeden er for lang",
+    "cant-edit-chat-message": "You are not allowed to edit this message",
    "reputation-system-disabled": "Vurderingssystem er slået fra.",
    "downvoting-disabled": "Nedvurdering er slået fra",
    "not-enough-reputation-to-downvote": "Du har ikke nok omdømme til at nedstemme dette indlæg",
--- a/public/language/da/global.json
+++ b/public/language/da/global.json
@@ -56,9 +56,11 @@
    "posted_ago_by_guest": "indsendt %1 af gæst",
    "posted_ago_by": "indsendt %1 siden af %2",
    "posted_ago": "Indsendt %1 siden",
-    "posted_in_ago_by_guest": "insendt i %1 %2 siden af gæst",
-    "posted_in_ago_by": "skrevet i %1 %2 af %3",
+    "posted_in": "skrevet i %1",
+    "posted_in_by": "skrevet i %1 af %2",
    "posted_in_ago": "skrivet i %1 %2",
+    "posted_in_ago_by": "skrevet i %1 %2 af %3",
+    "posted_in_ago_by_guest": "insendt i %1 %2 siden af gæst",
    "replied_ago": "svaret for %1",
    "user_posted_ago": "%1 skrev for %2",
    "guest_posted_ago": "Gæst skrev for %1",
@@ -80,5 +82,6 @@
    "privacy": "Privatliv",
    "follow": "Følg",
    "unfollow": "Følg ikke længere",
-    "delete_all": "Slet alt"
+    "delete_all": "Slet alt",
+    "map": "Kort"
 }
--- a/public/language/da/groups.json
+++ b/public/language/da/groups.json
@@ -15,8 +15,6 @@
    "invited.notification_title": "Du er blevet inviteret til at blive medlem af <strong>%1</strong>",
    "request.notification_title": "Gruppe medlemskab anmodning fra <strong>%1</strong>",
    "request.notification_text": "<strong>%1</strong> har anmodet om at blive medlem af <strong>%2</strong>",
-    "cover-instructions": "Træk og slip et billede, træk til positionen og tryk <strong>Gem</strong>",
-    "cover-change": "Ændre",
    "cover-save": "Gem",
    "cover-saving": "Gemmer",
    "details.title": "gruppe detaljer",
--- a/public/language/da/modules.json
+++ b/public/language/da/modules.json
@@ -5,7 +5,7 @@
    "chat.no_active": "Du har ingen aktive chats.",
    "chat.user_typing": "%1 skriver ...",
    "chat.user_has_messaged_you": "1% har skrevet til dig.",
-    "chat.see_all": "See all chats",
+    "chat.see_all": "Se alle chats",
    "chat.no-messages": "Vælg en modtager for at se beskedhistorikken",
    "chat.recent-chats": "Seneste chats",
    "chat.contacts": "Kontakter",
@@ -15,6 +15,7 @@
    "chat.seven_days": "7 dage",
    "chat.thirty_days": "30 dage",
    "chat.three_months": "3 måneder",
+    "chat.delete_message_confirm": "Are you sure you wish to delete this message?",
    "composer.compose": "Skriv",
    "composer.show_preview": "Vis forhåndsvisning",
    "composer.hide_preview": "Fjern forhåndsvisning",
@@ -23,7 +24,11 @@
    "composer.discard": "Er du sikker på at du vil kassere dette indlæg?",
    "composer.submit_and_lock": "Send og lås",
    "composer.toggle_dropdown": "Skift mellem dropdown",
+    "composer.uploading": "Uploader %1",
    "bootbox.ok": "OK",
-    "bootbox.cancel": "Cancel",
-    "bootbox.confirm": "Confirm"
+    "bootbox.cancel": "Annuller",
+    "bootbox.confirm": "Bekræft",
+    "cover.dragging_title": "Cover Photo Positioning",
+    "cover.dragging_message": "Drag the cover photo to the desired position and click \"Save\"",
+    "cover.saved": "Cover photo image and position saved"
 }
--- a/public/language/da/notifications.json
+++ b/public/language/da/notifications.json
@@ -1,7 +1,7 @@
 {
    "title": "Notifikationer",
    "no_notifs": "Du har ingen nye notifkationer",
-    "see_all": "See all notifications",
+    "see_all": "Se alle notifikationer",
    "mark_all_read": "Marker alle notifikationer læst",
    "back_to_home": "Tilbage til %1",
    "outgoing_link": "Udgående link",
@@ -12,14 +12,23 @@
    "you_have_unread_notifications": "Du har ulæste notifikationer.",
    "new_message_from": "Ny besked fra <strong>%1</strong>",
    "upvoted_your_post_in": "<strong>%1</strong> har upvotet dit indlæg i <strong>%2</strong>.",
-    "moved_your_post": "<strong>%1</strong> har flyttet dit indlæg.",
-    "moved_your_topic": "<strong>%1</strong> har flyttet din tråd.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
+    "moved_your_post": "<strong>%1</strong> har flyttet dit indlæg til <strong>%2</strong>",
+    "moved_your_topic": "<strong>%1</strong> har flyttet <strong>%2</strong>",
    "favourited_your_post_in": "<strong>%1</strong> har favoriseret dit indlæg i <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
    "user_flagged_post_in": "<strong>%1</strong> har anmeldt et indlæg i <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
    "user_posted_to": "<strong>%1</strong> har skrevet et svar til: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
    "user_posted_topic": "<strong>%1</strong> har oprettet en ny tråd: <strong>%2</strong>",
-    "user_mentioned_you_in": "<strong>%1</strong> nævnte dig i <strong>%2</strong>",
    "user_started_following_you": "<strong>%1</strong> har valgt at følge dig.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
    "new_register": "<strong>%1</strong> har sendt en registrerings anmodning.",
    "email-confirmed": "Email bekræftet",
    "email-confirmed-message": "Tak fordi du validerede din email. Din konto er nu fuldt ud aktiveret.",
--- a/public/language/da/pages.json
+++ b/public/language/da/pages.json
@@ -1,37 +1,41 @@
 {
    "home": "Forside",
    "unread": "Ulæste tråde",
-    "popular-day": "Popular topics today",
-    "popular-week": "Popular topics this week",
-    "popular-month": "Popular topics this month",
-    "popular-alltime": "All time popular topics",
+    "popular-day": "Populære tråde i dag",
+    "popular-week": "Populære tråde denne ude",
+    "popular-month": "Populære tråde denne måned",
+    "popular-alltime": "Top populære tråde",
    "recent": "Seneste tråde",
-    "users/online": "Online Users",
-    "users/latest": "Latest Users",
-    "users/sort-posts": "Users with the most posts",
-    "users/sort-reputation": "Users with the most reputation",
-    "users/map": "User Map",
-    "users/search": "User Search",
+    "users/online": "Online brugere",
+    "users/latest": "Seneste brugere",
+    "users/sort-posts": "Brugere med de fleste indlæg",
+    "users/sort-reputation": "Brugere med mest omdømme",
+    "users/map": "Bruger kort",
+    "users/search": "Bruger søgning",
    "notifications": "Notifikationer",
    "tags": "Tags",
    "tag": "Tråde tagget under \"%1\"",
-    "register": "Register an account",
-    "login": "Login to your account",
-    "reset": "Reset your account password",
-    "categories": "Categories",
-    "groups": "Groups",
-    "group": "%1 group",
+    "register": "Registre en konto",
+    "login": "Login til din konto",
+    "reset": "Nulstil din adgangskode",
+    "categories": "Kategorier",
+    "groups": "Grupper",
+    "group": "%1 gruppe",
    "chats": "Chats",
-    "chat": "Chatting with %1",
-    "account/edit": "Editing \"%1\"",
-    "account/following": "People %1 follows",
-    "account/followers": "People who follow %1",
-    "account/posts": "Posts made by %1",
-    "account/topics": "Topics created by %1",
-    "account/groups": "%1's Groups",
-    "account/favourites": "%1's Favourite Posts",
-    "account/settings": "User Settings",
-    "account/watched": "Topics watched by %1",
+    "chat": "Chatter med %1",
+    "account/edit": "Redigere \"%1\"",
+    "account/edit/password": "Redigerer adgangskode  for \"%1\"",
+    "account/edit/username": "Redigerer brugernavn for \"%1\"",
+    "account/edit/email": "Redigerer email for \"%1\"",
+    "account/following": "Personer som %1 følger",
+    "account/followers": "Personer som følger %1",
+    "account/posts": "Indlæg oprettet af %1",
+    "account/topics": "Tråde lavet af %1",
+    "account/groups": "%1s grupper",
+    "account/favourites": "&1s favorit indlæg",
+    "account/settings": "Bruger instillinger",
+    "account/watched": "Tråde fulgt af %1",
    "maintenance.text": "%1 er under vedligeholdelse. Kom venligst tilbage senere.",
-    "maintenance.messageIntro": "Administratoren har yderligere vedlagt denne besked:"
+    "maintenance.messageIntro": "Administratoren har yderligere vedlagt denne besked:",
+    "throttled.text": "%1 er ikke tilgængelig på grund af overbelastning. Venligst kom tilbage senere."
 }
--- a/public/language/da/topic.json
+++ b/public/language/da/topic.json
@@ -25,9 +25,8 @@
    "tools": "Værktøjer",
    "flag": "Marker",
    "locked": "Låst",
-    "bookmark_instructions": "Klik her for at returnere til den sidste position eller luk for at kassere.",
+    "bookmark_instructions": "Klik her for at returnere til det seneste ulæste indlæg i denne tråd.",
    "flag_title": "Meld dette indlæg til moderation",
-    "flag_confirm": "Er du sikker på du ænsker at melde dette indlæg?",
    "flag_success": "Dette indlæg er blevet meldt til moderation.",
    "deleted_message": "Denne tråd er blevet slettet. Kun brugere med emne behandlings privilegier kan se den.",
    "following_topic.message": "Du vil nu modtage notifikationer når nogle skriver et indlæg i dette emne.",
@@ -96,5 +95,13 @@
    "oldest_to_newest": "Ældste til nyeste",
    "newest_to_oldest": "Nyeste til ældste",
    "most_votes": "Flest stemmer",
-    "most_posts": "Flest indlæg"
+    "most_posts": "Flest indlæg",
+    "stale.title": "Create new topic instead?",
+    "stale.warning": "The topic you are replying to is quite old. Would you like to create a new topic instead, and reference this one in your reply?",
+    "stale.create": "Create a new topic",
+    "stale.reply_anyway": "Reply to this topic anyway",
+    "stale.link_back": "Re: [%1](%2)",
+    "spam": "Spam",
+    "offensive": "Stødende",
+    "custom-flag-reason": "Enter a flagging reason"
 }
--- a/public/language/da/user.json
+++ b/public/language/da/user.json
@@ -12,7 +12,7 @@
    "delete_account": "Slet konto",
    "delete_account_confirm": "Er du sikker på du vil slette din konto? <br /><strong>Dette kan ikke fortrydes, og du vil ikke være istand til at genoprette dine data</strong><br /><br />Indtast dit brugernavn for at bekræfte at du ønsker at slette din konto.",
    "delete_this_account_confirm": "Er du sikker på at du vil slette denne konto?<br /><strong>Denne handling kan ikke fortrydes, og du kan ikke genskabe nogen data.</strong><br /><br />",
-    "account-deleted": "Account deleted",
+    "account-deleted": "Konto slettet",
    "fullname": "Fulde navn",
    "website": "Webside",
    "location": "Lokation",
@@ -28,15 +28,18 @@
    "following": "Følger",
    "aboutme": "Om mig",
    "signature": "Signatur",
-    "gravatar": "Gravatar",
    "birthday": "Fødselsdag",
    "chat": "Chat",
+    "chat_with": "Chat med %1",
    "follow": "Følg",
    "unfollow": "Følg ikke",
    "more": "Mere",
    "profile_update_success": "Din profil blev opdateret",
    "change_picture": "Skift billede",
+    "change_username": "Ændre brugernavn",
+    "change_email": "Ændre email",
    "edit": "Rediger",
+    "default_picture": "Standard ikon",
    "uploaded_picture": "Upload billede",
    "upload_new_picture": "Upload nyt billede",
    "upload_new_picture_from_url": "Upload nyt billede fra URL",
@@ -51,10 +54,11 @@
    "confirm_password": "Bekræft kodeord",
    "password": "Kodeord",
    "username_taken_workaround": "Det valgte brugernavn er allerede taget, så vi har ændret det en smule. Du hedder nu <strong>%1</strong>",
+    "password_same_as_username": "Din adgangskode er det samme som dit brugernavn, vælg venligst en anden adgangskode.",
    "upload_picture": "Upload billede",
    "upload_a_picture": "Upload et billede",
-    "remove_uploaded_picture": "Remove Uploaded Picture",
-    "image_spec": "Du kan kun uploade PNG, JPG eller GIF billeder",
+    "remove_uploaded_picture": "Fjern uploaded billede",
+    "image_spec": "You may only upload PNG, JPG, or BMP files",
    "settings": "Indstillinger",
    "show_email": "Vis min emailaddresse",
    "show_fullname": "Vis mit fulde navn",
@@ -87,5 +91,13 @@
    "follow_topics_you_create": "Følg emner du opretter",
    "grouptitle": "Vælg gruppe titlen du gerne vil fremvise",
    "no-group-title": "Ingen gruppe titel",
-    "select-skin": "Select a Skin"
+    "select-skin": "Vælg et skin",
+    "select-homepage": "Vælg en hjemmeside",
+    "homepage": "Hjemmeside",
+    "homepage_description": "Vælg en side som forummets hjemmeside, eller 'Ingen' for at bruge standard hjemmesiden.",
+    "custom_route": "Custom Homepage Route",
+    "custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
+    "sso.title": "Single Sign-on Services",
+    "sso.associated": "Associated with",
+    "sso.not-associated": "Click here to associate with"
 }
--- a/public/language/de/category.json
+++ b/public/language/de/category.json
@@ -11,5 +11,6 @@
    "watch": "Beobachten",
    "ignore": "Ignorieren",
    "watch.message": "Du beobachtest jetzt Änderungen in dieser Kategorie",
-    "ignore.message": "Du ignorierst jetzt Änderungen in dieser Kategorie"
+    "ignore.message": "Du ignorierst jetzt Änderungen in dieser Kategorie",
+    "watched-categories": "Zuletzt angesehen Kategorien"
 }
--- a/public/language/de/email.json
+++ b/public/language/de/email.json
@@ -6,7 +6,7 @@
    "greeting_with_name": "Hallo %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.text3": "Ein Administrator hat deine Registration aktzeptiert. Du kannst dich jetzt mit deinem Benutzernamen/Passwort einloggen.",
+    "welcome.text3": "Ein Administrator hat deine Registrierung aktzeptiert. Du kannst dich jetzt mit deinem Benutzernamen/Passwort einloggen.",
    "welcome.cta": "Klicke hier, um deine E-Mail-Adresse zu bestätigen.",
    "invitation.text1": "%1 hat dich eingeladen %2 beizutreten",
    "invitation.ctr": "Klicke hier, um ein Konto zu erstellen.",
@@ -25,7 +25,7 @@
    "notif.chat.cta": "Klicke hier, um die Unterhaltung fortzusetzen",
    "notif.chat.unsub.info": "Diese Chat-Benachrichtigung wurde dir aufgrund deiner Abonnement-Einstellungen gesendet.",
    "notif.post.cta": "Hier klicken, um das gesamte Thema zu lesen",
-    "notif.post.unsub.info": "Diese Mitteilung wurde wegen ihrer Abonnement-Einstellung gesendet.",
+    "notif.post.unsub.info": "Diese Mitteilung wurde dir aufgrund deiner Abonnement-Einstellungen gesendet.",
    "test.text1": "Dies ist eine Test-E-Mail, um zu überprüfen, ob der E-Mailer deines NodeBB korrekt eingestellt wurde.",
    "unsub.cta": "Klicke hier, um diese Einstellungen zu ändern.",
    "closing": "Danke!"
--- a/public/language/de/error.json
+++ b/public/language/de/error.json
@@ -33,7 +33,6 @@
    "no-user": "Der Benutzer existiert nicht",
    "no-teaser": "Zusammenfassung existiert nicht",
    "no-privileges": "Du verfügst nicht über ausreichende Berechtigungen, um die Aktion durchzuführen.",
-    "no-emailers-configured": "Es wurde keine E-Mail-Plugins geladen, weshalb eine Test-E-Mail nicht gesendet werden konnte.",
    "category-disabled": "Kategorie ist deaktiviert",
    "topic-locked": "Thema ist gesperrt",
    "post-edit-duration-expired": "Entschuldigung, Sie dürfen Beiträge nur %1 Sekunde(n) nach dem veröffentlichen editieren.",
@@ -49,7 +48,6 @@
    "not-enough-tags": "Nicht genügend Tags. Themen müssen mindestens %1 Tag(s) enthalten",
    "too-many-tags": "Zu viele Tags. Themen dürfen nicht mehr als %1 Tag(s) enthalten",
    "file-too-big": "Die maximale Dateigröße ist %1 kB, bitte laden Sie eine kleinere Datei hoch.",
-    "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!",
@@ -61,6 +59,7 @@
    "group-already-exists": "Gruppe existiert bereits",
    "group-name-change-not-allowed": "Du kannst den Namen der Gruppe nicht ändern",
    "group-already-member": "Du bist bereits Teil dieser Gruppe",
+    "group-not-member": "Du bist kein Mitglied dieser Gruppe",
    "group-needs-owner": "Diese Gruppe muss mindestens einen Besitzer vorweisen",
    "group-already-invited": "Dieser Benutzer wurde bereits eingeladen",
    "group-already-requested": "Deine Mitgliedsanfrage wurde bereits eingereicht",
@@ -77,8 +76,9 @@
    "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.",
-    "invalid-chat-message": "Invalid chat message",
-    "chat-message-too-long": "Chat message is too long",
+    "invalid-chat-message": "Ungültige Nachricht",
+    "chat-message-too-long": "Die Nachricht ist zu lang",
+    "cant-edit-chat-message": "Du darfst diese Nachricht nicht ändern",
    "reputation-system-disabled": "Das Reputationssystem ist deaktiviert.",
    "downvoting-disabled": "Downvotes sind deaktiviert.",
    "not-enough-reputation-to-downvote": "Deine Reputation ist zu niedrig, um diesen Beitrag negativ zu bewerten.",
--- a/public/language/de/global.json
+++ b/public/language/de/global.json
@@ -4,18 +4,18 @@
    "buttons.close": "Schließen",
    "403.title": "Zugriff verweigert",
    "403.message": "Du hast keine Zugriffsberechtigung für diese Seite.",
-    "403.login": "Du solltest Dich <a href='%1/login'>einloggen</a>.",
+    "403.login": "Du solltest Dich <a href='%1/login'>anmelden</a>.",
    "404.title": " Nicht Gefunden",
    "404.message": "Diese Seite existiert nicht. Zur <a href='%1/'>Homepage</a> zurückkehren.",
    "500.title": "Interner Fehler.",
    "500.message": "Ups! Scheint als wäre etwas schief gelaufen!",
    "register": "Registrieren",
-    "login": "Login",
-    "please_log_in": "Bitte einloggen",
-    "logout": "Logout",
-    "posting_restriction_info": "Nur registrierte Mitglieder dürfen Beiträge verfassen. Hier klicken zum Einloggen.",
+    "login": "Anmelden",
+    "please_log_in": "Bitte anmelden",
+    "logout": "Abmelden",
+    "posting_restriction_info": "Nur registrierte Mitglieder dürfen Beiträge verfassen. Hier klicken zum Anmelden.",
    "welcome_back": "Willkommen zurück",
-    "you_have_successfully_logged_in": "Du hast dich erfolgreich eingeloggt",
+    "you_have_successfully_logged_in": "Du hast dich erfolgreich angemeldet",
    "save_changes": "Speichere Änderungen",
    "close": "Schließen",
    "pagination": "Seitennummerierung",
@@ -41,8 +41,8 @@
    "nextpage": "Nächste Seite",
    "alert.success": "Erfolg",
    "alert.error": "Fehler",
-    "alert.banned": "Gebannt",
-    "alert.banned.message": "Du bist gebannt und wirst nun ausgeloggt.",
+    "alert.banned": "Gesperrt",
+    "alert.banned.message": "Du bist gesperrt und wirst nun abgemeldet.",
    "alert.unfollow": "Du folgst %1 nicht länger!",
    "alert.follow": "Du folgst nun %1!",
    "online": "Online",
@@ -56,9 +56,11 @@
    "posted_ago_by_guest": "%1 von einem Gast geschrieben",
    "posted_ago_by": "%1 von %2 geschrieben",
    "posted_ago": "%1 geschrieben",
-    "posted_in_ago_by_guest": "verfasst in %1 %2 von einem Gast",
-    "posted_in_ago_by": "Verfasst in %1 %2 von %3",
+    "posted_in": "Verfasst in %1",
+    "posted_in_by": "verfasst in %1 von %2",
    "posted_in_ago": "Verfasst in %1 %2",
+    "posted_in_ago_by": "Verfasst in %1 %2 von %3",
+    "posted_in_ago_by_guest": "verfasst in %1 %2 von einem Gast",
    "replied_ago": "antwortete %1",
    "user_posted_ago": "%1 schrieb %2",
    "guest_posted_ago": "Gast schrieb %1",
@@ -66,7 +68,7 @@
    "norecentposts": "Keine aktuellen Beiträge",
    "norecenttopics": "Keine aktuellen Themen",
    "recentposts": "Aktuelle Beiträge",
-    "recentips": "Zuletzt eingeloggte IPs",
+    "recentips": "Zuletzt angemeldete IPs",
    "away": "Abwesend",
    "dnd": "Nicht stören",
    "invisible": "Unsichtbar",
@@ -80,5 +82,6 @@
    "privacy": "Privatsphäre",
    "follow": "Folgen",
    "unfollow": "Entfolgen",
-    "delete_all": "Alles löschen"
+    "delete_all": "Alles löschen",
+    "map": "Karte"
 }
--- a/public/language/de/groups.json
+++ b/public/language/de/groups.json
@@ -1,6 +1,6 @@
 {
    "groups": "Gruppen",
-    "view_group": "Gruppe betrachten",
+    "view_group": "Gruppe zeigen",
    "owner": "Gruppenbesitzer",
    "new_group": "Neue Gruppe erstellen",
    "no_groups_found": "Es sind keine Gruppen vorhanden",
@@ -12,11 +12,9 @@
    "invited.none": "Es sind zur Zeit keine weiteren Mitglieder eingeladen",
    "invited.uninvite": "Einladung zurücknehmen",
    "invited.search": "Suche nach einem Benutzer um ihn in diese Gruppe aufzunehmen",
-    "invited.notification_title": "You have been invited to join <strong>%1</strong>",
-    "request.notification_title": "Group Membership Request from <strong>%1</strong>",
-    "request.notification_text": "<strong>%1</strong> has requested to become a member of <strong>%2</strong>",
-    "cover-instructions": "Foto auf eine Position bewegen, und <strong>Speichern</strong> drücken",
-    "cover-change": "Ändern",
+    "invited.notification_title": "Du wurdest eingeladen <strong>%1</strong> beizutreten.",
+    "request.notification_title": "Mitgliedsanfrage von <strong>%1</strong>.",
+    "request.notification_text": "<strong>%1</strong> möchte Mitglied von <strong>%2</strong> werden.",
    "cover-save": "Speichern",
    "cover-saving": "Speicherung läuft",
    "details.title": "Gruppendetails",
--- a/public/language/de/language.json
+++ b/public/language/de/language.json
@@ -1,5 +1,5 @@
 {
-    "name": "German",
+    "name": "Deutsch",
    "code": "de",
    "dir": "ltr"
 }
--- a/public/language/de/modules.json
+++ b/public/language/de/modules.json
@@ -5,7 +5,7 @@
    "chat.no_active": "Du hast keine aktiven Chats.",
    "chat.user_typing": "%1 tippt gerade ...",
    "chat.user_has_messaged_you": "%1 hat dir geschrieben.",
-    "chat.see_all": "Alle Diagramme anzeigen",
+    "chat.see_all": "Alle Chats sehen",
    "chat.no-messages": "Bitte wähle einen Empfänger, um den jeweiligen Nachrichtenverlauf anzuzeigen.",
    "chat.recent-chats": "Aktuelle Chats",
    "chat.contacts": "Kontakte",
@@ -15,15 +15,20 @@
    "chat.seven_days": "7 Tage",
    "chat.thirty_days": "30 Tage",
    "chat.three_months": "3 Monate",
+    "chat.delete_message_confirm": "Bist du sicher, dass du diese Nachricht löschen möchtest?",
    "composer.compose": "Verfassen",
-    "composer.show_preview": "Vorschau anzeigen",
+    "composer.show_preview": "Vorschau zeigen",
    "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 Beitrag verwerfen möchtest?",
    "composer.submit_and_lock": "Einreichen und Sperren",
    "composer.toggle_dropdown": "Menu aus-/einblenden",
+    "composer.uploading": "Lade %1 hoch",
    "bootbox.ok": "OK",
    "bootbox.cancel": "Abbrechen",
-    "bootbox.confirm": "Bestätigen"
+    "bootbox.confirm": "Bestätigen",
+    "cover.dragging_title": "Titelbildpositionierung",
+    "cover.dragging_message": "Ziehe das Titelbild an die gewünschte Position und klicke auf \"Speichern\"",
+    "cover.saved": "Titelbild und -position gespeichert"
 }
--- a/public/language/de/notifications.json
+++ b/public/language/de/notifications.json
@@ -1,7 +1,7 @@
 {
    "title": "Benachrichtigungen",
-    "no_notifs": "Du hast keine neuen Benachrichtigungen",
-    "see_all": "Alle Benachrichtigungen anzeigen",
+    "no_notifs": "Keine neuen Benachrichtigungen",
+    "see_all": "Alle Benachrichtigungen zeigen",
    "mark_all_read": "Alle Benachrichtigungen als gelesen markieren",
    "back_to_home": "Zurück zu %1",
    "outgoing_link": "Externer Link",
@@ -12,14 +12,23 @@
    "you_have_unread_notifications": "Du hast ungelesene Benachrichtigungen.",
    "new_message_from": "Neue Nachricht von <strong>%1</strong>",
    "upvoted_your_post_in": "<strong>%1</strong> hat deinen Beitrag in <strong>%2</strong> positiv bewertet.",
-    "moved_your_post": "<strong>%1</strong> hat deinen Beitrag verschoben.",
-    "moved_your_topic": "<strong>%1</strong> hat dein Thema verschoben.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
+    "moved_your_post": "<strong>%1</strong> hat deinen Beitrag nach <strong>%2</strong> verschoben.",
+    "moved_your_topic": "<strong>%1</strong> hat <strong>%2</strong> verschoben.",
    "favourited_your_post_in": "<strong>%1</strong> hat deinen Beitrag in <strong>%2</strong> favorisiert.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
    "user_flagged_post_in": "<strong>%1</strong> hat einen Beitrag in </strong>%2</strong> gemeldet",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
    "user_posted_to": "<strong>%1</strong> hat auf <strong>%2</strong> geantwortet.",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
    "user_posted_topic": "<strong>%1</strong> hat ein neues Thema erstellt: <strong>%2</strong>",
-    "user_mentioned_you_in": "<strong>%1</strong> erwähnte dich in <strong>%2</strong>",
    "user_started_following_you": "<strong>%1</strong> folgt dir jetzt.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
    "new_register": "<strong>%1</strong> hat eine Registrationsanfrage geschickt.",
    "email-confirmed": "E-Mail bestätigt",
    "email-confirmed-message": "Vielen Dank für Ihre E-Mail-Validierung. Ihr Konto ist nun vollständig aktiviert.",
--- a/public/language/de/pages.json
+++ b/public/language/de/pages.json
@@ -1,5 +1,5 @@
 {
-    "home": "Home",
+    "home": "Übersicht",
    "unread": "Ungelesene Themen",
    "popular-day": "Beliebte Themen von Heute",
    "popular-week": "Beliebte Themen dieser Woche",
@@ -24,7 +24,10 @@
    "chats": "Chats",
    "chat": "Chatte mit %1",
    "account/edit": "Bearbeite %1",
-    "account/following": "Nutzer, die %1 folgt",
+    "account/edit/password": "Bearbeite Passwort von \"%1\"",
+    "account/edit/username": "Bearbeite Benutzernamen von \"%1\"",
+    "account/edit/email": "Bearbeite E-Mail von \"%1\"",
+    "account/following": "Nutzer, denen %1 folgt",
    "account/followers": "Nutzer, die %1 folgen",
    "account/posts": "Beiträge von %1",
    "account/topics": "Themen verfasst von %1",
@@ -32,6 +35,7 @@
    "account/favourites": "Von %1 favorisierte Beiträge",
    "account/settings": "Benutzer-Einstellungen",
    "account/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:"
+    "maintenance.text": "%1 befindet sich derzeit in der Wartung. Bitte komme später wieder.",
+    "maintenance.messageIntro": "Zusätzlich hat der Administrator diese Nachricht hinterlassen:",
+    "throttled.text": "%1 ist momentan aufgrund von Überlastung nicht verfügbar. Bitte komm später wieder."
 }
--- a/public/language/de/tags.json
+++ b/public/language/de/tags.json
@@ -1,7 +1,7 @@
 {
-    "no_tag_topics": "Es gibt keine Themen mit diesem Stichwort.",
-    "tags": "Stichwörter",
-    "enter_tags_here": "Gib hier Stichwörter ein. %1-%2 Zeichen. Drücke Enter nach jedem Stichwort",
-    "enter_tags_here_short": "Gib Stichwörter ein...",
-    "no_tags": "Es gibt bisher keine Stichwörter."
+    "no_tag_topics": "Es gibt keine Themen mit diesem Schlagwort.",
+    "tags": "Schlagworte",
+    "enter_tags_here": "Hier Schlagworte eingeben. Jeweils %1 bis %2 Zeichen.",
+    "enter_tags_here_short": "Schlagworte eingeben...",
+    "no_tags": "Es gibt noch keine Schlagworte."
 }
--- a/public/language/de/topic.json
+++ b/public/language/de/topic.json
@@ -25,9 +25,8 @@
    "tools": "Werkzeuge",
    "flag": "Markieren",
    "locked": "Gesperrt",
-    "bookmark_instructions": "Klicke hier, um zur letzten Position zurückzukehren oder schließe zum Abbrechen.",
+    "bookmark_instructions": "Klicke hier um zum letzten ungelesenen Beitrag in diesem Thema zu springen.",
    "flag_title": "Diesen Beitrag zur Moderation markieren",
-    "flag_confirm": "Sind Sie sicher, dass Sie diesen Post markieren möchten?",
    "flag_success": "Dieser Beitrag wurde erfolgreich für die Moderation markiert.",
    "deleted_message": "Dieses Thema wurde gelöscht. Nur Nutzer mit entsprechenden Rechten können es sehen.",
    "following_topic.message": "Du erhälst nun eine Benachrichtigung, wenn jemand einen Beitrag zu diesem Thema verfasst.",
@@ -96,5 +95,13 @@
    "oldest_to_newest": "Älteste zuerst",
    "newest_to_oldest": "Neuste zuerst",
    "most_votes": "Die meisten Stimmen",
-    "most_posts": "Die meisten Beiträge"
+    "most_posts": "Die meisten Beiträge",
+    "stale.title": "Stattdessen ein neues Thema erstellen?",
+    "stale.warning": "Das Thema auf das du antworten möchtest ist ziemlich alt. Möchtest du stattdessen ein neues Thema erstellen und auf dieses in deiner Antwort hinweisen?",
+    "stale.create": "Ein neues Thema erstellen",
+    "stale.reply_anyway": "Auf dieses Thema trotzdem antworten",
+    "stale.link_back": "Re: [%1](%2)",
+    "spam": "Spam",
+    "offensive": "Beleidigend",
+    "custom-flag-reason": "Gib einen Grund für die Markierung ein"
 }
--- a/public/language/de/user.json
+++ b/public/language/de/user.json
@@ -1,5 +1,5 @@
 {
-    "banned": "Gebannt",
+    "banned": "Gesperrt",
    "offline": "offline",
    "username": "Nutzername",
    "joindate": "Registriert vor",
@@ -12,7 +12,7 @@
    "delete_account": "Konto löschen",
    "delete_account_confirm": "Bist du sicher, dass du dein Konto löschen möchtest? <br /><strong>Diese Aktion kann nicht rückgängig gemacht werden und du kannst deine Daten nicht wiederherstellen</strong><br /><br />Gebe deinen Benutzernamen ein, um zu bestätigen, dass du dieses Konto löschen möchtest.",
    "delete_this_account_confirm": "Bist du sicher, dass du dieses Konto löschen möchtest?<br /><strong>Diese Aktion kann nicht rückgangig gemacht werden und du kannst die Daten nicht wiederherstellen</strong><br /><br />",
-    "account-deleted": "Account deleted",
+    "account-deleted": "Account gelöscht",
    "fullname": "Kompletter Name",
    "website": "Homepage",
    "location": "Wohnort",
@@ -24,19 +24,22 @@
    "reputation": "Reputation",
    "favourites": "Favoriten",
    "watched": "Beobachtet",
-    "followers": "Folger",
-    "following": "Folgt",
+    "followers": "Follower",
+    "following": "Folge ich",
    "aboutme": "Über mich",
    "signature": "Signatur",
-    "gravatar": "Gravatar",
    "birthday": "Geburtstag",
    "chat": "Chat",
+    "chat_with": "Chat mit %1",
    "follow": "Folgen",
    "unfollow": "Nicht mehr folgen",
    "more": "Mehr",
    "profile_update_success": "Profil erfolgreich aktualisiert!",
    "change_picture": "Profilbild ändern",
+    "change_username": "Benutzernamen ändern",
+    "change_email": "E-Mail ändern",
    "edit": "Ändern",
+    "default_picture": "Standardsymbol",
    "uploaded_picture": "Hochgeladene Bilder",
    "upload_new_picture": "Neues Bild hochladen",
    "upload_new_picture_from_url": "Neues Bild von URL hochladen",
@@ -51,10 +54,11 @@
    "confirm_password": "Passwort wiederholen",
    "password": "Passwort",
    "username_taken_workaround": "Der gewünschte Benutzername ist bereits vergeben, deshalb haben wir ihn ein wenig verändert. Du bist jetzt unter dem Namen <strong>%1</strong> bekannt.",
+    "password_same_as_username": "Dein Passwort entspricht deinem Benutzernamen, bitte wähle ein anderes Passwort.",
    "upload_picture": "Bild hochladen",
    "upload_a_picture": "Ein Bild hochladen",
-    "remove_uploaded_picture": "Remove Uploaded Picture",
-    "image_spec": "Sie dürfen nur Dateien vom Typ PNG, JPG oder GIF hochladen",
+    "remove_uploaded_picture": "Hochgeladenes Bild entfernen",
+    "image_spec": "Du solltest nur PNG-, JPG- oder BMP-Dateien hochladen",
    "settings": "Einstellungen",
    "show_email": "Zeige meine E-Mail Adresse an.",
    "show_fullname": "Zeige meinen kompletten Namen an",
@@ -87,5 +91,13 @@
    "follow_topics_you_create": "Themen folgen, die du erstellst",
    "grouptitle": "Wähle den anzuzeigenden Gruppen Titel aus",
    "no-group-title": "Kein Gruppentitel",
-    "select-skin": "Einen Skin auswählen"
+    "select-skin": "Einen Skin auswählen",
+    "select-homepage": "Eine Startseite auswählen",
+    "homepage": "Startseite",
+    "homepage_description": "Wähle eine Seite die als Forumstartseite benutzt werden soll aus oder 'Keine' um die Standardstartseite zu verwenden.",
+    "custom_route": "Eigener Startseitenpfad",
+    "custom_route_help": "Gib hier einen Pfadnamen ohne vorangehenden Slash ein (z.B. \"recent\" oder \"popular\")",
+    "sso.title": "Einmalanmeldungsdienste",
+    "sso.associated": "Verbunden mit",
+    "sso.not-associated": "Hier klicken um Dich mit %1 zu verbinden"
 }
--- a/public/language/de/users.json
+++ b/public/language/de/users.json
@@ -1,5 +1,5 @@
 {
-    "latest_users": "neuste Benutzer",
+    "latest_users": "Neuste Benutzer",
    "top_posters": "meiste Beiträge",
    "most_reputation": "höchstes Ansehen",
    "search": "Suchen",
@@ -16,6 +16,6 @@
    "popular_topics": "Beliebte Themen",
    "unread_topics": "Ungelesen Themen",
    "categories": "Kategorien",
-    "tags": "Stichwörter",
+    "tags": "Schlagworte",
    "map": "Karte"
 }
--- a/public/language/el/category.json
+++ b/public/language/el/category.json
@@ -11,5 +11,6 @@
    "watch": "Watch",
    "ignore": "Αγνόηση",
    "watch.message": "You are now watching updates from this category",
-    "ignore.message": "You are now ignoring updates from this category"
+    "ignore.message": "You are now ignoring updates from this category",
+    "watched-categories": "Watched categories"
 }
--- a/public/language/el/error.json
+++ b/public/language/el/error.json
@@ -33,7 +33,6 @@
    "no-user": "User does not exist",
    "no-teaser": "Teaser does not exist",
    "no-privileges": "You do not have enough privileges for this action.",
-    "no-emailers-configured": "Δεν έχουν φορτωθεί email plugins, οποτε το δοκιμαστικό email δεν μπορεί να σταλθεί",
    "category-disabled": "Η κατηγορία έχει απενεργοποιηθεί",
    "topic-locked": "Το θέμα έχει κλειδωθεί",
    "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
@@ -49,7 +48,6 @@
    "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
    "too-many-tags": "Too many tags. Topics can't have more than %1 tag(s)",
    "file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
-    "cant-vote-self-post": "Δεν μπορείς να ψηφίσεις την δημοσίευσή σου",
    "already-favourited": "You have already favourited this post",
    "already-unfavourited": "You have already unfavourited this post",
    "cant-ban-other-admins": "Δεν μπορείς να αποκλείσεις άλλους διαχειριστές!",
@@ -60,7 +58,8 @@
    "group-name-too-short": "Το όνομα της ομάδας είναι πολύ μικρό",
    "group-already-exists": "Το όνομα της ομάδας υπάρχει ήδη",
    "group-name-change-not-allowed": "Αλλαγή του ονόματος της ομάδας δεν επιτρέπεται",
-    "group-already-member": "You are already part of this group",
+    "group-already-member": "Already part of this group",
+    "group-not-member": "Not a member of this group",
    "group-needs-owner": "This group requires at least one owner",
    "group-already-invited": "This user has already been invited",
    "group-already-requested": "Your membership request has already been submitted",
@@ -79,6 +78,7 @@
    "too-many-messages": "You have sent too many messages, please wait awhile.",
    "invalid-chat-message": "Invalid chat message",
    "chat-message-too-long": "Chat message is too long",
+    "cant-edit-chat-message": "You are not allowed to edit this message",
    "reputation-system-disabled": "Το σύστημα φήμης έχει απενεργοποιηθεί.",
    "downvoting-disabled": "Η καταψήφιση έχει απενεργοποιηθεί",
    "not-enough-reputation-to-downvote": "Δεν έχεις αρκετή φήμη για να καταψηφίσεις αυτή την δημοσίευση",
--- a/public/language/el/global.json
+++ b/public/language/el/global.json
@@ -56,9 +56,11 @@
    "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": "posted in %1",
+    "posted_in_by": "posted in %1 by %2",
    "posted_in_ago": "δημοσιεύτηκε στο %1 πριν από %2",
+    "posted_in_ago_by": "δημοσιεύτηκε στο %1 πριν από %2 από τον/την %3",
+    "posted_in_ago_by_guest": "δημοσιεύτηκε στο %1 πριν από %2 από Επισκέπτη",
    "replied_ago": "απαντήθηκε πριν από %1",
    "user_posted_ago": "Ο/Η %1 δημοσίευσε πριν από %2",
    "guest_posted_ago": "Επισκέπτης δημοσίευσε πριν από %1",
@@ -80,5 +82,6 @@
    "privacy": "Privacy",
    "follow": "Follow",
    "unfollow": "Unfollow",
-    "delete_all": "Delete All"
+    "delete_all": "Delete All",
+    "map": "Map"
 }
--- a/public/language/el/groups.json
+++ b/public/language/el/groups.json
@@ -15,8 +15,6 @@
    "invited.notification_title": "You have been invited to join <strong>%1</strong>",
    "request.notification_title": "Group Membership Request from <strong>%1</strong>",
    "request.notification_text": "<strong>%1</strong> has requested to become a member of <strong>%2</strong>",
-    "cover-instructions": "Drag and Drop a photo, drag to position, and hit <strong>Save</strong>",
-    "cover-change": "Change",
    "cover-save": "Save",
    "cover-saving": "Saving",
    "details.title": "Λεπτομέρειες Ομάδας",
--- a/public/language/el/modules.json
+++ b/public/language/el/modules.json
@@ -15,6 +15,7 @@
    "chat.seven_days": "7 Ημέρες",
    "chat.thirty_days": "30 Ημέρες",
    "chat.three_months": "3 Μήνες",
+    "chat.delete_message_confirm": "Are you sure you wish to delete this message?",
    "composer.compose": "Compose",
    "composer.show_preview": "Show Preview",
    "composer.hide_preview": "Hide Preview",
@@ -23,7 +24,11 @@
    "composer.discard": "Είσαι σίγουρος/η πως θέλεις να πετάξεις αυτή την δημοσίευση;",
    "composer.submit_and_lock": "Submit and Lock",
    "composer.toggle_dropdown": "Toggle Dropdown",
+    "composer.uploading": "Uploading %1",
    "bootbox.ok": "OK",
    "bootbox.cancel": "Cancel",
-    "bootbox.confirm": "Confirm"
+    "bootbox.confirm": "Confirm",
+    "cover.dragging_title": "Cover Photo Positioning",
+    "cover.dragging_message": "Drag the cover photo to the desired position and click \"Save\"",
+    "cover.saved": "Cover photo image and position saved"
 }
--- a/public/language/el/notifications.json
+++ b/public/language/el/notifications.json
@@ -12,14 +12,23 @@
    "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> μετακίνησε το θέμα σου.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
+    "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
+    "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
    "favourited_your_post_in": "Η δημοσίευσή σου στο <strong>%2</strong> αρέσει στον/ην <strong>%1</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
    "user_flagged_post_in": "Ο/Η <strong>%1</strong> επεσήμανε μια δημοσίευσή σου στο <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
    "user_posted_to": "Ο/Η <strong>%1</strong> έγραψε μια απάντηση στο: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
    "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
-    "user_mentioned_you_in": "Ο/Η <strong>%1</strong> σε ανέφερε στο <strong>%2</strong>",
    "user_started_following_you": "Ο/Η <strong>%1</strong> σε ακολουθεί.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
    "new_register": "<strong>%1</strong> sent a registration request.",
    "email-confirmed": "Το Εmail Επιβεβαιώθηκε",
    "email-confirmed-message": "Ευχαριστούμε που επιβεβαίωσες το email σου. Ο λογαριασμός σου είναι πλέον πλήρως ενεργοποιημένος.",
--- a/public/language/el/pages.json
+++ b/public/language/el/pages.json
@@ -24,6 +24,9 @@
    "chats": "Chats",
    "chat": "Chatting with %1",
    "account/edit": "Editing \"%1\"",
+    "account/edit/password": "Editing password of \"%1\"",
+    "account/edit/username": "Editing username of \"%1\"",
+    "account/edit/email": "Editing email of \"%1\"",
    "account/following": "People %1 follows",
    "account/followers": "People who follow %1",
    "account/posts": "Posts made by %1",
@@ -33,5 +36,6 @@
    "account/settings": "User Settings",
    "account/watched": "Topics watched by %1",
    "maintenance.text": "Το %1 αυτή την στιγμή συντηρείται. Παρακαλώ έλα αργότερα.",
-    "maintenance.messageIntro": "Additionally, the administrator has left this message:"
+    "maintenance.messageIntro": "Additionally, the administrator has left this message:",
+    "throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
 }
--- a/public/language/el/topic.json
+++ b/public/language/el/topic.json
@@ -25,9 +25,8 @@
    "tools": "Εργαλεία",
    "flag": "Σημαία",
    "locked": "Κλειδωμένο",
-    "bookmark_instructions": "Κάνε κλικ εδώ για να επιστρέψεις στην τελευταία σου θέση ή κλείστο για να το πετάξεις.",
+    "bookmark_instructions": "Click here to return to the last unread post in this thread.",
    "flag_title": "Επισήμανση αυτής της δημοσίευσης για συντονισμό",
-    "flag_confirm": "Είσαι σίγουρος/η πως θες να επισημάνεις αυτή την δημοσίευση;",
    "flag_success": "Αυτή η δημοσίευση έχει επισημανθεί για συντονισμό.",
    "deleted_message": "Το θέμα αυτό έχει διαγραφεί. Μόνο οι χρήστες με δικαιώματα διαχειριστή θεμάτων μπορούν να το δουν.",
    "following_topic.message": "Θα λαμβάνεις ειδοποιήσεις όποτε κάποιος δημοσιεύει κάτι σε αυτό το θέμα.",
@@ -96,5 +95,13 @@
    "oldest_to_newest": "Παλαιότερο προς Νεότερο",
    "newest_to_oldest": "Νεότερο προς Παλαιότερο",
    "most_votes": "Περισσότερες ψήφοι",
-    "most_posts": "Most posts"
+    "most_posts": "Most posts",
+    "stale.title": "Create new topic instead?",
+    "stale.warning": "The topic you are replying to is quite old. Would you like to create a new topic instead, and reference this one in your reply?",
+    "stale.create": "Create a new topic",
+    "stale.reply_anyway": "Reply to this topic anyway",
+    "stale.link_back": "Re: [%1](%2)",
+    "spam": "Spam",
+    "offensive": "Offensive",
+    "custom-flag-reason": "Enter a flagging reason"
 }
--- a/public/language/el/user.json
+++ b/public/language/el/user.json
@@ -28,15 +28,18 @@
    "following": "Ακολουθά",
    "aboutme": "About me",
    "signature": "Υπογραφή",
-    "gravatar": "Gravatar",
    "birthday": "Γενέθλια",
    "chat": "Συνομιλία",
+    "chat_with": "Chat with %1",
    "follow": "Ακολούθησε",
    "unfollow": "Μην Ακολουθείς",
    "more": "More",
    "profile_update_success": "Το προφίλ ανανεώθηκε επιτυχώς!",
    "change_picture": "Αλλαγή Φωτογραφίας",
+    "change_username": "Change Username",
+    "change_email": "Change Email",
    "edit": "Επεξεργασία",
+    "default_picture": "Default Icon",
    "uploaded_picture": "Ανεβασμένη Φωτογραφία",
    "upload_new_picture": "Ανέβασμα Νέας Φωτογραφίας",
    "upload_new_picture_from_url": "Ανέβασμα Νέας Φωτογραφίας από URL",
@@ -51,10 +54,11 @@
    "confirm_password": "Επιβεβαίωση Κωδικού",
    "password": "Κωδικός",
    "username_taken_workaround": "Το όνομα χρήστη που ζήτησες χρησιμοποιείται ήδη, οπότε το τροποποιήσαμε λίγο. Πλέον είσαι γνωστός/ή ώς <strong>%1</strong>",
+    "password_same_as_username": "Your password is the same as your username, please select another password.",
    "upload_picture": "Ανέβασμα φωτογραφίας",
    "upload_a_picture": "Ανέβασε μια φωτογραφία",
    "remove_uploaded_picture": "Remove Uploaded Picture",
-    "image_spec": "Μπορείς να ανεβάσεις αρχεία τύπου PNG, JPG ή GIF μόνο",
+    "image_spec": "You may only upload PNG, JPG, or BMP files",
    "settings": "Επιλογές",
    "show_email": "Εμφάνιση του email μου",
    "show_fullname": "Show My Full Name",
@@ -87,5 +91,13 @@
    "follow_topics_you_create": "Follow topics you create",
    "grouptitle": "Select the group title you would like to display",
    "no-group-title": "No group title",
-    "select-skin": "Select a Skin"
+    "select-skin": "Select a Skin",
+    "select-homepage": "Select a Homepage",
+    "homepage": "Homepage",
+    "homepage_description": "Select a page to use as the forum homepage or 'None' to use the default homepage.",
+    "custom_route": "Custom Homepage Route",
+    "custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
+    "sso.title": "Single Sign-on Services",
+    "sso.associated": "Associated with",
+    "sso.not-associated": "Click here to associate with"
 }
--- a/public/language/en@pirate/category.json
+++ b/public/language/en@pirate/category.json
@@ -11,5 +11,6 @@
    "watch": "Watch",
    "ignore": "Ignore",
    "watch.message": "You are now watching updates from this category",
-    "ignore.message": "You are now ignoring updates from this category"
+    "ignore.message": "You are now ignoring updates from this category",
+    "watched-categories": "Watched categories"
 }
--- a/public/language/en@pirate/error.json
+++ b/public/language/en@pirate/error.json
@@ -33,7 +33,6 @@
    "no-user": "User does not exist",
    "no-teaser": "Teaser does not exist",
    "no-privileges": "You do not have enough privileges for this action.",
-    "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
    "category-disabled": "Category disabled",
    "topic-locked": "Topic Locked",
    "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
@@ -49,7 +48,6 @@
    "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
    "too-many-tags": "Too many tags. Topics can't have more than %1 tag(s)",
    "file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
-    "cant-vote-self-post": "You cannot vote for your own post",
    "already-favourited": "You have already favourited this post",
    "already-unfavourited": "You have already unfavourited this post",
    "cant-ban-other-admins": "You can't ban other admins!",
@@ -60,7 +58,8 @@
    "group-name-too-short": "Group name too short",
    "group-already-exists": "Group already exists",
    "group-name-change-not-allowed": "Group name change not allowed",
-    "group-already-member": "You are already part of this group",
+    "group-already-member": "Already part of this group",
+    "group-not-member": "Not a member of this group",
    "group-needs-owner": "This group requires at least one owner",
    "group-already-invited": "This user has already been invited",
    "group-already-requested": "Your membership request has already been submitted",
@@ -79,6 +78,7 @@
    "too-many-messages": "You have sent too many messages, please wait awhile.",
    "invalid-chat-message": "Invalid chat message",
    "chat-message-too-long": "Chat message is too long",
+    "cant-edit-chat-message": "You are not allowed to edit this message",
    "reputation-system-disabled": "Reputation system is disabled.",
    "downvoting-disabled": "Downvoting is disabled",
    "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",
--- a/public/language/en@pirate/global.json
+++ b/public/language/en@pirate/global.json
@@ -56,9 +56,11 @@
    "posted_ago_by_guest": "posted %1 by Guest",
    "posted_ago_by": "posted %1 by %2",
    "posted_ago": "posted %1",
-    "posted_in_ago_by_guest": "posted in %1 %2 by Guest",
-    "posted_in_ago_by": "posted in %1 %2 by %3",
+    "posted_in": "posted in %1",
+    "posted_in_by": "posted in %1 by %2",
    "posted_in_ago": "posted in %1 %2",
+    "posted_in_ago_by": "posted in %1 %2 by %3",
+    "posted_in_ago_by_guest": "posted in %1 %2 by Guest",
    "replied_ago": "replied %1",
    "user_posted_ago": "%1 posted %2",
    "guest_posted_ago": "Guest posted %1",
@@ -80,5 +82,6 @@
    "privacy": "Privacy",
    "follow": "Follow",
    "unfollow": "Unfollow",
-    "delete_all": "Delete All"
+    "delete_all": "Delete All",
+    "map": "Map"
 }
--- a/public/language/en@pirate/groups.json
+++ b/public/language/en@pirate/groups.json
@@ -15,8 +15,6 @@
    "invited.notification_title": "You have been invited to join <strong>%1</strong>",
    "request.notification_title": "Group Membership Request from <strong>%1</strong>",
    "request.notification_text": "<strong>%1</strong> has requested to become a member of <strong>%2</strong>",
-    "cover-instructions": "Drag and Drop a photo, drag to position, and hit <strong>Save</strong>",
-    "cover-change": "Change",
    "cover-save": "Save",
    "cover-saving": "Saving",
    "details.title": "Group Details",
--- a/public/language/en@pirate/modules.json
+++ b/public/language/en@pirate/modules.json
@@ -15,6 +15,7 @@
    "chat.seven_days": "7 Days",
    "chat.thirty_days": "30 Days",
    "chat.three_months": "3 Months",
+    "chat.delete_message_confirm": "Are you sure you wish to delete this message?",
    "composer.compose": "Compose",
    "composer.show_preview": "Show Preview",
    "composer.hide_preview": "Hide Preview",
@@ -23,7 +24,11 @@
    "composer.discard": "Are you sure you wish to discard this post?",
    "composer.submit_and_lock": "Submit and Lock",
    "composer.toggle_dropdown": "Toggle Dropdown",
+    "composer.uploading": "Uploading %1",
    "bootbox.ok": "OK",
    "bootbox.cancel": "Cancel",
-    "bootbox.confirm": "Confirm"
+    "bootbox.confirm": "Confirm",
+    "cover.dragging_title": "Cover Photo Positioning",
+    "cover.dragging_message": "Drag the cover photo to the desired position and click \"Save\"",
+    "cover.saved": "Cover photo image and position saved"
 }
--- a/public/language/en@pirate/notifications.json
+++ b/public/language/en@pirate/notifications.json
@@ -12,14 +12,23 @@
    "you_have_unread_notifications": "You have unread notifications.",
    "new_message_from": "New message from <strong>%1</strong>",
    "upvoted_your_post_in": "<strong>%1</strong> has upvoted your post in <strong>%2</strong>.",
-    "moved_your_post": "<strong>%1</strong> has moved your post.",
-    "moved_your_topic": "<strong>%1</strong> has moved your topic.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
+    "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
+    "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
    "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
    "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
    "user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
    "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
-    "user_mentioned_you_in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
    "user_started_following_you": "<strong>%1</strong> started following you.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
    "new_register": "<strong>%1</strong> sent a registration request.",
    "email-confirmed": "Email Confirmed",
    "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
--- a/public/language/en@pirate/pages.json
+++ b/public/language/en@pirate/pages.json
@@ -24,6 +24,9 @@
    "chats": "Chats",
    "chat": "Chatting with %1",
    "account/edit": "Editing \"%1\"",
+    "account/edit/password": "Editing password of \"%1\"",
+    "account/edit/username": "Editing username of \"%1\"",
+    "account/edit/email": "Editing email of \"%1\"",
    "account/following": "People %1 follows",
    "account/followers": "People who follow %1",
    "account/posts": "Posts made by %1",
@@ -33,5 +36,6 @@
    "account/settings": "User Settings",
    "account/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:"
+    "maintenance.messageIntro": "Additionally, the administrator has left this message:",
+    "throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
 }
--- a/public/language/en@pirate/topic.json
+++ b/public/language/en@pirate/topic.json
@@ -25,9 +25,8 @@
    "tools": "Tools",
    "flag": "Flag",
    "locked": "Locked",
-    "bookmark_instructions": "Click here to return to your last position or close to discard.",
+    "bookmark_instructions": "Click here to return to the last unread post in this thread.",
    "flag_title": "Flag this post for moderation",
-    "flag_confirm": "Are you sure you want to flag this post?",
    "flag_success": "This post has been flagged for moderation.",
    "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
    "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
@@ -96,5 +95,13 @@
    "oldest_to_newest": "Oldest to Newest",
    "newest_to_oldest": "Newest to Oldest",
    "most_votes": "Most votes",
-    "most_posts": "Most posts"
+    "most_posts": "Most posts",
+    "stale.title": "Create new topic instead?",
+    "stale.warning": "The topic you are replying to is quite old. Would you like to create a new topic instead, and reference this one in your reply?",
+    "stale.create": "Create a new topic",
+    "stale.reply_anyway": "Reply to this topic anyway",
+    "stale.link_back": "Re: [%1](%2)",
+    "spam": "Spam",
+    "offensive": "Offensive",
+    "custom-flag-reason": "Enter a flagging reason"
 }
--- a/public/language/en@pirate/user.json
+++ b/public/language/en@pirate/user.json
@@ -28,15 +28,18 @@
    "following": "Following",
    "aboutme": "About me",
    "signature": "Signature",
-    "gravatar": "Gravatar",
    "birthday": "Birthday",
    "chat": "Chat",
+    "chat_with": "Chat with %1",
    "follow": "Follow",
    "unfollow": "Unfollow",
    "more": "More",
    "profile_update_success": "Profile has been updated successfully!",
    "change_picture": "Change Picture",
+    "change_username": "Change Username",
+    "change_email": "Change Email",
    "edit": "Edit",
+    "default_picture": "Default Icon",
    "uploaded_picture": "Uploaded Picture",
    "upload_new_picture": "Upload New Picture",
    "upload_new_picture_from_url": "Upload New Picture From URL",
@@ -51,10 +54,11 @@
    "confirm_password": "Confirm Password",
    "password": "Password",
    "username_taken_workaround": "The username you requested was already taken, so we have altered it slightly. You are now known as <strong>%1</strong>",
+    "password_same_as_username": "Your password is the same as your username, please select another password.",
    "upload_picture": "Upload picture",
    "upload_a_picture": "Upload a picture",
    "remove_uploaded_picture": "Remove Uploaded Picture",
-    "image_spec": "You may only upload PNG, JPG, or GIF files",
+    "image_spec": "You may only upload PNG, JPG, or BMP files",
    "settings": "Settings",
    "show_email": "Show My Email",
    "show_fullname": "Show My Full Name",
@@ -87,5 +91,13 @@
    "follow_topics_you_create": "Follow topics you create",
    "grouptitle": "Select the group title you would like to display",
    "no-group-title": "No group title",
-    "select-skin": "Select a Skin"
+    "select-skin": "Select a Skin",
+    "select-homepage": "Select a Homepage",
+    "homepage": "Homepage",
+    "homepage_description": "Select a page to use as the forum homepage or 'None' to use the default homepage.",
+    "custom_route": "Custom Homepage Route",
+    "custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
+    "sso.title": "Single Sign-on Services",
+    "sso.associated": "Associated with",
+    "sso.not-associated": "Click here to associate with"
 }
--- a/public/language/en_GB/category.json
+++ b/public/language/en_GB/category.json
@@ -15,5 +15,7 @@
 	"ignore": "Ignore",

 	"watch.message": "You are now watching updates from this category",
-	"ignore.message": "You are now ignoring updates from this category"
+	"ignore.message": "You are now ignoring updates from this category",
+
+	"watched-categories": "Watched categories"
 }
--- a/public/language/en_GB/error.json
+++ b/public/language/en_GB/error.json
@@ -41,7 +41,6 @@
 	"no-user": "User does not exist",
 	"no-teaser": "Teaser does not exist",
 	"no-privileges": "You do not have enough privileges for this action.",
-	"no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",

 	"category-disabled": "Category disabled",

@@ -63,7 +62,6 @@

 	"file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",

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

@@ -77,7 +75,8 @@
 	"group-name-too-short": "Group name too short",
 	"group-already-exists": "Group already exists",
 	"group-name-change-not-allowed": "Group name change not allowed",
-	"group-already-member": "You are already part of this group",
+	"group-already-member": "Already part of this group",
+	"group-not-member": "Not a member of this group",
 	"group-needs-owner": "This group requires at least one owner",
 	"group-already-invited": "This user has already been invited",
 	"group-already-requested": "Your membership request has already been submitted",
@@ -102,6 +101,7 @@
 	"too-many-messages": "You have sent too many messages, please wait awhile.",
 	"invalid-chat-message": "Invalid chat message",
 	"chat-message-too-long": "Chat message is too long",
+	"cant-edit-chat-message": "You are not allowed to edit this message",

 	"reputation-system-disabled": "Reputation system is disabled.",
 	"downvoting-disabled": "Downvoting is disabled",
@@ -114,5 +114,7 @@
 	"registration-error": "Registration Error",
 	"parse-error": "Something went wrong while parsing server response",
 	"wrong-login-type-email": "Please use your email to login",
-	"wrong-login-type-username": "Please use your username to login"
-}
+	"wrong-login-type-username": "Please use your username to login",
+
+	"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2)."
+}
--- a/Show More
+++ b/Show More