0.9.0

As I did not realise both groups and users call the same
coverPhoto lib, the removeFn has to be in the user client js,
and not in the coverPhoto lib.

... of course, it *could* be in there, but it would be hacky.

.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/*"

.gitignore

@@ -41,3 +41,7 @@ pidfile
 ## File-based project format:
 *.ipr
 *.iws
+
+## Transifex
+tx.exe
+.transifexrc

.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

.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:

.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

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.
 

app.js

@@ -23,15 +23,14 @@
 var nconf = require('nconf');
 nconf.argv().env('__');
 
-var fs = require('fs'),
+var url = require('url'),
-	os = require('os'),
-	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'),
+var	configFile = path.join(__dirname, '/config.json');
-	configExists;
 
 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) {
+var configExists = file.existsSync(configFile);
-	start();
+
-} else if (nconf.get('setup') || nconf.get('install')) {
+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() {
+function activate() {
-	loadConfig();
-
 	require('./src/database').init(function(err) {
-		if (err) {
+		var plugin = nconf.get('activate'),
-			winston.error(err.message);
+			db = require('./src/database');
-			process.exit();
-		}
 
-		if (nconf.get('t')) {
+		winston.info('Activating plugin %s', plugin);
-			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');
 
-			process.stdout.write('\nPlugin reset flag (-p) can take a single argument\n');
+		db.sortedSetAdd('plugins:active', 0, plugin, start);
-			process.stdout.write('    e.g. ./nodebb reset -p nodebb-plugin-mentions\n');
-			process.exit();
-		}
 	});
 }
 
-function resetSettings(callback) {
+function listPlugins() {
-	var meta = require('./src/meta');
+	require('./src/database').init(function(err) {
-	meta.configs.set('allowLocalLogin', 1, function(err) {
-		winston.info('[reset] Settings reset to default');
-		if (typeof callback === 'function') {
-			callback(err);
-		} else {
-			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);
-		}
 
+		db.getSortedSetRange('plugins:active', 0, -1, function(err, plugins) {
+			winston.info('Active plugins: \n\t - ' + plugins.join('\n\t - '));
 			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.');

install/data/defaults.json

@@ -15,6 +15,7 @@
     "allowLocalLogin": 1,
     "allowAccountDelete": 1,
     "allowFileUploads": 0,
+    "allowUserHomePage": 1,
     "maximumFileSize": 2048,
     "minimumTitleLength": 3,
     "maximumTitleLength": 255,

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);

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');
 	});
 
+	async.filter(scripts, file.exists, function(scripts) {
 		if (minify) {
-		minifyScripts(scripts, function() {
+			minifyScripts(scripts, callback);
-			callback.apply(this, arguments);
-		});
 		} 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 + ';');

nodebb

@@ -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'),
+	async = require('async');
-	touch = require('touch');
 
 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, {
+	case 'activate':
-			cwd: __dirname,
+		var args = process.argv.slice(0);
-			silent: false
+		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!',
+				var message = 'NodeBB Upgrade Complete!';
-					spaces = new Array(Math.floor(process.stdout.columns / 2) - (message.length / 2) + 1).join(' ');
+				// 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,6 +170,8 @@ 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');

package.json

@@ -2,7 +2,7 @@
   "name": "nodebb",
   "license": "GPL-3.0",
   "description": "NodeBB Forum",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "homepage": "http://www.nodebb.org",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "async": "~1.4.2",
-    "bcryptjs": "~2.2.1",
+    "bcryptjs": "~2.3.0",
     "body-parser": "^1.9.0",
     "colors": "^1.1.0",
     "compression": "^1.1.0",
@@ -30,28 +30,29 @@
     "express-session": "^1.8.2",
     "gravatar": "^1.1.0",
     "heapdump": "^0.3.0",
+    "jimp": "^0.2.5",
     "less": "^2.0.0",
     "logrotate-stream": "^0.2.3",
     "lru-cache": "^2.6.1",
-    "lwip": "0.0.7",
     "mime": "^1.3.4",
     "minimist": "^1.1.1",
     "mkdirp": "~0.5.0",
     "mmmagic": "^0.4.0",
     "morgan": "^1.3.2",
-    "nconf": "~0.7.1",
+    "nconf": "~0.8.2",
-    "nodebb-plugin-composer-default": "1.0.14",
+    "nodebb-plugin-composer-default": "1.0.20",
-    "nodebb-plugin-dbsearch": "0.2.16",
+    "nodebb-plugin-dbsearch": "0.2.17",
-    "nodebb-plugin-emoji-extended": "0.4.13",
+    "nodebb-plugin-emoji-extended": "0.4.15",
-    "nodebb-plugin-markdown": "4.0.5",
+    "nodebb-plugin-markdown": "4.0.7",
-    "nodebb-plugin-mentions": "1.0.2",
+    "nodebb-plugin-mentions": "1.0.9",
     "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-lavender": "2.0.13",
-    "nodebb-theme-persona": "3.0.12",
+    "nodebb-theme-persona": "4.0.31",
-    "nodebb-theme-vanilla": "4.0.7",
+    "nodebb-theme-vanilla": "5.0.13",
-    "nodebb-widget-essentials": "2.0.1",
+    "nodebb-widget-essentials": "2.0.3",
+    "nodemailer": "0.7.1",
     "npm": "^2.1.4",
     "passport": "^0.3.0",
     "passport-local": "1.0.0",
@@ -61,20 +62,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",
     "string": "^3.0.0",
-    "templates.js": "0.2.10",
+    "templates.js": "0.3.0",
-    "touch": "1.0.0",
+    "toobusy-js": "^0.4.2",
     "uglify-js": "^2.4.24",
     "underscore": "~1.8.3",
     "underscore.deep": "^0.5.1",
     "validator": "^4.0.5",
     "winston": "^1.0.1",
-    "xregexp": "~2.0.0"
+    "xregexp": "~3.0.0"
   },
   "devDependencies": {
     "mocha": "~1.13.0",

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>

public/language/ar/category.json

@@ -11,5 +11,6 @@
     "watch": "متابعة",
     "ignore": "تجاهل",
     "watch.message": "أنت اﻷن متابع لتحديثات هذه الفئة",
-    "ignore.message": "أنت اﻷن تتجاهل تحديثات هذه الفئة"
+    "ignore.message": "أنت اﻷن تتجاهل تحديثات هذه الفئة",
+    "watched-categories": "Watched categories"
 }

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",
@@ -60,7 +59,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",

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": "posted in %1",
-    "posted_in_ago_by": "كتب في %1 %2 من طرف %3",
+    "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"
 }

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": "تفاصيل المجموعة",

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": "الأصدقاء",
@@ -23,7 +23,8 @@
     "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.cancel": "إلغاء",
-    "bootbox.confirm": "Confirm"
+    "bootbox.confirm": "تأكيد"
 }

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,8 +12,8 @@
     "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_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
-    "moved_your_topic": "<strong>%1</strong> نقل موضوعك.",
+    "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> أضاف مشاركتك في <strong>%2</strong> إلى مفضلته.",
     "user_flagged_post_in": "<strong>%1</strong> أشعَرَ بمشاركة مخلة في <strong>%2</strong>",
     "user_posted_to": "<strong>%1</strong> أضاف ردا إلى: <strong>%2</strong>",

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/online": "اﻷعضاء المتصلون",
-    "users/latest": "Latest Users",
+    "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",
+    "categories": "الفئات",
-    "groups": "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. المرجو العودة لاحقًا.",
-    "maintenance.messageIntro": "بالإضافة إلى ذلك، قام مدبر النظام بترك هذه الرسالة:"
+    "maintenance.messageIntro": "بالإضافة إلى ذلك، قام مدبر النظام بترك هذه الرسالة:",
+    "throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
 }

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,9 @@
     "oldest_to_newest": "من الأقدم إلى الأحدث",
     "newest_to_oldest": "من الأحدث إلى الأقدم",
     "most_votes": "الأكثر تصويتًا",
-    "most_posts": "اﻷكثر رداً"
+    "most_posts": "اﻷكثر رداً",
+    "stale_topic_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?",
+    "spam": "Spam",
+    "offensive": "Offensive",
+    "custom-flag-reason": "Enter a flagging reason"
 }

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,6 +54,7 @@
     "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",
@@ -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"
 }

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": "أحدث المواضيع",

public/language/bg/category.json

@@ -11,5 +11,6 @@
     "watch": "Следене",
     "ignore": "Игнориране",
     "watch.message": "Вече следите обновленията в тази категория",
-    "ignore.message": "Вече не следите обновленията в тази категория"
+    "ignore.message": "Вече не следите обновленията в тази категория",
+    "watched-categories": "Следени категории"
 }

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 секунда/и, след като ги пуснете",
@@ -60,7 +59,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": "Този потребител вече е бил поканен",
     "group-already-requested": "Вашата заявка за членство вече е била изпратена",
@@ -77,8 +77,8 @@
     "cant-chat-with-yourself": "Не можете да пишете съобщение на себе си!",
     "chat-restricted": "Този потребител е ограничил съобщенията до себе си. Той трябва първо да Ви последва, преди да можете да си пишете с него.",
     "too-many-messages": "Изпратили сте твърде много съобщения. Моля, изчакайте малко.",
-    "invalid-chat-message": "Invalid chat message",
+    "invalid-chat-message": "Невалидно съобщение",
-    "chat-message-too-long": "Chat message is too long",
+    "chat-message-too-long": "Съобщението е твърде дълго",
     "reputation-system-disabled": "Системата за репутация е изключена.",
     "downvoting-disabled": "Отрицателното гласуване е изключено",
     "not-enough-reputation-to-downvote": "Нямате достатъчно репутация, за да гласувате отрицателно за тази публикация",

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": "публикувано в %1",
-    "posted_in_ago_by": "публикувано в %1 %2 от %3",
+    "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": "Карта"
 }

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>",
+    "invited.notification_title": "Вие бяхте поканен/а да се присъедините към <strong>%1</strong>",
-    "request.notification_title": "Group Membership Request from <strong>%1</strong>",
+    "request.notification_title": "Заявка за членство в групата от <strong>%1</strong>",
-    "request.notification_text": "<strong>%1</strong> has requested to become a member of <strong>%2</strong>",
+    "request.notification_text": "<strong>%1</strong> поиска да стане член на <strong>%2</strong>",
-    "cover-instructions": "Плъзнете снимка, наместете я в предпочитаната позиция и натистнете <strong>Запазване</strong>",
-    "cover-change": "Промяна",
     "cover-save": "Запазване",
     "cover-saving": "Запазване",
     "details.title": "Подробности за групата",

public/language/bg/modules.json

@@ -23,6 +23,7 @@
     "composer.discard": "Сигурни ли сте, че искате да отхвърлите тази публикация?",
     "composer.submit_and_lock": "Публикуване и заключване",
     "composer.toggle_dropdown": "Превключване на падащото меню",
+    "composer.uploading": "Качване на %1",
     "bootbox.ok": "Добре",
     "bootbox.cancel": "Отказ",
     "bootbox.confirm": "Потвърждаване"

public/language/bg/notifications.json

@@ -12,8 +12,8 @@
     "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_post": "<strong>%1</strong> премести публикацията Ви в <strong>%2</strong>",
-    "moved_your_topic": "<strong>%1</strong> премести Ваша тема.",
+    "moved_your_topic": "<strong>%1</strong> премести <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> отбеляза Ваша публикация в <strong>%2</strong> като любима.",
     "user_flagged_post_in": "<strong>%1</strong> докладва Ваша публикация в <strong>%2</strong>",
     "user_posted_to": "<strong>%1</strong> публикува отговор на: <strong>%2</strong>",

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 в момента е недостъпен, поради прекомерно натоварване. Моля, върнете се отново по-късно."
 }

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": "Вече ще получавате известия когато някой публикува коментар в тази тема.",
@@ -96,5 +95,9 @@
     "oldest_to_newest": "Първо най-старите",
     "newest_to_oldest": "Първо най-новите",
     "most_votes": "Най-много гласове",
-    "most_posts": "Най-много публикации"
+    "most_posts": "Най-много публикации",
+    "stale_topic_warning": "Темата, в която отговаряте, е доста стара. Искате ли вместо това да създадете нова и да направите препратка към тази в отговора си?",
+    "spam": "Спам",
+    "offensive": "Обидно",
+    "custom-flag-reason": "Изберете причина за докладване"
 }

public/language/bg/user.json

@@ -12,7 +12,7 @@
     "delete_account": "Изтриване на акаунта",
     "delete_account_confirm": "Сигурни ли сте, че искате да изтриете акаунта си? <br /><strong>Това действие е необратимо и няма да можете да възстановите нищо от данните си</strong><br /><br />Въведете потребителското си име, за да потвърдите, че искате да унищожите този акаунт.",
     "delete_this_account_confirm": "Сигурни ли сте, че искате да изтриете този акаунт? <br /><strong>Това действие е необратимо и няма да можете да възстановите нищо от данните</strong><br /><br />",
-    "account-deleted": "Account deleted",
+    "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,9 +54,10 @@
     "confirm_password": "Потвърдете паролата",
     "password": "Парола",
     "username_taken_workaround": "Потребителското име, което искате, е заето и затова ние го променихме малко. Вие ще се наричате <strong>%1</strong>",
+    "password_same_as_username": "Паролата е същата като потребителското Ви име. Моля, изберете друга парола.",
     "upload_picture": "Качване на снимка",
     "upload_a_picture": "Качване на снимка",
-    "remove_uploaded_picture": "Remove Uploaded Picture",
+    "remove_uploaded_picture": "Премахване на качената снимка",
     "image_spec": "Можете да качвате само PNG, JPG, или GIF файлове",
     "settings": "Настройки",
     "show_email": "Да се показва е-пощата ми",
@@ -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": "Натиснете тук, за да свържете с"
 }

public/language/bn/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"
 }

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",
@@ -60,7 +59,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",

public/language/bn/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": "posted in %1",
-    "posted_in_ago_by": "%3 %1 বিভাগে পোস্ট করেছেন %2",
+    "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": "Map"
 }

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": "গ্রুপের বিস্তারিত",

public/language/bn/modules.json

@@ -23,6 +23,7 @@
     "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"

public/language/bn/notifications.json

@@ -12,8 +12,8 @@
     "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_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
-    "moved_your_topic": "<strong>%1</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>.",
     "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
     "user_posted_to": "<strong>%1</strong> একটি উত্তর দিয়েছেন: <strong>%2</strong>",

public/language/bn/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."
 }

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,9 @@
     "oldest_to_newest": "পুরাতন থেকে নতুন",
     "newest_to_oldest": "নতুন থেকে পুরাতন",
     "most_votes": "সর্বোচ্চ ভোট",
-    "most_posts": "Most posts"
+    "most_posts": "Most posts",
+    "stale_topic_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?",
+    "spam": "Spam",
+    "offensive": "Offensive",
+    "custom-flag-reason": "Enter a flagging reason"
 }

public/language/bn/user.json

@@ -28,15 +28,18 @@
     "following": "যারা আপনাকে অনুসরণ করছে",
     "aboutme": "About me",
     "signature": "স্বাক্ষর",
-    "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,6 +54,7 @@
     "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",
@@ -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"
 }

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

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",
@@ -60,7 +59,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",

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": "posted in %1",
-    "posted_in_ago_by": "posted in %1 %2 by %3",
+    "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"
 }

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

public/language/cs/modules.json

@@ -23,6 +23,7 @@
     "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"

public/language/cs/notifications.json

@@ -12,8 +12,8 @@
     "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_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
-    "moved_your_topic": "<strong>%1</strong> has moved your topic.",
+    "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>.",
     "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
     "user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",

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

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,9 @@
     "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_topic_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?",
+    "spam": "Spam",
+    "offensive": "Offensive",
+    "custom-flag-reason": "Enter a flagging reason"
 }

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,6 +54,7 @@
     "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",
@@ -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"
 }

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

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",
@@ -60,7 +59,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": "Already part of this group",
+    "group-not-member": "Not a member of this group",
     "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",

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": "posted in %1",
-    "posted_in_ago_by": "skrevet i %1 %2 af %3",
+    "posted_in_by": "posted in %1 by %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"
 }

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

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",
@@ -23,7 +23,8 @@
     "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": "Uploading %1",
     "bootbox.ok": "OK",
-    "bootbox.cancel": "Cancel",
+    "bootbox.cancel": "Annuller",
-    "bootbox.confirm": "Confirm"
+    "bootbox.confirm": "Bekræft"
 }

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,8 +12,8 @@
     "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_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
-    "moved_your_topic": "<strong>%1</strong> har flyttet din tråd.",
+    "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> har favoriseret dit indlæg i <strong>%2</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> har anmeldt et indlæg i <strong>%2</strong>",
     "user_posted_to": "<strong>%1</strong> har skrevet et svar til: <strong>%2</strong>",

public/language/da/pages.json

@@ -1,37 +1,41 @@
 {
     "home": "Forside",
     "unread": "Ulæste tråde",
-    "popular-day": "Popular topics today",
+    "popular-day": "Populære tråde i dag",
-    "popular-week": "Popular topics this week",
+    "popular-week": "Populære tråde denne ude",
-    "popular-month": "Popular topics this month",
+    "popular-month": "Populære tråde denne måned",
-    "popular-alltime": "All time popular topics",
+    "popular-alltime": "Top populære tråde",
     "recent": "Seneste tråde",
-    "users/online": "Online Users",
+    "users/online": "Online brugere",
-    "users/latest": "Latest Users",
+    "users/latest": "Seneste brugere",
-    "users/sort-posts": "Users with the most posts",
+    "users/sort-posts": "Brugere med de fleste indlæg",
-    "users/sort-reputation": "Users with the most reputation",
+    "users/sort-reputation": "Brugere med mest omdømme",
-    "users/map": "User Map",
+    "users/map": "Bruger kort",
-    "users/search": "User Search",
+    "users/search": "Bruger søgning",
     "notifications": "Notifikationer",
     "tags": "Tags",
     "tag": "Tråde tagget under \"%1\"",
-    "register": "Register an account",
+    "register": "Registre en konto",
-    "login": "Login to your account",
+    "login": "Login til din konto",
-    "reset": "Reset your account password",
+    "reset": "Nulstil din adgangskode",
-    "categories": "Categories",
+    "categories": "Kategorier",
-    "groups": "Groups",
+    "groups": "Grupper",
-    "group": "%1 group",
+    "group": "%1 gruppe",
     "chats": "Chats",
-    "chat": "Chatting with %1",
+    "chat": "Chatter med %1",
-    "account/edit": "Editing \"%1\"",
+    "account/edit": "Redigere \"%1\"",
-    "account/following": "People %1 follows",
+    "account/edit/password": "Editing password of \"%1\"",
-    "account/followers": "People who follow %1",
+    "account/edit/username": "Editing username of \"%1\"",
-    "account/posts": "Posts made by %1",
+    "account/edit/email": "Editing email of \"%1\"",
-    "account/topics": "Topics created by %1",
+    "account/following": "Personer som %1 følger",
-    "account/groups": "%1's Groups",
+    "account/followers": "Personer som følger %1",
-    "account/favourites": "%1's Favourite Posts",
+    "account/posts": "Indlæg oprettet af %1",
-    "account/settings": "User Settings",
+    "account/topics": "Tråde lavet af %1",
-    "account/watched": "Topics watched by %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 is currently unavailable due to excessive load. Please come back another time."
 }

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": "Click here to return to the last unread post in this thread.",
     "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,9 @@
     "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_topic_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?",
+    "spam": "Spam",
+    "offensive": "Offensive",
+    "custom-flag-reason": "Enter a flagging reason"
 }

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 with %1",
     "follow": "Følg",
     "unfollow": "Følg ikke",
     "more": "Mere",
     "profile_update_success": "Din profil blev opdateret",
     "change_picture": "Skift billede",
+    "change_username": "Change Username",
+    "change_email": "Change Email",
     "edit": "Rediger",
+    "default_picture": "Default Icon",
     "uploaded_picture": "Upload billede",
     "upload_new_picture": "Upload nyt billede",
     "upload_new_picture_from_url": "Upload nyt billede fra URL",
@@ -51,9 +54,10 @@
     "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": "Your password is the same as your username, please select another password.",
     "upload_picture": "Upload billede",
     "upload_a_picture": "Upload et billede",
-    "remove_uploaded_picture": "Remove Uploaded Picture",
+    "remove_uploaded_picture": "Fjern uploaded billede",
     "image_spec": "Du kan kun uploade PNG, JPG eller GIF billeder",
     "settings": "Indstillinger",
     "show_email": "Vis min emailaddresse",
@@ -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": "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"
 }

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

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.",
@@ -60,7 +59,8 @@
     "group-name-too-short": "Gruppenname zu kurz",
     "group-already-exists": "Gruppe existiert bereits",
     "group-name-change-not-allowed": "Du kannst den Namen der Gruppe nicht ändern",
-    "group-already-member": "Du bist bereits Teil dieser Gruppe",
+    "group-already-member": "Already part of this group",
+    "group-not-member": "Not a member of this group",
     "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 +77,8 @@
     "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",
+    "invalid-chat-message": "Ungültige Nachricht",
-    "chat-message-too-long": "Chat message is too long",
+    "chat-message-too-long": "Die Nachricht ist zu lang",
     "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.",

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",
+    "login": "Anmelden",
-    "please_log_in": "Bitte einloggen",
+    "please_log_in": "Bitte anmelden",
-    "logout": "Logout",
+    "logout": "Abmelden",
-    "posting_restriction_info": "Nur registrierte Mitglieder dürfen Beiträge verfassen. Hier klicken zum Einloggen.",
+    "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": "Gesperrt",
-    "alert.banned.message": "Du bist gebannt und wirst nun ausgeloggt.",
+    "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": "posted in %1",
-    "posted_in_ago_by": "Verfasst in %1 %2 von %3",
+    "posted_in_by": "posted in %1 by %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"
 }

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>",
+    "invited.notification_title": "Du wurdest eingeladen <strong>%1</strong> beizutreten.",
-    "request.notification_title": "Group Membership Request from <strong>%1</strong>",
+    "request.notification_title": "Mitgliedsanfrage von <strong>%1</strong>.",
-    "request.notification_text": "<strong>%1</strong> has requested to become a member of <strong>%2</strong>",
+    "request.notification_text": "<strong>%1</strong> möchte Mitglied von <strong>%2</strong> werden.",
-    "cover-instructions": "Foto auf eine Position bewegen, und <strong>Speichern</strong> drücken",
-    "cover-change": "Ändern",
     "cover-save": "Speichern",
     "cover-saving": "Speicherung läuft",
     "details.title": "Gruppendetails",

public/language/de/language.json

@@ -1,5 +1,5 @@
 {
-    "name": "German",
+    "name": "Deutsch",
     "code": "de",
     "dir": "ltr"
 }

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",
@@ -16,13 +16,14 @@
     "chat.thirty_days": "30 Tage",
     "chat.three_months": "3 Monate",
     "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": "Uploading %1",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Abbrechen",
     "bootbox.confirm": "Bestätigen"

public/language/de/notifications.json

@@ -1,7 +1,7 @@
 {
     "title": "Benachrichtigungen",
-    "no_notifs": "Du hast keine neuen Benachrichtigungen",
+    "no_notifs": "Keine neuen Benachrichtigungen",
-    "see_all": "Alle Benachrichtigungen anzeigen",
+    "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,8 +12,8 @@
     "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_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
-    "moved_your_topic": "<strong>%1</strong> hat dein Thema verschoben.",
+    "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> hat deinen Beitrag in <strong>%2</strong> favorisiert.",
     "user_flagged_post_in": "<strong>%1</strong> hat einen Beitrag in </strong>%2</strong> gemeldet",
     "user_posted_to": "<strong>%1</strong> hat auf <strong>%2</strong> geantwortet.",

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,6 +24,9 @@
     "chats": "Chats",
     "chat": "Chatte mit %1",
     "account/edit": "Bearbeite %1",
+    "account/edit/password": "Editing password of \"%1\"",
+    "account/edit/username": "Editing username of \"%1\"",
+    "account/edit/email": "Editing email of \"%1\"",
     "account/following": "Nutzer, die %1 folgt",
     "account/followers": "Nutzer, die %1 folgen",
     "account/posts": "Beiträge von %1",
@@ -33,5 +36,6 @@
     "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.messageIntro": "Zusätzlich hat der Administrator diese Nachricht hinterlassen:",
+    "throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
 }

public/language/de/tags.json

@@ -1,7 +1,7 @@
 {
-    "no_tag_topics": "Es gibt keine Themen mit diesem Stichwort.",
+    "no_tag_topics": "Es gibt keine Themen mit diesem Schlagwort.",
-    "tags": "Stichwörter",
+    "tags": "Schlagworte",
-    "enter_tags_here": "Gib hier Stichwörter ein. %1-%2 Zeichen. Drücke Enter nach jedem Stichwort",
+    "enter_tags_here": "Hier Schlagworte eingeben. Jeweils %1 bis %2 Zeichen.",
-    "enter_tags_here_short": "Gib Stichwörter ein...",
+    "enter_tags_here_short": "Schlagworte eingeben...",
-    "no_tags": "Es gibt bisher keine Stichwörter."
+    "no_tags": "Es gibt noch keine Schlagworte."
 }

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,9 @@
     "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_topic_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?",
+    "spam": "Spam",
+    "offensive": "Offensive",
+    "custom-flag-reason": "Enter a flagging reason"
 }

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",
@@ -28,15 +28,18 @@
     "following": "Folgt",
     "aboutme": "Über mich",
     "signature": "Signatur",
-    "gravatar": "Gravatar",
     "birthday": "Geburtstag",
     "chat": "Chat",
+    "chat_with": "Chat with %1",
     "follow": "Folgen",
     "unfollow": "Nicht mehr folgen",
     "more": "Mehr",
     "profile_update_success": "Profil erfolgreich aktualisiert!",
     "change_picture": "Profilbild ändern",
+    "change_username": "Change Username",
+    "change_email": "Change Email",
     "edit": "Ändern",
+    "default_picture": "Default Icon",
     "uploaded_picture": "Hochgeladene Bilder",
     "upload_new_picture": "Neues Bild hochladen",
     "upload_new_picture_from_url": "Neues Bild von URL hochladen",
@@ -51,9 +54,10 @@
     "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",
+    "remove_uploaded_picture": "Hochgeladenes Bild entfernen",
     "image_spec": "Sie dürfen nur Dateien vom Typ PNG, JPG oder GIF hochladen",
     "settings": "Einstellungen",
     "show_email": "Zeige meine E-Mail Adresse 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": "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": "Einmalanmeldungsdienste",
+    "sso.associated": "Verbunden mit",
+    "sso.not-associated": "Hier klicken um Dich mit %1 zu verbinden"
 }

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

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

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",
@@ -60,7 +59,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",

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": "posted in %1",
-    "posted_in_ago_by": "δημοσιεύτηκε στο %1 πριν από %2 από τον/την %3",
+    "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"
 }

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": "Λεπτομέρειες Ομάδας",

public/language/el/modules.json

@@ -23,6 +23,7 @@
     "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"

public/language/el/notifications.json

@@ -12,8 +12,8 @@
     "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_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
-    "moved_your_topic": "Ο/Η <strong>%1</strong> μετακίνησε το θέμα σου.",
+    "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "Η δημοσίευσή σου στο <strong>%2</strong> αρέσει στον/ην <strong>%1</strong>.",
     "user_flagged_post_in": "Ο/Η <strong>%1</strong> επεσήμανε μια δημοσίευσή σου στο <strong>%2</strong>",
     "user_posted_to": "Ο/Η <strong>%1</strong> έγραψε μια απάντηση στο: <strong>%2</strong>",

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

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,9 @@
     "oldest_to_newest": "Παλαιότερο προς Νεότερο",
     "newest_to_oldest": "Νεότερο προς Παλαιότερο",
     "most_votes": "Περισσότερες ψήφοι",
-    "most_posts": "Most posts"
+    "most_posts": "Most posts",
+    "stale_topic_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?",
+    "spam": "Spam",
+    "offensive": "Offensive",
+    "custom-flag-reason": "Enter a flagging reason"
 }

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,6 +54,7 @@
     "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",
@@ -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"
 }

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

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",
@@ -60,7 +59,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",

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": "posted in %1",
-    "posted_in_ago_by": "posted in %1 %2 by %3",
+    "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"
 }

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

public/language/en@pirate/modules.json

@@ -23,6 +23,7 @@
     "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"

public/language/en@pirate/notifications.json

@@ -12,8 +12,8 @@
     "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_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
-    "moved_your_topic": "<strong>%1</strong> has moved your topic.",
+    "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>.",
     "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
     "user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",

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

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,9 @@
     "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_topic_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?",
+    "spam": "Spam",
+    "offensive": "Offensive",
+    "custom-flag-reason": "Enter a flagging reason"
 }

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,6 +54,7 @@
     "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",
@@ -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"
 }

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

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",
 
@@ -77,7 +76,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",

public/language/en_GB/global.json

@@ -72,9 +72,11 @@
 	"posted_ago_by": "posted %1 by %2",
 	"posted_ago": "posted %1",
 
-	"posted_in_ago_by_guest": "posted in %1 %2 by Guest",
+	"posted_in": "posted in %1",
-	"posted_in_ago_by": "posted in %1 %2 by %3",
+	"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",
@@ -104,5 +106,6 @@
 	"privacy": "Privacy",
 	"follow": "Follow",
 	"unfollow": "Unfollow",
-	"delete_all": "Delete All"
+	"delete_all": "Delete All",
+	"map": "Map"
 }

public/language/en_GB/groups.json

@@ -19,8 +19,6 @@
 	"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",
 

public/language/en_GB/modules.json

@@ -24,6 +24,7 @@
 	"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",

public/language/en_GB/notifications.json

@@ -14,8 +14,8 @@
 
 	"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_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
-	"moved_your_topic": "<strong>%1</strong> has moved your topic.",
+	"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>.",
 	"user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
 	"user_posted_to" : "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",

public/language/en_GB/pages.json

@@ -29,6 +29,9 @@
 	"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",
@@ -39,5 +42,7 @@
 	"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."
 }

public/language/en_GB/topic.json

@@ -29,10 +29,9 @@
 	"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.",
 
@@ -115,5 +114,12 @@
 	"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_topic_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?",
+
+	"spam": "Spam",
+	"offensive": "Offensive",
+	"custom-flag-reason": "Enter a flagging reason"
+
 }

public/language/en_GB/user.json

@@ -30,16 +30,19 @@
 	"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",
@@ -54,6 +57,7 @@
 	"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",
@@ -101,5 +105,15 @@
 	"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"
 }

public/language/en_US/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"
 }