diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..cc592ac143
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,12 @@
+Please include the following information when submitting a bug report/issue:
+
+* NodeBB version and git hash (to find your git hash, execute `git rev-parse HEAD` from the main NodeBB directory)
+* Exact steps to cause this issue
+    1. First I did this...
+    2. Then, I clicked on this item...
+* What you expected
+    * e.g. I expected *abc* to *xyz*
+* What happened instead
+    * e.g. Instead, I got *zyx* and NodeBB set fire to my house
+
+Thank you!
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 144cfe268a..a8ea9cb1eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,4 +47,7 @@ pidfile
 
 ## Transifex
 tx.exe
-.transifexrc
\ No newline at end of file
+.transifexrc
+
+##Coverage output
+coverage
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
index a6aca2083a..eb3cdc7417 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -7,15 +7,16 @@ var fork = require('child_process').fork,
 
 
 module.exports = function(grunt) {
+	var args = [];
+	if (!grunt.option('verbose')) {
+		args.push('--log-level=info');
+	}
+
 	function update(action, filepath, target) {
-		var args = [],
+		var updateArgs = args.slice(),
 			fromFile = '',
 			compiling = '',
 			time = Date.now();
-
-		if (!grunt.option('verbose')) {
-			args.push('--log-level=info');
-		}
 		
 		if (target === 'lessUpdated_Client') {
 			fromFile = ['js', 'tpl', 'acpLess'];
@@ -37,11 +38,11 @@ module.exports = function(grunt) {
 			return incomplete.indexOf(ext) === -1;
 		});
 
-		args.push('--from-file=' + fromFile.join(','));
+		updateArgs.push('--from-file=' + fromFile.join(','));
 		incomplete.push(compiling);
 
 		worker.kill();
-		worker = fork('app.js', args, { env: env });
+		worker = fork('app.js', updateArgs, { env: env });
 
 		worker.on('message', function() {
 			if (incomplete.length) {
@@ -101,6 +102,6 @@ module.exports = function(grunt) {
 
 	env.NODE_ENV = 'development';
 
-	worker = fork('app.js', [], { env: env });
+	worker = fork('app.js', args, { env: env });
 	grunt.event.on('watch', update);
 };
\ No newline at end of file
diff --git a/app.js b/app.js
index fa8964fb35..1fd183757f 100644
--- a/app.js
+++ b/app.js
@@ -51,7 +51,7 @@ if (nconf.get('config')) {
 	configFile = path.resolve(__dirname, nconf.get('config'));
 }
 
-var configExists = file.existsSync(configFile);
+var configExists = file.existsSync(configFile) || (nconf.get('url') && nconf.get('secret') && nconf.get('database'));
 
 loadConfig();
 
@@ -117,7 +117,7 @@ function start() {
 	var urlObject = url.parse(nconf.get('url'));
 	var relativePath = urlObject.pathname !== '/' ? urlObject.pathname : '';
 	nconf.set('base_url', urlObject.protocol + '//' + urlObject.host);
-	nconf.set('secure', urlObject.protocol === 'https');
+	nconf.set('secure', urlObject.protocol === 'https:');
 	nconf.set('use_port', !!urlObject.port);
 	nconf.set('relative_path', relativePath);
 	nconf.set('port', urlObject.port || nconf.get('port') || nconf.get('PORT') || 4567);
@@ -180,7 +180,12 @@ function start() {
 			require('./src/meta').configs.init(next);
 		},
 		function(next) {
-			require('./src/meta').dependencies.check(next);
+			if (nconf.get('dep-check') === undefined || nconf.get('dep-check') !== false) {
+				require('./src/meta').dependencies.check(next);
+			} else {
+				winston.warn('[init] Dependency checking skipped!');
+				setImmediate(next);
+			}
 		},
 		function(next) {
 			require('./src/upgrade').check(next);
diff --git a/install/data/defaults.json b/install/data/defaults.json
index 5041ff83ea..c471db6b89 100644
--- a/install/data/defaults.json
+++ b/install/data/defaults.json
@@ -9,6 +9,8 @@
     "maximumPostLength": 32767,
     "minimumTagsPerTopic": 0,
     "maximumTagsPerTopic": 5,
+    "minimumTagLength": 3,
+    "maximumTagLength": 15,
     "allowGuestSearching": 0,
     "allowTopicsThumbnail": 0,
     "registrationType": "normal",
@@ -29,6 +31,9 @@
     "profileImageDimension": 128,
     "requireEmailConfirmation": 0,
     "allowProfileImageUploads": 1,
-    "teaserPost": "last",
-    "allowPrivateGroups": 1
-}
\ No newline at end of file
+    "teaserPost": "last-reply",
+    "allowPrivateGroups": 1,
+    "unreadCutoff": 2,
+    "bookmarkThreshold": 5,
+    "topicsPerList": 20
+}
diff --git a/install/data/footer.json b/install/data/footer.json
index 7c71cad648..12528110c6 100644
--- a/install/data/footer.json
+++ b/install/data/footer.json
@@ -2,7 +2,7 @@
 	{
 		"widget": "html",
 		"data" : {
-			"html": "<footer id=\"footer\" class=\"container footer\">\r\n\t<div class=\"copyright\">\r\n\t\tCopyright © 2015 <a target=\"_blank\" href=\"https://nodebb.org\">NodeBB Forums</a> | <a target=\"_blank\" href=\"//github.com/NodeBB/NodeBB/graphs/contributors\">Contributors</a>\r\n\t</div>\r\n</footer>",
+			"html": "<footer id=\"footer\" class=\"container footer\">\r\n\t<div class=\"copyright\">\r\n\t\tCopyright © 2016 <a target=\"_blank\" href=\"https://nodebb.org\">NodeBB Forums</a> | <a target=\"_blank\" href=\"//github.com/NodeBB/NodeBB/graphs/contributors\">Contributors</a>\r\n\t</div>\r\n</footer>",
 			"title":"",
 			"container":""
 		}
diff --git a/loader.js b/loader.js
index b78abdc4a1..e853fa562c 100644
--- a/loader.js
+++ b/loader.js
@@ -171,7 +171,7 @@ function forkWorker(index, isPrimary) {
 	}
 
 	process.env.isPrimary = isPrimary;
-	process.env.isCluster = true;
+	process.env.isCluster = ports.length > 1 ? true : false;
 	process.env.port = ports[index];
 
 	var worker = fork('app.js', [], {
diff --git a/nodebb b/nodebb
index 3e3aac5890..53ae28db22 100755
--- a/nodebb
+++ b/nodebb
@@ -1,14 +1,25 @@
 #!/usr/bin/env node
 
-var colors = require('colors'),
-	cproc = require('child_process'),
-	argv = require('minimist')(process.argv.slice(2)),
-	fs = require('fs'),
-	path = require('path'),
-	request = require('request'),
-	semver = require('semver'),
-	prompt = require('prompt'),
-	async = require('async');
+try {
+	var colors = require('colors'),
+		cproc = require('child_process'),
+		argv = require('minimist')(process.argv.slice(2)),
+		fs = require('fs'),
+		path = require('path'),
+		request = require('request'),
+		semver = require('semver'),
+		prompt = require('prompt'),
+		async = require('async');
+} catch (e) {
+	if (e.code === 'MODULE_NOT_FOUND') {
+		process.stdout.write('NodeBB could not be started because it\'s dependencies have not been installed.\n');
+		process.stdout.write('Please ensure that you have executed "npm install --production" prior to running NodeBB.\n\n');
+		process.stdout.write('For more information, please see: https://docs.nodebb.org/en/latest/installing/os.html\n\n');
+		process.stdout.write('Could not start: ' + e.code + '\n');
+
+		process.exit(1);
+	}
+}
 
 var getRunningPid = function(callback) {
 		fs.readFile(__dirname + '/pidfile', {
@@ -196,7 +207,7 @@ var getRunningPid = function(callback) {
 				description: 'Proceed with upgrade (y|n)?'.reset,
 				type: 'string'
 			}, function(err, result) {
-				if (result.upgrade === 'y' || result.upgrade === 'yes') {
+				if (['y', 'Y', 'yes', 'YES'].indexOf(result.upgrade) !== -1) {
 					process.stdout.write('\nUpgrading packages...');
 					var args = ['npm', 'i'];
 					found.forEach(function(suggestObj) {
diff --git a/package.json b/package.json
index 68da7bd634..f940092b18 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
   "main": "app.js",
   "scripts": {
     "start": "node loader.js",
-    "test": "mocha ./tests -t 10000"
+    "test": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- ./tests -t 10000"
   },
   "dependencies": {
     "async": "~1.5.0",
@@ -36,6 +36,7 @@
     "html-to-text": "2.0.0",
     "ip": "1.1.2",
     "jimp": "0.2.21",
+    "json-2-csv": "^2.0.22",
     "less": "^2.0.0",
     "logrotate-stream": "^0.2.3",
     "lru-cache": "4.0.0",
@@ -46,19 +47,19 @@
     "morgan": "^1.3.2",
     "mousetrap": "^1.5.3",
     "nconf": "~0.8.2",
-    "nodebb-plugin-composer-default": "3.0.22",
-    "nodebb-plugin-dbsearch": "1.0.1",
-    "nodebb-plugin-emoji-one": "1.1.0",
+    "nodebb-plugin-composer-default": "4.0.5",
+    "nodebb-plugin-dbsearch": "1.0.2",
     "nodebb-plugin-emoji-extended": "1.1.0",
-    "nodebb-plugin-markdown": "5.0.1",
-    "nodebb-plugin-mentions": "1.0.21",
+    "nodebb-plugin-emoji-one": "1.1.5",
+    "nodebb-plugin-markdown": "6.0.0",
+    "nodebb-plugin-mentions": "1.1.2",
     "nodebb-plugin-soundpack-default": "0.1.6",
-    "nodebb-plugin-spam-be-gone": "0.4.6",
-    "nodebb-rewards-essentials": "0.0.8",
-    "nodebb-theme-lavender": "3.0.9",
-    "nodebb-theme-persona": "4.0.118",
-    "nodebb-theme-vanilla": "5.0.63",
-    "nodebb-widget-essentials": "2.0.9",
+    "nodebb-plugin-spam-be-gone": "0.4.9",
+    "nodebb-rewards-essentials": "0.0.9",
+    "nodebb-theme-lavender": "3.0.13",
+    "nodebb-theme-persona": "4.1.7",
+    "nodebb-theme-vanilla": "5.1.3",
+    "nodebb-widget-essentials": "2.0.10",
     "nodemailer": "2.0.0",
     "nodemailer-sendmail-transport": "1.0.0",
     "nodemailer-smtp-transport": "^2.4.1",
@@ -88,9 +89,10 @@
     "xregexp": "~3.1.0"
   },
   "devDependencies": {
-    "mocha": "~1.13.0",
     "grunt": "~0.4.5",
-    "grunt-contrib-watch": "^1.0.0"
+    "grunt-contrib-watch": "^1.0.0",
+    "istanbul": "^0.4.2",
+    "mocha": "~1.13.0"
   },
   "bugs": {
     "url": "https://github.com/NodeBB/NodeBB/issues"
@@ -115,4 +117,4 @@
       "url": "https://github.com/barisusakli"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/503.html b/public/503.html
index 124e92ef26..8907525ec4 100644
--- a/public/503.html
+++ b/public/503.html
@@ -2,6 +2,7 @@
 <head>
 	<title>Excessive Load Warning</title>
 	<link href='http://fonts.googleapis.com/css?family=Ubuntu:400,500,700' rel='stylesheet' type='text/css'>
+	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<style type="text/css">
 	body {
 		background: #00A9EA;
@@ -32,6 +33,20 @@
 		font-size: 28px;
 	}
 
+	@media (max-width: 640px) {
+		h1 {
+			font-size: 125px;
+		}
+
+		p {
+			font-size: 16px;
+		}
+
+		p strong {
+			font-size: 20px;
+		}
+	}
+
 	.center {
 		position: relative;
 		top: 50%;
@@ -148,11 +163,13 @@
 		<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 />
+				<strong>This forum is temporarily unavailable due to excessive load.</strong>
+			</p>
+			<p>
 				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>
+				&nbsp;<small id="hide" class="hide">Alright. You can stop clicking... it's not going to make the site come back sooner!</small>
 			</p>
 		</div>
 	</div>
diff --git a/public/language/ar/category.json b/public/language/ar/category.json
index 192d1f02c8..77dc9decd9 100644
--- a/public/language/ar/category.json
+++ b/public/language/ar/category.json
@@ -5,12 +5,12 @@
     "guest-login-post": "يجب عليك تسجيل الدخول للرد",
     "no_topics": "<strong>لا توجد مواضيع في هذه الفئة</strong>لم لا تحاول إنشاء موضوع؟<br />",
     "browsing": "تصفح",
-    "no_replies": "لا توجد ردود.",
+    "no_replies": "لم يرد أحد",
     "no_new_posts": "لا يوجد مشاركات جديدة.",
     "share_this_category": "انشر هذه الفئة",
     "watch": "متابعة",
     "ignore": "تجاهل",
     "watch.message": "أنت اﻷن متابع لتحديثات هذه الفئة",
     "ignore.message": "أنت اﻷن تتجاهل تحديثات هذه الفئة",
-    "watched-categories": "Watched categories"
+    "watched-categories": "الفئات المراقبه"
 }
\ No newline at end of file
diff --git a/public/language/ar/email.json b/public/language/ar/email.json
index 0799f8892e..67171b01a6 100644
--- a/public/language/ar/email.json
+++ b/public/language/ar/email.json
@@ -21,9 +21,10 @@
     "digest.cta": "انقر هنا لمشاهدة %1",
     "digest.unsub.info": "تم إرسال هذا الإشعار بآخر المستجدات وفقا لخيارات تسجيلكم.",
     "digest.no_topics": "ليس هناك مواضيع نشيطة في %1 الماضي",
-    "digest.day": "day",
-    "digest.week": "week",
-    "digest.month": "month",
+    "digest.day": "يوم",
+    "digest.week": "أسبوع",
+    "digest.month": "شهر",
+    "digest.subject": "إستهلاك ل",
     "notif.chat.subject": "هناك محادثة جديدة من %1",
     "notif.chat.cta": "انقر هنا لمتابعة المحادثة",
     "notif.chat.unsub.info": "تم إرسال هذا الإشعار بوجودة محادثة جديدة وفقا لخيارات تسجيلك.",
diff --git a/public/language/ar/error.json b/public/language/ar/error.json
index 635f404c8c..18c5b611d8 100644
--- a/public/language/ar/error.json
+++ b/public/language/ar/error.json
@@ -1,5 +1,5 @@
 {
-    "invalid-data": "بيانات غير صالحة",
+    "invalid-data": "بيانات غير صحيحة",
     "not-logged-in": "لم تقم بتسجيل الدخول",
     "account-locked": "تم حظر حسابك مؤقتًا.",
     "search-requires-login": "البحث في المنتدى يتطلب حساب - الرجاء تسجيل الدخول أو التسجيل",
@@ -14,6 +14,7 @@
     "invalid-password": "كلمة السر غير مقبولة",
     "invalid-username-or-password": "المرجود تحديد اسم مستخدم و كلمة مرور",
     "invalid-search-term": "كلمة البحث غير صحيحة",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "اسم المستخدم مأخوذ",
     "email-taken": "البريد الالكتروني مأخوذ",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "هذا المنتدى يستلزم تفعيل بريدك الإلكتروني، انقر هنا من فضلك لإدخاله.",
     "email-confirm-failed": "لم نستطع تفعيل بريدك الإلكتروني، المرجو المحاولة لاحقًا.",
     "confirm-email-already-sent": "لقد تم ارسال بريد التأكيد، الرجاء اﻹنتظار 1% دقائق لإعادة اﻹرسال",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "اسم المستخدم قصير.",
     "username-too-long": "اسم المستخدم طويل",
     "password-too-long": "Password too long",
     "user-banned": "المستخدم محظور",
     "user-too-new": "عذرا, يجب أن تنتظر 1% ثواني قبل قيامك بأول مشاركة",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "قائمة غير موجودة",
     "no-topic": "موضوع غير موجود",
     "no-post": "رد غير موجود",
@@ -38,6 +41,19 @@
     "category-disabled": "قائمة معطلة",
     "topic-locked": "الموضوع مقفول",
     "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
     "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
@@ -55,10 +71,12 @@
     "already-unfavourited": "You have already unbookmarked this post",
     "cant-ban-other-admins": "لايمكن حظر مدبر نظام آخر.",
     "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Invalid image type. Allowed types are: %1",
     "invalid-image-extension": "Invalid image extension",
     "invalid-file-type": "Invalid file type. Allowed types are: %1",
     "group-name-too-short": "اسم المجموعة قصير",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "المجموعة موجودة مسبقا",
     "group-name-change-not-allowed": "لايسمح بتغيير أسماء المجموعات",
     "group-already-member": "Already part of this group",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "You are not allowed to edit this message",
     "cant-remove-last-user": "You can't remove the last user",
     "cant-delete-chat-message": "You are not allowed to delete this message",
+    "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "نظام السمعة معطل",
     "downvoting-disabled": "التصويتات السلبية معطلة",
     "not-enough-reputation-to-downvote": "ليس لديك سمعة تكفي لإضافة صوت سلبي لهذا الموضوع",
@@ -99,5 +118,6 @@
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
     "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "You can't kick yourself from the group",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/ar/login.json b/public/language/ar/login.json
index 29d256203f..c6007a15ff 100644
--- a/public/language/ar/login.json
+++ b/public/language/ar/login.json
@@ -5,7 +5,7 @@
     "remember_me": "تذكرني؟",
     "forgot_password": "نسيت كلمة المرور؟",
     "alternative_logins": "تسجيلات الدخول البديلة",
-    "failed_login_attempt": "فشلت محاولة تسجيل الدخول، يرجى المحاولة مرة أخرى.",
+    "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "قمت بتسجيل الدخول بنجاح!",
     "dont_have_account": "لا تملك حساب؟"
 }
\ No newline at end of file
diff --git a/public/language/ar/modules.json b/public/language/ar/modules.json
index 1c23da87ad..c753143075 100644
--- a/public/language/ar/modules.json
+++ b/public/language/ar/modules.json
@@ -17,7 +17,7 @@
     "chat.seven_days": "7 أيام",
     "chat.thirty_days": "30 يومًا",
     "chat.three_months": "3 أشهر",
-    "chat.delete_message_confirm": "Are you sure you wish to delete this message?",
+    "chat.delete_message_confirm": "هل أنت متأكد من أنك تريد حذف هذه الرسالة؟",
     "chat.roomname": "Chat Room %1",
     "chat.add-users-to-room": "Add users to room",
     "composer.compose": "اكتب",
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Submit and Lock",
     "composer.toggle_dropdown": "Toggle Dropdown",
     "composer.uploading": "Uploading %1",
+    "composer.formatting.bold": "Bold",
+    "composer.formatting.italic": "Italic",
+    "composer.formatting.list": "List",
+    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Picture",
+    "composer.upload-picture": "Upload Image",
+    "composer.upload-file": "Upload File",
     "bootbox.ok": "OK",
     "bootbox.cancel": "إلغاء",
     "bootbox.confirm": "تأكيد",
diff --git a/public/language/ar/pages.json b/public/language/ar/pages.json
index 74170e7af3..56c759fb09 100644
--- a/public/language/ar/pages.json
+++ b/public/language/ar/pages.json
@@ -12,13 +12,14 @@
     "users/sort-posts": "Users with the most posts",
     "users/sort-reputation": "Users with the most reputation",
     "users/banned": "Banned Users",
+    "users/most-flags": "Most flagged users",
     "users/search": "User Search",
     "notifications": "التنبيهات",
     "tags": "الكلمات الدلالية",
     "tag": "Topics tagged under \"%1\"",
-    "register": "Register an account",
+    "register": "تسجيل حساب",
     "login": "Login to your account",
-    "reset": "Reset your account password",
+    "reset": "إعادة تعيين كلمة مرور حسابك",
     "categories": "الفئات",
     "groups": "المجموعات",
     "group": "%1 group",
@@ -39,7 +40,7 @@
     "account/upvoted": "Posts upvoted by %1",
     "account/downvoted": "Posts downvoted by %1",
     "account/best": "Best posts made by %1",
-    "confirm": "Email Confirmed",
+    "confirm": "تم التحقق من عنوان البريد الإلكتروني",
     "maintenance.text": "جاري صيانة %1. المرجو العودة لاحقًا.",
     "maintenance.messageIntro": "بالإضافة إلى ذلك، قام مدبر النظام بترك هذه الرسالة:",
     "throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json
index 1e66ad91eb..3cb68415e1 100644
--- a/public/language/ar/topic.json
+++ b/public/language/ar/topic.json
@@ -26,12 +26,13 @@
     "tools": "أدوات",
     "flag": "تبليغ",
     "locked": "مقفل",
-    "bookmark_instructions": "Click here to return to the last unread post in this thread.",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "إشعار بمشاركة مخلة.",
     "flag_success": "تم الإشعار بهذه المشاركة على أنها مخلة",
     "deleted_message": "هذه المشاركة محذوفة. فقط من لهم صلاحية الإشراف على ا لمشاركات يمكنهم معاينتها.",
     "following_topic.message": "ستستلم تنبيها عند كل مشاركة جديدة في هذا الموضوع.",
     "not_following_topic.message": "لن تستلم أي تنبيه بخصوص عذا الموضوع بعد الآن.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "المرجو إنشاء حساب أو تسجيل الدخول حتى يمكنك متابعة هذا الموضوع.",
     "markAsUnreadForAll.success": "تم تحديد الموضوع على أنه غير مقروء.",
     "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
     "watch.title": "استلم تنبيها بالردود الجديدة في هذا الموضوع",
     "unwatch.title": "ألغ مراقبة هذا الموضوع",
     "share_this_post": "انشر هذا الموضوع",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "أدوات الموضوع",
     "thread_tools.markAsUnreadForAll": "علم غير مقروء",
     "thread_tools.pin": "علق الموضوع",
diff --git a/public/language/ar/unread.json b/public/language/ar/unread.json
index 992ffa6f5c..2d139f5e75 100644
--- a/public/language/ar/unread.json
+++ b/public/language/ar/unread.json
@@ -6,5 +6,8 @@
     "selected": "المحددة",
     "all": "الكل",
     "all_categories": "كل الفئات",
-    "topics_marked_as_read.success": "تم تحديد المواضيع على أنها مقروءة!"
+    "topics_marked_as_read.success": "تم تحديد المواضيع على أنها مقروءة!",
+    "all-topics": "كل المواضيع",
+    "new-topics": "مواضيع جديدة",
+    "watched-topics": "المواضيع المتابعة"
 }
\ No newline at end of file
diff --git a/public/language/ar/uploads.json b/public/language/ar/uploads.json
index 1622cb5693..2126d3ec03 100644
--- a/public/language/ar/uploads.json
+++ b/public/language/ar/uploads.json
@@ -1,6 +1,6 @@
 {
-    "uploading-file": "Uploading the file...",
+    "uploading-file": "جاري رفع الملف...",
     "select-file-to-upload": "Select a file to upload!",
-    "upload-success": "File uploaded successfully!",
+    "upload-success": "تم رفع الملف بنجاح!",
     "maximum-file-size": "Maximum %1 kb"
 }
\ No newline at end of file
diff --git a/public/language/ar/user.json b/public/language/ar/user.json
index 23519da3a5..50938b7178 100644
--- a/public/language/ar/user.json
+++ b/public/language/ar/user.json
@@ -36,10 +36,10 @@
     "more": "المزيد",
     "profile_update_success": "تم تحديث الملف الشخصي بنجاح",
     "change_picture": "تغيير الصورة",
-    "change_username": "Change Username",
-    "change_email": "Change Email",
+    "change_username": "تغيير اسم المستخدم",
+    "change_email": "تغيير البريد اﻹلكتروني",
     "edit": "تعديل",
-    "edit-profile": "Edit Profile",
+    "edit-profile": "تعديل الملف الشخصي",
     "default_picture": "Default Icon",
     "uploaded_picture": "الصورة المرفوعة",
     "upload_new_picture": "رفع صورة جديدة",
@@ -92,14 +92,16 @@
     "open_links_in_new_tab": "فتح الروابط الخارجية في نافدة جديدة",
     "enable_topic_searching": "تفعيل خاصية البحث داخل المواضيع",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
+    "delay_image_loading": "Delay Image Loading",
+    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
     "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "متابعة المواضيع التي تقوم بالرد فيها",
-    "follow_topics_you_create": "متابعة المواضيع التي تنشئها",
-    "grouptitle": "حدد عنوان المجموعة الذي تريد عرضه",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "عنوان المجموعة",
     "no-group-title": "لا يوجد عنوان للمجموعة",
     "select-skin": "Select a Skin",
     "select-homepage": "Select a Homepage",
-    "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\")",
diff --git a/public/language/ar/users.json b/public/language/ar/users.json
index 24e7416521..11a71a9341 100644
--- a/public/language/ar/users.json
+++ b/public/language/ar/users.json
@@ -2,6 +2,7 @@
     "latest_users": "أحدث الأعضاء",
     "top_posters": "اﻷكثر مشاركة",
     "most_reputation": "أعلى سمعة",
+    "most_flags": "Most Flags",
     "search": "بحث",
     "enter_username": "أدخل اسم مستخدم للبحث",
     "load_more": "حمل المزيد",
diff --git a/public/language/bg/email.json b/public/language/bg/email.json
index 12ebb52350..480dd09fff 100644
--- a/public/language/bg/email.json
+++ b/public/language/bg/email.json
@@ -24,6 +24,7 @@
     "digest.day": "ден",
     "digest.week": "месец",
     "digest.month": "година",
+    "digest.subject": "Резюме за %1",
     "notif.chat.subject": "Получено е ново съобщение от %1",
     "notif.chat.cta": "Натиснете тук, за да продължите разговора",
     "notif.chat.unsub.info": "Това известие за разговор беше изпратено до Вас поради настройките Ви за абонаментите.",
diff --git a/public/language/bg/error.json b/public/language/bg/error.json
index 0eaeb842d2..3afb0b4e6d 100644
--- a/public/language/bg/error.json
+++ b/public/language/bg/error.json
@@ -1,5 +1,5 @@
 {
-    "invalid-data": "Невалидни данни",
+    "invalid-data": "Грешни данни",
     "not-logged-in": "Изглежда не сте влезли в системата.",
     "account-locked": "Вашият акаунт беше заключен временно",
     "search-requires-login": "Търсенето изисква акаунт – моля, влезте или се регистрирайте.",
@@ -14,6 +14,7 @@
     "invalid-password": "Грешна парола",
     "invalid-username-or-password": "Моля, посочете потребителско име и парола",
     "invalid-search-term": "Грешен текст за търсене",
+    "csrf-invalid": "Не успяхме да Ви впишем, най-вероятно защото сесията Ви е изтекла. Моля, опитайте отново",
     "invalid-pagination-value": "Грешен номер на страница, трябва да бъде между %1 и %2",
     "username-taken": "Потребителското име е заето",
     "email-taken": "Е-пощата е заета",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "Този форум изисква потвърдена е-поща. Моля, натиснете тук, за да въведете е-поща",
     "email-confirm-failed": "Не успяхме да потвърдим е-пощата Ви. Моля, опитайте отново по-късно.",
     "confirm-email-already-sent": "Е-писмото за потвърждение вече е изпратено. Моля, почакайте още %1 минута/и, преди да изпратите ново.",
+    "sendmail-not-found": "Изпълнимият файл на „sendmail“ не може да бъде намерен. Моля, уверете се, че е инсталиран и изпълним за потребителя, чрез който е пуснат NodeBB.",
     "username-too-short": "Потребителското име е твърде кратко",
     "username-too-long": "Потребителското име е твърде дълго",
     "password-too-long": "Паролата е твърде дълга",
     "user-banned": "Потребителят е блокиран",
     "user-too-new": "Съжаляваме, но трябва да изчакате поне %1 секунда/и, преди да направите първата си публикация",
     "blacklisted-ip": "Съжаляваме, но Вашият IP адрес е забранен за ползване в тази общност. Ако смятате, че това е грешка, моля, свържете се с администратор.",
+    "ban-expiry-missing": "Моля, задайте крайна дата за това блокиране",
     "no-category": "Категорията не съществува",
     "no-topic": "Темата не съществува",
     "no-post": "Публикацията не съществува",
@@ -38,6 +41,19 @@
     "category-disabled": "Категорията е изключена",
     "topic-locked": "Темата е заключена",
     "post-edit-duration-expired": "Можете да редактирате публикациите си до %1 секунда/и, след като ги пуснете",
+    "post-edit-duration-expired-minutes": "Можете да редактирате публикациите си до %1 минута/и, след като ги пуснете",
+    "post-edit-duration-expired-minutes-seconds": "Можете да редактирате публикациите си до %1 минута/и и %2 секунда/и, след като ги пуснете",
+    "post-edit-duration-expired-hours": "Можете да редактирате публикациите си до %1 час(а), след като ги пуснете",
+    "post-edit-duration-expired-hours-minutes": "Можете да редактирате публикациите си до %1 час(а) и %2 минута/и, след като ги пуснете",
+    "post-edit-duration-expired-days": "Можете да редактирате публикациите си до %1 ден(а), след като ги пуснете",
+    "post-edit-duration-expired-days-hours": "Можете да редактирате публикациите си до %1 ден(а) и %2 час(а), след като ги пуснете",
+    "post-delete-duration-expired": "Можете да изтривате публикациите си до %1 секунда/и, след като ги пуснете",
+    "post-delete-duration-expired-minutes": "Можете да изтривате публикациите си до %1 минута/и, след като ги пуснете",
+    "post-delete-duration-expired-minutes-seconds": "Можете да изтривате публикациите си до %1 минута/и и %2 секунда/и, след като ги пуснете",
+    "post-delete-duration-expired-hours": "Можете да изтривате публикациите си до %1 час(а), след като ги пуснете",
+    "post-delete-duration-expired-hours-minutes": "Можете да изтривате публикациите си до %1 час(а) и %2 минута/и, след като ги пуснете",
+    "post-delete-duration-expired-days": "Можете да изтривате публикациите си до %1 ден(а), след като ги пуснете",
+    "post-delete-duration-expired-days-hours": "Можете да изтривате публикациите си до %1 ден(а) и %2 час(а), след като ги пуснете",
     "content-too-short": "Моля, въведете по-дълъг текст на публикацията. Публикациите трябва да съдържат поне %1 символ(а).",
     "content-too-long": "Моля, въведете по-кратък текст на публикацията. Публикациите трябва да съдържат не повече от %1 символ(а).",
     "title-too-short": "Моля, въведете по-дълго заглавие. Заглавията трябва да съдържат поне %1 символ(а).",
@@ -55,10 +71,12 @@
     "already-unfavourited": "Вече сте премахнали отметката си към тази публикация",
     "cant-ban-other-admins": "Не можете да блокирате другите администратори!",
     "cant-remove-last-admin": "Вие сте единственият администратор. Добавете друг потребител като администратор, преди да премахнете себе си като администратор",
+    "cant-delete-admin": "Премахнете администраторските права от този акаунт, преди да го изтриете.",
     "invalid-image-type": "Грешен тип на изображение. Позволените типове са: %1",
     "invalid-image-extension": "Грешно разширение на изображението",
     "invalid-file-type": "Грешен тип на файл. Позволените типове са: %1",
     "group-name-too-short": "Името на групата е твърде кратко",
+    "group-name-too-long": "Името на групата е твърде дълго",
     "group-already-exists": "Вече съществува такава група",
     "group-name-change-not-allowed": "Промяната на името на групата не е разрешено",
     "group-already-member": "Потребителят вече членува в тази група",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "Нямате право да редактирате това съобщение",
     "cant-remove-last-user": "Не можете да премахнете последния потребител",
     "cant-delete-chat-message": "Нямате право да изтриете това съобщение",
+    "already-voting-for-this-post": "Вече сте дали глас за тази публикация.",
     "reputation-system-disabled": "Системата за репутация е изключена.",
     "downvoting-disabled": "Отрицателното гласуване е изключено",
     "not-enough-reputation-to-downvote": "Нямате достатъчно репутация, за да гласувате отрицателно за тази публикация",
@@ -99,5 +118,6 @@
     "no-session-found": "Не е открита сесия за вход!",
     "not-in-room": "Потребителят не е в стаята",
     "no-users-in-room": "Няма потребители в тази стая",
-    "cant-kick-self": "Не можете да изритате себе си от групата"
+    "cant-kick-self": "Не можете да изритате себе си от групата",
+    "no-users-selected": "Няма избран(и) потребител(и)"
 }
\ No newline at end of file
diff --git a/public/language/bg/login.json b/public/language/bg/login.json
index f8340495af..4091422daa 100644
--- a/public/language/bg/login.json
+++ b/public/language/bg/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Запомнете ме?",
     "forgot_password": "Забравена парола?",
     "alternative_logins": "Други начини за влизане",
-    "failed_login_attempt": "Неуспешно влизане. Моля, опитайте отново.",
+    "failed_login_attempt": "Влизането беше неуспешно",
     "login_successful": "Вие влязохте успешно!",
     "dont_have_account": "Нямате акаунт?"
 }
\ No newline at end of file
diff --git a/public/language/bg/modules.json b/public/language/bg/modules.json
index f3afdaaa4a..441f89ea42 100644
--- a/public/language/bg/modules.json
+++ b/public/language/bg/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Публикуване и заключване",
     "composer.toggle_dropdown": "Превключване на падащото меню",
     "composer.uploading": "Качване на %1",
+    "composer.formatting.bold": "Получер",
+    "composer.formatting.italic": "Курсив",
+    "composer.formatting.list": "Списък",
+    "composer.formatting.strikethrough": "Зачертан",
+    "composer.formatting.link": "Връзка",
+    "composer.formatting.picture": "Снимка",
+    "composer.upload-picture": "Качване на изображение",
+    "composer.upload-file": "Качване на файл",
     "bootbox.ok": "Добре",
     "bootbox.cancel": "Отказ",
     "bootbox.confirm": "Потвърждаване",
diff --git a/public/language/bg/pages.json b/public/language/bg/pages.json
index 45e2861bdd..6ad263bdf2 100644
--- a/public/language/bg/pages.json
+++ b/public/language/bg/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Потребители с най-много публикации",
     "users/sort-reputation": "Потребители с най-висока репутация",
     "users/banned": "Блокирани потребители",
+    "users/most-flags": "Най-докладвани потребители",
     "users/search": "Търсене на потребители",
     "notifications": "Известия",
     "tags": "Етикети",
diff --git a/public/language/bg/topic.json b/public/language/bg/topic.json
index dbe44a1541..640b8a4eaa 100644
--- a/public/language/bg/topic.json
+++ b/public/language/bg/topic.json
@@ -26,12 +26,13 @@
     "tools": "Инструменти",
     "flag": "Докладване",
     "locked": "Заключена",
-    "bookmark_instructions": "Натиснете тук, за да се върнете на последната непрочетена публикация в тази тема.",
+    "bookmark_instructions": "Щракнете тук, за да се върнете към последно прочетената публикация в тази тема.",
     "flag_title": "Докладване на тази публикация до модератор",
     "flag_success": "Тази публикация е била докладвана до модератор.",
     "deleted_message": "Тази тема е била изтрита. Само потребители с права за управление на темите могат да я видят.",
     "following_topic.message": "Вече ще получавате известия когато някой публикува коментар в тази тема.",
     "not_following_topic.message": "Вече няма да получавате известия за тази тема.",
+    "ignoring_topic.message": "Вече няма да виждате тази тема в списъка с непрочетени теми. Ще получите известие, когато някой Ви спомене или гласува положително за Ваша публикация.",
     "login_to_subscribe": "Моля, регистрирайте се или влезте, за да се абонирате за тази тема.",
     "markAsUnreadForAll.success": "Темата е отбелязана като непрочетена за всички.",
     "mark_unread": "Отбелязване като непрочетена",
@@ -41,6 +42,12 @@
     "watch.title": "Получавайте известия за новите отговори в тази тема",
     "unwatch.title": "Спрете да наблюдавате тази тема",
     "share_this_post": "Споделете тази публикация",
+    "watching": "Наблюдавате",
+    "not-watching": "Не наблюдавате",
+    "ignoring": "Пренебрегвате",
+    "watching.description": "Ще получавате известия за новите отговори.<br/>Темата ще се показва в списъка с непрочетени.",
+    "not-watching.description": "Няма да получавате известия за новите отговори.<br/>Темата ще се показва в списъка с непрочетени, само ако категорията не се пренебрегва.",
+    "ignoring.description": "Няма да получавате известия за новите отговори.<br/>Темата няма да се показва в списъка с непрочетени.",
     "thread_tools.title": "Инструменти за темата",
     "thread_tools.markAsUnreadForAll": "Отбелязване като непрочетена",
     "thread_tools.pin": "Закачане на темата",
diff --git a/public/language/bg/unread.json b/public/language/bg/unread.json
index b80ddf87ef..7dc16f9cd3 100644
--- a/public/language/bg/unread.json
+++ b/public/language/bg/unread.json
@@ -6,5 +6,8 @@
     "selected": "Избраните",
     "all": "Всички",
     "all_categories": "Всички категории",
-    "topics_marked_as_read.success": "Темите бяха отбелязани като прочетени!"
+    "topics_marked_as_read.success": "Темите бяха отбелязани като прочетени!",
+    "all-topics": "Всички теми",
+    "new-topics": "Нови теми",
+    "watched-topics": "Наблюдавани теми"
 }
\ No newline at end of file
diff --git a/public/language/bg/user.json b/public/language/bg/user.json
index 6e16e70603..286380f71b 100644
--- a/public/language/bg/user.json
+++ b/public/language/bg/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Отваряне на външните връзки в нов подпрозорец",
     "enable_topic_searching": "Включване на търсенето в темите",
     "topic_search_help": "Ако е включено, търсенето в темата ще замени стандартното поведение на браузъра при търсене в страницата и ще Ви позволи да претърсвате цялата тема, а не само това, което се вижда на екрана",
+    "delay_image_loading": "Отлагане на зареждането на изображения",
+    "image_load_delay_help": "Ако е включено, изображенията в темите няма да бъдат зареждани, докато не превъртите страницата до тях",
     "scroll_to_my_post": "След публикуване на отговор, да се показва новата публикация",
-    "follow_topics_you_reply_to": "Следване на темите, на които отговаряте",
-    "follow_topics_you_create": "Следване на темите, които създавате",
-    "grouptitle": "Изберете заглавието на групата, което искате да се показва",
+    "follow_topics_you_reply_to": "Наблюдаване на темите, в които отговаряте",
+    "follow_topics_you_create": "Наблюдаване на темите, които създавате",
+    "grouptitle": "Заглавие на групата",
     "no-group-title": "Няма заглавие на група",
     "select-skin": "Изберете облик",
     "select-homepage": "Изберете начална страница",
diff --git a/public/language/bg/users.json b/public/language/bg/users.json
index 3addffa9d9..39c4954aaa 100644
--- a/public/language/bg/users.json
+++ b/public/language/bg/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Последни потребители",
     "top_posters": "С най-много публикации",
     "most_reputation": "С най-много репутация",
+    "most_flags": "С най-много доклади",
     "search": "Търсене",
     "enter_username": "Въведете потребителско име, което да потърсите",
     "load_more": "Зареждане на още",
diff --git a/public/language/bn/email.json b/public/language/bn/email.json
index a2411a99a7..525460a206 100644
--- a/public/language/bn/email.json
+++ b/public/language/bn/email.json
@@ -24,6 +24,7 @@
     "digest.day": "day",
     "digest.week": "week",
     "digest.month": "month",
+    "digest.subject": "Digest for %1",
     "notif.chat.subject": "%1 এর থেকে নতুন মেসেজ এসেছে।",
     "notif.chat.cta": "কথপোকথন চালিয়ে যেতে এখানে ক্লিক করুন",
     "notif.chat.unsub.info": "আপনার সাবস্ক্রীপশন সেটিংসের কারনে আপনার এই নোটিফিকেশন পাঠানো হয়েছে",
diff --git a/public/language/bn/error.json b/public/language/bn/error.json
index 7f363517cc..fd27a09bdb 100644
--- a/public/language/bn/error.json
+++ b/public/language/bn/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "ভুল পাসওয়ার্ড",
     "invalid-username-or-password": "অনুগ্রহ পূর্বক ইউজারনেম এবং পাসওয়ার্ড উভয়ই প্রদান করুন",
     "invalid-search-term": "অগ্রহনযোগ্য সার্চ টার্ম",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "ইউজারনেম আগেই ব্যবহৃত",
     "email-taken": "ইমেইল আগেই ব্যবহৃত",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
     "email-confirm-failed": "We could not confirm your email, please try again later.",
     "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "খুব ছোট ইউজারনেম",
     "username-too-long": "ইউজারনেম বড় হয়ে গিয়েছে",
     "password-too-long": "Password too long",
     "user-banned": "ব্যবহারকারী নিষিদ্ধ",
     "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "বিভাগটি খুজে পাওয়া যায় নি",
     "no-topic": "এই টপিক নেই",
     "no-post": "এই পোষ্ট নেই",
@@ -38,6 +41,19 @@
     "category-disabled": "বিভাগটি নিষ্ক্রিয়",
     "topic-locked": "টপিক বন্ধ",
     "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
     "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
@@ -55,10 +71,12 @@
     "already-unfavourited": "You have already unbookmarked this post",
     "cant-ban-other-admins": "আপনি অন্য এ্যাডমিনদের নিষিদ্ধ করতে পারেন না!",
     "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Invalid image type. Allowed types are: %1",
     "invalid-image-extension": "Invalid image extension",
     "invalid-file-type": "Invalid file type. Allowed types are: %1",
     "group-name-too-short": "গ্রুপের নাম খুব ছোট",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "গ্রুপ ইতিমধ্যেই বিদ্যমান",
     "group-name-change-not-allowed": "গ্রুপের নাম পরিবর্তনের অনুমতি নেই",
     "group-already-member": "Already part of this group",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "You are not allowed to edit this message",
     "cant-remove-last-user": "You can't remove the last user",
     "cant-delete-chat-message": "You are not allowed to delete this message",
+    "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "সম্মাননা ব্যাবস্থা নিস্ক্রীয় রাখা হয়েছে",
     "downvoting-disabled": "ঋণাত্মক ভোট নিস্ক্রীয় রাখা হয়েছে।",
     "not-enough-reputation-to-downvote": "আপনার এই পোস্ট downvote করার জন্য পর্যাপ্ত সম্মাননা নেই",
@@ -99,5 +118,6 @@
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
     "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "You can't kick yourself from the group",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/bn/login.json b/public/language/bn/login.json
index 7ecec47587..0fea8218ba 100644
--- a/public/language/bn/login.json
+++ b/public/language/bn/login.json
@@ -5,7 +5,7 @@
     "remember_me": "মনে রাখুন",
     "forgot_password": "পাসওয়ার্ড ভুলে গিয়েছেন?",
     "alternative_logins": "বিকল্প প্রবেশ",
-    "failed_login_attempt": "প্রবেশ সফল হয় নি, আবার চেষ্টা করুন।",
+    "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "আপনি সফলভাবে প্রবেশ করেছেন!",
     "dont_have_account": "কোন একাউন্ট নেই?"
 }
\ No newline at end of file
diff --git a/public/language/bn/modules.json b/public/language/bn/modules.json
index 51c65a2a6a..567a648df0 100644
--- a/public/language/bn/modules.json
+++ b/public/language/bn/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Submit and Lock",
     "composer.toggle_dropdown": "Toggle Dropdown",
     "composer.uploading": "Uploading %1",
+    "composer.formatting.bold": "Bold",
+    "composer.formatting.italic": "Italic",
+    "composer.formatting.list": "List",
+    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Picture",
+    "composer.upload-picture": "Upload Image",
+    "composer.upload-file": "Upload File",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",
diff --git a/public/language/bn/pages.json b/public/language/bn/pages.json
index d7d56d0e4a..fa4488b73e 100644
--- a/public/language/bn/pages.json
+++ b/public/language/bn/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Users with the most posts",
     "users/sort-reputation": "Users with the most reputation",
     "users/banned": "Banned Users",
+    "users/most-flags": "Most flagged users",
     "users/search": "User Search",
     "notifications": "বিজ্ঞপ্তি",
     "tags": "ট্যাগসমূহ",
diff --git a/public/language/bn/topic.json b/public/language/bn/topic.json
index 9fea972e71..29cb9dec7a 100644
--- a/public/language/bn/topic.json
+++ b/public/language/bn/topic.json
@@ -26,12 +26,13 @@
     "tools": "টুলস",
     "flag": "ফ্ল্যাগ",
     "locked": "বন্ধ",
-    "bookmark_instructions": "Click here to return to the last unread post in this thread.",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "মডারেশনের জন্য এই পোস্টটি ফ্ল্যাগ করুন",
     "flag_success": "এই পোস্টটি মডারেশনের জন্য ফ্ল্যাগ করা হয়েছে।",
     "deleted_message": "এই টপিকটি মুছে ফেলা হয়েছে। শুধুমাত্র টপিক ব্যবস্থাপনার ক্ষমতাপ্রাপ্ত সদস্যগণ এটি দেখতে পারবেন।",
     "following_topic.message": "এখন থেকে এই টপিকে অন্যকেউ পোস্ট করলে আপনি নোটিফিকেশন পাবেন।",
     "not_following_topic.message": "এই টপিক থেকে আপনি আর নোটিফিকেশন পাবেন না।",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "এই টপিকে সাবস্ক্রাইব করতে চাইলে অনুগ্রহ করে নিবন্ধণ করুন অথবা প্রবেশ করুন।",
     "markAsUnreadForAll.success": "টপিকটি সবার জন্য অপঠিত হিসাবে মার্ক করুন।",
     "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
     "watch.title": "এই টপিকে নতুন উত্তর এলে বিজ্ঞাপণের মাধ্যমে জানুন।",
     "unwatch.title": "এই টপিক দেখা বন্ধ করুন",
     "share_this_post": "এই পোষ্টটি শেয়ার করুন",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "টপিক সম্পর্কিত টুলস",
     "thread_tools.markAsUnreadForAll": "\"অপঠিত\" হিসেবে চিহ্নিত করুন",
     "thread_tools.pin": "টপিক পিন করুন",
diff --git a/public/language/bn/unread.json b/public/language/bn/unread.json
index d7e42fb61b..578e246f3b 100644
--- a/public/language/bn/unread.json
+++ b/public/language/bn/unread.json
@@ -6,5 +6,8 @@
     "selected": "নির্বাচিত",
     "all": "সবগুলো",
     "all_categories": "All categories",
-    "topics_marked_as_read.success": "পঠিত হিসেবে চিহ্নিত টপিকসমূহ"
+    "topics_marked_as_read.success": "পঠিত হিসেবে চিহ্নিত টপিকসমূহ",
+    "all-topics": "All Topics",
+    "new-topics": "New Topics",
+    "watched-topics": "Watched Topics"
 }
\ No newline at end of file
diff --git a/public/language/bn/user.json b/public/language/bn/user.json
index 9e26660f70..b53b04b5c4 100644
--- a/public/language/bn/user.json
+++ b/public/language/bn/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "আউটগোয়িং লিংকগুলো নতুন ট্যাবে খুলুন",
     "enable_topic_searching": "In-Topic সার্চ সক্রীয় করো",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
+    "delay_image_loading": "Delay Image Loading",
+    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
     "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Follow topics that you reply to",
-    "follow_topics_you_create": "Follow topics you create",
-    "grouptitle": "Select the group title you would like to display",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Group Title",
     "no-group-title": "No group title",
     "select-skin": "Select a Skin",
     "select-homepage": "Select a Homepage",
diff --git a/public/language/bn/users.json b/public/language/bn/users.json
index 4fca6b9a27..2af7331a13 100644
--- a/public/language/bn/users.json
+++ b/public/language/bn/users.json
@@ -2,6 +2,7 @@
     "latest_users": "সর্বশেষ নিবন্ধিত সদস্যরা:",
     "top_posters": "সর্বোচ্চ পোষ্টকারী",
     "most_reputation": "সর্বোচ্চ সম্মাননাধারী",
+    "most_flags": "Most Flags",
     "search": "খুঁজুন",
     "enter_username": "ইউজারনেম এর ভিত্তিতে সার্চ করুন",
     "load_more": "আরো লোড করুন",
diff --git a/public/language/cs/category.json b/public/language/cs/category.json
index d91e9ebda0..4df50da536 100644
--- a/public/language/cs/category.json
+++ b/public/language/cs/category.json
@@ -1,16 +1,16 @@
 {
-    "category": "Category",
-    "subcategories": "Subcategories",
+    "category": "Kategorie",
+    "subcategories": "Podkategorie",
     "new_topic_button": "Nové téma",
-    "guest-login-post": "Log in to post",
+    "guest-login-post": "Přihlásit se pro přispívání",
     "no_topics": "<strong>V této kategorii zatím nejsou žádné příspěvky.</strong><br />Můžeš být první!",
     "browsing": "prohlíží",
     "no_replies": "Nikdo ještě neodpověděl",
-    "no_new_posts": "No new posts.",
+    "no_new_posts": "Žádné nové příspěvky",
     "share_this_category": "Share this category",
-    "watch": "Watch",
+    "watch": "Sledovat",
     "ignore": "Ignorovat",
-    "watch.message": "You are now watching updates from this category",
-    "ignore.message": "You are now ignoring updates from this category",
-    "watched-categories": "Watched categories"
+    "watch.message": "Nyní sledujete aktualizace ve skupině",
+    "ignore.message": "Nyní ignorujete aktualizace ve skupině ",
+    "watched-categories": "Sledované kategorie"
 }
\ No newline at end of file
diff --git a/public/language/cs/email.json b/public/language/cs/email.json
index bcb35b58ae..9c456dd30e 100644
--- a/public/language/cs/email.json
+++ b/public/language/cs/email.json
@@ -1,34 +1,35 @@
 {
     "password-reset-requested": "Požadována obnova hesla - %1!",
     "welcome-to": "Vítejte v %1",
-    "invite": "Invitation from %1",
+    "invite": "Pozvánka od %1",
     "greeting_no_name": "Dobrý den",
     "greeting_with_name": "Dobrý den %1",
-    "welcome.text1": "Děkujeme vám za registraci s %1!",
+    "welcome.text1": "Děkujeme vám za registraci na %1!",
     "welcome.text2": "Pro úplnou aktivaci vašeho účtu potřebujeme ověřit vaší emailovou adresu.",
-    "welcome.text3": "An administrator has accepted your registration application. You can login with your username/password now.",
+    "welcome.text3": "Administrátor právě potvrdil vaší registraci. Nyní se můžete přihlásit jménem a heslem.",
     "welcome.cta": "Klikněte zde pro potvrzení vaší emailové adresy",
-    "invitation.text1": "%1 has invited you to join %2",
-    "invitation.ctr": "Click here to create your account.",
+    "invitation.text1": "%1 Vás pozval abyste se připojil k %2",
+    "invitation.ctr": "Klikněte zde pro vytvoření vašeho účtu",
     "reset.text1": "Obdrželi jsme požadavek na obnovu hesla, pravděpodobně kvůli tomu, že jste ho zapomněli. Pokud to není tento případ, ignorujte, prosím, tento email.",
     "reset.text2": "Přejete-li si pokračovat v obnově vašeho hesla, klikněte, prosím, na následující odkaz:",
     "reset.cta": "Klikněte zde, chcete-li obnovit vaše heslo",
-    "reset.notify.subject": "Password successfully changed",
-    "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.",
-    "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.",
+    "reset.notify.subject": "Heslo úspěšně změněno",
+    "reset.notify.text1": "Informujeme Vás, že na %1 vaše heslo bylo úspěšně změněno.",
+    "reset.notify.text2": "Pokud jste to neschválil, prosíme neprodleně kontaktujte správce.",
     "digest.notifications": "Máte tu nepřečtená oznámení od %1:",
     "digest.latest_topics": "Nejnovější témata od %1",
     "digest.cta": "Kliknutím zde navštívíte %1",
     "digest.unsub.info": "Tento výtah vám byl odeslán, protože jste si to nastavili ve vašich odběrech.",
     "digest.no_topics": "Dosud tu nebyly žádné aktivní témata %1",
-    "digest.day": "day",
-    "digest.week": "week",
-    "digest.month": "month",
+    "digest.day": "den",
+    "digest.week": "týden",
+    "digest.month": "měsíc",
+    "digest.subject": "Výběr pro %1",
     "notif.chat.subject": "Nová zpráva z chatu od %1",
     "notif.chat.cta": "Chcete-li pokračovat v konverzaci, klikněte zde.",
     "notif.chat.unsub.info": "Toto oznámení z chatu vám bylo zasláno, protože jste si to nastavili ve vašich odběrech.",
-    "notif.post.cta": "Click here to read the full topic",
-    "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.",
+    "notif.post.cta": "Klikněte zde pro přečtené celého tématu",
+    "notif.post.unsub.info": "Toto oznámení Vám bylo odesláno na základě vašeho nastavení odběru.",
     "test.text1": "Tento testovací email  slouží k ověření, že mailer je správně nastaven. NodeBB.",
     "unsub.cta": "Chcete-li změnit tyto nastavení, klikněte zde.",
     "closing": "Díky!"
diff --git a/public/language/cs/error.json b/public/language/cs/error.json
index dfec525151..c1f7905a73 100644
--- a/public/language/cs/error.json
+++ b/public/language/cs/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Neplatné heslo",
     "invalid-username-or-password": "Stanovte, prosím, oboje, jak uživatelské jméno, tak heslo",
     "invalid-search-term": "Neplatný výraz pro vyhledávání",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "Uživatelské jméno je již použito",
     "email-taken": "Email je již použit",
@@ -21,13 +22,15 @@
     "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
     "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
     "email-confirm-failed": "We could not confirm your email, please try again later.",
-    "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
+    "confirm-email-already-sent": "Potvrzovací email již byl odeslán. Vyčkejte %1 minut pokud chcete odeslat další.",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "Uživatelské jméno je příliš krátké",
     "username-too-long": "Uživatelské jméno je příliš dlouhé",
-    "password-too-long": "Password too long",
+    "password-too-long": "Heslo je příliš dlouhé",
     "user-banned": "Uživatel byl zakázán",
     "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "Kategorie neexistuje",
     "no-topic": "Téma neexistuje",
     "no-post": "Příspěvek neexistuje",
@@ -38,6 +41,19 @@
     "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",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
     "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
@@ -55,10 +71,12 @@
     "already-unfavourited": "You have already unbookmarked this post",
     "cant-ban-other-admins": "Nemůžete zakazovat ostatní administrátory!",
     "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Invalid image type. Allowed types are: %1",
     "invalid-image-extension": "Invalid image extension",
     "invalid-file-type": "Invalid file type. Allowed types are: %1",
     "group-name-too-short": "Název skupiny je příliš krátký",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Skupina už exstuje",
     "group-name-change-not-allowed": "Změna názvu skupiny není povolena",
     "group-already-member": "Already part of this group",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "You are not allowed to edit this message",
     "cant-remove-last-user": "You can't remove the last user",
     "cant-delete-chat-message": "You are not allowed to delete this message",
+    "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Systém reputací je zakázán.",
     "downvoting-disabled": "Downvoting is disabled",
     "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",
@@ -93,11 +112,12 @@
     "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.",
     "registration-error": "Chyba při registraci",
     "parse-error": "Something went wrong while parsing server response",
-    "wrong-login-type-email": "Please use your email to login",
-    "wrong-login-type-username": "Please use your username to login",
-    "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
+    "wrong-login-type-email": "Použijte prosím Váš e-mail pro přihlášení",
+    "wrong-login-type-username": "Použijte prosím Váše přihlašovací jméno pro přihlášení",
+    "invite-maximum-met": "Již jste pozval/a maximálně možný počet lidí (%1 z %2).",
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
     "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "Nemůžete vyhodit sami sebe ze kupiny",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/cs/global.json b/public/language/cs/global.json
index 1f1900a0f6..20163c921d 100644
--- a/public/language/cs/global.json
+++ b/public/language/cs/global.json
@@ -3,10 +3,10 @@
     "search": "Hledat",
     "buttons.close": "Zavřít",
     "403.title": "Přístup odepřen",
-    "403.message": "You seem to have stumbled upon a page that you do not have access to.",
-    "403.login": "Perhaps you should <a href='%1/login'>try logging in</a>?",
+    "403.message": "Zdá se, že jste narazil/a na stránky na které nemáte přístup.",
+    "403.login": "Možná byste měli se <a href='%1/login'>zkusit přihlásit</a>?",
     "404.title": "Stránka nenalezena",
-    "404.message": "You seem to have stumbled upon a page that does not exist. Return to the <a href='%1/'>home page</a>.",
+    "404.message": "Zdá se, že jste narazil/a na stránku která neexistuje. Vrátit se zpět na <a href='%1/'>domovskou stránku</a>.",
     "500.title": "Neznámá chyba",
     "500.message": "Jejda, vypadá to, že se něco pokazilo.",
     "register": "Registrovat",
@@ -22,40 +22,40 @@
     "pagination.out_of": "%1 z %2",
     "pagination.enter_index": "Enter index",
     "header.admin": "Administrace",
-    "header.categories": "Categories",
-    "header.recent": "Aktuality",
+    "header.categories": "Kategorie",
+    "header.recent": "Nejnovější",
     "header.unread": "Nepřečtené",
     "header.tags": "Tagy",
     "header.popular": "Populární",
     "header.users": "Uživatelé",
-    "header.groups": "Groups",
-    "header.chats": "Chats",
+    "header.groups": "Skupiny",
+    "header.chats": "Chaty",
     "header.notifications": "Oznámení",
     "header.search": "Hledat",
     "header.profile": "Můj profil",
-    "header.navigation": "Navigation",
+    "header.navigation": "Navigace",
     "notifications.loading": "Načítání upozornění",
-    "chats.loading": "Načítání grafů",
+    "chats.loading": "Načítání chatů",
     "motd.welcome": "Vítejte na NodeBB, diskusní platforma buducnosti.",
     "previouspage": "Předchozí stránka",
     "nextpage": "Další stránka",
-    "alert.success": "Success",
+    "alert.success": "Úspěch",
     "alert.error": "Chyba",
     "alert.banned": "Banned",
     "alert.banned.message": "You have just been banned, you will now be logged out.",
-    "alert.unfollow": "You are no longer following %1!",
-    "alert.follow": "You are now following %1!",
+    "alert.unfollow": "Již nesledujete %1!",
+    "alert.follow": "Nyní sledujete %1!",
     "online": "Online",
     "users": "Uživatelé",
     "topics": "Témata",
     "posts": "Příspěvky",
-    "best": "Best",
+    "best": "Nejlepší",
     "upvoted": "Upvoted",
     "downvoted": "Downvoted",
     "views": "Zobrazení",
-    "reputation": "Reputation",
-    "read_more": "read more",
-    "more": "More",
+    "reputation": "Reputace",
+    "read_more": "čtěte více",
+    "more": "Více",
     "posted_ago_by_guest": "posted %1 by Guest",
     "posted_ago_by": "posted %1 by %2",
     "posted_ago": "posted %1",
@@ -69,9 +69,9 @@
     "norecentposts": "Žádné nedávné příspěvky",
     "norecenttopics": "Žádné nedávné témata",
     "recentposts": "Nedávné příspěvky",
-    "recentips": "Recently Logged In IPs",
+    "recentips": "Naposledy zaznamenané IP adresy",
     "away": "Pryč",
-    "dnd": "Do not disturb",
+    "dnd": "Nevyrušovat",
     "invisible": "Neviditelný",
     "offline": "Offline",
     "email": "Email",
@@ -80,15 +80,15 @@
     "guests": "Hosté",
     "updated.title": "Fórum zaktualizováno",
     "updated.message": "Toto fórum bylo právě aktualizováno na poslední verzi. Klikněte zde a obnovte tuto stránku.",
-    "privacy": "Privacy",
-    "follow": "Follow",
-    "unfollow": "Unfollow",
+    "privacy": "Soukromí",
+    "follow": "Sledovat",
+    "unfollow": "Prestat sledovat",
     "delete_all": "Vymazat vše",
-    "map": "Map",
+    "map": "Mapa",
     "sessions": "Login Sessions",
-    "ip_address": "IP Address",
-    "enter_page_number": "Enter page number",
-    "upload_file": "Upload file",
-    "upload": "Upload",
-    "allowed-file-types": "Allowed file types are %1"
+    "ip_address": "IP adresa",
+    "enter_page_number": "Zadejte číslo stránky",
+    "upload_file": "Nahrár soubor",
+    "upload": "Nahrát",
+    "allowed-file-types": "Povolené typy souborů jsou %1"
 }
\ No newline at end of file
diff --git a/public/language/cs/groups.json b/public/language/cs/groups.json
index 5bfd7ed3ec..c1684ee4f0 100644
--- a/public/language/cs/groups.json
+++ b/public/language/cs/groups.json
@@ -1,54 +1,54 @@
 {
     "groups": "Skupiny",
     "view_group": "Prohlédnout skupinu",
-    "owner": "Group Owner",
-    "new_group": "Create New Group",
-    "no_groups_found": "There are no groups to see",
-    "pending.accept": "Accept",
-    "pending.reject": "Reject",
-    "pending.accept_all": "Accept All",
-    "pending.reject_all": "Reject All",
-    "pending.none": "There are no pending members at this time",
-    "invited.none": "There are no invited members at this time",
-    "invited.uninvite": "Rescind Invitation",
-    "invited.search": "Search for a user to invite to this group",
-    "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-save": "Save",
-    "cover-saving": "Saving",
-    "details.title": "podrobnosti skupiny",
+    "owner": "Vlastník skupiny",
+    "new_group": "Vytvořit novou skupinu",
+    "no_groups_found": "Žádné skupiny k prohlížení",
+    "pending.accept": "Přijmout",
+    "pending.reject": "Odmítnout",
+    "pending.accept_all": "Přijmout vše",
+    "pending.reject_all": "Odmítnout vše",
+    "pending.none": "Žádní čekající členové v tuto chvíli",
+    "invited.none": "Žádní pozvaní členové v tuto chvíli",
+    "invited.uninvite": "Zrušit pozvánku",
+    "invited.search": "Hledat uživatele k pozvání do této skupiny",
+    "invited.notification_title": "Byl jste pozván abyste se připojil/a k <strong>%1</strong>",
+    "request.notification_title": "Požadavek na členství ve skupině od <strong>%1</strong>",
+    "request.notification_text": "<strong>%1</strong> požádál o členství v <strong>%2</strong>",
+    "cover-save": "Uložit",
+    "cover-saving": "Ukládám",
+    "details.title": "Podrobnosti skupiny",
     "details.members": "Seznam členů",
-    "details.pending": "Pending Members",
-    "details.invited": "Invited Members",
+    "details.pending": "Čekající členové",
+    "details.invited": "Pozvaní členové",
     "details.has_no_posts": "Členové této skupiny dosud neodeslali ani jeden příspěvek.",
     "details.latest_posts": "Nejnovější příspěvky",
-    "details.private": "Private",
-    "details.disableJoinRequests": "Disable join requests",
-    "details.grant": "Grant/Rescind Ownership",
-    "details.kick": "Kick",
-    "details.owner_options": "Group Administration",
-    "details.group_name": "Group Name",
-    "details.member_count": "Member Count",
-    "details.creation_date": "Creation Date",
-    "details.description": "Description",
-    "details.badge_preview": "Badge Preview",
-    "details.change_icon": "Change Icon",
-    "details.change_colour": "Change Colour",
-    "details.badge_text": "Badge Text",
-    "details.userTitleEnabled": "Show Badge",
-    "details.private_help": "If enabled, joining of groups requires approval from a group owner",
-    "details.hidden": "Hidden",
-    "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
-    "details.delete_group": "Delete Group",
-    "details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
-    "event.updated": "Group details have been updated",
-    "event.deleted": "The group \"%1\" has been deleted",
-    "membership.accept-invitation": "Accept Invitation",
-    "membership.invitation-pending": "Invitation Pending",
-    "membership.join-group": "Join Group",
-    "membership.leave-group": "Leave Group",
-    "membership.reject": "Reject",
-    "new-group.group_name": "Group Name:",
-    "upload-group-cover": "Upload group cover"
+    "details.private": "Soukromé",
+    "details.disableJoinRequests": "Zakázat žádosti o připojení",
+    "details.grant": "Přidat/Zrušit vlastnictví",
+    "details.kick": "Vyhodit",
+    "details.owner_options": "Administrátor skupiny",
+    "details.group_name": "Název skupiny",
+    "details.member_count": "Počet členů",
+    "details.creation_date": "Datum vytvoření",
+    "details.description": "Popis",
+    "details.badge_preview": "Náhled odznaku",
+    "details.change_icon": "Změnit ikonu",
+    "details.change_colour": "Změnit barvu",
+    "details.badge_text": "Text odznaku",
+    "details.userTitleEnabled": "Zobrazit odznak",
+    "details.private_help": "Pokud je povoleno, připojování do skupin vyžaduje schválení od vlastníka skupiny",
+    "details.hidden": "Skrytý",
+    "details.hidden_help": "Pokud je povoleno, tato skupina nebude zobrazena v seznamu skupin, uživatelé budou muset být pozváni manuálně",
+    "details.delete_group": "Odstranit skupinu",
+    "details.private_system_help": "Soukromé skupiny jsou zakázáné na systémové úrovni, tato možnost nic nedělá",
+    "event.updated": "Podrobnosti skupiny byly aktualizovány",
+    "event.deleted": "Skupina \"%1\" byla odstraněna",
+    "membership.accept-invitation": "Přijmout pozvání",
+    "membership.invitation-pending": "Čekající pozvání",
+    "membership.join-group": "Vstoupit do skupiny",
+    "membership.leave-group": "Opustit skupinu",
+    "membership.reject": "Odmítnout",
+    "new-group.group_name": "Název skupiny:",
+    "upload-group-cover": "Nahrát titulní obrázek skupiny"
 }
\ No newline at end of file
diff --git a/public/language/cs/login.json b/public/language/cs/login.json
index 3308fbdde6..746c3364a9 100644
--- a/public/language/cs/login.json
+++ b/public/language/cs/login.json
@@ -1,11 +1,11 @@
 {
-    "username-email": "Username / Email",
-    "username": "Username",
+    "username-email": "Uživatel / Email",
+    "username": "Uživatel",
     "email": "Email",
     "remember_me": "Zapamatovat si mě?",
     "forgot_password": "Zapomněli jste heslo?",
     "alternative_logins": "Další způsoby přihlášení",
-    "failed_login_attempt": "Přihlášení se nezdařilo, zkuste to prosím znovu.",
+    "failed_login_attempt": "Přihlášení neúspěšné",
     "login_successful": "Přihlášení proběhlo úspěšně!",
     "dont_have_account": "Nemáte účet?"
 }
\ No newline at end of file
diff --git a/public/language/cs/modules.json b/public/language/cs/modules.json
index cb37aa7539..a6d59b761f 100644
--- a/public/language/cs/modules.json
+++ b/public/language/cs/modules.json
@@ -4,34 +4,42 @@
     "chat.send": "Odeslat",
     "chat.no_active": "Nemáte žádné aktivní konverzace.",
     "chat.user_typing": "%1 píše ...",
-    "chat.user_has_messaged_you": "%1 has messaged you.",
-    "chat.see_all": "See all chats",
-    "chat.mark_all_read": "Mark all chats read",
-    "chat.no-messages": "Please select a recipient to view chat message history",
-    "chat.no-users-in-room": "No users in this room",
-    "chat.recent-chats": "Recent Chats",
+    "chat.user_has_messaged_you": "%1 Vám napsal.",
+    "chat.see_all": "Prohlédnout všechny chaty",
+    "chat.mark_all_read": "Označit vše jako přečtené",
+    "chat.no-messages": "Prosím vyberte příjemce k prohlédnutí historie zpráv.",
+    "chat.no-users-in-room": "Žádní uživatelé v místnosti.",
+    "chat.recent-chats": "Aktuální chaty",
     "chat.contacts": "Kontakty",
     "chat.message-history": "Historie zpráv",
-    "chat.pop-out": "Pop out chat",
+    "chat.pop-out": "Skrýt chat",
     "chat.maximize": "Maximalizovat",
     "chat.seven_days": "7 dní",
     "chat.thirty_days": "30 dní",
     "chat.three_months": "3 měsíce",
-    "chat.delete_message_confirm": "Are you sure you wish to delete this message?",
-    "chat.roomname": "Chat Room %1",
-    "chat.add-users-to-room": "Add users to room",
-    "composer.compose": "Compose",
-    "composer.show_preview": "Show Preview",
-    "composer.hide_preview": "Hide Preview",
-    "composer.user_said_in": "%1 said in %2:",
-    "composer.user_said": "%1 said:",
-    "composer.discard": "Are you sure you wish to discard this post?",
-    "composer.submit_and_lock": "Submit and Lock",
+    "chat.delete_message_confirm": "Jste si jisti že chcete odstranit tuto zprávu?",
+    "chat.roomname": "Místnost %1",
+    "chat.add-users-to-room": "Přidat uživatele do místnosti",
+    "composer.compose": "Napsat",
+    "composer.show_preview": "Ukázat náhled",
+    "composer.hide_preview": "Skrýt náhled",
+    "composer.user_said_in": "%1 řekl v %2:",
+    "composer.user_said": "%1 řekl:",
+    "composer.discard": "Jste si jisti, že chcete zrušit tento příspěvek?",
+    "composer.submit_and_lock": "Potvrdit a uzamknout",
     "composer.toggle_dropdown": "Toggle Dropdown",
-    "composer.uploading": "Uploading %1",
+    "composer.uploading": "Odesílám %1",
+    "composer.formatting.bold": "Tučné",
+    "composer.formatting.italic": "Kurzíva",
+    "composer.formatting.list": "Seznam",
+    "composer.formatting.strikethrough": "Přeškrtnutí",
+    "composer.formatting.link": "Odkaz",
+    "composer.formatting.picture": "Obrázek",
+    "composer.upload-picture": "Nahrát obrázek",
+    "composer.upload-file": "Nahrát soubor",
     "bootbox.ok": "OK",
-    "bootbox.cancel": "Cancel",
-    "bootbox.confirm": "Confirm",
+    "bootbox.cancel": "Zrušit",
+    "bootbox.confirm": "Potvrdit",
     "cover.dragging_title": "Cover Photo Positioning",
     "cover.dragging_message": "Drag the cover photo to the desired position and click \"Save\"",
     "cover.saved": "Cover photo image and position saved"
diff --git a/public/language/cs/notifications.json b/public/language/cs/notifications.json
index 0137a973e3..8c6e418638 100644
--- a/public/language/cs/notifications.json
+++ b/public/language/cs/notifications.json
@@ -1,16 +1,16 @@
 {
     "title": "Upozornění",
-    "no_notifs": "You have no new notifications",
-    "see_all": "See all notifications",
-    "mark_all_read": "Mark all notifications read",
-    "back_to_home": "Back to %1",
+    "no_notifs": "Nemáte žádná nová upozornění.",
+    "see_all": "Zobrazit všechna upozornění",
+    "mark_all_read": "Označit všechna upozornění jako přečtená",
+    "back_to_home": "Zpět na %1",
     "outgoing_link": "Odkaz mimo fórum",
-    "outgoing_link_message": "You are now leaving %1",
-    "continue_to": "Continue to %1",
-    "return_to": "Return to %1",
-    "new_notification": "New Notification",
-    "you_have_unread_notifications": "You have unread notifications.",
-    "new_message_from": "New message from <strong>%1</strong>",
+    "outgoing_link_message": "Opouštíte %1",
+    "continue_to": "Pokračovat na %1",
+    "return_to": "Vrátit na %1",
+    "new_notification": "Nové upozornění",
+    "you_have_unread_notifications": "Máte nepřečtená upozornění.",
+    "new_message_from": "Nová zpráva od <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> has upvoted your post in <strong>%2</strong>.",
     "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
     "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
@@ -31,8 +31,8 @@
     "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> sent a registration request.",
     "new_register_multiple": "There are <strong>%1</strong> registration requests awaiting review.",
-    "email-confirmed": "Email Confirmed",
-    "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
-    "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.",
-    "email-confirm-sent": "Confirmation email sent."
+    "email-confirmed": "Email potvrzen",
+    "email-confirmed-message": "Děkujeme za ověření Vaší emailové adresy. Váš účet je nyní aktivován.",
+    "email-confirm-error-message": "Nastal problém s ověřením Vaší emailové adresy. Pravděpodobně neplatný nebo expirovaný kód.",
+    "email-confirm-sent": "Ověřovací email odeslán."
 }
\ No newline at end of file
diff --git a/public/language/cs/pages.json b/public/language/cs/pages.json
index 285aa30017..efd3e8001f 100644
--- a/public/language/cs/pages.json
+++ b/public/language/cs/pages.json
@@ -1,46 +1,47 @@
 {
-    "home": "Home",
-    "unread": "Unread Topics",
-    "popular-day": "Popular topics today",
-    "popular-week": "Popular topics this week",
-    "popular-month": "Popular topics this month",
-    "popular-alltime": "All time popular topics",
-    "recent": "Recent Topics",
-    "flagged-posts": "Flagged Posts",
-    "users/online": "Online Users",
-    "users/latest": "Latest Users",
-    "users/sort-posts": "Users with the most posts",
-    "users/sort-reputation": "Users with the most reputation",
-    "users/banned": "Banned Users",
-    "users/search": "User Search",
-    "notifications": "Notifications",
-    "tags": "Tags",
-    "tag": "Topics tagged under \"%1\"",
-    "register": "Register an account",
-    "login": "Login to your account",
-    "reset": "Reset your account password",
-    "categories": "Categories",
-    "groups": "Groups",
-    "group": "%1 group",
-    "chats": "Chats",
-    "chat": "Chatting with %1",
+    "home": "Domů",
+    "unread": "Nepřečtená témata",
+    "popular-day": "Dnešní oblíbená témata",
+    "popular-week": "Oblíbená témata pro tento týden",
+    "popular-month": "Oblíbená témata pro tento měsíc",
+    "popular-alltime": "Oblíbená témata za celou dobu",
+    "recent": "Aktuální témata",
+    "flagged-posts": "Označené příspěvky",
+    "users/online": "Uživatelé online",
+    "users/latest": "Nejnovější uživatelé",
+    "users/sort-posts": "Uživatelé s nejvíce příspěvky",
+    "users/sort-reputation": "Uživatelé s nejlepší reputací",
+    "users/banned": "Zabanovaní uživatelé",
+    "users/most-flags": "Most flagged users",
+    "users/search": "Hledání uživatele",
+    "notifications": "Oznámení",
+    "tags": "Tagy",
+    "tag": "Téma označeno pod \"%1\"",
+    "register": "Zaregistrovat účet",
+    "login": "Přihlásit se ke svému účtu",
+    "reset": "Obnovit heslo k účtu",
+    "categories": "Kategorie",
+    "groups": "Skupiny",
+    "group": "%1 skupina",
+    "chats": "Chaty",
+    "chat": "Chatovat s %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",
-    "account/topics": "Topics created by %1",
-    "account/groups": "%1's Groups",
+    "account/followers": "Lidé kteří sledují %1",
+    "account/posts": "Příspěvky od %1",
+    "account/topics": "Příspěvky vytvořeny uživatelem %1",
+    "account/groups": "%1's skupiny",
     "account/favourites": "%1's Bookmarked Posts",
-    "account/settings": "User Settings",
+    "account/settings": "Uživatelské nastavení",
     "account/watched": "Topics watched by %1",
     "account/upvoted": "Posts upvoted by %1",
     "account/downvoted": "Posts downvoted by %1",
-    "account/best": "Best posts made by %1",
-    "confirm": "Email Confirmed",
+    "account/best": "Nejlepší příspěvky od %1",
+    "confirm": "Email potvrzen",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
     "maintenance.messageIntro": "Additionally, the administrator has left this message:",
-    "throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
+    "throttled.text": "%1 je v současnou chvíli nedostupný pro velkou zátěž. Prosíme zkuste to za chvíli."
 }
\ No newline at end of file
diff --git a/public/language/cs/recent.json b/public/language/cs/recent.json
index 13e8b2284e..68867fe0a5 100644
--- a/public/language/cs/recent.json
+++ b/public/language/cs/recent.json
@@ -3,17 +3,17 @@
     "day": "Den",
     "week": "Týden",
     "month": "Měsíc",
-    "year": "Year",
-    "alltime": "All Time",
-    "no_recent_topics": "There are no recent topics.",
-    "no_popular_topics": "There are no popular topics.",
-    "there-is-a-new-topic": "There is a new topic.",
-    "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.",
-    "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.",
-    "there-are-new-topics": "There are %1 new topics.",
-    "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.",
-    "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.",
-    "there-is-a-new-post": "There is a new post.",
-    "there-are-new-posts": "There are %1 new posts.",
-    "click-here-to-reload": "Click here to reload."
+    "year": "Rok",
+    "alltime": "Pořád",
+    "no_recent_topics": "Nebyly nalezeny žádné nové téma.",
+    "no_popular_topics": "Žádná oblíbená téma.",
+    "there-is-a-new-topic": "K dispozici je nová téma.",
+    "there-is-a-new-topic-and-a-new-post": "K dispozici je nové téma a nový příspěvěk.",
+    "there-is-a-new-topic-and-new-posts": "K dispozici je nové téma a %1 nových příspěvků.",
+    "there-are-new-topics": "K dispozici je %1 nových témat.",
+    "there-are-new-topics-and-a-new-post": "K dispozici je %1 nových témat a jeden nový příspěvek.",
+    "there-are-new-topics-and-new-posts": "K dispozici je %1 nových témat a %2 nových příspěvků.",
+    "there-is-a-new-post": "K dispozici je nový příspěvek.",
+    "there-are-new-posts": "K dispozici je %1 nových příspěvků.",
+    "click-here-to-reload": "Kliknutím sem znovu načtete."
 }
\ No newline at end of file
diff --git a/public/language/cs/register.json b/public/language/cs/register.json
index db7a689039..c6d339688a 100644
--- a/public/language/cs/register.json
+++ b/public/language/cs/register.json
@@ -15,5 +15,5 @@
     "alternative_registration": "Jiný způsob registrace",
     "terms_of_use": "Podmínky",
     "agree_to_terms_of_use": "Souhlasím s Podmínkami",
-    "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator."
+    "registration-added-to-queue": "Vaše registrace byla přidána do fronty. Obdržíte e-mail až ji správce schválí."
 }
\ No newline at end of file
diff --git a/public/language/cs/reset_password.json b/public/language/cs/reset_password.json
index 566b746435..87e85611d1 100644
--- a/public/language/cs/reset_password.json
+++ b/public/language/cs/reset_password.json
@@ -11,7 +11,7 @@
     "enter_email_address": "Zadejte emailovou adresu",
     "password_reset_sent": "Obnova hesla odeslána",
     "invalid_email": "Špatný email / Email neexistuje!",
-    "password_too_short": "The password entered is too short, please pick a different password.",
-    "passwords_do_not_match": "The two passwords you've entered do not match.",
-    "password_expired": "Your password has expired, please choose a new password"
+    "password_too_short": "Zadané heslo je příliš krátké, zvolte si prosím jiné.",
+    "passwords_do_not_match": "Vámi zadaná hesla se neshodují.",
+    "password_expired": "Platnost Vašeho hesla vypršela, zvolte si prosím nové."
 }
\ No newline at end of file
diff --git a/public/language/cs/search.json b/public/language/cs/search.json
index 277c0a32bc..93fae4f92d 100644
--- a/public/language/cs/search.json
+++ b/public/language/cs/search.json
@@ -1,7 +1,7 @@
 {
     "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
     "no-matches": "No matches found",
-    "advanced-search": "Advanced Search",
+    "advanced-search": "Pokročilé hledání",
     "in": "In",
     "titles": "Titles",
     "titles-posts": "Titles and Posts",
@@ -12,28 +12,28 @@
     "at-least": "At least",
     "at-most": "At most",
     "post-time": "Post time",
-    "newer-than": "Newer than",
-    "older-than": "Older than",
+    "newer-than": "Novější než",
+    "older-than": "Starší než",
     "any-date": "Any date",
-    "yesterday": "Yesterday",
-    "one-week": "One week",
-    "two-weeks": "Two weeks",
-    "one-month": "One month",
+    "yesterday": "Včera",
+    "one-week": "Jeden týden",
+    "two-weeks": "Dva týdny",
+    "one-month": "Jeden měsíc",
     "three-months": "Three months",
-    "six-months": "Six months",
-    "one-year": "One year",
-    "sort-by": "Sort by",
+    "six-months": "Šest měsíců",
+    "one-year": "Jeden rok",
+    "sort-by": "Řadit dle",
     "last-reply-time": "Last reply time",
     "topic-title": "Topic title",
     "number-of-replies": "Number of replies",
     "number-of-views": "Number of views",
     "topic-start-date": "Topic start date",
-    "username": "Username",
-    "category": "Category",
+    "username": "Uživatelské jméno",
+    "category": "Kategorie",
     "descending": "In descending order",
     "ascending": "In ascending order",
-    "save-preferences": "Save preferences",
-    "clear-preferences": "Clear preferences",
+    "save-preferences": "Uložit nastavení",
+    "clear-preferences": "Vymazat nastavení",
     "search-preferences-saved": "Search preferences saved",
     "search-preferences-cleared": "Search preferences cleared",
     "show-results-as": "Show results as"
diff --git a/public/language/cs/success.json b/public/language/cs/success.json
index fde8a77044..e9dec2704e 100644
--- a/public/language/cs/success.json
+++ b/public/language/cs/success.json
@@ -1,6 +1,6 @@
 {
-    "success": "Success",
-    "topic-post": "You have successfully posted.",
-    "authentication-successful": "Authentication Successful",
-    "settings-saved": "Settings saved!"
+    "success": "Úspěch",
+    "topic-post": "Úspěšně umístěno.",
+    "authentication-successful": "Úspěšné přihlášení",
+    "settings-saved": "Nastavení byla uložena!"
 }
\ No newline at end of file
diff --git a/public/language/cs/tags.json b/public/language/cs/tags.json
index 8fc07c7da2..59b7f40c43 100644
--- a/public/language/cs/tags.json
+++ b/public/language/cs/tags.json
@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "Není zde žádné téma s tímto tagem.",
     "tags": "Tagy",
-    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
+    "enter_tags_here": "Zde vložte tagy, každý o délce %1 až %2 znaků.",
     "enter_tags_here_short": "Vložte tagy ...",
     "no_tags": "Zatím tu není žádný tag."
 }
\ No newline at end of file
diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json
index 3bced7f182..6d30b3ea98 100644
--- a/public/language/cs/topic.json
+++ b/public/language/cs/topic.json
@@ -5,55 +5,62 @@
     "no_topics_found": "Nebyla nalezena žádná témata!",
     "no_posts_found": "Nebyly nalezeny žádné příspěvky!",
     "post_is_deleted": "Tento příspěvek je vymazán!",
-    "topic_is_deleted": "This topic is deleted!",
+    "topic_is_deleted": "Toto téma je smazané!",
     "profile": "Profil",
-    "posted_by": "Posted by %1",
-    "posted_by_guest": "Posted by Guest",
+    "posted_by": "Přidal %1",
+    "posted_by_guest": "Přidal Host",
     "chat": "Chat",
     "notify_me": "Sledovat toto téma",
     "quote": "Citovat",
     "reply": "Odpovědět",
-    "reply-as-topic": "Reply as topic",
-    "guest-login-reply": "Log in to reply",
+    "reply-as-topic": "Odpovědět jako Téma",
+    "guest-login-reply": "Přihlásit se pro odpověď",
     "edit": "Upravit",
     "delete": "Smazat",
-    "purge": "Purge",
-    "restore": "Restore",
+    "purge": "Vypráznit",
+    "restore": "Obnovit",
     "move": "Přesunout",
     "fork": "Rozdělit",
     "link": "Odkaz",
     "share": "Sdílet",
     "tools": "Nástroje",
     "flag": "Flag",
-    "locked": "Locked",
-    "bookmark_instructions": "Click here to return to the last unread post in this thread.",
+    "locked": "Uzamčeno",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Flag this post for moderation",
     "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.",
     "not_following_topic.message": "You will no longer receive notifications from this topic.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
     "markAsUnreadForAll.success": "Topic marked as unread for all.",
-    "mark_unread": "Mark unread",
-    "mark_unread.success": "Topic marked as unread.",
-    "watch": "Watch",
+    "mark_unread": "Označ za nepřečtené",
+    "mark_unread.success": "Téma označeno jako nepřečtené",
+    "watch": "Sledovat",
     "unwatch": "Unwatch",
     "watch.title": "Be notified of new replies in this topic",
     "unwatch.title": "Stop watching this topic",
-    "share_this_post": "Share this Post",
-    "thread_tools.title": "Topic Tools",
+    "share_this_post": "Sdílet toto téma",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
+    "thread_tools.title": "Správa tématu",
     "thread_tools.markAsUnreadForAll": "Označit jako nepřečtené",
-    "thread_tools.pin": "Pin Topic",
-    "thread_tools.unpin": "Unpin Topic",
-    "thread_tools.lock": "Lock Topic",
-    "thread_tools.unlock": "Unlock Topic",
-    "thread_tools.move": "Move Topic",
-    "thread_tools.move_all": "Move All",
-    "thread_tools.fork": "Fork Topic",
-    "thread_tools.delete": "Delete Topic",
-    "thread_tools.delete-posts": "Delete Posts",
-    "thread_tools.delete_confirm": "Are you sure you want to delete this topic?",
-    "thread_tools.restore": "Restore Topic",
+    "thread_tools.pin": "Připnout téma",
+    "thread_tools.unpin": "Odepnout téma",
+    "thread_tools.lock": "Zamknout téma",
+    "thread_tools.unlock": "Odemknout téma",
+    "thread_tools.move": "Přesunout téma",
+    "thread_tools.move_all": "Přesunout vše",
+    "thread_tools.fork": "Větvit téma",
+    "thread_tools.delete": "Odstranit téma",
+    "thread_tools.delete-posts": "Odstranit přispěvky",
+    "thread_tools.delete_confirm": "Opravdu chcete smazat toto téma.",
+    "thread_tools.restore": "Obnovit téma",
     "thread_tools.restore_confirm": "Are you sure you want to restore this topic?",
     "thread_tools.purge": "Purge Topic",
     "thread_tools.purge_confirm": "Are you sure you want to purge this topic?",
@@ -65,48 +72,48 @@
     "disabled_categories_note": "Vypnuté (disabled) kategorie jsou šedé.",
     "confirm_move": "Přesunout",
     "confirm_fork": "Rozdělit",
-    "favourite": "Bookmark",
-    "favourites": "Bookmarks",
-    "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
+    "favourite": "Záložka",
+    "favourites": "Záložky",
+    "favourites.has_no_favourites": "Zatím jste do záložek nepřidal žádné příspěvky.",
     "loading_more_posts": "Načítání více příspěvků",
     "move_topic": "Přesunout téma",
-    "move_topics": "Move Topics",
+    "move_topics": "Přesunout témata",
     "move_post": "Přesunout příspěvek",
-    "post_moved": "Post moved!",
+    "post_moved": "Příspěvek přesunut!",
     "fork_topic": "Rozdělit příspěvek",
     "topic_will_be_moved_to": "Toto téma bude přesunuto do kategorie",
     "fork_topic_instruction": "Vyber příspěvky, které chceš oddělit",
     "fork_no_pids": "Žádné příspěvky nebyly vybrány!",
     "fork_success": "Successfully forked topic! Click here to go to the forked topic.",
     "delete_posts_instruction": "Click the posts you want to delete/purge",
-    "composer.title_placeholder": "Enter your topic title here...",
-    "composer.handle_placeholder": "Name",
-    "composer.discard": "Discard",
-    "composer.submit": "Submit",
+    "composer.title_placeholder": "Zadejte název tématu...",
+    "composer.handle_placeholder": "Jméno",
+    "composer.discard": "Zrušit",
+    "composer.submit": "Odeslat",
     "composer.replying_to": "Replying to %1",
-    "composer.new_topic": "New Topic",
-    "composer.uploading": "uploading...",
-    "composer.thumb_url_label": "Paste a topic thumbnail URL",
-    "composer.thumb_title": "Add a thumbnail to this topic",
+    "composer.new_topic": "Nové téma",
+    "composer.uploading": "nahrávání...",
+    "composer.thumb_url_label": "Vložit URL náhled tématu",
+    "composer.thumb_title": "Přidat k tématu náhled",
     "composer.thumb_url_placeholder": "http://example.com/thumb.png",
-    "composer.thumb_file_label": "Or upload a file",
-    "composer.thumb_remove": "Clear fields",
+    "composer.thumb_file_label": "Nebo nahrajte soubor",
+    "composer.thumb_remove": "Vymazat pole",
     "composer.drag_and_drop_images": "Drag and Drop Images Here",
     "more_users_and_guests": "%1 more user(s) and %2 guest(s)",
     "more_users": "%1 more user(s)",
     "more_guests": "%1 more guest(s)",
     "users_and_others": "%1 and %2 others",
-    "sort_by": "Sort by",
-    "oldest_to_newest": "Oldest to Newest",
-    "newest_to_oldest": "Newest to Oldest",
-    "most_votes": "Most votes",
-    "most_posts": "Most posts",
-    "stale.title": "Create new topic instead?",
-    "stale.warning": "The topic you are replying to is quite old. Would you like to create a new topic instead, and reference this one in your reply?",
-    "stale.create": "Create a new topic",
-    "stale.reply_anyway": "Reply to this topic anyway",
+    "sort_by": "Řadit dle",
+    "oldest_to_newest": "Od nejstarších po nejnovější",
+    "newest_to_oldest": "Od nejnovějších po nejstarší",
+    "most_votes": "Nejvíce hlasů",
+    "most_posts": "Nejvíce příspěvků",
+    "stale.title": "Přesto vytvořit nové téma",
+    "stale.warning": "Reagujete na starší téma. Nechcete raději vytvořit téma nové a na původní v něm odkázat?",
+    "stale.create": "Vytvořit nové téma",
+    "stale.reply_anyway": "Přesto reagovat na toto téma",
     "link_back": "Re: [%1](%2)",
     "spam": "Spam",
-    "offensive": "Offensive",
-    "custom-flag-reason": "Enter a flagging reason"
+    "offensive": "Urážlivé",
+    "custom-flag-reason": "Vložte důvod oznámení"
 }
\ No newline at end of file
diff --git a/public/language/cs/unread.json b/public/language/cs/unread.json
index 1ded2636c9..0c6ee0319f 100644
--- a/public/language/cs/unread.json
+++ b/public/language/cs/unread.json
@@ -2,9 +2,12 @@
     "title": "Nepřečtené",
     "no_unread_topics": "Nejsou zde žádné nepřečtené témata.",
     "load_more": "Načíst další",
-    "mark_as_read": "Označit jako přeštené",
+    "mark_as_read": "Označit jako přečtené",
     "selected": "Vybrané",
     "all": "Vše",
-    "all_categories": "All categories",
-    "topics_marked_as_read.success": "Téma bylo označeno jako přečtené!"
+    "all_categories": "Všechny kategorie",
+    "topics_marked_as_read.success": "Téma bylo označeno jako přečtené!",
+    "all-topics": "Všechna témata",
+    "new-topics": "Nová témata",
+    "watched-topics": "Sledovaná témata"
 }
\ No newline at end of file
diff --git a/public/language/cs/uploads.json b/public/language/cs/uploads.json
index 1622cb5693..0adbf0d9f0 100644
--- a/public/language/cs/uploads.json
+++ b/public/language/cs/uploads.json
@@ -1,6 +1,6 @@
 {
-    "uploading-file": "Uploading the file...",
-    "select-file-to-upload": "Select a file to upload!",
-    "upload-success": "File uploaded successfully!",
+    "uploading-file": "Nahrávání souboru...",
+    "select-file-to-upload": "Vyberte soubor pro nahrání!",
+    "upload-success": "Soubor byl úspěšně nahrán!",
     "maximum-file-size": "Maximum %1 kb"
 }
\ No newline at end of file
diff --git a/public/language/cs/user.json b/public/language/cs/user.json
index 35fdc4db9b..7fb371137c 100644
--- a/public/language/cs/user.json
+++ b/public/language/cs/user.json
@@ -11,8 +11,8 @@
     "unban_account": "Odblokovat účet",
     "delete_account": "Vymazat účet",
     "delete_account_confirm": "Opravdu chcete smazat váš účet? <br /><strong>Tato akce je nevratná a nebude možné obnovit žádné vaše data.</strong><br /><br /> Pro potvrzení smazání účtu napište vaše uživatelské jméno.",
-    "delete_this_account_confirm": "Are you sure you want to delete this account? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
-    "account-deleted": "Account deleted",
+    "delete_this_account_confirm": "Skutečně chcete zrušit tento účet? <br /><strong>Tato akce je nevratná a již nebude žádná možnost obnovení vašich dat</strong><br /><br />",
+    "account-deleted": "Účet smazán",
     "fullname": "Jméno a příjmení",
     "website": "Webové stránky",
     "location": "Poloha",
@@ -22,7 +22,7 @@
     "profile": "Profil",
     "profile_views": "Zobrazení profilu",
     "reputation": "Reputace",
-    "favourites": "Bookmarks",
+    "favourites": "Záložky",
     "watched": "Sledován",
     "followers": "Sledují ho",
     "following": "Sleduje",
@@ -30,17 +30,17 @@
     "signature": "Podpis",
     "birthday": "Datum narození",
     "chat": "Chat",
-    "chat_with": "Chat with %1",
+    "chat_with": "Chatovat s %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",
+    "change_username": "Změnit uživatelské jméno",
+    "change_email": "Změnit email",
     "edit": "Upravit",
-    "edit-profile": "Edit Profile",
-    "default_picture": "Default Icon",
+    "edit-profile": "Editovat profil",
+    "default_picture": "Výchozí ikonka",
     "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",
@@ -54,23 +54,23 @@
     "change_password_success": "Heslo je aktualizované!",
     "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.",
-    "password_same_as_email": "Your password is the same as your email, please select another password.",
+    "username_taken_workaround": "Zvolené uživatelské jméno je již zabrané, takže jsme ho trochu upravili. Nyní jste znám jako <strong>%1</strong>",
+    "password_same_as_username": "Vaše heslo je stejné jako vaše přihlašovací jméno. Zvolte si prosím jiné heslo.",
+    "password_same_as_email": "Vaše heslo je stejné jako email. Vyberte si prosím jiné heslo.",
     "upload_picture": "Nahrát obrázek",
     "upload_a_picture": "Nahrát obrázek",
-    "remove_uploaded_picture": "Remove Uploaded Picture",
-    "upload_cover_picture": "Upload cover picture",
+    "remove_uploaded_picture": "Odstranit nahraný obrázek",
+    "upload_cover_picture": "Náhrát titulní obrázek",
     "settings": "Nastavení",
     "show_email": "Zobrazovat můj email v profilu",
     "show_fullname": "Zobrazovat celé jméno",
-    "restrict_chats": "Only allow chat messages from users I follow",
-    "digest_label": "Subscribe to Digest",
+    "restrict_chats": "Povolit chatovací zprávy pouze od uživatelů, které sleduji.",
+    "digest_label": "Odebírat přehled",
     "digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule",
-    "digest_off": "Off",
-    "digest_daily": "Daily",
-    "digest_weekly": "Weekly",
-    "digest_monthly": "Monthly",
+    "digest_off": "Vypnuto",
+    "digest_daily": "Denně",
+    "digest_weekly": "Týdně",
+    "digest_monthly": "Měsíčně",
     "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
     "send_post_notifications": "Send an email when replies are made to topics I am subscribed to",
     "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
@@ -85,21 +85,23 @@
     "email_hidden": "Skrytý email",
     "hidden": "skrytý",
     "paginate_description": "Paginate topics and posts instead of using infinite scroll",
-    "topics_per_page": "Topics per Page",
-    "posts_per_page": "Posts per Page",
-    "notification_sounds": "Play a sound when you receive a notification",
+    "topics_per_page": "Témat na stránce",
+    "posts_per_page": "Příspěvků na stránce",
+    "notification_sounds": "Přehrát zvuk když dostanete notifikaci",
     "browsing": "Browsing Settings",
     "open_links_in_new_tab": "Open outgoing links in new tab",
     "enable_topic_searching": "Enable In-Topic Searching",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
+    "delay_image_loading": "Delay Image Loading",
+    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
     "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Follow topics that you reply to",
-    "follow_topics_you_create": "Follow topics you create",
-    "grouptitle": "Select the group title you would like to display",
-    "no-group-title": "No group title",
-    "select-skin": "Select a Skin",
-    "select-homepage": "Select a Homepage",
-    "homepage": "Homepage",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Nadpis skupiny",
+    "no-group-title": "Žádný nadpis skupiny",
+    "select-skin": "Vybrat skin",
+    "select-homepage": "Vybrat domovskou stránku",
+    "homepage": "Domovská stránka",
     "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\")",
diff --git a/public/language/cs/users.json b/public/language/cs/users.json
index 6145c20f2a..217e4e3db1 100644
--- a/public/language/cs/users.json
+++ b/public/language/cs/users.json
@@ -2,19 +2,20 @@
     "latest_users": "Nejnovější uživatelé",
     "top_posters": "Nejaktivnější",
     "most_reputation": "Nejváženější",
+    "most_flags": "Most Flags",
     "search": "Vyhledávat",
     "enter_username": "Zadej uživatelské jméno k hledání",
     "load_more": "Načíst další",
-    "users-found-search-took": "%1 user(s) found! Search took %2 seconds.",
-    "filter-by": "Filter By",
-    "online-only": "Online only",
-    "invite": "Invite",
-    "invitation-email-sent": "An invitation email has been sent to %1",
-    "user_list": "User List",
-    "recent_topics": "Recent Topics",
-    "popular_topics": "Popular Topics",
-    "unread_topics": "Unread Topics",
-    "categories": "Categories",
-    "tags": "Tags",
-    "no-users-found": "No users found!"
+    "users-found-search-took": "Nalezeno %1 uživatel(ů) za %2 vteřiny.",
+    "filter-by": "Filtrovat dle",
+    "online-only": "Pouze online",
+    "invite": "Pozvat",
+    "invitation-email-sent": "E-mailová pozvánka byla odeslána na adresu %1",
+    "user_list": "Seznam uživatelů",
+    "recent_topics": "Poslední témata",
+    "popular_topics": "Oblíbená témata",
+    "unread_topics": "Nepřečtená témata",
+    "categories": "Kategorie",
+    "tags": "Tagy",
+    "no-users-found": "Nebyly nalezeny žádní uživatelé!"
 }
\ No newline at end of file
diff --git a/public/language/da/email.json b/public/language/da/email.json
index 0ed8b77a53..d5591d698d 100644
--- a/public/language/da/email.json
+++ b/public/language/da/email.json
@@ -24,6 +24,7 @@
     "digest.day": "dag",
     "digest.week": "uge",
     "digest.month": "måned",
+    "digest.subject": "Digest for %1",
     "notif.chat.subject": "Ny chat besked modtaget fra %1",
     "notif.chat.cta": "Klik her for at forsætte med samtalen",
     "notif.chat.unsub.info": "Denne chat notifikation blev sendt til dig pga. indstillingerne i dit abonnement.",
diff --git a/public/language/da/error.json b/public/language/da/error.json
index 148f312c98..589ef4a617 100644
--- a/public/language/da/error.json
+++ b/public/language/da/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Ugyldig Adgangskode",
     "invalid-username-or-password": "Venligst angiv både brugernavn og adgangskode",
     "invalid-search-term": "Ugyldig søgeterm",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Ugyldig side værdi, skal mindst være %1 og maks. %2",
     "username-taken": "Brugernavn optaget",
     "email-taken": "Emailadresse allerede i brug",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "Dette forum kræver bekræftelse af din email, klik her for at indtaste en email",
     "email-confirm-failed": "Vi kunne ikke bekræfte din email, prøv igen senere.",
     "confirm-email-already-sent": "Bekræftelses email er allerede afsendt, vent venligt %1 minut(ter) for at sende endnu en.",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "Brugernavn er for kort",
     "username-too-long": "Brugernavn er for langt",
     "password-too-long": "Kodeord er for langt",
     "user-banned": "Bruger er bortvist",
     "user-too-new": "Beklager, du er nødt til at vente %1 sekund(er) før du opretter dit indlæg",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "Kategorien eksisterer ikke",
     "no-topic": "Tråden eksisterer ikke",
     "no-post": "Indlægget eksisterer ikke",
@@ -38,6 +41,19 @@
     "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",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Venligst indtast et længere indlæg. Indlægget skal mindst indeholde %1 karakter(er).",
     "content-too-long": "Venligt indtast et kortere indlæg. Indlæg kan ikke være længere end %1 karakter(er).",
     "title-too-short": "Venligst indtast en længere titel. Titlen skal mindst indeholde %1 karakter(er).",
@@ -55,10 +71,12 @@
     "already-unfavourited": "Du har allerede fjernet dette indlæg fra bogmærker",
     "cant-ban-other-admins": "Du kan ikke udlukke andre administatrorer!",
     "cant-remove-last-admin": "Du er den eneste administrator. Tilføj en anden bruger som administrator før du fjerner dig selv som administrator",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Invalid billed type. De tilladte typer er: %1",
     "invalid-image-extension": "Forkert billede filnavnsendelse",
     "invalid-file-type": "Invalid fil type. Tilladte typer er: %1",
     "group-name-too-short": "Gruppe navn for kort",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Gruppen eksisterer allerede",
     "group-name-change-not-allowed": "Ændring af gruppe navn er ikke tilladt",
     "group-already-member": "Allerede medlem af denne gruppe",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "Du har ikke tilladelse til at redigere denne besked",
     "cant-remove-last-user": "Du kan ikke fjerne den sidste bruger",
     "cant-delete-chat-message": "Du har ikke tilladelse til at slette denne besked",
+    "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Vurderingssystem er slået fra.",
     "downvoting-disabled": "Nedvurdering er slået fra",
     "not-enough-reputation-to-downvote": "Du har ikke nok omdømme til at nedstemme dette indlæg",
@@ -99,5 +118,6 @@
     "no-session-found": "Ingen login session kan findes!",
     "not-in-room": "Bruger er ikke i rummet",
     "no-users-in-room": "Ingen brugere i rummet",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "You can't kick yourself from the group",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/da/login.json b/public/language/da/login.json
index 1aabf6ec75..2196a937ee 100644
--- a/public/language/da/login.json
+++ b/public/language/da/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Husk mig?",
     "forgot_password": "Glemt kodeord?",
     "alternative_logins": "alternative logins",
-    "failed_login_attempt": "Login mislykkedes, venligt prøv igen.",
+    "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Du har successfuldt logged in!",
     "dont_have_account": "Har du ikke en konto?"
 }
\ No newline at end of file
diff --git a/public/language/da/modules.json b/public/language/da/modules.json
index 31ea913abe..d54ad1ec52 100644
--- a/public/language/da/modules.json
+++ b/public/language/da/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Send og lås",
     "composer.toggle_dropdown": "Skift mellem dropdown",
     "composer.uploading": "Uploader %1",
+    "composer.formatting.bold": "Bold",
+    "composer.formatting.italic": "Italic",
+    "composer.formatting.list": "List",
+    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Picture",
+    "composer.upload-picture": "Upload Image",
+    "composer.upload-file": "Upload File",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Annuller",
     "bootbox.confirm": "Bekræft",
diff --git a/public/language/da/pages.json b/public/language/da/pages.json
index cfc7678ce8..0d4fbde6c3 100644
--- a/public/language/da/pages.json
+++ b/public/language/da/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Brugere med de fleste indlæg",
     "users/sort-reputation": "Brugere med mest omdømme",
     "users/banned": "Banlyste Brugere",
+    "users/most-flags": "Most flagged users",
     "users/search": "Bruger søgning",
     "notifications": "Notifikationer",
     "tags": "Tags",
diff --git a/public/language/da/topic.json b/public/language/da/topic.json
index 888384ced3..afa21d92a2 100644
--- a/public/language/da/topic.json
+++ b/public/language/da/topic.json
@@ -26,12 +26,13 @@
     "tools": "Værktøjer",
     "flag": "Marker",
     "locked": "Låst",
-    "bookmark_instructions": "Klik her for at returnere til det seneste ulæste indlæg i denne tråd.",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Meld dette indlæg til moderation",
     "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.",
     "not_following_topic.message": "Du vil ikke længere modtage notifikationer fra dette emne.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "Venligt registrer eller login for at abbonere på dette emne.",
     "markAsUnreadForAll.success": "Emnet er market ulæst for alle.",
     "mark_unread": "Marker ulæste",
@@ -41,6 +42,12 @@
     "watch.title": "Bliv notificeret ved nye indlæg i dette emne",
     "unwatch.title": "Fjern overvågning af dette emne",
     "share_this_post": "Del dette indlæg",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "Emne værktøjer",
     "thread_tools.markAsUnreadForAll": "Marker som ulæst",
     "thread_tools.pin": "Fastgør tråd",
diff --git a/public/language/da/unread.json b/public/language/da/unread.json
index e44b6e42fd..dbb45d6024 100644
--- a/public/language/da/unread.json
+++ b/public/language/da/unread.json
@@ -6,5 +6,8 @@
     "selected": "Valgte",
     "all": "Alle",
     "all_categories": "Alle kategorier",
-    "topics_marked_as_read.success": "Emner markeret som læst!"
+    "topics_marked_as_read.success": "Emner markeret som læst!",
+    "all-topics": "All Topics",
+    "new-topics": "New Topics",
+    "watched-topics": "Watched Topics"
 }
\ No newline at end of file
diff --git a/public/language/da/user.json b/public/language/da/user.json
index ebc1cba887..c409da0009 100644
--- a/public/language/da/user.json
+++ b/public/language/da/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Åben udgående link i en ny tab",
     "enable_topic_searching": "Slå In-Topic søgning til",
     "topic_search_help": "Hvis slået til, så vil in-topic søgning overskrive browserens almindelige søge function og tillade dig at søge hele emnet, istedet for kun det der er vist på skærmen",
+    "delay_image_loading": "Delay Image Loading",
+    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
     "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Følg emner du har skrevet indlæg i",
-    "follow_topics_you_create": "Følg emner du opretter",
-    "grouptitle": "Vælg gruppe titlen du gerne vil fremvise",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Group Title",
     "no-group-title": "Ingen gruppe titel",
     "select-skin": "Vælg et skin",
     "select-homepage": "Vælg en hjemmeside",
diff --git a/public/language/da/users.json b/public/language/da/users.json
index 71e4aef9f7..ea51cc7398 100644
--- a/public/language/da/users.json
+++ b/public/language/da/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Seneste brugere",
     "top_posters": "Top Postere",
     "most_reputation": "Mest Omdømme",
+    "most_flags": "Most Flags",
     "search": "Søg",
     "enter_username": "Indtast brugernavn for at søge",
     "load_more": "Indlæs mere",
diff --git a/public/language/de/email.json b/public/language/de/email.json
index 459cb40156..7ba24003a7 100644
--- a/public/language/de/email.json
+++ b/public/language/de/email.json
@@ -24,6 +24,7 @@
     "digest.day": "des letzten Tages",
     "digest.week": "der letzten Woche",
     "digest.month": "des letzen Monats",
+    "digest.subject": "Übersicht für %1",
     "notif.chat.subject": "Neue Chatnachricht von %1 erhalten",
     "notif.chat.cta": "Klicke hier, um die Unterhaltung fortzusetzen",
     "notif.chat.unsub.info": "Diese Chat-Benachrichtigung wurde dir aufgrund deiner Abonnement-Einstellungen gesendet.",
diff --git a/public/language/de/error.json b/public/language/de/error.json
index 40615e0e2e..4b32d2fa52 100644
--- a/public/language/de/error.json
+++ b/public/language/de/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Ungültiges Passwort",
     "invalid-username-or-password": "Bitte gebe einen Benutzernamen und ein Passwort an",
     "invalid-search-term": "Ungültige Suchanfrage",
+    "csrf-invalid": "Dein Login war nicht erfolgreich da wahrscheinlich deine Sitzung abgelaufen ist. Bitte versuche es noch einmal",
     "invalid-pagination-value": "Ungültige Seitennummerierung, muss mindestens %1 und maximal %2 sein",
     "username-taken": "Der Benutzername ist bereits vergeben",
     "email-taken": "Die E-Mail-Adresse ist bereits vergeben",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "Dieses Forum setzt eine E-Mail-Bestätigung voraus, bitte klicke hier um eine E-Mail-Adresse einzugeben.",
     "email-confirm-failed": "Wir konnten deine E-Mail-Adresse nicht bestätigen, bitte versuch es später noch einmal",
     "confirm-email-already-sent": "Die Bestätigungsmail wurde verschickt, bitte warte %1 Minute(n) um eine Weitere zu verschicken.",
+    "sendmail-not-found": "Sendmail wurde nicht gefunden. Bitte stelle sicher, dass es installiert ist und durch den Benutzer unter dem NodeBB läuft ausgeführt werden kann.",
     "username-too-short": "Benutzername ist zu kurz",
     "username-too-long": "Benutzername ist zu lang",
     "password-too-long": "Passwort ist zu lang",
     "user-banned": "Benutzer ist gesperrt",
     "user-too-new": "Entschuldigung, du musst %1 Sekunde(n) warten, bevor du deinen ersten Beitrag schreiben kannst.",
     "blacklisted-ip": "Deine IP-Adresse ist für diese Plattform gesperrt. Sollte dies ein Irrtum sein, dann kontaktiere bitte einen Administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "Die Kategorie existiert nicht",
     "no-topic": "Das Thema existiert nicht",
     "no-post": "Der Beitrag existiert nicht",
@@ -38,6 +41,19 @@
     "category-disabled": "Kategorie ist deaktiviert",
     "topic-locked": "Thema ist gesperrt",
     "post-edit-duration-expired": "Entschuldigung, du darfst Beiträge nur %1 Sekunde(n) nach dem Veröffentlichen editieren.",
+    "post-edit-duration-expired-minutes": "Du darfst Beiträge lediglich innerhalb von %1 Minuten/n nach dem Erstellen editieren",
+    "post-edit-duration-expired-minutes-seconds": "Du darfst Beiträge lediglich innerhalb von %1 Minuten/n und %2 Sekunden nach dem Erstellen editieren",
+    "post-edit-duration-expired-hours": "Du darfst Beiträge lediglich innerhalb von %1 Stunde/n nach dem Erstellen editieren",
+    "post-edit-duration-expired-hours-minutes": "Du darfst Beiträge lediglich innerhalb von %1 Stunde/n und %2 Minute/n nach dem Erstellen editieren",
+    "post-edit-duration-expired-days": "Du darfst Beiträge lediglich innerhalb von %1 Tag/en nach dem Erstellen editieren",
+    "post-edit-duration-expired-days-hours": "Du darfst Beiträge lediglich innerhalb von %1 Tag/en und %2 Stunde/n nach dem Erstellen editieren",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Bitte schreibe einen längeren Beitrag. Beiträge sollten mindestens %1 Zeichen enthalten.",
     "content-too-long": "Bitte schreibe einen kürzeren Beitrag. Beiträge können nicht länger als %1 Zeichen sein.",
     "title-too-short": "Bitte gebe einen längeren Titel ein. Ein Titel muss mindestens %1 Zeichen enthalten.",
@@ -55,10 +71,12 @@
     "already-unfavourited": "Du hast diesen Beitrag bereits aus deinen Lesezeichen entfernt",
     "cant-ban-other-admins": "Du kannst andere Administratoren nicht sperren!",
     "cant-remove-last-admin": "Du bist der einzige Administrator. Füge zuerst einen anderen Administrator hinzu, bevor du dich selbst als Administrator entfernst",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Falsche Bildart. Erlaubte Arten sind: %1",
     "invalid-image-extension": "Ungültige Dateinamenerweiterung",
     "invalid-file-type": "Ungültiger Dateityp. Erlaubte Typen sind: %1",
     "group-name-too-short": "Gruppenname zu kurz",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Gruppe existiert bereits",
     "group-name-change-not-allowed": "Du kannst den Namen der Gruppe nicht ändern",
     "group-already-member": "Bereits Teil dieser Gruppe",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "Du darfst diese Nachricht nicht ändern",
     "cant-remove-last-user": "Du kannst den letzten Benutzer nicht entfernen",
     "cant-delete-chat-message": "Du darfst diese Nachricht nicht löschen",
+    "already-voting-for-this-post": "Du hast diesen Beitrag bereits bewertet.",
     "reputation-system-disabled": "Das Reputationssystem ist deaktiviert.",
     "downvoting-disabled": "Downvotes sind deaktiviert.",
     "not-enough-reputation-to-downvote": "Dein Ansehen ist zu niedrig, um diesen Beitrag negativ zu bewerten.",
@@ -99,5 +118,6 @@
     "no-session-found": "Keine Login-Sitzung gefunden!",
     "not-in-room": "Benutzer nicht im Raum",
     "no-users-in-room": "In diesem Raum befinden sich keine Benutzer.",
-    "cant-kick-self": "Du kannst dich nicht selber aus der Gruppe entfernen."
+    "cant-kick-self": "Du kannst dich nicht selber aus der Gruppe entfernen.",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/de/login.json b/public/language/de/login.json
index 8551266044..efa95cac28 100644
--- a/public/language/de/login.json
+++ b/public/language/de/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Eingeloggt bleiben?",
     "forgot_password": "Passwort vergessen?",
     "alternative_logins": "Alternative Logins",
-    "failed_login_attempt": " Anmeldeversuch fehlgeschlagen, versuche es erneut.",
+    "failed_login_attempt": "Login fehlgeschlagen",
     "login_successful": "Du hast dich erfolgreich eingeloggt!",
     "dont_have_account": "Du hast noch kein Konto?"
 }
\ No newline at end of file
diff --git a/public/language/de/modules.json b/public/language/de/modules.json
index 2210c035fd..e5f569dbed 100644
--- a/public/language/de/modules.json
+++ b/public/language/de/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Einreichen und Sperren",
     "composer.toggle_dropdown": "Menu aus-/einblenden",
     "composer.uploading": "Lade %1 hoch",
+    "composer.formatting.bold": "Fett",
+    "composer.formatting.italic": "Kursiv",
+    "composer.formatting.list": "Liste",
+    "composer.formatting.strikethrough": "Durchstreichen",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Bild",
+    "composer.upload-picture": "Bild hochladen",
+    "composer.upload-file": "Datei hochladen",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Abbrechen",
     "bootbox.confirm": "Bestätigen",
diff --git a/public/language/de/pages.json b/public/language/de/pages.json
index 743f286bd4..9bb4b009c5 100644
--- a/public/language/de/pages.json
+++ b/public/language/de/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Benutzer mit den meisten Beiträgen",
     "users/sort-reputation": "Benutzer mit dem höchsten Ansehen",
     "users/banned": "Gesperrte Benutzer",
+    "users/most-flags": "Most flagged users",
     "users/search": "Benutzer Suche",
     "notifications": "Benachrichtigungen",
     "tags": "Markierungen",
diff --git a/public/language/de/topic.json b/public/language/de/topic.json
index 2b34c42911..f58a51013f 100644
--- a/public/language/de/topic.json
+++ b/public/language/de/topic.json
@@ -26,12 +26,13 @@
     "tools": "Werkzeuge",
     "flag": "Markieren",
     "locked": "Gesperrt",
-    "bookmark_instructions": "Klicke hier um zum letzten ungelesenen Beitrag in diesem Thema zu springen.",
+    "bookmark_instructions": "Klicke hier, um zum letzten gelesenen Beitrag des Themas zurückzukehren.",
     "flag_title": "Diesen Beitrag zur Moderation markieren",
     "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.",
     "not_following_topic.message": "Du erhälst keine weiteren Benachrichtigungen zu diesem Thema mehr.",
+    "ignoring_topic.message": "Ungelesene Beiträge in diesem Thema werden nicht mehr angezeigt. Du erhältst eine Benachrichtigung wenn du in diesem Thema erwähnt wirst oder deine Beiträge positiv bewertet werden.",
     "login_to_subscribe": "Bitte registrieren oder einloggen um dieses Thema zu abonnieren",
     "markAsUnreadForAll.success": "Thema für Alle als ungelesen markiert.",
     "mark_unread": "Als ungelesen markieren",
@@ -41,6 +42,12 @@
     "watch.title": "Bei neuen Antworten benachrichtigen",
     "unwatch.title": "Dieses Thema nicht mehr beobachten",
     "share_this_post": "Diesen Beitrag teilen",
+    "watching": "Beobachtet",
+    "not-watching": "Nicht beobachtet",
+    "ignoring": "Ignoriert",
+    "watching.description": "Benachrichtigung bei neuen Beiträgen.<br/>Ungelesen Beiträge anzeigen.",
+    "not-watching.description": "Keine Benachrichtigung bei neuen Beiträgen.<br/>Ungelesen Beiträge anzeigen wenn die Kategorie nicht ignoriert wird.",
+    "ignoring.description": "Keine Benachrichtigung bei neuen Beiträgen.<br/>Ungelesene Beiträge nicht anzeigen.",
     "thread_tools.title": "Themen-Werkzeuge",
     "thread_tools.markAsUnreadForAll": "Als ungelesen markieren",
     "thread_tools.pin": "Thema anheften",
diff --git a/public/language/de/unread.json b/public/language/de/unread.json
index b9796b7c41..3c7cabe4ae 100644
--- a/public/language/de/unread.json
+++ b/public/language/de/unread.json
@@ -6,5 +6,8 @@
     "selected": "Ausgewählte",
     "all": "Alle",
     "all_categories": "Alle Kategorien",
-    "topics_marked_as_read.success": "Themen als gelesen markiert!"
+    "topics_marked_as_read.success": "Themen als gelesen markiert!",
+    "all-topics": "Alle Themen",
+    "new-topics": "Neue Themen",
+    "watched-topics": "Beobachtete Themen"
 }
\ No newline at end of file
diff --git a/public/language/de/user.json b/public/language/de/user.json
index e4fd8b8f8e..2a07d53cd3 100644
--- a/public/language/de/user.json
+++ b/public/language/de/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Ausgehende Links in neuem Tab öffnen",
     "enable_topic_searching": "Suchen innerhalb von Themen aktivieren",
     "topic_search_help": "Wenn aktiviert, ersetzt die im-Thema-Suche die Standardsuche des Browsers. Dadurch kannst du im ganzen Thema suchen, nicht nur im sichtbaren Abschnitt.",
+    "delay_image_loading": "Bilder nachladen",
+    "image_load_delay_help": "Wenn aktiviert, werden Bilder in Themen erst dann geladen, wenn sie in den sichtbaren Bereich gescrollt werden",
     "scroll_to_my_post": "Zeige eigene Antwort nach dem Erstellen im Thema an",
-    "follow_topics_you_reply_to": "Themen folgen, in denen auf dich geantwortet wird",
-    "follow_topics_you_create": "Themen folgen, die du erstellst",
-    "grouptitle": "Wähle den anzuzeigenden Gruppen Titel aus",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Gruppentitel",
     "no-group-title": "Kein Gruppentitel",
     "select-skin": "Einen Skin auswählen",
     "select-homepage": "Startseite",
diff --git a/public/language/de/users.json b/public/language/de/users.json
index 9a25653e0d..4b06e85635 100644
--- a/public/language/de/users.json
+++ b/public/language/de/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Neuste Benutzer",
     "top_posters": "meiste Beiträge",
     "most_reputation": "höchstes Ansehen",
+    "most_flags": "Most Flags",
     "search": "Suchen",
     "enter_username": "Benutzer durchsuchen",
     "load_more": "mehr laden",
diff --git a/public/language/el/email.json b/public/language/el/email.json
index 936eabdd43..3f5adb3021 100644
--- a/public/language/el/email.json
+++ b/public/language/el/email.json
@@ -24,6 +24,7 @@
     "digest.day": "day",
     "digest.week": "week",
     "digest.month": "month",
+    "digest.subject": "Digest for %1",
     "notif.chat.subject": "Νέο μήνυμα συνομιλίας από τον/την %1",
     "notif.chat.cta": "Κάνε κλικ εδώ για να πας στην συνομιλία",
     "notif.chat.unsub.info": "Αυτή η ειδοποίηση για συνομιλία σου στάλθηκε λόγω των ρυθμίσεών σου. ",
diff --git a/public/language/el/error.json b/public/language/el/error.json
index 388ec06c89..d1086fe787 100644
--- a/public/language/el/error.json
+++ b/public/language/el/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Άκυρος Κωδικός",
     "invalid-username-or-password": "Παρακαλώ γράψε το όνομα χρήστη και τον κωδικό",
     "invalid-search-term": "Άκυρος όρος αναζήτησης",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "Το όνομα χρήστη είναι πιασμένο",
     "email-taken": "Το email είναι πιασμένο",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
     "email-confirm-failed": "We could not confirm your email, please try again later.",
     "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "Το όνομα χρήστη είναι πολύ μικρό",
     "username-too-long": "Το όνομα χρήστη είναι πολύ μεγάλο",
     "password-too-long": "Password too long",
     "user-banned": "Ο Χρήστης είναι αποκλεισμένος/η",
     "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "Category does not exist",
     "no-topic": "Topic does not exist",
     "no-post": "Post does not exist",
@@ -38,6 +41,19 @@
     "category-disabled": "Η κατηγορία έχει απενεργοποιηθεί",
     "topic-locked": "Το θέμα έχει κλειδωθεί",
     "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
     "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
@@ -55,10 +71,12 @@
     "already-unfavourited": "You have already unbookmarked this post",
     "cant-ban-other-admins": "Δεν μπορείς να αποκλείσεις άλλους διαχειριστές!",
     "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Invalid image type. Allowed types are: %1",
     "invalid-image-extension": "Invalid image extension",
     "invalid-file-type": "Invalid file type. Allowed types are: %1",
     "group-name-too-short": "Το όνομα της ομάδας είναι πολύ μικρό",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Το όνομα της ομάδας υπάρχει ήδη",
     "group-name-change-not-allowed": "Αλλαγή του ονόματος της ομάδας δεν επιτρέπεται",
     "group-already-member": "Already part of this group",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "You are not allowed to edit this message",
     "cant-remove-last-user": "You can't remove the last user",
     "cant-delete-chat-message": "You are not allowed to delete this message",
+    "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Το σύστημα φήμης έχει απενεργοποιηθεί.",
     "downvoting-disabled": "Η καταψήφιση έχει απενεργοποιηθεί",
     "not-enough-reputation-to-downvote": "Δεν έχεις αρκετή φήμη για να καταψηφίσεις αυτή την δημοσίευση",
@@ -99,5 +118,6 @@
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
     "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "You can't kick yourself from the group",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/el/login.json b/public/language/el/login.json
index 6c10fb3de8..c46d2220f5 100644
--- a/public/language/el/login.json
+++ b/public/language/el/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Απομνημόνευση;",
     "forgot_password": "Ξέχασες τον κωδικό σου;",
     "alternative_logins": "Εναλλακτικά Login",
-    "failed_login_attempt": "Η προσπάθεια σύνδεσης απέτυχε, παρακαλώ προσπάθησε ξανά.",
+    "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Συνδέθηκες επιτυχώς!",
     "dont_have_account": "Δεν έχεις λογαριασμό;"
 }
\ No newline at end of file
diff --git a/public/language/el/modules.json b/public/language/el/modules.json
index 4b1dc9e48a..af0d74e3cd 100644
--- a/public/language/el/modules.json
+++ b/public/language/el/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Submit and Lock",
     "composer.toggle_dropdown": "Toggle Dropdown",
     "composer.uploading": "Uploading %1",
+    "composer.formatting.bold": "Bold",
+    "composer.formatting.italic": "Italic",
+    "composer.formatting.list": "List",
+    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Picture",
+    "composer.upload-picture": "Upload Image",
+    "composer.upload-file": "Upload File",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",
diff --git a/public/language/el/pages.json b/public/language/el/pages.json
index 092f813826..a6ac3ea6ee 100644
--- a/public/language/el/pages.json
+++ b/public/language/el/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Users with the most posts",
     "users/sort-reputation": "Users with the most reputation",
     "users/banned": "Banned Users",
+    "users/most-flags": "Most flagged users",
     "users/search": "User Search",
     "notifications": "Ειδοποιήσεις",
     "tags": "Tags",
diff --git a/public/language/el/topic.json b/public/language/el/topic.json
index a2f1d0fcd7..868cb0f650 100644
--- a/public/language/el/topic.json
+++ b/public/language/el/topic.json
@@ -26,12 +26,13 @@
     "tools": "Εργαλεία",
     "flag": "Σημαία",
     "locked": "Κλειδωμένο",
-    "bookmark_instructions": "Click here to return to the last unread post in this thread.",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Επισήμανση αυτής της δημοσίευσης για συντονισμό",
     "flag_success": "Αυτή η δημοσίευση έχει επισημανθεί για συντονισμό.",
     "deleted_message": "Το θέμα αυτό έχει διαγραφεί. Μόνο οι χρήστες με δικαιώματα διαχειριστή θεμάτων μπορούν να το δουν.",
     "following_topic.message": "Θα λαμβάνεις ειδοποιήσεις όποτε κάποιος δημοσιεύει κάτι σε αυτό το θέμα.",
     "not_following_topic.message": "Δεν θα λαμβάνεις άλλες ειδοποιήσεις από αυτό το θέμα.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "Παρακαλώ εγγράψου ή συνδέσου για για γραφτείς σε αυτό το θέμα.",
     "markAsUnreadForAll.success": "Το θέμα σημειώθηκε ως μη αναγνωσμένο για όλους.",
     "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
     "watch.title": "Να ειδοποιούμαι για νέες απαντήσεις σε αυτό το θέμα",
     "unwatch.title": "Να μην παρακολουθώ αυτό το θέμα",
     "share_this_post": "Μοιράσου αυτή την Δημοσίευση",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "Εργαλεία Θέματος",
     "thread_tools.markAsUnreadForAll": "Σημείωση ως μη αναγνωσμέν",
     "thread_tools.pin": "Καρφίτσωμα Θέματος",
diff --git a/public/language/el/unread.json b/public/language/el/unread.json
index 98aea93e27..803596873f 100644
--- a/public/language/el/unread.json
+++ b/public/language/el/unread.json
@@ -6,5 +6,8 @@
     "selected": "Επιλεγμένα",
     "all": "Όλα",
     "all_categories": "All categories",
-    "topics_marked_as_read.success": "Τα θέματα σημειώθηκαν ως αναγνωσμένα!"
+    "topics_marked_as_read.success": "Τα θέματα σημειώθηκαν ως αναγνωσμένα!",
+    "all-topics": "All Topics",
+    "new-topics": "New Topics",
+    "watched-topics": "Watched Topics"
 }
\ No newline at end of file
diff --git a/public/language/el/user.json b/public/language/el/user.json
index 7b6eed3269..5a4c0c3649 100644
--- a/public/language/el/user.json
+++ b/public/language/el/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Open outgoing links in new tab",
     "enable_topic_searching": "Enable In-Topic Searching",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
+    "delay_image_loading": "Delay Image Loading",
+    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
     "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Follow topics that you reply to",
-    "follow_topics_you_create": "Follow topics you create",
-    "grouptitle": "Select the group title you would like to display",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Group Title",
     "no-group-title": "No group title",
     "select-skin": "Select a Skin",
     "select-homepage": "Select a Homepage",
diff --git a/public/language/el/users.json b/public/language/el/users.json
index 39bba616e6..be5f770f99 100644
--- a/public/language/el/users.json
+++ b/public/language/el/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Πρόσφατοι Χρήστες",
     "top_posters": "Top Δημοσιεύοντες",
     "most_reputation": "Υψηλότερη Φήμη",
+    "most_flags": "Most Flags",
     "search": "Αναζήτηση",
     "enter_username": "Γράψε ένα όνομα χρήστη προς αναζήτηση",
     "load_more": "Φόρτωση περισσότερων",
diff --git a/public/language/en@pirate/category.json b/public/language/en@pirate/category.json
index 631d322e1a..77f9fdcb92 100644
--- a/public/language/en@pirate/category.json
+++ b/public/language/en@pirate/category.json
@@ -7,10 +7,10 @@
     "browsing": "browsin'",
     "no_replies": "No one has replied to ye message",
     "no_new_posts": "Thar be no new posts.",
-    "share_this_category": "Share this category",
-    "watch": "Watch",
-    "ignore": "Ignore",
+    "share_this_category": "Share 'tis category",
+    "watch": "Be watchin'",
+    "ignore": "Be ignorin'",
     "watch.message": "Ye now be watchin' updates from 'tis category",
     "ignore.message": "Ye now be ignorin' updates from 'tis category",
-    "watched-categories": "Watched categories"
+    "watched-categories": "Categories ye be watchin'"
 }
\ No newline at end of file
diff --git a/public/language/en@pirate/email.json b/public/language/en@pirate/email.json
index 1b8d512945..1ffc2ef7a7 100644
--- a/public/language/en@pirate/email.json
+++ b/public/language/en@pirate/email.json
@@ -1,14 +1,14 @@
 {
     "password-reset-requested": "Password Reset Requested - %1!",
-    "welcome-to": "Welcome to %1",
-    "invite": "Invitation from %1",
+    "welcome-to": "Ahoy thar %1!",
+    "invite": "Ye be invited by %1",
     "greeting_no_name": "Hello",
     "greeting_with_name": "Hello %1",
     "welcome.text1": "Thank you for registering with %1!",
     "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.",
     "welcome.text3": "An administrator has accepted your registration application. You can login with your username/password now.",
     "welcome.cta": "Click here to confirm your email address",
-    "invitation.text1": "%1 has invited you to join %2",
+    "invitation.text1": "%1 be invitin' ye to join %2",
     "invitation.ctr": "Click here to create your account.",
     "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
     "reset.text2": "To continue with the password reset, please click on the following link:",
@@ -24,6 +24,7 @@
     "digest.day": "day",
     "digest.week": "week",
     "digest.month": "month",
+    "digest.subject": "Digest for %1",
     "notif.chat.subject": "New chat message received from %1",
     "notif.chat.cta": "Click here to continue the conversation",
     "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
diff --git a/public/language/en@pirate/error.json b/public/language/en@pirate/error.json
index 0709e823b6..85292ab05e 100644
--- a/public/language/en@pirate/error.json
+++ b/public/language/en@pirate/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Invalid Password",
     "invalid-username-or-password": "Please specify both a username and password",
     "invalid-search-term": "Invalid search term",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "Username taken",
     "email-taken": "Email taken",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
     "email-confirm-failed": "We could not confirm your email, please try again later.",
     "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "Username too short",
     "username-too-long": "Username too long",
     "password-too-long": "Password too long",
     "user-banned": "User banned",
     "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "Category does not exist",
     "no-topic": "Topic does not exist",
     "no-post": "Post does not exist",
@@ -38,6 +41,19 @@
     "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",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
     "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
@@ -55,10 +71,12 @@
     "already-unfavourited": "You have already unbookmarked this post",
     "cant-ban-other-admins": "You can't ban other admins!",
     "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Invalid image type. Allowed types are: %1",
     "invalid-image-extension": "Invalid image extension",
     "invalid-file-type": "Invalid file type. Allowed types are: %1",
     "group-name-too-short": "Group name too short",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Group already exists",
     "group-name-change-not-allowed": "Group name change not allowed",
     "group-already-member": "Already part of this group",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "You are not allowed to edit this message",
     "cant-remove-last-user": "You can't remove the last user",
     "cant-delete-chat-message": "You are not allowed to delete this message",
+    "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Reputation system is disabled.",
     "downvoting-disabled": "Downvoting is disabled",
     "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",
@@ -99,5 +118,6 @@
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
     "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "You can't kick yourself from the group",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/en@pirate/login.json b/public/language/en@pirate/login.json
index 6e7b7a36c0..a27ed4d761 100644
--- a/public/language/en@pirate/login.json
+++ b/public/language/en@pirate/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Remember Me?",
     "forgot_password": "My mind be a scatt'rbrain, help a matey out!",
     "alternative_logins": "Oth'r gangplanks",
-    "failed_login_attempt": "Failed login attempt, please give it a go' again.",
+    "failed_login_attempt": "Ye be refused boardin'",
     "login_successful": "Welcome on board, matey!",
     "dont_have_account": "Don't have an account?"
 }
\ No newline at end of file
diff --git a/public/language/en@pirate/modules.json b/public/language/en@pirate/modules.json
index 0ae551df59..974cdf1b43 100644
--- a/public/language/en@pirate/modules.json
+++ b/public/language/en@pirate/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Submit and Lock",
     "composer.toggle_dropdown": "Toggle Dropdown",
     "composer.uploading": "Uploading %1",
+    "composer.formatting.bold": "Bold",
+    "composer.formatting.italic": "Italic",
+    "composer.formatting.list": "List",
+    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Picture",
+    "composer.upload-picture": "Upload Image",
+    "composer.upload-file": "Upload File",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",
diff --git a/public/language/en@pirate/pages.json b/public/language/en@pirate/pages.json
index 285aa30017..3309d4ced7 100644
--- a/public/language/en@pirate/pages.json
+++ b/public/language/en@pirate/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Users with the most posts",
     "users/sort-reputation": "Users with the most reputation",
     "users/banned": "Banned Users",
+    "users/most-flags": "Most flagged users",
     "users/search": "User Search",
     "notifications": "Notifications",
     "tags": "Tags",
diff --git a/public/language/en@pirate/topic.json b/public/language/en@pirate/topic.json
index c7ce76e07b..ab97715c5b 100644
--- a/public/language/en@pirate/topic.json
+++ b/public/language/en@pirate/topic.json
@@ -26,12 +26,13 @@
     "tools": "Tools",
     "flag": "Flag",
     "locked": "Locked",
-    "bookmark_instructions": "Click here to return to the last unread post in this thread.",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Flag this post for moderation",
     "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.",
     "not_following_topic.message": "You will no longer receive notifications from this topic.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
     "markAsUnreadForAll.success": "Topic marked as unread for all.",
     "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
     "watch.title": "Be notified of new replies in this topic",
     "unwatch.title": "Stop watching this topic",
     "share_this_post": "Share this Post",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "Topic Tools",
     "thread_tools.markAsUnreadForAll": "Mark Unread",
     "thread_tools.pin": "Pin Topic",
diff --git a/public/language/en@pirate/unread.json b/public/language/en@pirate/unread.json
index 994ee938f1..37133f87ef 100644
--- a/public/language/en@pirate/unread.json
+++ b/public/language/en@pirate/unread.json
@@ -6,5 +6,8 @@
     "selected": "Selected",
     "all": "All",
     "all_categories": "All categories",
-    "topics_marked_as_read.success": "Topics marked as read!"
+    "topics_marked_as_read.success": "Topics marked as read!",
+    "all-topics": "All Topics",
+    "new-topics": "New Topics",
+    "watched-topics": "Watched Topics"
 }
\ No newline at end of file
diff --git a/public/language/en@pirate/uploads.json b/public/language/en@pirate/uploads.json
index 1622cb5693..f124670d4e 100644
--- a/public/language/en@pirate/uploads.json
+++ b/public/language/en@pirate/uploads.json
@@ -1,6 +1,6 @@
 {
     "uploading-file": "Uploading the file...",
     "select-file-to-upload": "Select a file to upload!",
-    "upload-success": "File uploaded successfully!",
+    "upload-success": "Ye file be uploaded!",
     "maximum-file-size": "Maximum %1 kb"
 }
\ No newline at end of file
diff --git a/public/language/en@pirate/user.json b/public/language/en@pirate/user.json
index 0b5959462f..d2f9fa0707 100644
--- a/public/language/en@pirate/user.json
+++ b/public/language/en@pirate/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Open outgoing links in new tab",
     "enable_topic_searching": "Enable In-Topic Searching",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
+    "delay_image_loading": "Delay Image Loading",
+    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
     "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Follow topics that you reply to",
-    "follow_topics_you_create": "Follow topics you create",
-    "grouptitle": "Select the group title you would like to display",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Group Title",
     "no-group-title": "No group title",
     "select-skin": "Select a Skin",
     "select-homepage": "Select a Homepage",
diff --git a/public/language/en@pirate/users.json b/public/language/en@pirate/users.json
index 738f85d740..d1213c8f1f 100644
--- a/public/language/en@pirate/users.json
+++ b/public/language/en@pirate/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Land lubbers",
     "top_posters": "Top mateys",
     "most_reputation": "Most Reputation",
+    "most_flags": "Most Flags",
     "search": "Search",
     "enter_username": "Gimme y'er handle",
     "load_more": "Load More",
diff --git a/public/language/en_GB/category.json b/public/language/en_GB/category.json
index f8b02f32f8..d4da76f356 100644
--- a/public/language/en_GB/category.json
+++ b/public/language/en_GB/category.json
@@ -13,6 +13,10 @@
 	"share_this_category": "Share this category",
 	"watch": "Watch",
 	"ignore": "Ignore",
+	"watching": "Watching",
+	"ignoring": "Ignoring",
+	"watching.description": "Show topics in unread",
+	"ignoring.description": "Do not show topics in unread",
 
 	"watch.message": "You are now watching updates from this category",
 	"ignore.message": "You are now ignoring updates from this category",
diff --git a/public/language/en_GB/error.json b/public/language/en_GB/error.json
index 65e2c584df..dd0e7e8780 100644
--- a/public/language/en_GB/error.json
+++ b/public/language/en_GB/error.json
@@ -17,6 +17,7 @@
 	"invalid-password": "Invalid Password",
 	"invalid-username-or-password": "Please specify both a username and password",
 	"invalid-search-term": "Invalid search term",
+	"csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
 
 	"invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
 
@@ -27,6 +28,7 @@
 	"no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
 	"email-confirm-failed": "We could not confirm your email, please try again later.",
 	"confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
+	"sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
 
 	"username-too-short": "Username too short",
 	"username-too-long": "Username too long",
@@ -35,6 +37,7 @@
 	"user-banned": "User banned",
 	"user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
 	"blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+	"ban-expiry-missing": "Please provide an end date for this ban",
 
 	"no-category": "Category does not exist",
 	"no-topic": "Topic does not exist",
@@ -48,6 +51,20 @@
 
 	"topic-locked": "Topic Locked",
 	"post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
+	"post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+	"post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+	"post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+	"post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+	"post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+	"post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+
+	"post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+	"post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+	"post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+	"post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+	"post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+	"post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+	"post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
 
 	"content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
 	"content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
@@ -70,12 +87,14 @@
 
 	"cant-ban-other-admins": "You can't ban other admins!",
 	"cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+	"cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
 
 	"invalid-image-type": "Invalid image type. Allowed types are: %1",
 	"invalid-image-extension": "Invalid image extension",
 	"invalid-file-type": "Invalid file type. Allowed types are: %1",
 
 	"group-name-too-short": "Group name too short",
+	"group-name-too-long": "Group name too long",
 	"group-already-exists": "Group already exists",
 	"group-name-change-not-allowed": "Group name change not allowed",
 	"group-already-member": "Already part of this group",
@@ -128,5 +147,6 @@
 	"no-session-found": "No login session found!",
 	"not-in-room": "User not in room",
 	"no-users-in-room": "No users in this room",
-	"cant-kick-self": "You can't kick yourself from the group"
+	"cant-kick-self": "You can't kick yourself from the group",
+	"no-users-selected": "No user(s) selected"
 }
diff --git a/public/language/en_GB/global.json b/public/language/en_GB/global.json
index a7959aa349..226589b8af 100644
--- a/public/language/en_GB/global.json
+++ b/public/language/en_GB/global.json
@@ -63,7 +63,9 @@
 	"topics": "Topics",
 	"posts": "Posts",
 	"best": "Best",
+	"upvoters": "Upvoters",
 	"upvoted": "Upvoted",
+	"downvoters": "Downvoters",
 	"downvoted": "Downvoted",
 	"views": "Views",
 	"reputation": "Reputation",
diff --git a/public/language/en_GB/login.json b/public/language/en_GB/login.json
index 02abac6371..e76658fe3d 100644
--- a/public/language/en_GB/login.json
+++ b/public/language/en_GB/login.json
@@ -5,7 +5,7 @@
 	"remember_me": "Remember Me?",
 	"forgot_password": "Forgot Password?",
 	"alternative_logins": "Alternative Logins",
-	"failed_login_attempt": "Failed login attempt, please try again.",
+	"failed_login_attempt": "Login Unsuccessful",
 	"login_successful": "You have successfully logged in!",
 	"dont_have_account": "Don't have an account?"
 }
diff --git a/public/language/en_GB/modules.json b/public/language/en_GB/modules.json
index a3db35f6e3..6ad92fb217 100644
--- a/public/language/en_GB/modules.json
+++ b/public/language/en_GB/modules.json
@@ -30,6 +30,14 @@
 	"composer.submit_and_lock": "Submit and Lock",
 	"composer.toggle_dropdown": "Toggle Dropdown",
 	"composer.uploading": "Uploading %1",
+	"composer.formatting.bold": "Bold",
+	"composer.formatting.italic": "Italic",
+	"composer.formatting.list": "List",
+	"composer.formatting.strikethrough": "Strikethrough",
+	"composer.formatting.link": "Link",
+	"composer.formatting.picture": "Picture",
+	"composer.upload-picture": "Upload Image",
+	"composer.upload-file": "Upload File",
 
 	"bootbox.ok": "OK",
 	"bootbox.cancel": "Cancel",
diff --git a/public/language/en_GB/notifications.json b/public/language/en_GB/notifications.json
index 07ec757374..5a2ed58908 100644
--- a/public/language/en_GB/notifications.json
+++ b/public/language/en_GB/notifications.json
@@ -18,9 +18,6 @@
 	"upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
 	"moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
 	"moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
-	"favourited_your_post_in": "<strong>%1</strong> has bookmarked your post in <strong>%2</strong>.",
-	"favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have bookmarked your post in <strong>%3</strong>.",
-	"favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have bookmarked your post in <strong>%3</strong>.",
 	"user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
 	"user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
 	"user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
diff --git a/public/language/en_GB/pages.json b/public/language/en_GB/pages.json
index bbdf3cdc47..52339d7830 100644
--- a/public/language/en_GB/pages.json
+++ b/public/language/en_GB/pages.json
@@ -13,6 +13,7 @@
 	"users/sort-posts": "Users with the most posts",
 	"users/sort-reputation": "Users with the most reputation",
 	"users/banned": "Banned Users",
+	"users/most-flags": "Most flagged users",
 	"users/search": "User Search",
 
 	"notifications": "Notifications",
@@ -33,6 +34,7 @@
 	"account/edit/password": "Editing password of \"%1\"",
 	"account/edit/username": "Editing username of \"%1\"",
 	"account/edit/email": "Editing email of \"%1\"",
+	"account/info": "Account Info",
 	"account/following": "People %1 follows",
 	"account/followers": "People who follow %1",
 	"account/posts": "Posts made by %1",
diff --git a/public/language/en_GB/register.json b/public/language/en_GB/register.json
index dcbd4bb03a..81b20421d4 100644
--- a/public/language/en_GB/register.json
+++ b/public/language/en_GB/register.json
@@ -1,5 +1,6 @@
 {
 	"register": "Register",
+	"cancel_registration": "Cancel Registration",
 	"help.email": "By default, your email will be hidden from the public.",
 	"help.username_restrictions": "A unique username between %1 and %2 characters. Others can mention you with @<span id='yourUsername'>username</span>.",
 	"help.minimum_password_length": "Your password's length must be at least %1 characters.",
@@ -15,5 +16,8 @@
 	"alternative_registration": "Alternative Registration",
 	"terms_of_use": "Terms of Use",
 	"agree_to_terms_of_use": "I agree to the Terms of Use",
-	"registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator."
+	"terms_of_use_error": "You must agree to the Terms of Use",
+	"registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator.",
+	"interstitial.intro": "We require some additional information before we can create your account.",
+	"interstitial.errors-found": "We could not complete your registration:"
 }
\ No newline at end of file
diff --git a/public/language/en_GB/topic.json b/public/language/en_GB/topic.json
index 6299b8aac1..d0137b82d7 100644
--- a/public/language/en_GB/topic.json
+++ b/public/language/en_GB/topic.json
@@ -37,7 +37,8 @@
 	"deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
 
 	"following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
-	"not_following_topic.message": "You will no longer receive notifications from this topic.",
+	"not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
+	"ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
 
 	"login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
 
@@ -50,6 +51,12 @@
 	"watch.title": "Be notified of new replies in this topic",
 	"unwatch.title": "Stop watching this topic",
 	"share_this_post": "Share this Post",
+	"watching": "Watching",
+	"not-watching": "Not Watching",
+	"ignoring": "Ignoring",
+	"watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+	"not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+	"ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
 
 	"thread_tools.title": "Topic Tools",
 	"thread_tools.markAsUnreadForAll": "Mark Unread",
@@ -125,7 +132,7 @@
 	"stale.warning": "The topic you are replying to is quite old. Would you like to create a new topic instead, and reference this one in your reply?",
 	"stale.create": "Create a new topic",
 	"stale.reply_anyway": "Reply to this topic anyway",
-	
+
 	"link_back": "Re: [%1](%2)\n\n",
 
 	"spam": "Spam",
diff --git a/public/language/en_GB/unread.json b/public/language/en_GB/unread.json
index 0af9a2cdf6..4a449a53f5 100644
--- a/public/language/en_GB/unread.json
+++ b/public/language/en_GB/unread.json
@@ -6,5 +6,8 @@
 	"selected": "Selected",
 	"all": "All",
 	"all_categories": "All categories",
-	"topics_marked_as_read.success": "Topics marked as read!"
+	"topics_marked_as_read.success": "Topics marked as read!",
+	"all-topics": "All Topics",
+	"new-topics": "New Topics",
+	"watched-topics": "Watched Topics"
 }
\ No newline at end of file
diff --git a/public/language/en_GB/user.json b/public/language/en_GB/user.json
index a6ae357177..b1cb065de5 100644
--- a/public/language/en_GB/user.json
+++ b/public/language/en_GB/user.json
@@ -7,6 +7,7 @@
 
 	"email": "Email",
 	"confirm_email": "Confirm Email",
+	"account_info": "Account Info",
 	"ban_account": "Ban Account",
 	"ban_account_confirm": "Do you really want to ban this user?",
 	"unban_account": "Unban Account",
@@ -109,10 +110,10 @@
 
 	"scroll_to_my_post": "After posting a reply, show the new post",
 
-	"follow_topics_you_reply_to": "Follow topics that you reply to",
-	"follow_topics_you_create": "Follow topics you create",
+	"follow_topics_you_reply_to": "Watch topics that you reply to",
+	"follow_topics_you_create": "Watch topics you create",
 
-	"grouptitle": "Select the group title you would like to display",
+	"grouptitle": "Group Title",
 	"no-group-title": "No group title",
 
 	"select-skin": "Select a Skin",
@@ -125,5 +126,12 @@
 
 	"sso.title": "Single Sign-on Services",
 	"sso.associated": "Associated with",
-	"sso.not-associated": "Click here to associate with"
+	"sso.not-associated": "Click here to associate with",
+
+	"info.latest-flags": "Latest Flags",
+	"info.no-flags": "No Flagged Posts Found",
+	"info.ban-history": "Recent Ban History",
+	"info.no-ban-history": "This user has never been banned",
+	"info.banned-until": "Banned until %1",
+	"info.banned-permanently": "Banned permanently"
 }
diff --git a/public/language/en_GB/users.json b/public/language/en_GB/users.json
index e693bf6333..5c9d8b93a4 100644
--- a/public/language/en_GB/users.json
+++ b/public/language/en_GB/users.json
@@ -2,6 +2,7 @@
 	"latest_users": "Latest Users",
 	"top_posters": "Top Posters",
 	"most_reputation": "Most Reputation",
+	"most_flags": "Most Flags",
 	"search": "Search",
 	"enter_username": "Enter a username to search",
 	"load_more": "Load More",
diff --git a/public/language/en_US/email.json b/public/language/en_US/email.json
index 1b8d512945..691e6309a2 100644
--- a/public/language/en_US/email.json
+++ b/public/language/en_US/email.json
@@ -24,6 +24,7 @@
     "digest.day": "day",
     "digest.week": "week",
     "digest.month": "month",
+    "digest.subject": "Digest for %1",
     "notif.chat.subject": "New chat message received from %1",
     "notif.chat.cta": "Click here to continue the conversation",
     "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
diff --git a/public/language/en_US/error.json b/public/language/en_US/error.json
index 0709e823b6..85292ab05e 100644
--- a/public/language/en_US/error.json
+++ b/public/language/en_US/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Invalid Password",
     "invalid-username-or-password": "Please specify both a username and password",
     "invalid-search-term": "Invalid search term",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "Username taken",
     "email-taken": "Email taken",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
     "email-confirm-failed": "We could not confirm your email, please try again later.",
     "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "Username too short",
     "username-too-long": "Username too long",
     "password-too-long": "Password too long",
     "user-banned": "User banned",
     "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "Category does not exist",
     "no-topic": "Topic does not exist",
     "no-post": "Post does not exist",
@@ -38,6 +41,19 @@
     "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",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
     "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
@@ -55,10 +71,12 @@
     "already-unfavourited": "You have already unbookmarked this post",
     "cant-ban-other-admins": "You can't ban other admins!",
     "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Invalid image type. Allowed types are: %1",
     "invalid-image-extension": "Invalid image extension",
     "invalid-file-type": "Invalid file type. Allowed types are: %1",
     "group-name-too-short": "Group name too short",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Group already exists",
     "group-name-change-not-allowed": "Group name change not allowed",
     "group-already-member": "Already part of this group",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "You are not allowed to edit this message",
     "cant-remove-last-user": "You can't remove the last user",
     "cant-delete-chat-message": "You are not allowed to delete this message",
+    "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Reputation system is disabled.",
     "downvoting-disabled": "Downvoting is disabled",
     "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",
@@ -99,5 +118,6 @@
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
     "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "You can't kick yourself from the group",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/en_US/login.json b/public/language/en_US/login.json
index 70b7b98dd5..17c53b6628 100644
--- a/public/language/en_US/login.json
+++ b/public/language/en_US/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Remember Me?",
     "forgot_password": "Forgot Password?",
     "alternative_logins": "Alternative Logins",
-    "failed_login_attempt": "Failed login attempt, please try again.",
+    "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "You have successfully logged in!",
     "dont_have_account": "Don't have an account?"
 }
\ No newline at end of file
diff --git a/public/language/en_US/modules.json b/public/language/en_US/modules.json
index eb5e513640..b3775ab68f 100644
--- a/public/language/en_US/modules.json
+++ b/public/language/en_US/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Submit and Lock",
     "composer.toggle_dropdown": "Toggle Dropdown",
     "composer.uploading": "Uploading %1",
+    "composer.formatting.bold": "Bold",
+    "composer.formatting.italic": "Italic",
+    "composer.formatting.list": "List",
+    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Picture",
+    "composer.upload-picture": "Upload Image",
+    "composer.upload-file": "Upload File",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",
diff --git a/public/language/en_US/pages.json b/public/language/en_US/pages.json
index 285aa30017..3309d4ced7 100644
--- a/public/language/en_US/pages.json
+++ b/public/language/en_US/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Users with the most posts",
     "users/sort-reputation": "Users with the most reputation",
     "users/banned": "Banned Users",
+    "users/most-flags": "Most flagged users",
     "users/search": "User Search",
     "notifications": "Notifications",
     "tags": "Tags",
diff --git a/public/language/en_US/topic.json b/public/language/en_US/topic.json
index bdf6d77f91..ab97715c5b 100644
--- a/public/language/en_US/topic.json
+++ b/public/language/en_US/topic.json
@@ -32,6 +32,7 @@
     "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
     "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
     "not_following_topic.message": "You will no longer receive notifications from this topic.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
     "markAsUnreadForAll.success": "Topic marked as unread for all.",
     "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
     "watch.title": "Be notified of new replies in this topic",
     "unwatch.title": "Stop watching this topic",
     "share_this_post": "Share this Post",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "Topic Tools",
     "thread_tools.markAsUnreadForAll": "Mark Unread",
     "thread_tools.pin": "Pin Topic",
diff --git a/public/language/en_US/unread.json b/public/language/en_US/unread.json
index d723f6e8c9..c3050ba93e 100644
--- a/public/language/en_US/unread.json
+++ b/public/language/en_US/unread.json
@@ -6,5 +6,8 @@
     "selected": "Selected",
     "all": "All",
     "all_categories": "All categories",
-    "topics_marked_as_read.success": "Topics marked as read!"
+    "topics_marked_as_read.success": "Topics marked as read!",
+    "all-topics": "All Topics",
+    "new-topics": "New Topics",
+    "watched-topics": "Watched Topics"
 }
\ No newline at end of file
diff --git a/public/language/en_US/user.json b/public/language/en_US/user.json
index 86d31e818d..50e52efa5c 100644
--- a/public/language/en_US/user.json
+++ b/public/language/en_US/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Open outgoing links in new tab",
     "enable_topic_searching": "Enable In-Topic Searching",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behavior and allow you to search through the entire topic, instead of what is only shown on screen",
+    "delay_image_loading": "Delay Image Loading",
+    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
     "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Follow topics that you reply to",
-    "follow_topics_you_create": "Follow topics you create",
-    "grouptitle": "Select the group title you would like to display",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Group Title",
     "no-group-title": "No group title",
     "select-skin": "Select a Skin",
     "select-homepage": "Select a Homepage",
diff --git a/public/language/en_US/users.json b/public/language/en_US/users.json
index ae39f26f66..4d0bd5c53e 100644
--- a/public/language/en_US/users.json
+++ b/public/language/en_US/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Latest Users",
     "top_posters": "Top Posters",
     "most_reputation": "Most Reputation",
+    "most_flags": "Most Flags",
     "search": "Search",
     "enter_username": "Enter a username to search",
     "load_more": "Load More",
diff --git a/public/language/es/category.json b/public/language/es/category.json
index 5b0b5aee30..608bf7c75a 100644
--- a/public/language/es/category.json
+++ b/public/language/es/category.json
@@ -2,14 +2,14 @@
     "category": "Categoría",
     "subcategories": "Subcategorías",
     "new_topic_button": "Nuevo tema",
-    "guest-login-post": "Acceder para poder escribir un mensaje",
+    "guest-login-post": "Accede para poder escribir un mensaje",
     "no_topics": "<strong>No hay temas en esta categoría.</strong><br />¿Por qué no te animas y publicas uno?",
     "browsing": "viendo ahora",
     "no_replies": "Nadie ha respondido aún",
     "no_new_posts": "No hay mensajes nuevos.",
     "share_this_category": "Compartir esta categoría",
-    "watch": "Seguir",
-    "ignore": "Ignorar",
+    "watch": "Siguiendo",
+    "ignore": "Ignorando",
     "watch.message": "Ahora estás viendo actualizaciones de esta categoría",
     "ignore.message": "Ahora estás ignorando las actualizaciones de esta categoría",
     "watched-categories": "Categorías seguidas"
diff --git a/public/language/es/email.json b/public/language/es/email.json
index 04c27bd68f..ddc0a47556 100644
--- a/public/language/es/email.json
+++ b/public/language/es/email.json
@@ -24,6 +24,7 @@
     "digest.day": "día",
     "digest.week": "semana",
     "digest.month": "mes",
+    "digest.subject": "Resumen de 1%",
     "notif.chat.subject": "Nuevo mensaje de chat recibido de %1",
     "notif.chat.cta": "Haz click aquí para continuar la conversación",
     "notif.chat.unsub.info": "Esta notificación de chat se te envió debido a tus ajustes de suscripción.",
diff --git a/public/language/es/error.json b/public/language/es/error.json
index 630475a16f..4c07e24298 100644
--- a/public/language/es/error.json
+++ b/public/language/es/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Contraseña no válida",
     "invalid-username-or-password": "Por favor especifica tanto un usuario como contraseña",
     "invalid-search-term": "Término de búsqueda inválido",
+    "csrf-invalid": "El acceso ha fallado porque tu sesión ha expirado. Por favor prueba otra vez.",
     "invalid-pagination-value": "Número de página inválido, debe estar entre %1 y %2",
     "username-taken": "Nombre de usuario ocupado",
     "email-taken": "Correo electrónico ocupado",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "Este foro requiere confirmación de su email, por favor pulse aquí para introducir un email",
     "email-confirm-failed": "No se ha podido confirmar su email, por favor inténtelo de nuevo más tarde.",
     "confirm-email-already-sent": "El email de confirmación ya ha sido enviado, por favor espera %1 minuto(s) para enviar otro.",
+    "sendmail-not-found": "El ejecutable \"sendmail\" no ha sido encontrado, por favor asegúrate de que esta instalado en tu sistema y es accesible por el usuario que ejecuta NodeBB. ",
     "username-too-short": "Nombre de usuario es demasiado corto",
     "username-too-long": "Nombre de usuario demasiado largo",
     "password-too-long": "Contraseña muy corta",
     "user-banned": "Usuario baneado",
     "user-too-new": "Lo sentimos, es necesario que esperes %1 segundo(s) antes poder hacer tu primera publicación",
     "blacklisted-ip": "Lo sentimos, tu dirección IP ha sido baneada de esta comunidad. Si crees que debe de haber un error, por favor contacte con un administrador.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "La categoría no existe",
     "no-topic": "El tema no existe",
     "no-post": "La publicación no existe",
@@ -38,6 +41,19 @@
     "category-disabled": "Categoría deshabilitada",
     "topic-locked": "Tema bloqueado",
     "post-edit-duration-expired": "Sólo puedes editar mensajes durante %1 segundo(s) después de haberlo escrito",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Por favor introduzca una publicación más larga. Las publicaciones deben contener al menos %1 caractere(s).",
     "content-too-long": "Por favor introduzca un mensaje más corto. Los mensajes no pueden exceder los %1 caractere(s).",
     "title-too-short": "Por favor introduzca un título más largo. Los títulos deben contener al menos %1 caractere(s).",
@@ -55,10 +71,12 @@
     "already-unfavourited": "Ya habías desguardado este post.",
     "cant-ban-other-admins": "¡No puedes expulsar a otros administradores!",
     "cant-remove-last-admin": "Tu eres el unico administrador. Añade otro usuario como administrador antes de eliminarte a ti mismo.",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Tipo de imagen inválido. Los tipos permitidos son: %1",
     "invalid-image-extension": "Extensión de imagen inválida",
     "invalid-file-type": "Tipo de fichero inválido. Los tipos permitidos son: %1",
     "group-name-too-short": "Nombre del grupo es demasiado corto.",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "El grupo ya existe.",
     "group-name-change-not-allowed": "El nombre del grupo deseado no está permitido.",
     "group-already-member": "Ya eres miembro de este grupo",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "No tienes permiso para editar este mensaje",
     "cant-remove-last-user": "No puedes eliminar el último usuario",
     "cant-delete-chat-message": "No tienes permiso para eliminar este mensaje",
+    "already-voting-for-this-post": "Ya has votado a este mensaje.",
     "reputation-system-disabled": "El sistema de reputación está deshabilitado.",
     "downvoting-disabled": "La votación negativa está deshabilitada.",
     "not-enough-reputation-to-downvote": "No tienes suficiente reputación para votar negativo este post",
@@ -99,5 +118,6 @@
     "no-session-found": "¡No se ha encontrado ningún inicio de sesión!",
     "not-in-room": "El usuario no está en la sala",
     "no-users-in-room": "No hay usuarios en esta sala",
-    "cant-kick-self": "No te puedes expulsar a ti mismo del grupo"
+    "cant-kick-self": "No te puedes expulsar a ti mismo del grupo",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/es/global.json b/public/language/es/global.json
index d81c10ca88..f91bbda9b4 100644
--- a/public/language/es/global.json
+++ b/public/language/es/global.json
@@ -36,7 +36,7 @@
     "header.navigation": "Navegación",
     "notifications.loading": "Cargando notificaciones",
     "chats.loading": "Cargando chats",
-    "motd.welcome": "Bienvenido a NodeBB, la plataforma de debate del el futuro.",
+    "motd.welcome": "Bienvenido a NodeBB, la plataforma de debate del futuro.",
     "previouspage": "Página anterior",
     "nextpage": "Página siguiente",
     "alert.success": "¡Éxito!",
@@ -49,7 +49,7 @@
     "users": "Usuarios",
     "topics": "Temas",
     "posts": "Posts",
-    "best": "Mejor",
+    "best": "Mejor valorados",
     "upvoted": "Votado positivamente",
     "downvoted": "Votado negativamente",
     "views": "Visitas",
@@ -59,7 +59,7 @@
     "posted_ago_by_guest": "publicado %1 por Invitado",
     "posted_ago_by": "publicado %1 por %2",
     "posted_ago": "publicado %1",
-    "posted_in": "Publicado %1",
+    "posted_in": "publicado en %1",
     "posted_in_by": "publicado en %1 por %2",
     "posted_in_ago": "publicado en %1 %2",
     "posted_in_ago_by": "publicado en %1 %2 por %3",
diff --git a/public/language/es/login.json b/public/language/es/login.json
index 448ce31f43..d6e357016e 100644
--- a/public/language/es/login.json
+++ b/public/language/es/login.json
@@ -4,8 +4,8 @@
     "email": "Correo Electrónico",
     "remember_me": "¿Recordarme?",
     "forgot_password": "¿Olvidaste tu contraseña?",
-    "alternative_logins": "Métodos alternativos",
-    "failed_login_attempt": "Error al iniciar sesión, inténtalo otra vez.",
+    "alternative_logins": "Accesos alternativos",
+    "failed_login_attempt": "Error al iniciar sesión",
     "login_successful": "¡Identificado satisfactoriamente!",
     "dont_have_account": "¿Aún no tienes cuenta?"
 }
\ No newline at end of file
diff --git a/public/language/es/modules.json b/public/language/es/modules.json
index f0e34b04a1..87cc59c2fb 100644
--- a/public/language/es/modules.json
+++ b/public/language/es/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Enviar y Bloquear",
     "composer.toggle_dropdown": "Alternar desplegable",
     "composer.uploading": "Subiendo %1",
+    "composer.formatting.bold": "Negrita",
+    "composer.formatting.italic": "Itálica",
+    "composer.formatting.list": "Lista",
+    "composer.formatting.strikethrough": "Tachado",
+    "composer.formatting.link": "Enlace",
+    "composer.formatting.picture": "Foto",
+    "composer.upload-picture": "Subir foto",
+    "composer.upload-file": "Subir archivo",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancelar",
     "bootbox.confirm": "Confirmar",
diff --git a/public/language/es/pages.json b/public/language/es/pages.json
index 4a79f28222..2d62269b35 100644
--- a/public/language/es/pages.json
+++ b/public/language/es/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Top por mensajes",
     "users/sort-reputation": "Más reputados",
     "users/banned": "Usuarios baneados",
+    "users/most-flags": "Most flagged users",
     "users/search": "Buscar",
     "notifications": "Notificaciones",
     "tags": "Etiquetas",
@@ -23,8 +24,8 @@
     "groups": "Grupos",
     "group": "Grupo de %1",
     "chats": "Chats",
-    "chat": "Chateando con %1",
-    "account/edit": "Editando \"%1\"",
+    "chat": "Chatear con %1",
+    "account/edit": "Editar \"%1\"",
     "account/edit/password": "Editar contraseña de \"%1\"",
     "account/edit/username": "Editar nombre de usuario de \"%1\"",
     "account/edit/email": "Editar email \"%1\"",
diff --git a/public/language/es/recent.json b/public/language/es/recent.json
index fbfb6238c0..8c959ca0d5 100644
--- a/public/language/es/recent.json
+++ b/public/language/es/recent.json
@@ -6,7 +6,7 @@
     "year": "Año",
     "alltime": "Siempre",
     "no_recent_topics": "No hay publicaciones recientes.",
-    "no_popular_topics": "No hay tópicos populares",
+    "no_popular_topics": "No hay publicaciones populares",
     "there-is-a-new-topic": "Hay una nueva publicación.",
     "there-is-a-new-topic-and-a-new-post": "hay una nueva publicación y un nuevo mensaje.",
     "there-is-a-new-topic-and-new-posts": "Hay una nueva publicación y %1 nuevos mensajes.",
@@ -15,5 +15,5 @@
     "there-are-new-topics-and-new-posts": "Hay %1 nuevas publicaciones y %2 nuevos mensajes.",
     "there-is-a-new-post": "Hay un nuevo mensaje.",
     "there-are-new-posts": "Hay %1 nuevos mensajes.",
-    "click-here-to-reload": "Cliquea aquí para recargar."
+    "click-here-to-reload": "Click para recargar."
 }
\ No newline at end of file
diff --git a/public/language/es/topic.json b/public/language/es/topic.json
index 1f13a9e8e9..37a417cd42 100644
--- a/public/language/es/topic.json
+++ b/public/language/es/topic.json
@@ -26,23 +26,30 @@
     "tools": "Herramientas",
     "flag": "Reportar",
     "locked": "Cerrado",
-    "bookmark_instructions": "Clic aquí para regresar al último aporte sin leer en este hilo.",
+    "bookmark_instructions": "Haz click aquí para volver a tu último mensaje leído en este tema",
     "flag_title": "Reportar este mensaje",
     "flag_success": "Este mensaje ha sido reportado para moderación.",
     "deleted_message": "Este tema ha sido borrado. Solo los usuarios que tengan privilegios de administración de temas pueden verlo.",
     "following_topic.message": "Ahora recibiras notificaciones cuando alguien publique en este tema.",
     "not_following_topic.message": "No recibiras notificaciones de este tema.",
+    "ignoring_topic.message": "Ya no verás este tema en no leídos. Serás notificado si te mencionan o te votan.",
     "login_to_subscribe": "Por favor, conéctate para subscribirte a este tema.",
     "markAsUnreadForAll.success": "Publicación marcada como no leída para todos.",
-    "mark_unread": "Marcar como no leído",
-    "mark_unread.success": "Topic marked as unread.",
+    "mark_unread": "Marcar no leído",
+    "mark_unread.success": "Tema marcado como no leído.",
     "watch": "Seguir",
     "unwatch": "Dejar de seguir",
     "watch.title": "Serás notificado cuando haya nuevas respuestas en este tema",
     "unwatch.title": "Dejar de seguir este tema",
     "share_this_post": "Compartir este post",
-    "thread_tools.title": "Herramientas del tema",
-    "thread_tools.markAsUnreadForAll": "Marcar como no leído",
+    "watching": "Siguiendo",
+    "not-watching": "No siguiendo",
+    "ignoring": "Ignorando",
+    "watching.description": "Notificarme de nuevas respuestas.<br/>Mostrar tema en no leídos. ",
+    "not-watching.description": "No notificarme de nuevas respuestas.<br/>Mostrar tema en no leídos si sigo esa categoría. ",
+    "ignoring.description": "No notificarme de nuevas respuestas.<br/>No mostrar tema en no leídos. ",
+    "thread_tools.title": "Herramientas",
+    "thread_tools.markAsUnreadForAll": "Marcar no leído",
     "thread_tools.pin": "Adherir tema",
     "thread_tools.unpin": "Despegar tema",
     "thread_tools.lock": "Cerrar tema",
@@ -65,9 +72,9 @@
     "disabled_categories_note": "Las categorías deshabilitadas están en gris",
     "confirm_move": "Mover",
     "confirm_fork": "Dividir",
-    "favourite": "Bookmark",
-    "favourites": "Bookmarks",
-    "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
+    "favourite": "Marcador",
+    "favourites": "Marcadores",
+    "favourites.has_no_favourites": "No has marcado ningún tema aún.",
     "loading_more_posts": "Cargando más publicaciones",
     "move_topic": "Mover tema",
     "move_topics": "Mover temas",
@@ -96,7 +103,7 @@
     "more_users": "%1 usuario(s) más",
     "more_guests": "%1 invitado(s) más",
     "users_and_others": "%1 y otros %2",
-    "sort_by": "Ordenar por",
+    "sort_by": "Ordenar",
     "oldest_to_newest": "Más antiguo a más nuevo",
     "newest_to_oldest": "Más nuevo a más antiguo",
     "most_votes": "Mayor número de votos",
diff --git a/public/language/es/unread.json b/public/language/es/unread.json
index d77a5f7979..a451185530 100644
--- a/public/language/es/unread.json
+++ b/public/language/es/unread.json
@@ -6,5 +6,8 @@
     "selected": "Seleccionados",
     "all": "Todos",
     "all_categories": "Todos los foros",
-    "topics_marked_as_read.success": "¡Temas marcados como leídos!"
+    "topics_marked_as_read.success": "¡Temas marcados como leídos!",
+    "all-topics": "Todos los Temas",
+    "new-topics": "Temas Nuevos",
+    "watched-topics": "Temas Suscritos"
 }
\ No newline at end of file
diff --git a/public/language/es/uploads.json b/public/language/es/uploads.json
index 1622cb5693..9dac954194 100644
--- a/public/language/es/uploads.json
+++ b/public/language/es/uploads.json
@@ -1,6 +1,6 @@
 {
-    "uploading-file": "Uploading the file...",
-    "select-file-to-upload": "Select a file to upload!",
-    "upload-success": "File uploaded successfully!",
-    "maximum-file-size": "Maximum %1 kb"
+    "uploading-file": "Subiendo el archivo...",
+    "select-file-to-upload": "¡Selecciona un archivo para subir!",
+    "upload-success": "¡Archivo subido correctamente!",
+    "maximum-file-size": "Máximo %1 kb"
 }
\ No newline at end of file
diff --git a/public/language/es/user.json b/public/language/es/user.json
index b518f7c38c..cce042ed7a 100644
--- a/public/language/es/user.json
+++ b/public/language/es/user.json
@@ -2,13 +2,13 @@
     "banned": "Baneado",
     "offline": "Desconectado",
     "username": "Nombre de usuario",
-    "joindate": "Fecha de Registro",
+    "joindate": "Fecha de registro",
     "postcount": "Número De Publicaciones",
     "email": "Correo electrónico",
     "confirm_email": "Confirmar correo electrónico",
-    "ban_account": "Banear Cuenta",
+    "ban_account": "Banear cuenta",
     "ban_account_confirm": "Quieres confirmar el baneo de este usuario?",
-    "unban_account": "Desbanear Cuenta",
+    "unban_account": "Desbanear cuenta",
     "delete_account": "Eliminar cuenta",
     "delete_account_confirm": "¿Estás seguro de que quieres eliminar tu cuenta? <br /><strong>Esta acción es irreversible y no podrás recuperar ninguno de tus datos.</strong><br /><br />Introduce tu nombre de usuario para confirmar la eliminación de la cuenta.",
     "delete_this_account_confirm": "Esta seguro de eliminar este usuario? <br /><strong>Esta acción de irreversible y no podrás recuperar ningún dato</strong><br /><br />",
@@ -22,7 +22,7 @@
     "profile": "Perfil",
     "profile_views": "Visitas",
     "reputation": "Reputación",
-    "favourites": "Bookmarks",
+    "favourites": "Marcadores",
     "watched": "Suscritos",
     "followers": "Seguidores",
     "following": "Siguiendo",
@@ -30,7 +30,7 @@
     "signature": "Firma",
     "birthday": "Cumpleaños",
     "chat": "Chat",
-    "chat_with": "Chateando con %1",
+    "chat_with": "Chatear con %1",
     "follow": "Seguir",
     "unfollow": "Dejar de seguir",
     "more": "Más",
@@ -39,7 +39,7 @@
     "change_username": "Cambiar nombre de usuario",
     "change_email": "Cambiar email",
     "edit": "Editar",
-    "edit-profile": "Edit Profile",
+    "edit-profile": "Editar Perfil",
     "default_picture": "Icono por defecto",
     "uploaded_picture": "Imagen subida",
     "upload_new_picture": "Subir nueva imagen",
@@ -56,11 +56,11 @@
     "password": "Contraseña",
     "username_taken_workaround": "El nombre de usuario que has solicitada ya está siendo usado, por tanto lo hemos alterado ligeramente. Ahora eres conocido como <strong>%1</strong>.",
     "password_same_as_username": "Tu Constraseña es igual al nombre de Usuario, por favor seleccione otra Constraseña.",
-    "password_same_as_email": "Your password is the same as your email, please select another password.",
+    "password_same_as_email": "Tu contraseña es igual que tu dirección de correo, por favor elige otra contraseña.",
     "upload_picture": "Subir foto",
     "upload_a_picture": "Subir una foto",
     "remove_uploaded_picture": "Borrar Imagen subida",
-    "upload_cover_picture": "Upload cover picture",
+    "upload_cover_picture": "Subir imagen de portada",
     "settings": "Opciones",
     "show_email": "Mostrar mi correo electrónico",
     "show_fullname": "Mostrar mi nombre completo",
@@ -90,18 +90,20 @@
     "notification_sounds": "Reproducir un sonido al recibir una notificación",
     "browsing": "Preferencias de navegación.",
     "open_links_in_new_tab": "Abrir los enlaces externos en una nueva pestaña",
-    "enable_topic_searching": "Activar la búsqueda \"in-topic\"",
-    "topic_search_help": "Si está activada, la búsqueda 'in-topic' sustituirá el comportamiento por defecto del navegador y le permitirá buscar en el tema al completo, en vez de hacer una búsqueda únicamente sobre el contenido mostrado en pantalla",
-    "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Seguir los temas en los que respondes",
-    "follow_topics_you_create": "Seguir publicaciones que creas",
-    "grouptitle": "Selecciona el título del grupo que deseas visualizar",
+    "enable_topic_searching": "Activar la búsqueda \"dentro del tema\"",
+    "topic_search_help": "Si está activada, la búsqueda 'dentro del tema' al usar el buscador de la barra de navegación automáticamente buscaras solo en el tema actual.",
+    "delay_image_loading": "Retrasar la carga de imágenes",
+    "image_load_delay_help": "Si se habilita, las imágenes no cargarán hasta que se vean en pantalla",
+    "scroll_to_my_post": "Luego de enviar una respuesta, mostrar el nuevo mensaje",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Título del grupo",
     "no-group-title": "Sin título de grupo",
     "select-skin": "Seleccionar una plantilla",
-    "select-homepage": "Seleccione una Página de inicio",
+    "select-homepage": "Seleccione una página de inicio",
     "homepage": "Página de inicio",
     "homepage_description": "Seleccione una página para su uso habitual como la página principal del foro o 'Ninguno' para utilizar la página de inicio.",
-    "custom_route": "Modificar página de ruta",
+    "custom_route": "Pagina de inicio personalizada",
     "custom_route_help": "Introduzca un nombre de ruta aquí, sin ninguna barra anterior (por ejemplo, \"reciente\", o \"popular\")",
     "sso.title": "Servicios de Inicio de sesión Único",
     "sso.associated": "Asociado con",
diff --git a/public/language/es/users.json b/public/language/es/users.json
index cf8bdaefff..3d32fdc599 100644
--- a/public/language/es/users.json
+++ b/public/language/es/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Últimos usuarios",
     "top_posters": "Top por mensajes",
     "most_reputation": "Más reputados",
+    "most_flags": "Most Flags",
     "search": "Buscar",
     "enter_username": "Ingresa el nombre de usuario que quieres buscar",
     "load_more": "Cargar más",
@@ -16,5 +17,5 @@
     "unread_topics": "Temas no leídos",
     "categories": "Categorías ",
     "tags": "Etiquetas",
-    "no-users-found": "No users found!"
+    "no-users-found": "¡No se encontraron usuarios!"
 }
\ No newline at end of file
diff --git a/public/language/et/email.json b/public/language/et/email.json
index a1d3d4371b..03fa17fc9f 100644
--- a/public/language/et/email.json
+++ b/public/language/et/email.json
@@ -24,6 +24,7 @@
     "digest.day": "päev",
     "digest.week": "nädal",
     "digest.month": "kuu",
+    "digest.subject": "Ima 1% jaoks",
     "notif.chat.subject": "Sulle on saabunud uus sõnum kasutajalt %1",
     "notif.chat.cta": "Vajuta siia, et jätkata vestlusega",
     "notif.chat.unsub.info": "See chat teavitus on saadetud teile tellimuse seadistuse tõttu.",
diff --git a/public/language/et/error.json b/public/language/et/error.json
index 013db49d04..b697046163 100644
--- a/public/language/et/error.json
+++ b/public/language/et/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Vigane parool",
     "invalid-username-or-password": "Palun täpsusta kasutajanime ja parooli",
     "invalid-search-term": "Vigane otsingusõna",
+    "csrf-invalid": "Me ei saanud Sind sisse logida, võimalik, et tänu aegunud sessioonile, palun proovi uuesti",
     "invalid-pagination-value": "Väär lehekülje numeratsioon, peab olema vähemalt %1 ja kõige rohkem %2",
     "username-taken": "Kasutajanimi on juba võetud",
     "email-taken": "Email on võetud",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "See foorum nõuab emaili kinnitust, palun vajuta siia, et sisestada email",
     "email-confirm-failed": "Meil ei õnnestunud sinu emaili kinnitada, proovi hiljem uuesti.",
     "confirm-email-already-sent": "Kinnituskiri on juba saadetud, palun oota %1 minut(it) uue kirja saatmiseks.",
+    "sendmail-not-found": "Sendmail'i käivitatavat ei leitud, palun tee kindlaks, et see on installeeritud ja on käivitatav kasutaja poolt, kes käitab NodeBB't.",
     "username-too-short": "Kasutajanimi on liiga lühike",
     "username-too-long": "Kasutajanimi on liiga pikk",
     "password-too-long": "Parool liiga pikk",
     "user-banned": "Kasutaja bannitud",
     "user-too-new": "Vabandust, te peate ootama %1 sekund(it) enne esimese postituse loomist.",
-    "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "blacklisted-ip": "Vabandust! Sinu IP-aadress on siin kogukonnas keelatud. Kui arvad, et see on eksitus, palun leia kontakti administraatoriga.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "Kategooriat ei eksisteeri",
     "no-topic": "Teemat ei eksisteeri",
     "no-post": "Postitust ei eksisteeri",
@@ -38,6 +41,19 @@
     "category-disabled": "Kategooria keelatud",
     "topic-locked": "Teema lukustatud",
     "post-edit-duration-expired": "Te peate ootama %1 sekund(it), enne kui oma postitust muudate.",
+    "post-edit-duration-expired-minutes": "Teil on lubatud muuta oma postitusi vaid %1 minuti jooksul peale postitamist",
+    "post-edit-duration-expired-minutes-seconds": "Teil on lubatud muuta oma postitusi vaid %1 minuti %2 sekundi jooksul peale postitamist",
+    "post-edit-duration-expired-hours": "Teil on lubatud muuta oma postitusi vaid %1 tunni jooksul peale postitamist",
+    "post-edit-duration-expired-hours-minutes": "Teil on lubatud muuta oma postitusi vaid %1 tunni %2 minuti jooksul peale postitamist",
+    "post-edit-duration-expired-days": "Teil on lubatud muuta oma postitusi vaid %1 päeva jooksul peale postitamist",
+    "post-edit-duration-expired-days-hours": "Teil on lubatud muuta oma postitusi vaid %1 päeva %2 tunni jooksul peale postitamist",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Palun tehke pikem postitus. Postituse pikkus peab olema vähemalt %1 tähemärk(i).",
     "content-too-long": "Palun tehke lühem postitus. Postituse pikkus peab olema vähem kui %1 tähemärk(i).",
     "title-too-short": "Palun sisesta pikem pealkiri. Pealkirjad ei saa olla lühemad kui %1 tähemärk(i).",
@@ -51,14 +67,16 @@
     "still-uploading": "Palun oota, kuni üleslaadimised on laetud.",
     "file-too-big": "Maksimaalne üleslaetava faili suurus on %1 kB - valige väiksema mahuga fail.",
     "guest-upload-disabled": "Külaliste üleslaadimine on keelatud.",
-    "already-favourited": "You have already bookmarked this post",
-    "already-unfavourited": "You have already unbookmarked this post",
+    "already-favourited": "Sa oled juba selle postituse järjehoidjatesse pannud.",
+    "already-unfavourited": "Sa oled juba selle postituse järjehoidjatest ära võtnud.",
     "cant-ban-other-admins": "Sa ei saa bannida teisi administraatoreid!",
     "cant-remove-last-admin": "Te olete ainus administraator. Lisage keegi teine administraatoriks, enne kui eemaldate endalt administraatori.",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Vigane pildi formaat. Lubatud formaadid on: %1",
     "invalid-image-extension": "Vigane pildi formaat",
     "invalid-file-type": "Vigane faili formaat. Lubatud formaadid on: %1",
     "group-name-too-short": "Grupi nimi liiga lühike",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Grupp juba eksisteerib",
     "group-name-change-not-allowed": "Grupi nimevahetus ei ole lubatud",
     "group-already-member": "Oled juba selles grupis",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "Sul ei ole lubatud antud sõnumit muuta",
     "cant-remove-last-user": "Sa ei saa viimast kasutajat eemaldada",
     "cant-delete-chat-message": "Sul ei ole lubatud antud sõnumit kustutada",
+    "already-voting-for-this-post": "Sa oled juba hääletanud sellel postitusel.",
     "reputation-system-disabled": "Reputatsiooni süsteem ei ole aktiveeritud",
     "downvoting-disabled": "Negatiivsete häälte andmine ei ole võimaldatud",
     "not-enough-reputation-to-downvote": "Sul ei ole piisavalt reputatsiooni, et anda negatiivset hinnangut sellele postitusele.",
@@ -98,6 +117,7 @@
     "invite-maximum-met": "Sa oled kutsunud maksimaalse lubatud inimeste arvu (%1 %2 'st).",
     "no-session-found": "Sisse logimis sessiooni ei leitud!",
     "not-in-room": "Kasutaja pole ruumis",
-    "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "no-users-in-room": "Ühtegi kasutajat ei leidu siit ruumist",
+    "cant-kick-self": "Sa ei saa ennast ära visata gruppist",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/et/global.json b/public/language/et/global.json
index f43dd9007a..93fdfd9a16 100644
--- a/public/language/et/global.json
+++ b/public/language/et/global.json
@@ -87,8 +87,8 @@
     "map": "Kaart",
     "sessions": "Logitud Sessioonid",
     "ip_address": "IP Aadress",
-    "enter_page_number": "Enter page number",
-    "upload_file": "Upload file",
-    "upload": "Upload",
-    "allowed-file-types": "Allowed file types are %1"
+    "enter_page_number": "Sisesta lehekülje number",
+    "upload_file": "Lae fail üles",
+    "upload": "Lae üles",
+    "allowed-file-types": "Lubatud faili formaadid on %1"
 }
\ No newline at end of file
diff --git a/public/language/et/groups.json b/public/language/et/groups.json
index db8dfce3d1..a78fc57db4 100644
--- a/public/language/et/groups.json
+++ b/public/language/et/groups.json
@@ -41,7 +41,7 @@
     "details.hidden": "Peidetud",
     "details.hidden_help": "Kui sisse lülitatud, siis seda gruppi ei kuvata gruppide nimekirjas ning liikmed tuleb lisada manuaalselt",
     "details.delete_group": "Kustuta grupp",
-    "details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
+    "details.private_system_help": "Privaatset gruppid on keelatud sellel süsteemi tasemel, see sätte ei tee midagi",
     "event.updated": "Grupi lisainformatsiooni on uuendatud",
     "event.deleted": "Grupp \"%1\" on kustutatud",
     "membership.accept-invitation": "Võta kutse vastu",
@@ -50,5 +50,5 @@
     "membership.leave-group": "Lahku grupist",
     "membership.reject": "Lükka tagasi",
     "new-group.group_name": "Grupi nimi:",
-    "upload-group-cover": "Upload group cover"
+    "upload-group-cover": "Lae gruppi pilt üles"
 }
\ No newline at end of file
diff --git a/public/language/et/login.json b/public/language/et/login.json
index 6c283a8b83..1ee4c2d703 100644
--- a/public/language/et/login.json
+++ b/public/language/et/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Mäleta mind?",
     "forgot_password": "Unustasid parooli?",
     "alternative_logins": "Alternatiivsed sisse logimise võimalused",
-    "failed_login_attempt": "Sisse logimine ebaõnnestus, palun proovi uuesti.",
+    "failed_login_attempt": "Sisselogimine ebaõnnestus",
     "login_successful": "Edukalt sisse logitud!",
     "dont_have_account": "Pole veel kasutajat?"
 }
\ No newline at end of file
diff --git a/public/language/et/modules.json b/public/language/et/modules.json
index ec23804489..c4a2434ec1 100644
--- a/public/language/et/modules.json
+++ b/public/language/et/modules.json
@@ -6,7 +6,7 @@
     "chat.user_typing": "%1 kirjutab sõnumit...",
     "chat.user_has_messaged_you": "%1 saatis sulle sõnumi.",
     "chat.see_all": "Vaata kõiki vestluseid",
-    "chat.mark_all_read": "Mark all chats read",
+    "chat.mark_all_read": "Märgi kõik jutud loetuks",
     "chat.no-messages": "Vali sõnumisaaja, et vaadata sõnumite ajalugu.",
     "chat.no-users-in-room": "Ühtki kasutajat selles ruumis",
     "chat.recent-chats": "Hiljutised vestlused",
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Kinnita ja Lukusta",
     "composer.toggle_dropdown": "Aktiveeri rippmenüü",
     "composer.uploading": "%1 Üleslaadimine",
+    "composer.formatting.bold": "Paksult",
+    "composer.formatting.italic": "Kaldkiri",
+    "composer.formatting.list": "Nimekiri",
+    "composer.formatting.strikethrough": "Läbitõmmatud",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Pilt",
+    "composer.upload-picture": "Lae pilt üles",
+    "composer.upload-file": "Lae fail üles",
     "bootbox.ok": "Olgu",
     "bootbox.cancel": "Katkesta",
     "bootbox.confirm": "Kinnita",
diff --git a/public/language/et/notifications.json b/public/language/et/notifications.json
index 11e2823a75..52319818af 100644
--- a/public/language/et/notifications.json
+++ b/public/language/et/notifications.json
@@ -16,9 +16,9 @@
     "upvoted_your_post_in_multiple": "<strong>%1</strong> ja %2 teist on kiitnud sinu postituse heaks: <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> liigutas sinu postituse <strong>%2 'sse</strong>",
     "moved_your_topic": "<strong>%1</strong> liigutas <strong>%2</strong>",
-    "favourited_your_post_in": "<strong>%1</strong> has bookmarked your post in <strong>%2</strong>.",
-    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have bookmarked your post in <strong>%3</strong>.",
-    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have bookmarked your post in <strong>%3</strong>.",
+    "favourited_your_post_in": "<strong>%1</strong> pani Sinu postituse <strong>%2</strong> järjehoidjatesse.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> ja <strong>%2</strong> panid Sinu postituse <strong>%3</strong> enda järjehoidjatesse.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> ja %2 teist on Sinu postitust <strong>%3</strong> järjehoidjasse lisanud.",
     "user_flagged_post_in": "<strong>%1</strong> raporteeris postitust <strong>%2</strong>",
     "user_flagged_post_in_dual": "<strong>%1</strong> ja <strong>%2</strong> märgistasid postituse: <strong>%3</strong>",
     "user_flagged_post_in_multiple": "<strong>%1</strong> ja %2 teist märgistasid postituse: <strong>%3</strong>",
@@ -30,7 +30,7 @@
     "user_started_following_you_dual": "<strong>%1</strong> ja <strong>%2</strong> hakkasid sind jälgima.",
     "user_started_following_you_multiple": "<strong>%1</strong> ja %2 hakkasid sind jälgima.",
     "new_register": "<strong>%1</strong> saatis registreerimistaotluse.",
-    "new_register_multiple": "There are <strong>%1</strong> registration requests awaiting review.",
+    "new_register_multiple": "<strong>%1</strong> registreerimistaotlust ootavad ülevaadet.",
     "email-confirmed": "Emaili aadress kinnitatud",
     "email-confirmed-message": "Täname, et kinnitasite oma emaili aadressi. Teie kasutaja on nüüd täielikult aktiveeritud.",
     "email-confirm-error-message": "Emaili aadressi kinnitamisel tekkis viga. Võibolla kinnituskood oli vale või aegunud.",
diff --git a/public/language/et/pages.json b/public/language/et/pages.json
index f85b28ead0..fef1836725 100644
--- a/public/language/et/pages.json
+++ b/public/language/et/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Kasutajad, kel on enim postitusi",
     "users/sort-reputation": "Suurima reputatsiooniga kasutajad",
     "users/banned": "Keelustatud Kasutajad",
+    "users/most-flags": "Most flagged users",
     "users/search": "Kasutajate otsing",
     "notifications": "Teated",
     "tags": "Märksõnad",
@@ -33,13 +34,13 @@
     "account/posts": "Postitused, mis on tehtud kasutaja %1 poolt",
     "account/topics": "Teemad on kirjutanud %1",
     "account/groups": "Kasutaja %1 grupid",
-    "account/favourites": "%1's Bookmarked Posts",
+    "account/favourites": "%1 järjehoidjad",
     "account/settings": "Kasutaja sätted",
     "account/watched": "Teemasid jälgib %1 kasutajat",
     "account/upvoted": "Postitused %1 poolt heaks kiidetud",
     "account/downvoted": "Postitused %1 poolt vastu hääletatud",
     "account/best": "Parimad postitused %1 poolt",
-    "confirm": "Email Confirmed",
+    "confirm": "Emaili aadress kinnitatud",
     "maintenance.text": "%1 foorumil on käimas hooldustööd. Palun külastage meid mõne aja pärast uuesti.",
     "maintenance.messageIntro": "Administraator on jätnud ka omaltpoolt sõnumi:",
     "throttled.text": "%1 ei ole hetkel kättesaadav liigse koormuse tõttu. Palun tulge tagasi mõni teine kord."
diff --git a/public/language/et/topic.json b/public/language/et/topic.json
index d6aba7fb7a..998356d44a 100644
--- a/public/language/et/topic.json
+++ b/public/language/et/topic.json
@@ -26,12 +26,13 @@
     "tools": "Tööriistad",
     "flag": "Märgista",
     "locked": "Lukustatud",
-    "bookmark_instructions": "Kliki siia, et naasta viimasele lugemata postitusele selles teemas.",
+    "bookmark_instructions": "Vajuta siia, et tagasi minna viimati loetud postituse juurde siin teemas.",
     "flag_title": "Märgista see postitus modereerimiseks",
     "flag_success": "See postitus on nüüd märgistatud modereerimiseks.",
     "deleted_message": "See teema on kustutatud. Ainult kasutajad kellel on piisavalt õigusi saavad seda näha.",
     "following_topic.message": "Sulle ei edastata enam teateid uutest postitustest kui keegi postitab siia teemasse.",
     "not_following_topic.message": "Sulle ei edastata enam teateid uutest postitustest siin teemas.",
+    "ignoring_topic.message": "Sa ei näe seda teemat enam lugemata teemade nimekirjas. Sind teavitatakse, kui Sind mainitakse või Sinu postitust kiidetakse heaks.",
     "login_to_subscribe": "Palun registreeru kasutajaks või logi sisse, et tellida teateid selle postituse kohta.",
     "markAsUnreadForAll.success": "Teema märgitud mitte-loetuks kõikidele.",
     "mark_unread": "Märgi lugematuks",
@@ -41,6 +42,12 @@
     "watch.title": "Saa teateid uutest postitustest siin teemas",
     "unwatch.title": "Ära järgi enam seda teemat",
     "share_this_post": "Jaga seda postitust",
+    "watching": "Vaatan",
+    "not-watching": "Ei vaata",
+    "ignoring": "Ignoreerin",
+    "watching.description": "Teavita mind uutest vastustest.<br/>Näita teemat lugemata teemade hulgas.",
+    "not-watching.description": "Ära teavita mind uutest vastustest.<br/>Näita teemat lugemata teemade hulgas, kui kategooria on ignoreeritud.",
+    "ignoring.description": "Ära teavita mind uutest vastustest.<br/>Ära näita teemat lugemata teemade hulgas.",
     "thread_tools.title": "Teema tööriistad",
     "thread_tools.markAsUnreadForAll": "Märgi mitte-loetuks",
     "thread_tools.pin": "Tõsta esile teema",
@@ -65,9 +72,9 @@
     "disabled_categories_note": "Kinnised kategooriad on hallid",
     "confirm_move": "Liiguta",
     "confirm_fork": "Fork",
-    "favourite": "Bookmark",
-    "favourites": "Bookmarks",
-    "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
+    "favourite": "Järjehoidja",
+    "favourites": "Järjehoidjad",
+    "favourites.has_no_favourites": "Sa ei ole ühtegi postitust pannud järjehoidjatesse veel.",
     "loading_more_posts": "Laen postitusi",
     "move_topic": "Liiguta teemat",
     "move_topics": "Liiguta teemasi",
diff --git a/public/language/et/unread.json b/public/language/et/unread.json
index 140ff1dd62..169806bdb0 100644
--- a/public/language/et/unread.json
+++ b/public/language/et/unread.json
@@ -6,5 +6,8 @@
     "selected": "Valitud",
     "all": "Kõik",
     "all_categories": "Kõik kategooriad",
-    "topics_marked_as_read.success": "Teemad märgitud loetuks!"
+    "topics_marked_as_read.success": "Teemad märgitud loetuks!",
+    "all-topics": "Kõik teemad",
+    "new-topics": "Uued teemad",
+    "watched-topics": "Vaadatud teemad"
 }
\ No newline at end of file
diff --git a/public/language/et/uploads.json b/public/language/et/uploads.json
index 1622cb5693..feee146ab8 100644
--- a/public/language/et/uploads.json
+++ b/public/language/et/uploads.json
@@ -1,6 +1,6 @@
 {
-    "uploading-file": "Uploading the file...",
-    "select-file-to-upload": "Select a file to upload!",
-    "upload-success": "File uploaded successfully!",
-    "maximum-file-size": "Maximum %1 kb"
+    "uploading-file": "Laen faili üles...",
+    "select-file-to-upload": "Vali fail mida üles laadida!",
+    "upload-success": "Fail üles laetud edukalt!",
+    "maximum-file-size": "Maksimaalselt %1 kb"
 }
\ No newline at end of file
diff --git a/public/language/et/user.json b/public/language/et/user.json
index 463b4c5e8e..c6d779d569 100644
--- a/public/language/et/user.json
+++ b/public/language/et/user.json
@@ -22,7 +22,7 @@
     "profile": "Profiil",
     "profile_views": "Vaatamisi",
     "reputation": "Reputatsioon",
-    "favourites": "Bookmarks",
+    "favourites": "Järjehoidjad",
     "watched": "Vaadatud",
     "followers": "Jälgijad",
     "following": "Jälgimised",
@@ -39,7 +39,7 @@
     "change_username": "Vaheta kasutajanime",
     "change_email": "Vaheta emaili",
     "edit": "Muuda",
-    "edit-profile": "Edit Profile",
+    "edit-profile": "Redigeeri profiili",
     "default_picture": "Algne ikoon",
     "uploaded_picture": "Üleslaetud pilt",
     "upload_new_picture": "Laadi uus pilt",
@@ -56,11 +56,11 @@
     "password": "Parool",
     "username_taken_workaround": "Kasutajanimi mida soovisid, ei olnud saadaval, seeg muutsime seda natukene. Sinu uus kasutajanimi on nüüd: <strong>%1</strong>",
     "password_same_as_username": "Su parool kattub su kasutajanimega, palun vali mõni muu parool.",
-    "password_same_as_email": "Your password is the same as your email, please select another password.",
+    "password_same_as_email": "Su parool kattub su e-mailiga, palun vali mõni muu parool.",
     "upload_picture": "Laadi pilt",
     "upload_a_picture": "Lae pilt üles",
     "remove_uploaded_picture": "Eemalda üleslaetud pilt",
-    "upload_cover_picture": "Upload cover picture",
+    "upload_cover_picture": "Lae üles katte pilt",
     "settings": "Seaded",
     "show_email": "Näita minu emaili",
     "show_fullname": "Näita minu täisnime",
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Ava väljaminevad lingid uues aknas",
     "enable_topic_searching": "Võimalda teemasisene otsing",
     "topic_search_help": "Kui see on sisse lükatud, siis teemasisene otsing võtab üle brauseri tavapärase otsingu ning võimaldab otsida ainult ekraanile mahtuva teema asemel terve teema ulatuses.",
-    "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Järgi teemasid, millele olete vastanud.",
-    "follow_topics_you_create": "Järgi teemasi, mis on teie loodud.",
-    "grouptitle": "Vali grupile tiitel mida kuvada soovid",
+    "delay_image_loading": "Viivita pildi laadimisega",
+    "image_load_delay_help": "Kui lubatud, pildid teemades ei lae kuni nad on nähtavuses",
+    "scroll_to_my_post": "Pärast vastuse postitamist, näita uut postitust",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Grupi tiitel",
     "no-group-title": "Grupi tiitel puudub",
     "select-skin": "Vali välimus",
     "select-homepage": "Vali avaleht",
diff --git a/public/language/et/users.json b/public/language/et/users.json
index bb377c7239..a9b23a1b38 100644
--- a/public/language/et/users.json
+++ b/public/language/et/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Hilised kasutajad",
     "top_posters": "Top postitajad",
     "most_reputation": "Kõige rohkem reputatsiooni",
+    "most_flags": "Most Flags",
     "search": "Otsi",
     "enter_username": "Sisesta kasutajanimi, keda soovid otsida",
     "load_more": "Lae veel",
diff --git a/public/language/fa_IR/category.json b/public/language/fa_IR/category.json
index 50c14bee3b..3706ca7af4 100644
--- a/public/language/fa_IR/category.json
+++ b/public/language/fa_IR/category.json
@@ -1,5 +1,5 @@
 {
-    "category": "دسته بندی",
+    "category": "دسته‌بندی",
     "subcategories": "زیر دسته ها",
     "new_topic_button": "جستار تازه",
     "guest-login-post": "برای ثبت نظر وارد شوید",
diff --git a/public/language/fa_IR/email.json b/public/language/fa_IR/email.json
index 1ec13b4a26..de1a046499 100644
--- a/public/language/fa_IR/email.json
+++ b/public/language/fa_IR/email.json
@@ -24,6 +24,7 @@
     "digest.day": "روز",
     "digest.week": "هفته",
     "digest.month": "ماه",
+    "digest.subject": "خلاصه برای %1",
     "notif.chat.subject": "پیام چتی جدیدی از %1 دریافت شد",
     "notif.chat.cta": "برای ادامه‌ی چت اینجا کلیک کنید",
     "notif.chat.unsub.info": "این اطلاعیه ی چتیی که برای شما فرستاده شده به علت تنظیمات اشترک شماست.",
diff --git a/public/language/fa_IR/error.json b/public/language/fa_IR/error.json
index c6651bc9d8..dfe0dd693e 100644
--- a/public/language/fa_IR/error.json
+++ b/public/language/fa_IR/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "کلمه عبور نامعتبر است.",
     "invalid-username-or-password": "لطفا هم نام کاربری و هم کلمه عبور را مشخص کنید",
     "invalid-search-term": "کلمه جستجو نامعتبر است",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "این نام کاربری گرفته شده است.",
     "email-taken": "این ایمیل گرفته شده است.",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "ایمیل شما تایید نشده است ، لطفا برای وارد کردن ایمیل اینجا کلیک کنید",
     "email-confirm-failed": "سیستم موفق به تایید ایمیل شما نشد، لطفا بعدا دوباره سعی کنید",
     "confirm-email-already-sent": "ایمیل فعال‌سازی قبلا فرستاده شده، لطفا %1 دقیقه صبر کنید تا ایمیل دیگری بفرستید.",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "نام کاربری خیلی کوتاه است.",
     "username-too-long": "نام کاربری بسیار طولانیست",
     "password-too-long": "کلمه عبور بسیار طولانیست",
     "user-banned": "کاربر محروم شد.",
     "user-too-new": "با عرض پوزش، شما باید %1 ثانیه پیش از فرستادن پست نخست خود صبر کنید",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "دسته بندی وجود ندارد",
     "no-topic": "موضوع وجود ندارد.",
     "no-post": "پست وجود ندارد",
@@ -38,6 +41,19 @@
     "category-disabled": "دسته غیر‌فعال شد.",
     "topic-locked": "موضوع بسته شد.",
     "post-edit-duration-expired": "شما تنها می توانید %1 ثانیه پس از فرستادن پست آن‌را ویرایش کنید",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "خواهشمندیم پست بلندتری بنویسید. پست‌ها دست‌کم باید %1 کاراکتر داشته باشند.",
     "content-too-long": "لطفا طول مطلب را کوتاه تر کنید. طول پست نمیتواند بیشتر از %1 کاراکتر باشد.",
     "title-too-short": "لطفا یک عنوان بلندتر وارد کنید. عنوان باید حداقل %1 کاراکتر داشته باشد.",
@@ -50,15 +66,17 @@
     "too-many-tags": "تعداد برچسب ها بیشتر  از حد مجاز است. موضوع ها نمی توانند بیشتر از %1 برچسب داشته باشند",
     "still-uploading": "خواهشمندیم تا پایان بارگذاری‌ها شکیبا باشید.",
     "file-too-big": "حداکثر مجاز حجم فایل %1 کیلوبایت می باشد - لطفا فایلی با حجم کمتر بارگذاری کنید",
-    "guest-upload-disabled": "Guest uploading has been disabled",
-    "already-favourited": "You have already bookmarked this post",
-    "already-unfavourited": "You have already unbookmarked this post",
+    "guest-upload-disabled": "بارگذاری برای مهمانان غیر فعال شده است",
+    "already-favourited": "شما در حال حاضر این پست را به علاقمندی های خود اضافه کرده ایید",
+    "already-unfavourited": "شما در حال حاضر این پست را از لیست علاقمندی خود خارج کردید",
     "cant-ban-other-admins": "شما نمی‌توانید دیگر مدیران را محروم کنید!",
     "cant-remove-last-admin": "شما تنها مدیر می باشید . شما باید قبل از عزل خود از مدیریت یک کاربر دیگر را مدیر کنید",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "نوع تصویر نامعتبر است. نوعهای قابل قبول اینها هستند: %1",
     "invalid-image-extension": "پسوند عکس نامعتبر است",
     "invalid-file-type": "نوع پرونده نامعتبر است. نوعهای قابل قبول اینها هستند: %1",
     "group-name-too-short": "نام گروه خیلی کوتاه است.",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "این گروه از پیش وجود دارد.",
     "group-name-change-not-allowed": "تغیر نام گروه نیاز به دسترسی دارد.",
     "group-already-member": "شما عضوی از این گروه می باشید",
@@ -78,13 +96,14 @@
     "about-me-too-long": "با عرض پوزش محتوای 'درباره ی من' نمی تواند طولانی تر از %1 کاراکتر باشد",
     "cant-chat-with-yourself": "شما نمی‌توانید با خودتان چت کنید!",
     "chat-restricted": "این کاربر پیام های چتی خود را محدود کرده است . آنها بایدشما را دنبال کنند تا اینکه شما بتوانید به آنها پیامی بفرستید",
-    "chat-disabled": "Chat system disabled",
+    "chat-disabled": "سیستم گفتمان غیرفعال شده است",
     "too-many-messages": "شما پیامهای خیلی زیادی فرستاده اید، لطفا مدتی صبر نمایید",
     "invalid-chat-message": "پیام نامعتبر",
     "chat-message-too-long": "پیام طولانی تر از حد مجاز است",
     "cant-edit-chat-message": "شما اجازه ی ویرایش این پیام را ندارید",
-    "cant-remove-last-user": "You can't remove the last user",
-    "cant-delete-chat-message": "You are not allowed to delete this message",
+    "cant-remove-last-user": "شما نمی توانید آخرین کاربر را حذف کنید",
+    "cant-delete-chat-message": "شما اجازه حذف این پیام را ندارید.",
+    "already-voting-for-this-post": "شما قبلا به این پست رای داده اید.",
     "reputation-system-disabled": "سیستم اعتبار غیر فعال شده است",
     "downvoting-disabled": "رأی منفی غیر فعال شده است",
     "not-enough-reputation-to-downvote": "شما اعتبار کافی برای دادن رأی منفی به این پست را ندارید.",
@@ -96,8 +115,9 @@
     "wrong-login-type-email": "لطفا از ایمیل خود برای ورود استفاده کنید",
     "wrong-login-type-username": "لطفا از نام کاربری خود برای ورود استفاده کنید",
     "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
-    "no-session-found": "No login session found!",
-    "not-in-room": "User not in room",
+    "no-session-found": "هیچ سشن ورودی یافت نشد!",
+    "not-in-room": "هیچ کاربری در این گفتگو نیست",
     "no-users-in-room": "هیچ کاربری در این گفتگو نیست",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "شما نمی توانید خودتان را از گروه کیک کنید",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/fa_IR/global.json b/public/language/fa_IR/global.json
index 948145c589..7681ad9bea 100644
--- a/public/language/fa_IR/global.json
+++ b/public/language/fa_IR/global.json
@@ -49,9 +49,9 @@
     "users": "کاربران",
     "topics": "موضوع ها",
     "posts": "دیدگاه‌ها",
-    "best": "Best",
-    "upvoted": "Upvoted",
-    "downvoted": "Downvoted",
+    "best": "بهترین",
+    "upvoted": "رای مثبت",
+    "downvoted": "رای منفی",
     "views": "بازدیدها",
     "reputation": "اعتبار",
     "read_more": "بیشتر بخوانید",
@@ -65,7 +65,7 @@
     "posted_in_ago_by": "ارسال شده در %1 %2 توسط %3",
     "user_posted_ago": "%1 در %2 ارسال کرده است",
     "guest_posted_ago": "مهمان در %1 ارسال کرده است",
-    "last_edited_by": "last edited by %1",
+    "last_edited_by": "آخرین ویرایش توسط %1 انجام شده",
     "norecentposts": "هیچ دیدگاه تازه‌ای نیست",
     "norecenttopics": "هیچ جستار تازه‌ای نیست",
     "recentposts": "دیدگاه‌های تازه",
@@ -85,10 +85,10 @@
     "unfollow": "دنبال نکن",
     "delete_all": "حذف همه",
     "map": "نقشه",
-    "sessions": "Login Sessions",
-    "ip_address": "IP Address",
-    "enter_page_number": "Enter page number",
-    "upload_file": "Upload file",
-    "upload": "Upload",
-    "allowed-file-types": "Allowed file types are %1"
+    "sessions": "Session های ورود",
+    "ip_address": "آدرس آی پی",
+    "enter_page_number": "شماره صفحه را وارد کنید",
+    "upload_file": "بارگذاری فایل",
+    "upload": "بارگذاری",
+    "allowed-file-types": "فایل قابل قبول اینها هستند %1"
 }
\ No newline at end of file
diff --git a/public/language/fa_IR/groups.json b/public/language/fa_IR/groups.json
index 2c1db5b30d..47d8fb07da 100644
--- a/public/language/fa_IR/groups.json
+++ b/public/language/fa_IR/groups.json
@@ -18,7 +18,7 @@
     "cover-save": "ذخیره",
     "cover-saving": "در حال ذخیره کردن",
     "details.title": "جزئیات گروه",
-    "details.members": "لیست اعضا",
+    "details.members": "فهرست اعضا",
     "details.pending": "اعضای در انتظار",
     "details.invited": "اعضای دعوت شده",
     "details.has_no_posts": "اعضای این گروه هیچ پستی ایجاد نکرده اند",
@@ -41,7 +41,7 @@
     "details.hidden": "پنهان",
     "details.hidden_help": "اگر فعال باشد، این گروه در فهرست گروه‌ها پیدا نمی‌شود و کاربران باید دستی فراخوانده شوند",
     "details.delete_group": "حذف گروه",
-    "details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
+    "details.private_system_help": "گروه های خصوصی در این سطح سیستم غیر فعال هستند، این گزینه هیچ کاری انجام نمی دهد",
     "event.updated": "جزییات گروه با موفقیت به روز شد",
     "event.deleted": "گروه \"%1\" حدف شد",
     "membership.accept-invitation": "دعوت را قبول میکنم",
diff --git a/public/language/fa_IR/login.json b/public/language/fa_IR/login.json
index 578071109d..a6c3e72fa8 100644
--- a/public/language/fa_IR/login.json
+++ b/public/language/fa_IR/login.json
@@ -5,7 +5,7 @@
     "remember_me": "مرا به یاد بسپار؟",
     "forgot_password": "گذرواژه را فراموش کرده‌اید؟",
     "alternative_logins": "روش‌های درون آمدن جایگزین",
-    "failed_login_attempt": "شکست در درون آمدن، لطفا دوباره تلاش کنید.",
+    "failed_login_attempt": "ورود ناموفق",
     "login_successful": "شما با موفقیت به درون آمده‌اید!",
     "dont_have_account": "حساب کاربری ندارید؟"
 }
\ No newline at end of file
diff --git a/public/language/fa_IR/modules.json b/public/language/fa_IR/modules.json
index cae06f83b0..58e75bf025 100644
--- a/public/language/fa_IR/modules.json
+++ b/public/language/fa_IR/modules.json
@@ -6,7 +6,7 @@
     "chat.user_typing": "%1 در حال نوشتن است...",
     "chat.user_has_messaged_you": "%1 به شما پیام داده است.",
     "chat.see_all": "دیدن همه ی چت ها",
-    "chat.mark_all_read": "Mark all chats read",
+    "chat.mark_all_read": "علامت گذاری شده به عنوان تمام چت ها را خوانده",
     "chat.no-messages": "مشخص کنید تاریخچه چتهایتان با چه کاربری را می‌خواهید ببینید",
     "chat.no-users-in-room": "هیچ کاربری در این گفتگو نیست",
     "chat.recent-chats": "چتهای اخیر",
@@ -18,8 +18,8 @@
     "chat.thirty_days": "30 روز",
     "chat.three_months": "3 ماه",
     "chat.delete_message_confirm": "آیا مطمئن هستید که می خواهید این پیام را حذف کنید؟",
-    "chat.roomname": "Chat Room %1",
-    "chat.add-users-to-room": "Add users to room",
+    "chat.roomname": "اتاق گفتگو %1",
+    "chat.add-users-to-room": "اضافه کردن کاربر به این گفتگو",
     "composer.compose": "ارسال",
     "composer.show_preview": "نمایش پیش‌نمایش",
     "composer.hide_preview": "مخفی کردن پیش‌نمایش",
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "ارسال و قفل",
     "composer.toggle_dropdown": "باز و بسته کردن کرکره",
     "composer.uploading": "در حال بارگذاری %1",
+    "composer.formatting.bold": "توپر",
+    "composer.formatting.italic": "کج",
+    "composer.formatting.list": "فهرست",
+    "composer.formatting.strikethrough": "خط خورده",
+    "composer.formatting.link": "پیوند",
+    "composer.formatting.picture": "عکس",
+    "composer.upload-picture": "بارگذاری عکس",
+    "composer.upload-file": "بارگذاری فایل",
     "bootbox.ok": "باشه",
     "bootbox.cancel": "لغو",
     "bootbox.confirm": "تایید",
diff --git a/public/language/fa_IR/notifications.json b/public/language/fa_IR/notifications.json
index ee4641d006..cfcf1c270d 100644
--- a/public/language/fa_IR/notifications.json
+++ b/public/language/fa_IR/notifications.json
@@ -5,15 +5,15 @@
     "mark_all_read": "همه اطلاعیه ها را خوانده شده علامت بزن",
     "back_to_home": "بازگشت به %1",
     "outgoing_link": "پیوند برون‌رو",
-    "outgoing_link_message": "You are now leaving %1",
+    "outgoing_link_message": "شما در حال ترک %1 هستید",
     "continue_to": "ادامه به %1",
     "return_to": "بازگشت به %1",
     "new_notification": "آکاه‌سازی تازه",
     "you_have_unread_notifications": "شما اطلاعیه های نخوانده دارید.",
     "new_message_from": "پیام تازه از <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> امتیاز مثبت به پست شما در <strong>%2</strong> داده",
-    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
-    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> و <strong>%2</strong> رای مثبت به پست شما در\n <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong>و %2 دیگران به پست شما رای مثبت دادن در  <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> پست شما را به <strong>%2</strong> انتقال داده است",
     "moved_your_topic": "<strong>%2</strong> <strong>%1</strong> را منتقل کرده است",
     "favourited_your_post_in": "<strong>%1</strong> has bookmarked your post in <strong>%2</strong>.",
diff --git a/public/language/fa_IR/pages.json b/public/language/fa_IR/pages.json
index 06d6c1ec35..1172c2e624 100644
--- a/public/language/fa_IR/pages.json
+++ b/public/language/fa_IR/pages.json
@@ -6,12 +6,13 @@
     "popular-month": "موضوعات پربازدید این ماه",
     "popular-alltime": "پربازدیدترین موضوعات",
     "recent": "جستارهای تازه",
-    "flagged-posts": "Flagged Posts",
+    "flagged-posts": "پست نشانه گذاری شده",
     "users/online": "کاربران آنلاین",
     "users/latest": "آخرین کاربران",
     "users/sort-posts": "کاربران با بیش‌ترین پست",
     "users/sort-reputation": "کاربران دارای بیشترین اعتبار",
-    "users/banned": "Banned Users",
+    "users/banned": "کاربران اخراج شده",
+    "users/most-flags": "Most flagged users",
     "users/search": "جستجوی کاربر",
     "notifications": "آگاه‌سازی‌ها",
     "tags": "برچسب‌ها",
@@ -33,13 +34,13 @@
     "account/posts": "پست‌های %1",
     "account/topics": "موضوع های %1",
     "account/groups": "گروه‌های %1",
-    "account/favourites": "%1's Bookmarked Posts",
+    "account/favourites": "%1 پست های به علاقمندی اضافه شدن",
     "account/settings": "تنظیمات کاربر",
     "account/watched": "موضوع های دیده شده توسط \"%1\"",
-    "account/upvoted": "Posts upvoted by %1",
-    "account/downvoted": "Posts downvoted by %1",
-    "account/best": "Best posts made by %1",
-    "confirm": "Email Confirmed",
+    "account/upvoted": "رای مثبت داده شده به پست ها توسط  %1",
+    "account/downvoted": "رای منفی داده شده به پست ها توسط %1",
+    "account/best": "بهترین پست های ارسال شده توسط %1",
+    "confirm": "ایمیل تایید شد",
     "maintenance.text": "%1 در حال حاضر تحت تعمیر و نگهدارییست. لطفا زمان دیگری مراجعه کنید.",
     "maintenance.messageIntro": "علاوه بر این، مدیر این پیام را گذاشته است:",
     "throttled.text": "%1 به دلیل بارگذاری بیش از حد ، قابل دسترس نمی باشد. لطفا در زمان دیگری دوباره امتحان کنید"
diff --git a/public/language/fa_IR/register.json b/public/language/fa_IR/register.json
index 1478014a36..6ece75479c 100644
--- a/public/language/fa_IR/register.json
+++ b/public/language/fa_IR/register.json
@@ -1,7 +1,7 @@
 {
     "register": "نام‌نویسی",
     "help.email": "به طور پیش‌فرض، ایمیل‌ی شما از دید همگان پنهان می‌شود.",
-    "help.username_restrictions": "یک نام کاربری یکتا بین %1 و %2 کاراکتر. دیگران می‌توانند با @<span id='yourUsername'>نام‌کاربری</span> به شما اشاره کنند.",
+    "help.username_restrictions": "یک نام کاربری یکتا بین %1 و %2 نویسه. دیگران می‌توانند با @<span id='yourUsername'>نام‌کاربری</span> به شما اشاره کنند.",
     "help.minimum_password_length": "کلمه عبور شما باید دست‌کم %1 کاراکتر داشته باشد.",
     "email_address": "نشانی رایانامه",
     "email_address_placeholder": "نوشتن نشانی رایانامه",
diff --git a/public/language/fa_IR/tags.json b/public/language/fa_IR/tags.json
index ba8c46a569..45470ec855 100644
--- a/public/language/fa_IR/tags.json
+++ b/public/language/fa_IR/tags.json
@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "جُستاری با این برچسب وجود ندارد.",
     "tags": "برچسب‌ها",
-    "enter_tags_here": "برچسب‌ها را اینجا وارد کنید. هر کدام بین %1 و %2 کاراکتور",
-    "enter_tags_here_short": "برچسب ها را وارد کنید ...",
+    "enter_tags_here": "برچسب‌ها را اینجا وارد کنید، هر کدام بین %1 و %2 کاراکتر.",
+    "enter_tags_here_short": "برچسب‌ها را وارد کنید...",
     "no_tags": "هنوز برچسبی وجود ندارد."
 }
\ No newline at end of file
diff --git a/public/language/fa_IR/topic.json b/public/language/fa_IR/topic.json
index f3265b1ca9..a4c0951b5a 100644
--- a/public/language/fa_IR/topic.json
+++ b/public/language/fa_IR/topic.json
@@ -13,7 +13,7 @@
     "notify_me": "از پاسخ‌های تازه در موضوع آگاه شوید",
     "quote": "نقل قول",
     "reply": "پاسخ",
-    "reply-as-topic": "Reply as topic",
+    "reply-as-topic": "پاسخ به موضوع",
     "guest-login-reply": "وارد شوید تا پست بفرستید",
     "edit": "ویرایش",
     "delete": "حذف",
@@ -26,21 +26,28 @@
     "tools": "ابزارها",
     "flag": "پرچم",
     "locked": "قفل شده است",
-    "bookmark_instructions": "برای بازگشت به آخرین پست خوانده نشده در این دسته اینجا کلیک کنید",
+    "bookmark_instructions": "برای بازگشت به آخرین پست در این موضوع اینجا را کلیک کنید.",
     "flag_title": "پرچم‌گذاری این موضوع برای بررسی ناظران",
     "flag_success": "این موضوع برای بررسی ناظران پرچم گذاشته شد.",
     "deleted_message": "این موضوع پاک شده است. تنها کاربرانِ با حق مدیریت موضوع می‌توانند آن را ببینند.",
     "following_topic.message": "از این پس اگر کسی در این موضوع پست بگذارد، شما آگاه خواهید شد.",
     "not_following_topic.message": "شما دیگر اطلاعیه های این موضوع را دریافت نخواهید کرد.",
+    "ignoring_topic.message": "شما دیگر نمی خواهید این تاپیک را در فهرست عنوان های خوانده نشده ببینید. به شما اطلاع داده خواهد شد زمانی که به پست شما کسی رای بدهد.",
     "login_to_subscribe": "برای دنبال کردن این موضوع، لطفا ثبت نام کنید و یا با نام کاربری خود وارد شوید",
     "markAsUnreadForAll.success": "موضوع برای همگان نخوانده در نظر گرفته شد.",
-    "mark_unread": "Mark unread",
-    "mark_unread.success": "Topic marked as unread.",
+    "mark_unread": "علامت بزن به عنوان خوانده نشده",
+    "mark_unread.success": "تاپیک را علامت بزن به عنوان خوانده نشده",
     "watch": "پیگیری",
     "unwatch": "عدم پیگیری",
     "watch.title": "از پاسخ‌های تازه به این موضوع آگاه شوید.",
     "unwatch.title": "توقف پیگیری این موضوع",
     "share_this_post": "به اشتراک‌گذاری این موضوع",
+    "watching": "درحال پیگیری",
+    "not-watching": "درحال پیگیری نیستید",
+    "ignoring": "نادیده گرفتن",
+    "watching.description": "به من اطلاع بده برای پاسخ های جدید.<br/>نشان بده تاپیک های خوانده نشده را.",
+    "not-watching.description": "به من پس از ارسال هر پاسخی جدیدی اطلاع نده.<br/>تاپیک به صورت خوانده نشده قرار بگیرد ولی نادیده گرفته نشود.",
+    "ignoring.description": "به من پس از ارسال هر پاسخی جدیدی اطلاع نده.<br/>دیگر تاپیک را به صورت خوانده نشده نشان نده.",
     "thread_tools.title": "ابزارهای موضوع",
     "thread_tools.markAsUnreadForAll": "نخوانده بگیر",
     "thread_tools.pin": "سنجاق زدن موضوع",
@@ -51,7 +58,7 @@
     "thread_tools.move_all": "جابجایی همه",
     "thread_tools.fork": "شاخه ساختن از موضوع",
     "thread_tools.delete": "پاک کردن موضوع",
-    "thread_tools.delete-posts": "Delete Posts",
+    "thread_tools.delete-posts": "حذف پست ها",
     "thread_tools.delete_confirm": "آیا مطمئنید می خواهید این موضوع را حذف کنید؟",
     "thread_tools.restore": "برگرداندن موضوع",
     "thread_tools.restore_confirm": "آیا مطمئنید که می خواهید این موضوع را بازگردانی کنید؟",
@@ -65,9 +72,9 @@
     "disabled_categories_note": "دسته‌های از کار افتاده به رنگ خاکستری در می‌آیند",
     "confirm_move": "جابه‌جا کردن",
     "confirm_fork": "شاخه ساختن",
-    "favourite": "Bookmark",
-    "favourites": "Bookmarks",
-    "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
+    "favourite": "علاقمندی",
+    "favourites": "علاقمندی ها",
+    "favourites.has_no_favourites": "شما هیچ پستی را به صورت علاقمندی ندارید.",
     "loading_more_posts": "بارگذاری پست‌های بیش‌تر",
     "move_topic": "جابه‌جایی موضوع",
     "move_topics": "انتقال موضوع",
@@ -78,7 +85,7 @@
     "fork_topic_instruction": "پست‌هایی را که می‌خواهید به موضوع تازه ببرید، انتخاب کنید",
     "fork_no_pids": "هیچ پستی انتخاب نشده!",
     "fork_success": "موضوع با موفقیت منشعب شد! برای رفتن به موضوع انشعابی اینجا را کلیک کنید.",
-    "delete_posts_instruction": "Click the posts you want to delete/purge",
+    "delete_posts_instruction": "با کلیک بر روی پست شما می خواهید به حذف/پاکسازی",
     "composer.title_placeholder": "عنوان موضوعتان را اینجا بنویسید...",
     "composer.handle_placeholder": "نام",
     "composer.discard": "دور بیانداز",
@@ -105,7 +112,7 @@
     "stale.warning": "موضوعی که شما در حال پاسخگویی به آن هستید قدیمی می باشد. آیا میلید به جای آن یک موضوع جدید ایجاد کنید و در آن به این موضوع ارجاع دهید؟",
     "stale.create": "ایجاد یک موضوع جدید",
     "stale.reply_anyway": "در هر صورت می خواهم به این موضوع پاسخ دهم",
-    "link_back": "Re: [%1](%2)",
+    "link_back": "پاسخ: [%1](%2)",
     "spam": "اسپم",
     "offensive": "توهین آمیز",
     "custom-flag-reason": "وارد کردن دلیل پرچمگذاری"
diff --git a/public/language/fa_IR/unread.json b/public/language/fa_IR/unread.json
index c5a17f9649..b99597020c 100644
--- a/public/language/fa_IR/unread.json
+++ b/public/language/fa_IR/unread.json
@@ -6,5 +6,8 @@
     "selected": "برگزیده",
     "all": "همه",
     "all_categories": "تمام دسته ها",
-    "topics_marked_as_read.success": "همه موضوع ها خوانده شدند"
+    "topics_marked_as_read.success": "همه موضوع ها خوانده شدند",
+    "all-topics": "همه موضوع ها",
+    "new-topics": "موضوع های جدید",
+    "watched-topics": "موضوع های پیگیری شده"
 }
\ No newline at end of file
diff --git a/public/language/fa_IR/uploads.json b/public/language/fa_IR/uploads.json
index 1622cb5693..8cf6622f5b 100644
--- a/public/language/fa_IR/uploads.json
+++ b/public/language/fa_IR/uploads.json
@@ -1,6 +1,6 @@
 {
-    "uploading-file": "Uploading the file...",
-    "select-file-to-upload": "Select a file to upload!",
-    "upload-success": "File uploaded successfully!",
-    "maximum-file-size": "Maximum %1 kb"
+    "uploading-file": "در حال بارگذاری فایل...",
+    "select-file-to-upload": "فایل مورد نظر را برای بارگذاری انتخاب کنید!",
+    "upload-success": "فایل با موفقیت بارگذاری شد!",
+    "maximum-file-size": "حداکثر %1 کیلوبایت"
 }
\ No newline at end of file
diff --git a/public/language/fa_IR/user.json b/public/language/fa_IR/user.json
index 57d8e534b7..2fb8fe00c7 100644
--- a/public/language/fa_IR/user.json
+++ b/public/language/fa_IR/user.json
@@ -22,7 +22,7 @@
     "profile": "پروفایل",
     "profile_views": "بازدیدهای نمایه",
     "reputation": "اعتبار",
-    "favourites": "Bookmarks",
+    "favourites": "علاقمندی ها",
     "watched": "پیگیری شده",
     "followers": "دنبال‌کننده‌ها",
     "following": "دنبال‌شونده‌ها",
@@ -39,7 +39,7 @@
     "change_username": "تغییر نام کاربری",
     "change_email": "تغییر ایمیل",
     "edit": "ویرایش",
-    "edit-profile": "Edit Profile",
+    "edit-profile": "ویرایش پروفایل",
     "default_picture": "آیکون پیش فرض",
     "uploaded_picture": "تصویر بارشده",
     "upload_new_picture": "بارگذاری تصویر تازه",
@@ -56,11 +56,11 @@
     "password": "گذرواژه",
     "username_taken_workaround": "نام کاربری درخواستی شما در حال حاضر گرفته شده است، بنابراین ما آن را کمی تغییر داده‌ایم. شما هم‌اکنون با نام <strong>%1</strong  شناخته می‌شوید.",
     "password_same_as_username": "کلمه ی عبور شما با نام کاربری شما یکسان می باشند ، لطفا کلمه ی عبور دیگری را انتخاب کنید",
-    "password_same_as_email": "Your password is the same as your email, please select another password.",
+    "password_same_as_email": "کلمه ی عبور شما با ایمیل شما یکسان است، لطفا کلمه عبور دیگری را انتخاب کنید.",
     "upload_picture": "بارگذاری تصویر",
     "upload_a_picture": "یک تصویر بارگذاری کنید",
     "remove_uploaded_picture": "پاک کردن عکس بارگذاری شده",
-    "upload_cover_picture": "Upload cover picture",
+    "upload_cover_picture": "بارگذاری عکس کاور",
     "settings": "تنظیمات",
     "show_email": "نمایش ایمیل‌ام",
     "show_fullname": "نام کامل من را نشان بده",
@@ -79,9 +79,9 @@
     "has_no_posts": "این کاربر تا به حال هیچ چیزی ارسال نکرده است.",
     "has_no_topics": "این کاربر تا به حال هیچ موضوعی ارسال نکرده است",
     "has_no_watched_topics": "این کاربر تا به حال هیچ موضوعی را پیگیری نکرده است",
-    "has_no_upvoted_posts": "This user hasn't upvoted any posts yet.",
-    "has_no_downvoted_posts": "This user hasn't downvoted any posts yet.",
-    "has_no_voted_posts": "This user has no voted posts",
+    "has_no_upvoted_posts": "این کاربر به هیچ پستی امتیاز نداده است.",
+    "has_no_downvoted_posts": "این کاربر به هیچ پستی رای منفی نداده است.",
+    "has_no_voted_posts": "این کاربر به پست رای نداده است",
     "email_hidden": "ایمیل پنهان شده",
     "hidden": "پنهان",
     "paginate_description": "صفحه بندی و نمایش موضوع ها و پست‌ها  به جای نمایش بر اساس اسکرول موس",
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "پیوندهای به بیرون را در برگ جدید باز کن",
     "enable_topic_searching": "فعال کردن جستجوی داخل-موضوع",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
-    "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "تاپیک هایی که پاسخ داده ای را دنبال کن",
-    "follow_topics_you_create": "موضوع هایی که ایجاد کرده ای را دنبال کن",
-    "grouptitle": "عنوان گروهی که میخواهید نشان داده شود را انتخاب کنید.",
+    "delay_image_loading": "تاخیر در حال بارگذاری عکس",
+    "image_load_delay_help": "اگر فعال باشد، تصاویر در تاپیک ها بارگذاری نمی شود تا زمانی که از طریق اسکرول روی آن بروید قابل مشاهده است",
+    "scroll_to_my_post": "پس از ارسال پست، اولین پست جدید نشان بده",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "عنوان گروه",
     "no-group-title": "عنوان گروهی نیست",
     "select-skin": "Select a Skin",
     "select-homepage": "Select a Homepage",
diff --git a/public/language/fa_IR/users.json b/public/language/fa_IR/users.json
index 3cd0087dcf..c3e7c799bd 100644
--- a/public/language/fa_IR/users.json
+++ b/public/language/fa_IR/users.json
@@ -2,6 +2,7 @@
     "latest_users": "آخرین کاربران",
     "top_posters": "بهترین فرستنده‌ها",
     "most_reputation": "بیش‌ترین اعتبار",
+    "most_flags": "Most Flags",
     "search": "جستجو",
     "enter_username": "یک نام کاربری برای جستجو وارد کنید",
     "load_more": "بارگذاری بیش‌تر",
@@ -16,5 +17,5 @@
     "unread_topics": "موضوع های خوانده نشده",
     "categories": "دسته ها",
     "tags": "برچسب‌ها",
-    "no-users-found": "No users found!"
+    "no-users-found": "کاربری پیدا نشد!"
 }
\ No newline at end of file
diff --git a/public/language/fi/email.json b/public/language/fi/email.json
index 92002dae56..105dc065a1 100644
--- a/public/language/fi/email.json
+++ b/public/language/fi/email.json
@@ -24,6 +24,7 @@
     "digest.day": "päivä",
     "digest.week": "viikko",
     "digest.month": "kuukausi",
+    "digest.subject": "Digest for %1",
     "notif.chat.subject": "Uusi chatviesti henkilöltä %1",
     "notif.chat.cta": "Click here to continue the conversation",
     "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
diff --git a/public/language/fi/error.json b/public/language/fi/error.json
index dbb4fd10c2..b87d5f0f7b 100644
--- a/public/language/fi/error.json
+++ b/public/language/fi/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Virheellinen salasana",
     "invalid-username-or-password": "Ole hyvä ja anna sekä käyttäjänimi että salasana",
     "invalid-search-term": "Virheellinen hakutermi",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "Käyttäjänimi varattu",
     "email-taken": "Sähköpostiosoite varattu",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
     "email-confirm-failed": "We could not confirm your email, please try again later.",
     "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "Käyttäjänimi on liian lyhyt",
     "username-too-long": "Käyttäjänimi on liian pitkä",
     "password-too-long": "Password too long",
     "user-banned": "Käyttäjä on estetty",
     "user-too-new": "Anteeksi, mutta sinun täytyy odottaa %1 sekunti(a) ennen sinun ensimmäisen viestin lähettämistä",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "Kategoriaa ei ole olemassa",
     "no-topic": "Aihetta ei ole olemassa",
     "no-post": "Viestiä ei ole olemassa",
@@ -38,6 +41,19 @@
     "category-disabled": "Kategoria ei ole käytössä",
     "topic-locked": "Aihe lukittu",
     "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Ole hyvä ja syötä pidempi viesti. Sen pitäisi sisältää ainakin %1 merkki(ä).",
     "content-too-long": "Ole hyvä ja syötä lyhyempi viesti. Sen voi sisältää vain %1 merkki(ä).",
     "title-too-short": "Ole hyä ja syötä pidempi otsikko. Sen pitäisi sisältää anakin %1 merkki(ä).",
@@ -55,10 +71,12 @@
     "already-unfavourited": "You have already unbookmarked this post",
     "cant-ban-other-admins": "Et voi estää muita ylläpitäjiä!",
     "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Invalid image type. Allowed types are: %1",
     "invalid-image-extension": "Invalid image extension",
     "invalid-file-type": "Invalid file type. Allowed types are: %1",
     "group-name-too-short": "Ryhmän nimi on liian lyhyt",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Ryhmä on jo olemassa",
     "group-name-change-not-allowed": "Et voi vaihtaa ryhmän nimeä",
     "group-already-member": "Already part of this group",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "You are not allowed to edit this message",
     "cant-remove-last-user": "You can't remove the last user",
     "cant-delete-chat-message": "You are not allowed to delete this message",
+    "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Reputation system is disabled.",
     "downvoting-disabled": "Downvoting is disabled",
     "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",
@@ -99,5 +118,6 @@
     "no-session-found": "No login session found!",
     "not-in-room": "Käyttäjä ei ole huoneessa",
     "no-users-in-room": "Ei käyttäjiä tässä huoneessa",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "You can't kick yourself from the group",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/fi/login.json b/public/language/fi/login.json
index 3dc14792ee..a9c69851b2 100644
--- a/public/language/fi/login.json
+++ b/public/language/fi/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Muista minut?",
     "forgot_password": "Unohditko salasanasi?",
     "alternative_logins": "Vaihtoehtoiset kirjautumistavat",
-    "failed_login_attempt": "Kirjautumisyritys epäonnistui, ole hyvä ja yritä uudestaan.",
+    "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Olet onnistuneesti kirjautunut sisään!",
     "dont_have_account": "Ei käyttäjätunnusta?"
 }
\ No newline at end of file
diff --git a/public/language/fi/modules.json b/public/language/fi/modules.json
index 978d306170..77fff03fd5 100644
--- a/public/language/fi/modules.json
+++ b/public/language/fi/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Submit and Lock",
     "composer.toggle_dropdown": "Toggle Dropdown",
     "composer.uploading": "Uploading %1",
+    "composer.formatting.bold": "Bold",
+    "composer.formatting.italic": "Italic",
+    "composer.formatting.list": "List",
+    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Picture",
+    "composer.upload-picture": "Upload Image",
+    "composer.upload-file": "Upload File",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",
diff --git a/public/language/fi/pages.json b/public/language/fi/pages.json
index d2eba81a6c..66c6fdfe34 100644
--- a/public/language/fi/pages.json
+++ b/public/language/fi/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Users with the most posts",
     "users/sort-reputation": "Users with the most reputation",
     "users/banned": "Banned Users",
+    "users/most-flags": "Most flagged users",
     "users/search": "User Search",
     "notifications": "Ilmoitukset",
     "tags": "Tunnisteet",
diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json
index 37b9b98e80..9136073cab 100644
--- a/public/language/fi/topic.json
+++ b/public/language/fi/topic.json
@@ -26,12 +26,13 @@
     "tools": "Työkalut",
     "flag": "Ilmianna",
     "locked": "Lukittu",
-    "bookmark_instructions": "Click here to return to the last unread post in this thread.",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Ilmianna tämä viesti moderaattoreille",
     "flag_success": "Tämä viesti ilmiannettiin moderaattoreille.",
     "deleted_message": "Tämä aihe on poistettu. Vain käyttäjät, joilla on aiheen hallintaoikeudet, voivat nähdä sen.",
     "following_topic.message": "Saat nyt ilmoituksen, kun joku kirjoittaa tähän aiheeseen.",
     "not_following_topic.message": "Et saa enää ilmoituksia tästä aiheesta.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "Ole hyvä ja rekisteröidy tai kirjaudu sisään tilataksesi tämän aiheen.",
     "markAsUnreadForAll.success": "Aihe merkitty lukemattomaksi kaikille.",
     "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
     "watch.title": "Ilmoita, kun tähän keskusteluun tulee uusia viestejä",
     "unwatch.title": "Lopeta tämän aiheen seuraaminen",
     "share_this_post": "Jaa tämä viesti",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "Aiheen työkalut",
     "thread_tools.markAsUnreadForAll": "Merkitse lukemattomaksi",
     "thread_tools.pin": "Kiinnitä aihe",
diff --git a/public/language/fi/unread.json b/public/language/fi/unread.json
index 5588fce2c3..e7296b4cf8 100644
--- a/public/language/fi/unread.json
+++ b/public/language/fi/unread.json
@@ -6,5 +6,8 @@
     "selected": "Valitut",
     "all": "Kaikki",
     "all_categories": "All categories",
-    "topics_marked_as_read.success": "Aihe merkitty luetuksi!"
+    "topics_marked_as_read.success": "Aihe merkitty luetuksi!",
+    "all-topics": "All Topics",
+    "new-topics": "New Topics",
+    "watched-topics": "Watched Topics"
 }
\ No newline at end of file
diff --git a/public/language/fi/user.json b/public/language/fi/user.json
index f7218528a3..46ac2e314d 100644
--- a/public/language/fi/user.json
+++ b/public/language/fi/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Open outgoing links in new tab",
     "enable_topic_searching": "Salli aiheen sisäiset haut",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
+    "delay_image_loading": "Delay Image Loading",
+    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
     "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Follow topics that you reply to",
-    "follow_topics_you_create": "Follow topics you create",
-    "grouptitle": "Select the group title you would like to display",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Group Title",
     "no-group-title": "No group title",
     "select-skin": "Select a Skin",
     "select-homepage": "Select a Homepage",
diff --git a/public/language/fi/users.json b/public/language/fi/users.json
index 9ebaf393e1..2a01aed651 100644
--- a/public/language/fi/users.json
+++ b/public/language/fi/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Viimeisimmät käyttäjät",
     "top_posters": "Aktiivisimmat viestittelijät",
     "most_reputation": "Eniten mainetta",
+    "most_flags": "Most Flags",
     "search": "Hae",
     "enter_username": "Syötä käyttäjätunnus hakeaksesi",
     "load_more": "Lataa lisää",
diff --git a/public/language/fr/category.json b/public/language/fr/category.json
index 785b6af048..a44eb21efe 100644
--- a/public/language/fr/category.json
+++ b/public/language/fr/category.json
@@ -8,9 +8,9 @@
     "no_replies": "Personne n'a répondu",
     "no_new_posts": "Pas de nouveau message",
     "share_this_category": "Partager cette catégorie",
-    "watch": "Surveiller",
+    "watch": "S'abonner",
     "ignore": "Ne plus surveiller",
-    "watch.message": "Vous surveillez désormais les mises à jour de cette catégorie.",
+    "watch.message": "Vous êtes désormais abonné aux mises à jour de cette catégorie.",
     "ignore.message": "Vous ne surveillez plus les mises jour de cette catégorie.",
-    "watched-categories": "Catégories Suivies"
+    "watched-categories": "Abonnements"
 }
\ No newline at end of file
diff --git a/public/language/fr/email.json b/public/language/fr/email.json
index 5de03234d8..b990e55c58 100644
--- a/public/language/fr/email.json
+++ b/public/language/fr/email.json
@@ -24,6 +24,7 @@
     "digest.day": "jour",
     "digest.week": "semaine",
     "digest.month": "mois",
+    "digest.subject": "Résumé de l'actualité de %1",
     "notif.chat.subject": "Nouveau message de chat reçu de %1",
     "notif.chat.cta": "Cliquez ici pour continuer la conversation",
     "notif.chat.unsub.info": "Cette notification de chat a été envoyé en raison de vos paramètres d'abonnement.",
diff --git a/public/language/fr/error.json b/public/language/fr/error.json
index d80c43277e..74fb3a81d4 100644
--- a/public/language/fr/error.json
+++ b/public/language/fr/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Mot de passe invalide",
     "invalid-username-or-password": "Veuillez entrer un nom d'utilisateur et un mot de passe",
     "invalid-search-term": "Données de recherche invalides",
+    "csrf-invalid": "Nous ne pouvons pas vous connectez, possiblement car votre session a expiré. Merci de réessayer.",
     "invalid-pagination-value": "Valeur de pagination invalide. Celle-ci doit être comprise entre %1 et %2.",
     "username-taken": "Nom d’utilisateur déjà utilisé",
     "email-taken": "Email déjà utilisé",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "Ce forum requiert une vérification de votre adresse email. Veuillez cliquer ici pour entrer une adresse.",
     "email-confirm-failed": "Votre adresse email n'a pas pu être vérifiée. Veuillez ré-essayer plus tard.",
     "confirm-email-already-sent": "L'email de confirmation a déjà été envoyé. Veuillez attendre %1 minute(s) avant de redemander un nouvel envoi.",
+    "sendmail-not-found": "L'application d'envoi de mail est introuvable, assurez-vous qu'elle est installée et que l'utilisateur servant à démarrer NodeBB ait des droits suffisants.",
     "username-too-short": "Nom d'utilisateur trop court",
     "username-too-long": "Nom d'utilisateur trop long",
     "password-too-long": "Mot de passe trop long",
     "user-banned": "Utilisateur banni",
     "user-too-new": "Désolé, vous devez attendre encore %1 seconde(s) avant d'envoyer votre premier message",
     "blacklisted-ip": "Désolé, votre adresse IP a été bannie de cette communauté. Si vous pensez que c'est une erreur, veuillez contacter un administrateur.",
+    "ban-expiry-missing": "Veuillez entrer une date de fin de banissement.",
     "no-category": "Cette catégorie n'existe pas",
     "no-topic": "Ce sujet n'existe pas",
     "no-post": "Ce message n'existe pas",
@@ -37,7 +40,20 @@
     "no-privileges": "Vous n'avez pas les privilèges nécessaires pour effectuer cette action.",
     "category-disabled": "Catégorie désactivée",
     "topic-locked": "Sujet verrouillé",
-    "post-edit-duration-expired": "Vous ne pouvez modifier un message que %1 seconde(s) après l'avoir posté.",
+    "post-edit-duration-expired": "Vous ne pouvez modifier un message que pendant %1 seconde(s) après l'avoir posté.",
+    "post-edit-duration-expired-minutes": "Vous ne pouvez éditer un message que pendant %1 minute(s) après l'avoir posté.",
+    "post-edit-duration-expired-minutes-seconds": "Vous ne pouvez éditer un message que pendant %1 minute(s) et %2 seconde(s) après l'avoir posté.",
+    "post-edit-duration-expired-hours": "Vous ne pouvez éditer un message que pendant %1 heure(s) après l'avoir posté.",
+    "post-edit-duration-expired-hours-minutes": "Vous ne pouvez éditer un message que pendant %1 heure(s) et %2 minute(s) après l'avoir posté.",
+    "post-edit-duration-expired-days": "Vous ne pouvez éditer un message que pendant %1 jours(s) après l'avoir posté.",
+    "post-edit-duration-expired-days-hours": "Vous ne pouvez éditer un message que pendant %1 jours(s) et %2 heures(s) après l'avoir posté.",
+    "post-delete-duration-expired": "Vous ne pouvez supprimer un message que pendant %1 seconde(s) après l'avoir posté.",
+    "post-delete-duration-expired-minutes": "Vous ne pouvez supprimer un message que pendant %1 minute(s) après l'avoir posté.",
+    "post-delete-duration-expired-minutes-seconds": "Vous ne pouvez supprimer un message que pendant %1 minute(s) et %2 seconde(s) après l'avoir posté.",
+    "post-delete-duration-expired-hours": "Vous ne pouvez supprimer un message que pendant %1 heure(s) après l'avoir posté.",
+    "post-delete-duration-expired-hours-minutes": "Vous ne pouvez supprimer un message que pendant %1 heure(s) et %2 minute(s) après l'avoir posté.",
+    "post-delete-duration-expired-days": "Vous ne pouvez supprimer un message que pendant %1 jour(s) après l'avoir posté.",
+    "post-delete-duration-expired-days-hours": "Vous ne pouvez supprimer un message que pendant %1 jour(s) et %2 heure(s) après l'avoir posté.",
     "content-too-short": "Veuillez entrer un message plus long. %1 caractère(s) minimum.",
     "content-too-long": "Veuillez poster un message plus cours. Les messages ne peuvent être plus long que %1 caractère(s).",
     "title-too-short": "Veuillez entrer un titre plus long. %1 caractère(s) minimum.",
@@ -55,10 +71,12 @@
     "already-unfavourited": "Vous avez déjà retiré un marque-page",
     "cant-ban-other-admins": "Vous ne pouvez pas bannir les autres administrateurs !",
     "cant-remove-last-admin": "Vous seul êtes administrateur. Ajouter un autre utilisateur en tant qu'administrateur avant de vous en retirer.",
+    "cant-delete-admin": "Veuillez retirer les droits d'administration de ce compte avant de tenter de le supprimer.",
     "invalid-image-type": "Type d'image invalide. Les types autorisés sont: %1",
     "invalid-image-extension": "Extension d'image invalide",
     "invalid-file-type": "Type de fichier non valide. Les types autorisés sont : %1",
     "group-name-too-short": "Nom de groupe trop court",
+    "group-name-too-long": "Nom du groupe trop long",
     "group-already-exists": "Ce groupe existe déjà",
     "group-name-change-not-allowed": "Modification du nom de groupe non permise",
     "group-already-member": "Déjà membre du groupe",
@@ -77,7 +95,7 @@
     "signature-too-long": "La signature ne peut dépasser %1 caractère(s).",
     "about-me-too-long": "Votre texte \"à propos de moi\" ne peut dépasser %1 caractère(s).",
     "cant-chat-with-yourself": "Vous ne pouvez chatter avec vous même !",
-    "chat-restricted": "Cet utilisateur a restreint les ses messages de chat. Il doit d'abord vous suivre avant de pouvoir discuter avec lui.",
+    "chat-restricted": "Cet utilisateur a restreint les ses messages de chat. Il doit d'abord s'abonner à votre compte avant que vous puissiez discuter avec lui.",
     "chat-disabled": "Système de chat désactivé",
     "too-many-messages": "Vous avez envoyé trop de messages, veuillez patienter un instant.",
     "invalid-chat-message": "Message de Chat invalide",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "Vous n'avez pas l'autorisation de modifier ce message",
     "cant-remove-last-user": "Vous ne pouvez pas supprimer le dernier utilisateur",
     "cant-delete-chat-message": "Vous n'avez pas l'autorisation de supprimer ce message",
+    "already-voting-for-this-post": "Vous avez déjà voté pour ce message.",
     "reputation-system-disabled": "Le système de réputation est désactivé",
     "downvoting-disabled": "Les votes négatifs ne sont pas autorisés",
     "not-enough-reputation-to-downvote": "Vous n'avez pas une réputation assez élevée pour noter négativement ce message",
@@ -99,5 +118,6 @@
     "no-session-found": "Pas de session de connexion trouvé!",
     "not-in-room": "L'utilisateur n'est pas dans cette salle",
     "no-users-in-room": "Aucun utilisateur dans cette salle",
-    "cant-kick-self": "Vous ne pouvez pas vous exclure vous-même du groupe"
+    "cant-kick-self": "Vous ne pouvez pas vous exclure vous-même du groupe",
+    "no-users-selected": "Aucun utilisateur sélectionné"
 }
\ No newline at end of file
diff --git a/public/language/fr/global.json b/public/language/fr/global.json
index 7096b63f7c..647e78ca5c 100644
--- a/public/language/fr/global.json
+++ b/public/language/fr/global.json
@@ -41,10 +41,10 @@
     "nextpage": "Page suivante",
     "alert.success": "Succès",
     "alert.error": "Erreur",
-    "alert.banned": "Banni",
+    "alert.banned": "Bannis",
     "alert.banned.message": "Vous venez d'être banni, vous allez maintenant être déconnecté.",
-    "alert.unfollow": "Vous ne suivez désormais plus %1 !",
-    "alert.follow": "Vous suivez désormais %1 !",
+    "alert.unfollow": "Vous n'êtes plus abonné à %1 !",
+    "alert.follow": "Vous êtes désormais abonné à %1 !",
     "online": "En ligne",
     "users": "Utilisateurs",
     "topics": "Sujets",
@@ -81,8 +81,8 @@
     "updated.title": "Forum mis à jour",
     "updated.message": "Ce forum a été mis à jour à la dernière version. Cliquez ici pour recharger la page.",
     "privacy": "Vie privée",
-    "follow": "Suivre",
-    "unfollow": "Ne plus suivre",
+    "follow": "S'abonner",
+    "unfollow": "Se désabonner",
     "delete_all": "Tout supprimer",
     "map": "Carte",
     "sessions": "Sessions de connexion",
diff --git a/public/language/fr/login.json b/public/language/fr/login.json
index 6470717691..41150728c6 100644
--- a/public/language/fr/login.json
+++ b/public/language/fr/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Se souvenir de moi ?",
     "forgot_password": "Mot de passe oublié ?",
     "alternative_logins": "Autres méthodes de connexion",
-    "failed_login_attempt": "Echèc d'authentification, veuillez réessayer.",
+    "failed_login_attempt": "Identification échouée",
     "login_successful": "Vous êtes maintenant connecté !",
     "dont_have_account": "Vous n'avez pas de compte ?"
 }
\ No newline at end of file
diff --git a/public/language/fr/modules.json b/public/language/fr/modules.json
index 33fd5fe494..bc05644724 100644
--- a/public/language/fr/modules.json
+++ b/public/language/fr/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Envoyer et verrouiller",
     "composer.toggle_dropdown": "Afficher/masquer le menu",
     "composer.uploading": "Envoi en cours %1",
+    "composer.formatting.bold": "Gras",
+    "composer.formatting.italic": "Italique",
+    "composer.formatting.list": "Liste",
+    "composer.formatting.strikethrough": "Barré",
+    "composer.formatting.link": "Lien",
+    "composer.formatting.picture": "Image",
+    "composer.upload-picture": "Envoyer une image",
+    "composer.upload-file": "Envoyer un fichier",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Annuler",
     "bootbox.confirm": "Confirmer",
diff --git a/public/language/fr/notifications.json b/public/language/fr/notifications.json
index fadee3aa62..c5ce2c609a 100644
--- a/public/language/fr/notifications.json
+++ b/public/language/fr/notifications.json
@@ -27,8 +27,8 @@
     "user_posted_to_multiple": "<strong>%1</strong> et %2 autres ont posté une réponse à : <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> a posté un nouveau sujet: <strong>%2</strong>.",
     "user_started_following_you": "<strong>%1</strong> vous suit.",
-    "user_started_following_you_dual": "<strong>%1</strong> et <strong>%2</strong> vous suivent.",
-    "user_started_following_you_multiple": "<strong>%1</strong> et %2 autres vous suivent.",
+    "user_started_following_you_dual": "<strong>%1</strong> et <strong>%2</strong> se sont abonnés à votre compte.",
+    "user_started_following_you_multiple": "<strong>%1</strong> et %2 autres se sont abonnés à votre compte.",
     "new_register": "<strong>%1</strong> a envoyé une demande d'incription.",
     "new_register_multiple": "<strong>%1</strong> inscription(s) est en attente de validation.",
     "email-confirmed": "Email vérifié",
diff --git a/public/language/fr/pages.json b/public/language/fr/pages.json
index 3c0cb29b90..4b1aeadc51 100644
--- a/public/language/fr/pages.json
+++ b/public/language/fr/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Utilisateurs avec le plus de messages",
     "users/sort-reputation": "Utilisateurs avec la plus grande réputation",
     "users/banned": "Utilisateurs bannis",
+    "users/most-flags": "Utilisateurs les plus souvent signalés",
     "users/search": "Rechercher des utilisateurs",
     "notifications": "Notifications",
     "tags": "Mots-clés",
@@ -24,23 +25,23 @@
     "group": "%1 groupe",
     "chats": "Discussions",
     "chat": "Conversation avec %1",
-    "account/edit": "Edition de \"%1\"",
+    "account/edit": "Édition de \"%1\"",
     "account/edit/password": "Édition du mot de passe de \"%1\"",
     "account/edit/username": "Édition du nom d'utilisateur de \"%1\"",
     "account/edit/email": "Édition de l'e-mail de \"%1\"",
-    "account/following": "Les personnes que %1 suit",
-    "account/followers": "Les personnes qui suivent %1",
+    "account/following": "Les personnes auxquelles %1 est abonné",
+    "account/followers": "Les personnes abonnées à %1",
     "account/posts": "Messages postés par %1",
     "account/topics": "Sujets créés par %1",
     "account/groups": "Groupes auxquels appartient %1",
     "account/favourites": "Marques-pages de %1",
     "account/settings": "Paramètres d'utilisateur",
-    "account/watched": "Sujets surveillés par %1",
+    "account/watched": "Sujets auxquels %1 est abonné",
     "account/upvoted": "Messages pour lesquels %1 a voté",
     "account/downvoted": "Messages contre lesquels %1 a voté",
     "account/best": "Meilleurs messages postés par %1",
     "confirm": "Email vérifié",
     "maintenance.text": "%1 est en maintenance. Veuillez revenir un peu plus tard.",
-    "maintenance.messageIntro": "De plus, l'administrateur a laissé ce message:",
+    "maintenance.messageIntro": "De plus, l'administrateur a laissé ce message :",
     "throttled.text": "%1 est actuellement indisponible en raison d'une charge excessive. Merci de réessayer plus tard."
 }
\ No newline at end of file
diff --git a/public/language/fr/search.json b/public/language/fr/search.json
index cfbabc6dd0..b371aa3097 100644
--- a/public/language/fr/search.json
+++ b/public/language/fr/search.json
@@ -7,7 +7,7 @@
     "titles-posts": "Titres et Messages",
     "posted-by": "Posté par",
     "in-categories": "Dans les catégories",
-    "search-child-categories": "Chercher les sous catégories",
+    "search-child-categories": "Rechercher également dans les sous catégories",
     "reply-count": "Nombre de réponses",
     "at-least": "Au moins",
     "at-most": "Au plus",
diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json
index 8a71ff511a..247410d7e3 100644
--- a/public/language/fr/topic.json
+++ b/public/language/fr/topic.json
@@ -26,21 +26,28 @@
     "tools": "Outils",
     "flag": "Signaler",
     "locked": "Verrouillé",
-    "bookmark_instructions": "Cliquez ici pour retourner au dernier message non lu dans ce fil de discussion.",
+    "bookmark_instructions": "Cliquez ici pour retourner au dernier message lu de ce fil.",
     "flag_title": "Signaler ce message à la modération",
     "flag_success": "Ce message a bien été signalé aux modérateurs.",
     "deleted_message": "Ce sujet a été supprimé. Seuls les utilisateurs avec les droits d'administration peuvent le voir.",
     "following_topic.message": "Vous recevrez désormais des notifications lorsque quelqu'un postera dans ce sujet.",
     "not_following_topic.message": "Vous ne recevrez plus de notifications pour ce sujet.",
+    "ignoring_topic.message": "Vous ne verrez plus ce sujet dans la liste des sujets non lus. Vous serez notifié lorsque vous serez mentionné ou que quelqu'un votera pour votre message.",
     "login_to_subscribe": "Veuillez vous enregistrer ou vous connecter afin de vous abonner à ce sujet.",
     "markAsUnreadForAll.success": "Sujet marqué comme non lu pour tout le monde.",
     "mark_unread": "Marquer comme non-lu",
     "mark_unread.success": "Sujet marqué comme non lu.",
-    "watch": "Surveiller",
-    "unwatch": "Ne plus surveiller",
+    "watch": "S'abonner",
+    "unwatch": "Se désabonner",
     "watch.title": "Être notifié des nouvelles réponses dans ce sujet",
-    "unwatch.title": "Arrêter de surveiller ce sujet",
+    "unwatch.title": "Se désabonner de ce sujet",
     "share_this_post": "Partager ce message",
+    "watching": "Abonné",
+    "not-watching": "Non abonné",
+    "ignoring": "Ignoré",
+    "watching.description": "Me notifier les nouvelles réponses.<br/>Afficher le sujet dans l'onglet \"Non lu\".",
+    "not-watching.description": "Ne pas me notifier les nouvelles réponses.<br/>Afficher le sujet dans l'onglet \"Non lu\" si la catégorie n'est pas ignorée.",
+    "ignoring.description": "Ne pas me notifier les nouvelle réponses.<br/>Ne pas afficher ce sujet dans l'onglet \"Non lu\".",
     "thread_tools.title": "Outils pour sujets",
     "thread_tools.markAsUnreadForAll": "Marquer comme non lu",
     "thread_tools.pin": "Épingler le sujet",
diff --git a/public/language/fr/unread.json b/public/language/fr/unread.json
index 9432bf9d36..dae04c99b9 100644
--- a/public/language/fr/unread.json
+++ b/public/language/fr/unread.json
@@ -6,5 +6,8 @@
     "selected": "Sélectionnés",
     "all": "Tous",
     "all_categories": "Toutes Catégories",
-    "topics_marked_as_read.success": "Sujets marqués comme lus !"
+    "topics_marked_as_read.success": "Sujets marqués comme lus !",
+    "all-topics": "Tous les sujets",
+    "new-topics": "Nouveau sujet",
+    "watched-topics": "Abonnements"
 }
\ No newline at end of file
diff --git a/public/language/fr/user.json b/public/language/fr/user.json
index 0a6450fdd3..278d6dfe10 100644
--- a/public/language/fr/user.json
+++ b/public/language/fr/user.json
@@ -23,7 +23,7 @@
     "profile_views": "Vues",
     "reputation": "Réputation",
     "favourites": "Marque-pages",
-    "watched": "Suivis",
+    "watched": "Abonnements",
     "followers": "Abonnés",
     "following": "Abonnements",
     "aboutme": "À propos de moi",
@@ -64,8 +64,8 @@
     "settings": "Paramètres",
     "show_email": "Afficher mon email",
     "show_fullname": "Afficher mon nom complet",
-    "restrict_chats": "Autoriser la réception de messages provenant uniquement des personnes que je suis",
-    "digest_label": "S’inscrire aux comptes-rendus",
+    "restrict_chats": "Autoriser la réception de messages ne provenant que des personnes auxquelles je suis abonné",
+    "digest_label": "S’inscrire aux résumés de l'actualité du forum",
     "digest_description": "S'abonner par email aux mises à jours de ce forum (nouvelles notifications et nouveaux sujets) selon le planning sélectionné.",
     "digest_off": "Désactivé",
     "digest_daily": "Quotidien",
@@ -74,11 +74,11 @@
     "send_chat_notifications": "Envoyer un e-mail si un nouveau message de chat arrive lorsque je ne suis pas en ligne",
     "send_post_notifications": "Envoyer un email lors de réponses envoyées aux sujets auxquels je suis abonné",
     "settings-require-reload": "Certains réglages nécessitent un rechargement. Cliquez ici pour recharger la page.",
-    "has_no_follower": "Cet utilisateur n'est suivi par personne :(",
-    "follows_no_one": "Cet utilisateur ne suit personne :(",
+    "has_no_follower": "Personne n'est abonné à cet utilisateur :(",
+    "follows_no_one": "Cet utilisateur n'est abonné à personne :(",
     "has_no_posts": "Cet utilisateur n'a encore rien posté.",
     "has_no_topics": "Cet utilisateur n'a encore créé aucun sujet.",
-    "has_no_watched_topics": "Cet utilisateur n'a encore consulté aucun sujet.",
+    "has_no_watched_topics": "Cet utilisateur ne s'est encore abonné à aucun sujet.",
     "has_no_upvoted_posts": "Cet utilisateur n'a voté pour aucun message",
     "has_no_downvoted_posts": "Cet utilisateur n'a voté contre aucun message",
     "has_no_voted_posts": "Personne n'a voté pour des messages de cet utilisateur",
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Ouvrir les liens externes dans un nouvel onglet",
     "enable_topic_searching": "Activer la recherche dans les sujets",
     "topic_search_help": "Une fois activé, la recherche dans les sujets va remplacer la recherche de page du navigateur et vous permettra de rechercher dans l'intégralité d'un sujet au lieu des seuls posts affichés à l'écran.",
+    "delay_image_loading": "Délayer le chargement des images",
+    "image_load_delay_help": "Lorsque cette option est activée, les images des sujets ne seront pas chargées avant qu'elles ne soient visibles dans la fenêtre.",
     "scroll_to_my_post": "Après avoir répondu, montrer le nouveau message",
-    "follow_topics_you_reply_to": "Suivre les sujets auxquels vous répondez",
-    "follow_topics_you_create": "Suivre les sujets que vous créez",
-    "grouptitle": "Sélectionnez le titre de groupe que vous souhaitez afficher",
+    "follow_topics_you_reply_to": "S'abonner aux sujets auxquels vous répondez",
+    "follow_topics_you_create": "S'abonner aux sujets que vous créez",
+    "grouptitle": "Nom du groupe",
     "no-group-title": "Aucun titre de groupe",
     "select-skin": "Sélectionner un thème",
     "select-homepage": "Sélectionner une page d'accueil",
diff --git a/public/language/fr/users.json b/public/language/fr/users.json
index fad9536811..35b6a06787 100644
--- a/public/language/fr/users.json
+++ b/public/language/fr/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Derniers inscrits",
     "top_posters": "Actifs",
     "most_reputation": "Réputés",
+    "most_flags": "Les plus souvent signalés",
     "search": "Rechercher",
     "enter_username": "Entrez le nom d'un utilisateur",
     "load_more": "Charger la suite",
diff --git a/public/language/gl/email.json b/public/language/gl/email.json
index 340dd326e1..9d13746d08 100644
--- a/public/language/gl/email.json
+++ b/public/language/gl/email.json
@@ -24,6 +24,7 @@
     "digest.day": "día",
     "digest.week": "semana",
     "digest.month": "mes",
+    "digest.subject": "Resumo de 1%",
     "notif.chat.subject": "Nova charla recibida de %1",
     "notif.chat.cta": "Pica aquí para continuar a conversación",
     "notif.chat.unsub.info": "Esta notificación de charla foiche enviada polas túas opcións de subscrición.",
diff --git a/public/language/gl/error.json b/public/language/gl/error.json
index 5a5619eaf0..3872f56627 100644
--- a/public/language/gl/error.json
+++ b/public/language/gl/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Contrasinal Inválido",
     "invalid-username-or-password": "Especifica ámbolos dous por favor, nome de usuario e contrasinal",
     "invalid-search-term": "Termo de búsqueda inválido",
+    "csrf-invalid": "Non fomos capaces de entrar, probablemente debido a que a sesión expirou. Por favor, téntao de novo",
     "invalid-pagination-value": "Valor de paxinación incorreto, ten que estar entre %1 e %2",
     "username-taken": "Nome de usuario en uso",
     "email-taken": "Correo en uso",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "Este foro require confirmación de correo, por favor pica aquí para introducir un correo.",
     "email-confirm-failed": "Non podemos confirmar o teu correo, por favor téntao de novo máis tarde.",
     "confirm-email-already-sent": "O correo de confirmación foi enviado, agarda %1 minute(s) para enviar outro.",
+    "sendmail-not-found": "Non se atopa o executable \"sendmail\", por favor, asegúrate de que está instalado no teu sistema e que é accesible polo usuario que executa NodeBB. ",
     "username-too-short": "Nome de usuario demasiado curto",
     "username-too-long": "Nome de usuario demasiado longo.",
     "password-too-long": "Contrasinal moi longa",
     "user-banned": "Usuario expulsado",
     "user-too-new": "Desculpa, agarda %1 second(s) antes de facer a túa primeira publicación.",
-    "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "blacklisted-ip": "Sentímolo, o teu enderezo IP foi baneado desta comunidade. Se crees que se debe a un erro, por favor, contacte cun administrador.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "A categoría non existe",
     "no-topic": "O tema non existe",
     "no-post": "A publicación non existe",
@@ -38,6 +41,19 @@
     "category-disabled": "Categoría deshabilitada",
     "topic-locked": "Tema Pechado",
     "post-edit-duration-expired": "Só podes editar as publicacións %1 segundo(s) despois de envialas. ",
+    "post-edit-duration-expired-minutes": "Só podes editar as publicacións %1 segundo(s) despois de envialas. ",
+    "post-edit-duration-expired-minutes-seconds": "Só podes editar as publicacións %1 minuto(s) %2 segundo(s) despois de envialas. ",
+    "post-edit-duration-expired-hours": "Só podes editar as publicacións %1 hora(s) despois de envialas. ",
+    "post-edit-duration-expired-hours-minutes": "Só podes editar as publicacións %1 hora(s) %2 segundo(s) despois de envialas. ",
+    "post-edit-duration-expired-days": "Só podes editar as publicacións %1 día(s) despois de envialas. ",
+    "post-edit-duration-expired-days-hours": "Só podes editar as publicacións %1 día(s) %2 hora(s) despois de envialas. ",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Por favor, introduce unha publicación máis longa. Debe conter %1 carácter(es) como mínimo.",
     "content-too-long": "Por favor, introduce unha publicación máis curta. As publicacións non poden conter máis de %1 carácter(es).",
     "title-too-short": "Por favor, introduce un título máis longo. Os títulos deben conter %1 carácter(es) como mínimo.",
@@ -51,14 +67,16 @@
     "still-uploading": "Por favor, agarda a que remate a subida.",
     "file-too-big": "O tamaño máximo permitido é %1 kB - por favor, sube un arquivo máis pequeno",
     "guest-upload-disabled": "As subidas están deshabilitadas para os convidados",
-    "already-favourited": "You have already bookmarked this post",
-    "already-unfavourited": "You have already unbookmarked this post",
+    "already-favourited": "Xa gardaras esta publicación.",
+    "already-unfavourited": "Xa desgardaras esta publicación.",
     "cant-ban-other-admins": "Non podes botar outros administradores!",
     "cant-remove-last-admin": "Eres o único administrador. Engade outros administradores antes de quitarte a ti mesmo como administrador.",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Tipo de imaxe inválida. Tipos admitidos: %1",
     "invalid-image-extension": "Extensión de imaxe inválida",
     "invalid-file-type": "Tipo de arquivo inválido. Tipos admitidos: %1",
     "group-name-too-short": "Nome de grupo moi curto",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "O grupo xa existe",
     "group-name-change-not-allowed": "Cambio de nome do grupo non permitido",
     "group-already-member": "Xa eres parte deste grupo",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "Non tes permitido editar esta mensaxe.",
     "cant-remove-last-user": "Non podes quitar o último usuario",
     "cant-delete-chat-message": "Non tes permitido borrar esta mensaxe.",
+    "already-voting-for-this-post": "Xa votache esta mensaxe.",
     "reputation-system-disabled": "O sistema de reputación está deshabilitado",
     "downvoting-disabled": "Os votos negativos están deshabilitados",
     "not-enough-reputation-to-downvote": "Non tes reputación dabonda para esta acción",
@@ -98,6 +117,7 @@
     "invite-maximum-met": "Convidaches á cantidade máxima de persoas  (%1 de %2).",
     "no-session-found": "Non se atopa ningún inicio de sesión!",
     "not-in-room": "O usuario non se encontra nesta sala",
-    "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "no-users-in-room": "Non hai usuarios nesta sala",
+    "cant-kick-self": "Non te podes expulsar  a ti mesmo do grupo",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/gl/global.json b/public/language/gl/global.json
index 6ff44536a7..f2398c524c 100644
--- a/public/language/gl/global.json
+++ b/public/language/gl/global.json
@@ -87,8 +87,8 @@
     "map": "Mapa",
     "sessions": "Inicios de sesión",
     "ip_address": "Enderezo IP",
-    "enter_page_number": "Enter page number",
-    "upload_file": "Upload file",
-    "upload": "Upload",
-    "allowed-file-types": "Allowed file types are %1"
+    "enter_page_number": "Escribe o número da páxina",
+    "upload_file": "Subir arquivo ",
+    "upload": "Subir",
+    "allowed-file-types": "Os tipos de arquivos permitidos son: %1"
 }
\ No newline at end of file
diff --git a/public/language/gl/groups.json b/public/language/gl/groups.json
index d9b33b659d..f0f16871e4 100644
--- a/public/language/gl/groups.json
+++ b/public/language/gl/groups.json
@@ -41,7 +41,7 @@
     "details.hidden": "Oculto",
     "details.hidden_help": "Se está habilitado, este grupo non se poderá atopar na listaxe de grupos e os usuarios deberán ser convidados manualmente.",
     "details.delete_group": "Eliminar Grupo",
-    "details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
+    "details.private_system_help": "Os grupos privados están desactivados ao nivel do sistema, esta opción non trocará nada.",
     "event.updated": "Os detalles do grupo foron actualizados",
     "event.deleted": "O grupo \"%1\" foi borrado.",
     "membership.accept-invitation": "Aceptar ",
@@ -50,5 +50,5 @@
     "membership.leave-group": "Marchar do grupo",
     "membership.reject": "Rexeitar",
     "new-group.group_name": "Nome do grupo:",
-    "upload-group-cover": "Upload group cover"
+    "upload-group-cover": "Cargar foto para o grupo"
 }
\ No newline at end of file
diff --git a/public/language/gl/login.json b/public/language/gl/login.json
index 34e3a89ecb..d2fc82f95b 100644
--- a/public/language/gl/login.json
+++ b/public/language/gl/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Lembrarme?",
     "forgot_password": "Esqueciches o teu contrasinal?",
     "alternative_logins": "Métodos alternativos",
-    "failed_login_attempt": "Erro ao iniciar sesión, téntao de novo.",
+    "failed_login_attempt": "Erro ao iniciar sesión",
     "login_successful": "Sesión iniciada con éxito!",
     "dont_have_account": "Aínda non tes conta?"
 }
\ No newline at end of file
diff --git a/public/language/gl/modules.json b/public/language/gl/modules.json
index a50f0a5a03..d097d97686 100644
--- a/public/language/gl/modules.json
+++ b/public/language/gl/modules.json
@@ -6,7 +6,7 @@
     "chat.user_typing": "%1 está a escribir...",
     "chat.user_has_messaged_you": "%1 enviouche unha mensaxe.",
     "chat.see_all": "Ver tódalas chamadas",
-    "chat.mark_all_read": "Mark all chats read",
+    "chat.mark_all_read": "Marcar tódolos chats como lidos ",
     "chat.no-messages": "Por favor, seleccione un destinatario para ver o historial das mensaxes ",
     "chat.no-users-in-room": "Non hai usuarios nesta sala",
     "chat.recent-chats": "Charlas Recentes",
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Enviar e bloquear",
     "composer.toggle_dropdown": "Alternar despregable",
     "composer.uploading": "Subindo %1",
+    "composer.formatting.bold": "Negriña",
+    "composer.formatting.italic": "Itálica",
+    "composer.formatting.list": "Lista",
+    "composer.formatting.strikethrough": "Tachado",
+    "composer.formatting.link": "Ligazón",
+    "composer.formatting.picture": "Foto",
+    "composer.upload-picture": "Subir foto",
+    "composer.upload-file": "Subir arquivo",
     "bootbox.ok": "De acordo",
     "bootbox.cancel": "Cancelar",
     "bootbox.confirm": "Confirmar",
diff --git a/public/language/gl/notifications.json b/public/language/gl/notifications.json
index 2796d782a0..c13bca0593 100644
--- a/public/language/gl/notifications.json
+++ b/public/language/gl/notifications.json
@@ -16,9 +16,9 @@
     "upvoted_your_post_in_multiple": "<strong>%1</strong> e %2 máis votaron positivamente a túa mensaxe en <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> moveu a túa publicación a<strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> foi movido <strong>%2</strong>",
-    "favourited_your_post_in": "<strong>%1</strong> has bookmarked your post in <strong>%2</strong>.",
-    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have bookmarked your post in <strong>%3</strong>.",
-    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have bookmarked your post in <strong>%3</strong>.",
+    "favourited_your_post_in": "<strong>%1</strong> gardouse a súa publicación en<strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> y <strong>%2</strong> gardaron a súa publicación en<strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> e outros %2 usuarios gardaron a súa publicación en <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> reportou unha mensaxe en <strong>%2</strong>",
     "user_flagged_post_in_dual": "<strong>%1</strong> e <strong>%2</strong> reportaron a túa mensaxe en <strong>%3</strong>",
     "user_flagged_post_in_multiple": "<strong>%1</strong> e outras %2 persoas reportaron unha mensaxe en <strong>%3</strong>",
@@ -30,7 +30,7 @@
     "user_started_following_you_dual": "<strong>%1</strong> e <strong>%2</strong> comezaron a seguirte.",
     "user_started_following_you_multiple": "<strong>%1</strong> e %2 máis comezaron a seguirte.",
     "new_register": "<strong>%1</strong> enviou unha petición de rexistro.",
-    "new_register_multiple": "There are <strong>%1</strong> registration requests awaiting review.",
+    "new_register_multiple": "Hai <strong>%1</strong> peticións de rexistros pendentes de revisión",
     "email-confirmed": "Correo confirmado",
     "email-confirmed-message": "Grazas por validar o teu correo. A túa conta agora está activada.",
     "email-confirm-error-message": "Houbo un problema validando o teu correo. Poida que o código fose inválido ou expirase. ",
diff --git a/public/language/gl/pages.json b/public/language/gl/pages.json
index b0a97d55cd..e14eb65e85 100644
--- a/public/language/gl/pages.json
+++ b/public/language/gl/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Usuarios con máis temas",
     "users/sort-reputation": "Usuarios máis reputados",
     "users/banned": "Usuarios Expulsados",
+    "users/most-flags": "Most flagged users",
     "users/search": "Búsqueda de usuarios",
     "notifications": "Notificacións",
     "tags": "Etiquetas",
@@ -33,13 +34,13 @@
     "account/posts": "Publicación de %1",
     "account/topics": "Temas de %1",
     "account/groups": "%1's Grupos",
-    "account/favourites": "%1's Bookmarked Posts",
+    "account/favourites": "Publicacións favoritas de %1 ",
     "account/settings": "Opcións de Usuario",
     "account/watched": "Temas vistos por %1",
     "account/upvoted": "Mensaxes votadas positivamente por %1",
     "account/downvoted": "Mensaxes votadas negativamente por %1",
     "account/best": "Mellores mensaxes escritas por %1",
-    "confirm": "Email Confirmed",
+    "confirm": "Enderezo electrónico confirmado",
     "maintenance.text": "%1 está baixo mantemento. Por favor, volve máis tarde.",
     "maintenance.messageIntro": "A máis, o administrador deixou esta mensaxe: ",
     "throttled.text": "&1 non está dispoñible debido a unha carga excesiva. Por favor, volva noutro momento"
diff --git a/public/language/gl/topic.json b/public/language/gl/topic.json
index e892d34146..24004ac1fd 100644
--- a/public/language/gl/topic.json
+++ b/public/language/gl/topic.json
@@ -26,12 +26,13 @@
     "tools": "Ferramentas",
     "flag": "Reportar",
     "locked": "Pechado",
-    "bookmark_instructions": "Clic aquí para ir á última publicación sen ler neste tema. ",
+    "bookmark_instructions": "Pica aquí para volver á última mensaxe lida neste tema ",
     "flag_title": "Reportar esta mensaxe",
     "flag_success": "Esta mensaxe foi reportada para moderación.",
     "deleted_message": "Este tema foi borrado. Só os usuarios con privilexios administrativos poden velo.",
     "following_topic.message": "Agora recibirás notificacións cando alguén publique neste tema.",
     "not_following_topic.message": "Non recibirás notificacións deste tema.",
+    "ignoring_topic.message": "Xa non verás este fío na lista de fíos non lidos. Serás notificado cando sexas mencionado ou a túa publicación sexa votada.",
     "login_to_subscribe": "Por favor, identifícate para subscribirte a este tema.",
     "markAsUnreadForAll.success": "Publicación marcada como non lida para todos.",
     "mark_unread": "Marcar coma non lido",
@@ -41,6 +42,12 @@
     "watch.title": "Serás notificado canto haxa novas respostas neste tema",
     "unwatch.title": "Deixar de vixiar este tema",
     "share_this_post": "Compartir esta publicación",
+    "watching": "Vendo",
+    "not-watching": "Non Vendo",
+    "ignoring": "Ignorar",
+    "watching.description": "Notificádeme das novas repostas. <br/>Amosa-lo fío nos non lidos.",
+    "not-watching.description": "Non me notifiquedes as novas respostas. <br/>Amosa-lo fío en non lidos se a categoría non está ignorada.",
+    "ignoring.description": "Non me notifiquedes as novas respostas. <br/>Non amosa-lo fío en non lidos.",
     "thread_tools.title": "Ferramentas do tema",
     "thread_tools.markAsUnreadForAll": "Marcar como non lido",
     "thread_tools.pin": "Fixar Tema",
@@ -65,9 +72,9 @@
     "disabled_categories_note": "As categorías deshabilitadas están en gris",
     "confirm_move": "Mover",
     "confirm_fork": "Dividir",
-    "favourite": "Bookmark",
-    "favourites": "Bookmarks",
-    "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
+    "favourite": "Marcador",
+    "favourites": "Marcadores",
+    "favourites.has_no_favourites": "Aínda non marcache ningún tema. ",
     "loading_more_posts": "Cargando máis publicacións",
     "move_topic": "Mover Tema",
     "move_topics": "Mover Temas",
diff --git a/public/language/gl/unread.json b/public/language/gl/unread.json
index 11f79dc4ca..bb0975ec26 100644
--- a/public/language/gl/unread.json
+++ b/public/language/gl/unread.json
@@ -6,5 +6,8 @@
     "selected": "Seleccionado",
     "all": "Todos",
     "all_categories": "Tódalas categorías",
-    "topics_marked_as_read.success": "Temas marcados como lidos"
+    "topics_marked_as_read.success": "Temas marcados como lidos",
+    "all-topics": "Tódolos Temas",
+    "new-topics": "Temas Novos",
+    "watched-topics": "Temas Suscritos"
 }
\ No newline at end of file
diff --git a/public/language/gl/uploads.json b/public/language/gl/uploads.json
index 1622cb5693..223d022e87 100644
--- a/public/language/gl/uploads.json
+++ b/public/language/gl/uploads.json
@@ -1,6 +1,6 @@
 {
-    "uploading-file": "Uploading the file...",
-    "select-file-to-upload": "Select a file to upload!",
-    "upload-success": "File uploaded successfully!",
-    "maximum-file-size": "Maximum %1 kb"
+    "uploading-file": "Subindo o arquivo...",
+    "select-file-to-upload": "Selecciona un arquivo para subir!",
+    "upload-success": "Arquivo subido correctamente!",
+    "maximum-file-size": "Máximo %1 kb"
 }
\ No newline at end of file
diff --git a/public/language/gl/user.json b/public/language/gl/user.json
index 014b7aead3..96d1a465a3 100644
--- a/public/language/gl/user.json
+++ b/public/language/gl/user.json
@@ -22,7 +22,7 @@
     "profile": "Perfil",
     "profile_views": "Visitas ao perfil:",
     "reputation": "Reputación",
-    "favourites": "Bookmarks",
+    "favourites": "Marcadores",
     "watched": "Visto",
     "followers": "Seguidores",
     "following": "Seguindo",
@@ -39,7 +39,7 @@
     "change_username": "Cambia-lo nome de usuario",
     "change_email": "Cambia-lo correo",
     "edit": "Editar",
-    "edit-profile": "Edit Profile",
+    "edit-profile": "Editar Perfil",
     "default_picture": "Icona por defecto.",
     "uploaded_picture": "Foto subida",
     "upload_new_picture": "Subir unha nova foto",
@@ -56,11 +56,11 @@
     "password": "Contrasinal",
     "username_taken_workaround": "Ese nome de usuario xa estaba collido, así que o modificamos lixeiramente. Agora o teu nome é <strong>%1</strong> ",
     "password_same_as_username": "O teu contrasinal e o teu nome de usuario son os mesmos, por favor, escolle outro contrasinal.",
-    "password_same_as_email": "Your password is the same as your email, please select another password.",
+    "password_same_as_email": "O teu contrasinal é igual que o teu enderezo electrónico, por favor, escolle outro contrasinal.",
     "upload_picture": "Subir foto",
     "upload_a_picture": "Subir unha foto",
     "remove_uploaded_picture": "Borrar unha foto subida",
-    "upload_cover_picture": "Upload cover picture",
+    "upload_cover_picture": "Subir imaxen de portada",
     "settings": "Opcións",
     "show_email": "Amosa-lo meu Email",
     "show_fullname": "Amosa-lo meu Nome Completo",
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Abrir ligazóns externos nunca nova pestaña",
     "enable_topic_searching": "Permitir buscar dentro dun tema",
     "topic_search_help": "Se se activa, o buscador do NodeBB superporase ao propio do navegador dentro de cada tema, permitindo buscar en todo o tema e non só naquilo que se presenta na pantalla.",
-    "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Segui-los temas nos que respostas",
-    "follow_topics_you_create": "Segui-los temas que ti fas",
-    "grouptitle": "Escolle o título de grupo que che gustaría amosar",
+    "delay_image_loading": "Retrasar a carga de imaxes",
+    "image_load_delay_help": "Se se habilita, as imaxes non cargarán hasta que sexan visibles na pantalla",
+    "scroll_to_my_post": "Logo de enviar unha resposta, mostrar a nova mensaxe",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Título do Grupo",
     "no-group-title": "Sen titulo de grupo",
     "select-skin": "Seleccionar apariencia",
     "select-homepage": "Escolla unha páxina de inicio",
diff --git a/public/language/gl/users.json b/public/language/gl/users.json
index 625c85f741..e05a100f87 100644
--- a/public/language/gl/users.json
+++ b/public/language/gl/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Últimos usuarios",
     "top_posters": "Maiores Publicadores",
     "most_reputation": "Máis Reputados",
+    "most_flags": "Most Flags",
     "search": "Busca",
     "enter_username": "Introduce o nome de usuario a procurar",
     "load_more": "Cargar máis",
diff --git a/public/language/he/email.json b/public/language/he/email.json
index 9ca8de27a9..48ff8f4a50 100644
--- a/public/language/he/email.json
+++ b/public/language/he/email.json
@@ -24,6 +24,7 @@
     "digest.day": "יום",
     "digest.week": "שבוע",
     "digest.month": "חודש",
+    "digest.subject": "Digest for %1",
     "notif.chat.subject": "הודעת צ'אט חדשה התקבלה מ%1",
     "notif.chat.cta": "לחץ כאן כדי להמשיך את השיחה",
     "notif.chat.unsub.info": "התראה הצ'אט הזו נשלחה אליך על-פי הגדרות החשבון שלך.",
diff --git a/public/language/he/error.json b/public/language/he/error.json
index 33972d8246..c30c84bc10 100644
--- a/public/language/he/error.json
+++ b/public/language/he/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "סיסמא שגויה",
     "invalid-username-or-password": "אנא הגדר שם משתמש וסיסמה",
     "invalid-search-term": "מילת חיפוש לא תקינה",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "ערך דף לא חוקי, חייב להיות לפחות %1 ולא מעל %2",
     "username-taken": "שם משתמש תפוס",
     "email-taken": "כתובת אימייל תפוסה",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "פורום זה דורש אישור בדוא\"ל, אנא לחץ כאן כדי להכניס לדואר אלקטרוני",
     "email-confirm-failed": "לא הצלחנו לאשר את הדוא\"ל שלך, תנסה שוב אחר כך",
     "confirm-email-already-sent": "מייל האישור כבר נשלח, אנא המתן %1 דקות כדי לשלוח מייל נוסף.",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "שם משתמש קצר מדי",
     "username-too-long": "שם משתמש ארוך מדי",
     "password-too-long": "הסיסמה ארוכה מדי",
     "user-banned": "המשתמש מושעה",
     "user-too-new": "אנא המתן  %1 שניות לפני פרסום ההודעה",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "קטגוריה אינה קיימת",
     "no-topic": "נושא אינו קיים",
     "no-post": "פוסט אינו קיים",
@@ -38,6 +41,19 @@
     "category-disabled": "קטגוריה לא פעילה",
     "topic-locked": "נושא נעול",
     "post-edit-duration-expired": "אתה רשאי לערוך פוסטים רק ל-%1 שניות לאחר הפרסום",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "אנא הכנס פוסט ארוך יותר. פוסטים חייבים להכיל לפחות %1 תווים.",
     "content-too-long": "אנא הכנס פוסט קצר יותר. פוסטים חייבים להיות קצרים יותר מ-%1 תווים.",
     "title-too-short": "אנא הכנס כותרת ארוכה יותר. כותרות חייבות להכיל לפחות %1 תווים.",
@@ -55,10 +71,12 @@
     "already-unfavourited": "כבר הסרת את הסימון מפוסט זה",
     "cant-ban-other-admins": "אינך יכול לחסום מנהלים אחרים!",
     "cant-remove-last-admin": "אתה המנהל היחיד. הוסף משתמש אחר לניהול לפני שאתה מוריד את עצמך מניהול",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "פורמט תמונה לא תקין. הפורמטים המורשים הם: %1",
     "invalid-image-extension": "פורמט תמונה לא תקין",
     "invalid-file-type": "פורמט הקובץ לא תקין. הפורמטים המורשים הם: %1",
     "group-name-too-short": "שם הקבוצה קצר מדי",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "הקבוצה כבר קיימת",
     "group-name-change-not-allowed": "לא ניתן לשנות את שם הקבוצה",
     "group-already-member": "כבר חבר בקבוצה זו",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "אתה לא רשאי לערוך הודעה זו",
     "cant-remove-last-user": "אינך יכול למחוק את המשתמש האחרון",
     "cant-delete-chat-message": "אתה לא רשאי למחוק הודעה זו",
+    "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "מערכת המוניטין לא פעילה.",
     "downvoting-disabled": "היכולת להצביע נגד לא פעילה",
     "not-enough-reputation-to-downvote": "אין לך מספיק מוניטין כדי להוריד את הדירוג של פוסט זה",
@@ -99,5 +118,6 @@
     "no-session-found": "לא נמצאו סשני התחברות!",
     "not-in-room": "משתמש זה לא בצ'אט",
     "no-users-in-room": "אין משתמש בחדר הזה",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "You can't kick yourself from the group",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/he/language.json b/public/language/he/language.json
index 203ee90e04..2c12710abf 100644
--- a/public/language/he/language.json
+++ b/public/language/he/language.json
@@ -1,5 +1,5 @@
 {
-    "name": "אנגלית (הממלכה המאוחדת/קנדה)",
+    "name": "עברית (ישראל)",
     "code": "he",
     "dir": "rtl"
 }
\ No newline at end of file
diff --git a/public/language/he/login.json b/public/language/he/login.json
index 6142a8a045..c0c679e0cd 100644
--- a/public/language/he/login.json
+++ b/public/language/he/login.json
@@ -5,7 +5,7 @@
     "remember_me": "זכור אותי?",
     "forgot_password": "שכחת סיסמתך?",
     "alternative_logins": "התחבר באמצעות...",
-    "failed_login_attempt": "נסיון התחברות נכשל, נסה שוב.",
+    "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "התחברת בהצלחה!",
     "dont_have_account": "אין לך חשבון עדיין?"
 }
\ No newline at end of file
diff --git a/public/language/he/modules.json b/public/language/he/modules.json
index 6b6f8c40f3..3664bac5b3 100644
--- a/public/language/he/modules.json
+++ b/public/language/he/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "אשר ונעל",
     "composer.toggle_dropdown": "הדלק/כבה את התפריט הנפתח",
     "composer.uploading": "העלאה %1",
+    "composer.formatting.bold": "Bold",
+    "composer.formatting.italic": "Italic",
+    "composer.formatting.list": "List",
+    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Picture",
+    "composer.upload-picture": "Upload Image",
+    "composer.upload-file": "Upload File",
     "bootbox.ok": "בסדר",
     "bootbox.cancel": "בטל",
     "bootbox.confirm": "אשר",
diff --git a/public/language/he/pages.json b/public/language/he/pages.json
index 0a36793f6a..e939b0b589 100644
--- a/public/language/he/pages.json
+++ b/public/language/he/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "משתמשים עם המונה הגבוה ביותר",
     "users/sort-reputation": "משתמשים עם המוניטין הגבוה ביותר",
     "users/banned": "משתמשים מורחקים",
+    "users/most-flags": "Most flagged users",
     "users/search": "חיפוש משתמשים",
     "notifications": "התראות",
     "tags": "תגיות",
diff --git a/public/language/he/topic.json b/public/language/he/topic.json
index 49ca0e5bba..d1b892a460 100644
--- a/public/language/he/topic.json
+++ b/public/language/he/topic.json
@@ -26,12 +26,13 @@
     "tools": "כלים",
     "flag": "דווח",
     "locked": "נעול",
-    "bookmark_instructions": "לחץ כאן כדי לחזור לפוסט האחרון שלא קראת באשכול זה",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "דווח על פוסט זה למנהל",
     "flag_success": "התקבל דיווח על פוסט זה.",
     "deleted_message": "נושא זה נמחק. רק משתמשים עם ההרשאות המתאימות יכולים לצפות בו.",
     "following_topic.message": "מעתה, תקבל הודעות כאשר מישהו יעלה פוסט לנושא זה.",
     "not_following_topic.message": "לא תקבל הודעות נוספות בנושא זה.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "אנא הרשם או התחבר על-מנת לעקוב אחר נושא זה.",
     "markAsUnreadForAll.success": "נושא זה סומן כלא נקרא לכולם.",
     "mark_unread": "סמן כלא נקרא",
@@ -41,6 +42,12 @@
     "watch.title": "קבל התראה כאשר יש תגובות חדשות בנושא זה",
     "unwatch.title": "הפסק לעקוב אחר נושא זה",
     "share_this_post": "שתף פוסט זה",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "כלי נושא",
     "thread_tools.markAsUnreadForAll": "סמן כלא נקרא",
     "thread_tools.pin": "נעץ נושא",
diff --git a/public/language/he/unread.json b/public/language/he/unread.json
index 587071777b..51923d7147 100644
--- a/public/language/he/unread.json
+++ b/public/language/he/unread.json
@@ -6,5 +6,8 @@
     "selected": "נבחר",
     "all": "הכל",
     "all_categories": "כל הקטגוריות",
-    "topics_marked_as_read.success": "נושאים שמסומנים כנקרא!"
+    "topics_marked_as_read.success": "נושאים שמסומנים כנקרא!",
+    "all-topics": "All Topics",
+    "new-topics": "New Topics",
+    "watched-topics": "Watched Topics"
 }
\ No newline at end of file
diff --git a/public/language/he/user.json b/public/language/he/user.json
index a442d5fd10..79296e8215 100644
--- a/public/language/he/user.json
+++ b/public/language/he/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "פתח קישורים חיצוניים בכרטיסייה חדשה",
     "enable_topic_searching": "הפעל חיפוש בתוך נושא",
     "topic_search_help": "אם מאופשר, החיפוש בתוך הנושא יעקוף את שיטת החיפוש של הדפדפן, ויאפשר לך לחפש בכל הנושא - ולא רק במה שמוצג על המסך",
+    "delay_image_loading": "Delay Image Loading",
+    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
     "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "עקוב אחרת נושאים שהגבת בהם",
-    "follow_topics_you_create": "עקוב אחר נושאים שיצרת",
-    "grouptitle": "בחר את כותרת הקבוצה שברצונך להציג",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Group Title",
     "no-group-title": "ללא כותרת לקבוצה",
     "select-skin": "בחר מראה",
     "select-homepage": "בחר דף בית",
diff --git a/public/language/he/users.json b/public/language/he/users.json
index 7bbdc26e0b..b4c068bd33 100644
--- a/public/language/he/users.json
+++ b/public/language/he/users.json
@@ -2,6 +2,7 @@
     "latest_users": "משתמשים אחרונים",
     "top_posters": "מפרסמים הכי הרבה",
     "most_reputation": "המוניטין הגבוה ביותר",
+    "most_flags": "Most Flags",
     "search": "חיפוש",
     "enter_username": "הכנס שם משתמש לחיפוש",
     "load_more": "טען עוד",
diff --git a/public/language/hu/email.json b/public/language/hu/email.json
index 729de1a530..15a689ac13 100644
--- a/public/language/hu/email.json
+++ b/public/language/hu/email.json
@@ -24,6 +24,7 @@
     "digest.day": "day",
     "digest.week": "week",
     "digest.month": "month",
+    "digest.subject": "Digest for %1",
     "notif.chat.subject": "Új chat üzenet érkezett a következőtől: %1",
     "notif.chat.cta": "Kattints ide a beszélgetés folytatásához",
     "notif.chat.unsub.info": "Ez a chat-értesítés a feliratkozási beállításaid miatt lett kiküldve.",
diff --git a/public/language/hu/error.json b/public/language/hu/error.json
index e0744b39ca..c3a461d679 100644
--- a/public/language/hu/error.json
+++ b/public/language/hu/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Érvénytelen jelszó",
     "invalid-username-or-password": "Kérlek adj meg egy felhasználónevet és egy jelszót",
     "invalid-search-term": "Érvénytelen keresési feltétel",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "Foglalt felhasználónév",
     "email-taken": "Foglalt e-mail",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "Ez a fórum e-mail megerősítést kíván, kérlek kattints ide egy cím beírásához",
     "email-confirm-failed": "Nem tudtuk ellenőrizni az e-mail címedet, kérlek próbálkozz később.",
     "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "Túl rövid felhasználónév",
     "username-too-long": "Túl hosszú felhasználónév",
     "password-too-long": "Password too long",
     "user-banned": "Kitiltott felhasználó",
     "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "Nem létező kategória",
     "no-topic": "Nem létező téma",
     "no-post": "Nem létező hozzászólás",
@@ -38,6 +41,19 @@
     "category-disabled": "Kategória kikapcsolva",
     "topic-locked": "Téma lezárva",
     "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
     "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
@@ -55,10 +71,12 @@
     "already-unfavourited": "You have already unbookmarked this post",
     "cant-ban-other-admins": "Nem tilthatsz ki másik adminisztrátort!",
     "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Érvénytelen a kép típusa. Engedett kiterjesztések: %1",
     "invalid-image-extension": "Érvénytelen a kép kiterjesztése",
     "invalid-file-type": "Érvénytelen a fájl típusa. Engedélyezett kiterjesztések: %1",
     "group-name-too-short": "A csoport név túl rövid",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "A csoport nem létezik",
     "group-name-change-not-allowed": "A csoport névváltoztatás nem engedélyezett",
     "group-already-member": "Already part of this group",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "You are not allowed to edit this message",
     "cant-remove-last-user": "You can't remove the last user",
     "cant-delete-chat-message": "You are not allowed to delete this message",
+    "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Hírnév funkció kikapcsolva.",
     "downvoting-disabled": "Leszavazás funkció kikapcsolva",
     "not-enough-reputation-to-downvote": "Nem rendelkezel elég Hírnév ponttal, hogy leszavazhasd ezt a hozzászólást",
@@ -99,5 +118,6 @@
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
     "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "You can't kick yourself from the group",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/hu/login.json b/public/language/hu/login.json
index 14be774171..4323321c44 100644
--- a/public/language/hu/login.json
+++ b/public/language/hu/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Megjegyzés",
     "forgot_password": "Elfelejtett Jelszó?",
     "alternative_logins": "Alternatív belépés",
-    "failed_login_attempt": "Sikertelen belépési kísérlet, kérlek próbálkozzunk újra.",
+    "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Sikeres belépés",
     "dont_have_account": "Nincs még fiók?"
 }
\ No newline at end of file
diff --git a/public/language/hu/modules.json b/public/language/hu/modules.json
index 65142c04d3..e7262c7dff 100644
--- a/public/language/hu/modules.json
+++ b/public/language/hu/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Submit and Lock",
     "composer.toggle_dropdown": "Toggle Dropdown",
     "composer.uploading": "Uploading %1",
+    "composer.formatting.bold": "Bold",
+    "composer.formatting.italic": "Italic",
+    "composer.formatting.list": "List",
+    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Picture",
+    "composer.upload-picture": "Upload Image",
+    "composer.upload-file": "Upload File",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",
diff --git a/public/language/hu/pages.json b/public/language/hu/pages.json
index c67ccb5355..9ae7887b0e 100644
--- a/public/language/hu/pages.json
+++ b/public/language/hu/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Users with the most posts",
     "users/sort-reputation": "Users with the most reputation",
     "users/banned": "Banned Users",
+    "users/most-flags": "Most flagged users",
     "users/search": "User Search",
     "notifications": "Értesítések",
     "tags": "Tags",
diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json
index 189f065bde..d96b4b61a8 100644
--- a/public/language/hu/topic.json
+++ b/public/language/hu/topic.json
@@ -26,12 +26,13 @@
     "tools": "Eszközök",
     "flag": "Jelentés",
     "locked": "Locked",
-    "bookmark_instructions": "Click here to return to the last unread post in this thread.",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "A hozzászólás jelentése a moderátoroknál",
     "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.",
     "not_following_topic.message": "You will no longer receive notifications from this topic.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
     "markAsUnreadForAll.success": "Topic marked as unread for all.",
     "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
     "watch.title": "Be notified of new replies in this topic",
     "unwatch.title": "Stop watching this topic",
     "share_this_post": "Hozzászólás megosztása",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "Topic Tools",
     "thread_tools.markAsUnreadForAll": "Olvasatlannak jelölés",
     "thread_tools.pin": "Kiemel",
diff --git a/public/language/hu/unread.json b/public/language/hu/unread.json
index 8bf28e0be6..dd411974f5 100644
--- a/public/language/hu/unread.json
+++ b/public/language/hu/unread.json
@@ -6,5 +6,8 @@
     "selected": "Kiválasztva",
     "all": "Összes",
     "all_categories": "All categories",
-    "topics_marked_as_read.success": "Témakör olvasottnak jelölve!"
+    "topics_marked_as_read.success": "Témakör olvasottnak jelölve!",
+    "all-topics": "All Topics",
+    "new-topics": "New Topics",
+    "watched-topics": "Watched Topics"
 }
\ No newline at end of file
diff --git a/public/language/hu/user.json b/public/language/hu/user.json
index fd2a183e03..dc8c9969d3 100644
--- a/public/language/hu/user.json
+++ b/public/language/hu/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Open outgoing links in new tab",
     "enable_topic_searching": "Témán belüli keresés bekapcsolása",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
+    "delay_image_loading": "Delay Image Loading",
+    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
     "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Follow topics that you reply to",
-    "follow_topics_you_create": "Follow topics you create",
-    "grouptitle": "Select the group title you would like to display",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Group Title",
     "no-group-title": "No group title",
     "select-skin": "Select a Skin",
     "select-homepage": "Select a Homepage",
diff --git a/public/language/hu/users.json b/public/language/hu/users.json
index faedac9f35..8deea8b8c2 100644
--- a/public/language/hu/users.json
+++ b/public/language/hu/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Legújabb felhasználók",
     "top_posters": "Legaktívabbak",
     "most_reputation": "Legnépszerűbbek",
+    "most_flags": "Most Flags",
     "search": "Keresés",
     "enter_username": "Írj be egy nicknevet a kereséshez",
     "load_more": "Több betöltése",
diff --git a/public/language/id/email.json b/public/language/id/email.json
index 4b3a591c23..4f778999a4 100644
--- a/public/language/id/email.json
+++ b/public/language/id/email.json
@@ -24,6 +24,7 @@
     "digest.day": "day",
     "digest.week": "week",
     "digest.month": "month",
+    "digest.subject": "Digest for %1",
     "notif.chat.subject": "Pesan yang baru diterima dari %1",
     "notif.chat.cta": "Klik di sini untuk melanjutkan percakapan",
     "notif.chat.unsub.info": "Sesuai pengaturan langganan anda, notifikasi obrolan ini dikirmkan kepada anda",
diff --git a/public/language/id/error.json b/public/language/id/error.json
index de932ffac2..0c8082a88f 100644
--- a/public/language/id/error.json
+++ b/public/language/id/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Password Salah",
     "invalid-username-or-password": "Mohon spesifikasikan username dan password",
     "invalid-search-term": "Kata pencarian salah",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "Username sudah terdaftar",
     "email-taken": "Email sudah terdaftar",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
     "email-confirm-failed": "We could not confirm your email, please try again later.",
     "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "Username terlalu pendek",
     "username-too-long": "Username terlalu panjang",
     "password-too-long": "Password too long",
     "user-banned": "Pengguna dibanned",
     "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "Kategori tidak ditemukan",
     "no-topic": "Topik tidak ditemukan",
     "no-post": "Post tidak ditemukan",
@@ -38,6 +41,19 @@
     "category-disabled": "Kategori ditiadakan",
     "topic-locked": "Topik dikunci",
     "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
     "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
@@ -55,10 +71,12 @@
     "already-unfavourited": "You have already unbookmarked this post",
     "cant-ban-other-admins": "Kamu tidak dapat ban admin lainnya!",
     "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Invalid image type. Allowed types are: %1",
     "invalid-image-extension": "Invalid image extension",
     "invalid-file-type": "Invalid file type. Allowed types are: %1",
     "group-name-too-short": "Nama grup terlalu pendek",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Grup sudah ada",
     "group-name-change-not-allowed": "Perubahan nama grup tidak dibolehkan",
     "group-already-member": "Already part of this group",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "You are not allowed to edit this message",
     "cant-remove-last-user": "You can't remove the last user",
     "cant-delete-chat-message": "You are not allowed to delete this message",
+    "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Sistem reputasi ditiadakan.",
     "downvoting-disabled": "Downvoting ditiadakan",
     "not-enough-reputation-to-downvote": "Tidak cukup reputation untuk downvote post ini",
@@ -99,5 +118,6 @@
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
     "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "You can't kick yourself from the group",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/id/login.json b/public/language/id/login.json
index 7a1c52fe71..48aa87589d 100644
--- a/public/language/id/login.json
+++ b/public/language/id/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Ingin Diingat?",
     "forgot_password": "Lupa Password?",
     "alternative_logins": "Login Alternatif",
-    "failed_login_attempt": "Percobaan login gagal, cobalah kembali.",
+    "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Kamu telah berhasil login!",
     "dont_have_account": "Belum memiliki akun?"
 }
\ No newline at end of file
diff --git a/public/language/id/modules.json b/public/language/id/modules.json
index 7ddec19b96..bd2946c9d7 100644
--- a/public/language/id/modules.json
+++ b/public/language/id/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Submit and Lock",
     "composer.toggle_dropdown": "Toggle Dropdown",
     "composer.uploading": "Uploading %1",
+    "composer.formatting.bold": "Bold",
+    "composer.formatting.italic": "Italic",
+    "composer.formatting.list": "List",
+    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Picture",
+    "composer.upload-picture": "Upload Image",
+    "composer.upload-file": "Upload File",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",
diff --git a/public/language/id/pages.json b/public/language/id/pages.json
index 0ec372ded8..2d5d418547 100644
--- a/public/language/id/pages.json
+++ b/public/language/id/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Users with the most posts",
     "users/sort-reputation": "Users with the most reputation",
     "users/banned": "Banned Users",
+    "users/most-flags": "Most flagged users",
     "users/search": "User Search",
     "notifications": "Pemberitahuan",
     "tags": "Tags",
diff --git a/public/language/id/topic.json b/public/language/id/topic.json
index 6ba52cacce..b1cf656bcc 100644
--- a/public/language/id/topic.json
+++ b/public/language/id/topic.json
@@ -26,12 +26,13 @@
     "tools": "Perangkat",
     "flag": "Tandai",
     "locked": "Terkunci",
-    "bookmark_instructions": "Click here to return to the last unread post in this thread.",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Tandai posting ini untuk moderasi",
     "flag_success": "Posting ini telah ditandai untuk moderasi",
     "deleted_message": "Topik ini telah dihapus. Hanya pengguna dengan hak manajemen topik yang dapat melihatnya.",
     "following_topic.message": "Saat ini kamu akan menerima pemberitahuan saat seseorang membuat posting di dalam topik ini.",
     "not_following_topic.message": "Kamu tidak lagi menerima notiifikasi dari topik ini.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "Daftar atau login untuk berlangganan topik ini.",
     "markAsUnreadForAll.success": "Topik ditandai Belum Dibaca seluruhnya",
     "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
     "watch.title": "Beritahukan balasan baru untuk topik ini",
     "unwatch.title": "Berhenti memantau topik ini",
     "share_this_post": "Bagikan Posting ini",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "Perangkat Topik",
     "thread_tools.markAsUnreadForAll": "Tandai Belum Dibaca",
     "thread_tools.pin": "Tempel Topik",
diff --git a/public/language/id/unread.json b/public/language/id/unread.json
index 27ace0a281..f7bc4cf56b 100644
--- a/public/language/id/unread.json
+++ b/public/language/id/unread.json
@@ -6,5 +6,8 @@
     "selected": "Terpilih",
     "all": "Semua",
     "all_categories": "Semua Kategori",
-    "topics_marked_as_read.success": "Topik ditandai sudah dibaca!"
+    "topics_marked_as_read.success": "Topik ditandai sudah dibaca!",
+    "all-topics": "All Topics",
+    "new-topics": "New Topics",
+    "watched-topics": "Watched Topics"
 }
\ No newline at end of file
diff --git a/public/language/id/user.json b/public/language/id/user.json
index 4610dd8f43..4acdc89f51 100644
--- a/public/language/id/user.json
+++ b/public/language/id/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Open outgoing links in new tab",
     "enable_topic_searching": "Gunakan Pencarian Di dalam Topik",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
+    "delay_image_loading": "Delay Image Loading",
+    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
     "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Follow topics that you reply to",
-    "follow_topics_you_create": "Follow topics you create",
-    "grouptitle": "Select the group title you would like to display",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Group Title",
     "no-group-title": "No group title",
     "select-skin": "Select a Skin",
     "select-homepage": "Select a Homepage",
diff --git a/public/language/id/users.json b/public/language/id/users.json
index 7beb3ead46..23c5728a82 100644
--- a/public/language/id/users.json
+++ b/public/language/id/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Pengguna Terakhir",
     "top_posters": "Posting Terbanyak",
     "most_reputation": "Reputasi Terbanyak",
+    "most_flags": "Most Flags",
     "search": "Pencarian",
     "enter_username": "Masukkan nama pengguna untuk mencari",
     "load_more": "Tampilkan Lebih Banyak",
diff --git a/public/language/it/email.json b/public/language/it/email.json
index 6dc40a7a16..ef28eac56e 100644
--- a/public/language/it/email.json
+++ b/public/language/it/email.json
@@ -21,9 +21,10 @@
     "digest.cta": "Clicca qui per visitare %1",
     "digest.unsub.info": "Questo sommario ti è stato inviato perché lo hai sottoscritto nelle tue impostazioni.",
     "digest.no_topics": "Non ci sono state discussioni attive nell'ultimo %1",
-    "digest.day": "day",
-    "digest.week": "week",
-    "digest.month": "month",
+    "digest.day": "giorno",
+    "digest.week": "settimana",
+    "digest.month": "mese",
+    "digest.subject": "Digest for %1",
     "notif.chat.subject": "Nuovo messaggio in chat da %1",
     "notif.chat.cta": "Clicca qui per continuare la conversazione",
     "notif.chat.unsub.info": "Questa notifica di chat ti è stata inviata perché l'hai scelta nelle impostazioni.",
diff --git a/public/language/it/error.json b/public/language/it/error.json
index 25358c4310..d7af7cfe6b 100644
--- a/public/language/it/error.json
+++ b/public/language/it/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Password non valida",
     "invalid-username-or-password": "Si prega di specificare sia un nome utente che una password",
     "invalid-search-term": "Termine di ricerca non valido",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "Nome utente già preso",
     "email-taken": "Email già esistente",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "Questo forum richiede la conferma dell'indirizzo email, per favore clicca qui per inserirne uno",
     "email-confirm-failed": "Non possiamo confermare la tua email, per favore prova ancora più tardi.",
     "confirm-email-already-sent": "Email di conferma già inviata, per favore attendere %1 minuti per richiederne un'altra.",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "Nome utente troppo corto",
     "username-too-long": "Nome utente troppo lungo",
-    "password-too-long": "Password too long",
+    "password-too-long": "Password troppo lunga",
     "user-banned": "Utente bannato",
     "user-too-new": "Devi attendere %1 secondi prima di creare il tuo primo post",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "La Categoria non esiste",
     "no-topic": "Il Topic non esiste",
     "no-post": "Il Post non esiste",
@@ -38,6 +41,19 @@
     "category-disabled": "Categoria disabilitata",
     "topic-locked": "Discussione Bloccata",
     "post-edit-duration-expired": "Ti è consentito modificare un post per %1 secondi dopo averlo inviato",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Inserisci un testo più lungo. Il messaggio deve contenere almeno %1 caratteri.",
     "content-too-long": "Inserisci un post più breve. I post non possono essere più lunghi di %1 caratteri.",
     "title-too-short": "Inserisci un titolo più lungo. I titoli devono contenere almeno %1 caratteri.",
@@ -55,10 +71,12 @@
     "already-unfavourited": "You have already unbookmarked this post",
     "cant-ban-other-admins": "Non puoi bannare altri amministratori!",
     "cant-remove-last-admin": "Sei l'unico Amministratore. Aggiungi un altro amministratore prima di rimuovere il tuo ruolo",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Tipo dell'immagine non valido. I tipi permessi sono: %1",
     "invalid-image-extension": "Estensione immagine non valida",
     "invalid-file-type": "Tipo di file non valido. I formati consentiti sono: %1",
     "group-name-too-short": "Nome del Gruppo troppo corto",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Il Gruppo esiste già",
     "group-name-change-not-allowed": "Il cambio di nome al Gruppo non è consentito",
     "group-already-member": "Already part of this group",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "You are not allowed to edit this message",
     "cant-remove-last-user": "You can't remove the last user",
     "cant-delete-chat-message": "You are not allowed to delete this message",
+    "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Il sistema di reputazione è disabilitato.",
     "downvoting-disabled": "Il Downvoting è disabilitato",
     "not-enough-reputation-to-downvote": "Non hai i privilegi per votare negativamente questo post",
@@ -99,5 +118,6 @@
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
     "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "You can't kick yourself from the group",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/it/login.json b/public/language/it/login.json
index f04d6cdfb4..cdfa00c223 100644
--- a/public/language/it/login.json
+++ b/public/language/it/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Ricordami?",
     "forgot_password": "Password dimenticata?",
     "alternative_logins": "Accessi Alternativi",
-    "failed_login_attempt": "Tentativo di accesso fallito, prova ancora.",
+    "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Sei entrato con successo!",
     "dont_have_account": "Non hai un account?"
 }
\ No newline at end of file
diff --git a/public/language/it/modules.json b/public/language/it/modules.json
index fd58d80dd1..1d39879d23 100644
--- a/public/language/it/modules.json
+++ b/public/language/it/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Invia e Blocca",
     "composer.toggle_dropdown": "Mostra/Nascondi menu a discesa",
     "composer.uploading": "Uploading %1",
+    "composer.formatting.bold": "Bold",
+    "composer.formatting.italic": "Italic",
+    "composer.formatting.list": "List",
+    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Picture",
+    "composer.upload-picture": "Upload Image",
+    "composer.upload-file": "Upload File",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Annulla",
     "bootbox.confirm": "Conferma",
diff --git a/public/language/it/pages.json b/public/language/it/pages.json
index dd6de7ed92..477782d3c8 100644
--- a/public/language/it/pages.json
+++ b/public/language/it/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Utenti maggiori contributori",
     "users/sort-reputation": "Utenti con la reputazione più alta",
     "users/banned": "Banned Users",
+    "users/most-flags": "Most flagged users",
     "users/search": "Ricerca Utenti",
     "notifications": "Notifiche",
     "tags": "Tags",
diff --git a/public/language/it/topic.json b/public/language/it/topic.json
index 8bbcf4c4c2..c8ec24ade8 100644
--- a/public/language/it/topic.json
+++ b/public/language/it/topic.json
@@ -26,12 +26,13 @@
     "tools": "Strumenti",
     "flag": "Segnala",
     "locked": "Bloccato",
-    "bookmark_instructions": "Clicca qui per tornare all'ultimo post non letto in questo thread",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Segnala questo post per la moderazione",
     "flag_success": "Questo post è stato contrassegnato per la moderazione.",
     "deleted_message": "Questa discussione è stata cancellata. Solo gli utenti con diritti di gestione possono vederla.",
     "following_topic.message": "Da ora riceverai notifiche quando qualcuno posterà in questa discussione.",
     "not_following_topic.message": "Non riceverai più notifiche da questa discussione.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "Si prega di accedere o registrarsi per potersi iscrivere a questa discussione.",
     "markAsUnreadForAll.success": "Discussione segnata come non letta per tutti.",
     "mark_unread": "Segna come non letto",
@@ -41,6 +42,12 @@
     "watch.title": "Ricevi notifiche di nuove risposte in questa discussione",
     "unwatch.title": "Smetti di osservare questa discussione",
     "share_this_post": "Condividi questo Post",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "Strumenti per la Discussione",
     "thread_tools.markAsUnreadForAll": "Segna come non letto",
     "thread_tools.pin": "Fissa Discussione",
diff --git a/public/language/it/unread.json b/public/language/it/unread.json
index e2e6018a47..94c4a315a3 100644
--- a/public/language/it/unread.json
+++ b/public/language/it/unread.json
@@ -6,5 +6,8 @@
     "selected": "Selezionati",
     "all": "Tutti",
     "all_categories": "Tutte le categorie",
-    "topics_marked_as_read.success": "Discussione marcata come letta!"
+    "topics_marked_as_read.success": "Discussione marcata come letta!",
+    "all-topics": "All Topics",
+    "new-topics": "New Topics",
+    "watched-topics": "Watched Topics"
 }
\ No newline at end of file
diff --git a/public/language/it/user.json b/public/language/it/user.json
index 6202ea0bd8..2ef72244b7 100644
--- a/public/language/it/user.json
+++ b/public/language/it/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Apri i link web in una nuova pagina",
     "enable_topic_searching": "Abilita la ricerca negli argomenti",
     "topic_search_help": "Se abilitata, la ricerca negli argomenti ignorerà il comportamento predefinito del browser per consentirti di cercare all'interno delle discussioni, anziché soltanto nel contenuto visibile a schermo",
+    "delay_image_loading": "Delay Image Loading",
+    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
     "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Segui le discussioni a cui hai risposto",
-    "follow_topics_you_create": "Segui le discussioni che hai iniziato",
-    "grouptitle": "Seleziona il titolo del gruppo che vorresti vedere",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Group Title",
     "no-group-title": "Nessun titolo al gruppo",
     "select-skin": "Seleziona uno Skin",
     "select-homepage": "Select a Homepage",
diff --git a/public/language/it/users.json b/public/language/it/users.json
index b4770d2df5..3299cd0459 100644
--- a/public/language/it/users.json
+++ b/public/language/it/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Ultimi Utenti",
     "top_posters": "Maggiori contributori",
     "most_reputation": "Reputazione più alta",
+    "most_flags": "Most Flags",
     "search": "Cerca",
     "enter_username": "Inserisci il nome utente da cercare",
     "load_more": "Carica altri",
diff --git a/public/language/ja/email.json b/public/language/ja/email.json
index 86af5f6131..5cfeeb34f1 100644
--- a/public/language/ja/email.json
+++ b/public/language/ja/email.json
@@ -24,6 +24,7 @@
     "digest.day": "日",
     "digest.week": "週",
     "digest.month": "月",
+    "digest.subject": "Digest for %1",
     "notif.chat.subject": "%1さんからの新しいチャットメッセージがあります。",
     "notif.chat.cta": "クリックして会話を続ける",
     "notif.chat.unsub.info": "このチャットの通知はあなたの購読設定により送られました。",
diff --git a/public/language/ja/error.json b/public/language/ja/error.json
index 7deddf6c53..14332c43a4 100644
--- a/public/language/ja/error.json
+++ b/public/language/ja/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "無効なパスワード",
     "invalid-username-or-password": "ユーザー名とパスワードの両方を指定してください",
     "invalid-search-term": "無効な検索ワード",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "ユーザー名は既に使われています",
     "email-taken": "メールアドレスは既に使われています",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "このフォーラムを利用するにはメールアドレスの確認を行う必要があります。メールアドレスを確認するためにはここをクリックしてください。",
     "email-confirm-failed": "メールアドレスの確認が出来ませんでした。再度お試しください。",
     "confirm-email-already-sent": "確認のメールは既に送信されています。再度送信するには、%1分後に再度お試しください。",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "ユーザー名が短すぎます",
     "username-too-long": "ユーザー名が長すぎます",
     "password-too-long": "パスワードが長すぎます",
     "user-banned": "ユーザーは停止されています",
     "user-too-new": "申し訳ありません。登録後に投稿を行うには%1秒お待ち下さい。",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "カテゴリは存在しません",
     "no-topic": "トピックは存在しません",
     "no-post": "投稿は存在しません",
@@ -38,6 +41,19 @@
     "category-disabled": "この板は無効された",
     "topic-locked": "スレッドがロックされた",
     "post-edit-duration-expired": "あなたが%1秒後に投稿を編集する事が許されます",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "より長く投稿を書いて下さい。投稿にはせめて%1文字が必要です。",
     "content-too-long": "より短く投稿を書いて下さい。投稿が%1文字以上が許されません。",
     "title-too-short": "より長くタイトルを書いて下さい。タイトルはせめて%1文字が必要です。",
@@ -55,10 +71,12 @@
     "already-unfavourited": "You have already unbookmarked this post",
     "cant-ban-other-admins": "ほかの管理者を停止することはできません！",
     "cant-remove-last-admin": "あなたが唯一の管理者です。管理者としてあなた自身を削除する前に、管理者として別のユーザーを追加します。",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "無効なイメージタイプです。許可された種類は: %1",
     "invalid-image-extension": "無効なイメージのエクステンション",
     "invalid-file-type": "無効なファイルタイプです。許可された種類は: %1",
     "group-name-too-short": "グループ名は短すぎます。",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "グループ名はすでに存在しています",
     "group-name-change-not-allowed": "グループ名の修正はできません",
     "group-already-member": "既にこのグループの一部であります",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "You are not allowed to edit this message",
     "cant-remove-last-user": "You can't remove the last user",
     "cant-delete-chat-message": "You are not allowed to delete this message",
+    "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Reputation system is disabled.",
     "downvoting-disabled": "Downvoting is disabled",
     "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",
@@ -99,5 +118,6 @@
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
     "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "You can't kick yourself from the group",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/ja/language.json b/public/language/ja/language.json
index e210a4285a..ecd635ee30 100644
--- a/public/language/ja/language.json
+++ b/public/language/ja/language.json
@@ -1,5 +1,5 @@
 {
     "name": "日本語",
-    "code": "ja_JP",
+    "code": "ja",
     "dir": "ltr"
 }
\ No newline at end of file
diff --git a/public/language/ja/login.json b/public/language/ja/login.json
index 916593a30d..59c72797e6 100644
--- a/public/language/ja/login.json
+++ b/public/language/ja/login.json
@@ -5,7 +5,7 @@
     "remember_me": "ログイン情報を記憶",
     "forgot_password": "パスワードを忘れましたか？",
     "alternative_logins": "ほかのログイン方法",
-    "failed_login_attempt": "ログインに失敗しました.ユーザー名やパスワードをご確認ください。",
+    "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "ログインしました！",
     "dont_have_account": "アカウントをもっていませんか?"
 }
\ No newline at end of file
diff --git a/public/language/ja/modules.json b/public/language/ja/modules.json
index 204c392bbb..bc661721f9 100644
--- a/public/language/ja/modules.json
+++ b/public/language/ja/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Submit and Lock",
     "composer.toggle_dropdown": "Toggle Dropdown",
     "composer.uploading": "Uploading %1",
+    "composer.formatting.bold": "Bold",
+    "composer.formatting.italic": "Italic",
+    "composer.formatting.list": "List",
+    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Picture",
+    "composer.upload-picture": "Upload Image",
+    "composer.upload-file": "Upload File",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",
diff --git a/public/language/ja/pages.json b/public/language/ja/pages.json
index 717c66327e..037ef853f4 100644
--- a/public/language/ja/pages.json
+++ b/public/language/ja/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "ほとんどの投稿を持つユーザー",
     "users/sort-reputation": "一番評価の高いユーザー",
     "users/banned": "Banned Users",
+    "users/most-flags": "Most flagged users",
     "users/search": "ユーザーを検索",
     "notifications": "通知",
     "tags": "Tags",
diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json
index f24579e205..2428021556 100644
--- a/public/language/ja/topic.json
+++ b/public/language/ja/topic.json
@@ -26,12 +26,13 @@
     "tools": "ツール",
     "flag": "フラグ",
     "locked": "ロック",
-    "bookmark_instructions": "ここを押して、最後の未読の投稿戻ります",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "リポートする",
     "flag_success": "このポストをリポートしました。",
     "deleted_message": "このトピックが削除されました。トピック管理権を持っているユーザーにしか読めません。",
     "following_topic.message": "このスレッドが更新された際に通知を受け取ります。",
     "not_following_topic.message": "このスレッドの更新通知を停止しました。",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "このスレッドを購読するためにログインが必要です。",
     "markAsUnreadForAll.success": "すべてのスレッドを未読にしました。",
     "mark_unread": "未読として示す",
@@ -41,6 +42,12 @@
     "watch.title": "新しいポストの通知を受ける",
     "unwatch.title": "このトピックの通知を停止します",
     "share_this_post": "ポストを共有",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "トピックのツール",
     "thread_tools.markAsUnreadForAll": "未読にする",
     "thread_tools.pin": "スレッドを最上部に固定",
diff --git a/public/language/ja/unread.json b/public/language/ja/unread.json
index 66a8e02906..54446f4116 100644
--- a/public/language/ja/unread.json
+++ b/public/language/ja/unread.json
@@ -6,5 +6,8 @@
     "selected": "選択済み",
     "all": "全て",
     "all_categories": "全てのカテゴリ",
-    "topics_marked_as_read.success": "すべてのスレッドを既読にしました。"
+    "topics_marked_as_read.success": "すべてのスレッドを既読にしました。",
+    "all-topics": "All Topics",
+    "new-topics": "New Topics",
+    "watched-topics": "Watched Topics"
 }
\ No newline at end of file
diff --git a/public/language/ja/user.json b/public/language/ja/user.json
index 539809537d..a205a6d4d1 100644
--- a/public/language/ja/user.json
+++ b/public/language/ja/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "外リンクを新しいタブに開きます",
     "enable_topic_searching": "インートピックの検索を有効にします",
     "topic_search_help": "有効にしたら、インートピックの検索はブラウザの既定機能を無視して、スクリーンに示したよりトピック内からの全部を検索します",
+    "delay_image_loading": "Delay Image Loading",
+    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
     "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "返信したトピックをフォローします",
-    "follow_topics_you_create": "投稿したトピックをフォローします",
-    "grouptitle": "好きなグループ名を選んで下さい",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Group Title",
     "no-group-title": "グループ名がありません",
     "select-skin": "スキンを選んで下さい",
     "select-homepage": "ホームページを選んで下さい",
diff --git a/public/language/ja/users.json b/public/language/ja/users.json
index feb467657d..65fafee4d4 100644
--- a/public/language/ja/users.json
+++ b/public/language/ja/users.json
@@ -2,6 +2,7 @@
     "latest_users": "新しいユーザー",
     "top_posters": "最も投稿したユーザー",
     "most_reputation": "最も評価されたユーザー",
+    "most_flags": "Most Flags",
     "search": "検索",
     "enter_username": "検索するユーザー名を入力してください",
     "load_more": "もっと見る",
diff --git a/public/language/ko/email.json b/public/language/ko/email.json
index ff07b4a927..07a668917b 100644
--- a/public/language/ko/email.json
+++ b/public/language/ko/email.json
@@ -24,6 +24,7 @@
     "digest.day": "일",
     "digest.week": "주",
     "digest.month": "월",
+    "digest.subject": "%1님을 위한 다이제스트",
     "notif.chat.subject": "%1님이 대화 메시지를 보냈습니다.",
     "notif.chat.cta": "대화를 계속하려면 여기를 클릭하세요.",
     "notif.chat.unsub.info": "이 대화 알림은 사용자의 구독 설정에 따라 전송되었습니다.",
diff --git a/public/language/ko/error.json b/public/language/ko/error.json
index edb0a3a88d..ca530bc67c 100644
--- a/public/language/ko/error.json
+++ b/public/language/ko/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "올바르지 않은 비밀번호입니다.",
     "invalid-username-or-password": "사용자 이름과 패스워드를 모두 설정해주세요.",
     "invalid-search-term": "올바르지 않은 검색어입니다.",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "올바르지 않은 값입니다. 최소 1%에서 최대 2%까지 설정해야 합니다.",
     "username-taken": "이미 사용 중인 사용자 이름입니다.",
     "email-taken": "이미 사용 중인 이메일입니다.",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "이메일 인증이 필요합니다. 이곳을 클릭하여 이메일 입력하세요.",
     "email-confirm-failed": "이메일 인증이 실패하였습니다. 잠시 후에 다시 시도하세요.",
     "confirm-email-already-sent": "인증 메일이 이미 발송되었습니다. %1 분 이후에 재 발송이 가능합니다.",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "사용자 이름이 너무 짧습니다.",
     "username-too-long": "사용자 이름이 너무 깁니다.",
     "password-too-long": "패스워드가 너무 깁니다.",
     "user-banned": "차단된 사용자입니다.",
     "user-too-new": "죄송합니다, 첫 번째 게시물은 %1 초 후에 작성할 수 있습니다.",
     "blacklisted-ip": "죄송하지만, 당신의 IP는 이 커뮤니티로부터 차단되었습니다. 만약 에러라는 생각이 드신다면 관리자에게 연락해주세요.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "존재하지 않는 카테고리입니다.",
     "no-topic": "존재하지 않는 주제입니다.",
     "no-post": "존재하지 않는 게시물입니다.",
@@ -38,6 +41,19 @@
     "category-disabled": "비활성화된 카테고리입니다.",
     "topic-locked": "잠긴 주제입니다.",
     "post-edit-duration-expired": "게시물의 수정은 작성한 시간으로부터 %1초 후에 가능합니다.",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "게시물의 내용이 너무 짧습니다. 내용은 최소 %1자 이상이어야 합니다.",
     "content-too-long": "게시물의 내용이 너무 깁니다. 내용은 최대 %1자 이내로 작성할 수 있습니다.",
     "title-too-short": "제목이 너무 짧습니다. 제목은 최소 %1자 이상이어야 합니다.",
@@ -55,10 +71,12 @@
     "already-unfavourited": "이미 이 게시물을 북마크 해제했습니다.",
     "cant-ban-other-admins": "다른 관리자를 차단할 수 없습니다.",
     "cant-remove-last-admin": "귀하는 유일한 관리자입니다. 관리자를 그만두시기 전에 다른 사용자를 관리자로 선임하세요.",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "올바르지 않은 이미지입니다. 사용가능한 유형: %1",
     "invalid-image-extension": "올바르지 않은 이미지 확장자입니다.",
     "invalid-file-type": "올바르지 않은 파일 유형입니다. 사용가능한 유형: %1",
     "group-name-too-short": "그룹 이름이 너무 짧습니다.",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "이미 존재하는 그룹입니다.",
     "group-name-change-not-allowed": "그룹 이름의 변경은 불가합니다.",
     "group-already-member": "이미 이 그룹에 속해있습니다.",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "편집 할 수 있는 권한이 없습니다.",
     "cant-remove-last-user": "마지막 사용자를 삭제할 수 없습니다.",
     "cant-delete-chat-message": "메세지를 지울 권한이 없습니다.",
+    "already-voting-for-this-post": "이미 이 게시글에 투표하셨습니다.",
     "reputation-system-disabled": "인지도 기능이 비활성 상태입니다.",
     "downvoting-disabled": "비추천 기능이 비활성 상태입니다.",
     "not-enough-reputation-to-downvote": "인지도가 낮아 이 게시물에 반대할 수 없습니다.",
@@ -99,5 +118,6 @@
     "no-session-found": "로그인 세션을 찾을 수 없습니다.",
     "not-in-room": "없는 사용자입니다.",
     "no-users-in-room": "사용자가 없습니다.",
-    "cant-kick-self": "스스로 이 그룹을 탈퇴할 수 없습니다."
+    "cant-kick-self": "스스로 이 그룹을 탈퇴할 수 없습니다.",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/ko/login.json b/public/language/ko/login.json
index 61413fcb8a..d71e824596 100644
--- a/public/language/ko/login.json
+++ b/public/language/ko/login.json
@@ -5,7 +5,7 @@
     "remember_me": "로그인 유지",
     "forgot_password": "비밀번호 초기화",
     "alternative_logins": "다른 방법으로 로그인",
-    "failed_login_attempt": "로그인에 실패했습니다.",
+    "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "성공적으로 로그인했습니다.",
     "dont_have_account": "계정이 없으신가요?"
 }
\ No newline at end of file
diff --git a/public/language/ko/modules.json b/public/language/ko/modules.json
index 99aea82699..3d7b19c6a1 100644
--- a/public/language/ko/modules.json
+++ b/public/language/ko/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "잠금 상태로 작성 완료",
     "composer.toggle_dropdown": "내려서 확인하기",
     "composer.uploading": "%1 업로드 중",
+    "composer.formatting.bold": "Bold",
+    "composer.formatting.italic": "Italic",
+    "composer.formatting.list": "List",
+    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Picture",
+    "composer.upload-picture": "Upload Image",
+    "composer.upload-file": "Upload File",
     "bootbox.ok": "확인",
     "bootbox.cancel": "취소",
     "bootbox.confirm": "확인",
diff --git a/public/language/ko/pages.json b/public/language/ko/pages.json
index 65130b5b29..d7c47cd17d 100644
--- a/public/language/ko/pages.json
+++ b/public/language/ko/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "가장 많은 게시물을 작성한 사용자",
     "users/sort-reputation": "가장 높은 인지도를 가진 사용자",
     "users/banned": "차단된 유저",
+    "users/most-flags": "Most flagged users",
     "users/search": "사용자 검색",
     "notifications": "알림",
     "tags": "태그",
diff --git a/public/language/ko/topic.json b/public/language/ko/topic.json
index 056ccb5a8f..cc156f3114 100644
--- a/public/language/ko/topic.json
+++ b/public/language/ko/topic.json
@@ -26,12 +26,13 @@
     "tools": "도구",
     "flag": "신고",
     "locked": "잠김",
-    "bookmark_instructions": "여기를 누르면 마지막으로 읽지 않은 포스트로 이동합니다.",
+    "bookmark_instructions": "이 스레드에서 읽은 마지막 게시글로 이동하시려면 여기를 클릭하세요.",
     "flag_title": "이 게시물을 신고",
     "flag_success": "이 게시물은 신고되었습니다.",
     "deleted_message": "이 주제는 삭제되었습니다. 주제 관리 권한이 있는 사용자만 볼 수 있습니다.",
     "following_topic.message": "이제 이 주제에 새 답글이 달리면 알림을 받습니다.",
     "not_following_topic.message": "더 이상 이 주제의 새 답글을 알리지 않습니다.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "이 주제의 알림을 받기 위해서는 로그인해야 합니다.",
     "markAsUnreadForAll.success": "모든 사용자에 대해 읽지 않음으로 표시했습니다.",
     "mark_unread": "읽지 않음으로 표시",
@@ -41,6 +42,12 @@
     "watch.title": "이 주제의 새 답글 알리기",
     "unwatch.title": "이 주제에 대한 관심을 해제합니다.",
     "share_this_post": "이 게시물 공유",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "주제 관리",
     "thread_tools.markAsUnreadForAll": "모두에게 읽지 않음으로 표시",
     "thread_tools.pin": "상단 고정",
diff --git a/public/language/ko/unread.json b/public/language/ko/unread.json
index 56f631af80..527a990c08 100644
--- a/public/language/ko/unread.json
+++ b/public/language/ko/unread.json
@@ -6,5 +6,8 @@
     "selected": "선택된 주제",
     "all": "전체",
     "all_categories": "모든 카테고리",
-    "topics_marked_as_read.success": "성공적으로 읽음으로 표시했습니다."
+    "topics_marked_as_read.success": "성공적으로 읽음으로 표시했습니다.",
+    "all-topics": "모든 주제",
+    "new-topics": "새 주제",
+    "watched-topics": "읽은 주제"
 }
\ No newline at end of file
diff --git a/public/language/ko/user.json b/public/language/ko/user.json
index b86ed76b19..eb6c5e0b71 100644
--- a/public/language/ko/user.json
+++ b/public/language/ko/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "외부 링크를 새로운 탭을 사용하여 열람",
     "enable_topic_searching": "주제 내 검색 허용",
     "topic_search_help": "활성화 된후 브라우저의 기본 페이지 검색 기능을 연관 주제 검색 기능으로 대신하고 화면에 보여지는 것 뿐만 아니라 주제와 연관된 모든것을 검색합니다.",
+    "delay_image_loading": "이미지 로딩 지연",
+    "image_load_delay_help": "활성화 되면 이미지 위치로 스크롤을 움직이기 전까지 이미지가 로드 되지 않습니다.",
     "scroll_to_my_post": "답글 게시 후 새 포스트 보여주기",
-    "follow_topics_you_reply_to": "답글 단 게시물을 팔로우 합니다.",
-    "follow_topics_you_create": "생성한 주제를 팔로우 합니다.",
-    "grouptitle": "표시할 그룹 이름을 선택하세요.",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "그룹 주제",
     "no-group-title": "그룹 이름이 없습니다.",
     "select-skin": "스킨 선택",
     "select-homepage": "홈페이지 선택",
diff --git a/public/language/ko/users.json b/public/language/ko/users.json
index a3ba794ca2..738cbe8f05 100644
--- a/public/language/ko/users.json
+++ b/public/language/ko/users.json
@@ -2,6 +2,7 @@
     "latest_users": "가입일",
     "top_posters": "게시물 수",
     "most_reputation": "인기도",
+    "most_flags": "Most Flags",
     "search": "검색",
     "enter_username": "검색할 사용자 이름을 입력하세요.",
     "load_more": "더 보기",
diff --git a/public/language/lt/email.json b/public/language/lt/email.json
index cd68d27182..f183b346f2 100644
--- a/public/language/lt/email.json
+++ b/public/language/lt/email.json
@@ -24,6 +24,7 @@
     "digest.day": "day",
     "digest.week": "week",
     "digest.month": "month",
+    "digest.subject": "Digest for %1",
     "notif.chat.subject": "Nauja pokalbio žinutė gauta iš %1",
     "notif.chat.cta": "Pokalbio pratęsimui spauskite čia",
     "notif.chat.unsub.info": "Šios žinutės perpėjimas buvo išsiųstas į tavo prenumeratos nustatymus",
diff --git a/public/language/lt/error.json b/public/language/lt/error.json
index e23088894e..c1f30b5596 100644
--- a/public/language/lt/error.json
+++ b/public/language/lt/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Klaidingas slaptažodis",
     "invalid-username-or-password": "Prašome nurodyti tiek vartotojo vardą, tiek ir slaptažodį",
     "invalid-search-term": "Neteisingas paieškos terminas",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "Vartotojo vardas jau užimtas",
     "email-taken": "El. pašto adresas jau užimtas",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "Šis forumas reikalauja patvirtinimo el. paštu prašome spausti čia el. adreso įrašymui",
     "email-confirm-failed": "Negalime patvirtinti jūsų el. adreso, prašom bandyti vėliau.",
     "confirm-email-already-sent": "Patvirtinimo laiškas išsiųstas, prašome palaukti %1 minute(s) kad išsiųstume kita",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "Slapyvardis per trumpas",
     "username-too-long": "Vartotojo vardas per ilgas",
     "password-too-long": "Password too long",
     "user-banned": "Vartotojas užblokuotas",
     "user-too-new": "Atsiprašome, jūs įpareigoti palaukti %1 sekunde(s) prieš rašant pirmą pranešimą",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "Tokios kategorijos nėra",
     "no-topic": "Tokios temos nėra",
     "no-post": "Tokio įrašo nėra",
@@ -38,6 +41,19 @@
     "category-disabled": "Kategorija išjungta",
     "topic-locked": "Tema užrakinta",
     "post-edit-duration-expired": "Jums galima redaguoti pranešims tik %1 sekunde(s) po parašymo",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Prašome parašyti ilgesni pranešimą. Pranešimas turi sudaryti mažiausiai %1 simboli(us)",
     "content-too-long": "Prašome parašyti trumpesnį pranešimą. Pranešimas negali sudaryti daugiau %1 simboli(us)",
     "title-too-short": "Prašome įvesti ilgesni pavadinimą. Pavadinimas turi sudaryti mažiausiai %1 simboli(us)",
@@ -55,10 +71,12 @@
     "already-unfavourited": "You have already unbookmarked this post",
     "cant-ban-other-admins": "Jūs negalite užblokuoti kitų administratorių!",
     "cant-remove-last-admin": "Jūs esate vienintelis administratorius. Pridėkite kitą vartotoja kaip administratorių prieš pašalindamas save",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Neteisingas vaizdo tipas. Leidžiami tipai :%1",
     "invalid-image-extension": "Neteisingas vaizdo plėtinys",
     "invalid-file-type": "Neteisingas failo tipas. Leidžiami tipai: %1",
     "group-name-too-short": "Grupės pavadinimas per trumpas",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Tokia grupė jau egzistuoja",
     "group-name-change-not-allowed": "Grupės pavadinimas keitimas neleidžiamas",
     "group-already-member": "Already part of this group",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "You are not allowed to edit this message",
     "cant-remove-last-user": "You can't remove the last user",
     "cant-delete-chat-message": "You are not allowed to delete this message",
+    "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Reputacijos sistema išjungta.",
     "downvoting-disabled": "Downvoting yra išjungtas",
     "not-enough-reputation-to-downvote": "Jūs neturite pakankamai reputacijos balsuoti prieš šį pranešimą",
@@ -99,5 +118,6 @@
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
     "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "You can't kick yourself from the group",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/lt/login.json b/public/language/lt/login.json
index dd18d2949c..09d9b42d62 100644
--- a/public/language/lt/login.json
+++ b/public/language/lt/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Prisiminti?",
     "forgot_password": "Užmiršote slaptažodį?",
     "alternative_logins": "Alternatyvūs prisijungimo būdai",
-    "failed_login_attempt": "Prisijungti nepavyko, bandykite dar kartą.",
+    "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Jūs sėkmingai prisijungėte!",
     "dont_have_account": "Neturite paskyros?"
 }
\ No newline at end of file
diff --git a/public/language/lt/modules.json b/public/language/lt/modules.json
index 252dd3bfa3..a490086245 100644
--- a/public/language/lt/modules.json
+++ b/public/language/lt/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Pateikti ir užrakinti",
     "composer.toggle_dropdown": "Perjungti Nukritimą",
     "composer.uploading": "Uploading %1",
+    "composer.formatting.bold": "Bold",
+    "composer.formatting.italic": "Italic",
+    "composer.formatting.list": "List",
+    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Picture",
+    "composer.upload-picture": "Upload Image",
+    "composer.upload-file": "Upload File",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",
diff --git a/public/language/lt/pages.json b/public/language/lt/pages.json
index 9eb817a26c..949e4c3eb2 100644
--- a/public/language/lt/pages.json
+++ b/public/language/lt/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Users with the most posts",
     "users/sort-reputation": "Users with the most reputation",
     "users/banned": "Banned Users",
+    "users/most-flags": "Most flagged users",
     "users/search": "User Search",
     "notifications": "Pranešimai",
     "tags": "Žymos",
diff --git a/public/language/lt/topic.json b/public/language/lt/topic.json
index a12bdd4c4e..e2e85315f5 100644
--- a/public/language/lt/topic.json
+++ b/public/language/lt/topic.json
@@ -26,12 +26,13 @@
     "tools": "Įrankiai",
     "flag": "Pažymėti",
     "locked": "Užrakinta",
-    "bookmark_instructions": "Click here to return to the last unread post in this thread.",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Pažymėti ši pranešimą moderatoriams",
     "flag_success": "Šis pranešimas buvo pažymėtas moderatorių patikrinimui.",
     "deleted_message": "Ši tema buvo ištrinta. Tik Vartotojai su temos redagavimo privilegijomis gali matyti ja",
     "following_topic.message": "Dabar jūs gausite pranešimus kai kas nors atrašys šioje temoje.",
     "not_following_topic.message": "Jūs daugiau negausite pranešimų iš šios temos.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "Norėdami prenumeruoti šią temą, prašome prisiregistruoti arba prisijungti.",
     "markAsUnreadForAll.success": "Tema visiems vartotojams pažymėta kaip neskaityta.",
     "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
     "watch.title": "Gauti pranešimą apie naujus įrašus šioje temoje",
     "unwatch.title": "Baigti šios temos stebėjimą",
     "share_this_post": "Dalintis šiuo įrašu",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "Temos priemonės",
     "thread_tools.markAsUnreadForAll": "Pažymėti kaip neskaitytą",
     "thread_tools.pin": "Prisegti temą",
diff --git a/public/language/lt/unread.json b/public/language/lt/unread.json
index 37c42dc40d..88b8b1464f 100644
--- a/public/language/lt/unread.json
+++ b/public/language/lt/unread.json
@@ -6,5 +6,8 @@
     "selected": "Pasirinkti",
     "all": "Visi",
     "all_categories": "Visos kategorijos",
-    "topics_marked_as_read.success": "Temos pažymėtos kaip perskaitytos."
+    "topics_marked_as_read.success": "Temos pažymėtos kaip perskaitytos.",
+    "all-topics": "All Topics",
+    "new-topics": "New Topics",
+    "watched-topics": "Watched Topics"
 }
\ No newline at end of file
diff --git a/public/language/lt/user.json b/public/language/lt/user.json
index 13f3b36b7b..51671a2486 100644
--- a/public/language/lt/user.json
+++ b/public/language/lt/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Atidaryti išeinančias nuorodas naujam skirtuke",
     "enable_topic_searching": "Įjungti Temų Ieškojimą ",
     "topic_search_help": "Jeigu įjungtas, temų ieškojimas, nepaisys naršyklės puslapio ieškojimo, ir pradės ieškoti tik toje temoje kuri bus rodoma ekrane",
+    "delay_image_loading": "Delay Image Loading",
+    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
     "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Sekti tas temas kur atrašai tu",
-    "follow_topics_you_create": "Sekti tas temas kurias sukuri tu",
-    "grouptitle": "Pasirinkite grupės pavadinimą kurį norėtumėte kad atvaizduotu",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Group Title",
     "no-group-title": "Nėra grupės pavadinimo",
     "select-skin": "Select a Skin",
     "select-homepage": "Select a Homepage",
diff --git a/public/language/lt/users.json b/public/language/lt/users.json
index e349dc32b6..e55086ed4a 100644
--- a/public/language/lt/users.json
+++ b/public/language/lt/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Paskutiniai vartotojai",
     "top_posters": "Geriausi autoriai",
     "most_reputation": "Didžiausia reputacija",
+    "most_flags": "Most Flags",
     "search": "Ieškoti",
     "enter_username": "Įrašykite vartotojo vardą paieškai",
     "load_more": "Įkelti daugiau",
diff --git a/public/language/ms/email.json b/public/language/ms/email.json
index 01dc9523e3..eb5affbabd 100644
--- a/public/language/ms/email.json
+++ b/public/language/ms/email.json
@@ -24,6 +24,7 @@
     "digest.day": "day",
     "digest.week": "week",
     "digest.month": "month",
+    "digest.subject": "Digest for %1",
     "notif.chat.subject": "Pesanan baru diterima dari %1",
     "notif.chat.cta": "Klik sini untuk meneruskan perbualan",
     "notif.chat.unsub.info": "Pemberitahuan sembang ini dihantar berdasarkan tetapan langganan anda.",
diff --git a/public/language/ms/error.json b/public/language/ms/error.json
index 7840393a92..4f95e3308d 100644
--- a/public/language/ms/error.json
+++ b/public/language/ms/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Kata laluan salah!",
     "invalid-username-or-password": "Sila tentukan kedua-dua nama pengguna dan kata laluan",
     "invalid-search-term": "Terma pencarian tak sah",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Nombor halaman tidak sah, mesti tidak kurang dari %1 dan tidak lebih dari %2",
     "username-taken": "Nama pengguna telah digunakan",
     "email-taken": "Emel telah digunakan",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "Forum ini memerlukan pengesahan emel, sila klik sini untuk memasukkan emel",
     "email-confirm-failed": "Kami tidak dapat memastikan emel anda, sila cuba lagi nanti",
     "confirm-email-already-sent": "Pengesahan emel telah dihantar, sila tunggu %1 minit() untuk menghantar yang baru.",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "Nama pengunna terlalu pendek",
     "username-too-long": "Nama pengunna terlalu panjang",
     "password-too-long": "Kata laluan terlalu panjang",
     "user-banned": "Pengguna diharamkan",
     "user-too-new": "Maaf, anda dikehendaki menunggu %1 saat() sebelum membuat kiriman pertama anda",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "Kategori tidak wujud",
     "no-topic": "Topik tidak wujud",
     "no-post": "Kiriman tidak wujud",
@@ -38,6 +41,19 @@
     "category-disabled": "Kategori dilumpuhkan",
     "topic-locked": "Topik Dikunci",
     "post-edit-duration-expired": "Anda hanya dibenarkan menyunting kiriman selepas %1 saat() berlalu",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Sila masukkan kiriman yang lebih panjang. Kiriman mesti mengandungi sekurang-kurangnya %1 aksara().",
     "content-too-long": "Sila masukkan kiriman yang lebih ringkas. Kiriman mesti mengandungi tidak lebih %1 aksara().",
     "title-too-short": "Sila masukkan tajuk yang lebih panjang. Tajuk mesti mengandungi sekurang-kurangnya %1 aksara().",
@@ -55,10 +71,12 @@
     "already-unfavourited": "Anda telah pun membuang penanda untuk kiriman ini",
     "cant-ban-other-admins": "Anda tidak boleh haramkan admin / pentadbir!",
     "cant-remove-last-admin": "Anda satu-satunya pentadbir. Tambah pentadbir lain sebelum membuang diri anda sebagai pentadbir",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Jenis imej tak sah. Jenis yang dibenarkan ialah: %1",
     "invalid-image-extension": "Sambungan imej tak sah",
     "invalid-file-type": "Jenis fail tak sah. Jenis fail yang dibenarkan ialah: %1",
     "group-name-too-short": "Nama kumpulan terlalu pendek",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Kumpulan telah wujud",
     "group-name-change-not-allowed": "Pengubahan nama kumpulan tidak dibenarkan",
     "group-already-member": "Sudah pun sebahagian dari kumpulan ini",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "Anda tidak dibenarkan menyunting mesej ini",
     "cant-remove-last-user": "Anda tidak boleh membuang pengguna akhir",
     "cant-delete-chat-message": "Anda tidak dibenarkan memadamkan mesej ini",
+    "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Sistem reputasi dilumpuhkan.",
     "downvoting-disabled": "Undi turun dilumpuhkan",
     "not-enough-reputation-to-downvote": "Anda tidak mempunyai reputasi mencukupi untuk mengundi turun kiriman ini",
@@ -99,5 +118,6 @@
     "no-session-found": "Tiada sesyen log masuk dijumpai",
     "not-in-room": "Pengguna tiada dalam bilik",
     "no-users-in-room": "Tiada pengguna dalam bilik ini",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "You can't kick yourself from the group",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/ms/login.json b/public/language/ms/login.json
index 7536a7c973..3c3a1fd1d1 100644
--- a/public/language/ms/login.json
+++ b/public/language/ms/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Ingatkan Saya",
     "forgot_password": "Lupa Kata Laluan?",
     "alternative_logins": "Log Masuk Alternatif",
-    "failed_login_attempt": "Log masuk gagal, sila cuba lagi.",
+    "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Anda berjaya log masuk!",
     "dont_have_account": "Tiada akaun?"
 }
\ No newline at end of file
diff --git a/public/language/ms/modules.json b/public/language/ms/modules.json
index 996443d174..774d674123 100644
--- a/public/language/ms/modules.json
+++ b/public/language/ms/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Hantar dan Kunci",
     "composer.toggle_dropdown": "Togol Kebawah",
     "composer.uploading": "Memuat naik %1",
+    "composer.formatting.bold": "Bold",
+    "composer.formatting.italic": "Italic",
+    "composer.formatting.list": "List",
+    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Picture",
+    "composer.upload-picture": "Upload Image",
+    "composer.upload-file": "Upload File",
     "bootbox.ok": "Ok",
     "bootbox.cancel": "Batal",
     "bootbox.confirm": "Pasti",
diff --git a/public/language/ms/pages.json b/public/language/ms/pages.json
index c215ed4197..d6134a2dd5 100644
--- a/public/language/ms/pages.json
+++ b/public/language/ms/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Pengguna Mengikut Kiriman Terbanyak",
     "users/sort-reputation": "Pengguna Mengikut Reputasi Terbanyak",
     "users/banned": "Pengguna Diharam",
+    "users/most-flags": "Most flagged users",
     "users/search": "Carian Pengguna",
     "notifications": "Makluman",
     "tags": "Tag",
diff --git a/public/language/ms/topic.json b/public/language/ms/topic.json
index 8c12c5a409..cb75bb32bc 100644
--- a/public/language/ms/topic.json
+++ b/public/language/ms/topic.json
@@ -26,12 +26,13 @@
     "tools": "Perkakas",
     "flag": "Tanda",
     "locked": "Kunci",
-    "bookmark_instructions": "Klik disini untuk kembali ke kiriman terakhir yang anda telah baca di thread ini.",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Tanda kiriman ini untuk diselia",
     "flag_success": "Kiriman ini telah ditandakan untuk diselia",
     "deleted_message": "Topik ini telah dipadam. Hanya pengguna dengan kuasa pengurusan boleh melihatnya.",
     "following_topic.message": "Anda akan menerima makluman apabila ada kiriman ke dalam topik ini",
     "not_following_topic.message": "Anda tidak lagi akan menerima makluman daripada topik ini",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "Sila daftar atau log masuk untuk melanggani topik ini",
     "markAsUnreadForAll.success": "Topik ditanda sebagai belum dibaca untuk semua",
     "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
     "watch.title": "Akan dimaklumkan sekiranya ada balasan dalam topik ini",
     "unwatch.title": "Berhenti melihat topik ini",
     "share_this_post": "Kongsi kiriman ini",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "Perkakas Topik",
     "thread_tools.markAsUnreadForAll": "Tanda sebagai belum dibaca",
     "thread_tools.pin": "Pinkan topik",
diff --git a/public/language/ms/unread.json b/public/language/ms/unread.json
index 6e23443905..3e132e6f2c 100644
--- a/public/language/ms/unread.json
+++ b/public/language/ms/unread.json
@@ -6,5 +6,8 @@
     "selected": "Dipilih",
     "all": "Semua",
     "all_categories": "Semua Kategori",
-    "topics_marked_as_read.success": "Topik ditandakan sebagai sudah dibaca"
+    "topics_marked_as_read.success": "Topik ditandakan sebagai sudah dibaca",
+    "all-topics": "All Topics",
+    "new-topics": "New Topics",
+    "watched-topics": "Watched Topics"
 }
\ No newline at end of file
diff --git a/public/language/ms/user.json b/public/language/ms/user.json
index 39d38cc538..0a9449ec31 100644
--- a/public/language/ms/user.json
+++ b/public/language/ms/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Buka pautan luar di tab yang baru",
     "enable_topic_searching": "Aktifkan Pencarian Dalam-Topik",
     "topic_search_help": "Jika diaktifkan, pencarian dalam-topik akan membatalkan fungsi asal pencarian pelayan dan membenarkan anda untuk mencari seluruh topik, daripada menunjukkan apa yang terdapat pada skrin sahaja",
+    "delay_image_loading": "Delay Image Loading",
+    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
     "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Ikut topik yang anda balas",
-    "follow_topics_you_create": "Ikut topik yang anda buat",
-    "grouptitle": "Pilih nama kumpulan yang anda ingin tunjukkan",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Group Title",
     "no-group-title": "Tiada nama kumpulan",
     "select-skin": "Pilih skin",
     "select-homepage": "Pilih Laman Utama",
diff --git a/public/language/ms/users.json b/public/language/ms/users.json
index feb8d17edc..426f26a3e0 100644
--- a/public/language/ms/users.json
+++ b/public/language/ms/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Pengguna terkini",
     "top_posters": "Pengirim terbanyak",
     "most_reputation": "Reputasi terbaik",
+    "most_flags": "Most Flags",
     "search": "Cari",
     "enter_username": "Masukkan nama pengguna untuk carian",
     "load_more": "Muat lagi",
diff --git a/public/language/nb/email.json b/public/language/nb/email.json
index 4e542e97a7..6377d85fbf 100644
--- a/public/language/nb/email.json
+++ b/public/language/nb/email.json
@@ -24,6 +24,7 @@
     "digest.day": "day",
     "digest.week": "week",
     "digest.month": "month",
+    "digest.subject": "Digest for %1",
     "notif.chat.subject": "Ny samtalemelding mottatt fra %1",
     "notif.chat.cta": "Klikk her for å fortsette samtalen",
     "notif.chat.unsub.info": "Denne samtale-varselen ble sendt til deg basert på dine innstillinger for abonnering.",
diff --git a/public/language/nb/error.json b/public/language/nb/error.json
index 773e406837..c49ab8f47b 100644
--- a/public/language/nb/error.json
+++ b/public/language/nb/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Ugyldig passord",
     "invalid-username-or-password": "Vennligst spesifiser både et brukernavn og passord",
     "invalid-search-term": "Ugyldig søkeord",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "Brukernavn opptatt",
     "email-taken": "E-post opptatt",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "Dette forumet krever e-postbekreftelse, vennligst klikk her for å skrive inn en e-post",
     "email-confirm-failed": "Vi kunne ikke bekrefte e-posten din, vennligst prøv igjen senere.",
     "confirm-email-already-sent": "E-post for bekreftelse er allerede sendt, vennligst vent %1 minutt(er) for å sende en til.",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "Brukernavnet er for kort",
     "username-too-long": "Brukernavnet er for langt",
     "password-too-long": "Password too long",
     "user-banned": "Bruker utestengt",
     "user-too-new": "Beklager, du må vente %1 sekund(er) før du oppretter ditt første innlegg",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "Kategorien eksisterer ikke",
     "no-topic": "Emne eksisterer ikke",
     "no-post": "Innlegg eksisterer ikke",
@@ -38,6 +41,19 @@
     "category-disabled": "Kategori deaktivert",
     "topic-locked": "Emne låst",
     "post-edit-duration-expired": "Du har bare lov til å redigere innlegg i %1 sekund(er) etter at det er sendt",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Vennligst skriv et lengre innlegg. Innlegg må inneholde minst %1 tegn.",
     "content-too-long": "Vennligst skriv et kortere innlegg. Innlegg kan ikke være lengre enn %1 tegn.",
     "title-too-short": "Vennligst skriv en lengre tittel. Titler må inneholde minst %1 tegn.",
@@ -55,10 +71,12 @@
     "already-unfavourited": "You have already unbookmarked this post",
     "cant-ban-other-admins": "Du kan ikke utestenge andre administratorer!",
     "cant-remove-last-admin": "Du er den eneste administratoren. Legg til en annen bruker som administrator før du fjerner deg selv.",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Ugyldig bildetype. Tilatte typer er: %1",
     "invalid-image-extension": "Ugyldig bildefiltype",
     "invalid-file-type": "Ugyldig filtype. Tillatte typer er: %1",
     "group-name-too-short": "Gruppenavnet er for kort",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Gruppe eksisterer allerede",
     "group-name-change-not-allowed": "Endring av gruppenavn er ikke tillatt",
     "group-already-member": "Already part of this group",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "You are not allowed to edit this message",
     "cant-remove-last-user": "You can't remove the last user",
     "cant-delete-chat-message": "You are not allowed to delete this message",
+    "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Ryktesystemet er deaktivert.",
     "downvoting-disabled": "Nedstemming er deaktivert",
     "not-enough-reputation-to-downvote": "Du har ikke nok rykte til å nedstemme det innlegget",
@@ -99,5 +118,6 @@
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
     "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "You can't kick yourself from the group",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/nb/login.json b/public/language/nb/login.json
index 785a7defc4..cdf5766265 100644
--- a/public/language/nb/login.json
+++ b/public/language/nb/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Husk meg?",
     "forgot_password": "Glemt passord?",
     "alternative_logins": "Alternativ innlogging",
-    "failed_login_attempt": "Mislykket innloggingsforsøk, vennligst prøv igjen.",
+    "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Du har blitt logget inn!",
     "dont_have_account": "Har du ikke en konto?"
 }
\ No newline at end of file
diff --git a/public/language/nb/modules.json b/public/language/nb/modules.json
index a25a971028..6b3309287d 100644
--- a/public/language/nb/modules.json
+++ b/public/language/nb/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Send og lås",
     "composer.toggle_dropdown": "Veksle nedtrekksfelt",
     "composer.uploading": "Uploading %1",
+    "composer.formatting.bold": "Bold",
+    "composer.formatting.italic": "Italic",
+    "composer.formatting.list": "List",
+    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Picture",
+    "composer.upload-picture": "Upload Image",
+    "composer.upload-file": "Upload File",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Avbryt",
     "bootbox.confirm": "Bekreft",
diff --git a/public/language/nb/pages.json b/public/language/nb/pages.json
index cda5867418..224d00b617 100644
--- a/public/language/nb/pages.json
+++ b/public/language/nb/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Brukere med flest innlegg",
     "users/sort-reputation": "Brukere med best rykte",
     "users/banned": "Banned Users",
+    "users/most-flags": "Most flagged users",
     "users/search": "Brukersøk",
     "notifications": "Varsler",
     "tags": "Emneord",
diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json
index 3e37dc2ba7..f214fd1bd7 100644
--- a/public/language/nb/topic.json
+++ b/public/language/nb/topic.json
@@ -26,12 +26,13 @@
     "tools": "Verktøy",
     "flag": "Rapporter",
     "locked": "Låst",
-    "bookmark_instructions": "Klikk her for å returnere til siste uleste emne i denne tråden.",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Rapporter dette innlegget for granskning",
     "flag_success": "Dette innlegget har blitt rapportert.",
     "deleted_message": "Dette emnet har blitt slettet. Bare brukere med emnehåndterings-privilegier kan se den.",
     "following_topic.message": "Du vil nå motta varsler når noen skriver i denne tråden.",
     "not_following_topic.message": "Du vil ikke lenger motta varsler fra denne tråden.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "Vennligst registrer deg eller logg inn for å abonnere på denne tråden.",
     "markAsUnreadForAll.success": "Tråd markert som ulest for alle.",
     "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
     "watch.title": "Bli varslet om nye svar i dette emnet",
     "unwatch.title": "Slutt å overvåke dette emnet",
     "share_this_post": "Del ditt innlegg",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "Emneverktøy",
     "thread_tools.markAsUnreadForAll": "Marker som ulest",
     "thread_tools.pin": "Fest tråd",
diff --git a/public/language/nb/unread.json b/public/language/nb/unread.json
index f36bd28af3..c22af54291 100644
--- a/public/language/nb/unread.json
+++ b/public/language/nb/unread.json
@@ -6,5 +6,8 @@
     "selected": "Valgte",
     "all": "Alle",
     "all_categories": "Alle kategorier",
-    "topics_marked_as_read.success": "Emner merket som lest!"
+    "topics_marked_as_read.success": "Emner merket som lest!",
+    "all-topics": "All Topics",
+    "new-topics": "New Topics",
+    "watched-topics": "Watched Topics"
 }
\ No newline at end of file
diff --git a/public/language/nb/user.json b/public/language/nb/user.json
index 48cc0e0359..3082f7ef9f 100644
--- a/public/language/nb/user.json
+++ b/public/language/nb/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Åpne utgående lenker i en ny fane",
     "enable_topic_searching": "Aktiver søk-i-emne",
     "topic_search_help": "Hvis søk-i-emne er aktivert, overstyres nettleserens standard sidesøk og gir mulighet til å søke gjennom hele emnet, ikke bare det som vises på skjermen",
+    "delay_image_loading": "Delay Image Loading",
+    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
     "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Følg emner du besvarer",
-    "follow_topics_you_create": "Følg emner du oppretter",
-    "grouptitle": "Velg gruppetittelen du vil vise",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Group Title",
     "no-group-title": "Ingen gruppetittel",
     "select-skin": "Velg et skin",
     "select-homepage": "Select a Homepage",
diff --git a/public/language/nb/users.json b/public/language/nb/users.json
index 0cfb6f31fa..c491a4d7e2 100644
--- a/public/language/nb/users.json
+++ b/public/language/nb/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Seneste brukere",
     "top_posters": "Flest innlegg",
     "most_reputation": "Best rykte",
+    "most_flags": "Most Flags",
     "search": "Søk",
     "enter_username": "Skriv ett brukernavn for å søke",
     "load_more": "Last flere",
diff --git a/public/language/nl/email.json b/public/language/nl/email.json
index 829ad4fcdc..c010b77769 100644
--- a/public/language/nl/email.json
+++ b/public/language/nl/email.json
@@ -24,6 +24,7 @@
     "digest.day": "dag",
     "digest.week": "week",
     "digest.month": "maand",
+    "digest.subject": "Samenvatting voor %1",
     "notif.chat.subject": "Nieuw chatbericht van %1",
     "notif.chat.cta": "Klik hier om het gesprek te hervatten",
     "notif.chat.unsub.info": "Deze notificatie is verzonden vanwege de gebruikersinstellingen voor abonnementen.",
diff --git a/public/language/nl/error.json b/public/language/nl/error.json
index 9b6c912a23..ba9d00c3cb 100644
--- a/public/language/nl/error.json
+++ b/public/language/nl/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Ongeldig wachtwoord",
     "invalid-username-or-password": "Geef zowel een gebruikersnaam als wachtwoord op",
     "invalid-search-term": "Ongeldig zoekterm",
+    "csrf-invalid": "We konden u niet aanmelden, waarschijnlijk door een verlopen sessie. Probeer het a.u.b. nogmaals.",
     "invalid-pagination-value": "Invalide paginering waarde. De waarde moet op z'n minst %1 zijn en niet hoger dan %2 zijn.",
     "username-taken": "Gebruikersnaam is al in gebruik ",
     "email-taken": "E-mailadres is al in gebruik",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "Dit berichtenforum vereist bevestiging per e-mail, klik hier om een e-mailadres te registreren",
     "email-confirm-failed": "Helaas kon het e-mailadres niet bevestigd worden, probeer het later nog eens.",
     "confirm-email-already-sent": "Bevestigingsmail is zojuist al verzonden, wacht alsjeblieft %1 minuut (minuten) voordat je opnieuw een bevestigingsmail aanvraagt.",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "Gebruikersnaam is te kort",
     "username-too-long": "Gebruikersnaam is te lang",
     "password-too-long": "Wachtwoord is te lang",
     "user-banned": "Gebruiker verbannen",
     "user-too-new": "Helaas, het is een vereiste om %1 seconde(n) te wachten voordat het eerste bericht geplaatst kan worden.",
     "blacklisted-ip": "Sorry, uw IP-adres is verbannen uit deze community. Als u meent dat dit onterecht is, neem dan contact op met een beheerder.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "Categorie bestaat niet",
     "no-topic": "Onderwerp bestaat niet",
     "no-post": "Bericht bestaat niet",
@@ -38,6 +41,19 @@
     "category-disabled": "Categorie uitgeschakeld",
     "topic-locked": "Onderwerp gesloten",
     "post-edit-duration-expired": "Het is slechts toegestaan om binnen %1 seconde(n) na plaatsen van het bericht, deze te bewerken.",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Geef wat meer inhoud aan een bericht! Berichten dienen uit minimaal %1 teken(s) te bestaan.",
     "content-too-long": "Kort het bericht wat in, het aantal gebruikte tekens overschrijdt het ingestelde limiet want berichten mogen niet meer dan %1 teken(s) bevatten.",
     "title-too-short": "Geef een titel op die uit meer tekens bestaat. Titels dienen ten minste uit %1 teken(s) te bestaan.",
@@ -55,10 +71,12 @@
     "already-unfavourited": "Je hebt dit bericht al verwijderd uit je favorieten",
     "cant-ban-other-admins": "Het is niet toegestaan andere beheerders te verbannen!",
     "cant-remove-last-admin": "Je bent de enige beheerder. Stel eerst een andere gebruiker als beheerder in voordat je jezelf geen beheerder meer maakt.",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Ongeldig bestandstype afbeelding. Deze afbeelding is van een bestandstype dat niet ondersteund wordt. Toegestane bestandstypes voor afbeeldingsbestanden zijn: %1",
     "invalid-image-extension": "Ongeldig bestandstype afbeelding",
     "invalid-file-type": "Dit bestandstype wordt niet ondersteund. Toegestane bestandstypen zijn: %1",
     "group-name-too-short": "De groepsnaam is te kort",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Een groep met deze naam bestaat al",
     "group-name-change-not-allowed": "Het aanpassen van de groepsnaam is niet toegestaan",
     "group-already-member": "Deze gebruiker is al lid van deze groep",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "Het is niet toegestaan om dit bericht aan te passen",
     "cant-remove-last-user": "Je kan de laatste gebruiker niet verwijderen",
     "cant-delete-chat-message": "Het is niet toegestaan om dit bericht te verwijderen",
+    "already-voting-for-this-post": "Je hebt al gestemd voor deze post.",
     "reputation-system-disabled": "Reputatie systeem is uitgeschakeld.",
     "downvoting-disabled": "Negatief stemmen is uitgeschakeld",
     "not-enough-reputation-to-downvote": "Je hebt onvoldoende reputatie om een negatieve stem uit te mogen brengen",
@@ -99,5 +118,6 @@
     "no-session-found": "Geen login sessie gevonden!",
     "not-in-room": "Gebruiker niet in de chat",
     "no-users-in-room": "Er zijn geen gebruikers in deze chat",
-    "cant-kick-self": "Je kunt jezelf niet uit een groep schoppen"
+    "cant-kick-self": "Je kunt jezelf niet uit een groep schoppen",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/nl/groups.json b/public/language/nl/groups.json
index 2bf421bd5b..e146a2d29c 100644
--- a/public/language/nl/groups.json
+++ b/public/language/nl/groups.json
@@ -41,7 +41,7 @@
     "details.hidden": "Niet getoond",
     "details.hidden_help": "Indien geactiveerd zal deze groep niet getoond worden in de groepslijst en zullen gebruikers handmatig uitgenodigd moeten worden.",
     "details.delete_group": "Groep verwijderen",
-    "details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
+    "details.private_system_help": "Private groepen zijn op systeemniveau uitgeschakeld, deze optie doet niets.",
     "event.updated": "Groepsdetails zijn bijgewerkt",
     "event.deleted": "De groep \"%1\" is verwijderd",
     "membership.accept-invitation": "Uitnodiging accepteren",
diff --git a/public/language/nl/login.json b/public/language/nl/login.json
index 9b84acdc8a..88ffdf3196 100644
--- a/public/language/nl/login.json
+++ b/public/language/nl/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Aangemeld blijven?",
     "forgot_password": "Wachtwoord vergeten?",
     "alternative_logins": "Andere manieren van aanmelden",
-    "failed_login_attempt": "Aanmelden niet geslaagd. Probeer het nog eens.",
+    "failed_login_attempt": "Aanmelden mislukt",
     "login_successful": "Je bent succesvol ingelogd!",
     "dont_have_account": "Geen gebruikersaccount?"
 }
\ No newline at end of file
diff --git a/public/language/nl/modules.json b/public/language/nl/modules.json
index dd7de3cc62..9210bfd177 100644
--- a/public/language/nl/modules.json
+++ b/public/language/nl/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Bericht plaatsen en sluiten",
     "composer.toggle_dropdown": "Keuzelijst schakelen",
     "composer.uploading": "Uploaden van %1",
+    "composer.formatting.bold": "Vet",
+    "composer.formatting.italic": "Cursief",
+    "composer.formatting.list": "Lijst",
+    "composer.formatting.strikethrough": "Doorhalen",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Afbeelding",
+    "composer.upload-picture": "Upload afbeelding",
+    "composer.upload-file": "Upload bestand",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Annuleren",
     "bootbox.confirm": "Bevestig",
diff --git a/public/language/nl/pages.json b/public/language/nl/pages.json
index 96f5f11a38..8be4008d95 100644
--- a/public/language/nl/pages.json
+++ b/public/language/nl/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Gebruikers met de meeste berichten",
     "users/sort-reputation": "Gebruikers met de meeste reputatie",
     "users/banned": "Verbannen Gebruikers",
+    "users/most-flags": "Most flagged users",
     "users/search": "Zoek Gebruiker",
     "notifications": "Notificaties",
     "tags": "Tags",
diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json
index 5bff87a78c..a680adcb46 100644
--- a/public/language/nl/topic.json
+++ b/public/language/nl/topic.json
@@ -26,12 +26,13 @@
     "tools": "Extra",
     "flag": "Markeren",
     "locked": "Gesloten",
-    "bookmark_instructions": "Klik hier om naar het nieuwste ongelezen bericht te gaan.",
+    "bookmark_instructions": "Klik hier om terug te keren naar de laatst gelezen post in deze thread.",
     "flag_title": "Bericht aan beheerders melden",
     "flag_success": "Dit bericht is gerapporteerd aan de beheerder.",
     "deleted_message": "Dit onderwerp is verwijderd. Alleen gebruikers met beheerrechten op onderwerpniveau kunnen dit inzien.",
     "following_topic.message": "Vanaf nu worden meldingen ontvangen zodra iemand een reactie op dit onderwerp geeft.",
     "not_following_topic.message": "Je ontvangt geen notificaties meer over dit onderwerp.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "Log in or registreer om dit onderwerp te volgen.",
     "markAsUnreadForAll.success": "Onderwerp is voor iedereen als ongelezen gemarkeerd.",
     "mark_unread": "Ongelezen markeren",
@@ -41,6 +42,12 @@
     "watch.title": "Krijg meldingen van nieuwe reacties op dit onderwerp",
     "unwatch.title": "Dit onderwerp niet langer volgen",
     "share_this_post": "Deel dit bericht",
+    "watching": "Gevolgd",
+    "not-watching": "Niet gevolgd",
+    "ignoring": "Genegeerd",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "Acties",
     "thread_tools.markAsUnreadForAll": "Ongelezen markeren",
     "thread_tools.pin": "Onderwerp vastpinnen",
diff --git a/public/language/nl/unread.json b/public/language/nl/unread.json
index 4a5fc11558..d5bed309e4 100644
--- a/public/language/nl/unread.json
+++ b/public/language/nl/unread.json
@@ -6,5 +6,8 @@
     "selected": "Geselecteerd",
     "all": "Alles",
     "all_categories": "Alle categorieën",
-    "topics_marked_as_read.success": "Onderwerp gemarkeerd als gelezen!"
+    "topics_marked_as_read.success": "Onderwerp gemarkeerd als gelezen!",
+    "all-topics": "Alle onderwerpen",
+    "new-topics": "Nieuwe onderwerpen",
+    "watched-topics": "Bekeken onderwerpen"
 }
\ No newline at end of file
diff --git a/public/language/nl/uploads.json b/public/language/nl/uploads.json
index 1622cb5693..c59223164d 100644
--- a/public/language/nl/uploads.json
+++ b/public/language/nl/uploads.json
@@ -1,6 +1,6 @@
 {
-    "uploading-file": "Uploading the file...",
-    "select-file-to-upload": "Select a file to upload!",
-    "upload-success": "File uploaded successfully!",
-    "maximum-file-size": "Maximum %1 kb"
+    "uploading-file": "Bestand word geüpload...",
+    "select-file-to-upload": "Selecteer een bestand om te uploaden!",
+    "upload-success": "Bestand succesvol geüpload!",
+    "maximum-file-size": "Maximaal %1 kb"
 }
\ No newline at end of file
diff --git a/public/language/nl/user.json b/public/language/nl/user.json
index 70d646156b..cba88cc077 100644
--- a/public/language/nl/user.json
+++ b/public/language/nl/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Open uitgaande links naar een externe site in een nieuw tabblad",
     "enable_topic_searching": "Inschakelen mogelijkheid op onderwerp te kunnen zoeken",
     "topic_search_help": "Wanneer ingeschakeld zal de standaard zoekfunctie, met een aangepaste methode voor onderwerpen, overschreven worden",
+    "delay_image_loading": "Afbeeldingen Laden Uitstellen",
+    "image_load_delay_help": "Indien ingeschakeld zullen afbeeldingen in topics niet laden totdat ze het scherm inscrollen",
     "scroll_to_my_post": "Toon het nieuwe bericht na het plaatsen van een antwoord",
-    "follow_topics_you_reply_to": "Volg de onderwerpen waarop ik gereageerd heb",
-    "follow_topics_you_create": "Volg de onderwerpen waarvan ik de oorspronkelijke auteur ben",
-    "grouptitle": "Selecteer de groepstitel voor weergave",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Groepstitel",
     "no-group-title": "Geen groepstitel",
     "select-skin": "Selecteer een skin",
     "select-homepage": "Selecteer een startpagina",
diff --git a/public/language/nl/users.json b/public/language/nl/users.json
index 03dcb21bbb..eb8ba2c2ae 100644
--- a/public/language/nl/users.json
+++ b/public/language/nl/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Laatste gebruikers",
     "top_posters": "Meest actieve leden",
     "most_reputation": "Meeste reputatie",
+    "most_flags": "Most Flags",
     "search": "Zoeken",
     "enter_username": "Vul een gebruikersnaam in om te zoeken",
     "load_more": "Meer laden...",
diff --git a/public/language/pl/category.json b/public/language/pl/category.json
index bda340c895..7519a5060c 100644
--- a/public/language/pl/category.json
+++ b/public/language/pl/category.json
@@ -10,7 +10,7 @@
     "share_this_category": "Udostępnij tę kategorię",
     "watch": "Obserwuj",
     "ignore": "Ignoruj",
-    "watch.message": "Obserwujesz teraz aktualizacje tej kategorii",
-    "ignore.message": "Ignorujesz teraz aktualizacje tej kategorii",
+    "watch.message": "Obserwujesz teraz uaktualnienia z tej kategorii",
+    "ignore.message": "Ignorujesz teraz uaktualnienia z tej kategorii",
     "watched-categories": "Obserwowane kategorie"
 }
\ No newline at end of file
diff --git a/public/language/pl/email.json b/public/language/pl/email.json
index c33233781e..5146cc5cd2 100644
--- a/public/language/pl/email.json
+++ b/public/language/pl/email.json
@@ -21,9 +21,10 @@
     "digest.cta": "Kliknij, by odwiedzić %1",
     "digest.unsub.info": "To podsumowanie zostało wysłane zgodnie z Twoimi ustawieniami.",
     "digest.no_topics": "Nie było żadnych aktywnych tematów w ciągu ostatnich %1",
-    "digest.day": "day",
-    "digest.week": "week",
-    "digest.month": "month",
+    "digest.day": "dzień",
+    "digest.week": "tydzień",
+    "digest.month": "miesiąc",
+    "digest.subject": "Digest for %1",
     "notif.chat.subject": "Nowa wiadomość czatu od %1",
     "notif.chat.cta": "Kliknij tutaj, by kontynuować konwersację",
     "notif.chat.unsub.info": "To powiadomienie o czacie zostało Ci wysłane zgodnie z ustawieniami Twojego konta.",
diff --git a/public/language/pl/error.json b/public/language/pl/error.json
index 196a9e6c77..98a2b56a91 100644
--- a/public/language/pl/error.json
+++ b/public/language/pl/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Błędne Hasło",
     "invalid-username-or-password": "Proszę podać nazwę użytkownika i hasło",
     "invalid-search-term": "Błędne wyszukiwane wyrażenie",
+    "csrf-invalid": "Nie mogliśmy Cię zalogować. Zapewne przyczyną jest wygasła sesja. Proszę spróbuj ponownie.",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "Login zajęty",
     "email-taken": "Email zajęty",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "To forum wymaga weryfikacji przez email. Proszę kliknąć tutaj, aby wprowadzić adres.",
     "email-confirm-failed": "Nie byliśmy w stanie potwierdzić twojego email-a. Proszę spróbować później.",
     "confirm-email-already-sent": "Email potwierdzający został już wysłany, proszę odczekaj jeszcze %1 minut(y), aby wysłać kolejny.",
+    "sendmail-not-found": "Program sendmail nie został znaleziony, proszę upewnij się, że jest zainstalowany i możliwy do uruchomienia przez użytkownika uruchamiającego NodeBB.",
     "username-too-short": "Nazwa użytkownika za krótka",
     "username-too-long": "Zbyt długa nazwa użytkownika",
-    "password-too-long": "Password too long",
+    "password-too-long": "Hasło jest za długie",
     "user-banned": "Użytkownik zbanowany",
     "user-too-new": "Przepraszamy, musisz odczekać %1 sekund(y) przed utworzeniem pierwszego posta",
-    "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "blacklisted-ip": "Twój adres IP został zablokowany na tej społeczności. Jeśli uważasz to za błąd, zgłoś to administratorowi",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "Kategoria nie istnieje",
     "no-topic": "Temat nie istnieje",
     "no-post": "Post nie istnieje",
@@ -38,6 +41,19 @@
     "category-disabled": "Kategoria wyłączona.",
     "topic-locked": "Temat Zablokowany",
     "post-edit-duration-expired": "Możesz edytować posty tylko przez %1 sekund(y) po ich napisaniu",
+    "post-edit-duration-expired-minutes": "Możesz edytować posty tylko przez %1 minut(y) po ich napisaniu",
+    "post-edit-duration-expired-minutes-seconds": "Możesz edytować posty tylko przez %1 minut(y) i %2 sekund(y) po ich napisaniu",
+    "post-edit-duration-expired-hours": "Możesz edytować posty tylko przez %1 godzin(y) po ich napisaniu",
+    "post-edit-duration-expired-hours-minutes": "Możesz edytować posty tylko przez %1 godzin(y) i %2 minut(y) po ich napisaniu",
+    "post-edit-duration-expired-days": "Możesz edytować posty tylko przez %1 dzień (dni) po ich napisaniu",
+    "post-edit-duration-expired-days-hours": "Możesz edytować posty tylko przez %1 dzień (dni) i %2 godzin(y) po ich napisaniu",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Prosimy wpisać dłuższy post. Posty powinny zawierać co najmniej %1 znaków.",
     "content-too-long": "Prosimy wpisać krótszy post. Posty nie mogą zawierać więcej niż %1 znaków.",
     "title-too-short": "Prosimy podać dłuższy tytuł. Tytuły powinny zawierać co najmniej %1 znaków.",
@@ -55,14 +71,16 @@
     "already-unfavourited": "You have already unbookmarked this post",
     "cant-ban-other-admins": "Nie możesz zbanować innych adminów!",
     "cant-remove-last-admin": "Jesteś jedynym administratorem. Dodaj innego użytkownika jako administratora przed usunięciem siebie z tej grupy",
+    "cant-delete-admin": "Usuń uprawnienia administratora z tego konta przed próbą jego usunięcia.",
     "invalid-image-type": "Błędny typ obrazka. Dozwolone typy to: %1",
     "invalid-image-extension": "Błędne rozszerzenie pliku",
     "invalid-file-type": "Błędny typ pliku. Dozwolone typy to: %1",
     "group-name-too-short": "Nazwa grupy za krótka",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Grupa już istnieje",
     "group-name-change-not-allowed": "Nie można zmieniać nazwy tej grupy.",
-    "group-already-member": "Already part of this group",
-    "group-not-member": "Not a member of this group",
+    "group-already-member": "Już jesteś członkiem tej grupy",
+    "group-not-member": "Nie jesteś członkiem tej grupy",
     "group-needs-owner": "Ta grupa musi mieć przynajmniej jednego właściciela",
     "group-already-invited": "Ten użytkownik został już zaproszony",
     "group-already-requested": "Twoje podanie o członkostwo zostało już wysłane",
@@ -78,13 +96,14 @@
     "about-me-too-long": "Przepraszamy, twoja informacja o sobie nie może być dłuższa niż %1 znaków.",
     "cant-chat-with-yourself": "Nie możesz rozmawiać sam ze sobą!",
     "chat-restricted": "Ten użytkownik ograniczył swoje rozmowy. Musi cię śledzić, aby kontakt z nim był możliwy",
-    "chat-disabled": "Chat system disabled",
+    "chat-disabled": "System rozmów jest wyłączony",
     "too-many-messages": "Wysłałeś zbyt wiele wiadomości, prosimy chwilę poczekać.",
     "invalid-chat-message": "Nieprawidłowa wiadomość",
     "chat-message-too-long": "Wiadomość jest zbyt długa",
-    "cant-edit-chat-message": "You are not allowed to edit this message",
+    "cant-edit-chat-message": "Nie jesteś upoważniony do edycji tej wiadomości",
     "cant-remove-last-user": "You can't remove the last user",
-    "cant-delete-chat-message": "You are not allowed to delete this message",
+    "cant-delete-chat-message": "Nie jesteś upoważniony do usunięcia tej wiadomości",
+    "already-voting-for-this-post": "Już zagłosowałeś na ten post",
     "reputation-system-disabled": "System reputacji jest wyłączony.",
     "downvoting-disabled": "Negatywna ocena postów jest wyłączona",
     "not-enough-reputation-to-downvote": "Masz za mało reputacji, aby negatywnie ocenić ten post",
@@ -95,9 +114,10 @@
     "parse-error": "Coś poszło nie tak podczas przetwarzania odpowiedzi serwera",
     "wrong-login-type-email": "Zaloguj się używając adresu email",
     "wrong-login-type-username": "Zaloguj się używając nazwy użytkownika",
-    "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
-    "no-session-found": "No login session found!",
-    "not-in-room": "User not in room",
-    "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "invite-maximum-met": "Zaprosiłeś maksymalną ilość osób (%1 z %2).",
+    "no-session-found": "Nie znaleziono sesji logowania",
+    "not-in-room": "Użytkownik nie jest w pokoju",
+    "no-users-in-room": "Brak użytkowników w pokoju",
+    "cant-kick-self": "Nie możesz wyrzucić samego siebie z grupy",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/pl/global.json b/public/language/pl/global.json
index 2aba9da79d..24825d2e75 100644
--- a/public/language/pl/global.json
+++ b/public/language/pl/global.json
@@ -49,7 +49,7 @@
     "users": "Użytkownicy",
     "topics": "Tematy",
     "posts": "Posty",
-    "best": "Best",
+    "best": "Najlepsze",
     "upvoted": "Upvoted",
     "downvoted": "Downvoted",
     "views": "wyświetleń",
@@ -65,7 +65,7 @@
     "posted_in_ago_by": "wysłany w %1 %2 przez %3",
     "user_posted_ago": "%1 wysłał %2",
     "guest_posted_ago": "Gość wysłał %1",
-    "last_edited_by": "last edited by %1",
+    "last_edited_by": "ostatnio edytowany przez %1",
     "norecentposts": "Brak ostatnich postów",
     "norecenttopics": "Brak Ostatnich Tematów",
     "recentposts": "Ostatnie posty",
@@ -81,14 +81,14 @@
     "updated.title": "Forum zaktualizowane",
     "updated.message": "To forum zostało zaktualizowane do najnowszej wersji. Kliknij tutaj by odświeżyć stronę",
     "privacy": "Prywatność",
-    "follow": "Obserwuj",
+    "follow": "Śledź",
     "unfollow": "Przestań śledzić",
     "delete_all": "Usuń wszystko",
     "map": "Mapa",
-    "sessions": "Login Sessions",
-    "ip_address": "IP Address",
-    "enter_page_number": "Enter page number",
-    "upload_file": "Upload file",
-    "upload": "Upload",
-    "allowed-file-types": "Allowed file types are %1"
+    "sessions": "Sesje logowania",
+    "ip_address": "Adres IP",
+    "enter_page_number": "Wpisz numer strony",
+    "upload_file": "Załaduj plik",
+    "upload": "Załaduj",
+    "allowed-file-types": "Dozwolone typy plików %1"
 }
\ No newline at end of file
diff --git a/public/language/pl/groups.json b/public/language/pl/groups.json
index 845409bb43..8fdb1b3f9b 100644
--- a/public/language/pl/groups.json
+++ b/public/language/pl/groups.json
@@ -41,7 +41,7 @@
     "details.hidden": "Ukryty",
     "details.hidden_help": "Jeśli aktywowane, ta grupa nie będzie widoczna w wykazie grup, a użytkownicy będą musieli być zapraszani manualnie.",
     "details.delete_group": "Usuń Grupę",
-    "details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
+    "details.private_system_help": "Prywatne grupy zostały zablokowane w systemie, ta opcja nic nie zmienia.",
     "event.updated": "Dane grupy zostały zaktualizowane",
     "event.deleted": "Grupa \"%1\" została skasowana",
     "membership.accept-invitation": "Przyjmij Zaproszenie",
@@ -50,5 +50,5 @@
     "membership.leave-group": "Opuść Grupę",
     "membership.reject": "Odrzuć",
     "new-group.group_name": "Nazwa Grupy:",
-    "upload-group-cover": "Upload group cover"
+    "upload-group-cover": "Załaduj zdjęcie tła grupy"
 }
\ No newline at end of file
diff --git a/public/language/pl/modules.json b/public/language/pl/modules.json
index ea0d3c2c10..1a9902604b 100644
--- a/public/language/pl/modules.json
+++ b/public/language/pl/modules.json
@@ -6,9 +6,9 @@
     "chat.user_typing": "%1 pisze...",
     "chat.user_has_messaged_you": "%1 napisał do Ciebie",
     "chat.see_all": "Zobacz wszystkie rozmowy",
-    "chat.mark_all_read": "Mark all chats read",
+    "chat.mark_all_read": "Oznacz wszystkie rozmowy jako przeczytane",
     "chat.no-messages": "Wybierz odbiorcę, by wyświetlić historię rozmów.",
-    "chat.no-users-in-room": "No users in this room",
+    "chat.no-users-in-room": "Brak użytkowników w tym pokoju",
     "chat.recent-chats": "Ostatnie rozmowy",
     "chat.contacts": "Kontakty",
     "chat.message-history": "Historia wiadomości",
@@ -17,7 +17,7 @@
     "chat.seven_days": "7 dni",
     "chat.thirty_days": "30 dni",
     "chat.three_months": "3 miesiące",
-    "chat.delete_message_confirm": "Are you sure you wish to delete this message?",
+    "chat.delete_message_confirm": "Jesteś pewny, że chcesz usunąć tą wiadomość?",
     "chat.roomname": "Chat Room %1",
     "chat.add-users-to-room": "Add users to room",
     "composer.compose": "Twórz",
@@ -28,11 +28,19 @@
     "composer.discard": "Na pewno chcesz porzucić ten post?",
     "composer.submit_and_lock": "Prześlij i Zablokuj",
     "composer.toggle_dropdown": "Przełącz Listę Rozwijaną",
-    "composer.uploading": "Uploading %1",
+    "composer.uploading": "Wysyłanie %1",
+    "composer.formatting.bold": "Pogrubienie",
+    "composer.formatting.italic": "Pochylenie",
+    "composer.formatting.list": "Lista",
+    "composer.formatting.strikethrough": "Przekreślenie",
+    "composer.formatting.link": "Odnośnik",
+    "composer.formatting.picture": "Obraz",
+    "composer.upload-picture": "Wyślij obraz",
+    "composer.upload-file": "Wyślij plik",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Anuluj",
     "bootbox.confirm": "Potwierdź",
-    "cover.dragging_title": "Cover Photo Positioning",
-    "cover.dragging_message": "Drag the cover photo to the desired position and click \"Save\"",
-    "cover.saved": "Cover photo image and position saved"
+    "cover.dragging_title": "Pozycjonowanie tła",
+    "cover.dragging_message": "Przeciągnij i upuść zdjęcie na żądanym miejscu, po zakończeniu kliknij \"Zapisz\"",
+    "cover.saved": "Tło zapisane"
 }
\ No newline at end of file
diff --git a/public/language/pl/notifications.json b/public/language/pl/notifications.json
index 5873b93a47..e049560a7d 100644
--- a/public/language/pl/notifications.json
+++ b/public/language/pl/notifications.json
@@ -5,7 +5,7 @@
     "mark_all_read": "Oznacz wszystkie powiadomienia jako przeczytane",
     "back_to_home": "Wróć do %1",
     "outgoing_link": "Łącze wychodzące",
-    "outgoing_link_message": "You are now leaving %1",
+    "outgoing_link_message": "Opuszczasz %1",
     "continue_to": "Kontynuuj do %1",
     "return_to": "Wróć do %1",
     "new_notification": "Nowe powiadomienie",
@@ -14,23 +14,23 @@
     "upvoted_your_post_in": "<strong>%1</strong> zagłosował na Twój post w <strong>%2</strong>",
     "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
     "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
-    "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
-    "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
-    "favourited_your_post_in": "<strong>%1</strong> has bookmarked your post in <strong>%2</strong>.",
-    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have bookmarked your post in <strong>%3</strong>.",
-    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have bookmarked your post in <strong>%3</strong>.",
+    "moved_your_post": "<strong>%1</strong> przeniósł twoj post do <strong>%2</strong>",
+    "moved_your_topic": "<strong>%1</strong> przeniósł <strong>%2</strong>",
+    "favourited_your_post_in": "<strong>%1</strong> dodał do ulubionych twoj post w <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> oraz <strong>%2</strong> dodali do ulubionych twój post w <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> oraz %2 innych dodali do ulubionych twój post w <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1<strong> oflagował Twój post w <strong>%2</strong>",
-    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
-    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> oraz <strong>%2</strong> oflagowali post w <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> oraz %2 innych oflagowali post w <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> dodał odpowiedź do <strong>%2</strong>",
-    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
-    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> oraz <strong>%2</strong> dodali odpowiedzi do <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> oraz %2 innych dodali odpowiedzi do <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> wysłał nowy temat: <strong>%2</strong>",
-    "user_started_following_you": "<string>%1</strong> zaczął Cię śledzić.",
-    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
-    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
+    "user_started_following_you": "<string>%1</strong> zaczął obserwować ciebie.",
+    "user_started_following_you_dual": "<strong>%1</strong> oraz <strong>%2</strong> obserwuje ciebie.",
+    "user_started_following_you_multiple": "<strong>%1</strong> oraz %2 innych obserwuje ciebie.",
     "new_register": "<strong>%1</strong> wysłał żądanie rejestracji.",
-    "new_register_multiple": "There are <strong>%1</strong> registration requests awaiting review.",
+    "new_register_multiple": "Są <strong>%1</strong> nowe żądania rejestracji.",
     "email-confirmed": "E-mail potwierdzony",
     "email-confirmed-message": "Dziękujemy za potwierdzenie maila. Twoje konto zostało aktywowane.",
     "email-confirm-error-message": "Wystąpił problem przy aktywacji, - kod jest błędny lub przestarzały",
diff --git a/public/language/pl/pages.json b/public/language/pl/pages.json
index a9def8e4aa..5ea253c797 100644
--- a/public/language/pl/pages.json
+++ b/public/language/pl/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Użytkownicy z największą liczbą postów",
     "users/sort-reputation": "Użytkownicy z najwyższą reputacją",
     "users/banned": "Banned Users",
+    "users/most-flags": "Most flagged users",
     "users/search": "Wyszukiwanie Użytkownków",
     "notifications": "Powiadomienia",
     "tags": "Tagi",
@@ -33,14 +34,14 @@
     "account/posts": "Posty napisane przez %1",
     "account/topics": "Tematy stworzone przez %1",
     "account/groups": "Grupy %1",
-    "account/favourites": "%1's Bookmarked Posts",
+    "account/favourites": "%1 - ulubione posty",
     "account/settings": "Ustawienia Użytkownika",
     "account/watched": "Tematy obserwowane przez %1",
     "account/upvoted": "Posts upvoted by %1",
     "account/downvoted": "Posts downvoted by %1",
-    "account/best": "Best posts made by %1",
-    "confirm": "Email Confirmed",
+    "account/best": "Najlepsze posty od %1",
+    "confirm": "E-mail potwierdzony",
     "maintenance.text": "Obecnie trwają prace konserwacyjne nad %1. Proszę wrócić później.",
     "maintenance.messageIntro": "Dodatkowo, administrator zostawił wiadomość:",
-    "throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
+    "throttled.text": "%1 jest niedostępny z powodu obciążenia. Proszę wrócić później."
 }
\ No newline at end of file
diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json
index 974a61dd94..9aa7ce3929 100644
--- a/public/language/pl/topic.json
+++ b/public/language/pl/topic.json
@@ -26,21 +26,28 @@
     "tools": "Narzędzia",
     "flag": "Zgłoś",
     "locked": "Zablokowany",
-    "bookmark_instructions": "Kliknij tutaj, aby powrócic do ostatniego nieprzeczytanego postu w tym wątku.",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Zgłoś post do moderacji",
     "flag_success": "Ten post został oznaczony do moderacji.",
     "deleted_message": "Ten temat został skasowany. Tylko użytkownicy z uprawnieniami do zarządzania mogą go zobaczyć.",
     "following_topic.message": "Będziesz od teraz otrzymywał powiadomienia, gdy ktoś odpowie w tym temacie.",
     "not_following_topic.message": "Nie będziesz już otrzymywał powiadomień z tego tematu.",
+    "ignoring_topic.message": "Nie zobaczysz już tego tematu na liście nieprzeczytanych. Otrzymasz powiadomienie, kiedy zostaniesz wspomniany lub ktoś odda głos na twój post.",
     "login_to_subscribe": "Zaloguj się, aby subskrybować ten temat.",
     "markAsUnreadForAll.success": "Temat oznaczony jako nieprzeczytany dla wszystkich.",
-    "mark_unread": "Mark unread",
-    "mark_unread.success": "Topic marked as unread.",
+    "mark_unread": "Oznacz jako nieprzeczytany",
+    "mark_unread.success": "Temat oznaczony jako nieprzeczytany.",
     "watch": "Obserwuj",
     "unwatch": "Nie obserwuj",
     "watch.title": "Otrzymuj powiadomienia o nowych odpowiedziach w tym temacie",
     "unwatch.title": "Przestań obserwować ten temat",
     "share_this_post": "Udostępnij",
+    "watching": "Obserwuj",
+    "not-watching": "Nie obserwuj",
+    "ignoring": "Ignoruj",
+    "watching.description": "Powiadom mnie o nowych odpowiedziach<br/>Pokaż temat w nieprzeczytanych.",
+    "not-watching.description": "Nie informuj mnie o nowych odpowiedziach<br/>Pokaż temat w nieprzeczytanych, jeśli kategoria nie jest ignorowana.",
+    "ignoring.description": "Nie informuj mnie o nowych odpowiedziach<br/>Nie pokazuj tematu w nieprzeczytanych.",
     "thread_tools.title": "Narzędzia Tematu",
     "thread_tools.markAsUnreadForAll": "Oznacz jako nieprzeczytany",
     "thread_tools.pin": "Przypnij Temat",
@@ -65,9 +72,9 @@
     "disabled_categories_note": "Zablokowane kategorie zostały wyszarzone.",
     "confirm_move": "Przenieś",
     "confirm_fork": "Skopiuj",
-    "favourite": "Bookmark",
-    "favourites": "Bookmarks",
-    "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
+    "favourite": "Ulubione",
+    "favourites": "Ulubione",
+    "favourites.has_no_favourites": "Nie masz jeszcze ulubionych postów.",
     "loading_more_posts": "Załaduj więcej postów",
     "move_topic": "Przenieś Temat",
     "move_topics": "Przenieś Tematy",
@@ -78,7 +85,7 @@
     "fork_topic_instruction": "Zaznacz posty, które chcesz sklonować",
     "fork_no_pids": "Nie zaznaczyłeś żadnych postów!",
     "fork_success": "Udało się skopiować temat. Kliknij tutaj, aby do niego przejść.",
-    "delete_posts_instruction": "Click the posts you want to delete/purge",
+    "delete_posts_instruction": "Kliknij na posty, które chcesz usunąć",
     "composer.title_placeholder": "Wpisz tutaj tytuł tematu...",
     "composer.handle_placeholder": "Nazwa",
     "composer.discard": "Odrzuć",
@@ -101,12 +108,12 @@
     "newest_to_oldest": "Najpierw najnowsze",
     "most_votes": "Najwięcej głosów",
     "most_posts": "Najwięcej postów",
-    "stale.title": "Create new topic instead?",
+    "stale.title": "Stworzyć nowy temat?",
     "stale.warning": "The topic you are replying to is quite old. Would you like to create a new topic instead, and reference this one in your reply?",
-    "stale.create": "Create a new topic",
+    "stale.create": "Stwórz nowy temat",
     "stale.reply_anyway": "Reply to this topic anyway",
     "link_back": "Re: [%1](%2)",
     "spam": "Spam",
-    "offensive": "Offensive",
+    "offensive": "Obrażliwy",
     "custom-flag-reason": "Enter a flagging reason"
 }
\ No newline at end of file
diff --git a/public/language/pl/unread.json b/public/language/pl/unread.json
index dbee60d817..872ae755d1 100644
--- a/public/language/pl/unread.json
+++ b/public/language/pl/unread.json
@@ -6,5 +6,8 @@
     "selected": "Wybrane",
     "all": "Wszystkie",
     "all_categories": "Wszystkie kategorie",
-    "topics_marked_as_read.success": "Tematy zostały oznaczone jako przeczytane!"
+    "topics_marked_as_read.success": "Tematy zostały oznaczone jako przeczytane!",
+    "all-topics": "Wszystkie tematy",
+    "new-topics": "Nowe tematy",
+    "watched-topics": "Obserwowane tematy"
 }
\ No newline at end of file
diff --git a/public/language/pl/uploads.json b/public/language/pl/uploads.json
index 1622cb5693..f29dc364f2 100644
--- a/public/language/pl/uploads.json
+++ b/public/language/pl/uploads.json
@@ -1,6 +1,6 @@
 {
-    "uploading-file": "Uploading the file...",
-    "select-file-to-upload": "Select a file to upload!",
-    "upload-success": "File uploaded successfully!",
-    "maximum-file-size": "Maximum %1 kb"
+    "uploading-file": "Wysyłanie pliku...",
+    "select-file-to-upload": "Zaznacz plik do wgrania!",
+    "upload-success": "Pomyślnie załadowano plik!",
+    "maximum-file-size": "Maksymalna wielkość %1 kb"
 }
\ No newline at end of file
diff --git a/public/language/pl/user.json b/public/language/pl/user.json
index a5f79daab8..3dff926b77 100644
--- a/public/language/pl/user.json
+++ b/public/language/pl/user.json
@@ -22,25 +22,25 @@
     "profile": "Profil",
     "profile_views": "wyświetleń",
     "reputation": "reputacji",
-    "favourites": "Bookmarks",
+    "favourites": "Ulubione",
     "watched": "Obserwowane",
-    "followers": "Obserwujących",
-    "following": "Obserwowanych",
+    "followers": "Śledzących",
+    "following": "Śledzonych",
     "aboutme": "O mnie",
     "signature": "Sygnatura",
     "birthday": "Urodziny",
     "chat": "Rozmawiaj",
-    "chat_with": "Chat with %1",
+    "chat_with": "Rozmawiaj z %1",
     "follow": "Śledź",
     "unfollow": "Przestań śledzić",
     "more": "Więcej",
     "profile_update_success": "Profil został zaktualizowany pomyślnie!",
     "change_picture": "Zmień zdjęcie",
-    "change_username": "Change Username",
-    "change_email": "Change Email",
+    "change_username": "Zmień nazwę użytkownika",
+    "change_email": "Zmień adres e-mail",
     "edit": "Edytuj",
-    "edit-profile": "Edit Profile",
-    "default_picture": "Default Icon",
+    "edit-profile": "Edytuj profil",
+    "default_picture": "Domyślna ikona",
     "uploaded_picture": "Przesłane zdjęcie",
     "upload_new_picture": "Prześlij nowe zdjęcie",
     "upload_new_picture_from_url": "Wgraj zdjęcie z adresu URL",
@@ -56,11 +56,11 @@
     "password": "Hasło",
     "username_taken_workaround": "Wybrany login jest już zajęty, więc zmieniliśmy go trochę. Proponujemy  <strong>%1</strong>",
     "password_same_as_username": "Twoje hasło jest takie samo jak nazwa użytkownika, prosimy wybrać inne hasło.",
-    "password_same_as_email": "Your password is the same as your email, please select another password.",
+    "password_same_as_email": "Twoje hasło jest takie samo jak adres e-mail, prosimy wybrać inne hasło.",
     "upload_picture": "Prześlij zdjęcie",
     "upload_a_picture": "Prześlij zdjęcie",
     "remove_uploaded_picture": "Usuń Przesłane Zdjęcie",
-    "upload_cover_picture": "Upload cover picture",
+    "upload_cover_picture": "Prześlij zdjęcie tła",
     "settings": "Ustawienia",
     "show_email": "Wyświetlaj mój adres e-mail",
     "show_fullname": "Wyświetlaj moją pełną nazwę",
@@ -74,8 +74,8 @@
     "send_chat_notifications": "Wyślij e-maila, jeśli dostanę nową wiadomość, a nie jestem on-line",
     "send_post_notifications": "Wyślij email, kiedy w tematach, które subskrybuję pojawią się odpowiedzi",
     "settings-require-reload": "Niektóre zmiany ustawień wymagają przeładowania. Kliknij tutaj, aby przeładować stronę.",
-    "has_no_follower": "Ten użytkownik nie ma jeszcze żadnych obserwujących",
-    "follows_no_one": "Użytkownik jeszcze nikogo nie obsweruje.",
+    "has_no_follower": "Ten użytkownik nie ma jeszcze żadnych śledzących",
+    "follows_no_one": "Użytkownik jeszcze nikogo nie śledzi.",
     "has_no_posts": "Ten użytkownik nic jeszcze nie napisał.",
     "has_no_topics": "Ten użytkownik nie stworzył jeszcze żadnych tematów.",
     "has_no_watched_topics": "Ten użytkownik nie obserwuje jeszcze żadnych tematów.",
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Otwieraj linki wychodzące w nowej karcie",
     "enable_topic_searching": "Odblokuj szukanie w temacie",
     "topic_search_help": "Jeśli włączone, wyszukiwanie w tematach zastąpi przeglądarkowe przeszukiwanie strony i pozwoli na przeszukanie całego tematu, zamiast ograniczonej zawartości aktualnie wyświetlonej na ekranie",
-    "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Śledź tematy, na które odpowiadasz",
-    "follow_topics_you_create": "Śledź tematy, które tworzysz",
-    "grouptitle": "Wybierz tytuł grupy, który chcesz wyświetlać",
+    "delay_image_loading": "Opóźnienie ładowania zdjęcia",
+    "image_load_delay_help": "Jeśli włączone, zdjęcia w temacie nie załadują się dopóki nie najedzie się",
+    "scroll_to_my_post": "Po napisaniu odpowiedzi, wyświetl najnowsze posty",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Tytuł grupy",
     "no-group-title": "Brak tytułu grupy",
     "select-skin": "Wybierz Skórkę",
     "select-homepage": "Select a Homepage",
diff --git a/public/language/pl/users.json b/public/language/pl/users.json
index f21c62380a..59c58c8df7 100644
--- a/public/language/pl/users.json
+++ b/public/language/pl/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Nowi użytkownicy",
     "top_posters": "Najwięcej postów",
     "most_reputation": "Największa reputacja",
+    "most_flags": "Most Flags",
     "search": "Szukaj",
     "enter_username": "Wpisz wyszukiwaną nazwę użytkownika",
     "load_more": "Wczytaj Więcej",
@@ -16,5 +17,5 @@
     "unread_topics": "Nieprzeczytane Tematy",
     "categories": "Kategorie",
     "tags": "Tagi",
-    "no-users-found": "No users found!"
+    "no-users-found": "Nie znaleziono pasujących użytkowników!"
 }
\ No newline at end of file
diff --git a/public/language/pt_BR/email.json b/public/language/pt_BR/email.json
index c773f3236b..64ef3928a9 100644
--- a/public/language/pt_BR/email.json
+++ b/public/language/pt_BR/email.json
@@ -24,6 +24,7 @@
     "digest.day": "dia",
     "digest.week": "semana",
     "digest.month": "mês",
+    "digest.subject": "Resumo de %1",
     "notif.chat.subject": "Nova mensagem de chat recebida de %1",
     "notif.chat.cta": "Clique aqui para continuar a conversa",
     "notif.chat.unsub.info": "Esta notificação de chat foi enviada a você devido às suas configurações de assinatura.",
diff --git a/public/language/pt_BR/error.json b/public/language/pt_BR/error.json
index e681f5664f..be9e3d7492 100644
--- a/public/language/pt_BR/error.json
+++ b/public/language/pt_BR/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Senha Inválida",
     "invalid-username-or-password": "Por favor especifique ambos nome de usuário e senha",
     "invalid-search-term": "Termo de pesquisa inválido",
+    "csrf-invalid": "Nós não fomos capazes de logá-lo, provavelmente devido à uma sessão expirada. Por favor tente novamente.",
     "invalid-pagination-value": "Valor de paginação inválido, precisa ser entre no mínimo %1 e no máximo %2",
     "username-taken": "Nome de usuário já existe",
     "email-taken": "Email já cadastrado",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "Este fórum exige confirmação de email, por gentileza clique aqui para digitar um email",
     "email-confirm-failed": "Nós não pudemos confirmar seu email, por gentileza tente novamente mais tarde.",
     "confirm-email-already-sent": "O email de confirmação já foi enviado, por favor aguarde %1 minuto(s) para enviar outro.",
+    "sendmail-not-found": "O executável do sendmail não pôde ser encontrado, por favor se certifique de que ele está instalado e é executável pelo usuário que roda o NodeBB.",
     "username-too-short": "Nome de usuário muito curto",
     "username-too-long": "Nome de usuário muito longo",
     "password-too-long": "A senha é muito grande",
     "user-banned": "Usuário banido",
     "user-too-new": "Desculpe, é necessário que você aguarde %1 segundo(s) antes de fazer o seu primeiro post.",
     "blacklisted-ip": "Desculpe, o seu endereço IP foi banido desta comunidade. Se você acha que isso é um engano, por favor contate um administrador.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "A categoria não existe",
     "no-topic": "O tópico não existe",
     "no-post": "O post não existe",
@@ -38,6 +41,19 @@
     "category-disabled": "Categoria desativada",
     "topic-locked": "Tópico Trancado",
     "post-edit-duration-expired": "Você só pode editar posts %1 segundo(s) após postar.",
+    "post-edit-duration-expired-minutes": "Você pode apenas editar posts por %1 minuto(s) após postar",
+    "post-edit-duration-expired-minutes-seconds": "Você pode apenas editar posts por %1 minuto(s) e %2 segundo(s) após postar",
+    "post-edit-duration-expired-hours": "Você pode apenas editar posts por %1 hora(s) após postar",
+    "post-edit-duration-expired-hours-minutes": "Você pode apenas editar posts por %1 hora(s) e %2 minuto(s) após postar",
+    "post-edit-duration-expired-days": "Você pode apenas editar posts por %1 dia(s) após postar",
+    "post-edit-duration-expired-days-hours": "Você pode apenas editar posts por %1 dia(s) e %2 hora(s) após postar",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Por favor digite um post maior. Posts precisam conter ao menos %1 caractere(s).",
     "content-too-long": "Por favor digite um post mais curto. Posts não podem ser maiores que %1 caractere(s)",
     "title-too-short": "Por favor digite um título maior. Títulos devem conter no mínimo %1 caractere(s)",
@@ -55,10 +71,12 @@
     "already-unfavourited": "Você já removeu este post dos favoritos",
     "cant-ban-other-admins": "Você não pode banir outros administradores!",
     "cant-remove-last-admin": "Você é o único administrador. Adicione outro usuário como administrador antes de remover a si mesmo como admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Tipo inválido de imagem. Os tipos permitidos são: %1",
     "invalid-image-extension": "Extensão de imagem inválida",
     "invalid-file-type": "Tipo de arquivo inválido. Os tipos permitidos são: %1",
     "group-name-too-short": "Nome do grupo é muito curto",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "O grupo já existe",
     "group-name-change-not-allowed": "Sem permissão para alterar nome do grupo",
     "group-already-member": "Já faz parte deste grupo",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "Você não tem permissão para editar esta mensagem",
     "cant-remove-last-user": "Você não pode excluir o último usuário",
     "cant-delete-chat-message": "Você não possui permissão para deletar esta mensagem",
+    "already-voting-for-this-post": "Você já votou neste post.",
     "reputation-system-disabled": "O sistema de reputação está desabilitado.",
     "downvoting-disabled": "Negativação está desabilitada",
     "not-enough-reputation-to-downvote": "Você não possui reputação suficiente para negativar este post",
@@ -99,5 +118,6 @@
     "no-session-found": "Nenhuma sessão de login encontrada!",
     "not-in-room": "O usuário não está na sala",
     "no-users-in-room": "Nenhum usuário nesta sala",
-    "cant-kick-self": "Você não pode kickar a si mesmo do grupo"
+    "cant-kick-self": "Você não pode kickar a si mesmo do grupo",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/pt_BR/global.json b/public/language/pt_BR/global.json
index cb79fa97d5..89778c07ef 100644
--- a/public/language/pt_BR/global.json
+++ b/public/language/pt_BR/global.json
@@ -78,7 +78,7 @@
     "language": "Idioma",
     "guest": "Visitante",
     "guests": "Visitantes",
-    "updated.title": "Fórum Atualizado",
+    "updated.title": "Forum Updated",
     "updated.message": "Este fórum foi atualizado para sua última versão. Clique aqui para atualizar a página.",
     "privacy": "Privacidade",
     "follow": "Seguir",
diff --git a/public/language/pt_BR/login.json b/public/language/pt_BR/login.json
index 7b8299af75..eaccc74fac 100644
--- a/public/language/pt_BR/login.json
+++ b/public/language/pt_BR/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Lembrar de Mim?",
     "forgot_password": "Esqueceu a Senha?",
     "alternative_logins": "Logins Alternativos",
-    "failed_login_attempt": "Falha no login, por favor tente novamente.",
+    "failed_login_attempt": "Falha no Login",
     "login_successful": "Você logou com sucesso!",
     "dont_have_account": "Não tem uma conta?"
 }
\ No newline at end of file
diff --git a/public/language/pt_BR/modules.json b/public/language/pt_BR/modules.json
index 597e750246..20d1fe1805 100644
--- a/public/language/pt_BR/modules.json
+++ b/public/language/pt_BR/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Enviar e Trancar",
     "composer.toggle_dropdown": "Alternar Dropdown",
     "composer.uploading": "Enviando %1",
+    "composer.formatting.bold": "Negrito",
+    "composer.formatting.italic": "Itálico",
+    "composer.formatting.list": "Lista",
+    "composer.formatting.strikethrough": "Riscado",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Imagem",
+    "composer.upload-picture": "Fazer upload de Imagem",
+    "composer.upload-file": "Fazer upload de Arquivo",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancelar",
     "bootbox.confirm": "Confirmar",
diff --git a/public/language/pt_BR/pages.json b/public/language/pt_BR/pages.json
index ac5238bb22..b2d2f1e277 100644
--- a/public/language/pt_BR/pages.json
+++ b/public/language/pt_BR/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Usuários com mais posts",
     "users/sort-reputation": "Usuários com maior reputação",
     "users/banned": "Usuários Banidos",
+    "users/most-flags": "Most flagged users",
     "users/search": "Pesquisa de Usuários",
     "notifications": "Notificações",
     "tags": "Tags",
diff --git a/public/language/pt_BR/topic.json b/public/language/pt_BR/topic.json
index 5f2d6257c1..e1dc6bffd7 100644
--- a/public/language/pt_BR/topic.json
+++ b/public/language/pt_BR/topic.json
@@ -26,12 +26,13 @@
     "tools": "Ferramentas",
     "flag": "Sinalizar",
     "locked": "Trancado",
-    "bookmark_instructions": "Clique aqui para retornar ao último post não lido nesta thread.",
+    "bookmark_instructions": "Clique aqui para retornar ao último post lido neste tópico.",
     "flag_title": "Sinalizar este post para moderação",
     "flag_success": "Este post foi sinalizado para ser moderado.",
     "deleted_message": "Este tópico foi deletado. Apenas usuários com privilégios de moderação de tópico podem vê-lo.",
     "following_topic.message": "Agora você receberá notificações quando alguém responder este tópico.",
     "not_following_topic.message": "Você não receberá mais notificações sobre este tópico.",
+    "ignoring_topic.message": "Você não verá mais este tópico na lista de tópicos não lidos. Você será notificado quando você for mencionado ou sua postagem for votada positivamente.",
     "login_to_subscribe": "Por favor se cadastre ou entre para assinar à este tópico.",
     "markAsUnreadForAll.success": "Tópico marcado como não lido para todos.",
     "mark_unread": "Marcar como não lidas",
@@ -41,6 +42,12 @@
     "watch.title": "Seja notificado sobre novas respostas neste tópico",
     "unwatch.title": "Parar de acompanhar este tópico",
     "share_this_post": "Compartilhar este Post",
+    "watching": "Seguindo",
+    "not-watching": "Não Seguindo",
+    "ignoring": "Ignorando",
+    "watching.description": "Me notificar de novas respostas.<br/>Mostrar tópico em não-lidos.",
+    "not-watching.description": "Não me notificar de novas respostas.<br/>Mostrar tópico em não-lido se a categoria não estiver sendo ignorada.",
+    "ignoring.description": "Não me notificar de novas respostas.<br/>Não mostrar tópico em não-lido.",
     "thread_tools.title": "Ferramentas de Tópico",
     "thread_tools.markAsUnreadForAll": "Marcar Não Lido",
     "thread_tools.pin": "Fixar Tópico",
diff --git a/public/language/pt_BR/unread.json b/public/language/pt_BR/unread.json
index bba5086d93..2ee62fbb68 100644
--- a/public/language/pt_BR/unread.json
+++ b/public/language/pt_BR/unread.json
@@ -6,5 +6,8 @@
     "selected": "Selecionado",
     "all": "Todos",
     "all_categories": "Todas as categorias",
-    "topics_marked_as_read.success": "Tópicos marcados como lidos!"
+    "topics_marked_as_read.success": "Tópicos marcados como lidos!",
+    "all-topics": "Todos os Tópicos",
+    "new-topics": "Novos Tópicos",
+    "watched-topics": "Topicos Acompanhados"
 }
\ No newline at end of file
diff --git a/public/language/pt_BR/user.json b/public/language/pt_BR/user.json
index 21df201b80..6d8c1545fb 100644
--- a/public/language/pt_BR/user.json
+++ b/public/language/pt_BR/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Abrir links externos em nova aba",
     "enable_topic_searching": "Habilitar Pesquisa dentro de Tópico",
     "topic_search_help": "Se habilitado, a pesquisa dentro do tópico irá substituir a pesquisa padrão do seu navegador. Assim, você poderá pesquisar pelo tópico inteiro, e não apenas pelo o que está sendo exibido na tela.",
+    "delay_image_loading": "Aguardar para Carregar Imagens",
+    "image_load_delay_help": "Se habilitado, imagens em tópicos não serão carregadas até que eles sejam rolados à visão",
     "scroll_to_my_post": "Após postar uma réplica, mostre o novo post",
-    "follow_topics_you_reply_to": "Seguir tópicos que você responde",
-    "follow_topics_you_create": "Seguir tópicos que você cria",
-    "grouptitle": "Escolha o título do grupo que você deseja exibir",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Título do Grupo",
     "no-group-title": "Sem título de grupo",
     "select-skin": "Escolha uma Skin",
     "select-homepage": "Selecione uma página inicial",
diff --git a/public/language/pt_BR/users.json b/public/language/pt_BR/users.json
index 0cd0b190d5..e67604fdba 100644
--- a/public/language/pt_BR/users.json
+++ b/public/language/pt_BR/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Últimos Usuários",
     "top_posters": "Principais Participantes",
     "most_reputation": "Maior Reputação",
+    "most_flags": "Most Flags",
     "search": "Pesquisar",
     "enter_username": "Digite um nome de usuário para pesquisar",
     "load_more": "Carregar Mais",
diff --git a/public/language/ro/category.json b/public/language/ro/category.json
index e525ac8878..1c3fe61fec 100644
--- a/public/language/ro/category.json
+++ b/public/language/ro/category.json
@@ -1,16 +1,16 @@
 {
-    "category": "Category",
-    "subcategories": "Subcategories",
+    "category": "Categorie",
+    "subcategories": "Subcategorii",
     "new_topic_button": "Subiect Nou",
-    "guest-login-post": "Log in to post",
+    "guest-login-post": "Conecteaza-te pentru a posta",
     "no_topics": "<strong>Nu există nici un subiect de discuție în această categorie.</strong><br />De ce nu încerci să postezi tu unul?",
     "browsing": "navighează",
     "no_replies": "Nu a răspuns nimeni",
-    "no_new_posts": "No new posts.",
+    "no_new_posts": "Nici o postare nouă",
     "share_this_category": "Distribuie această categorie",
-    "watch": "Watch",
+    "watch": "Urmărește",
     "ignore": "Ignoră",
-    "watch.message": "You are now watching updates from this category",
-    "ignore.message": "You are now ignoring updates from this category",
-    "watched-categories": "Watched categories"
+    "watch.message": "Urmăriți acum actualizări din această categorie",
+    "ignore.message": "Ignorați acum actualizări din această categorie",
+    "watched-categories": "Categorii urmărite"
 }
\ No newline at end of file
diff --git a/public/language/ro/email.json b/public/language/ro/email.json
index 5b802555de..e07033fd97 100644
--- a/public/language/ro/email.json
+++ b/public/language/ro/email.json
@@ -1,19 +1,19 @@
 {
     "password-reset-requested": "Cererea de resetare a parolei a fost efectuată - %1!",
     "welcome-to": "Salutare lui %1",
-    "invite": "Invitation from %1",
+    "invite": "Invitație de la %1",
     "greeting_no_name": "Salut",
     "greeting_with_name": "Salut %1",
     "welcome.text1": "îți mulțumim că te-ai Înregistrat cu %1!",
     "welcome.text2": "Pentru a-ți activa cu success contul trebuie să verificăm adresa de email pe care ai folosit-o la înregistrare.",
     "welcome.text3": "An administrator has accepted your registration application. You can login with your username/password now.",
     "welcome.cta": "Apasă aici pentru a confirma adresa ta de email",
-    "invitation.text1": "%1 has invited you to join %2",
+    "invitation.text1": "%1 te-a invitat să te alături %2",
     "invitation.ctr": "Click here to create your account.",
     "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
     "reset.text2": "Pentru a continua cu resetarea parolei, te rugăm sa apeși pe următorul link:",
     "reset.cta": "Apasă aici pentru a-ți reseta parola",
-    "reset.notify.subject": "Password successfully changed",
+    "reset.notify.subject": "Parola a fost schimbată cu succes",
     "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.",
     "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.",
     "digest.notifications": "You have unread notifications from %1:",
@@ -21,9 +21,10 @@
     "digest.cta": "Apasă aici pentru a vizita %1",
     "digest.unsub.info": "This digest was sent to you due to your subscription settings.",
     "digest.no_topics": "There have been no active topics in the past %1",
-    "digest.day": "day",
-    "digest.week": "week",
-    "digest.month": "month",
+    "digest.day": "zi",
+    "digest.week": "saptămână",
+    "digest.month": "lună",
+    "digest.subject": "Rezumat pentru %1",
     "notif.chat.subject": "Ai primit un mesaj de la %1",
     "notif.chat.cta": "Apasă aici pentru a continua conversația",
     "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
diff --git a/public/language/ro/error.json b/public/language/ro/error.json
index 56750a42a0..c9dcb91bf3 100644
--- a/public/language/ro/error.json
+++ b/public/language/ro/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Parolă Invalidă",
     "invalid-username-or-password": "Te rugăm să specifici atât un nume de utilizator cât si o parolă",
     "invalid-search-term": "Cuvânt de căutare invalid",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "Numele de utilizator este deja folosit",
     "email-taken": "Adresa de email este deja folostă",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "Ca sa accesezi forumul trebuie sa iti confirmi email-ul, click aici ca sa intri in mail.",
     "email-confirm-failed": "Mail-ul tau nu a putut fi confirmat, te rog incearca mai tarziu.",
     "confirm-email-already-sent": "Email-ul de confirmare ti-a fost trimis, asteapta te rog %1 minut(e) ca sa trimiti inca unul.",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "Numele de utilizator este prea scurt",
     "username-too-long": "Numele de utilizator este prea lung",
     "password-too-long": "Parola prea lunga.",
     "user-banned": "Utilizator banat",
     "user-too-new": "Imi pare rau dar trebuie sa astepti %1 secunda(e) pentru a posta prima oara.",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "Categoria nu exista.",
     "no-topic": "Topicul nu exista.",
     "no-post": "Post-ul nu exista.",
@@ -38,6 +41,19 @@
     "category-disabled": "Categorie dezactivată",
     "topic-locked": "Subiect Închis",
     "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
     "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
@@ -55,10 +71,12 @@
     "already-unfavourited": "You have already unbookmarked this post",
     "cant-ban-other-admins": "Nu poți bana alți administratori!",
     "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Invalid image type. Allowed types are: %1",
     "invalid-image-extension": "Invalid image extension",
     "invalid-file-type": "Invalid file type. Allowed types are: %1",
     "group-name-too-short": "Numele grupului este prea scurt",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Grupul deja există",
     "group-name-change-not-allowed": "Schimbarea numelui grupului este interzisă",
     "group-already-member": "Already part of this group",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "You are not allowed to edit this message",
     "cant-remove-last-user": "You can't remove the last user",
     "cant-delete-chat-message": "You are not allowed to delete this message",
+    "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Sistemul de reputație este dezactivat.",
     "downvoting-disabled": "Votarea negativă este dezactivată",
     "not-enough-reputation-to-downvote": "Nu ai destulă reputație pentru a vota negativ acest post.",
@@ -99,5 +118,6 @@
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
     "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "You can't kick yourself from the group",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/ro/global.json b/public/language/ro/global.json
index 501638ec86..b79039789b 100644
--- a/public/language/ro/global.json
+++ b/public/language/ro/global.json
@@ -3,8 +3,8 @@
     "search": "Căutare",
     "buttons.close": "Închide",
     "403.title": "Acces Interzis",
-    "403.message": "You seem to have stumbled upon a page that you do not have access to.",
-    "403.login": "Perhaps you should <a href='%1/login'>try logging in</a>?",
+    "403.message": "Se pare că ai ajuns pe o pagină la care nu ai acces",
+    "403.login": "Poate ar trebui să te <a href='%1/login'>autentifici</a>?",
     "404.title": "Nu a fost găsit",
     "404.message": "You seem to have stumbled upon a page that does not exist. Return to the <a href='%1/'>home page</a>.",
     "500.title": "Eroare internă.",
@@ -49,7 +49,7 @@
     "users": "Utilizatori",
     "topics": "Subiecte",
     "posts": "Mesaje",
-    "best": "Best",
+    "best": "Cel mai bun",
     "upvoted": "Upvoted",
     "downvoted": "Downvoted",
     "views": "Vizualizări",
@@ -65,7 +65,7 @@
     "posted_in_ago_by": "postat în %1 %2 de %3",
     "user_posted_ago": "%1 a postat %2",
     "guest_posted_ago": "Vizitator a postat %1",
-    "last_edited_by": "last edited by %1",
+    "last_edited_by": "ultima editare de %1",
     "norecentposts": "Nici un mesaj recent",
     "norecenttopics": "Nici un subiect recent",
     "recentposts": "Mesaje Recente",
@@ -85,10 +85,10 @@
     "unfollow": "Nu mai urmări",
     "delete_all": "Şterge Tot",
     "map": "Hartă",
-    "sessions": "Login Sessions",
-    "ip_address": "IP Address",
-    "enter_page_number": "Enter page number",
-    "upload_file": "Upload file",
-    "upload": "Upload",
-    "allowed-file-types": "Allowed file types are %1"
+    "sessions": "Ședința de login",
+    "ip_address": "Adresa IP",
+    "enter_page_number": "Introdu numărul paginei",
+    "upload_file": "Încărcați fișierul",
+    "upload": "Încărcați",
+    "allowed-file-types": "Tipuri de fișiere permise sunt %1"
 }
\ No newline at end of file
diff --git a/public/language/ro/groups.json b/public/language/ro/groups.json
index 60719c2bf9..b116606f87 100644
--- a/public/language/ro/groups.json
+++ b/public/language/ro/groups.json
@@ -1,54 +1,54 @@
 {
     "groups": "Grupuri",
     "view_group": "Vezi Grup",
-    "owner": "Group Owner",
-    "new_group": "Create New Group",
-    "no_groups_found": "There are no groups to see",
-    "pending.accept": "Accept",
-    "pending.reject": "Reject",
-    "pending.accept_all": "Accept All",
-    "pending.reject_all": "Reject All",
-    "pending.none": "There are no pending members at this time",
-    "invited.none": "There are no invited members at this time",
-    "invited.uninvite": "Rescind Invitation",
+    "owner": "Propietar de group",
+    "new_group": "Crează un grup nou",
+    "no_groups_found": "Nu sunt grupuri de văzut",
+    "pending.accept": "Acceptă",
+    "pending.reject": "Respinge",
+    "pending.accept_all": "Acceptă toate",
+    "pending.reject_all": "Respinge toate",
+    "pending.none": "Momentan nu există membrii în așteptare",
+    "invited.none": "Momentan nu există membrii invitați",
+    "invited.uninvite": "Anulează invitația",
     "invited.search": "Search for a user to invite to this group",
-    "invited.notification_title": "You have been invited to join <strong>%1</strong>",
+    "invited.notification_title": "Ai fost  invitat să te alături <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-save": "Save",
-    "cover-saving": "Saving",
+    "cover-save": "Salvează",
+    "cover-saving": "Salvez",
     "details.title": "Detalii Grup",
     "details.members": "Listă Membrii",
-    "details.pending": "Pending Members",
-    "details.invited": "Invited Members",
+    "details.pending": "Membrii în așteptare",
+    "details.invited": "Membrii invitați",
     "details.has_no_posts": "Membrii acestui grup nu au facut nici o postare.",
     "details.latest_posts": "Ultimele Mesaje",
-    "details.private": "Private",
+    "details.private": "Privat",
     "details.disableJoinRequests": "Disable join requests",
     "details.grant": "Grant/Rescind Ownership",
     "details.kick": "Kick",
-    "details.owner_options": "Group Administration",
-    "details.group_name": "Group Name",
-    "details.member_count": "Member Count",
-    "details.creation_date": "Creation Date",
-    "details.description": "Description",
-    "details.badge_preview": "Badge Preview",
-    "details.change_icon": "Change Icon",
-    "details.change_colour": "Change Colour",
-    "details.badge_text": "Badge Text",
-    "details.userTitleEnabled": "Show Badge",
+    "details.owner_options": "Administrarea grupului",
+    "details.group_name": "Numele grupului",
+    "details.member_count": "Număr de membrii",
+    "details.creation_date": "Data creării",
+    "details.description": "Descriere",
+    "details.badge_preview": "Previzualizarea insignei",
+    "details.change_icon": "Schimbă icoana",
+    "details.change_colour": "Schimbă culoarea",
+    "details.badge_text": "Textul insignei",
+    "details.userTitleEnabled": "Arată insigna",
     "details.private_help": "If enabled, joining of groups requires approval from a group owner",
-    "details.hidden": "Hidden",
+    "details.hidden": "Ascuns",
     "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
-    "details.delete_group": "Delete Group",
+    "details.delete_group": "Șterge grupul",
     "details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
-    "event.updated": "Group details have been updated",
-    "event.deleted": "The group \"%1\" has been deleted",
-    "membership.accept-invitation": "Accept Invitation",
-    "membership.invitation-pending": "Invitation Pending",
-    "membership.join-group": "Join Group",
-    "membership.leave-group": "Leave Group",
-    "membership.reject": "Reject",
-    "new-group.group_name": "Group Name:",
-    "upload-group-cover": "Upload group cover"
+    "event.updated": "Detaliile grupului au fost actualizate",
+    "event.deleted": "Grupul %1\" a fost șters",
+    "membership.accept-invitation": "Acceptă invitația",
+    "membership.invitation-pending": "Invitație in așteptare",
+    "membership.join-group": "Alăture-te grupului",
+    "membership.leave-group": "Părăsește grupul",
+    "membership.reject": "Respinge",
+    "new-group.group_name": "Numele grupului:",
+    "upload-group-cover": "Încarcă coperta de grup"
 }
\ No newline at end of file
diff --git a/public/language/ro/login.json b/public/language/ro/login.json
index 479e3a83be..c79bb9e0f9 100644
--- a/public/language/ro/login.json
+++ b/public/language/ro/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Autentifică-mă automat la fiecare vizită",
     "forgot_password": "Ai uitat parola?",
     "alternative_logins": "Autentificare Alternativă",
-    "failed_login_attempt": "Încercare de autentificare eșuată, te rugăm să încerci dinou.",
+    "failed_login_attempt": "Login nereușit",
     "login_successful": "Te-ai autentificat cu succes!",
     "dont_have_account": "Nu ai un cont?"
 }
\ No newline at end of file
diff --git a/public/language/ro/modules.json b/public/language/ro/modules.json
index f1f0bdf9d6..fa79140b83 100644
--- a/public/language/ro/modules.json
+++ b/public/language/ro/modules.json
@@ -5,7 +5,7 @@
     "chat.no_active": "Nu ai nici o conversație activă",
     "chat.user_typing": "%1 scrie ...",
     "chat.user_has_messaged_you": "%1 ți-a trimis un mesaj.",
-    "chat.see_all": "See all chats",
+    "chat.see_all": "Vezi toate conversațiile",
     "chat.mark_all_read": "Mark all chats read",
     "chat.no-messages": "Selectează un recipient pentru a vedea istoria mesajelor chat",
     "chat.no-users-in-room": "No users in this room",
@@ -20,7 +20,7 @@
     "chat.delete_message_confirm": "Are you sure you wish to delete this message?",
     "chat.roomname": "Chat Room %1",
     "chat.add-users-to-room": "Add users to room",
-    "composer.compose": "Compose",
+    "composer.compose": "Scrie",
     "composer.show_preview": "Show Preview",
     "composer.hide_preview": "Hide Preview",
     "composer.user_said_in": "%1 a spus în %2:",
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Submit and Lock",
     "composer.toggle_dropdown": "Toggle Dropdown",
     "composer.uploading": "Uploading %1",
+    "composer.formatting.bold": "Bold",
+    "composer.formatting.italic": "Italic",
+    "composer.formatting.list": "List",
+    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Picture",
+    "composer.upload-picture": "Upload Image",
+    "composer.upload-file": "Upload File",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",
diff --git a/public/language/ro/notifications.json b/public/language/ro/notifications.json
index 9684a7d9cc..ef01014715 100644
--- a/public/language/ro/notifications.json
+++ b/public/language/ro/notifications.json
@@ -1,11 +1,11 @@
 {
     "title": "Notificări",
     "no_notifs": "Nu ai nici o notificare recentă",
-    "see_all": "See all notifications",
-    "mark_all_read": "Mark all notifications read",
+    "see_all": "Vezi toate notificările",
+    "mark_all_read": "Marchează toate notificările citite",
     "back_to_home": "Înapoi la %1",
     "outgoing_link": "Link Extern",
-    "outgoing_link_message": "You are now leaving %1",
+    "outgoing_link_message": "Părăsești acuma %1",
     "continue_to": "Continuă la %1",
     "return_to": "Întoarce-te la %1",
     "new_notification": "Notificare Nouă",
diff --git a/public/language/ro/pages.json b/public/language/ro/pages.json
index b90accee42..29cd26e889 100644
--- a/public/language/ro/pages.json
+++ b/public/language/ro/pages.json
@@ -1,24 +1,25 @@
 {
     "home": "Acasă",
     "unread": "Subiecte Necitite",
-    "popular-day": "Popular topics today",
-    "popular-week": "Popular topics this week",
-    "popular-month": "Popular topics this month",
+    "popular-day": "Subiecte populare azi",
+    "popular-week": "Subiecte populare în săptămâna asta",
+    "popular-month": "Subiecte populare în luna asta",
     "popular-alltime": "All time popular topics",
     "recent": "Subiecte Noi",
     "flagged-posts": "Flagged Posts",
-    "users/online": "Online Users",
-    "users/latest": "Latest Users",
-    "users/sort-posts": "Users with the most posts",
+    "users/online": "Utilizatori online",
+    "users/latest": "Ultimii membrii",
+    "users/sort-posts": "Membrii cu cele mai multe postări",
     "users/sort-reputation": "Users with the most reputation",
     "users/banned": "Banned Users",
+    "users/most-flags": "Most flagged users",
     "users/search": "User Search",
     "notifications": "Notificări",
     "tags": "Taguri",
     "tag": "Topics tagged under \"%1\"",
-    "register": "Register an account",
+    "register": "Înregistrează un cont nou",
     "login": "Login to your account",
-    "reset": "Reset your account password",
+    "reset": "Resetează parola contului tău",
     "categories": "Categorii",
     "groups": "Grupuri",
     "group": "%1 group",
diff --git a/public/language/ro/recent.json b/public/language/ro/recent.json
index 5b657f39b1..45d788dfc3 100644
--- a/public/language/ro/recent.json
+++ b/public/language/ro/recent.json
@@ -6,14 +6,14 @@
     "year": "An",
     "alltime": "Tot Timpul",
     "no_recent_topics": "Nu există subiecte recente.",
-    "no_popular_topics": "There are no popular topics.",
-    "there-is-a-new-topic": "There is a new topic.",
-    "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.",
+    "no_popular_topics": "Nu sunt subiecte populare.",
+    "there-is-a-new-topic": "Există un subiect nou.",
+    "there-is-a-new-topic-and-a-new-post": "Există un subiect nou si o postare nouă.",
     "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.",
-    "there-are-new-topics": "There are %1 new topics.",
-    "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.",
-    "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.",
-    "there-is-a-new-post": "There is a new post.",
-    "there-are-new-posts": "There are %1 new posts.",
+    "there-are-new-topics": "Există %1 postări noi.",
+    "there-are-new-topics-and-a-new-post": "Exista %1 subiect nou și o postare nouă",
+    "there-are-new-topics-and-new-posts": "Exista %1 subiecte noi și %2 postări noi",
+    "there-is-a-new-post": "Exista o postare nouă",
+    "there-are-new-posts": "Există %1 postări noi",
     "click-here-to-reload": "Click here to reload."
 }
\ No newline at end of file
diff --git a/public/language/ro/reset_password.json b/public/language/ro/reset_password.json
index 15800e2b55..02afb16f0c 100644
--- a/public/language/ro/reset_password.json
+++ b/public/language/ro/reset_password.json
@@ -13,5 +13,5 @@
     "invalid_email": "Adresă de email invalidă / Adresa de email nu există!",
     "password_too_short": "The password entered is too short, please pick a different password.",
     "passwords_do_not_match": "The two passwords you've entered do not match.",
-    "password_expired": "Your password has expired, please choose a new password"
+    "password_expired": "Parola ta a expirat, te rugăm alege altă parolă"
 }
\ No newline at end of file
diff --git a/public/language/ro/topic.json b/public/language/ro/topic.json
index 5503fa8c3d..764d203e19 100644
--- a/public/language/ro/topic.json
+++ b/public/language/ro/topic.json
@@ -5,7 +5,7 @@
     "no_topics_found": "Nu a fost găsit nici un subiect!",
     "no_posts_found": "Nu a fost găsit nici un mesaj!",
     "post_is_deleted": "Acest mesaj a fost șters!",
-    "topic_is_deleted": "This topic is deleted!",
+    "topic_is_deleted": "Acest subiect este șters!",
     "profile": "Profil",
     "posted_by": "Postat de %1",
     "posted_by_guest": "Postat de Vizitator",
@@ -13,8 +13,8 @@
     "notify_me": "Notică-mă de noi răspunsuri în acest subiect",
     "quote": "Citează",
     "reply": "Răspunde",
-    "reply-as-topic": "Reply as topic",
-    "guest-login-reply": "Log in to reply",
+    "reply-as-topic": "Răspunde ca subiect",
+    "guest-login-reply": "Login pentru a răspunde",
     "edit": "Editează",
     "delete": "Șterge",
     "purge": "Curăță",
@@ -26,12 +26,13 @@
     "tools": "Unelte",
     "flag": "Semnalizează",
     "locked": "Închis",
-    "bookmark_instructions": "Click here to return to the last unread post in this thread.",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Semnalizează acest mesaj pentru moderare",
     "flag_success": "Acest mesaj a fost semnalizat pentru moderare.",
     "deleted_message": "Acest subiect a fost șters. Doar utilizatorii cu privilegii pentru moderarea subiectelor îl poate vedea.",
     "following_topic.message": "Vei primi notificări când cineva va posta un nou mesaj in acest subiect.",
     "not_following_topic.message": "Nu vei mai primi notificări legate de acest subiect.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "Te rugăm să te înregistrezi sau să te autentifici ca să te poți abona la acest subiect.",
     "markAsUnreadForAll.success": "Subiect marcat ca citit pentru toți.",
     "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
     "watch.title": "Abonează-te la notificări legate de acest subiect",
     "unwatch.title": "Oprește urmărirea acestui subiect",
     "share_this_post": "Distribuie acest mesaj",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "Unelte pentru subiecte",
     "thread_tools.markAsUnreadForAll": "Marchează Necitit",
     "thread_tools.pin": "Pin Subiect",
diff --git a/public/language/ro/unread.json b/public/language/ro/unread.json
index 5cff8c6546..a5b6c46e7e 100644
--- a/public/language/ro/unread.json
+++ b/public/language/ro/unread.json
@@ -5,6 +5,9 @@
     "mark_as_read": "Marchează ca citit",
     "selected": "Selectate",
     "all": "Toate",
-    "all_categories": "All categories",
-    "topics_marked_as_read.success": "Subiectele au fost marcate ca citite!"
+    "all_categories": "Toate categoriile",
+    "topics_marked_as_read.success": "Subiectele au fost marcate ca citite!",
+    "all-topics": "Toate subiectele",
+    "new-topics": "Subiecte noi",
+    "watched-topics": "Subiecte urmărite"
 }
\ No newline at end of file
diff --git a/public/language/ro/uploads.json b/public/language/ro/uploads.json
index 1622cb5693..aa633f773e 100644
--- a/public/language/ro/uploads.json
+++ b/public/language/ro/uploads.json
@@ -1,6 +1,6 @@
 {
     "uploading-file": "Uploading the file...",
-    "select-file-to-upload": "Select a file to upload!",
+    "select-file-to-upload": "Selectează un fișier pentru încărcare!",
     "upload-success": "File uploaded successfully!",
-    "maximum-file-size": "Maximum %1 kb"
+    "maximum-file-size": "Maxim %1 kB"
 }
\ No newline at end of file
diff --git a/public/language/ro/user.json b/public/language/ro/user.json
index 8a61af9abf..cb7b5c6bab 100644
--- a/public/language/ro/user.json
+++ b/public/language/ro/user.json
@@ -12,7 +12,7 @@
     "delete_account": "Șterge Cont",
     "delete_account_confirm": "Ești sigur ca vrei să îți ștergi contul? <br /><strong>Această acțiune este ireversibilă și nu o să mai fie posibil să îți recuperezi datele</strong><br /><br />Introdu numele tău de utilizator pentru a confirma că dorești să ștergi acest cont.",
     "delete_this_account_confirm": "Are you sure you want to delete this account? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
-    "account-deleted": "Account deleted",
+    "account-deleted": "Cont șters",
     "fullname": "Nume Întreg",
     "website": "Pagină Web",
     "location": "Locație",
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Open outgoing links in new tab",
     "enable_topic_searching": "Enable In-Topic Searching",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
+    "delay_image_loading": "Delay Image Loading",
+    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
     "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Follow topics that you reply to",
-    "follow_topics_you_create": "Follow topics you create",
-    "grouptitle": "Select the group title you would like to display",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Group Title",
     "no-group-title": "No group title",
     "select-skin": "Select a Skin",
     "select-homepage": "Select a Homepage",
diff --git a/public/language/ro/users.json b/public/language/ro/users.json
index 8f2cf6914c..d3a4f09a9e 100644
--- a/public/language/ro/users.json
+++ b/public/language/ro/users.json
@@ -2,12 +2,13 @@
     "latest_users": "Ultimii Utilizatori",
     "top_posters": "Top Utilizatori",
     "most_reputation": "Cei mai apreciați utilizatori",
+    "most_flags": "Most Flags",
     "search": "Căutare",
     "enter_username": "Introdu un nume de utilizator pentru a căuta",
     "load_more": "Încarcă mai multe",
     "users-found-search-took": "%1 user(s) found! Search took %2 seconds.",
     "filter-by": "Filter By",
-    "online-only": "Online only",
+    "online-only": "Numai online",
     "invite": "Invită",
     "invitation-email-sent": "An invitation email has been sent to %1",
     "user_list": "Listă utilizatori",
diff --git a/public/language/ru/category.json b/public/language/ru/category.json
index 347af2bd0e..2d4aeb0dc3 100644
--- a/public/language/ru/category.json
+++ b/public/language/ru/category.json
@@ -2,7 +2,7 @@
     "category": "Категория",
     "subcategories": "Подкатегории",
     "new_topic_button": "Создать тему",
-    "guest-login-post": "Войдите, чтобы создавать сообщения",
+    "guest-login-post": "Войдите, чтобы ответить в теме",
     "no_topics": "<strong>В этой категории еще нет тем.</strong><br />Почему бы вам не создать первую?",
     "browsing": "просматривают",
     "no_replies": "Нет ответов",
diff --git a/public/language/ru/email.json b/public/language/ru/email.json
index a4b378b897..f76b43d120 100644
--- a/public/language/ru/email.json
+++ b/public/language/ru/email.json
@@ -24,6 +24,7 @@
     "digest.day": "день",
     "digest.week": "неделя",
     "digest.month": "месяц",
+    "digest.subject": "Дайджест для %1",
     "notif.chat.subject": "Новое сообщение от %1",
     "notif.chat.cta": "Нажмите для продолжения диалога",
     "notif.chat.unsub.info": "Вы получили это уведомление в соответствии с настройками подписок.",
diff --git a/public/language/ru/error.json b/public/language/ru/error.json
index efaab28fa9..941bcb1816 100644
--- a/public/language/ru/error.json
+++ b/public/language/ru/error.json
@@ -14,7 +14,8 @@
     "invalid-password": "Неверный пароль",
     "invalid-username-or-password": "Пожалуйста, укажите и имя пользователя и пароль",
     "invalid-search-term": "Неверный поисковой запрос",
-    "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
+    "csrf-invalid": "Нам не удалось Вас найти из-за просроченной сессии. Попробуйте еще раз.",
+    "invalid-pagination-value": "Неверное значение страницы. Значение должно быть в диапазоне от %1 до %2",
     "username-taken": "Имя пользователя занято",
     "email-taken": "Email занят",
     "email-not-confirmed": "Ваш email не подтвержден, нажмите для подтверждения.",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "Этот форум требует подтверждения по E-mail. Нажмите здесь для ввода E-mail.",
     "email-confirm-failed": "Мы не можем подтвердить Ваш E-mail, попробуйте позже.",
     "confirm-email-already-sent": "Сообщение для подтверждения уже выслано на E-mail. Повторная отправка возможна через %1 мин.",
+    "sendmail-not-found": "Не можем найти sendmail, убедитесь что он установлен и управляется NodeBB.",
     "username-too-short": "Слишком короткое имя пользователя",
     "username-too-long": "Имя пользователя слишком длинное",
     "password-too-long": "Пароль слишком длинный",
     "user-banned": "Пользователь заблокирован",
     "user-too-new": "Вы можете написать свое первой сообщение через %1 сек.",
-    "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "blacklisted-ip": "Извините, ваш IP адрес был забанен этим сообществом. Если вы считаете что это ошибка, пожалуйста, свяжитесь с администратором.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "Категория не существует",
     "no-topic": "Тема не существует",
     "no-post": "Сообщение не существует",
@@ -38,6 +41,19 @@
     "category-disabled": "Категория отключена",
     "topic-locked": "Тема закрыта",
     "post-edit-duration-expired": "Сообщения можно редактировать только в течение %1 секунд(ы) после опубликования",
+    "post-edit-duration-expired-minutes": "Вы можете редактировать посты только в течение %1 минут(ы) после публикации.",
+    "post-edit-duration-expired-minutes-seconds": "Вы можете редактировать сообщение в течение %1 минут(ы) %2 секунд(ы) после публикации.",
+    "post-edit-duration-expired-hours": "Вы можете редактировать сообщения в течение %1 час(а) после публикации.",
+    "post-edit-duration-expired-hours-minutes": "Вы можете редактировать сообщения в течение %1 час(а) %2 минут(ы) после публикации.",
+    "post-edit-duration-expired-days": "Вы можете редактировать сообщения в течение %1 дня(ей) после публикации.",
+    "post-edit-duration-expired-days-hours": "Вы можете редактировать сообщения в течение %1 чдня(ей) и %2 час(а) после публикации.",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Слишком короткое сообщение. Минимум символов: %1.",
     "content-too-long": "Слишком длинное сообщение. Максимум символов: %1.",
     "title-too-short": "Слишком короткое сообщение. Минимум символов: %1.",
@@ -52,13 +68,15 @@
     "file-too-big": "Слишком большой файл. Максимальный размер: %1 Кбайт.",
     "guest-upload-disabled": "Загрузка для гостей была отключена",
     "already-favourited": "Вы уже добавили это сообщение в закладки",
-    "already-unfavourited": "You have already unbookmarked this post",
+    "already-unfavourited": "Вы уже убрали из закладок этот пост",
     "cant-ban-other-admins": "Вы не можете забанить других администраторов!",
     "cant-remove-last-admin": "Вы единственный администратор. Назначьте другого пользователя администратором, прежде чем складывать с себя полномочия админа",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Неверный формат изображения. Поддерживаемые форматы: %1",
     "invalid-image-extension": "Недопустимое расширение файла",
     "invalid-file-type": "Неверный формат файла. Поддерживаемые форматы: %1",
     "group-name-too-short": "Название группы слишком короткое",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Группа уже существует",
     "group-name-change-not-allowed": "Изменение названия группы запрещено",
     "group-already-member": "Уже в этой группе",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "У вас нет доступа для редактирования этого сообщения",
     "cant-remove-last-user": "Вы не можете убрать последнего пользователя",
     "cant-delete-chat-message": "У вас нет доступа на удаление этого сообщения",
+    "already-voting-for-this-post": "Вы уже голосовали за это сообщение.",
     "reputation-system-disabled": "Система репутации отключена.",
     "downvoting-disabled": "Понижение оценки отключено",
     "not-enough-reputation-to-downvote": "У Вас недостаточно репутации для понижения оценки сообщения",
@@ -99,5 +118,6 @@
     "no-session-found": "Сессия входа не найдена!",
     "not-in-room": "Пользователь не в комнате",
     "no-users-in-room": "В этой комнате нет пользователей",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "Вы не можете удалить себя сами из группы.",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/ru/global.json b/public/language/ru/global.json
index 3c6a09c0b5..5f45c17a34 100644
--- a/public/language/ru/global.json
+++ b/public/language/ru/global.json
@@ -60,12 +60,12 @@
     "posted_ago_by": "сообщений %1 от %2",
     "posted_ago": "написал %1",
     "posted_in": "написал в %1",
-    "posted_in_by": "posted in %1 by %2",
+    "posted_in_by": "опубликовано в %1 %2",
     "posted_in_ago": "написал в %1 %2",
     "posted_in_ago_by": "%3 написал в %1 %2",
     "user_posted_ago": "%1 написал %2",
     "guest_posted_ago": "Гость написал %1",
-    "last_edited_by": "last edited by %1",
+    "last_edited_by": "отредактировано %1",
     "norecentposts": "Нет новых сообщений",
     "norecenttopics": "Нету новых тем",
     "recentposts": "Свежие записи",
diff --git a/public/language/ru/groups.json b/public/language/ru/groups.json
index eeeca0e8fb..53ac0687f2 100644
--- a/public/language/ru/groups.json
+++ b/public/language/ru/groups.json
@@ -41,7 +41,7 @@
     "details.hidden": "Скрыто",
     "details.hidden_help": "Если включено, группа не будет показываться в списках, а пользователи должны приглашаться вручную",
     "details.delete_group": "Удалить группу",
-    "details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
+    "details.private_system_help": "Частные группы отключены на уровне системы, эта опция ничего не даст",
     "event.updated": "Настройки группы обновлены",
     "event.deleted": "Группа \"%1\" удалена",
     "membership.accept-invitation": "Принять приглашение",
diff --git a/public/language/ru/login.json b/public/language/ru/login.json
index b0a5793412..62a4e64f8a 100644
--- a/public/language/ru/login.json
+++ b/public/language/ru/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Запомнить меня",
     "forgot_password": "Забыли пароль?",
     "alternative_logins": "Войти через",
-    "failed_login_attempt": "Не удалось войти, попробуйте еще раз.",
+    "failed_login_attempt": "Некорректный логин",
     "login_successful": "Вы успешно вошли!",
     "dont_have_account": "Нет акканута?"
 }
\ No newline at end of file
diff --git a/public/language/ru/modules.json b/public/language/ru/modules.json
index 07ecb488c8..a4dfd79293 100644
--- a/public/language/ru/modules.json
+++ b/public/language/ru/modules.json
@@ -6,7 +6,7 @@
     "chat.user_typing": "%1 печатает ...",
     "chat.user_has_messaged_you": "%1 отправил вам сообщение.",
     "chat.see_all": "Посмотреть все чаты",
-    "chat.mark_all_read": "Mark all chats read",
+    "chat.mark_all_read": "Отметить все чаты как прочитанные",
     "chat.no-messages": "Пожалуйста, выберите собеседника для просмотра истории сообщений",
     "chat.no-users-in-room": "В этой комнате нет пользователей",
     "chat.recent-chats": "Последние переписки",
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Отправить и закрыть",
     "composer.toggle_dropdown": "Показать выпадающий список",
     "composer.uploading": "Загрузка %1",
+    "composer.formatting.bold": "Жирность",
+    "composer.formatting.italic": "Курсив",
+    "composer.formatting.list": "Список",
+    "composer.formatting.strikethrough": "Перечеркивание",
+    "composer.formatting.link": "Ссылка",
+    "composer.formatting.picture": "Изображение",
+    "composer.upload-picture": "Загрузить изображение",
+    "composer.upload-file": "Загрузить файл",
     "bootbox.ok": "ОК",
     "bootbox.cancel": "Отмена",
     "bootbox.confirm": "Подтвердить",
diff --git a/public/language/ru/notifications.json b/public/language/ru/notifications.json
index 21c0a3b46c..eae90894d7 100644
--- a/public/language/ru/notifications.json
+++ b/public/language/ru/notifications.json
@@ -16,9 +16,9 @@
     "upvoted_your_post_in_multiple": "<strong>%1</strong> и %2 другие проголосовали за ваше сообщение в <strong>%3</strong>",
     "moved_your_post": "<strong>%1</strong> переместил Ваше сообщение в <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> переместил <strong>%2</strong>",
-    "favourited_your_post_in": "<strong>%1</strong> has bookmarked your post in <strong>%2</strong>.",
-    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have bookmarked your post in <strong>%3</strong>.",
-    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have bookmarked your post in <strong>%3</strong>.",
+    "favourited_your_post_in": "<strong>%1</strong> сделал закладкой Ваш пост в <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> и <strong>%2</strong> добавили в закладки Ваш пост в <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> и %2 добавили в закладки Ваш пост в <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> пометил сообщение в <strong>%2</strong>",
     "user_flagged_post_in_dual": "<strong>%1</strong> и <strong>%2</strong> пометили ваше сообщение в <strong>%3</strong>",
     "user_flagged_post_in_multiple": "<strong>%1</strong> и %2 другие пометили ваше сообщение <strong>%3</strong>",
@@ -30,7 +30,7 @@
     "user_started_following_you_dual": "<strong>%1</strong> и <strong>%2</strong> подписались на вас.",
     "user_started_following_you_multiple": "<strong>%1</strong> и %2 подписались на вас.",
     "new_register": "<strong>%1</strong> отправил запрос на регистрацию.",
-    "new_register_multiple": "There are <strong>%1</strong> registration requests awaiting review.",
+    "new_register_multiple": "В очереди <strong>%1</strong> заявок на регистрацию.",
     "email-confirmed": "Email подтвержден",
     "email-confirmed-message": "Спасибо за подтверждение Вашего Email-адреса. Ваш аккаунт активирован.",
     "email-confirm-error-message": "Ошибка проверки Email-адреса. Возможно, код неверен, либо у него истек срок действия.",
diff --git a/public/language/ru/pages.json b/public/language/ru/pages.json
index 962dba881c..811c051bc3 100644
--- a/public/language/ru/pages.json
+++ b/public/language/ru/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Пользователи по кол-ву сообщений",
     "users/sort-reputation": "Пользователи по кол-ву репутации",
     "users/banned": "Заблокированные пользователи",
+    "users/most-flags": "Most flagged users",
     "users/search": "Поиск пользователей",
     "notifications": "Уведомления",
     "tags": "Теги",
@@ -33,7 +34,7 @@
     "account/posts": "Сообщение от %1",
     "account/topics": "Тема создана %1",
     "account/groups": "%1 Групп",
-    "account/favourites": "%1's Bookmarked Posts",
+    "account/favourites": "%1 постов в закладках",
     "account/settings": "Настройки пользователя",
     "account/watched": "Тему смотрели %1",
     "account/upvoted": "Posts upvoted by %1",
@@ -42,5 +43,5 @@
     "confirm": "Email подтвержден",
     "maintenance.text": "%1 в настоящее время на обслуживании. Пожалуйста, возвращайтесь позже.",
     "maintenance.messageIntro": "Администратор оставил сообщение:",
-    "throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
+    "throttled.text": "%1 в настоящее время недоступен из-за высокой нагрузки. Пожалуйста, приходите в другой раз."
 }
\ No newline at end of file
diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json
index 00ca832430..5c882e2719 100644
--- a/public/language/ru/topic.json
+++ b/public/language/ru/topic.json
@@ -26,12 +26,13 @@
     "tools": "Опции",
     "flag": "Отметить",
     "locked": "Закрыт",
-    "bookmark_instructions": "Нажмите здесь чтобы вернуться к последнему непрочитанному сообщению в теме.",
+    "bookmark_instructions": "Нажмите здесь, чтобы вернуться к последнему прочитанному сообщению в этой теме.",
     "flag_title": "Отметить сообщение для модерирования",
     "flag_success": "Это сообщение было помечено для модерации",
     "deleted_message": "Эта тема была удалена. Только пользователи с правами управления темами могут ее видеть.",
     "following_topic.message": "Теперь вы будете получать уведомления при обновлении этой темы.",
     "not_following_topic.message": "Вы больше не будете получать уведомления из этой темы.",
+    "ignoring_topic.message": "Вы больше не будете видеть эту тему в списке непрочитанных тем. Вас уведомят, когда Вас упомянут или проголосуют за Ваш пост.",
     "login_to_subscribe": "Пожалуйста зарегистрируйтесь, или войдите под своим аккаунтом, чтобы подписаться на эту тему.",
     "markAsUnreadForAll.success": "Тема помечена как непрочитанная для всех.",
     "mark_unread": "Отметить как непрочитанное",
@@ -41,6 +42,12 @@
     "watch.title": "Сообщать мне об ответах в этой теме",
     "unwatch.title": "Не сообщать мне об ответах в этой теме",
     "share_this_post": "Поделиться этим Сообщением",
+    "watching": "Наблюдать",
+    "not-watching": "Не наблюдать",
+    "ignoring": "Игнорирование",
+    "watching.description": "Сообщить мне о новых ответах.<br/>Показать тему в непрочитанных.",
+    "not-watching.description": "Не уведомлять меня о новых ответах.<br/>Показать тему в непрочитанных, если категория мной не игнорируется.",
+    "ignoring.description": "Не уведомлять меня о новых ответах.<br/>Не отображать тему в непрочитанных.",
     "thread_tools.title": "Опции темы",
     "thread_tools.markAsUnreadForAll": "Отметить как непрочитанные",
     "thread_tools.pin": "Прикрепить тему",
@@ -101,12 +108,12 @@
     "newest_to_oldest": "От новых к старым",
     "most_votes": "По голосам",
     "most_posts": "По количеству ответов",
-    "stale.title": "Create new topic instead?",
-    "stale.warning": "The topic you are replying to is quite old. Would you like to create a new topic instead, and reference this one in your reply?",
+    "stale.title": "Создать новую тему вместо этой?",
+    "stale.warning": "Тема, в которую Вы пишите, очень старая. Вы хотите создать новую тему?",
     "stale.create": "Создать новую тему",
     "stale.reply_anyway": "Всё равно ответить в этой теме",
-    "link_back": "Re: [%1](%2)",
+    "link_back": "Ответ: [%1](%2)",
     "spam": "Спам",
-    "offensive": "Offensive",
-    "custom-flag-reason": "Enter a flagging reason"
+    "offensive": "Наступление",
+    "custom-flag-reason": "Введите другую причину"
 }
\ No newline at end of file
diff --git a/public/language/ru/unread.json b/public/language/ru/unread.json
index 7d51d6abbf..421d8d730c 100644
--- a/public/language/ru/unread.json
+++ b/public/language/ru/unread.json
@@ -6,5 +6,8 @@
     "selected": "Выбранное",
     "all": "Все",
     "all_categories": "Все категории",
-    "topics_marked_as_read.success": "Темы помечены как прочитанные!"
+    "topics_marked_as_read.success": "Темы помечены как прочитанные!",
+    "all-topics": "Все темы",
+    "new-topics": "Новые темы",
+    "watched-topics": "Наблюдаемые темы"
 }
\ No newline at end of file
diff --git a/public/language/ru/uploads.json b/public/language/ru/uploads.json
index 1622cb5693..dedc27456d 100644
--- a/public/language/ru/uploads.json
+++ b/public/language/ru/uploads.json
@@ -1,6 +1,6 @@
 {
-    "uploading-file": "Uploading the file...",
-    "select-file-to-upload": "Select a file to upload!",
-    "upload-success": "File uploaded successfully!",
-    "maximum-file-size": "Maximum %1 kb"
+    "uploading-file": "Загрузка файла...",
+    "select-file-to-upload": "Укажите файл для загрузки!",
+    "upload-success": "Файл успешно загружен!",
+    "maximum-file-size": "Максимум %1 kb"
 }
\ No newline at end of file
diff --git a/public/language/ru/user.json b/public/language/ru/user.json
index 5e14dc8004..ec6d071c53 100644
--- a/public/language/ru/user.json
+++ b/public/language/ru/user.json
@@ -79,9 +79,9 @@
     "has_no_posts": "Этот пользователь еще ничего не написал.",
     "has_no_topics": "Этот пользователь еще не размещал какие-либо темы.",
     "has_no_watched_topics": "Этот пользователь еще не просматривал какие-либо темы.",
-    "has_no_upvoted_posts": "This user hasn't upvoted any posts yet.",
-    "has_no_downvoted_posts": "This user hasn't downvoted any posts yet.",
-    "has_no_voted_posts": "This user has no voted posts",
+    "has_no_upvoted_posts": "Пользователь не поднимал рейтинг ни одному посту.",
+    "has_no_downvoted_posts": "Пользователь не понижал рейтинг ни одному посту.",
+    "has_no_voted_posts": "Пользователь не голосовал за сообщения.",
     "email_hidden": "Email скрыт",
     "hidden": "скрыто",
     "paginate_description": "Разбивать по страницам топики и посты вместо того чтобы выводить бесконечным списком",
@@ -92,17 +92,19 @@
     "open_links_in_new_tab": "Открывать внешние ссылки в новых вкладках",
     "enable_topic_searching": "Активировать поиск внутри тем",
     "topic_search_help": "Если опция включена, поиск в теме будет осуществляться за счёт собственного поиска, который позволит искать во всей теме, а не только в загруженных сообщениях",
-    "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Следить за темами в которых вы отвечаете",
-    "follow_topics_you_create": "Следить за темами которые вы создаёте",
-    "grouptitle": "Выберите бейдж группы для отображения",
+    "delay_image_loading": "Ожидайте загрузки изображения",
+    "image_load_delay_help": "Если включить, изображения в темах не будут загружаться, пока они не появятся в поле зрения.",
+    "scroll_to_my_post": "После отправки ответа, прокрутить страницу до него.",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Заголовок группы",
     "no-group-title": "Не показывать бейдж",
     "select-skin": "Выбрать скин",
     "select-homepage": "Укажите главную страницу",
     "homepage": "Главная страница",
     "homepage_description": "Укажите страницу, которую хотите использовать как главную страницу форума или 'None', что бы использовать страницу по умолчанию.",
-    "custom_route": "Custom Homepage Route",
-    "custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
+    "custom_route": "Другой маршрут главной страницы",
+    "custom_route_help": "Введите название маршрута здесь, без слешей (например, \\\"recent\\\", или \\\"popular\\\")",
     "sso.title": "Сервис единого входа",
     "sso.associated": "Связан с",
     "sso.not-associated": "Нажмите здесь, что бы связать себя с"
diff --git a/public/language/ru/users.json b/public/language/ru/users.json
index 40c180685a..89693b3b92 100644
--- a/public/language/ru/users.json
+++ b/public/language/ru/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Новые пользователи",
     "top_posters": "Самые активные",
     "most_reputation": "Лучшая репутация",
+    "most_flags": "Most Flags",
     "search": "Поиск",
     "enter_username": "Введите имя пользователя для поиска",
     "load_more": "Загрузить еще",
diff --git a/public/language/rw/email.json b/public/language/rw/email.json
index 626f11dec4..d26954b90b 100644
--- a/public/language/rw/email.json
+++ b/public/language/rw/email.json
@@ -24,6 +24,7 @@
     "digest.day": "umunsi",
     "digest.week": "icyumweru",
     "digest.month": "ukwezi",
+    "digest.subject": "Digest for %1",
     "notif.chat.subject": "Ubutumwa bwo mu gikari bwaturutse kuri %1",
     "notif.chat.cta": "Kanda hano kugirango ukomeze",
     "notif.chat.unsub.info": "Iri tangazo rijyanye n'ubutumwa bwo mu gikari waryohererejwe kubera ko wabihisemo mu byo uzajya umenyeshwa",
diff --git a/public/language/rw/error.json b/public/language/rw/error.json
index a86168d3ef..12f4a26968 100644
--- a/public/language/rw/error.json
+++ b/public/language/rw/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Ijambobanga Ntiryemewe",
     "invalid-username-or-password": "Tanga izina ukoresha n'ijambobanga",
     "invalid-search-term": "Icyashatswe nticyemewe",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "Izina ryarafashwe mbere",
     "email-taken": "Email yarafashwe mbere",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "Uru rubuga rusaba ko wemeza ko utunze email. Kanda hano kugirango utange email yawe",
     "email-confirm-failed": "Ntabwo email yawe yabashije kwemezwa. Ongera ugerageze mu bundi buryo. ",
     "confirm-email-already-sent": "Email yo kwemeza yamaze koherezwa. Tegereza iminota (umunota) %1 mbere yo kohereza indi. ",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "Izina ni rigufi cyane",
     "username-too-long": "Izina ni rirerire cyane",
     "password-too-long": "Password too long",
     "user-banned": "Umuntu wirukanwe",
     "user-too-new": "Wihangena kuko usabwa gutegereza amasegonda (isegonda) %1 mbere yo gushyiraho ikintu cyawe cya mbere",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "Icyiciro kitabaho",
     "no-topic": "Ikiganiro kitabaho",
     "no-post": "Icyashyizweho kitabaho",
@@ -38,6 +41,19 @@
     "category-disabled": "Icyiciro cyabujijwe",
     "topic-locked": "Ikiganiro Cyafungiranywe",
     "post-edit-duration-expired": "Wemerewe gusa kugira icyo uhindura ku byo washyizeho nyuma y'amasegonda (isegonda) %1 nyuma yo kubishyiraho",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Gerageza ushyireho ikintu kirekireho. Icyo ushyiraho kigomba kuba kigizwe nibura n'inyuguti (cyangwa ibimenyetso) zigera kuri %1.",
     "content-too-long": "Gerageza ushyireho ibintu bigufiyaho. Icyo ushyiraho kigomba kuba kigizwe n'inyuguti (cyangwa ibimenyetso) zirenga %1. ",
     "title-too-short": "Gerageza ushyireho umutwe muremureho. Umutwe ugomba kuba ugizwe n'inyuguti (cyangwa ibimenyetso) zigera kuri %1. ",
@@ -55,10 +71,12 @@
     "already-unfavourited": "You have already unbookmarked this post",
     "cant-ban-other-admins": "Ntabwo wakwirukana abandi bayobozi!",
     "cant-remove-last-admin": "Ni wowe muyobozi wenyine. Ongeramo undi muntu nk'umuyobozi mbere y'uko wikura ku buyobozi",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Ubwoko bw'ifoto wahisemo ntibwemewe. Hemewe gusa: %1",
     "invalid-image-extension": "Impera itemewe igaragaza foruma y'ifoto",
     "invalid-file-type": "Ubwoko bw'ifayilo ntibwemewe. Hemewe gusa: %1",
     "group-name-too-short": "Izina ry'itsinda ni rigufi cyane",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Itsinda ryitwa gutya risanzweho",
     "group-name-change-not-allowed": "Guhindura izina ry'itsinda ntibyemewe",
     "group-already-member": "Already part of this group",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "You are not allowed to edit this message",
     "cant-remove-last-user": "You can't remove the last user",
     "cant-delete-chat-message": "You are not allowed to delete this message",
+    "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Ibijyanye n'itangwa ry'amanota ntibyemerewe. ",
     "downvoting-disabled": "Kwambura amanota ntibyemerewe",
     "not-enough-reputation-to-downvote": "Ntabwo ufite amanota ahagije ngo ube wakwemererwa kugira uwo wambura amanota",
@@ -99,5 +118,6 @@
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
     "no-users-in-room": "Nta muntu uri muri iki gikari",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "You can't kick yourself from the group",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/rw/login.json b/public/language/rw/login.json
index 72ae32e57c..5bdb99dc21 100644
--- a/public/language/rw/login.json
+++ b/public/language/rw/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Wibukwe?",
     "forgot_password": "Wibagiwe ijambobanga?",
     "alternative_logins": "Ukundi Wakwinjiramo",
-    "failed_login_attempt": "Ntiwinjiyemo. Ongera ugerageze. ",
+    "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Winjiyemo nta ngorane!",
     "dont_have_account": "Nta konte ufite?"
 }
\ No newline at end of file
diff --git a/public/language/rw/modules.json b/public/language/rw/modules.json
index e0aff84e80..15d1ea25eb 100644
--- a/public/language/rw/modules.json
+++ b/public/language/rw/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Shyiraho kandi Unafungirane",
     "composer.toggle_dropdown": "Hindura Icyerekezo",
     "composer.uploading": "Ugupakira %1",
+    "composer.formatting.bold": "Bold",
+    "composer.formatting.italic": "Italic",
+    "composer.formatting.list": "List",
+    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Picture",
+    "composer.upload-picture": "Upload Image",
+    "composer.upload-file": "Upload File",
     "bootbox.ok": "Sawa",
     "bootbox.cancel": "Isubire",
     "bootbox.confirm": "Emeza",
diff --git a/public/language/rw/pages.json b/public/language/rw/pages.json
index b59cebf627..d5b70c7ba0 100644
--- a/public/language/rw/pages.json
+++ b/public/language/rw/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Abantu bashyizeho byinshi",
     "users/sort-reputation": "Abantu bafite amanota menshi",
     "users/banned": "Abantu Bakumiriwe",
+    "users/most-flags": "Most flagged users",
     "users/search": "Gushaka Abantu",
     "notifications": "Amatangazo",
     "tags": "Ibimenyetso",
diff --git a/public/language/rw/topic.json b/public/language/rw/topic.json
index b3ba723ec7..261758b052 100644
--- a/public/language/rw/topic.json
+++ b/public/language/rw/topic.json
@@ -26,12 +26,13 @@
     "tools": "Ibikoresho",
     "flag": "Tambikana",
     "locked": "Birafungiranye",
-    "bookmark_instructions": "Kanda hano kugirango usubire ahari ibitarasomwe biheruka muri iki kiganiro.",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Bimenyeshe ubuyobozi",
     "flag_success": "Bimaze kumenyeshwa ubuyobozi ngo bikurikiranwe. ",
     "deleted_message": "Iki kiganiro cyamaze gukurwaho. Abantu babifitiye uburenganzira ni bo bonyine bashobora kukibona. ",
     "following_topic.message": "Ntabwo uzongera kubimenyeshwa nihagira umuntu ugira icyo yandika kuri iki kiganiro. ",
     "not_following_topic.message": "Ntabwo uzongera kujya umenyeshwa ku bibera muri iki kiganiro. ",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "Ba umunyamuryango cyangwa winjiremo niba ushaka kwiyandikisha kuri iki kiganiro. ",
     "markAsUnreadForAll.success": "Ikiganiro kigizwe nk'icyasomwe na bose",
     "mark_unread": "Garagaza nk'ibyasomwe",
@@ -41,6 +42,12 @@
     "watch.title": "Ujye umenyeshwa ibyongerwaho bishya kuri iki kiganiro",
     "unwatch.title": "Rekera aho gucunga iki kiganiro",
     "share_this_post": "Sangiza Ibi",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "Ibikoresho by'Ikiganiro",
     "thread_tools.markAsUnreadForAll": "Bigaragaze nk'Ibyasomwe",
     "thread_tools.pin": "Zamura Ikiganiro",
diff --git a/public/language/rw/unread.json b/public/language/rw/unread.json
index 075fdc7792..07c6e6c04c 100644
--- a/public/language/rw/unread.json
+++ b/public/language/rw/unread.json
@@ -6,5 +6,8 @@
     "selected": "Ibyatoranyijwe",
     "all": "Byose",
     "all_categories": "Ibyiciro Byose",
-    "topics_marked_as_read.success": "Ibiganiro byamaze kugaragazwa nk'ibyasomwe!"
+    "topics_marked_as_read.success": "Ibiganiro byamaze kugaragazwa nk'ibyasomwe!",
+    "all-topics": "All Topics",
+    "new-topics": "New Topics",
+    "watched-topics": "Watched Topics"
 }
\ No newline at end of file
diff --git a/public/language/rw/user.json b/public/language/rw/user.json
index 9ca89d0160..7b92f9a676 100644
--- a/public/language/rw/user.json
+++ b/public/language/rw/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Fungurira imirongo ijya hanze mu idirishya rishya",
     "enable_topic_searching": "Emerera Ugushakira mu Kiganiro",
     "topic_search_help": "Nibyemerwa, ugushakira mu kiganiro bizajya biba ari byo bikorwa maze bitume umuntu abasha gushakira mu kiganiro hose aho gushakira kuri paji igaragarira amaso, imbere yawe gusa",
+    "delay_image_loading": "Delay Image Loading",
+    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
     "scroll_to_my_post": "Nyuma yo gushyiraho igisubizo, hagaragare icyashyizweho gishya",
-    "follow_topics_you_reply_to": "Kurikira ibiganiro ushyiraho ibisubizo",
-    "follow_topics_you_create": "Kurikira ibiganiro uba watangije",
-    "grouptitle": "Hitamo umutwe w'itsinda ushaka ko uzajya ugaragara",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Group Title",
     "no-group-title": "Nta mutwe w'itsinda",
     "select-skin": "Hitamo Uruhu",
     "select-homepage": "Hitamo Paji y'Imbere",
diff --git a/public/language/rw/users.json b/public/language/rw/users.json
index 16993f0592..dc92a1f54b 100644
--- a/public/language/rw/users.json
+++ b/public/language/rw/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Abantu Bashya",
     "top_posters": "Abashyizeho Byinshi",
     "most_reputation": "Abafite Amanota Menshi",
+    "most_flags": "Most Flags",
     "search": "Shaka",
     "enter_username": "Shyiramo izina ryo gushaka",
     "load_more": "Zana Ibindi",
diff --git a/public/language/sc/email.json b/public/language/sc/email.json
index 1b8d512945..691e6309a2 100644
--- a/public/language/sc/email.json
+++ b/public/language/sc/email.json
@@ -24,6 +24,7 @@
     "digest.day": "day",
     "digest.week": "week",
     "digest.month": "month",
+    "digest.subject": "Digest for %1",
     "notif.chat.subject": "New chat message received from %1",
     "notif.chat.cta": "Click here to continue the conversation",
     "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
diff --git a/public/language/sc/error.json b/public/language/sc/error.json
index 0709e823b6..85292ab05e 100644
--- a/public/language/sc/error.json
+++ b/public/language/sc/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Invalid Password",
     "invalid-username-or-password": "Please specify both a username and password",
     "invalid-search-term": "Invalid search term",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "Username taken",
     "email-taken": "Email taken",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
     "email-confirm-failed": "We could not confirm your email, please try again later.",
     "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "Username too short",
     "username-too-long": "Username too long",
     "password-too-long": "Password too long",
     "user-banned": "User banned",
     "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "Category does not exist",
     "no-topic": "Topic does not exist",
     "no-post": "Post does not exist",
@@ -38,6 +41,19 @@
     "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",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
     "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
@@ -55,10 +71,12 @@
     "already-unfavourited": "You have already unbookmarked this post",
     "cant-ban-other-admins": "You can't ban other admins!",
     "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Invalid image type. Allowed types are: %1",
     "invalid-image-extension": "Invalid image extension",
     "invalid-file-type": "Invalid file type. Allowed types are: %1",
     "group-name-too-short": "Group name too short",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Group already exists",
     "group-name-change-not-allowed": "Group name change not allowed",
     "group-already-member": "Already part of this group",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "You are not allowed to edit this message",
     "cant-remove-last-user": "You can't remove the last user",
     "cant-delete-chat-message": "You are not allowed to delete this message",
+    "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Reputation system is disabled.",
     "downvoting-disabled": "Downvoting is disabled",
     "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",
@@ -99,5 +118,6 @@
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
     "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "You can't kick yourself from the group",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/sc/login.json b/public/language/sc/login.json
index 83a84e0ad1..ee7f253df5 100644
--- a/public/language/sc/login.json
+++ b/public/language/sc/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Regorda·mi?",
     "forgot_password": "Password Iscarèssida?",
     "alternative_logins": "Intradas Alternativas",
-    "failed_login_attempt": "Intrada isballiada, pro praghere torra a provare.",
+    "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Ses intradu!",
     "dont_have_account": "Don't have an account?"
 }
\ No newline at end of file
diff --git a/public/language/sc/modules.json b/public/language/sc/modules.json
index 89b779d53e..93c5b11202 100644
--- a/public/language/sc/modules.json
+++ b/public/language/sc/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Submit and Lock",
     "composer.toggle_dropdown": "Toggle Dropdown",
     "composer.uploading": "Uploading %1",
+    "composer.formatting.bold": "Bold",
+    "composer.formatting.italic": "Italic",
+    "composer.formatting.list": "List",
+    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Picture",
+    "composer.upload-picture": "Upload Image",
+    "composer.upload-file": "Upload File",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",
diff --git a/public/language/sc/pages.json b/public/language/sc/pages.json
index a2e82aa90f..51b098ff88 100644
--- a/public/language/sc/pages.json
+++ b/public/language/sc/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Users with the most posts",
     "users/sort-reputation": "Users with the most reputation",
     "users/banned": "Banned Users",
+    "users/most-flags": "Most flagged users",
     "users/search": "User Search",
     "notifications": "Notìficas",
     "tags": "Tags",
diff --git a/public/language/sc/topic.json b/public/language/sc/topic.json
index 1f58d8582d..cae1e2843e 100644
--- a/public/language/sc/topic.json
+++ b/public/language/sc/topic.json
@@ -26,12 +26,13 @@
     "tools": "Ainas",
     "flag": "Signala",
     "locked": "Locked",
-    "bookmark_instructions": "Click here to return to the last unread post in this thread.",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Signala custu arresonu pro sa moderatzione",
     "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": "As a retzire notìficas si calincunu pùblica in custa arresonada.",
     "not_following_topic.message": "No as a retzire prus notìficas pro custa arresonada.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "Pro praghere registra·ti o intra pro sutascrìere custa arresonada.",
     "markAsUnreadForAll.success": "Arresonada marcada comente de lèghere pro totus.",
     "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
     "watch.title": "Be notified of new replies in this topic",
     "unwatch.title": "Stop watching this topic",
     "share_this_post": "Cumpartzi custu Arresonu",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "Topic Tools",
     "thread_tools.markAsUnreadForAll": "Signa comente De Lèghere",
     "thread_tools.pin": "Pone in evidèntzia s'Arresonda",
diff --git a/public/language/sc/unread.json b/public/language/sc/unread.json
index 692bb12f14..3039d0fa6e 100644
--- a/public/language/sc/unread.json
+++ b/public/language/sc/unread.json
@@ -6,5 +6,8 @@
     "selected": "Selected",
     "all": "All",
     "all_categories": "All categories",
-    "topics_marked_as_read.success": "Topics marked as read!"
+    "topics_marked_as_read.success": "Topics marked as read!",
+    "all-topics": "All Topics",
+    "new-topics": "New Topics",
+    "watched-topics": "Watched Topics"
 }
\ No newline at end of file
diff --git a/public/language/sc/user.json b/public/language/sc/user.json
index 2b30121863..f88e8ce20e 100644
--- a/public/language/sc/user.json
+++ b/public/language/sc/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Open outgoing links in new tab",
     "enable_topic_searching": "Enable In-Topic Searching",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
+    "delay_image_loading": "Delay Image Loading",
+    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
     "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Follow topics that you reply to",
-    "follow_topics_you_create": "Follow topics you create",
-    "grouptitle": "Select the group title you would like to display",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Group Title",
     "no-group-title": "No group title",
     "select-skin": "Select a Skin",
     "select-homepage": "Select a Homepage",
diff --git a/public/language/sc/users.json b/public/language/sc/users.json
index 93913a20a3..7c1de58d1a 100644
--- a/public/language/sc/users.json
+++ b/public/language/sc/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Ùrtimos Impitadores",
     "top_posters": "Prus Ativos",
     "most_reputation": "Prus Famados",
+    "most_flags": "Most Flags",
     "search": "Chirca",
     "enter_username": "Pone unu nùmene de impitadore de chircare",
     "load_more": "Càrriga de prus",
diff --git a/public/language/sk/email.json b/public/language/sk/email.json
index 5fb7201bf4..8ad65fe965 100644
--- a/public/language/sk/email.json
+++ b/public/language/sk/email.json
@@ -24,6 +24,7 @@
     "digest.day": "day",
     "digest.week": "week",
     "digest.month": "month",
+    "digest.subject": "Digest for %1",
     "notif.chat.subject": "Máte novú správu od %1",
     "notif.chat.cta": "Kliknite sem pre pokračovanie v konverzácii",
     "notif.chat.unsub.info": "Toto upozornenie o správach ste prijali na základe Vašich nastavení účtu.",
diff --git a/public/language/sk/error.json b/public/language/sk/error.json
index 4d99825f9e..6ab638ca04 100644
--- a/public/language/sk/error.json
+++ b/public/language/sk/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Nesprávne heslo",
     "invalid-username-or-password": "Please specify both a username and password",
     "invalid-search-term": "Invalid search term",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "Užívateľske meno je obsadené",
     "email-taken": "Email je obsadený",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
     "email-confirm-failed": "We could not confirm your email, please try again later.",
     "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "Username too short",
     "username-too-long": "Username too long",
     "password-too-long": "Password too long",
     "user-banned": "Užívateľ je zakázaný",
     "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "Category does not exist",
     "no-topic": "Topic does not exist",
     "no-post": "Post does not exist",
@@ -38,6 +41,19 @@
     "category-disabled": "Kategória je znefunkčená.",
     "topic-locked": "Uzamknutá téma",
     "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
     "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
@@ -55,10 +71,12 @@
     "already-unfavourited": "You have already unbookmarked this post",
     "cant-ban-other-admins": "Nemožte zakázať druhých adminov.",
     "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Invalid image type. Allowed types are: %1",
     "invalid-image-extension": "Invalid image extension",
     "invalid-file-type": "Invalid file type. Allowed types are: %1",
     "group-name-too-short": "Názov skupiny je príliš krátky",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Skupina už existuje",
     "group-name-change-not-allowed": "Nepovolená zmena mena skupiny",
     "group-already-member": "Already part of this group",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "You are not allowed to edit this message",
     "cant-remove-last-user": "You can't remove the last user",
     "cant-delete-chat-message": "You are not allowed to delete this message",
+    "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Reputation system is disabled.",
     "downvoting-disabled": "Downvoting is disabled",
     "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",
@@ -99,5 +118,6 @@
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
     "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "You can't kick yourself from the group",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/sk/login.json b/public/language/sk/login.json
index bc2f675ff2..0736ab4faa 100644
--- a/public/language/sk/login.json
+++ b/public/language/sk/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Zapamätať si ma?",
     "forgot_password": "Zabudol si heslo?",
     "alternative_logins": "Ďalšie spôsoby prihlásenia",
-    "failed_login_attempt": "Prihlásenie sa nepodarilo, skús to znovu.",
+    "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Prihlásenie prebehlo úspešne!",
     "dont_have_account": "Nemáš účet?"
 }
\ No newline at end of file
diff --git a/public/language/sk/modules.json b/public/language/sk/modules.json
index b9be2fb6c3..0268001e7f 100644
--- a/public/language/sk/modules.json
+++ b/public/language/sk/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Submit and Lock",
     "composer.toggle_dropdown": "Toggle Dropdown",
     "composer.uploading": "Uploading %1",
+    "composer.formatting.bold": "Bold",
+    "composer.formatting.italic": "Italic",
+    "composer.formatting.list": "List",
+    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Picture",
+    "composer.upload-picture": "Upload Image",
+    "composer.upload-file": "Upload File",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",
diff --git a/public/language/sk/pages.json b/public/language/sk/pages.json
index f5d5c49231..2774eebd05 100644
--- a/public/language/sk/pages.json
+++ b/public/language/sk/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Users with the most posts",
     "users/sort-reputation": "Users with the most reputation",
     "users/banned": "Banned Users",
+    "users/most-flags": "Most flagged users",
     "users/search": "User Search",
     "notifications": "Notifikácie",
     "tags": "Tagy",
diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json
index 39f4ca03d8..8db00e4e56 100644
--- a/public/language/sk/topic.json
+++ b/public/language/sk/topic.json
@@ -26,12 +26,13 @@
     "tools": "Nástroje",
     "flag": "Označiť",
     "locked": "Locked",
-    "bookmark_instructions": "Click here to return to the last unread post in this thread.",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Označiť príspevok pre moderáciu",
     "flag_success": "Tento príspevok bol označený na úpravu. ",
     "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
     "following_topic.message": "Budete teraz príjimať notifikácie, ked niekto prispeje do témy.",
     "not_following_topic.message": "Nebudete už dostávať notifikácie z tejto Témy",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "Prosím Zaregistrujte sa alebo sa Prihláste, aby ste mohli odoberať túto Tému",
     "markAsUnreadForAll.success": "Téma označená ako neprečítaná pre všetkých.",
     "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
     "watch.title": "Buďte informovaní o nových odpovediach k tejto téme",
     "unwatch.title": "Stop watching this topic",
     "share_this_post": "Zdielaj tento príspevok",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "Topic Tools",
     "thread_tools.markAsUnreadForAll": "Označ ako neprečítané",
     "thread_tools.pin": "Zviditeľniť tému",
diff --git a/public/language/sk/unread.json b/public/language/sk/unread.json
index cd254ebd4a..eed25e3c74 100644
--- a/public/language/sk/unread.json
+++ b/public/language/sk/unread.json
@@ -6,5 +6,8 @@
     "selected": "Vybrané",
     "all": "Všetko",
     "all_categories": "All categories",
-    "topics_marked_as_read.success": "Témy označiť ako prečítané!"
+    "topics_marked_as_read.success": "Témy označiť ako prečítané!",
+    "all-topics": "All Topics",
+    "new-topics": "New Topics",
+    "watched-topics": "Watched Topics"
 }
\ No newline at end of file
diff --git a/public/language/sk/user.json b/public/language/sk/user.json
index 6baaf337ce..7571caab77 100644
--- a/public/language/sk/user.json
+++ b/public/language/sk/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Open outgoing links in new tab",
     "enable_topic_searching": "Enable In-Topic Searching",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
+    "delay_image_loading": "Delay Image Loading",
+    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
     "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Follow topics that you reply to",
-    "follow_topics_you_create": "Follow topics you create",
-    "grouptitle": "Select the group title you would like to display",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Group Title",
     "no-group-title": "No group title",
     "select-skin": "Select a Skin",
     "select-homepage": "Select a Homepage",
diff --git a/public/language/sk/users.json b/public/language/sk/users.json
index 73b24c1744..1c6c9f717e 100644
--- a/public/language/sk/users.json
+++ b/public/language/sk/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Najnovší užívatelia",
     "top_posters": "Najaktívnejší",
     "most_reputation": "Najváženejší",
+    "most_flags": "Most Flags",
     "search": "Vyhľadávať",
     "enter_username": "Zadaj užívateľské meno k hľadaniu",
     "load_more": "Načítať dalšie",
diff --git a/public/language/sl/email.json b/public/language/sl/email.json
index 5007647a0f..b214e979b6 100644
--- a/public/language/sl/email.json
+++ b/public/language/sl/email.json
@@ -24,6 +24,7 @@
     "digest.day": "day",
     "digest.week": "week",
     "digest.month": "month",
+    "digest.subject": "Digest for %1",
     "notif.chat.subject": "Novo sporočilo prejeto na %1",
     "notif.chat.cta": "Kliknite tu za nadaljevanje pogovora",
     "notif.chat.unsub.info": "Obvestilu o pogovoru je bilo poslano zaradi vaših nastavitev obvestil.",
diff --git a/public/language/sl/error.json b/public/language/sl/error.json
index a0453bc488..56e4d080f8 100644
--- a/public/language/sl/error.json
+++ b/public/language/sl/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Napačno geslo",
     "invalid-username-or-password": "Prosimo vpišite uporabniško ime in geslo",
     "invalid-search-term": "Napačna iskalna poizvedba",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "Uporabniško ime je že zasedeno",
     "email-taken": "E-mail naslov je že zaseden",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "Ta forum zahteva potrjen e-mail naslov. Prosim kliknite tu za vnos e-mail naslova.",
     "email-confirm-failed": "Nismo mogli potrditi vašega e-mail naslova. Prosimo poskusite ponovno.",
     "confirm-email-already-sent": "Potrditveni e-mail naslov je že poslan. Prosimo počakajte %1 minut(o) za ponovno pošiljanje.",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "Uporabniško ime je prekratko",
     "username-too-long": "Uporabniško ime je predolgo",
     "password-too-long": "Password too long",
     "user-banned": "Uporabnik je blokiran",
     "user-too-new": "Oprostite, počakajte %1 sekund pred vašo prvo objavo",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "Kategorija ne obstaja",
     "no-topic": "Tema ne obstaja",
     "no-post": "Objava ne obstaja",
@@ -38,6 +41,19 @@
     "category-disabled": "Kategorija onemogočena",
     "topic-locked": "Tema zaklenjena",
     "post-edit-duration-expired": "Urejanje objave je dovoljeno le %1 sekund po prvi objavi.",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Prosimo napišite daljšo objavo. Objave morajo vsebovati vsaj %1 znak(ov).",
     "content-too-long": "Prosimo napišite krajšo objavo. Objave ne smejo vsebovati več kot %1 znak(ov).",
     "title-too-short": "Prosimo vnesite daljši naslov. Naslovi morajo vsebovati vsaj %1 znak(ov).",
@@ -55,10 +71,12 @@
     "already-unfavourited": "You have already unbookmarked this post",
     "cant-ban-other-admins": "Ne morete blokirati drugih administratorjev!",
     "cant-remove-last-admin": "Ste edini administrator. Dodajte novega administratorja preden boste odstranili sebe.",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Nedovoljen format slike. Dovoljeni formati so: %1",
     "invalid-image-extension": "Nedovoljena končnica slike",
     "invalid-file-type": "Nedovoljen format datoteke. Dovoljeni formati so: %1",
     "group-name-too-short": "Ime skupine je prekratko",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Skupina še obstaja",
     "group-name-change-not-allowed": "Sprememba imena skupine ni dovoljena",
     "group-already-member": "Already part of this group",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "You are not allowed to edit this message",
     "cant-remove-last-user": "You can't remove the last user",
     "cant-delete-chat-message": "You are not allowed to delete this message",
+    "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Možnost ugleda je onemogočena.",
     "downvoting-disabled": "Negativno glasovanje je onemogočeno",
     "not-enough-reputation-to-downvote": "Nimate dovolj ugleda za negativno glasovanje",
@@ -99,5 +118,6 @@
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
     "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "You can't kick yourself from the group",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/sl/login.json b/public/language/sl/login.json
index 6955d274bd..7f3d80e3cb 100644
--- a/public/language/sl/login.json
+++ b/public/language/sl/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Spomni me?",
     "forgot_password": "Pozabljeno geslo?",
     "alternative_logins": "Prijava z drugim računom",
-    "failed_login_attempt": "Napačna prijava, prosim poskusi ponovno.",
+    "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Prijava je uspešna.",
     "dont_have_account": "Ali še nimaš uporabniškega računa?"
 }
\ No newline at end of file
diff --git a/public/language/sl/modules.json b/public/language/sl/modules.json
index 911a9f1588..a9b88e3019 100644
--- a/public/language/sl/modules.json
+++ b/public/language/sl/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Pošlji in zakleni",
     "composer.toggle_dropdown": "Preklopi spustni meni",
     "composer.uploading": "Uploading %1",
+    "composer.formatting.bold": "Bold",
+    "composer.formatting.italic": "Italic",
+    "composer.formatting.list": "List",
+    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Picture",
+    "composer.upload-picture": "Upload Image",
+    "composer.upload-file": "Upload File",
     "bootbox.ok": "Vredu",
     "bootbox.cancel": "Prekliči",
     "bootbox.confirm": "Potrdi",
diff --git a/public/language/sl/pages.json b/public/language/sl/pages.json
index 3c206aadf4..118bb4201a 100644
--- a/public/language/sl/pages.json
+++ b/public/language/sl/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Uporabniki z največ objavami",
     "users/sort-reputation": "Uporabniki najbolj vredni zaupanja",
     "users/banned": "Banned Users",
+    "users/most-flags": "Most flagged users",
     "users/search": "Iskanje uporabnikov",
     "notifications": "Obvestila",
     "tags": "Oznake",
diff --git a/public/language/sl/topic.json b/public/language/sl/topic.json
index 503f7ee250..00eadc76e0 100644
--- a/public/language/sl/topic.json
+++ b/public/language/sl/topic.json
@@ -26,12 +26,13 @@
     "tools": "Orodja",
     "flag": "Prijavi",
     "locked": "Zaklenjeno",
-    "bookmark_instructions": "Click here to return to the last unread post in this thread.",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Prijavi to objavo v pregled administratorju",
     "flag_success": "Ta objava je bila prijavljena v pregled administratorju.",
     "deleted_message": "Ta tema je bila izbrisana. Le uporabniki s pravicami teme jo lahko vidijo.",
     "following_topic.message": "Sedaj boste dobili obvestila, ko bo nekdo objavil v to temo.",
     "not_following_topic.message": "Ne boste več prejemali obvestil s te teme.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "Prosimo prijavite ali registrirajte se za naročanje o tej temi.",
     "markAsUnreadForAll.success": "Tema označena kot neprebrana za vse.",
     "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
     "watch.title": "Bodi obveščen o novih odgovorih v tej temi",
     "unwatch.title": "Prenehaj spremljati to temo",
     "share_this_post": "Deli to objavo",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "Orodja teme",
     "thread_tools.markAsUnreadForAll": "Označi kot neprebrano",
     "thread_tools.pin": "Prilepi temo",
diff --git a/public/language/sl/unread.json b/public/language/sl/unread.json
index 73f87fdfe1..d63d75cb61 100644
--- a/public/language/sl/unread.json
+++ b/public/language/sl/unread.json
@@ -6,5 +6,8 @@
     "selected": "Izbrano",
     "all": "Vse",
     "all_categories": "Vse kategorije",
-    "topics_marked_as_read.success": "Teme označene kot prebrane!"
+    "topics_marked_as_read.success": "Teme označene kot prebrane!",
+    "all-topics": "All Topics",
+    "new-topics": "New Topics",
+    "watched-topics": "Watched Topics"
 }
\ No newline at end of file
diff --git a/public/language/sl/user.json b/public/language/sl/user.json
index 2f13808e59..25e97a8ef3 100644
--- a/public/language/sl/user.json
+++ b/public/language/sl/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Zunanje povezave odpri v novem zavihku",
     "enable_topic_searching": "Omogoči iskanje znotraj teme",
     "topic_search_help": "Če omogočite, bo iskanje prepisalo brskalnikove prevzete nastavitve in vam omogočilo iskanje skozi celotno temo.",
+    "delay_image_loading": "Delay Image Loading",
+    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
     "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Spremljaj teme v katerih si sodeloval",
-    "follow_topics_you_create": "Spremljaj teme, ki si jih ustvaril/a",
-    "grouptitle": "Izberi ime skupine za prikaz",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Group Title",
     "no-group-title": "Skupina nima imena",
     "select-skin": "Izberi obliko",
     "select-homepage": "Select a Homepage",
diff --git a/public/language/sl/users.json b/public/language/sl/users.json
index 4441c34e62..d2b634cd56 100644
--- a/public/language/sl/users.json
+++ b/public/language/sl/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Zadnji uporabniki",
     "top_posters": "Najboljši uporabniki",
     "most_reputation": "Največ ugleda",
+    "most_flags": "Most Flags",
     "search": "Išči",
     "enter_username": "Za iskanje vpiši uporabniško ime",
     "load_more": "Naloži več",
diff --git a/public/language/sr/email.json b/public/language/sr/email.json
index a9ef2f8954..885e6d2cbd 100644
--- a/public/language/sr/email.json
+++ b/public/language/sr/email.json
@@ -21,9 +21,10 @@
     "digest.cta": "Кликните овде да посетите %1",
     "digest.unsub.info": "Овај резиме је послат вама због претплате.",
     "digest.no_topics": "Није било активних тема у последњих %1",
-    "digest.day": "day",
-    "digest.week": "week",
-    "digest.month": "month",
+    "digest.day": "Дан",
+    "digest.week": "Недеља",
+    "digest.month": "Месец",
+    "digest.subject": "Digest for %1",
     "notif.chat.subject": "Примљена је нова порука ћаскања од %1",
     "notif.chat.cta": "Кликните овде да наставите са разговором",
     "notif.chat.unsub.info": "Ова нотификација је послата вама због претплате коју имате.",
diff --git a/public/language/sr/error.json b/public/language/sr/error.json
index 25e4d1b130..093feca88a 100644
--- a/public/language/sr/error.json
+++ b/public/language/sr/error.json
@@ -14,20 +14,23 @@
     "invalid-password": "Неисправна лозинка",
     "invalid-username-or-password": "Молимо наведите и корисничко име и лозинку",
     "invalid-search-term": "Неисправан упит за претрагу",
-    "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
+    "invalid-pagination-value": "Неважећа вредност при обележавању страна, мора бити најмање %1 и највише %2 ",
     "username-taken": "Корисничко име је заузето",
     "email-taken": "Адреса е-поште је заусета",
     "email-not-confirmed": "Ваша адреса е-поште жоуш увек није оверена, кликните овде да би сте то учинили.",
     "email-not-confirmed-chat": "Није вам дозвољено да ћаскате док не оверите вашу е-пошту, клкните овде да то учините.",
-    "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
-    "email-confirm-failed": "We could not confirm your email, please try again later.",
-    "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
-    "username-too-short": "Username too short",
-    "username-too-long": "Username too long",
-    "password-too-long": "Password too long",
-    "user-banned": "User banned",
+    "no-email-to-confirm": "Форум захтева потврду е-поште, кликните овде да бисте отворили е-пошту",
+    "email-confirm-failed": "Потврда е-поште није успела, молимо вас да покушате касније.",
+    "confirm-email-already-sent": "Конфирмациони имејл је већ послат, молимо вас да сачекате %1 минут(а) да бисте послали други.",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
+    "username-too-short": "Корисничко име је прекратко",
+    "username-too-long": "Корисничко име је предуго",
+    "password-too-long": "Шифра је предугачка.",
+    "user-banned": "Члан банован",
     "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "Категорија не постоји",
     "no-topic": "Тема не постоји",
     "no-post": "Порука не постоји",
@@ -38,6 +41,19 @@
     "category-disabled": "Category disabled",
     "topic-locked": "Тема је закључана",
     "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
     "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
@@ -55,10 +71,12 @@
     "already-unfavourited": "You have already unbookmarked this post",
     "cant-ban-other-admins": "You can't ban other admins!",
     "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Invalid image type. Allowed types are: %1",
     "invalid-image-extension": "Неважећи тип слике",
     "invalid-file-type": "Неважећи тип фајла. Дозвољени су: %1",
     "group-name-too-short": "Име групе је прекратко",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Група већ постоји",
     "group-name-change-not-allowed": "Мењање имена групе није дозвољено",
     "group-already-member": "Already part of this group",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "You are not allowed to edit this message",
     "cant-remove-last-user": "You can't remove the last user",
     "cant-delete-chat-message": "You are not allowed to delete this message",
+    "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Reputation system is disabled.",
     "downvoting-disabled": "Downvoting is disabled",
     "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",
@@ -99,5 +118,6 @@
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
     "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "You can't kick yourself from the group",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/sr/login.json b/public/language/sr/login.json
index 8fefdb9068..abcf584db7 100644
--- a/public/language/sr/login.json
+++ b/public/language/sr/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Памти ме?",
     "forgot_password": "Заборављена лозинка?",
     "alternative_logins": "Алтернативно пријављивање",
-    "failed_login_attempt": "Неуспело пријављивање, покушајте поново.",
+    "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Успешно сте се пријавили!",
     "dont_have_account": "Немате налог?"
 }
\ No newline at end of file
diff --git a/public/language/sr/modules.json b/public/language/sr/modules.json
index 412f9fd207..24d2e521f9 100644
--- a/public/language/sr/modules.json
+++ b/public/language/sr/modules.json
@@ -6,7 +6,7 @@
     "chat.user_typing": "%1 куца ...",
     "chat.user_has_messaged_you": "%1 вам посла поруку.",
     "chat.see_all": "Погледајте сва ћаскања",
-    "chat.mark_all_read": "Mark all chats read",
+    "chat.mark_all_read": "Означи све разговоре као прочитане",
     "chat.no-messages": "Изаберите примаоца да бисте видели историју ћаскања",
     "chat.no-users-in-room": "Нема корисника у овој соби",
     "chat.recent-chats": "Недавна ћаскања",
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Пошаљи и закључај",
     "composer.toggle_dropdown": "Подесите \"Dropdown\"",
     "composer.uploading": "Убацивање %1",
+    "composer.formatting.bold": "Bold",
+    "composer.formatting.italic": "Italic",
+    "composer.formatting.list": "List",
+    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Picture",
+    "composer.upload-picture": "Upload Image",
+    "composer.upload-file": "Upload File",
     "bootbox.ok": "ОК",
     "bootbox.cancel": "Откажи",
     "bootbox.confirm": "Потврди",
diff --git a/public/language/sr/pages.json b/public/language/sr/pages.json
index 0e7387583e..f9b4a45f87 100644
--- a/public/language/sr/pages.json
+++ b/public/language/sr/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Users with the most posts",
     "users/sort-reputation": "Users with the most reputation",
     "users/banned": "Banned Users",
+    "users/most-flags": "Most flagged users",
     "users/search": "User Search",
     "notifications": "Обавештења",
     "tags": "Ознаке",
diff --git a/public/language/sr/topic.json b/public/language/sr/topic.json
index 37e042c18f..18b2227b96 100644
--- a/public/language/sr/topic.json
+++ b/public/language/sr/topic.json
@@ -26,12 +26,13 @@
     "tools": "Алатке",
     "flag": "Означи",
     "locked": "Закључан",
-    "bookmark_instructions": "Click here to return to the last unread post in this thread.",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Flag this post for moderation",
     "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.",
     "not_following_topic.message": "You will no longer receive notifications from this topic.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
     "markAsUnreadForAll.success": "Topic marked as unread for all.",
     "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
     "watch.title": "Be notified of new replies in this topic",
     "unwatch.title": "Stop watching this topic",
     "share_this_post": "Share this Post",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "Алатке теме",
     "thread_tools.markAsUnreadForAll": "Означи као непрочитано",
     "thread_tools.pin": "Pin Topic",
diff --git a/public/language/sr/unread.json b/public/language/sr/unread.json
index 3fe33d78e0..a811fd23d4 100644
--- a/public/language/sr/unread.json
+++ b/public/language/sr/unread.json
@@ -6,5 +6,8 @@
     "selected": "Изабране",
     "all": "Све",
     "all_categories": "Све категорије",
-    "topics_marked_as_read.success": "Теме означене као прочитане!"
+    "topics_marked_as_read.success": "Теме означене као прочитане!",
+    "all-topics": "All Topics",
+    "new-topics": "New Topics",
+    "watched-topics": "Watched Topics"
 }
\ No newline at end of file
diff --git a/public/language/sr/user.json b/public/language/sr/user.json
index 66280af2d3..4cd8f93f74 100644
--- a/public/language/sr/user.json
+++ b/public/language/sr/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Open outgoing links in new tab",
     "enable_topic_searching": "Enable In-Topic Searching",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
+    "delay_image_loading": "Delay Image Loading",
+    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
     "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Follow topics that you reply to",
-    "follow_topics_you_create": "Follow topics you create",
-    "grouptitle": "Select the group title you would like to display",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Group Title",
     "no-group-title": "No group title",
     "select-skin": "Select a Skin",
     "select-homepage": "Select a Homepage",
diff --git a/public/language/sr/users.json b/public/language/sr/users.json
index 6308354310..fc774b20b2 100644
--- a/public/language/sr/users.json
+++ b/public/language/sr/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Последњи корисник",
     "top_posters": "Највише порука",
     "most_reputation": "Највећи углед",
+    "most_flags": "Most Flags",
     "search": "Претрага",
     "enter_username": "Унесите корисничко име за претрагу",
     "load_more": "Учитај више",
diff --git a/public/language/sv/category.json b/public/language/sv/category.json
index 12204804ed..6736de62eb 100644
--- a/public/language/sv/category.json
+++ b/public/language/sv/category.json
@@ -6,7 +6,7 @@
     "no_topics": "<strong>Det finns inga ämnen i denna kategori.</strong><br />Varför skapar inte du ett ämne?",
     "browsing": "läser",
     "no_replies": "Ingen har svarat",
-    "no_new_posts": "Inga nya inlägg",
+    "no_new_posts": "Inga nya inlägg.",
     "share_this_category": "Dela den här kategorin",
     "watch": "Bevaka",
     "ignore": "Ignorera",
diff --git a/public/language/sv/email.json b/public/language/sv/email.json
index 7d10363d97..6780dc6f92 100644
--- a/public/language/sv/email.json
+++ b/public/language/sv/email.json
@@ -5,31 +5,32 @@
     "greeting_no_name": "Hej",
     "greeting_with_name": "Hej %1",
     "welcome.text1": "Tack för att du registerar dig på %1!",
-    "welcome.text2": "För att slutföra aktiveringen av ditt konto, behöver vi verifiera att du har tillgång till den epostadress du registrerade dig med.",
+    "welcome.text2": "För att slutföra aktiveringen av ditt konto, behöver vi verifiera att du har tillgång till den e-postadress du registrerade dig med.",
     "welcome.text3": "En administrator har accepterat din registreringsansökan. Du kan logga in med ditt användarnamn och lösenord nu.",
-    "welcome.cta": "Klicka här för att bekräfta din epostadress ",
+    "welcome.cta": "Klicka här för att bekräfta din e-postadress ",
     "invitation.text1": "%1 har bjudit in dig till %2",
     "invitation.ctr": "Klicka här för att skapa ditt konto.",
     "reset.text1": "Vi fick en förfrågan om att återställa ditt lösenord, möjligen för att du har glömt det. Om detta inte är fallet, så kan du bortse från det här epostmeddelandet. ",
     "reset.text2": "För att fortsätta med återställning av lösenordet så kan du klicka på följande länk:",
     "reset.cta": "Klicka här för att återställa ditt lösenord",
     "reset.notify.subject": "Lösenordet ändrat",
-    "reset.notify.text1": "Vi vill uppmärksamma dig på att ditt lösenord ändrades den %1",
-    "reset.notify.text2": "Om du inte godkänt det här så vänligen kontakta en admin snarast. ",
+    "reset.notify.text1": "Vi vill uppmärksamma dig på att ditt lösenord ändrades den %1.",
+    "reset.notify.text2": "Om du inte godkänt det här så vänligen kontakta en administratör snarast. ",
     "digest.notifications": "Du har olästa notiser från %1:",
     "digest.latest_topics": "Senaste ämnen från %1",
     "digest.cta": "Klicka här för att besöka %1",
     "digest.unsub.info": "Det här meddelandet fick du på grund av dina inställningar för prenumeration. ",
-    "digest.no_topics": "Inga aktiva ämnen dom senaste %1",
-    "digest.day": "day",
-    "digest.week": "week",
-    "digest.month": "month",
-    "notif.chat.subject": "Nytt chatt-meddelande från %1",
+    "digest.no_topics": "Inga aktiva ämnen de senaste %1",
+    "digest.day": "dag",
+    "digest.week": "vecka",
+    "digest.month": "månad",
+    "digest.subject": "Sammanställt flöde för %1",
+    "notif.chat.subject": "Nytt meddelande från %1",
     "notif.chat.cta": "Klicka här för att fortsätta konversationen",
-    "notif.chat.unsub.info": "Denna chatt-notifikation skickades till dig på grund av dina inställningar för prenumerationer.",
+    "notif.chat.unsub.info": "Denna notifikation skickades till dig på grund av dina inställningar för prenumerationer.",
     "notif.post.cta": "Klicka här för att läsa hela ämnet",
     "notif.post.unsub.info": "Det här meddelandet fick du på grund av dina inställningar för prenumeration. ",
-    "test.text1": "\nDet här är ett textmeddelande som verifierar att eposten är korrekt installerat för din NodeBB. ",
-    "unsub.cta": "Klicka här för att ändra dom inställningarna",
+    "test.text1": "\nDet här är ett testmeddelande som verifierar att e-posten är korrekt installerad för din NodeBB. ",
+    "unsub.cta": "Klicka här för att ändra inställningarna",
     "closing": "Tack!"
 }
\ No newline at end of file
diff --git a/public/language/sv/error.json b/public/language/sv/error.json
index efb83e5014..702808d4ca 100644
--- a/public/language/sv/error.json
+++ b/public/language/sv/error.json
@@ -14,7 +14,8 @@
     "invalid-password": "Ogiltigt lösenord",
     "invalid-username-or-password": "Specificera både användarnamn och lösenord",
     "invalid-search-term": "Ogiltig sökterm",
-    "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
+    "csrf-invalid": "Det gick inte att logga in dig, sannolikt på grund av en utgången session. Var god försök igen",
+    "invalid-pagination-value": "Ogiltigt värde för siduppdelning. Värdet måste vara mellan %1 och %2",
     "username-taken": "Användarnamn upptaget",
     "email-taken": "Epostadress upptagen",
     "email-not-confirmed": "Din epostadress är ännu inte bekräftad. Klicka här för att bekräfta din epostadress.",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "Detta forum kräver bekräftning av epostadresser, var god klicka här för att fylla i en epostadress",
     "email-confirm-failed": "Vi kunde ej bekräfta din epostadress, var god försök igen senare.",
     "confirm-email-already-sent": "Bekräftningsbrev redan skickat, var god vänta %1 minut(er) innan du skickar ett nytt.",
+    "sendmail-not-found": "Kunde inte hitta Sendmail, vänligen se till att den är installerad och får köras av den användare som kör NodeBB.",
     "username-too-short": "Användarnamnet är för kort",
     "username-too-long": "Användarnamnet är för långt",
-    "password-too-long": "Password too long",
+    "password-too-long": "Lösenordet är för långt",
     "user-banned": "Användare bannlyst",
     "user-too-new": "När du är ny medlem måste du vänta %1 sekund(er) innan du gör ditt första inlägg",
-    "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "blacklisted-ip": "Din IP-adress har blivit bannlyst från det här forumet. Om du tror att det beror på ett misstag, vad god kontakta en administratör. ",
+    "ban-expiry-missing": "Ange ett slutdatum för denna banning",
     "no-category": "Kategorin finns inte",
     "no-topic": "Ämnet finns inte",
     "no-post": "Inlägget finns inte",
@@ -38,31 +41,46 @@
     "category-disabled": "Kategorin inaktiverad",
     "topic-locked": "Ämnet låst",
     "post-edit-duration-expired": "Du kan endast ändra inlägg inom %1 sekund(er) efter att ha skickat det",
+    "post-edit-duration-expired-minutes": "Du kan endast ändra inlägg inom %1 minut(er) efter att ha skickat det",
+    "post-edit-duration-expired-minutes-seconds": "Du kan endast ändra inlägg inom %1 minut(er) %2 sekund(er) efter att ha skickat det",
+    "post-edit-duration-expired-hours": "Du kan endast ändra inlägg inom %1 timm(ar) efter att ha skickat det",
+    "post-edit-duration-expired-hours-minutes": "Du kan endast ändra inlägg inom %1 timm(ar) %2 minut(er) efter att ha skickat det",
+    "post-edit-duration-expired-days": "Du kan endast ändra inlägg inom %1 dag(ar) efter att ha skickat det",
+    "post-edit-duration-expired-days-hours": "Du kan endast ändra inlägg inom %1 dag(ar) %2 timm(ar) efter att ha skickat det",
+    "post-delete-duration-expired": "Du kan endast radera inlägg inom %1 sekund(er) efter att ha skickat det",
+    "post-delete-duration-expired-minutes": "Du kan endast radera inlägg inom %1 minut(er) efter att ha skickat det",
+    "post-delete-duration-expired-minutes-seconds": "Du kan endast radera inlägg inom %1 minut(er) %2 sekund(er) efter att ha skickat det",
+    "post-delete-duration-expired-hours": "Du kan endast radera inlägg inom %1 timm(ar) efter att ha skickat det",
+    "post-delete-duration-expired-hours-minutes": "Du kan endast radera inlägg inom %1 timmar(er) %2 minut(er) efter att ha skickat det",
+    "post-delete-duration-expired-days": "Du kan endast radera inlägg inom %1 dag(ar) efter att ha skickat det",
+    "post-delete-duration-expired-days-hours": "Du kan endast radera inlägg inom %1 dag(ar) %2 timm(ar) efter att ha skickat det",
     "content-too-short": "Skriv ett längre inlägg. Inlägg måste innehålla minst %1 tecken.",
     "content-too-long": "Skriv ett kortare inlägg. Inlägg kan inte innehålla mer än %1 tecken.",
     "title-too-short": "Skriv en längre rubrik. Rubriker måste innehålla minst %1 tecken.",
     "title-too-long": "Skriv en kortare rubrik. Rubriker kan inte innehålla mer än %1 tecken.",
     "too-many-posts": "Du måste vänta minst %1 sekund(er) mellan varje inlägg",
     "too-many-posts-newbie": "Som ny användare måste du vänta %1 sekund(er) mellan varje inlägg tills dess du har %2 förtroende",
-    "tag-too-short": "Fyll i ett längre märkord. Märkord måste vara minst %1 tecken långa",
-    "tag-too-long": "Fyll i ett kortare märkord. Märkord kan ej vara längre än %1 tecken långa",
-    "not-enough-tags": "Ej tillräckligt många märkord. Ämnen måste ha minst %1 märkord",
-    "too-many-tags": "För många märkord. Ämnen kan ej har mer än %1 märkord",
+    "tag-too-short": "Fyll i en längre tagg. Taggar måste vara minst %1 tecken långa",
+    "tag-too-long": "Fyll i en kortare tagg. Taggar kan ej vara längre än %1 tecken långa",
+    "not-enough-tags": "Otillräckligt antal taggar. Ämnen måste ha minst %1 taggar",
+    "too-many-tags": "För många taggar. Ämnen kan ej har mer än %1 tagg(ar)",
     "still-uploading": "Vänta medan uppladdningen slutförs.",
-    "file-too-big": "Den maximalt tillåtna filstorleken är %1 kB - ladda upp en mindre fil",
-    "guest-upload-disabled": "Guest uploading has been disabled",
-    "already-favourited": "You have already bookmarked this post",
-    "already-unfavourited": "You have already unbookmarked this post",
-    "cant-ban-other-admins": "Du kan inte bannlysa andra administratörer.",
+    "file-too-big": "Den maximalt tillåtna filstorleken är %1 kB - var god ladda upp en mindre fil",
+    "guest-upload-disabled": "Uppladdningar av oregistrerade användare har inaktiverats",
+    "already-favourited": "Du har redan lagt till bokmärke för det här inlägget",
+    "already-unfavourited": "Du har redan tagit bort bokmärket för det här inlägget",
+    "cant-ban-other-admins": "Du kan inte bannlysa andra administratörer!",
     "cant-remove-last-admin": "Du är den enda administratören. Lägg till en annan användare som administratör innan du tar bort dig själv.",
+    "cant-delete-admin": "Ta bort administratörsbehörighet från detta konto innan du försöker ta bort den.",
     "invalid-image-type": "Ogiltig bildtyp. Tillåtna typer är: % 1",
     "invalid-image-extension": "Ogiltigt bildformat",
     "invalid-file-type": "Ogiltig filtyp. Tillåtna typer är: % 1",
     "group-name-too-short": "Gruppnamnet är för kort",
+    "group-name-too-long": "Gruppnamnet är för långt",
     "group-already-exists": "Gruppen existerar redan",
     "group-name-change-not-allowed": "Gruppnamnet får inte ändras",
-    "group-already-member": "Already part of this group",
-    "group-not-member": "Not a member of this group",
+    "group-already-member": "Redan i denna grupp",
+    "group-not-member": "Ej medlem av denna grupp",
     "group-needs-owner": "Gruppen kräver minst en ägare",
     "group-already-invited": "Användaren har redan bjudits in",
     "group-already-requested": "Din medlemsskapsförfrågan har redan skickats",
@@ -70,34 +88,36 @@
     "post-already-restored": "Inlägget är redan återställt",
     "topic-already-deleted": "Ämnet är redan raderat",
     "topic-already-restored": "Ämnet är redan återställt",
-    "cant-purge-main-post": "Huvudinlägg kan ej rensas, ta bort ämnet istället",
+    "cant-purge-main-post": "Huvudinlägg kan ej rensas bort, ta bort ämnet istället",
     "topic-thumbnails-are-disabled": "Miniatyrbilder för ämnen är inaktiverat",
     "invalid-file": "Ogiltig fil",
     "uploads-are-disabled": "Uppladdningar är inaktiverat",
     "signature-too-long": "Din signatur kan inte vara längre än %1 tecken.",
-    "about-me-too-long": "Din om mig kan inte vara längre än %1 tecken.",
-    "cant-chat-with-yourself": "Du kan inte chatta med dig själv.",
-    "chat-restricted": "Denna användaren har begränsat sina chatt-meddelanden. Användaren måste följa dig innan ni kan chatta med varann",
-    "chat-disabled": "Chat system disabled",
+    "about-me-too-long": "Din text om dig själv kan inte vara längre än %1 tecken.",
+    "cant-chat-with-yourself": "Du kan inte chatta med dig själv!",
+    "chat-restricted": "Denna användaren har begränsat sina meddelanden. Användaren måste följa dig innan ni kan chatta med varandra",
+    "chat-disabled": "Chatten är inaktiverad",
     "too-many-messages": "Du har skickat för många meddelanden, var god vänta",
     "invalid-chat-message": "Ogiltigt chattmeddelande",
     "chat-message-too-long": "Chattmeddelande är för långt",
-    "cant-edit-chat-message": "You are not allowed to edit this message",
-    "cant-remove-last-user": "You can't remove the last user",
-    "cant-delete-chat-message": "You are not allowed to delete this message",
+    "cant-edit-chat-message": "Du har inte rättigheter att redigera det här meddelandet",
+    "cant-remove-last-user": "Du kan inte ta bort den sista användaren",
+    "cant-delete-chat-message": "Du har inte rättigheter att radera det här meddelandet",
+    "already-voting-for-this-post": "Du har redan röstat på det här inlägget.",
     "reputation-system-disabled": "Ryktessystemet är inaktiverat.",
     "downvoting-disabled": "Nedröstning är inaktiverat",
     "not-enough-reputation-to-downvote": "Du har inte tillräckligt förtroende för att rösta ner det här meddelandet",
     "not-enough-reputation-to-flag": "Du har inte tillräckligt förtroende för att flagga det här inlägget.",
     "already-flagged": "Du har redan flaggat det här inlägget",
-    "reload-failed": "NodeBB stötte på problem med att ladda om: \"%1\". NodeBB kommer fortsätta servera den befintliga resurser till klienten, men du borde återställa det du gjorde alldeles innan du försökte ladda om.",
+    "reload-failed": "NodeBB stötte på problem med att ladda om: \"%1\". NodeBB kommer fortsätta servera befintliga resurser till klienten, men du borde återställa det du gjorde innan du försökte ladda om.",
     "registration-error": "Registreringsfel",
     "parse-error": "Något gick fel vid tolkning av svar från servern",
-    "wrong-login-type-email": "Använd din e-post adress för att logga in",
+    "wrong-login-type-email": "Använd din e-postadress för att logga in",
     "wrong-login-type-username": "Använd ditt användarnamn för att logga in",
-    "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
-    "no-session-found": "No login session found!",
-    "not-in-room": "User not in room",
-    "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "invite-maximum-met": "Du har bjudit in det maximala antalet användare (%1 av %2)",
+    "no-session-found": "Ingen login-session hittades!",
+    "not-in-room": "Användaren finns inte i rummet",
+    "no-users-in-room": "Inga användare i det här rummet",
+    "cant-kick-self": "Du kan inte sparka ut dig själv från gruppen",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/sv/global.json b/public/language/sv/global.json
index a9cb801869..d6f66b4dab 100644
--- a/public/language/sv/global.json
+++ b/public/language/sv/global.json
@@ -2,13 +2,13 @@
     "home": "Hem",
     "search": "Sök",
     "buttons.close": "Stäng",
-    "403.title": "Tillgång Nekad",
+    "403.title": "Tillgång nekad",
     "403.message": "Du verkar ha ramlat in på en sida du ej har tillgång till.",
     "403.login": "Du kanske bör <a href='%1/login'>försöka logga in</a>?",
     "404.title": "Sidan saknas",
     "404.message": "Du verkar ha ramlat in på en sida som inte finns. Återgå till <a href='%1/'>första sidan</a>.",
     "500.title": "Internt fel.",
-    "500.message": "Hoppsan! Verkar som att något gått snett!",
+    "500.message": "Hoppsan! Något verkar ha gått fel!",
     "register": "Registrera",
     "login": "Logga in",
     "please_log_in": "Var god logga in",
@@ -25,7 +25,7 @@
     "header.categories": "Kategorier",
     "header.recent": "Senaste",
     "header.unread": "Olästa",
-    "header.tags": "Märkningar",
+    "header.tags": "Taggar",
     "header.popular": "Populära",
     "header.users": "Användare",
     "header.groups": "Grupper",
@@ -33,15 +33,15 @@
     "header.notifications": "Notiser",
     "header.search": "Sök",
     "header.profile": "Profil",
-    "header.navigation": "Navigation",
-    "notifications.loading": "Laddar Notiser",
-    "chats.loading": "Laddar Chattar",
-    "motd.welcome": "Välkommen till NodeBB, framtidens diskussions-plattform.",
+    "header.navigation": "Navigering",
+    "notifications.loading": "Laddar notiser",
+    "chats.loading": "Laddar chattar",
+    "motd.welcome": "Välkommen till NodeBB, framtidens diskussionsplattform.",
     "previouspage": "Föregående sida",
     "nextpage": "Nästa sida",
-    "alert.success": "success",
+    "alert.success": "Lyckat",
     "alert.error": "Fel",
-    "alert.banned": "Bannad",
+    "alert.banned": "Bannlyst",
     "alert.banned.message": "Du har blivit bannlyst och kommer nu att loggas ut. ",
     "alert.unfollow": "Du följer inte längre %1!",
     "alert.follow": "Du följer nu %1!",
@@ -49,46 +49,46 @@
     "users": "Användare",
     "topics": "Ämnen",
     "posts": "Inlägg",
-    "best": "Best",
-    "upvoted": "Upvoted",
-    "downvoted": "Downvoted",
+    "best": "Bästa",
+    "upvoted": "Uppröstad",
+    "downvoted": "Nedröstad",
     "views": "Visningar",
     "reputation": "Rykte",
     "read_more": "läs mer",
     "more": "Mer",
     "posted_ago_by_guest": "inskickad %1 av anonym",
     "posted_ago_by": "inskickad %1 av %2",
-    "posted_ago": "inskickad %1",
-    "posted_in": "posted in %1",
-    "posted_in_by": "posted in %1 by %2",
+    "posted_ago": "postat %1",
+    "posted_in": "postat i %1",
+    "posted_in_by": "postat i %1 av %2",
     "posted_in_ago": "inskickad i %1 %2",
-    "posted_in_ago_by": "inskickad i %1 %2 av %3",
-    "user_posted_ago": "%1 skickades in %2",
-    "guest_posted_ago": "Anonym skickade in %1",
-    "last_edited_by": "last edited by %1",
+    "posted_in_ago_by": "postat i %1 %2 av %3",
+    "user_posted_ago": "%1 postades %2",
+    "guest_posted_ago": "Anonym postade %1",
+    "last_edited_by": "Senaste redigerad av %1",
     "norecentposts": "Inga nya inlägg",
     "norecenttopics": "Inga nya ämnen",
-    "recentposts": "Senaste ämnena",
+    "recentposts": "Senaste inläggen",
     "recentips": "Nyligen inloggade IPn",
     "away": "Borta",
-    "dnd": "Do not disturb",
+    "dnd": "Stör inte",
     "invisible": "Osynlig",
     "offline": "Offline",
-    "email": "Epost",
+    "email": "E-post",
     "language": "Språk",
     "guest": "Anonym",
     "guests": "Anonyma",
-    "updated.title": "Forum uppdaterades",
+    "updated.title": "Forumet uppdaterades",
     "updated.message": "Det här forumet har nu uppdaterats till senaste versionen. Klicka här för att ladda om sidan.",
     "privacy": "Integritet",
     "follow": "Följ",
     "unfollow": "Sluta följ",
-    "delete_all": "Ta bort Alla",
-    "map": "Map",
-    "sessions": "Login Sessions",
-    "ip_address": "IP Address",
-    "enter_page_number": "Enter page number",
-    "upload_file": "Upload file",
-    "upload": "Upload",
-    "allowed-file-types": "Allowed file types are %1"
+    "delete_all": "Ta bort alla",
+    "map": "Karta",
+    "sessions": "Login-sessioner",
+    "ip_address": "IP-adress",
+    "enter_page_number": "Skriv in sidnummer",
+    "upload_file": "Ladda upp en fil",
+    "upload": "Ladda upp",
+    "allowed-file-types": "Tillåtna filtyper är %1"
 }
\ No newline at end of file
diff --git a/public/language/sv/groups.json b/public/language/sv/groups.json
index 2fa0d40823..a88962291c 100644
--- a/public/language/sv/groups.json
+++ b/public/language/sv/groups.json
@@ -7,30 +7,30 @@
     "pending.accept": "Acceptera",
     "pending.reject": "Neka",
     "pending.accept_all": "Acceptera alla",
-    "pending.reject_all": "Neka alla",
+    "pending.reject_all": "Avvisa alla",
     "pending.none": "Det finns inga väntande medlemmar just nu",
     "invited.none": "Det finns inga inbjudna medlemmar just nu",
     "invited.uninvite": "Dra tillbaka inbjudan",
     "invited.search": "Sök efter en användare att lägga till i denna grupp",
-    "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>",
+    "invited.notification_title": "Du har blivit inbjuden att bli medlem i <strong>%1</strong>",
+    "request.notification_title": "Förfrågan om gruppmedlemskap från <strong>%1</strong>",
+    "request.notification_text": "<strong>%1</strong> har skickat en förfrågan om medlemskap i <strong>%2</strong>",
     "cover-save": "Spara",
     "cover-saving": "Sparar",
     "details.title": "Detaljer för gruppen ",
-    "details.members": "Medlemmar",
+    "details.members": "Medlemslista",
     "details.pending": "Väntande medlemmar",
     "details.invited": "Inbjudna medlemmar",
     "details.has_no_posts": "Den här gruppens medlemmar har inte skrivit några inlägg.",
     "details.latest_posts": "Senaste inlägg",
     "details.private": "Privat",
-    "details.disableJoinRequests": "Disable join requests",
-    "details.grant": "Ge/Ta ifrån ägarskap",
+    "details.disableJoinRequests": "Inaktivera förfrågningar om att gå med",
+    "details.grant": "Tilldela/Dra tillbaka ägarskap",
     "details.kick": "Sparka ut",
     "details.owner_options": "Gruppadministration",
     "details.group_name": "Gruppnamn",
     "details.member_count": "Medlemsantal",
-    "details.creation_date": "Skapatdatum",
+    "details.creation_date": "Skapardatum",
     "details.description": "Beskrivning",
     "details.badge_preview": "Förhandsgranskning av märke",
     "details.change_icon": "Byt ikon",
@@ -41,14 +41,14 @@
     "details.hidden": "Dold",
     "details.hidden_help": "Om aktiverat kommer gruppen inte synas i grupplistan och användare måste bli inbjudna manuellt",
     "details.delete_group": "Ta bort grupp",
-    "details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
-    "event.updated": "Gruppdetaljerna har uppdaterats",
+    "details.private_system_help": "Privata grupper är ej tillgängligt. Den här inställningen har ingen effekt.",
+    "event.updated": "Gruppinformationen har uppdaterats",
     "event.deleted": "Gruppen \"%1\" har tagits bort",
     "membership.accept-invitation": "Acceptera inbjudan",
     "membership.invitation-pending": "Inbjudan väntar på svar",
     "membership.join-group": "Gå med i grupp",
     "membership.leave-group": "Lämna grupp",
     "membership.reject": "Neka",
-    "new-group.group_name": "Group Name:",
-    "upload-group-cover": "Upload group cover"
+    "new-group.group_name": "Gruppnamn:",
+    "upload-group-cover": "Ladda upp omslagsbild för grupp"
 }
\ No newline at end of file
diff --git a/public/language/sv/login.json b/public/language/sv/login.json
index 67478a02ca..4b08e7209e 100644
--- a/public/language/sv/login.json
+++ b/public/language/sv/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Kom ihåg mig?",
     "forgot_password": "Glömt lösenord?",
     "alternative_logins": "Alternativa inloggningssätt",
-    "failed_login_attempt": "Inloggningen misslyckades, var god försök igen.",
+    "failed_login_attempt": "Misslyckad inloggning",
     "login_successful": "Du är nu inloggad!",
     "dont_have_account": "Har du inget konto?"
 }
\ No newline at end of file
diff --git a/public/language/sv/modules.json b/public/language/sv/modules.json
index ae9799ad2e..3d69a7aab8 100644
--- a/public/language/sv/modules.json
+++ b/public/language/sv/modules.json
@@ -1,38 +1,46 @@
 {
     "chat.chatting_with": "Chatta med <span id=\"chat-with-name\"></span>",
-    "chat.placeholder": "Skriv chatmeddelande här och tryck sen enter för att skicka ",
+    "chat.placeholder": "Skriv chattmeddelande här och tryck sen Enter för att skicka ",
     "chat.send": "Skicka",
     "chat.no_active": "Du har inte några aktiva chattar.",
     "chat.user_typing": "%1 skriver ...",
     "chat.user_has_messaged_you": "%1 har skickat ett medelande till dig.",
-    "chat.see_all": "See all chats",
-    "chat.mark_all_read": "Mark all chats read",
-    "chat.no-messages": "Välj mottagare för att visa historik för chatmeddelande",
-    "chat.no-users-in-room": "No users in this room",
+    "chat.see_all": "Se alla chattar",
+    "chat.mark_all_read": "Markera alla chattar som lästa",
+    "chat.no-messages": "Välj mottagare för att visa historik för chattmeddelande",
+    "chat.no-users-in-room": "Inga användare i detta rum",
     "chat.recent-chats": "Senaste chattarna",
     "chat.contacts": "Kontakter ",
     "chat.message-history": "Historik för meddelande",
     "chat.pop-out": "Utskjutande chatt",
     "chat.maximize": "Maximera",
-    "chat.seven_days": "7 Dagar",
-    "chat.thirty_days": "30 Dagar",
-    "chat.three_months": "3 Månader",
-    "chat.delete_message_confirm": "Are you sure you wish to delete this message?",
-    "chat.roomname": "Chat Room %1",
-    "chat.add-users-to-room": "Add users to room",
+    "chat.seven_days": "7 dagar",
+    "chat.thirty_days": "30 dagar",
+    "chat.three_months": "3 månader",
+    "chat.delete_message_confirm": "Är du säker på att du vill radera det här meddelandet?",
+    "chat.roomname": "Chattrum %1",
+    "chat.add-users-to-room": "Addera användare till rum",
     "composer.compose": "Komponera",
     "composer.show_preview": "Visa förhandsgranskning",
     "composer.hide_preview": "Dölj förhandsgranskning",
     "composer.user_said_in": "%1 sa i %2:",
     "composer.user_said": "%1 sa:",
-    "composer.discard": "Är du säker på att du vill förkasta det här inlägget?",
+    "composer.discard": "Är du säker på att du vill ta bort det här inlägget?",
     "composer.submit_and_lock": "Skicka och lås",
     "composer.toggle_dropdown": "Visa/Dölj dropdown",
-    "composer.uploading": "Uploading %1",
+    "composer.uploading": "Laddar upp %1",
+    "composer.formatting.bold": "Fet",
+    "composer.formatting.italic": "Kursiv",
+    "composer.formatting.list": "Lista",
+    "composer.formatting.strikethrough": "Genomstrykning",
+    "composer.formatting.link": "Länk",
+    "composer.formatting.picture": "Bild",
+    "composer.upload-picture": "Ladda upp bild",
+    "composer.upload-file": "Ladda upp fil",
     "bootbox.ok": "OK",
-    "bootbox.cancel": "Cancel",
-    "bootbox.confirm": "Confirm",
-    "cover.dragging_title": "Cover Photo Positioning",
-    "cover.dragging_message": "Drag the cover photo to the desired position and click \"Save\"",
-    "cover.saved": "Cover photo image and position saved"
+    "bootbox.cancel": "Avbryt",
+    "bootbox.confirm": "Bekräfta",
+    "cover.dragging_title": "Positionering av omslagsbild",
+    "cover.dragging_message": "Dra omslagsbilden till önskad position och tryck \"Spara\"",
+    "cover.saved": "Omslagsbilden sparad"
 }
\ No newline at end of file
diff --git a/public/language/sv/notifications.json b/public/language/sv/notifications.json
index 743451971a..df0b331ac3 100644
--- a/public/language/sv/notifications.json
+++ b/public/language/sv/notifications.json
@@ -1,38 +1,38 @@
 {
     "title": "Notiser",
     "no_notifs": "Du har inga nya notiser",
-    "see_all": "See all notifications",
+    "see_all": "Visa alla notiser",
     "mark_all_read": "Markera alla notiser som lästa",
     "back_to_home": "Tillbaka till %1",
     "outgoing_link": "Utgående länk",
-    "outgoing_link_message": "You are now leaving %1",
+    "outgoing_link_message": "Du lämnar nu %1",
     "continue_to": "Fortsätt till %1",
     "return_to": "Återgå till %1",
     "new_notification": "Ny notis",
     "you_have_unread_notifications": "Du har olästa notiser.",
     "new_message_from": "Nytt medelande från <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> har röstat upp ditt inlägg i <strong>%2</strong>",
-    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
-    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
-    "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
-    "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
-    "favourited_your_post_in": "<strong>%1</strong> has bookmarked your post in <strong>%2</strong>.",
-    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have bookmarked your post in <strong>%3</strong>.",
-    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have bookmarked your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> och <strong>%2</strong> har röstat upp ditt inlägg i <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> och %2 andra har röstat upp ditt inlägg i <strong>%3</strong>.",
+    "moved_your_post": "<strong>%1</strong> har flyttat ditt inlägg till <strong>%2</strong>",
+    "moved_your_topic": "<strong>%1</strong> har flyttat <strong>%2</strong>",
+    "favourited_your_post_in": "<strong>%1</strong> har lagt till bokmärke på ditt inlägg i <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> och <strong>%2</strong> har lagt till bokmärke på ditt inlägg i <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> och %2 andra har lagt till bokmärke på ditt inlägg i <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> flaggade ett inlägg i <strong>%2</strong>",
-    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
-    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> och <strong>%2</strong> rapporterade ett inlägg i <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> och %2 andra rapporterade ett inlägg i <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> har skrivit ett svar på: <strong>%2</strong>",
-    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
-    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> och <strong>%2</strong> har svarat på: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> och %2 andra har svarat på: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> har skapat ett nytt ämne: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> började följa dig.",
-    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
-    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
+    "user_started_following_you_dual": "<strong>%1</strong> och <strong>%2</strong> började följa dig.",
+    "user_started_following_you_multiple": "<strong>%1</strong> och %2 andra började följa dig.",
     "new_register": "<strong>%1</strong> skickade en registreringsförfrågan.",
-    "new_register_multiple": "There are <strong>%1</strong> registration requests awaiting review.",
-    "email-confirmed": "Epost bekräftad",
-    "email-confirmed-message": "Tack för att du bekräftat din epostadress. Ditt konto är nu fullt ut aktiverat.",
-    "email-confirm-error-message": "Det uppstod ett fel med att bekräfta din epostadress. Kanske var koden ogiltig eller har gått ut.",
-    "email-confirm-sent": "Bekräftelseepost skickat."
+    "new_register_multiple": "Det finns <strong>%1</strong> förfrågningar om registrering som inväntar granskning.",
+    "email-confirmed": "E-post bekräftad",
+    "email-confirmed-message": "Tack för att du bekräftat din e-postadress. Ditt konto är nu fullt ut aktiverat.",
+    "email-confirm-error-message": "Det uppstod ett problem med bekräftelsen av din e-postadress. Kanske var koden felaktig eller ogiltig.",
+    "email-confirm-sent": "Bekräftelsemeddelande skickat."
 }
\ No newline at end of file
diff --git a/public/language/sv/pages.json b/public/language/sv/pages.json
index 6953bf554e..0b6ff875ea 100644
--- a/public/language/sv/pages.json
+++ b/public/language/sv/pages.json
@@ -4,43 +4,44 @@
     "popular-day": "Populära ämnen idag",
     "popular-week": "Populära ämnen den här veckan",
     "popular-month": "Populära ämnen denna månad",
-    "popular-alltime": "All time popular topics",
+    "popular-alltime": "Populäraste ämnena genom tiderna",
     "recent": "Senaste ämnena",
-    "flagged-posts": "Flagged Posts",
+    "flagged-posts": "Flaggade inlägg",
     "users/online": "Användare online",
     "users/latest": "Senaste Användare",
     "users/sort-posts": "Användare med flest inlägg",
-    "users/sort-reputation": "Users with the most reputation",
-    "users/banned": "Banned Users",
+    "users/sort-reputation": "Användare med bäst rykte",
+    "users/banned": "Bannlysta användare",
+    "users/most-flags": "Most flagged users",
     "users/search": "Användar Sök",
     "notifications": "Notiser",
     "tags": "Etiketter",
     "tag": "Ämnen märkta med \"%1\"",
-    "register": "Register an account",
+    "register": "Registrera ett konto",
     "login": "Logga in på ditt konto",
     "reset": "Återställ lösenord",
     "categories": "Kategorier",
     "groups": "Grupper",
-    "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",
-    "account/topics": "Topics created by %1",
-    "account/groups": "%1's Groups",
-    "account/favourites": "%1's Bookmarked Posts",
+    "group": "%1 grupp",
+    "chats": "Chattar",
+    "chat": "Chattar med %1",
+    "account/edit": "Redigerar \"%1\"",
+    "account/edit/password": "Redigerar lösenord för \"%1\"",
+    "account/edit/username": "Redigerar användarnamn för \"%1\"",
+    "account/edit/email": "Redigerar e-postadress för \"%1\"",
+    "account/following": "Användare som %1 följer",
+    "account/followers": "Användare som följer %1",
+    "account/posts": "Inlägg skapade av %1",
+    "account/topics": "Ämnen skapade av %1 ",
+    "account/groups": "%1's grupper",
+    "account/favourites": "%1's bokmärken",
     "account/settings": "Avnändarinställningar",
-    "account/watched": "Topics watched by %1",
-    "account/upvoted": "Posts upvoted by %1",
-    "account/downvoted": "Posts downvoted by %1",
-    "account/best": "Best posts made by %1",
-    "confirm": "Email Confirmed",
+    "account/watched": "Ämnen som bevakas av %1",
+    "account/upvoted": "Inlägg som röstats upp av %1",
+    "account/downvoted": "Inlägg som röstats ned av %1",
+    "account/best": "Bästa inläggen skapade av %1",
+    "confirm": "E-postadress bekräftad",
     "maintenance.text": "%1 genomgår underhåll just nu. Vänligen kom tillbaka lite senare.",
-    "maintenance.messageIntro": "Ytterligare så lämnade administratören detta meddelande:",
-    "throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
+    "maintenance.messageIntro": "Utöver det så lämnade administratören följande meddelande:",
+    "throttled.text": "%1 ligger tillfälligt nere på grund av överbelastning. Var god återkom senare. "
 }
\ No newline at end of file
diff --git a/public/language/sv/recent.json b/public/language/sv/recent.json
index 46d7531d3c..0e75be8355 100644
--- a/public/language/sv/recent.json
+++ b/public/language/sv/recent.json
@@ -6,12 +6,12 @@
     "year": "År",
     "alltime": "Alltid",
     "no_recent_topics": "Det finns inga olästa ämnen.",
-    "no_popular_topics": "Det finns inga populära ämnen",
-    "there-is-a-new-topic": "Det finns ett nytt ämne",
+    "no_popular_topics": "Det finns inga populära ämnen.",
+    "there-is-a-new-topic": "Det finns ett nytt ämne.",
     "there-is-a-new-topic-and-a-new-post": "Det finns ett nytt ämne och ett nytt inlägg.",
     "there-is-a-new-topic-and-new-posts": "Det finns ett nytt ämne och %1 nya inlägg.",
     "there-are-new-topics": "Det finns %1 nya ämnen.",
-    "there-are-new-topics-and-a-new-post": "Det finns %1 nya ämnen och ett nytt inlägg..",
+    "there-are-new-topics-and-a-new-post": "Det finns %1 nya ämnen och ett nytt inlägg.",
     "there-are-new-topics-and-new-posts": "Det finns %1 nya ämnen och %2 nya inlägg.",
     "there-is-a-new-post": "Det finns ett nytt inlägg.",
     "there-are-new-posts": "Det finns %1 nya inlägg.",
diff --git a/public/language/sv/register.json b/public/language/sv/register.json
index 6f1aa3764b..1ada86d0ba 100644
--- a/public/language/sv/register.json
+++ b/public/language/sv/register.json
@@ -1,10 +1,10 @@
 {
     "register": "Registrera",
-    "help.email": "Som standard, är din epost-adress dold för allmänheten.",
+    "help.email": "Som standard, är din e-postadress dold för allmänheten.",
     "help.username_restrictions": "Ett unikt användarnamn mellan %1 och %2 bokstäver. Andra kan nämna dig med @<span id='yourUsername'>användarnamn</span>.",
     "help.minimum_password_length": "Ditt lösenord måste vara minst %1 bokstäver.",
-    "email_address": "Epost-adress",
-    "email_address_placeholder": "Ange Epost-adress",
+    "email_address": "E-postadress",
+    "email_address_placeholder": "Ange E-postadress",
     "username": "Användarnamn",
     "username_placeholder": "Ange användarnamn",
     "password": "Lösenord",
diff --git a/public/language/sv/reset_password.json b/public/language/sv/reset_password.json
index 9f79207d43..a6ee1793e1 100644
--- a/public/language/sv/reset_password.json
+++ b/public/language/sv/reset_password.json
@@ -7,10 +7,10 @@
     "wrong_reset_code.message": "Den mottagna återställningskoden var felaktig. Var god försök igen, eller <a href=\"/reset\">begär en ny återställningskod</a>.",
     "new_password": "Nytt lösenord",
     "repeat_password": "Bekräfta lösenord",
-    "enter_email": "Var god fyll i din <strong>epost-adress</strong> så får du snart en epost med instruktioner hur du återsätller ditt konto.",
-    "enter_email_address": "Skriv in epostadress",
+    "enter_email": "Var god fyll i din <strong>e-postadress</strong> så skickas ett e-postmeddelande med instruktioner hur du återställer ditt konto.",
+    "enter_email_address": "Skriv in e-postadress",
     "password_reset_sent": "Lösenordsåterställning skickad",
-    "invalid_email": "Felaktig epost / Epost finns inte!",
+    "invalid_email": "Felaktig e-post / E-post finns inte!",
     "password_too_short": "Lösenordet är för kort, var god välj ett annat lösenord.",
     "passwords_do_not_match": "De två lösenorden du har fyllt i matchar ej varandra.",
     "password_expired": "Ditt lösenord har gått ut, var god välj ett nytt lösenord."
diff --git a/public/language/sv/search.json b/public/language/sv/search.json
index eeb5a36feb..3682c8bef5 100644
--- a/public/language/sv/search.json
+++ b/public/language/sv/search.json
@@ -4,7 +4,7 @@
     "advanced-search": "Avancerad sökning",
     "in": "i",
     "titles": "Ämnen",
-    "titles-posts": "Ämnen och Inlägg",
+    "titles-posts": "Ämnen och inlägg",
     "posted-by": "Skapad av",
     "in-categories": "I kategorier",
     "search-child-categories": "Sök i underkategorier",
diff --git a/public/language/sv/tags.json b/public/language/sv/tags.json
index b3fbeebd24..cc8a7e02dc 100644
--- a/public/language/sv/tags.json
+++ b/public/language/sv/tags.json
@@ -1,7 +1,7 @@
 {
-    "no_tag_topics": "Det finns inga ämnen med detta märkord.",
-    "tags": "Märkord",
-    "enter_tags_here": "Fyll i märkord på mellan %1 och %2 tecken här.",
+    "no_tag_topics": "Det finns inga ämnen med denna tagg.",
+    "tags": "Taggar",
+    "enter_tags_here": "Fyll i taggar på %1 till %2 tecken här.",
     "enter_tags_here_short": "Ange taggar...",
-    "no_tags": "Det finns inga märkord ännu."
+    "no_tags": "Det finns inga taggar ännu."
 }
\ No newline at end of file
diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json
index 4fa03da4ee..6cb0d01710 100644
--- a/public/language/sv/topic.json
+++ b/public/language/sv/topic.json
@@ -13,7 +13,7 @@
     "notify_me": "Få notiser om nya svar i detta ämne",
     "quote": "Citera",
     "reply": "Svara",
-    "reply-as-topic": "Reply as topic",
+    "reply-as-topic": "Svara som ämne",
     "guest-login-reply": "Logga in för att posta",
     "edit": "Ändra",
     "delete": "Ta bort",
@@ -26,63 +26,70 @@
     "tools": "Verktyg",
     "flag": "Rapportera",
     "locked": "Låst",
-    "bookmark_instructions": "Klicka här för att återvända till det sista olästa inlägget i den här tråden.",
+    "bookmark_instructions": "Klicka här för att återgå till senast lästa inlägg i detta ämne.",
     "flag_title": "Rapportera detta inlägg för granskning",
     "flag_success": "Det här inlägget har flaggats för moderering.",
     "deleted_message": "Det här ämnet har raderats. Endast användare med ämneshanterings-privilegier kan se det.",
     "following_topic.message": "Du kommer nu få notiser när någon gör inlägg i detta ämne.",
     "not_following_topic.message": "Du kommer inte längre få notiser från detta ämne.",
+    "ignoring_topic.message": "Du kommer inte längre se detta ämne i listan olästa ämnen. Du kommer att meddelas när du nämns eller ditt inlägg är upp röstat.",
     "login_to_subscribe": "Var god registrera eller logga in för att kunna prenumerera på detta ämne.",
     "markAsUnreadForAll.success": "Ämne markerat som oläst av alla.",
-    "mark_unread": "Mark unread",
-    "mark_unread.success": "Topic marked as unread.",
+    "mark_unread": "Markera som oläst",
+    "mark_unread.success": "Ämne markerat som oläst.",
     "watch": "Bevaka",
     "unwatch": "Sluta bevaka",
     "watch.title": "Få notis om nya svar till det här ämnet",
     "unwatch.title": "Sluta bevaka detta ämne",
     "share_this_post": "Dela detta inlägg",
+    "watching": "Bevakar",
+    "not-watching": "Bevakar inte",
+    "ignoring": "Ignorerar",
+    "watching.description": "Meddela mig om nya svar. <br/> Visa ämne i oläst.",
+    "not-watching.description": "Meddela mig inte om nya svar. <br/> Visa ämne i oläst ifall kategorin är ignorerad.",
+    "ignoring.description": "Meddela mig inte om nya svar. <br/>Visa inte ämne i oläst.",
     "thread_tools.title": "Ämnesverktyg",
     "thread_tools.markAsUnreadForAll": "Markera som oläst",
-    "thread_tools.pin": "Fäst ämne",
+    "thread_tools.pin": "Nåla fast ämne",
     "thread_tools.unpin": "Lösgör ämne",
     "thread_tools.lock": "Lås ämne",
-    "thread_tools.unlock": "Öppna upp ämne",
+    "thread_tools.unlock": "Lås upp ämne",
     "thread_tools.move": "Flytta ämne",
-    "thread_tools.move_all": "Flytta alla.",
+    "thread_tools.move_all": "Flytta alla",
     "thread_tools.fork": "Grena ämne",
     "thread_tools.delete": "Ta bort ämne",
-    "thread_tools.delete-posts": "Delete Posts",
+    "thread_tools.delete-posts": "Radera inlägg",
     "thread_tools.delete_confirm": "Är du säker på att du vill ta bort det här ämnet?",
     "thread_tools.restore": "Återställ ämne",
     "thread_tools.restore_confirm": "Är du säker på att du vill återställa det här ämnet?",
-    "thread_tools.purge": "Rensa ämne",
-    "thread_tools.purge_confirm": "Är du säker att du vill rensa ut det här ämnet?",
+    "thread_tools.purge": "Rensa bort ämne",
+    "thread_tools.purge_confirm": "Är du säker att du vill rensa bort det här ämnet?",
     "topic_move_success": "Det här ämnet har flyttats till %1",
     "post_delete_confirm": "Är du säker på att du vill ta bort det här inlägget?",
     "post_restore_confirm": "Är du säker på att du vill återställa det här inlägget?",
-    "post_purge_confirm": "Är du säker att du vill rensa ut det här inlägget?",
+    "post_purge_confirm": "Är du säker att du vill rensa bort det här inlägget?",
     "load_categories": "Laddar kategorier",
     "disabled_categories_note": "Inaktiverade kategorier är utgråade",
     "confirm_move": "Flytta",
     "confirm_fork": "Grena",
-    "favourite": "Bookmark",
-    "favourites": "Bookmarks",
-    "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
+    "favourite": "Bokmärke",
+    "favourites": "Bokmärken",
+    "favourites.has_no_favourites": "Du har inte lagt till bokmärke på något inlägg än.",
     "loading_more_posts": "Laddar fler inlägg",
     "move_topic": "Flytta ämne",
     "move_topics": "Flytta ämnen",
     "move_post": "Flytta inlägg",
     "post_moved": "Inlägget flyttades.",
     "fork_topic": "Grena ämne",
-    "topic_will_be_moved_to": "Detta ämne kommer bli flytta till kategori",
+    "topic_will_be_moved_to": "Detta ämne kommer att flyttas till kategorin",
     "fork_topic_instruction": "Klicka på de inlägg du vill grena",
     "fork_no_pids": "Inga inlägg valda!",
     "fork_success": "Ämnet har blivit förgrenat. Klicka här för att gå till det förgrenade ämnet.",
-    "delete_posts_instruction": "Click the posts you want to delete/purge",
+    "delete_posts_instruction": "Klicka på inläggen du vill radera/rensa bort",
     "composer.title_placeholder": "Skriv in ämnets titel här...",
     "composer.handle_placeholder": "Namn",
     "composer.discard": "Avbryt",
-    "composer.submit": "Skicka",
+    "composer.submit": "Posta inlägg",
     "composer.replying_to": "Svarar till %1",
     "composer.new_topic": "Nytt ämne",
     "composer.uploading": "laddar upp...",
@@ -92,21 +99,21 @@
     "composer.thumb_file_label": "Eller ladda upp en fil",
     "composer.thumb_remove": "Töm fält",
     "composer.drag_and_drop_images": "Dra och släpp bilder här",
-    "more_users_and_guests": "%1 fler användare() och %2 gäst(er)",
-    "more_users": "%1 fler användare()",
+    "more_users_and_guests": "%1 fler användare och %2 gäst(er)",
+    "more_users": "%1 fler användare",
     "more_guests": "1% fler gäst(er)",
     "users_and_others": "%1 och %2 andra",
     "sort_by": "Sortera på",
     "oldest_to_newest": "Äldst till nyaste",
     "newest_to_oldest": "Nyaste till äldst",
-    "most_votes": "Mest röster",
-    "most_posts": "Felst inlägg",
-    "stale.title": "Create new topic instead?",
-    "stale.warning": "The topic you are replying to is quite old. Would you like to create a new topic instead, and reference this one in your reply?",
-    "stale.create": "Create a new topic",
-    "stale.reply_anyway": "Reply to this topic anyway",
+    "most_votes": "Flest röster",
+    "most_posts": "Flest inlägg",
+    "stale.title": "Skapa nytt ämne istället?",
+    "stale.warning": "Ämnet du svarar på är ganska gammalt. Vill du skapa ett nytt ämne istället och inkludera en referens till det här ämnet i ditt inlägg?",
+    "stale.create": "Skapa nytt ämne",
+    "stale.reply_anyway": "Svara på ämnet ändå",
     "link_back": "Re: [%1](%2)",
     "spam": "Spam",
-    "offensive": "Offensive",
-    "custom-flag-reason": "Enter a flagging reason"
+    "offensive": "Kränkande",
+    "custom-flag-reason": "Ange skälet för rapporteringen"
 }
\ No newline at end of file
diff --git a/public/language/sv/unread.json b/public/language/sv/unread.json
index 0ed0a80ae7..06ae0bbe92 100644
--- a/public/language/sv/unread.json
+++ b/public/language/sv/unread.json
@@ -2,9 +2,12 @@
     "title": "Olästa",
     "no_unread_topics": "Det finns inga olästa ämnen.",
     "load_more": "Ladda fler",
-    "mark_as_read": "Markerad som läst",
+    "mark_as_read": "Markera som läst",
     "selected": "Vald",
     "all": "Alla",
     "all_categories": "Alla kategorier",
-    "topics_marked_as_read.success": "Ämnet markerat som läst."
+    "topics_marked_as_read.success": "Ämnet markerat som läst.",
+    "all-topics": "Alla ämnen",
+    "new-topics": "Nya ämnen",
+    "watched-topics": "Bevakade ämnen"
 }
\ No newline at end of file
diff --git a/public/language/sv/uploads.json b/public/language/sv/uploads.json
index 1622cb5693..4546acd888 100644
--- a/public/language/sv/uploads.json
+++ b/public/language/sv/uploads.json
@@ -1,6 +1,6 @@
 {
-    "uploading-file": "Uploading the file...",
-    "select-file-to-upload": "Select a file to upload!",
-    "upload-success": "File uploaded successfully!",
-    "maximum-file-size": "Maximum %1 kb"
+    "uploading-file": "Laddar upp filen...",
+    "select-file-to-upload": "Välj en fil att ladda upp!",
+    "upload-success": "Filen laddades upp!",
+    "maximum-file-size": "Maximalt %1 kb"
 }
\ No newline at end of file
diff --git a/public/language/sv/user.json b/public/language/sv/user.json
index ab893029e1..34aa2dd96e 100644
--- a/public/language/sv/user.json
+++ b/public/language/sv/user.json
@@ -1,11 +1,11 @@
 {
-    "banned": "Bannad",
+    "banned": "Bannlyst",
     "offline": "Offline",
     "username": "Användarnamn",
     "joindate": "Gick med",
     "postcount": "Antal inlägg",
-    "email": "Epost",
-    "confirm_email": "Bekräfta epostadress ",
+    "email": "E-post",
+    "confirm_email": "Bekräfta e-postadress ",
     "ban_account": "Bannlys konto",
     "ban_account_confirm": "Vill du verkligen bannlysa den här användaren?",
     "unban_account": "Ta bort bannlysning",
@@ -22,7 +22,7 @@
     "profile": "Profil",
     "profile_views": "Profil-visningar",
     "reputation": "Rykte",
-    "favourites": "Bookmarks",
+    "favourites": "Bokmärken",
     "watched": "Bevakad",
     "followers": "Följare",
     "following": "Följer",
@@ -30,20 +30,20 @@
     "signature": "Signatur",
     "birthday": "Födelsedag",
     "chat": "Chatta",
-    "chat_with": "Chat with %1",
+    "chat_with": "Chatta med %1",
     "follow": "Följ",
     "unfollow": "Sluta följ",
     "more": "Mer",
     "profile_update_success": "Profilen uppdaterades.",
     "change_picture": "Ändra bild",
-    "change_username": "Change Username",
-    "change_email": "Change Email",
+    "change_username": "Ändra användarnamn",
+    "change_email": "Ändra e-postadress",
     "edit": "Ändra",
-    "edit-profile": "Edit Profile",
-    "default_picture": "Default Icon",
+    "edit-profile": "Redigera profil",
+    "default_picture": "Standard-ikon",
     "uploaded_picture": "Uppladdad bild",
     "upload_new_picture": "Ladda upp ny bild",
-    "upload_new_picture_from_url": "Ladda Upp Ny Bild Från Länk",
+    "upload_new_picture_from_url": "Ladda upp ny bild via länk",
     "current_password": "Nuvarande lösenord",
     "change_password": "Ändra lösenord",
     "change_password_error": "Ogiltigt lösenord.",
@@ -56,54 +56,56 @@
     "password": "Lösenord",
     "username_taken_workaround": "Användarnamnet är redan upptaget, så vi förändrade det lite. Du kallas nu för <strong>%1</strong>",
     "password_same_as_username": "Ditt lösenord är samma som ditt användarnamn, välj ett annat lösenord.",
-    "password_same_as_email": "Your password is the same as your email, please select another password.",
+    "password_same_as_email": "Ditt lösenord är detsamma som din e-postadress. Var god välj ett annat lösenord.",
     "upload_picture": "Ladda upp bild",
     "upload_a_picture": "Ladda upp en bild",
     "remove_uploaded_picture": "Ta bort uppladdad bild",
-    "upload_cover_picture": "Upload cover picture",
+    "upload_cover_picture": "Ladda upp omslagsbild",
     "settings": "Inställningar",
-    "show_email": "Visa min epost",
-    "show_fullname": "Visa Fullständigt Namn",
+    "show_email": "Visa min e-postadress",
+    "show_fullname": "Visa fullständigt namn",
     "restrict_chats": "Tillåt endast chatt-meddelanden från användare som jag följer",
     "digest_label": "Prenumerera på sammanställt flöde",
-    "digest_description": "Prenumerera på epostuppdateringar för det här forumet (notiser och ämnen) med en viss regelbundenhet",
+    "digest_description": "Prenumerera på e-postuppdateringar för det här forumet (notiser och ämnen) med en viss regelbundenhet",
     "digest_off": "Avslagen",
-    "digest_daily": "Daligen",
+    "digest_daily": "Dagligen",
     "digest_weekly": "Veckovis",
     "digest_monthly": "Månadsvis",
-    "send_chat_notifications": "Skicka ett epostmeddelande om nya chatt-meddelanden tas emot när jag inte är online.",
-    "send_post_notifications": "Skicka ett epost när svar kommit på ämnen jag prenumererar på till",
+    "send_chat_notifications": "Skicka ett e-postmeddelande om nya chatt-meddelanden tas emot när jag inte är online.",
+    "send_post_notifications": "Skicka ett e-postmeddelande när svar tillkommit på ämnen jag prenumererar på",
     "settings-require-reload": "Vissa inställningar som ändrades kräver att sidan laddas om. Klicka här för att ladda om sidan.",
     "has_no_follower": "Denna användare har inga följare :(",
     "follows_no_one": "Denna användare följer ingen :(",
-    "has_no_posts": "Användaren har inte skrivit några inlägg ännu",
-    "has_no_topics": "Användaren har inte skrivit några ämnen ännu",
-    "has_no_watched_topics": "Användaren har inte bevakat några ämnen ännu",
-    "has_no_upvoted_posts": "This user hasn't upvoted any posts yet.",
-    "has_no_downvoted_posts": "This user hasn't downvoted any posts yet.",
-    "has_no_voted_posts": "This user has no voted posts",
-    "email_hidden": "Epost dold",
+    "has_no_posts": "Användaren har inte skrivit några inlägg ännu.",
+    "has_no_topics": "Användaren har inte postat några ämnen ännu.",
+    "has_no_watched_topics": "Användaren har inte bevakat några ämnen ännu.",
+    "has_no_upvoted_posts": "Den här användaren har inte röstat upp några inlägg än.",
+    "has_no_downvoted_posts": "Den här användaren har inte röstat ned några inlägg än.",
+    "has_no_voted_posts": "Den här användaren har inga inlägg med röster",
+    "email_hidden": "E-post dold",
     "hidden": "dold",
     "paginate_description": "Gör så att ämnen och inlägg visas som sidor istället för oändlig skroll",
     "topics_per_page": "Ämnen per sida",
     "posts_per_page": "Inlägg per sida",
     "notification_sounds": "Spela ett ljud när du får en notis",
     "browsing": "Inställning för bläddring",
-    "open_links_in_new_tab": "Öppna utgående länkar på ny flik",
-    "enable_topic_searching": "Aktivera Sökning Inom Ämne",
+    "open_links_in_new_tab": "Öppna utgående länkar i ny flik",
+    "enable_topic_searching": "Aktivera sökning inom ämne",
     "topic_search_help": "Om aktiverat kommer sökning inom ämne överskrida webbläsarens vanliga funktionen för sökning bland sidor och tillåta dig att söka genom hela ämnet istället för det som endast visas på skärmen.",
-    "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Följ ämnen som du svarat på",
-    "follow_topics_you_create": "Följ ämnen du skapat",
-    "grouptitle": "Välj tittel för gruppen så som du vill att den ska visas",
+    "delay_image_loading": "Fördröj inladdning av bilder",
+    "image_load_delay_help": "Aktivera för att hindra bilder ifrån att ladda in, innan de skrollats fram på skärmen. ",
+    "scroll_to_my_post": "Visa det nya inlägget när ett svar har postats",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Grupptitel",
     "no-group-title": "Ingen titel på gruppen",
     "select-skin": "Välj ett 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"
+    "select-homepage": "Välj en startsida",
+    "homepage": "Startsida",
+    "homepage_description": "Välj en sida som ska användas som forumets startsida eller 'Ingen' för att använda standardstartsidan.",
+    "custom_route": "Sökväg till egen startsida",
+    "custom_route_help": "Skriv in ett sökvägsnamn här, utan föregående slash. (tex \"recent\" eller \"popular\")",
+    "sso.title": "Single Sign-on-tjänster",
+    "sso.associated": "Associerad med",
+    "sso.not-associated": "Klicka här för att associera med"
 }
\ No newline at end of file
diff --git a/public/language/sv/users.json b/public/language/sv/users.json
index 29f91b76c0..639b11ac14 100644
--- a/public/language/sv/users.json
+++ b/public/language/sv/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Senaste användarna",
     "top_posters": "Flest inlägg",
     "most_reputation": "Bäst rykte",
+    "most_flags": "Most Flags",
     "search": "Sök",
     "enter_username": "Ange ett användarnamn för att söka",
     "load_more": "Ladda fler",
@@ -15,6 +16,6 @@
     "popular_topics": "Populära ämnen",
     "unread_topics": "Olästa ämnen",
     "categories": "Kategorier",
-    "tags": "Märkord",
-    "no-users-found": "No users found!"
+    "tags": "Taggar",
+    "no-users-found": "Inga användare hittades!"
 }
\ No newline at end of file
diff --git a/public/language/th/email.json b/public/language/th/email.json
index 50a596b128..6881135565 100644
--- a/public/language/th/email.json
+++ b/public/language/th/email.json
@@ -24,6 +24,7 @@
     "digest.day": "day",
     "digest.week": "week",
     "digest.month": "month",
+    "digest.subject": "Digest for %1",
     "notif.chat.subject": "New chat message received from %1",
     "notif.chat.cta": "กดตรงนี้เพื่อกลับไปยังบทสนทนา",
     "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
diff --git a/public/language/th/error.json b/public/language/th/error.json
index 5fa5730b94..03b006c3bf 100644
--- a/public/language/th/error.json
+++ b/public/language/th/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "รหัสผ่านไม่ถูกต้อง",
     "invalid-username-or-password": "กรุณาระบุชื่อผู้ใช้และรหัสผ่าน",
     "invalid-search-term": "ข้อความค้นหาไม่ถูกต้อง",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "ชื่อผู้ใช้นี้มีการใช้แล้ว",
     "email-taken": "อีเมลนี้มีการใช้แล้ว",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "Forum นี้ต้องการการยืนยันอีเมล กรุณากดที่นี่เพื่อระบุอีเมล",
     "email-confirm-failed": "เราไม่สามารถยืนยันอีเมลของคุณ ณ ขณะนี้ กรุณาลองใหม่อีกครั้งภายหลัง",
     "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
+    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "username-too-short": "ชื่อบัญชีผู้ใช้ สั้นเกินไป",
     "username-too-long": "ชื่อบัญชีผู้ใช้ ยาวเกินไป",
     "password-too-long": "Password too long",
     "user-banned": "User banned",
     "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
     "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "ยังไม่มี Category นี้",
     "no-topic": "ยังไม่มี Topic นี้",
     "no-post": "ยังไม่มี Post นี้",
@@ -38,6 +41,19 @@
     "category-disabled": "Category นี้ถูกปิดการใช้งานแล้ว",
     "topic-locked": "Topic Locked",
     "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
     "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
@@ -55,10 +71,12 @@
     "already-unfavourited": "You have already unbookmarked this post",
     "cant-ban-other-admins": "You can't ban other admins!",
     "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Invalid image type. Allowed types are: %1",
     "invalid-image-extension": "Invalid image extension",
     "invalid-file-type": "Invalid file type. Allowed types are: %1",
     "group-name-too-short": "Group name too short",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Group already exists",
     "group-name-change-not-allowed": "Group name change not allowed",
     "group-already-member": "Already part of this group",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "You are not allowed to edit this message",
     "cant-remove-last-user": "You can't remove the last user",
     "cant-delete-chat-message": "You are not allowed to delete this message",
+    "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Reputation system is disabled.",
     "downvoting-disabled": "Downvoting is disabled",
     "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",
@@ -99,5 +118,6 @@
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
     "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "You can't kick yourself from the group",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/th/login.json b/public/language/th/login.json
index 5eba336a39..c9e8a589eb 100644
--- a/public/language/th/login.json
+++ b/public/language/th/login.json
@@ -5,7 +5,7 @@
     "remember_me": "จำไว้ในระบบ?",
     "forgot_password": "ลืมรหัสผ่าน?",
     "alternative_logins": "เข้าสู่ระบบโดยทางอื่น",
-    "failed_login_attempt": "เข้าสู่ระบบล้มเหลว โปรดลองอีกครั้ง",
+    "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "คุณเข้าสู่ระบบเรียบร้อยแล้ว",
     "dont_have_account": "คุณยังไม่มีบัญชีเข้าระบบ?"
 }
\ No newline at end of file
diff --git a/public/language/th/modules.json b/public/language/th/modules.json
index 15a7bb1fa5..51c6065cd8 100644
--- a/public/language/th/modules.json
+++ b/public/language/th/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Submit and Lock",
     "composer.toggle_dropdown": "Toggle Dropdown",
     "composer.uploading": "Uploading %1",
+    "composer.formatting.bold": "Bold",
+    "composer.formatting.italic": "Italic",
+    "composer.formatting.list": "List",
+    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.link": "Link",
+    "composer.formatting.picture": "Picture",
+    "composer.upload-picture": "Upload Image",
+    "composer.upload-file": "Upload File",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",
diff --git a/public/language/th/pages.json b/public/language/th/pages.json
index e017b8df5e..238e31cb5a 100644
--- a/public/language/th/pages.json
+++ b/public/language/th/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Users with the most posts",
     "users/sort-reputation": "Users with the most reputation",
     "users/banned": "Banned Users",
+    "users/most-flags": "Most flagged users",
     "users/search": "User Search",
     "notifications": "แจ้งเตือน",
     "tags": "Tags",
diff --git a/public/language/th/topic.json b/public/language/th/topic.json
index 19cecadf9d..ee282402b0 100644
--- a/public/language/th/topic.json
+++ b/public/language/th/topic.json
@@ -26,12 +26,13 @@
     "tools": "เครื่องมือ",
     "flag": "ปักธง",
     "locked": "Locked",
-    "bookmark_instructions": "Click here to return to the last unread post in this thread.",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "ปักธงโพสต์นี้เพื่อดำเนินการ",
     "flag_success": "This post has been flagged for moderation.",
     "deleted_message": "Topic นี้ถูกลบไปแล้ว เฉพาะผู้ใช้งานที่มีสิทธิ์ในการจัดการ Topic เท่านั้นที่จะมีสิทธิ์ในการเข้าชม",
     "following_topic.message": "คุณจะได้รับการแจ้งเตือนเมื่อมีคนโพสต์ในกระทู้นี้",
     "not_following_topic.message": "คุณจะไม่รับการแจ้งเตือนจากกระทู้นี้",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
     "login_to_subscribe": "กรุณาลงทะเบียนหรือเข้าสู่ระบบเพื่อที่จะติดตามกระทู้นี้",
     "markAsUnreadForAll.success": "ทำเครื่องหมายว่ายังไม่ได้อ่านทั้งหมด",
     "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
     "watch.title": "ให้แจ้งเตือนเมื่อมีการตอบกลับ Topic นี้",
     "unwatch.title": "ยกเลิกการติดตาม Topic นี้",
     "share_this_post": "แชร์โพสต์นี้",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
     "thread_tools.title": "เครื่องมือช่วยจัดการ Topic",
     "thread_tools.markAsUnreadForAll": "ทำหมายว่ายังไม่ได้อ่าน",
     "thread_tools.pin": "ปักหมุดกระทู้",
diff --git a/public/language/th/unread.json b/public/language/th/unread.json
index 6928cb1366..00f800a723 100644
--- a/public/language/th/unread.json
+++ b/public/language/th/unread.json
@@ -6,5 +6,8 @@
     "selected": "เลือก",
     "all": "ทั้งหมด",
     "all_categories": "All categories",
-    "topics_marked_as_read.success": "Topic ถูกทำเครื่องหมายว่าอ่านแล้วเรียบร้อย"
+    "topics_marked_as_read.success": "Topic ถูกทำเครื่องหมายว่าอ่านแล้วเรียบร้อย",
+    "all-topics": "All Topics",
+    "new-topics": "New Topics",
+    "watched-topics": "Watched Topics"
 }
\ No newline at end of file
diff --git a/public/language/th/user.json b/public/language/th/user.json
index 092f19cf70..6b6d4c453a 100644
--- a/public/language/th/user.json
+++ b/public/language/th/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Open outgoing links in new tab",
     "enable_topic_searching": "เปิดใช้การค้นหาแบบ In-Topic",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
+    "delay_image_loading": "Delay Image Loading",
+    "image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
     "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Follow topics that you reply to",
-    "follow_topics_you_create": "Follow topics you create",
-    "grouptitle": "Select the group title you would like to display",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Group Title",
     "no-group-title": "No group title",
     "select-skin": "Select a Skin",
     "select-homepage": "Select a Homepage",
diff --git a/public/language/th/users.json b/public/language/th/users.json
index a3f7bcb85e..423257816b 100644
--- a/public/language/th/users.json
+++ b/public/language/th/users.json
@@ -2,6 +2,7 @@
     "latest_users": "ผู้ใช้งานล่าสุด",
     "top_posters": "ผู้ที่โพสต์มากที่สุด",
     "most_reputation": "ผู้ที่มีชื่อเสียงมากที่สุด",
+    "most_flags": "Most Flags",
     "search": "ค้นหา",
     "enter_username": "ใส่ชื่อผู้ใช้เพื่อค้นหา",
     "load_more": "โหลดเพิ่มเติม",
diff --git a/public/language/tr/email.json b/public/language/tr/email.json
index 7dabee41c7..4353efd42a 100644
--- a/public/language/tr/email.json
+++ b/public/language/tr/email.json
@@ -24,6 +24,7 @@
     "digest.day": "gün",
     "digest.week": "hafta",
     "digest.month": "ay",
+    "digest.subject": "%1 için özet",
     "notif.chat.subject": "Okunmamış bazı iletileriniz var",
     "notif.chat.cta": "Sohbete devam etmek için buraya tıklayın",
     "notif.chat.unsub.info": "Bu bildirim şectiğiniz ayarlar yüzünden gönderildi.",
diff --git a/public/language/tr/error.json b/public/language/tr/error.json
index bb03c66177..5c1adb7ae9 100644
--- a/public/language/tr/error.json
+++ b/public/language/tr/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Geçersiz Şifre",
     "invalid-username-or-password": "Lütfen kullanıcı ismi ve parola girin.",
     "invalid-search-term": "Geçersiz arama",
+    "csrf-invalid": "Büyük olasılıkla süresi dolmuş oturum nedeniyle girişinizi geçersiz kıldık. Lütfen tekrar deneyiniz.",
     "invalid-pagination-value": "Geçersiz sayfalama değeri, en az %1 ve en fazla %2 olabilir",
     "username-taken": "Kullanıcı İsmi Alınmış",
     "email-taken": "E-posta Alınmış",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "Bu forum e-posta doğrulaması gerektirir, lütfen buraya bir e-posta adresi girin",
     "email-confirm-failed": "E-posta adresinizi doğrulayamıyoruz. Lütfen daha sonra tekrar deneyin.",
     "confirm-email-already-sent": "E-mail onayı zaten gönderilmiş, yeni bir onay göndermek için lütfen 1 dakika bekleyin.",
+    "sendmail-not-found": "Sendmail yürütülemedi, lüften indirildiğinden ve NodeBB kullanıcısı tarafından uygulanabilir olduğundan emin olun.",
     "username-too-short": "Kullanıcı ismi çok kısa",
     "username-too-long": "Kullanıcı ismi çok uzun.",
     "password-too-long": "Parola çok uzun",
     "user-banned": "Kullanıcı Yasaklı",
     "user-too-new": "Özür dileriz, ilk iletinizi yapmadan önce %1 saniye beklemeniz gerekiyor",
     "blacklisted-ip": "Üzgünüz, IP adresiniz, bu toplulukta yasaklandı. Bunun bir hata olduğunu düşünüyorsanız, bir yönetici ile irtibata geçiniz.",
+    "ban-expiry-missing": "Bu yasak için bir bitiş tarihi girin",
     "no-category": "Kategori Yok",
     "no-topic": "Başlık Yok",
     "no-post": "İleti Yok",
@@ -38,6 +41,19 @@
     "category-disabled": "Kategori aktif değil",
     "topic-locked": "Başlık Kilitli",
     "post-edit-duration-expired": "Gönderilen iletiler %1 saniyeden sonra değiştirilemez",
+    "post-edit-duration-expired-minutes": "Gönderildikten %1 dakika(s) sonra iletini düzenlemene izin verilir.",
+    "post-edit-duration-expired-minutes-seconds": "Gönderildikten %1 dakika(s) %2 saniye(s) sonra iletini düzenlemene izin verilir.",
+    "post-edit-duration-expired-hours": "Gönderildikten %1 saat(s) sonra iletini düzenlemene izin verilir.",
+    "post-edit-duration-expired-hours-minutes": "Gönderildikten %1 saat(s) %2 dakika(s) sonra iletini düzenlemene izin verilir.",
+    "post-edit-duration-expired-days": "Gönderildikten %1 gün(s) sonra iletini düzenlemene izin verilir.",
+    "post-edit-duration-expired-days-hours": "Gönderildikten %1 gün(s) %2 saat(s) sonra iletini düzenlemene izin verilir.",
+    "post-delete-duration-expired": "Gönderildikten %1 saniye(s) sonra iletini silmene izin verilir.",
+    "post-delete-duration-expired-minutes": "Gönderildikten %1 dakika(s) sonra iletini silmene izin verilir.",
+    "post-delete-duration-expired-minutes-seconds": "Gönderildikten %1 dakika(s) %2 saniye(s) sonra iletini silmene izin verilir.",
+    "post-delete-duration-expired-hours": "Gönderildikten %1 saat(s) sonra iletini silmene izin verilir.",
+    "post-delete-duration-expired-hours-minutes": "Gönderildikten %1 saat(s) %2 dakika(s) sonra iletini silmene izin verilir.",
+    "post-delete-duration-expired-days": "Gönderildikten %1 gün(s) sonra iletini silmene izin verilir.",
+    "post-delete-duration-expired-days-hours": "Gönderildikten  %1 gün(s) %2 saat(s) sonra iletini silmene izin verilir.",
     "content-too-short": "Lütfen daha uzun bir ileti girin. En az %1 karakter.",
     "content-too-long": "Lütfen daha kısa bir ileti girin. İletiler %1 karakterden uzun olamaz.",
     "title-too-short": "Lütfen daha uzun bir başlık girin. Başlıklar en az %1 karakter içermelidir.",
@@ -55,10 +71,12 @@
     "already-unfavourited": "Bu iletiyi zaten yer imlerinizden çıkardınız",
     "cant-ban-other-admins": "Başka yöneticileri yasaklayamazsınız!",
     "cant-remove-last-admin": "Tek yönetici sizsiniz. Kendinizi adminlikten çıkarmadan önce başka bir kullanıcıyı admin olarak ekleyiniz",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Geçersiz resim uzantısı. Izin verilen uzantılar: %1",
     "invalid-image-extension": "Geçersiz resim uzantısı",
     "invalid-file-type": "Geçersiz dosya türü. İzin verilenler şunlar : %1",
     "group-name-too-short": "Grup ismi çok kısa",
+    "group-name-too-long": "Grup adı çok uzun",
     "group-already-exists": "Grup zaten var",
     "group-name-change-not-allowed": "Grup ismini değiştiremezsiniz",
     "group-already-member": "Bu grubun zaten bir parçasısın.",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "Bu mesajı düzenlemek için izin verilmez",
     "cant-remove-last-user": "Son kullanıcıyı silemezsiniz",
     "cant-delete-chat-message": "Bu mesajı silmek için izin verilmez",
+    "already-voting-for-this-post": "Bu gönderi için zaten oy verdin.",
     "reputation-system-disabled": "Saygınlık sistemi kapatılmış.",
     "downvoting-disabled": "Aşagı oylama kapatılmış",
     "not-enough-reputation-to-downvote": "Bu iletiyi aşagı oylamak için yeterince saygınlığınız yok.",
@@ -99,5 +118,6 @@
     "no-session-found": "Giriş yapılmış bir oturum bulunamadı!",
     "not-in-room": "Odada kullanıcı yok",
     "no-users-in-room": "Bu odada kullanıcı yok",
-    "cant-kick-self": "Kendinizi gruptan atamazsınız."
+    "cant-kick-self": "Kendinizi gruptan atamazsınız.",
+    "no-users-selected": "Seçili kullanıcı(s) bulunamadı"
 }
\ No newline at end of file
diff --git a/public/language/tr/login.json b/public/language/tr/login.json
index bd13e81d46..e28dda2797 100644
--- a/public/language/tr/login.json
+++ b/public/language/tr/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Beni Hatırla!",
     "forgot_password": "Şifrenizi mi unuttunuz?",
     "alternative_logins": "Alternatif Girişler",
-    "failed_login_attempt": "Oturum açma girişimi başarısız, lütfen tekrar deneyin.",
+    "failed_login_attempt": "Giriş Başarısız",
     "login_successful": "Başarıyla giriş yaptınız!",
     "dont_have_account": "Hesabınız yok mu?"
 }
\ No newline at end of file
diff --git a/public/language/tr/modules.json b/public/language/tr/modules.json
index b896b442a0..06e5876c68 100644
--- a/public/language/tr/modules.json
+++ b/public/language/tr/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Gönder ve Kitle",
     "composer.toggle_dropdown": "Menü aç",
     "composer.uploading": "Yükleniyor %1",
+    "composer.formatting.bold": "Kalın",
+    "composer.formatting.italic": "İtalik",
+    "composer.formatting.list": "Liste",
+    "composer.formatting.strikethrough": "Üstüçizili",
+    "composer.formatting.link": "Bağlantı",
+    "composer.formatting.picture": "Görsel",
+    "composer.upload-picture": "Görsel Yükle",
+    "composer.upload-file": "Dosya Yükle",
     "bootbox.ok": "Tamam",
     "bootbox.cancel": "İptal",
     "bootbox.confirm": "Onayla",
diff --git a/public/language/tr/pages.json b/public/language/tr/pages.json
index b076bf11d9..a23ef6844d 100644
--- a/public/language/tr/pages.json
+++ b/public/language/tr/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "En çok ileti gönderen kullanıcılar",
     "users/sort-reputation": "En çok saygınlığı olan kullanıcılar",
     "users/banned": "Yasaklanmış Kullanıcılar",
+    "users/most-flags": "En Fazla Bayraklanan Kullanıcılar",
     "users/search": "Kullanıcı Ara",
     "notifications": "Bildirimler",
     "tags": "Etiketler",
diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json
index e12c92f005..e79c6c3d4e 100644
--- a/public/language/tr/topic.json
+++ b/public/language/tr/topic.json
@@ -26,12 +26,13 @@
     "tools": "Araçlar",
     "flag": "Bayrak",
     "locked": "Kilitli",
-    "bookmark_instructions": "Bu başlıkta okuduğun en son iletiye gitmek için buraya tıklayınız",
+    "bookmark_instructions": "Bu başlıkta en son kaldığın yere dönmek için tıklayın.",
     "flag_title": "Bu iletiyi moderatöre haber et",
     "flag_success": "Bu ileti yöneticilere bildirildi.",
     "deleted_message": "Bu başlık silindi. Sadece başlık düzenleme yetkisi olan kullanıcılar görebilir.",
     "following_topic.message": "Artık bir kullanıcı bu başlığa ileti gönderdiğinde bildirim alacaksınız.",
     "not_following_topic.message": "Artık bu başlık için bildirim almayacaksınız.",
+    "ignoring_topic.message": "Bu başlığı okunmamış başlıklar alanında görmeyeceksin. Eğer bir iletide bahsedilirsen veya iletin oylanırsa bildiri alacaksın.",
     "login_to_subscribe": "Lütfen bu iletiyi başlığa üye olmak için giriş yapın.",
     "markAsUnreadForAll.success": "Başlık herkes için okunmadı olarak işaretlendi.",
     "mark_unread": "Okunmadı olarak işaretle",
@@ -41,6 +42,12 @@
     "watch.title": "Bu başlığa gelen yeni iletilerden haberdar ol",
     "unwatch.title": "Bu konuyu izleme",
     "share_this_post": "Bu iletiyi paylaş",
+    "watching": "Takip Et",
+    "not-watching": "Takip etme",
+    "ignoring": "Sustur",
+    "watching.description": "Yeni bir ileti geldiğinde beni bildir.<br/>Okunmamış olarak göster.",
+    "not-watching.description": "Yeni bir ileti geldiğinde bildirme.<br/>Kategori susturulmamışsa okunmamış olarak göster.",
+    "ignoring.description": "Yeni bir ileti geldiğinde bildirme.<br/>Okunmamış olarak gösterme.",
     "thread_tools.title": "Konu Ayaları",
     "thread_tools.markAsUnreadForAll": "Okunmadı Olarak İşaretle",
     "thread_tools.pin": "Başlığı İğnele",
diff --git a/public/language/tr/unread.json b/public/language/tr/unread.json
index 49b8995dc5..4ef01109e7 100644
--- a/public/language/tr/unread.json
+++ b/public/language/tr/unread.json
@@ -6,5 +6,8 @@
     "selected": "Seçili",
     "all": "Hepsi",
     "all_categories": "Tüm kategoriler",
-    "topics_marked_as_read.success": "Başlıklar okundu olarak işaretlendi!"
+    "topics_marked_as_read.success": "Başlıklar okundu olarak işaretlendi!",
+    "all-topics": "Tüm Başlıklar",
+    "new-topics": "Yeni Başlıklar",
+    "watched-topics": "İzlenen Başlıklar"
 }
\ No newline at end of file
diff --git a/public/language/tr/user.json b/public/language/tr/user.json
index 1664a6ec81..c697e9adda 100644
--- a/public/language/tr/user.json
+++ b/public/language/tr/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Dışarı giden bağlantıları yeni sekmede aç",
     "enable_topic_searching": "Konu içi aramayı aktive et",
     "topic_search_help": "Aktive edilirse, konu içi arama tarayıcının normal arama davranışını değiştirerek tüm konuyu aramanızı sağlar",
+    "delay_image_loading": "Gecikmeli Görsel Yükleme",
+    "image_load_delay_help": "Aktif hale getirmeniz halinde başlıktaki görseller, sayfa kaydırıldıkca yüklenecek",
     "scroll_to_my_post": "Cevap yazdıktan sonra yeni gönderiyi göster",
-    "follow_topics_you_reply_to": "Cevap verdiğim konuları takip et",
-    "follow_topics_you_create": "Kendi konularımı takip et",
-    "grouptitle": "Göstermek istediğiniz gurup başlığını seçin",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Grup Başlığı",
     "no-group-title": "Grup başlığı yok",
     "select-skin": "Bir deri şeçin",
     "select-homepage": "Bir anasayfa seçin",
diff --git a/public/language/tr/users.json b/public/language/tr/users.json
index fa0bc51096..92dbf55d42 100644
--- a/public/language/tr/users.json
+++ b/public/language/tr/users.json
@@ -2,6 +2,7 @@
     "latest_users": "En Yeni Kullanıcılar",
     "top_posters": "En Fazla Gönderim Yapanlar",
     "most_reputation": "En Saygın",
+    "most_flags": "En Fazla Bayrak",
     "search": "Ara",
     "enter_username": "Aramak için bir kullanıcı adı girin",
     "load_more": "Daha Fazla Yükle",
diff --git a/public/language/vi/email.json b/public/language/vi/email.json
index de77b60125..30b3fb658a 100644
--- a/public/language/vi/email.json
+++ b/public/language/vi/email.json
@@ -24,6 +24,7 @@
     "digest.day": "ngày",
     "digest.week": "tuần",
     "digest.month": "tháng",
+    "digest.subject": "Tóm tắt cho %1",
     "notif.chat.subject": "Bạn có tin nhắn mới từ %1",
     "notif.chat.cta": "Nhấn vào đây để tiếp tục cuộc hội thoại",
     "notif.chat.unsub.info": "Thông báo tin nhắn này được gửi tới dựa theo cài đặt theo dõi của bạn.",
diff --git a/public/language/vi/error.json b/public/language/vi/error.json
index fd5b2a903e..737ca3da9f 100644
--- a/public/language/vi/error.json
+++ b/public/language/vi/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "Mật khẩu không hợp lệ",
     "invalid-username-or-password": "Xin hãy nhập cả tên đăng nhập và mật khẩu",
     "invalid-search-term": "Từ khóa không hợp lệ",
+    "csrf-invalid": "Hệ thống không cho phép bạn đăng nhập, có vẻ như phiên đăng nhập cũ đã hết hạn. Hãy thử đăng nhập lại",
     "invalid-pagination-value": "Giá trị trang không hợp lệ, tối thiểu phải là %1 và tối đa là %2",
     "username-taken": "Tên đăng nhập đã tồn tại",
     "email-taken": "Email đã được đăng kí",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "Diễn đàn này yêu cầu xác nhận email, vui lòng nhấn vào đây để nhập email.",
     "email-confirm-failed": "Chúng tôi không thể xác nhận email của bạn, vui lòng thử lại sau.",
     "confirm-email-already-sent": "Email xác nhận đã được gửi, vui lòng chờ %1 phút để yêu cầu gửi lại.",
+    "sendmail-not-found": "Không tìm thấy lệnh thực thi \"sendmail\", hãy chắc chắn nó đã được cài đặt và thực thi bởi người quản trị đang vận hành NodeBB",
     "username-too-short": "Tên đăng nhập quá ngắn",
     "username-too-long": "Tên đăng nhập quá dài",
     "password-too-long": "Mật khẩu quá dài",
     "user-banned": "Tài khoản bị ban",
     "user-too-new": "Rất tiếc, bạn phải chờ %1 giây để đăng bài viết đầu tiên.",
-    "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "blacklisted-ip": "Rất tiếc, địa chỉ IP của bạn đã bị ban khỏi cộng đồng. Nếu bạn cảm thấy có gì không đúng, hãy liên lạc với người quản trị.",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "Danh mục không tồn tại",
     "no-topic": "Chủ đề không tồn tại",
     "no-post": "Bài viết không tồn tại",
@@ -38,6 +41,19 @@
     "category-disabled": "Danh mục bị khóa",
     "topic-locked": "Chủ đề bị khóa",
     "post-edit-duration-expired": "Bạn chỉ được phép sửa bài viết sau khi đăng %1 giây.",
+    "post-edit-duration-expired-minutes": "Bạn chỉ được phép sửa các bài viết sau khi đăng %1 phút(s)",
+    "post-edit-duration-expired-minutes-seconds": "Bạn chỉ được phép sửa các bài viết sau khi đăng %1 phút(s) %2 giây(s)",
+    "post-edit-duration-expired-hours": "Bạn chỉ được phép sửa bài viết sau khi đăng %1 giờ(s).",
+    "post-edit-duration-expired-hours-minutes": "Bạn chỉ được phép sửa các bài viết sau khi đăng %1 giờ(s) %2 phút(s)",
+    "post-edit-duration-expired-days": "Bạn chỉ được phép sửa các bài viết sau khi đăng %1 ngày(s)",
+    "post-edit-duration-expired-days-hours": "Bạn chỉ được phép sửa các bài viết sau khi đăng %1 ngày(s) %2 giờ(s)",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
     "content-too-short": "Vui lòng nhập một bài viết dài hơn. Bài viết phải có tối thiểu %1 ký tự.",
     "content-too-long": "Vui lòng nhập một bài viết ngắn hơn. Bài viết chỉ có thể có tối đa %1 ký tự.",
     "title-too-short": "Vui lòng nhập tiêu đề dài hơn. Tiêu đề phải có tối thiểu %1 ký tự.",
@@ -51,14 +67,16 @@
     "still-uploading": "Vui lòng chờ upload",
     "file-too-big": "Kích cỡ file được cho phép tối đa là %1 kB - vui lòng tải lên file có dung lượng nhỏ hơn.",
     "guest-upload-disabled": "Khách (chưa có tài khoản) không có quyền tải lên file.",
-    "already-favourited": "You have already bookmarked this post",
-    "already-unfavourited": "You have already unbookmarked this post",
+    "already-favourited": "Bạn đã đánh dấu bài viết này",
+    "already-unfavourited": "Bạn đã bỏ đánh dấu bài viết này",
     "cant-ban-other-admins": "Bạn không thể ban được các admin khác",
     "cant-remove-last-admin": "Bạn là quản trị viên duy nhất. Hãy cho thành viên khác làm quản trị viên trước khi huỷ bỏ quyền quản trị của bạn.",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "Định dạng ảnh không hợp lệ. Những định dạng được cho phép là: %1",
     "invalid-image-extension": "Định dạng ảnh không hợp lệ",
     "invalid-file-type": "Định dạng file không hợp lệ. Những định dạng được cho phép là: %1",
     "group-name-too-short": "Tên nhóm quá ngắn",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "Nhóm đã tồn tại",
     "group-name-change-not-allowed": "Không cho phép đổi tên nhóm",
     "group-already-member": "Bạn đã là thành viên của nhóm này.",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "Bạn không được phép chỉnh sửa tin nhắn này",
     "cant-remove-last-user": "Bạn không thể xoá thành viên cuối cùng",
     "cant-delete-chat-message": "Bạn không được phép xoá tin nhắn này",
+    "already-voting-for-this-post": "Bạn đã bỏ phiếu cho bài viết này",
     "reputation-system-disabled": "Hệ thống tín nhiệm đã bị vô hiệu hóa.",
     "downvoting-disabled": "Downvote đã bị tắt",
     "not-enough-reputation-to-downvote": "Bạn không có đủ phiếu tín nhiệm để downvote bài này",
@@ -98,6 +117,7 @@
     "invite-maximum-met": "Bạn đã sử dụng hết số lượng lời mời bạn có thể gửi (%1 đã gửi trên tổng số %2 được cho phép)",
     "no-session-found": "Không tìm thấy phiên đăng nhập!",
     "not-in-room": "Thành viên không có trong phòng",
-    "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "no-users-in-room": "Không có ai trong phòng này",
+    "cant-kick-self": "Bạn không thể kick chính bạn ra khỏi nhóm",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/vi/global.json b/public/language/vi/global.json
index e466d74fae..ffd5490c4b 100644
--- a/public/language/vi/global.json
+++ b/public/language/vi/global.json
@@ -87,8 +87,8 @@
     "map": "Bản đồ",
     "sessions": "Phiên đăng nhập",
     "ip_address": "Địa chỉ IP",
-    "enter_page_number": "Enter page number",
-    "upload_file": "Upload file",
-    "upload": "Upload",
-    "allowed-file-types": "Allowed file types are %1"
+    "enter_page_number": "Nhập vào số trang",
+    "upload_file": "Tải file lên",
+    "upload": "Tải lên",
+    "allowed-file-types": "Các định dạng file được cho phép là %1"
 }
\ No newline at end of file
diff --git a/public/language/vi/groups.json b/public/language/vi/groups.json
index 1bb89ad728..eeadc826ec 100644
--- a/public/language/vi/groups.json
+++ b/public/language/vi/groups.json
@@ -41,7 +41,7 @@
     "details.hidden": "Đã ẩn",
     "details.hidden_help": "Nếu bật, nhóm này sẽ không được hiện thị trong danh sách nhóm, và thành viên phải được mời để tham gia",
     "details.delete_group": "Xoá nhóm",
-    "details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
+    "details.private_system_help": "Các nhóm kín được vô hiệu hóa bởi hệ thống, tùy chọn này không thực hiện bất cứ điều gì cả",
     "event.updated": "Thông tin nhóm đã được cập nhật",
     "event.deleted": "Nhóm \"%1\" đã bị xoá",
     "membership.accept-invitation": "Chấp nhận lời mời",
@@ -50,5 +50,5 @@
     "membership.leave-group": "Rời khỏi nhóm",
     "membership.reject": "Từ chối",
     "new-group.group_name": "Tên nhóm",
-    "upload-group-cover": "Upload group cover"
+    "upload-group-cover": "Tải ảnh bìa lên cho nhóm"
 }
\ No newline at end of file
diff --git a/public/language/vi/login.json b/public/language/vi/login.json
index 01b7f2dc96..525f84e455 100644
--- a/public/language/vi/login.json
+++ b/public/language/vi/login.json
@@ -5,7 +5,7 @@
     "remember_me": "Ghi nhớ?",
     "forgot_password": "Quên mật khẩu?",
     "alternative_logins": "Đăng nhập bằng tài khoản khác",
-    "failed_login_attempt": "Đăng nhập thất bại, xin hãy thử lại",
+    "failed_login_attempt": "Đăng nhập không thành công",
     "login_successful": "Bạn đã đăng nhập thành công!",
     "dont_have_account": "Chưa có tài khoản?"
 }
\ No newline at end of file
diff --git a/public/language/vi/modules.json b/public/language/vi/modules.json
index 0f5ba2fe46..c7863e97aa 100644
--- a/public/language/vi/modules.json
+++ b/public/language/vi/modules.json
@@ -6,7 +6,7 @@
     "chat.user_typing": "%1b đang gõ...",
     "chat.user_has_messaged_you": "%1 đã gửi tin cho bạn.",
     "chat.see_all": "Xem tất cả",
-    "chat.mark_all_read": "Mark all chats read",
+    "chat.mark_all_read": "Đánh dấu đã đọc toàn bộ hội thoại",
     "chat.no-messages": "Hãy chọn 1 tài khoản để xem lịch sử chat",
     "chat.no-users-in-room": "Không có người nào trong phòng này.",
     "chat.recent-chats": "Vừa chat",
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "Đăng và Khoá",
     "composer.toggle_dropdown": "Đóng/mở dropdown",
     "composer.uploading": "Đang tải lên %1",
+    "composer.formatting.bold": "In đậm",
+    "composer.formatting.italic": "In nghiêng",
+    "composer.formatting.list": "Danh sách",
+    "composer.formatting.strikethrough": "Gạch ngang",
+    "composer.formatting.link": "Đường dẫn",
+    "composer.formatting.picture": "Hình ảnh",
+    "composer.upload-picture": "Tải ảnh lên",
+    "composer.upload-file": "Tải file lên",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Huỷ bỏ",
     "bootbox.confirm": "Xác nhận",
diff --git a/public/language/vi/notifications.json b/public/language/vi/notifications.json
index 1520437ea9..c6f06e5b9e 100644
--- a/public/language/vi/notifications.json
+++ b/public/language/vi/notifications.json
@@ -16,9 +16,9 @@
     "upvoted_your_post_in_multiple": "<strong>%1</strong> và %2 others đã tán thành với bài viết của bạn trong <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> đã chuyển bài viết của bạn tới <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> đã chuyển <strong>%2</strong>",
-    "favourited_your_post_in": "<strong>%1</strong> has bookmarked your post in <strong>%2</strong>.",
-    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have bookmarked your post in <strong>%3</strong>.",
-    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have bookmarked your post in <strong>%3</strong>.",
+    "favourited_your_post_in": "<strong>%1</strong> đã đánh dấu  bài viết của bạn tại <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> và <strong>%2</strong> đã đánh dấu bài viết của bạn tại <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> và %2 người khác đã đánh dấu bài viết của bạn tại <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> gắn cờ 1 bài trong <strong>%2</strong>",
     "user_flagged_post_in_dual": "<strong>%1</strong> và <strong>%2</strong> đã gắn cờ một bài viết trong <strong>%3</strong>",
     "user_flagged_post_in_multiple": "<strong>%1</strong> và %2 người khác đã gắn cờ bài viết của bạn trong <strong>%3</strong>",
@@ -30,7 +30,7 @@
     "user_started_following_you_dual": "<strong>%1</strong> và <strong>%2</strong>  đã bắt đầu theo dõi bạn.",
     "user_started_following_you_multiple": "<strong>%1</strong> và %2 người khác đã bắt đầu theo dõi bạn.",
     "new_register": "<strong>%1</strong> đã gửi một yêu cầu tham gia.",
-    "new_register_multiple": "There are <strong>%1</strong> registration requests awaiting review.",
+    "new_register_multiple": "Có <strong>%1</strong> đơn đăng ký đang chờ xem xét.",
     "email-confirmed": "Đã xác nhận email",
     "email-confirmed-message": "Cảm ơn bạn đã xác nhận địa chỉ email của bạn. Tài khoản của bạn đã được kích hoạt đầy đủ.",
     "email-confirm-error-message": "Đã có lỗi khi xác nhận địa chỉ email. Có thể đoạn mã không đúng hoặc đã hết hạn.",
diff --git a/public/language/vi/pages.json b/public/language/vi/pages.json
index 13b6ab018d..7cd685507a 100644
--- a/public/language/vi/pages.json
+++ b/public/language/vi/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "Thành viên có nhiều bài đăng nhất",
     "users/sort-reputation": "Thành viên có điểm tín nhiệm cao nhất",
     "users/banned": "Thành viên đã bị cấm",
+    "users/most-flags": "Most flagged users",
     "users/search": "Tìm kiếm thành viên",
     "notifications": "Thông báo",
     "tags": "Tag",
@@ -33,13 +34,13 @@
     "account/posts": "Bài viết được đăng bởi %1",
     "account/topics": "Chủ đề được tạo bởi %1",
     "account/groups": "Nhóm của %1",
-    "account/favourites": "%1's Bookmarked Posts",
+    "account/favourites": "Các bài viết được đánh dấu của %1",
     "account/settings": "Thiết lập",
     "account/watched": "Chủ đề %1 đang theo dõi",
     "account/upvoted": "Bài viết %1 tán thành",
     "account/downvoted": "Bài viết %1 phản đối",
     "account/best": "Bài viết hay nhất của %1",
-    "confirm": "Email Confirmed",
+    "confirm": "Đã xác nhận email",
     "maintenance.text": "%1 đang được bảo trì. Xin vui lòng quay lại sau.",
     "maintenance.messageIntro": "Ban quản lí để lại lời nhắn sau:",
     "throttled.text": "%1 hiện đang bị quá tải. Vui lòng quay lại sau."
diff --git a/public/language/vi/topic.json b/public/language/vi/topic.json
index 683acae9fa..e44b46ce5a 100644
--- a/public/language/vi/topic.json
+++ b/public/language/vi/topic.json
@@ -26,12 +26,13 @@
     "tools": "Công cụ",
     "flag": "Gắn cờ",
     "locked": "Khóa",
-    "bookmark_instructions": "Nhấn vào đây để trở lại bài viết cuối cùng mà bạn chưa đọc trong chủ đề này.",
+    "bookmark_instructions": "Bấm vào đây để quay về đọc bài viết mới nhất trong chủ đề này.",
     "flag_title": "Flag bài viết này để chỉnh sửa",
     "flag_success": "Chủ đề này đã được flag để chỉnh sửa",
     "deleted_message": "Chủ đề này đã bị xóa. Chỉ ban quản trị mới xem được.",
     "following_topic.message": "Từ giờ bạn sẽ nhận được thông báo khi có ai đó gửi bài viết trong chủ đề này",
     "not_following_topic.message": "Bạn sẽ không còn nhận được thông báo từ chủ đề này",
+    "ignoring_topic.message": "Bạn sẽ không còn xem được chủ đề này trong danh sách các chủ đề chưa đọc nữa. Bạn sẽ nhận được thông báo khi bạn được đề cập tới hoặc bài viết của bạn được bỏ phiếu.",
     "login_to_subscribe": "Xin hãy đăng ký hoặc đăng nhập để theo dõi topic này",
     "markAsUnreadForAll.success": "Chủ đề đã được đánh dấu là chưa đọc toàn bộ",
     "mark_unread": "Đánh dấu chưa đọc",
@@ -41,6 +42,12 @@
     "watch.title": "Được thông báo khi có trả lời mới trong chủ đề này",
     "unwatch.title": "Ngừng theo dõi chủ đề này",
     "share_this_post": "Chia sẻ bài viết này",
+    "watching": "Đang xem",
+    "not-watching": "Không xem",
+    "ignoring": "Bỏ qua",
+    "watching.description": "Thông báo cho tôi các trả lời mới. <br/>Hiển thị các mục chưa đọc",
+    "not-watching.description": "Không thông báo tôi các trả lời mới. <br/>Hiển thị mục chưa đọc nếu danh mục bị bỏ qua.",
+    "ignoring.description": "Không thông báo tôi các trả lời mới. <br/>Không hiển thị các mục chưa đọc.",
     "thread_tools.title": "Công cụ",
     "thread_tools.markAsUnreadForAll": "Đánh dấu chưa đọc",
     "thread_tools.pin": "Pin chủ đề",
@@ -65,9 +72,9 @@
     "disabled_categories_note": "Các phần mục bị khóa đã được đánh xám",
     "confirm_move": "Di chuyển",
     "confirm_fork": "Tạo bảo sao",
-    "favourite": "Bookmark",
-    "favourites": "Bookmarks",
-    "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
+    "favourite": "Đánh dấu",
+    "favourites": "Các đánh dấu",
+    "favourites.has_no_favourites": "Bạn chưa đánh dấu bất kỳ bài viết nào.",
     "loading_more_posts": "Tải thêm các bài gửi khác",
     "move_topic": "Chuyển chủ đề",
     "move_topics": "Di chuyển chủ đề",
diff --git a/public/language/vi/unread.json b/public/language/vi/unread.json
index 14233ae900..db616b77e7 100644
--- a/public/language/vi/unread.json
+++ b/public/language/vi/unread.json
@@ -6,5 +6,8 @@
     "selected": "Đã chọn",
     "all": "Tất cả",
     "all_categories": "Tất cả chuyên mục",
-    "topics_marked_as_read.success": "Chủ đề được đánh dấu đã đọc"
+    "topics_marked_as_read.success": "Chủ đề được đánh dấu đã đọc",
+    "all-topics": "Toàn bộ chủ đề",
+    "new-topics": "Các chủ đề mới",
+    "watched-topics": "Các chủ đề đã xem"
 }
\ No newline at end of file
diff --git a/public/language/vi/uploads.json b/public/language/vi/uploads.json
index 1622cb5693..8ab633f25f 100644
--- a/public/language/vi/uploads.json
+++ b/public/language/vi/uploads.json
@@ -1,6 +1,6 @@
 {
-    "uploading-file": "Uploading the file...",
-    "select-file-to-upload": "Select a file to upload!",
-    "upload-success": "File uploaded successfully!",
-    "maximum-file-size": "Maximum %1 kb"
+    "uploading-file": "Đang tải file lên...",
+    "select-file-to-upload": "Chọn một file để tải lên!",
+    "upload-success": "Tải file lên thành công!",
+    "maximum-file-size": "Tối đa %1 kb"
 }
\ No newline at end of file
diff --git a/public/language/vi/user.json b/public/language/vi/user.json
index c98cd1b9f9..1e185f18c5 100644
--- a/public/language/vi/user.json
+++ b/public/language/vi/user.json
@@ -22,7 +22,7 @@
     "profile": "Hồ sơ",
     "profile_views": "Số lượt người ghé thăm",
     "reputation": "Mức uy tín",
-    "favourites": "Bookmarks",
+    "favourites": "Các đánh dấu",
     "watched": "Đã theo dõi",
     "followers": "Số người theo dõi",
     "following": "Đang theo dõi",
@@ -39,7 +39,7 @@
     "change_username": "Đổi tên đăng nhập",
     "change_email": "Đổi email",
     "edit": "Chỉnh sửa",
-    "edit-profile": "Edit Profile",
+    "edit-profile": "Sửa thông tin cá nhân",
     "default_picture": "Icon mặc định",
     "uploaded_picture": "Ảnh đã tải lên",
     "upload_new_picture": "Tải lên ảnh mới",
@@ -56,11 +56,11 @@
     "password": "Mật khẩu",
     "username_taken_workaround": "Tên truy cập này đã tồn tại, vì vậy chúng tôi đã sửa đổi nó một chút. Tên truy cập của bạn giờ là <strong>%1</strong>",
     "password_same_as_username": "Mật khẩu của bạn trùng với tên đăng nhập, vui lòng chọn một mật khẩu khác.",
-    "password_same_as_email": "Your password is the same as your email, please select another password.",
+    "password_same_as_email": "Mật khẩu của bạn trùng với email của bạn, hãy chọn mật khẩu khác.",
     "upload_picture": "Tải lên hình ảnh",
     "upload_a_picture": "Tải lên một hình ảnh",
     "remove_uploaded_picture": "Xoá ảnh đã tải lên",
-    "upload_cover_picture": "Upload cover picture",
+    "upload_cover_picture": "Tải ảnh bìa lên",
     "settings": "Thiết lập",
     "show_email": "Hiện Email của tôi",
     "show_fullname": "Hiện tên đầy đủ",
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "Mở link trong tab mới.",
     "enable_topic_searching": "Bật In-topic Searching",
     "topic_search_help": "Nếu bật, tìm kiếm trong chủ đề sẽ thay thế tính năng tính năng tìm kiếm của trình duyệt và cho phép bạn tìm kiếm trong toàn bộ chủ đề, thay vì chỉ tìm kiếm nội dung đang hiện thị trên màn hình",
-    "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Theo dõi chủ đề bạn trả lời",
-    "follow_topics_you_create": "Theo dõi chủ đề bạn tạo",
-    "grouptitle": "Chọn tên nhóm mà bạn muốn hiển thị",
+    "delay_image_loading": "Việc tải ảnh đang bị chậm",
+    "image_load_delay_help": "Nếu được bật, toàn bộ ảnh trong chủ đề sẽ chỉ được tải khi người dùng kéo chuột tới",
+    "scroll_to_my_post": "Sau khi đăng một trả lời thì hiển thị bài viết mới",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "Tên nhóm",
     "no-group-title": "Không có tên nhóm",
     "select-skin": "Chọn một giao diện",
     "select-homepage": "Chọn Trang chủ",
diff --git a/public/language/vi/users.json b/public/language/vi/users.json
index 0e60994360..5a830cf2de 100644
--- a/public/language/vi/users.json
+++ b/public/language/vi/users.json
@@ -2,6 +2,7 @@
     "latest_users": "Thành viên mới nhất",
     "top_posters": "Thành viên đăng bài nhiều nhất",
     "most_reputation": "Thành viên có điểm tín nhiệm cao nhất",
+    "most_flags": "Most Flags",
     "search": "Tìm kiếm",
     "enter_username": "Gõ tên thành viên để tìm kiếm",
     "load_more": "Tải thêm",
diff --git a/public/language/zh_CN/email.json b/public/language/zh_CN/email.json
index 4d4534bf72..66650a0b02 100644
--- a/public/language/zh_CN/email.json
+++ b/public/language/zh_CN/email.json
@@ -24,6 +24,7 @@
     "digest.day": "天",
     "digest.week": "周",
     "digest.month": "月",
+    "digest.subject": "%1 的摘要",
     "notif.chat.subject": "收到来自 %1 的新聊天消息",
     "notif.chat.cta": "点击这里继续会话",
     "notif.chat.unsub.info": "根据您的订阅设置，为您发送此聊天提醒。",
diff --git a/public/language/zh_CN/error.json b/public/language/zh_CN/error.json
index 4e8ec6a25f..fb79c05f2d 100644
--- a/public/language/zh_CN/error.json
+++ b/public/language/zh_CN/error.json
@@ -14,6 +14,7 @@
     "invalid-password": "无效密码",
     "invalid-username-or-password": "请确认用户名和密码",
     "invalid-search-term": "无效的搜索关键字",
+    "csrf-invalid": "可能是由于会话过期，登录失败。请重试。",
     "invalid-pagination-value": "无效的分页数值，必须介于 %1 和 %2 之间",
     "username-taken": "此用户名已被占用",
     "email-taken": "此电子邮箱已被占用",
@@ -22,12 +23,14 @@
     "no-email-to-confirm": "本论坛需要电子邮箱确认，请点击这里输入电子邮箱地址",
     "email-confirm-failed": "我们无法确认您的电子邮箱，请重试",
     "confirm-email-already-sent": "确认邮件已发出，如需重新发送请等待 %1 分钟后再试。",
+    "sendmail-not-found": "无法找到sendmail可执行程序，请确保sendmail已经安装并可被运行NodeBB的用户执行",
     "username-too-short": "用户名太短",
     "username-too-long": "用户名太长",
     "password-too-long": "密码太长",
     "user-banned": "用户已禁止",
     "user-too-new": "抱歉，您需要等待 %1 秒后，才可以发帖！",
     "blacklisted-ip": "对不起，您的IP地址已被社区禁用。如果您认为这是一个错误，请与管理员联系。",
+    "ban-expiry-missing": "请提供此次禁言结束日期",
     "no-category": "版块不存在",
     "no-topic": "主题不存在",
     "no-post": "帖子不存在",
@@ -38,6 +41,19 @@
     "category-disabled": "版块已禁用",
     "topic-locked": "主题已锁定",
     "post-edit-duration-expired": "您必须在发表 %1 秒后才能修改内容",
+    "post-edit-duration-expired-minutes": "在发表 %1 分钟后才能修改内容",
+    "post-edit-duration-expired-minutes-seconds": "发表 %1 分 %2 秒后才能修改内容",
+    "post-edit-duration-expired-hours": "发表 %1 小时后才能修改内容",
+    "post-edit-duration-expired-hours-minutes": "发表 %1 小时 ％2 分钟后才能修改内容",
+    "post-edit-duration-expired-days": "发表 %1 天后才能修改内容",
+    "post-edit-duration-expired-days-hours": "发表 %1 天 %2 小时后才能修改内容",
+    "post-delete-duration-expired": "您只能在发表 %1 秒后删除帖子",
+    "post-delete-duration-expired-minutes": "您只能在发表 %1 分钟后删除帖子",
+    "post-delete-duration-expired-minutes-seconds": "您只能在发表 %1 分 %2 秒后删除帖子",
+    "post-delete-duration-expired-hours": "您只能在发表 %1 小时后删除帖子",
+    "post-delete-duration-expired-hours-minutes": "您只能在发表 %1 小时 %2 分钟后删除帖子",
+    "post-delete-duration-expired-days": "您只能在发表 %1 天后删除帖子",
+    "post-delete-duration-expired-days-hours": "您只能在发表 %1 天 %2 小时后删除帖子",
     "content-too-short": "请增添发帖内容，不能少于 %1 个字符。",
     "content-too-long": "请删减发帖内容，不能超过 %1 个字符。",
     "title-too-short": "请增加标题，不能少于 %1 个字符。",
@@ -55,10 +71,12 @@
     "already-unfavourited": "您已取消了此贴的书签",
     "cant-ban-other-admins": "您不能封禁其他管理员！",
     "cant-remove-last-admin": "您是唯一的管理员。在删除您的管理员权限前，请添加另一个管理员。",
+    "cant-delete-admin": "在删除之前请你先把管理员的权限从这个账号移除。",
     "invalid-image-type": "无效的图像类型。允许的类型有：%1",
     "invalid-image-extension": "无效的图像扩展",
     "invalid-file-type": "无效文件格式，允许的格式有：%1",
     "group-name-too-short": "小组名太短",
+    "group-name-too-long": "小组名太长",
     "group-already-exists": "小组已存在",
     "group-name-change-not-allowed": "不允许更改小组名称",
     "group-already-member": "已经是此小组的成员",
@@ -85,6 +103,7 @@
     "cant-edit-chat-message": "您不能编辑这条信息",
     "cant-remove-last-user": "您不能移除这个用户",
     "cant-delete-chat-message": "您不允许删除这条消息",
+    "already-voting-for-this-post": "您已为此帖回复投过票了。",
     "reputation-system-disabled": "威望系统已禁用。",
     "downvoting-disabled": "扣分功能已禁用",
     "not-enough-reputation-to-downvote": "您的威望不足以给此帖扣分",
@@ -99,5 +118,6 @@
     "no-session-found": "未登录!",
     "not-in-room": "用户已不在聊天室中",
     "no-users-in-room": "这个聊天室中没有用户",
-    "cant-kick-self": "你不能把自己踢出群组"
+    "cant-kick-self": "你不能把自己踢出群组",
+    "no-users-selected": "尚未选择用户"
 }
\ No newline at end of file
diff --git a/public/language/zh_CN/login.json b/public/language/zh_CN/login.json
index 9cf15f0e15..6086ef9b0e 100644
--- a/public/language/zh_CN/login.json
+++ b/public/language/zh_CN/login.json
@@ -5,7 +5,7 @@
     "remember_me": "记住我？",
     "forgot_password": "忘记密码？",
     "alternative_logins": "使用合作网站帐号登录",
-    "failed_login_attempt": "登录失败，请重试。",
+    "failed_login_attempt": "登录失败",
     "login_successful": "您已经成功登录！",
     "dont_have_account": "没有帐号？"
 }
\ No newline at end of file
diff --git a/public/language/zh_CN/modules.json b/public/language/zh_CN/modules.json
index bf50d3f496..da6d813ee3 100644
--- a/public/language/zh_CN/modules.json
+++ b/public/language/zh_CN/modules.json
@@ -29,6 +29,14 @@
     "composer.submit_and_lock": "提交并锁定",
     "composer.toggle_dropdown": "标为 Dropdown",
     "composer.uploading": "正在上传 %1",
+    "composer.formatting.bold": "加粗",
+    "composer.formatting.italic": "倾斜",
+    "composer.formatting.list": "列表",
+    "composer.formatting.strikethrough": "删除线",
+    "composer.formatting.link": "链接",
+    "composer.formatting.picture": "图片",
+    "composer.upload-picture": "上传图片",
+    "composer.upload-file": "上传文件",
     "bootbox.ok": "确认",
     "bootbox.cancel": "取消",
     "bootbox.confirm": "确认",
diff --git a/public/language/zh_CN/pages.json b/public/language/zh_CN/pages.json
index 728ed037b8..c35e09991d 100644
--- a/public/language/zh_CN/pages.json
+++ b/public/language/zh_CN/pages.json
@@ -12,6 +12,7 @@
     "users/sort-posts": "最多发帖的会员",
     "users/sort-reputation": "最多积分的会员",
     "users/banned": "被封禁的用户",
+    "users/most-flags": "被举报次数最多的用户",
     "users/search": "会员搜索",
     "notifications": "提醒",
     "tags": "话题",
diff --git a/public/language/zh_CN/topic.json b/public/language/zh_CN/topic.json
index c123366bb0..a7c0b74f52 100644
--- a/public/language/zh_CN/topic.json
+++ b/public/language/zh_CN/topic.json
@@ -26,12 +26,13 @@
     "tools": "工具",
     "flag": "举报",
     "locked": "已锁定",
-    "bookmark_instructions": "点击这里返回最新的未读回帖。",
+    "bookmark_instructions": "点击阅读本主题帖中的最新回复",
     "flag_title": "举报此帖",
     "flag_success": "已举报此回帖。",
     "deleted_message": "此主题已被删除。只有拥有主题管理权限的用户可以查看。",
     "following_topic.message": "当有人回复此主题时，您会收到通知。",
     "not_following_topic.message": "您已停止接收此主题的通知。",
+    "ignoring_topic.message": "您将不会在未读主题列表里看到这个主题，但在被提到以及帖子被顶时仍将收到通知。",
     "login_to_subscribe": "请注册或登录后，再订阅此主题。",
     "markAsUnreadForAll.success": "将全部主题标为未读。",
     "mark_unread": "标记为未读",
@@ -41,6 +42,12 @@
     "watch.title": "当此主题有新回复时，通知我",
     "unwatch.title": "取消关注此主题",
     "share_this_post": "分享",
+    "watching": "关注中",
+    "not-watching": "未关注",
+    "ignoring": "忽略中",
+    "watching.description": "有新回复时通知我。<br/>在未读主题中显示。",
+    "not-watching.description": "不要在有新回复时通知我。<br/>如果这个分类未被忽略则在未读主题中显示。",
+    "ignoring.description": "不要在有新回复时通知我。<br/>不要在未读主题中显示该主题。",
     "thread_tools.title": "主题工具",
     "thread_tools.markAsUnreadForAll": "标记为未读",
     "thread_tools.pin": "置顶主题",
diff --git a/public/language/zh_CN/unread.json b/public/language/zh_CN/unread.json
index 58ab5b0389..bd4d52074b 100644
--- a/public/language/zh_CN/unread.json
+++ b/public/language/zh_CN/unread.json
@@ -6,5 +6,8 @@
     "selected": "已选",
     "all": "全部",
     "all_categories": "全部分类",
-    "topics_marked_as_read.success": "主题被标为已读！"
+    "topics_marked_as_read.success": "主题被标为已读！",
+    "all-topics": "全部主题",
+    "new-topics": "新建主题",
+    "watched-topics": "看过的主题"
 }
\ No newline at end of file
diff --git a/public/language/zh_CN/user.json b/public/language/zh_CN/user.json
index e713189b25..1f8575b9be 100644
--- a/public/language/zh_CN/user.json
+++ b/public/language/zh_CN/user.json
@@ -92,10 +92,12 @@
     "open_links_in_new_tab": "在新标签打开外部链接",
     "enable_topic_searching": "启用主题内搜索",
     "topic_search_help": "如果启用此项，主题内搜索会替代浏览器默认的页面搜索，您将可以在整个主题内搜索，而不仅仅只搜索页面上展现的内容。",
+    "delay_image_loading": "延迟图片加载",
+    "image_load_delay_help": "启用后，帖子中的图片仅在用户滚动到图片所在位置时加载",
     "scroll_to_my_post": "在提交回复之后显示新帖子",
-    "follow_topics_you_reply_to": "关注您回复的主题",
-    "follow_topics_you_create": "关注您创建的主题",
-    "grouptitle": "选择展示的小组称号",
+    "follow_topics_you_reply_to": "关注你回复过的主题",
+    "follow_topics_you_create": "关注你创建的主题",
+    "grouptitle": "小组标题",
     "no-group-title": "不展示小组称号",
     "select-skin": "选择皮肤",
     "select-homepage": "选择首页",
diff --git a/public/language/zh_CN/users.json b/public/language/zh_CN/users.json
index 50d6dc0c23..44af27c94d 100644
--- a/public/language/zh_CN/users.json
+++ b/public/language/zh_CN/users.json
@@ -2,6 +2,7 @@
     "latest_users": "最新会员",
     "top_posters": "发帖排行",
     "most_reputation": "威望排行",
+    "most_flags": "最多举报",
     "search": "搜索",
     "enter_username": "输入用户名搜索",
     "load_more": "加载更多",
diff --git a/public/language/zh_TW/category.json b/public/language/zh_TW/category.json
index c1ab395ea5..fa2e367ae2 100644
--- a/public/language/zh_TW/category.json
+++ b/public/language/zh_TW/category.json
@@ -1,16 +1,16 @@
 {
-    "category": "Category",
-    "subcategories": "Subcategories",
+    "category": "類別",
+    "subcategories": "子類別",
     "new_topic_button": "新主題",
-    "guest-login-post": "登錄後才能發表",
-    "no_topics": "<strong>這個類別還沒有任何主題。</strong><br />為何不來發點東西呢？",
+    "guest-login-post": "登入後才能張貼文章",
+    "no_topics": "<strong>這個類別目前沒有任何主題。</strong><br />你要不要來張貼個新主題呢？",
     "browsing": "正在瀏覽",
     "no_replies": "還沒有回覆",
-    "no_new_posts": "No new posts.",
+    "no_new_posts": "沒有新的張貼",
     "share_this_category": "分享這類別",
-    "watch": "觀看",
+    "watch": "關注",
     "ignore": "忽略",
-    "watch.message": "您正觀看著此類別的更新",
-    "ignore.message": "您已忽略此類別的更新",
-    "watched-categories": "Watched categories"
+    "watch.message": "你正關注此類別的更新",
+    "ignore.message": "你已忽略此類別的更新",
+    "watched-categories": "關注的類別"
 }
\ No newline at end of file
diff --git a/public/language/zh_TW/email.json b/public/language/zh_TW/email.json
index 2eeb7a8e13..d34fae331b 100644
--- a/public/language/zh_TW/email.json
+++ b/public/language/zh_TW/email.json
@@ -1,35 +1,36 @@
 {
     "password-reset-requested": "已要求重設密碼 - %1!",
-    "welcome-to": "歡迎來到%1",
-    "invite": "Invitation from %1",
-    "greeting_no_name": "您好",
-    "greeting_with_name": "您好，%1",
-    "welcome.text1": "多謝登記%1!",
-    "welcome.text2": "要啟用你的帳戶，我們先要驗證你用作登記的電郵地址",
-    "welcome.text3": "An administrator has accepted your registration application. You can login with your username/password now.",
-    "welcome.cta": "請點擊此處確認您的電郵地址",
-    "invitation.text1": "%1 has invited you to join %2",
-    "invitation.ctr": "Click here to create your account.",
+    "welcome-to": "歡迎來到 %1",
+    "invite": "邀請來自 %1",
+    "greeting_no_name": "你好",
+    "greeting_with_name": "%1 你好",
+    "welcome.text1": "感謝註冊 %1!",
+    "welcome.text2": "要啟動你的帳戶，我們先要驗證你用作註冊的電子郵件地址",
+    "welcome.text3": "管理者已經批準你的註冊申請。你現在可以使用你的帳號/密碼進行登入。",
+    "welcome.cta": "請點擊此處來確認你的電子郵件地址",
+    "invitation.text1": "%1 邀請你加入 %2",
+    "invitation.ctr": "點擊這裡來建立你的帳號",
     "reset.text1": "我們收到一個重設密碼的請求，你忘掉了密碼嗎？如果不是，請忽略這封郵件。",
     "reset.text2": "要繼續重置密碼，請點擊以下鏈接：",
     "reset.cta": "點擊這裡重置密碼",
     "reset.notify.subject": "密碼修改成功",
-    "reset.notify.text1": "提醒您密碼已於 %1 修改成功",
-    "reset.notify.text2": "如果您未允許此動作, 請即刻通知系統管理者",
-    "digest.notifications": "你有來自$1的未讀通知：",
-    "digest.latest_topics": "來自%1的最新話題",
-    "digest.cta": "點擊這裡訪問%1",
-    "digest.unsub.info": "本摘要按您的訂閱設置發送給您。",
-    "digest.no_topics": "在過去%1沒有活躍的話題",
-    "digest.day": "day",
-    "digest.week": "week",
-    "digest.month": "month",
-    "notif.chat.subject": "收到來自$1的聊天消息",
-    "notif.chat.cta": "點擊此處繼續對話",
-    "notif.chat.unsub.info": "本聊天通知按您的訂閱設置發送給您。",
-    "notif.post.cta": "按此以閱讀完整標題",
-    "notif.post.unsub.info": "本發文通知按您的訂閱設置發送給您。",
-    "test.text1": "這是一個測試電郵，以確認您的NodeBB郵件器設置正確。",
-    "unsub.cta": "點擊這裡更改這些設置",
-    "closing": "謝謝！"
+    "reset.notify.text1": "我們要通知你在 %1 的密碼已成功更改",
+    "reset.notify.text2": "如果你未允許此動作, 請立即通知系統管理者",
+    "digest.notifications": "你有來自 %1 的未讀通知:",
+    "digest.latest_topics": "來自 %1 的最新主題",
+    "digest.cta": "點擊這裡訪問 %1",
+    "digest.unsub.info": "本摘要依照你的訂閱設置發送給你。",
+    "digest.no_topics": "在過去 %1 沒有活躍的主題",
+    "digest.day": "日",
+    "digest.week": "週",
+    "digest.month": "月",
+    "digest.subject": "摘要於 %1",
+    "notif.chat.subject": "收到來自 %1 的聊天訊息",
+    "notif.chat.cta": "點擊此處繼續聊天對話",
+    "notif.chat.unsub.info": "本聊天通知按你的訂閱設置發送給你。",
+    "notif.post.cta": "點擊此處來閱讀完整主題",
+    "notif.post.unsub.info": "本張貼通知按你的訂閱設置發送給你。",
+    "test.text1": "這是一個測試電子郵件，用於確認你的NodeBB郵件功能是否設置正確。",
+    "unsub.cta": "點擊此處來更改這些設置",
+    "closing": "感謝!"
 }
\ No newline at end of file
diff --git a/public/language/zh_TW/error.json b/public/language/zh_TW/error.json
index 0db5a671c2..64e29efa7e 100644
--- a/public/language/zh_TW/error.json
+++ b/public/language/zh_TW/error.json
@@ -1,8 +1,8 @@
 {
     "invalid-data": "無效的資料",
-    "not-logged-in": "您似乎還沒有登入喔！",
-    "account-locked": "您的帳戶暫時被鎖定！",
-    "search-requires-login": "Searching requires an account - please login or register.",
+    "not-logged-in": "你似乎還沒有登入喔！",
+    "account-locked": "你的帳戶暫時被鎖定！",
+    "search-requires-login": "進行搜尋需要有帳號 - 請先註冊或登入",
     "invalid-cid": "無效的類別 ID",
     "invalid-tid": "無效的主題 ID",
     "invalid-pid": "無效的文章 ID",
@@ -14,90 +14,110 @@
     "invalid-password": "無效的密碼",
     "invalid-username-or-password": "請指定用戶名和密碼",
     "invalid-search-term": "無效的搜索字詞",
-    "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
+    "csrf-invalid": "我們無法讓你登入，似乎是因為連線階段已到期。請再重試一次。",
+    "invalid-pagination-value": "無效的分頁數值, 必需是至少 %1 與最多 %2",
     "username-taken": "該使用者名稱已被使用",
     "email-taken": "該信箱已被使用",
-    "email-not-confirmed": "您的電郵尚未得到確認，請點擊此處確認您的電子郵件。",
-    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
-    "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
-    "email-confirm-failed": "We could not confirm your email, please try again later.",
-    "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
-    "username-too-short": "使用者名稱太簡短",
-    "username-too-long": "使用者名稱太長",
-    "password-too-long": "Password too long",
+    "email-not-confirmed": "你的電子郵件尚未確認，請點擊此處確認你的電子郵件。",
+    "email-not-confirmed-chat": "你需要先確認電子郵件後才能進行聊天，請點擊這裡來確認你的電子郵件。",
+    "no-email-to-confirm": "討論區要求電子郵件確認，請點擊這裡輸入一個電子郵件。",
+    "email-confirm-failed": "我們無法確認你的Email，請之後再重試。",
+    "confirm-email-already-sent": "確認電子郵件已經寄送，請等待 %1 分鐘才能再寄送另一封。",
+    "sendmail-not-found": "沒有找到sendmail可執行程序，請確認它是不是已經被安裝與可讓執行NodeBB的使用者執行的",
+    "username-too-short": "帳號太短",
+    "username-too-long": "帳號太長",
+    "password-too-long": "密碼太長",
     "user-banned": "該使用者已被停用",
-    "user-too-new": "抱歉，發表您第一篇文章須要等待 %1 秒",
-    "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
+    "user-too-new": "抱歉，發表你第一篇文章須要等待 %1 秒",
+    "blacklisted-ip": "抱歉，你的IP位置已經被這個社群禁用了。如果你覺得這是一個失誤，請連絡管理員。",
+    "ban-expiry-missing": "Please provide an end date for this ban",
     "no-category": "類別並不存在",
     "no-topic": "主題並不存在",
     "no-post": "文章並不存在",
     "no-group": "群組並不存在",
     "no-user": "使用者並不存在",
     "no-teaser": "Teaser 並不存在",
-    "no-privileges": "您似乎沒有執行這個行為的權限！",
+    "no-privileges": "你沒有執行這個行為的足夠權限！",
     "category-disabled": "該類別已被關閉",
     "topic-locked": "該主題已被鎖定",
-    "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
-    "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
-    "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
-    "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
-    "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 character(s).",
-    "too-many-posts": "You can only post once every %1 second(s) - please wait before posting again",
-    "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
-    "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",
-    "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 character(s)",
-    "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
-    "too-many-tags": "Too many tags. Topics can't have more than %1 tag(s)",
+    "post-edit-duration-expired": "在張貼 %1 秒後，你才能編輯張貼文章",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
+    "content-too-short": "請輸入一個長一點的張貼內容。張貼內容長度不能少於 %1 字元。",
+    "content-too-long": "請輸入一個短一點的張貼內容。張貼內容長度不能超過 %1 字元。",
+    "title-too-short": "請輸入一個長一點的標題。標題長度不能少於 %1 字元。",
+    "title-too-long": "請輸入一個短一點的標題。標題長度不能超過 %1 字元。",
+    "too-many-posts": "在張貼 %1 秒後，你才能再張貼文章 - 請在重新張貼前等待這個時間。",
+    "too-many-posts-newbie": "新使用者需要直到獲得 %2 聲譽後，才能在每 %1 秒後進行張貼一篇文章 - 請在重新張貼前等待這個時間。",
+    "tag-too-short": "請輸入一個長一點的標籤。標籤長度不能少於 %1 字元。",
+    "tag-too-long": "請輸入一個短一點的標籤。標籤長度不能超過 %1 字元。",
+    "not-enough-tags": "標籤數量不足夠。主題需要至少 %1 標籤。",
+    "too-many-tags": "過多標籤數量。主題無法擁有超過 %1 個標籤。",
     "still-uploading": "請等待上傳完成。",
-    "file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
-    "guest-upload-disabled": "Guest uploading has been disabled",
-    "already-favourited": "You have already bookmarked this post",
-    "already-unfavourited": "You have already unbookmarked this post",
-    "cant-ban-other-admins": "您無法禁止其他的管理員！",
-    "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "file-too-big": "最大允許的檔案大小是 %1 kB - 請上傳一個小於這個數值的檔案。",
+    "guest-upload-disabled": "訪客上傳是被禁止的",
+    "already-favourited": "你已經將這篇張貼加入書籤",
+    "already-unfavourited": "你已經將這篇張貼移除書籤",
+    "cant-ban-other-admins": "你無法封鎖其他的管理員！",
+    "cant-remove-last-admin": "你是唯一的管理員。在你移除自己為管理員前，需要新增另一個使用者為管理員。",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
     "invalid-image-type": "無效的圖像類型。允許的類型：%1",
     "invalid-image-extension": "無效的圖像擴充元件",
     "invalid-file-type": "無效的檔案類型。允許的類型：%1",
     "group-name-too-short": "群組名稱太短了",
+    "group-name-too-long": "Group name too long",
     "group-already-exists": "群組名稱已存在",
     "group-name-change-not-allowed": "變更群組名稱不被允許",
-    "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",
+    "group-already-member": "已經加入這個群組",
+    "group-not-member": "不是這個群組的一員",
+    "group-needs-owner": "這個群組需要至少一個擁有者",
+    "group-already-invited": "這個使用者已經被邀請",
+    "group-already-requested": "你的會員申請已經被提交",
     "post-already-deleted": "此文章已經被刪除",
     "post-already-restored": "此文章已還原",
     "topic-already-deleted": "此主題已經被刪除",
     "topic-already-restored": "此主題已還原",
-    "cant-purge-main-post": "You can't purge the main post, please delete the topic instead",
+    "cant-purge-main-post": "你無法清除主要的張貼文，請改為刪除這個張貼文。",
     "topic-thumbnails-are-disabled": "禁用主題縮圖",
     "invalid-file": "無效的檔案",
     "uploads-are-disabled": "上傳功能被停用",
-    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
-    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
+    "signature-too-long": "抱歉，你的簽名長度不能超過 %1 字元。",
+    "about-me-too-long": "抱歉，關於我長度不能超過 %1 字元。",
     "cant-chat-with-yourself": "你不能與自己聊天！",
     "chat-restricted": "此用戶已限制了他的聊天功能。你要在他關注你之後，才能跟他聊天",
-    "chat-disabled": "Chat system disabled",
-    "too-many-messages": "You have sent too many messages, please wait awhile.",
-    "invalid-chat-message": "Invalid chat message",
-    "chat-message-too-long": "Chat message is too long",
-    "cant-edit-chat-message": "You are not allowed to edit this message",
-    "cant-remove-last-user": "You can't remove the last user",
-    "cant-delete-chat-message": "You are not allowed to delete this message",
+    "chat-disabled": "聊天系統被禁止",
+    "too-many-messages": "你已經送出過多的訊息，請稍等一下。",
+    "invalid-chat-message": "無效的聊天訊息",
+    "chat-message-too-long": "聊天訊息太長",
+    "cant-edit-chat-message": "你不被允許編輯這條訊息",
+    "cant-remove-last-user": "你不能移除最後的使用者",
+    "cant-delete-chat-message": "你不被允許刪除這條訊息",
+    "already-voting-for-this-post": "你已經對這個張貼投過票了",
     "reputation-system-disabled": "信譽系統已停用。",
-    "downvoting-disabled": "Downvoting已停用",
-    "not-enough-reputation-to-downvote": "你沒有足夠的信譽downvote這個帖子",
+    "downvoting-disabled": "反向投票已停用",
+    "not-enough-reputation-to-downvote": "你沒有足夠的信譽可以對這個張貼進行反向投票",
     "not-enough-reputation-to-flag": "你沒有足夠的信譽來舉報這個帖子",
-    "already-flagged": "You have already flagged this post",
+    "already-flagged": "你已經對這個張貼標記過了",
     "reload-failed": "NodeBB重載\"%1\"時遇到了問題。 NodeBB將繼續提供現有的客戶端資源，但請你撤消重載前的動作。",
     "registration-error": "註冊錯誤",
-    "parse-error": "Something went wrong while parsing server response",
-    "wrong-login-type-email": "請使用您的電子郵件進行登錄",
-    "wrong-login-type-username": "請使用您的使用者名稱進行登錄",
-    "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
-    "no-session-found": "No login session found!",
-    "not-in-room": "User not in room",
-    "no-users-in-room": "No users in this room",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "parse-error": "當剖析伺服器回應時發生了某個錯誤",
+    "wrong-login-type-email": "請使用你的電子郵件進行登入",
+    "wrong-login-type-username": "請使用你的帳號進行登入",
+    "invite-maximum-met": "你已經邀請最多可邀請的人數限制 (%1 於 %2)。",
+    "no-session-found": "沒有找到登入的連線階段!",
+    "not-in-room": "使用者沒有在聊天室中",
+    "no-users-in-room": "沒有使用者在聊天室中",
+    "cant-kick-self": "你不能把自己從群組中踢出",
+    "no-users-selected": "No user(s) selected"
 }
\ No newline at end of file
diff --git a/public/language/zh_TW/global.json b/public/language/zh_TW/global.json
index 10e4169e07..85c0b4edd5 100644
--- a/public/language/zh_TW/global.json
+++ b/public/language/zh_TW/global.json
@@ -3,92 +3,92 @@
     "search": "搜尋",
     "buttons.close": "關閉",
     "403.title": "禁止存取",
-    "403.message": "你沒有該頁面的存取權限",
-    "403.login": "可能是因為你尚未<a href='%1/login'>登入</a>?",
+    "403.message": "你沒有該頁面的存取權限。",
+    "403.login": "或許是你應該 <a href='%1/login'>試著登入</a>?",
     "404.title": "無法找到該頁",
-    "404.message": "你所查找的頁面並不存在，返回<a href='%1/'>主頁</a>。",
+    "404.message": "你所查找的頁面並不存在。返回<a href='%1/'>首頁</a>。",
     "500.title": "內部錯誤",
-    "500.message": "不好！看來是哪裡出錯了！",
-    "register": "注冊",
-    "login": "登錄",
-    "please_log_in": "請登入",
-    "logout": "退出",
-    "posting_restriction_info": "發表文章目前僅限於註冊的會員，點擊此處進行登錄。",
+    "500.message": "糟糕! 看來是不知道哪裡出錯了!",
+    "register": "註冊",
+    "login": "登入",
+    "please_log_in": "請先登入",
+    "logout": "登出",
+    "posting_restriction_info": "張貼文章目前只限註冊會員，點擊此處進行登入。",
     "welcome_back": "歡迎回來！",
-    "you_have_successfully_logged_in": "您已經成功登錄！",
-    "save_changes": "保存修改",
+    "you_have_successfully_logged_in": "你已成功登入！",
+    "save_changes": "儲存變更",
     "close": "關閉",
     "pagination": "分頁",
-    "pagination.out_of": "%1 out of %2",
-    "pagination.enter_index": "輸入Index",
+    "pagination.out_of": "%1 於 %2",
+    "pagination.enter_index": "輸入索引",
     "header.admin": "管理",
-    "header.categories": "Categories",
+    "header.categories": "類別",
     "header.recent": "最近",
     "header.unread": "未讀",
     "header.tags": "標籤",
     "header.popular": "熱門",
-    "header.users": "用戶",
+    "header.users": "使用者",
     "header.groups": "群組",
     "header.chats": "聊天",
     "header.notifications": "通知",
     "header.search": "搜尋",
-    "header.profile": "設置",
-    "header.navigation": "Navigation",
-    "notifications.loading": "消息載入中",
-    "chats.loading": "聊天載入中···",
+    "header.profile": "個人資料",
+    "header.navigation": "導覽",
+    "notifications.loading": "通知載入中",
+    "chats.loading": "聊天載入中",
     "motd.welcome": "歡迎來到 NodeBB，一個未來的討論平台。",
     "previouspage": "上一頁",
     "nextpage": "下一頁",
     "alert.success": "成功",
     "alert.error": "錯誤",
     "alert.banned": "封鎖",
-    "alert.banned.message": "你已被封鎖並將登出!",
-    "alert.unfollow": "你已不再關注 %1!",
-    "alert.follow": "你正在關注 %1!",
-    "online": "在線",
+    "alert.banned.message": "你剛被封鎖，將會被登出!",
+    "alert.unfollow": "你已不再跟隨 %1!",
+    "alert.follow": "你正在跟隨 %1!",
+    "online": "線上",
     "users": "使用者",
     "topics": "主題",
-    "posts": "文章",
-    "best": "Best",
-    "upvoted": "Upvoted",
-    "downvoted": "Downvoted",
-    "views": "Views",
-    "reputation": "聲譽",
-    "read_more": "閱讀更多...",
-    "more": "More",
-    "posted_ago_by_guest": "posted %1 by Guest",
-    "posted_ago_by": "posted %1 by %2",
-    "posted_ago": "posted %1",
-    "posted_in": "posted in %1",
-    "posted_in_by": "posted in %1 by %2",
-    "posted_in_ago": "posted in %1",
-    "posted_in_ago_by": "posted in %1 %2 by %3",
-    "user_posted_ago": "%1 posted %2",
-    "guest_posted_ago": "Guest posted %1",
-    "last_edited_by": "last edited by %1",
-    "norecentposts": "最近沒新文章",
-    "norecenttopics": "最近沒新主題",
-    "recentposts": "最近的文章",
-    "recentips": "最近登錄的 IP 來源位址",
+    "posts": "張貼",
+    "best": "最棒",
+    "upvoted": "正向投票",
+    "downvoted": "負向投票",
+    "views": "瀏覽",
+    "reputation": "聲望",
+    "read_more": "閱讀更多",
+    "more": "更多",
+    "posted_ago_by_guest": "訪客張貼 %1",
+    "posted_ago_by": "%2 張貼 %1 ",
+    "posted_ago": "張貼 %1",
+    "posted_in": "張貼在 %1",
+    "posted_in_by": "張貼於 %1 由 %2",
+    "posted_in_ago": "張貼在 %1 %2",
+    "posted_in_ago_by": "由 %3 張貼在 %1 %2 ",
+    "user_posted_ago": "%1 張貼 %2",
+    "guest_posted_ago": "訪客張貼 %1",
+    "last_edited_by": "最後編輯由 %1",
+    "norecentposts": "沒新張貼文",
+    "norecenttopics": "沒新主題",
+    "recentposts": "最近的張貼文",
+    "recentips": "最近登入的 IP 位址",
     "away": "離開",
-    "dnd": "Do not disturb",
-    "invisible": "隱藏",
+    "dnd": "勿打擾",
+    "invisible": "隱形",
     "offline": "離線",
     "email": "Email",
     "language": "語言",
-    "guest": "Guest",
-    "guests": "Guests",
-    "updated.title": "討論區更新完畢",
-    "updated.message": "這個討論區最近被更新至最新的版本. 按此來重整這個頁面",
+    "guest": "訪客",
+    "guests": "訪客",
+    "updated.title": "討論區已更新",
+    "updated.message": "這個討論區最近已更新至最新的版本。點擊此處來重整這個頁面。",
     "privacy": "隱私",
-    "follow": "追蹤",
-    "unfollow": "取消追蹤",
+    "follow": "跟隨",
+    "unfollow": "取消跟隨",
     "delete_all": "全部刪除",
-    "map": "Map",
-    "sessions": "Login Sessions",
-    "ip_address": "IP Address",
-    "enter_page_number": "Enter page number",
-    "upload_file": "Upload file",
-    "upload": "Upload",
-    "allowed-file-types": "Allowed file types are %1"
+    "map": "地圖",
+    "sessions": "登入連線階段",
+    "ip_address": "IP地址",
+    "enter_page_number": "輸入頁碼",
+    "upload_file": "上傳檔案",
+    "upload": "上傳",
+    "allowed-file-types": "允許的檔案類型是 %1"
 }
\ No newline at end of file
diff --git a/public/language/zh_TW/groups.json b/public/language/zh_TW/groups.json
index d562fb5ccd..511331e301 100644
--- a/public/language/zh_TW/groups.json
+++ b/public/language/zh_TW/groups.json
@@ -6,25 +6,25 @@
     "no_groups_found": "這裡看不到任何群組",
     "pending.accept": "接受",
     "pending.reject": "拒絕",
-    "pending.accept_all": "Accept All",
-    "pending.reject_all": "Reject All",
-    "pending.none": "There are no pending members at this time",
-    "invited.none": "There are no invited members at this time",
-    "invited.uninvite": "Rescind Invitation",
-    "invited.search": "Search for a user to invite to this group",
-    "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>",
+    "pending.accept_all": "同意所有",
+    "pending.reject_all": "拒絕所有",
+    "pending.none": "目前沒有等待中的會員",
+    "invited.none": "目前沒有邀請的會員",
+    "invited.uninvite": "撤銷邀請",
+    "invited.search": "搜尋要邀請加入這個群組的用戶",
+    "invited.notification_title": "你已被邀請加入<strong>%1</strong>",
+    "request.notification_title": "群組會員要求，來自<strong>%1</strong>",
+    "request.notification_text": "<strong>%1</strong>已經要求成為<strong>%2</strong>群組的會員",
     "cover-save": "儲存",
     "cover-saving": "儲存中",
     "details.title": "群組詳細信息",
     "details.members": "成員列表",
     "details.pending": "待審成員",
-    "details.invited": "Invited Members",
+    "details.invited": "邀請會員",
     "details.has_no_posts": "這個群組的成員還未發出任何帖子。",
     "details.latest_posts": "最新文章",
     "details.private": "私人",
-    "details.disableJoinRequests": "Disable join requests",
+    "details.disableJoinRequests": "禁止加入要求",
     "details.grant": "准許/撤銷 所有權",
     "details.kick": "剔除",
     "details.owner_options": "群組管理員",
@@ -37,18 +37,18 @@
     "details.change_colour": "變更顏色",
     "details.badge_text": "徽章字串",
     "details.userTitleEnabled": "顯示徽章",
-    "details.private_help": "If enabled, joining of groups requires approval from a group owner",
+    "details.private_help": "如果開啟，加入群組需要經過群組擁有者批準",
     "details.hidden": "隱藏",
-    "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
-    "details.delete_group": "Delete Group",
-    "details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
+    "details.hidden_help": "如果開啟的話，群組將不會在群組列表中被看到，而且用戶將需要手動邀請",
+    "details.delete_group": "刪除群組",
+    "details.private_system_help": "私有群組在系統層級被禁用，這個選項沒有任何作用",
     "event.updated": "群組詳細訊息已被更新",
     "event.deleted": "此 \"%1\" 群組已被刪除了",
-    "membership.accept-invitation": "Accept Invitation",
-    "membership.invitation-pending": "Invitation Pending",
-    "membership.join-group": "Join Group",
-    "membership.leave-group": "Leave Group",
-    "membership.reject": "Reject",
-    "new-group.group_name": "Group Name:",
-    "upload-group-cover": "Upload group cover"
+    "membership.accept-invitation": "同意邀請",
+    "membership.invitation-pending": "邀請等待中",
+    "membership.join-group": "加入群組",
+    "membership.leave-group": "離開群組",
+    "membership.reject": "拒絕",
+    "new-group.group_name": "群組名稱:",
+    "upload-group-cover": "上傳群組封面圖"
 }
\ No newline at end of file
diff --git a/public/language/zh_TW/login.json b/public/language/zh_TW/login.json
index 4ffc8773e6..de5b637a5e 100644
--- a/public/language/zh_TW/login.json
+++ b/public/language/zh_TW/login.json
@@ -1,11 +1,11 @@
 {
-    "username-email": "用戶名稱 / 電子郵件",
-    "username": "用戶名稱",
+    "username-email": "帳號 / 電子郵件",
+    "username": "帳號",
     "email": "電子郵件",
     "remember_me": "記住我？",
     "forgot_password": "忘記密碼？",
-    "alternative_logins": "其他登錄方式",
-    "failed_login_attempt": "登錄失敗，請再嘗試。",
-    "login_successful": "你已成功登錄！",
-    "dont_have_account": "還沒有賬號？"
+    "alternative_logins": "其他登入方式",
+    "failed_login_attempt": "登入失敗",
+    "login_successful": "你已成功登入！",
+    "dont_have_account": "還沒有帳號？"
 }
\ No newline at end of file
diff --git a/public/language/zh_TW/modules.json b/public/language/zh_TW/modules.json
index c34132769a..bbf71c78bf 100644
--- a/public/language/zh_TW/modules.json
+++ b/public/language/zh_TW/modules.json
@@ -4,11 +4,11 @@
     "chat.send": "發送",
     "chat.no_active": "暫無聊天",
     "chat.user_typing": "%1 正在輸入中...",
-    "chat.user_has_messaged_you": "%1 已傳送訊息給你了",
-    "chat.see_all": "See all chats",
-    "chat.mark_all_read": "Mark all chats read",
+    "chat.user_has_messaged_you": "%1 傳送訊息給你",
+    "chat.see_all": "顯示全部聊天",
+    "chat.mark_all_read": "所有訊息標為已讀",
     "chat.no-messages": "請選擇收件人來查看聊天記錄",
-    "chat.no-users-in-room": "No users in this room",
+    "chat.no-users-in-room": "沒有用戶在聊天室中",
     "chat.recent-chats": "最近的聊天記錄",
     "chat.contacts": "通訊錄",
     "chat.message-history": "消息記錄",
@@ -17,22 +17,30 @@
     "chat.seven_days": "7日",
     "chat.thirty_days": "30日",
     "chat.three_months": "3個月",
-    "chat.delete_message_confirm": "Are you sure you wish to delete this message?",
-    "chat.roomname": "Chat Room %1",
-    "chat.add-users-to-room": "Add users to room",
-    "composer.compose": "Compose",
-    "composer.show_preview": "Show Preview",
-    "composer.hide_preview": "Hide Preview",
-    "composer.user_said_in": "%1在%2裡說：",
-    "composer.user_said": "%1說：",
+    "chat.delete_message_confirm": "你確定要刪除這個訊息？",
+    "chat.roomname": "聊天室 %1",
+    "chat.add-users-to-room": "將用戶加入聊天室中",
+    "composer.compose": "撰寫",
+    "composer.show_preview": "顯示預覽",
+    "composer.hide_preview": "隱藏預覽",
+    "composer.user_said_in": "%1 在 %2 裡說：",
+    "composer.user_said": "%1 說：",
     "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",
-    "cover.dragging_title": "Cover Photo Positioning",
-    "cover.dragging_message": "Drag the cover photo to the desired position and click \"Save\"",
-    "cover.saved": "Cover photo image and position saved"
+    "composer.submit_and_lock": "提交然後鎖定",
+    "composer.toggle_dropdown": "切換下拉選單",
+    "composer.uploading": "上傳中 %1",
+    "composer.formatting.bold": "粗體",
+    "composer.formatting.italic": "斜體",
+    "composer.formatting.list": "列表項目",
+    "composer.formatting.strikethrough": "刪除線",
+    "composer.formatting.link": "連結",
+    "composer.formatting.picture": "圖片",
+    "composer.upload-picture": "上傳圖片",
+    "composer.upload-file": "上傳檔案",
+    "bootbox.ok": "好",
+    "bootbox.cancel": "取消",
+    "bootbox.confirm": "確認",
+    "cover.dragging_title": "封面照片位置",
+    "cover.dragging_message": "拖拉封面照片到想要的位置，然後按下\"儲存\"",
+    "cover.saved": "封面照片與位置已儲存"
 }
\ No newline at end of file
diff --git a/public/language/zh_TW/notifications.json b/public/language/zh_TW/notifications.json
index 3174feb38e..da335d908b 100644
--- a/public/language/zh_TW/notifications.json
+++ b/public/language/zh_TW/notifications.json
@@ -1,38 +1,38 @@
 {
     "title": "通知",
     "no_notifs": "沒有新消息",
-    "see_all": "See all notifications",
+    "see_all": "觀看所有通知",
     "mark_all_read": "所有訊息設為已讀",
-    "back_to_home": "返回%1",
+    "back_to_home": "返回 %1",
     "outgoing_link": "站外連結",
-    "outgoing_link_message": "You are now leaving %1",
+    "outgoing_link_message": "你現在離開了 %1",
     "continue_to": "繼續前往 %1",
-    "return_to": "返回%1",
+    "return_to": "返回 %1",
     "new_notification": "新訊息通知",
-    "you_have_unread_notifications": "您有未讀的訊息！",
+    "you_have_unread_notifications": "你有未讀的通知。",
     "new_message_from": "來自 <strong>%1</strong> 的新訊息",
-    "upvoted_your_post_in": "<strong>%1</strong> upvote了您在 <strong>%2</strong>的post。",
-    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
-    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
-    "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
-    "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
-    "favourited_your_post_in": "<strong>%1</strong> has bookmarked your post in <strong>%2</strong>.",
-    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have bookmarked your post in <strong>%3</strong>.",
-    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have bookmarked your post in <strong>%3</strong>.",
-    "user_flagged_post_in": "<strong>%1</strong> 舉報了 <strong>%2</strong>裡的一個post。",
-    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
-    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
+    "upvoted_your_post_in": "<strong>%1</strong> 對你在 <strong>%2</strong>的張貼文投了正向票。",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> 與 <strong>%2</strong> 已經對你在<strong>%3</strong>的張貼作正向投票。",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> 與 %2 其他人已經對你在<strong>%3</strong>正向投票。",
+    "moved_your_post": "<strong>%1</strong> 已經移動你的張貼到 <strong>%2</strong>",
+    "moved_your_topic": "<strong>%1</strong> 已經移動到 <strong>%2</strong>",
+    "favourited_your_post_in": "<strong>%1</strong> 已經把你在 <strong>%2</strong> 的張貼加入書籤。",
+    "favourited_your_post_in_dual": "<strong>%1</strong> 與 <strong>%2</strong> 已經把你在<strong>%3</strong>的張貼加入書籤。",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> 與 %2 其他人已經把你在 <strong>%3</strong> 的張貼加入書籤。",
+    "user_flagged_post_in": "<strong>%1</strong> 標記了 <strong>%2</strong>裡的一個張貼。",
+    "user_flagged_post_in_dual": "<strong>%1</strong> 與 <strong>%2</strong> 標記一個張貼在 <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> 與 %2 其他人標記一個張貼在 <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> 發布一個回覆給: <strong>%2</strong>",
-    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
-    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> 與 <strong>%2</strong> 已經張貼回覆到: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> 與 %2 其他人已經張貼回覆到:  <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> 發布了一個新的主題： <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> 開始關注你。",
-    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
-    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
-    "new_register": "<strong>%1</strong> sent a registration request.",
-    "new_register_multiple": "There are <strong>%1</strong> registration requests awaiting review.",
-    "email-confirmed": "已確認電郵",
-    "email-confirmed-message": "感謝您驗證您的電郵。您的帳戶現已全面啟用。",
-    "email-confirm-error-message": "驗證您的電郵地址時出現問題。也許啟動碼無效或已過期。",
-    "email-confirm-sent": "已發送確認電郵。"
+    "user_started_following_you_dual": "<strong>%1</strong> 與 <strong>%2</strong> 開始跟隨你。",
+    "user_started_following_you_multiple": "<strong>%1</strong> 與 %2 其他的開始跟隨你。",
+    "new_register": "<strong>%1</strong>傳送了註冊要求。",
+    "new_register_multiple": "目前有 <strong>%1</strong> 個註冊要求等待審核中。",
+    "email-confirmed": "已確認電子郵件",
+    "email-confirmed-message": "感謝你驗證電子郵件。你的帳戶現已完整的啟動。",
+    "email-confirm-error-message": "驗證你的電子郵件地址時發生問題。也許是啟動碼無效或是已過期。",
+    "email-confirm-sent": "已發送確認電子郵件。"
 }
\ No newline at end of file
diff --git a/public/language/zh_TW/pages.json b/public/language/zh_TW/pages.json
index 121be06593..71c0bbc9aa 100644
--- a/public/language/zh_TW/pages.json
+++ b/public/language/zh_TW/pages.json
@@ -1,46 +1,47 @@
 {
     "home": "首頁",
     "unread": "未讀的主題",
-    "popular-day": "Popular topics today",
-    "popular-week": "Popular topics this week",
-    "popular-month": "Popular topics this month",
-    "popular-alltime": "All time popular topics",
+    "popular-day": "今天受歡迎的主題",
+    "popular-week": "本週受歡迎的主題",
+    "popular-month": "本月受歡迎的主題",
+    "popular-alltime": "所有時間受歡迎的主題",
     "recent": "近期的主題",
-    "flagged-posts": "Flagged Posts",
-    "users/online": "Online Users",
-    "users/latest": "Latest Users",
-    "users/sort-posts": "Users with the most posts",
-    "users/sort-reputation": "Users with the most reputation",
-    "users/banned": "Banned Users",
-    "users/search": "User Search",
+    "flagged-posts": "標記的張貼",
+    "users/online": "線上用戶",
+    "users/latest": "最近用戶",
+    "users/sort-posts": "最多張貼的使用者",
+    "users/sort-reputation": "最多聲譽的使用者",
+    "users/banned": "已封鎖用戶",
+    "users/most-flags": "Most flagged users",
+    "users/search": "用戶搜尋",
     "notifications": "新訊息通知",
     "tags": "標籤",
-    "tag": "Topics tagged under \"%1\"",
-    "register": "Register an account",
-    "login": "Login to your account",
-    "reset": "Reset your account password",
-    "categories": "Categories",
-    "groups": "Groups",
-    "group": "%1 group",
-    "chats": "Chats",
-    "chat": "Chatting with %1",
-    "account/edit": "Editing \"%1\"",
-    "account/edit/password": "Editing password of \"%1\"",
-    "account/edit/username": "Editing username of \"%1\"",
-    "account/edit/email": "Editing email of \"%1\"",
-    "account/following": "People %1 follows",
-    "account/followers": "People who follow %1",
-    "account/posts": "Posts made by %1",
-    "account/topics": "Topics created by %1",
-    "account/groups": "%1's Groups",
-    "account/favourites": "%1's Bookmarked Posts",
-    "account/settings": "User Settings",
-    "account/watched": "Topics watched by %1",
-    "account/upvoted": "Posts upvoted by %1",
-    "account/downvoted": "Posts downvoted by %1",
-    "account/best": "Best posts made by %1",
-    "confirm": "Email Confirmed",
+    "tag": "有\"%1\"標籤的主題",
+    "register": "註冊帳號",
+    "login": "登入帳號",
+    "reset": "重設你的帳號密碼",
+    "categories": "類別",
+    "groups": "群組",
+    "group": "%1 群組",
+    "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 發表的張貼",
+    "account/topics": "由 %1 建立的主題",
+    "account/groups": "%1 的群組",
+    "account/favourites": "%1 所加入書籤的張貼",
+    "account/settings": "用戶設定",
+    "account/watched": "%1 所觀看的主題",
+    "account/upvoted": "%1 所正向投票的張貼",
+    "account/downvoted": "%1 所負向投票的張貼",
+    "account/best": "由 %1 建立的最佳張貼文",
+    "confirm": "已確認電子郵件",
     "maintenance.text": "目前 %1 正在進行維修。請稍後再來。",
     "maintenance.messageIntro": "此外，管理員有以下訊息：",
-    "throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
+    "throttled.text": "%1 目前無法提供，是因為使用量過度。請之後再回來操作。"
 }
\ No newline at end of file
diff --git a/public/language/zh_TW/recent.json b/public/language/zh_TW/recent.json
index cf46a366d3..6076b0acb6 100644
--- a/public/language/zh_TW/recent.json
+++ b/public/language/zh_TW/recent.json
@@ -7,13 +7,13 @@
     "alltime": "所有時間",
     "no_recent_topics": "最近沒有新的主題。",
     "no_popular_topics": "最近沒有受歡迎的主題。",
-    "there-is-a-new-topic": "There is a new topic.",
-    "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.",
-    "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.",
-    "there-are-new-topics": "There are %1 new topics.",
-    "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.",
-    "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.",
-    "there-is-a-new-post": "There is a new post.",
-    "there-are-new-posts": "There are %1 new posts.",
+    "there-is-a-new-topic": "有一篇新主題",
+    "there-is-a-new-topic-and-a-new-post": "有一篇新主題與一篇新張貼",
+    "there-is-a-new-topic-and-new-posts": "有一篇新主題與 %1 篇新張貼",
+    "there-are-new-topics": "有 %1 篇新主題",
+    "there-are-new-topics-and-a-new-post": "有 %1 篇新主題與一篇新張貼",
+    "there-are-new-topics-and-new-posts": "有 %1 篇新主題與 %2 篇新張貼",
+    "there-is-a-new-post": "有一篇新張貼",
+    "there-are-new-posts": "有 %1 篇新張貼",
     "click-here-to-reload": "點擊這裡進行重整。"
 }
\ No newline at end of file
diff --git a/public/language/zh_TW/register.json b/public/language/zh_TW/register.json
index e690779ae8..a48bfa98f7 100644
--- a/public/language/zh_TW/register.json
+++ b/public/language/zh_TW/register.json
@@ -1,8 +1,8 @@
 {
     "register": "註冊",
     "help.email": "默認情況下，你的郵箱不會公開。",
-    "help.username_restrictions": "用戶名由%1到%2個字符組成。其他人可以通過 @<span id='yourUsername'>用戶名</span> 點名你。",
-    "help.minimum_password_length": "密碼必須至少包含%1個字符。",
+    "help.username_restrictions": "獨立的帳號由 %1 到 %2 個字元組成。其他人可以通過 @<span id='yourUsername'>帳號</span> 提及你。",
+    "help.minimum_password_length": "密碼必須至少包含 %1 個字元。",
     "email_address": "Email",
     "email_address_placeholder": "輸入郵箱地址",
     "username": "用戶名",
@@ -15,5 +15,5 @@
     "alternative_registration": "其他註冊方式",
     "terms_of_use": "使用條款",
     "agree_to_terms_of_use": "同意遵守使用條款",
-    "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator."
+    "registration-added-to-queue": "你的註冊已經被加入到審核序列中。你將會在管理者批準後收到一封電子郵件。"
 }
\ No newline at end of file
diff --git a/public/language/zh_TW/reset_password.json b/public/language/zh_TW/reset_password.json
index 5c2964579c..f7d83c8dd1 100644
--- a/public/language/zh_TW/reset_password.json
+++ b/public/language/zh_TW/reset_password.json
@@ -4,14 +4,14 @@
     "password_changed.title": "密碼已更改",
     "password_changed.message": "<p>密碼重設成功，請重新<a href=\"/login\">登錄</a>。",
     "wrong_reset_code.title": "驗証碼不正確",
-    "wrong_reset_code.message": "您輸入的驗証碼有誤，請重新輸入，或<a href=\"/reset\">申請新的驗証碼</a>。",
+    "wrong_reset_code.message": "重置驗証碼不正確。請重新輸入，或是<a href=\"/reset\">申請新重置驗証碼</a>。",
     "new_password": "輸入新的密碼",
     "repeat_password": "再次確認新密碼",
-    "enter_email": "請輸入您的<strong>電子郵件地址</strong>，我們會寄送郵件告訴您如何重設密碼。",
+    "enter_email": "請輸入你的<strong>電子郵件地址</strong>，我們會寄送郵件告訴你如何重置你的帳戶。",
     "enter_email_address": "輸入電子郵件地址",
     "password_reset_sent": "密碼重設郵件已發送。",
     "invalid_email": "無效的電子郵件 / 電子郵件不存在！",
-    "password_too_short": "The password entered is too short, please pick a different password.",
-    "passwords_do_not_match": "The two passwords you've entered do not match.",
-    "password_expired": "Your password has expired, please choose a new password"
+    "password_too_short": "輸入的密碼太短，請使用另一個不同的密碼",
+    "passwords_do_not_match": "你已經輸入的兩個密碼不一樣",
+    "password_expired": "你的密碼已過期，請選擇一組新密碼"
 }
\ No newline at end of file
diff --git a/public/language/zh_TW/search.json b/public/language/zh_TW/search.json
index 9eadd12f6d..58b8258ed4 100644
--- a/public/language/zh_TW/search.json
+++ b/public/language/zh_TW/search.json
@@ -1,17 +1,17 @@
 {
-    "results_matching": "有%1個跟\"%2\"相符的結果（%3秒）",
+    "results_matching": "有 %1 個與 \"%2\" 符合的結果 (%3秒)",
     "no-matches": "沒有找到相符的主題",
-    "advanced-search": "Advanced Search",
+    "advanced-search": "進階搜尋",
     "in": "在",
     "titles": "標題",
-    "titles-posts": "標題與發布",
-    "posted-by": "Posted by",
+    "titles-posts": "標題與張貼",
+    "posted-by": "張貼由",
     "in-categories": "在類別中",
     "search-child-categories": "搜尋子類別",
     "reply-count": "回覆數量",
     "at-least": "最少",
     "at-most": "最多",
-    "post-time": "發布時間",
+    "post-time": "張貼時間",
     "newer-than": "較新",
     "older-than": "較舊",
     "any-date": "任意日期",
@@ -22,7 +22,7 @@
     "three-months": "三個月",
     "six-months": "六個月",
     "one-year": "一年",
-    "sort-by": "排序依據",
+    "sort-by": "排序依照",
     "last-reply-time": "最後回覆時間",
     "topic-title": "主題",
     "number-of-replies": "回覆數量",
diff --git a/public/language/zh_TW/success.json b/public/language/zh_TW/success.json
index 7d3170435b..1d652b82e6 100644
--- a/public/language/zh_TW/success.json
+++ b/public/language/zh_TW/success.json
@@ -1,6 +1,6 @@
 {
     "success": "成功",
-    "topic-post": "您的文章已張貼成功",
+    "topic-post": "你的文章已張貼成功",
     "authentication-successful": "驗證成功",
     "settings-saved": "設定已儲存"
 }
\ No newline at end of file
diff --git a/public/language/zh_TW/tags.json b/public/language/zh_TW/tags.json
index ce9de5c88b..8b2046b293 100644
--- a/public/language/zh_TW/tags.json
+++ b/public/language/zh_TW/tags.json
@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "沒有此標籤的主題。",
     "tags": "標籤",
-    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
+    "enter_tags_here": "在這裡輸入標籤，每個介於 %1 到 %2 字元。                      ",
     "enter_tags_here_short": "輸入標籤...",
     "no_tags": "還沒有標籤呢。"
 }
\ No newline at end of file
diff --git a/public/language/zh_TW/topic.json b/public/language/zh_TW/topic.json
index 62f48e9523..4719cd6fd1 100644
--- a/public/language/zh_TW/topic.json
+++ b/public/language/zh_TW/topic.json
@@ -13,7 +13,7 @@
     "notify_me": "該主題有新回覆時通知我",
     "quote": "引用",
     "reply": "回覆",
-    "reply-as-topic": "Reply as topic",
+    "reply-as-topic": "回復為另一個新主題",
     "guest-login-reply": "登入以回覆",
     "edit": "編輯",
     "delete": "刪除",
@@ -26,21 +26,28 @@
     "tools": "工具",
     "flag": "檢舉",
     "locked": "已鎖定",
-    "bookmark_instructions": "Click here to return to the last unread post in this thread.",
+    "bookmark_instructions": "點擊這裡返回到這個討論串的最後一篇張貼文",
     "flag_title": "檢舉這篇文章, 交給仲裁者來審閱.",
     "flag_success": "這文章已經被檢舉要求仲裁.",
     "deleted_message": "此主題已被刪除。只有具有主題管理權限的用戶才能看到它。",
     "following_topic.message": "有人貼文回覆主題時, 你將會收到新通知.",
     "not_following_topic.message": "有人貼文回覆主題時, 你將不會收到通知.",
+    "ignoring_topic.message": "你將不會再未讀主題列表中看到這個主題。當你被提及或你的張貼被正向投票時，你會被通知。",
     "login_to_subscribe": "請先註冊或登錄, 才可訂閱此主題.",
     "markAsUnreadForAll.success": "將全部的主題設為未讀.",
-    "mark_unread": "Mark unread",
-    "mark_unread.success": "Topic marked as unread.",
+    "mark_unread": "標為未讀",
+    "mark_unread.success": "標記主題為未讀",
     "watch": "關注",
     "unwatch": "取消關注",
     "watch.title": "當主題有新回覆時將收到通知",
     "unwatch.title": "停止關注這個主題",
     "share_this_post": "分享這篇文章",
+    "watching": "關注",
+    "not-watching": "取消關注",
+    "ignoring": "忽略",
+    "watching.description": "有新的回覆通知我。<br/>在未讀頁中顯示主題。",
+    "not-watching.description": "有新的回覆不用通知我。<br/>如果類別不是被忽略的，在未讀頁中顯示主題。",
+    "ignoring.description": "有新的回覆不用通知我。<br/>在未讀頁中不顯示主題。",
     "thread_tools.title": "主題工具箱",
     "thread_tools.markAsUnreadForAll": "設為未讀",
     "thread_tools.pin": "釘選主題",
@@ -49,9 +56,9 @@
     "thread_tools.unlock": "解除主題鎖定",
     "thread_tools.move": "移動主題",
     "thread_tools.move_all": "移動全部",
-    "thread_tools.fork": "Fork 主題",
+    "thread_tools.fork": "分叉主題",
     "thread_tools.delete": "刪除主題",
-    "thread_tools.delete-posts": "Delete Posts",
+    "thread_tools.delete-posts": "刪除張貼",
     "thread_tools.delete_confirm": "你確定要刪除這個主題？",
     "thread_tools.restore": "還原刪除的主題",
     "thread_tools.restore_confirm": "你確定你要恢復這個主題嗎？",
@@ -65,9 +72,9 @@
     "disabled_categories_note": "停用的版面為灰色",
     "confirm_move": "移動",
     "confirm_fork": "作為主題",
-    "favourite": "Bookmark",
-    "favourites": "Bookmarks",
-    "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
+    "favourite": "書籤",
+    "favourites": "書籤",
+    "favourites.has_no_favourites": "你尚未將任何張貼加入書籤",
     "loading_more_posts": "載入更多文章",
     "move_topic": "移動主題",
     "move_topics": "移動主題",
@@ -78,7 +85,7 @@
     "fork_topic_instruction": "點擊要作為主題的文章",
     "fork_no_pids": "尚未選擇文章！",
     "fork_success": "成功分叉成新的主題！點擊這裡進入新的主題。",
-    "delete_posts_instruction": "Click the posts you want to delete/purge",
+    "delete_posts_instruction": "點擊你想要刪除/清除的張貼",
     "composer.title_placeholder": "輸入標題...",
     "composer.handle_placeholder": "名字",
     "composer.discard": "放棄",
@@ -100,13 +107,13 @@
     "oldest_to_newest": "從舊到新",
     "newest_to_oldest": "從新到舊",
     "most_votes": "得票最多",
-    "most_posts": "最多post",
-    "stale.title": "Create new topic instead?",
-    "stale.warning": "The topic you are replying to is quite old. Would you like to create a new topic instead, and reference this one in your reply?",
-    "stale.create": "Create a new topic",
-    "stale.reply_anyway": "Reply to this topic anyway",
-    "link_back": "Re: [%1](%2)",
-    "spam": "Spam",
-    "offensive": "Offensive",
-    "custom-flag-reason": "Enter a flagging reason"
+    "most_posts": "最多張貼",
+    "stale.title": "改為建立新的主題？",
+    "stale.warning": "你正回覆的主題是非常舊的一篇。你想要改為建立一個新主題，然後參考到這篇你回覆的？",
+    "stale.create": "建立新主題",
+    "stale.reply_anyway": "無論如何都回覆這個主題",
+    "link_back": "回覆: [%1](%2)",
+    "spam": "灌水",
+    "offensive": "攻擊",
+    "custom-flag-reason": "輸入標記的理由"
 }
\ No newline at end of file
diff --git a/public/language/zh_TW/unread.json b/public/language/zh_TW/unread.json
index b8e2086168..b11d2ee762 100644
--- a/public/language/zh_TW/unread.json
+++ b/public/language/zh_TW/unread.json
@@ -5,6 +5,9 @@
     "mark_as_read": "標記成已讀",
     "selected": "已選擇",
     "all": "全部",
-    "all_categories": "All categories",
-    "topics_marked_as_read.success": "標記主題成已讀!"
+    "all_categories": "所有類別",
+    "topics_marked_as_read.success": "標記主題成已讀!",
+    "all-topics": "所有主題",
+    "new-topics": "新主題",
+    "watched-topics": "已觀看主題"
 }
\ No newline at end of file
diff --git a/public/language/zh_TW/uploads.json b/public/language/zh_TW/uploads.json
index 1622cb5693..aaef40f16c 100644
--- a/public/language/zh_TW/uploads.json
+++ b/public/language/zh_TW/uploads.json
@@ -1,6 +1,6 @@
 {
-    "uploading-file": "Uploading the file...",
-    "select-file-to-upload": "Select a file to upload!",
-    "upload-success": "File uploaded successfully!",
-    "maximum-file-size": "Maximum %1 kb"
+    "uploading-file": "檔案上傳中...",
+    "select-file-to-upload": "選擇要上傳的檔案!",
+    "upload-success": "檔案已成功上傳!",
+    "maximum-file-size": "最大大小 %1 kb"
 }
\ No newline at end of file
diff --git a/public/language/zh_TW/user.json b/public/language/zh_TW/user.json
index 118ba2f471..6e8e500786 100644
--- a/public/language/zh_TW/user.json
+++ b/public/language/zh_TW/user.json
@@ -5,14 +5,14 @@
     "joindate": "加入時間",
     "postcount": "文章數量",
     "email": "電子郵件",
-    "confirm_email": "確認電郵",
-    "ban_account": "Ban Account",
-    "ban_account_confirm": "Do you really want to ban this user?",
-    "unban_account": "Unban Account",
+    "confirm_email": "確認電子郵件",
+    "ban_account": "禁用帳號",
+    "ban_account_confirm": "你確定要禁用這個使用者?",
+    "unban_account": "取消禁用帳號",
     "delete_account": "刪除帳戶",
-    "delete_account_confirm": "你確定要刪除自己的帳戶？ <br /><strong>此操作不能復原，您將無法恢復任何數據</strong><br /><br />輸入您的使用者名稱，以確認您希望刪除這個帳戶。",
-    "delete_this_account_confirm": "Are you sure you want to delete this account? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
-    "account-deleted": "Account deleted",
+    "delete_account_confirm": "你確定要刪除自己的帳戶？ <br /><strong>此操作不能復原，你將無法恢復任何數據</strong><br /><br />輸入你的帳號，用來確認希望刪除這個帳戶。",
+    "delete_this_account_confirm": "你確定要刪除這個帳戶？ <br /><strong>此操作是不能還原的，你將無法回復任何資料</strong><br />",
+    "account-deleted": "帳號已刪除",
     "fullname": "全名",
     "website": "網站",
     "location": "地址",
@@ -22,88 +22,90 @@
     "profile": "個人資料",
     "profile_views": "資料被查看",
     "reputation": "聲譽",
-    "favourites": "Bookmarks",
+    "favourites": "書籤",
     "watched": "觀看者",
     "followers": "跟隨者",
     "following": "正在關注",
-    "aboutme": "About me",
+    "aboutme": "關於我",
     "signature": "簽名",
     "birthday": "生日",
     "chat": "聊天",
-    "chat_with": "Chat with %1",
+    "chat_with": "與 %1 聊天",
     "follow": "跟隨",
     "unfollow": "取消跟隨",
     "more": "更多",
-    "profile_update_success": "您的個人資料已更新成功！",
+    "profile_update_success": "你的個人資料已更新成功！",
     "change_picture": "改變頭像",
-    "change_username": "Change Username",
-    "change_email": "Change Email",
+    "change_username": "更改帳號",
+    "change_email": "更改電子郵件",
     "edit": "編輯",
-    "edit-profile": "Edit Profile",
-    "default_picture": "Default Icon",
+    "edit-profile": "編輯個人資料",
+    "default_picture": "預設圖示",
     "uploaded_picture": "已有頭像",
     "upload_new_picture": "上傳新頭像",
-    "upload_new_picture_from_url": "上傳新頭像(URL)",
+    "upload_new_picture_from_url": "從網址上傳新頭像",
     "current_password": "目前的密碼",
     "change_password": "更改密碼",
     "change_password_error": "無效的密碼！",
     "change_password_error_wrong_current": "目前的密碼不正確！",
     "change_password_error_length": "密碼太短！",
     "change_password_error_match": "密碼必須要一致！",
-    "change_password_error_privileges": "您沒有變更此密碼的權限！",
+    "change_password_error_privileges": "你沒有變更此密碼的權限！",
     "change_password_success": "你的密碼已經更新！",
     "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.",
-    "password_same_as_email": "Your password is the same as your email, please select another password.",
+    "username_taken_workaround": "你想要註冊的帳號已經被使用了，所以我們將它略作改變。你現在的帳號名稱是 <strong>%1</strong>",
+    "password_same_as_username": "你的密碼和帳號是一樣的，請選擇另一組密碼。",
+    "password_same_as_email": "你的密碼和電子郵件是一樣的，請選擇另一組密碼。",
     "upload_picture": "上傳頭像",
     "upload_a_picture": "上傳一張照片",
-    "remove_uploaded_picture": "Remove Uploaded Picture",
-    "upload_cover_picture": "Upload cover picture",
+    "remove_uploaded_picture": "移除上傳的圖片",
+    "upload_cover_picture": "上傳封面圖片",
     "settings": "設定",
     "show_email": "顯示我的郵箱",
     "show_fullname": "顯示我的全名",
     "restrict_chats": "只允許我跟隨的用戶和我聊天",
     "digest_label": "訂閱摘要",
-    "digest_description": "使用 eamil 訂閱本論壇新的訊息通知與主題 (根據您所設的時間表)",
+    "digest_description": "根據你所設的時間排程，用電子郵件訂閱這個討論區 (新的通知與主題)。",
     "digest_off": "關閉",
     "digest_daily": "每日",
     "digest_weekly": "每週",
     "digest_monthly": "每月",
     "send_chat_notifications": "如果有新的聊天消息而我不在線，發送郵件給我",
-    "send_post_notifications": "Send an email when replies are made to topics I am subscribed to",
-    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
+    "send_post_notifications": "當我訂閱的主題有新回覆時寄送Email給我",
+    "settings-require-reload": "有些設定的更動是需要重新整理。點擊這裡來重新整理頁面。",
     "has_no_follower": "該用戶還沒有被任何人關注。",
     "follows_no_one": "該用戶還沒有關注過任何人。",
-    "has_no_posts": "This user hasn't posted anything yet.",
-    "has_no_topics": "This user hasn't posted any topics yet.",
-    "has_no_watched_topics": "This user hasn't watched any topics yet.",
-    "has_no_upvoted_posts": "This user hasn't upvoted any posts yet.",
-    "has_no_downvoted_posts": "This user hasn't downvoted any posts yet.",
-    "has_no_voted_posts": "This user has no voted posts",
+    "has_no_posts": "使用者還沒有發表任何張貼",
+    "has_no_topics": "使用者還沒有發表任何主題",
+    "has_no_watched_topics": "使用者還沒有觀看任何主題",
+    "has_no_upvoted_posts": "使用者還沒有對任何主題投正向票",
+    "has_no_downvoted_posts": "使用者還沒有對任何主題投負向票",
+    "has_no_voted_posts": "這個使用者沒有投票的張貼",
     "email_hidden": "郵箱被隱藏",
     "hidden": "隱藏",
-    "paginate_description": "Paginate topics and posts instead of using infinite scroll",
+    "paginate_description": "將主題與張貼用分頁來顯示，取代使用無盡的捲動方式。",
     "topics_per_page": "每頁的主題數",
     "posts_per_page": "每頁的文章數",
-    "notification_sounds": "Play a sound when you receive a notification",
+    "notification_sounds": "當你接收到通知時撥放音效",
     "browsing": "瀏覽設定",
-    "open_links_in_new_tab": "Open outgoing links in new tab",
-    "enable_topic_searching": "Enable In-Topic Searching",
-    "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
-    "scroll_to_my_post": "After posting a reply, show the new post",
-    "follow_topics_you_reply_to": "Follow topics that you reply to",
-    "follow_topics_you_create": "Follow topics you create",
-    "grouptitle": "Select the group title you would like to display",
+    "open_links_in_new_tab": "在新的資料標籤裡打開外部的連結",
+    "enable_topic_searching": "啟用在主題中的搜尋",
+    "topic_search_help": "如果啟用的話，在主題中搜尋將會覆蓋瀏覽器預設網頁搜尋的行為，這會允許你搜尋整篇的主題，而不只是顯示出來在畫面上的而已。",
+    "delay_image_loading": "延遲圖片載入",
+    "image_load_delay_help": "如果啟用的話，在主題中的圖片直到它們被捲到到可視範圍時才會載入。",
+    "scroll_to_my_post": "在張貼回覆後，顯示新的張貼",
+    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_create": "Watch topics you create",
+    "grouptitle": "群組標題",
     "no-group-title": "無此群組標題",
-    "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"
+    "select-skin": "選擇外觀",
+    "select-homepage": "選擇首頁",
+    "homepage": "首頁",
+    "homepage_description": "選擇一個要用來當作討論區的首頁的頁面，或是選None使用預設的首頁。",
+    "custom_route": "自訂首頁路由",
+    "custom_route_help": "在這裡輸入路由名稱，不需要在前面的斜線(例如recent或popular)",
+    "sso.title": "單一簽入SSO服務",
+    "sso.associated": "關連於",
+    "sso.not-associated": "點擊這裡進行關連於"
 }
\ No newline at end of file
diff --git a/public/language/zh_TW/users.json b/public/language/zh_TW/users.json
index 9d42c05416..91822886e1 100644
--- a/public/language/zh_TW/users.json
+++ b/public/language/zh_TW/users.json
@@ -2,19 +2,20 @@
     "latest_users": "最近用戶",
     "top_posters": "發文數最多",
     "most_reputation": "聲望最高",
+    "most_flags": "Most Flags",
     "search": "搜尋",
     "enter_username": "輸入想找的使用者帳號",
     "load_more": "載入更多",
-    "users-found-search-took": "發現 %1 用戶！搜尋只用 %2 秒。",
-    "filter-by": "Filter By",
+    "users-found-search-took": "找到 %1 使用者! 搜尋用了 %2 秒。",
+    "filter-by": "過濾依照",
     "online-only": "線上僅有",
-    "invite": "Invite",
-    "invitation-email-sent": "An invitation email has been sent to %1",
-    "user_list": "User List",
-    "recent_topics": "Recent Topics",
-    "popular_topics": "Popular Topics",
-    "unread_topics": "Unread Topics",
-    "categories": "Categories",
-    "tags": "Tags",
-    "no-users-found": "No users found!"
+    "invite": "邀請",
+    "invitation-email-sent": "所有邀請Email已經被寄送到 %1",
+    "user_list": "用戶列表",
+    "recent_topics": "最新的主題",
+    "popular_topics": "受歡迎的主題",
+    "unread_topics": "未讀的主題",
+    "categories": "類別",
+    "tags": "標籤",
+    "no-users-found": "沒有找到用戶！"
 }
\ No newline at end of file
diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less
index e733d8d9bd..ed15e562e4 100644
--- a/public/less/admin/admin.less
+++ b/public/less/admin/admin.less
@@ -11,6 +11,7 @@
 @import "./manage/categories";
 @import "./manage/tags";
 @import "./manage/groups";
+@import "./manage/registration";
 @import "./manage/users";
 @import "./appearance/customise";
 @import "./appearance/themes";
@@ -18,6 +19,7 @@
 @import "./extend/rewards";
 @import "./advanced/database";
 @import "./advanced/logs";
+@import "./advanced/errors";
 @import "./settings";
 
 @import "../flags";
@@ -26,6 +28,11 @@
 @import "./modules/alerts";
 @import "./modules/selectable";
 @import "./modules/snackbar";
+@import "./modules/nprogress";
+
+body {
+	overflow-y: scroll;
+}
 
 .admin {
 	background: #fff;
@@ -50,12 +57,30 @@
 		color: @link-color;
 	}
 
+	// .floating-button can either be a container or the button itself
 	.floating-button {
-		background: @brand-primary !important;
 		position: fixed;
 		right: 30px;
 		bottom: 30px;
 		z-index: 1;
+		max-width: 56px;
+
+		button {
+			&.primary {
+				background: @brand-primary !important;
+			}
+
+			&.success {
+				background: @brand-success !important;
+			}
+
+			&:not(:last-child) {
+				margin-bottom: 2rem;
+			}
+		}
+	}
+	button.floating-button {
+		background: @brand-primary !important;
 	}
 
 	.user-img {
diff --git a/public/less/admin/advanced/errors.less b/public/less/admin/advanced/errors.less
new file mode 100644
index 0000000000..89b9dda540
--- /dev/null
+++ b/public/less/admin/advanced/errors.less
@@ -0,0 +1,26 @@
+
+.page-advanced-errors {
+	.table {
+		table-layout: fixed;
+
+		th {
+			&:first-child {
+				width: 90%;
+			}
+
+			&:last-child {
+				text-align: center;
+			}
+		}
+
+		td {
+			&:first-child {
+				word-wrap: break-word;
+			}
+
+			&:last-child {
+				text-align: center;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/public/less/admin/header.less b/public/less/admin/header.less
index ea0e9fb0d1..8ccf535c30 100644
--- a/public/less/admin/header.less
+++ b/public/less/admin/header.less
@@ -89,4 +89,11 @@
 			}
 		}
 	}
+
+	.reconnect-spinner {
+		left: initial;
+		right: 310px;
+		bottom: initial;
+		top: 14px;
+	}
 }
\ No newline at end of file
diff --git a/public/less/admin/manage/registration.less b/public/less/admin/manage/registration.less
new file mode 100644
index 0000000000..ea483e727d
--- /dev/null
+++ b/public/less/admin/manage/registration.less
@@ -0,0 +1,7 @@
+@media screen and (max-width: @screen-sm-max) {
+	.page-manage-registration {
+		.users-list {
+			font-size: 10px;
+		}
+	}
+}
\ No newline at end of file
diff --git a/public/less/admin/mobile.less b/public/less/admin/mobile.less
index a324072679..e0e8ddb1dc 100644
--- a/public/less/admin/mobile.less
+++ b/public/less/admin/mobile.less
@@ -37,12 +37,12 @@
 	}
 
 	#mobile-menu {
-		width: 31px;
+		width: 22px;
 		background: none;
 		border: none;
 		vertical-align: 10%;
 		margin-right: 10px;
-		margin-left: -15px;
+		margin-left: -5px;
 		outline: none !important;
 		display: block;
 
diff --git a/public/less/admin/modules/nprogress.less b/public/less/admin/modules/nprogress.less
new file mode 100644
index 0000000000..c1b6effe02
--- /dev/null
+++ b/public/less/admin/modules/nprogress.less
@@ -0,0 +1,80 @@
+#nprogress {
+  pointer-events: none;
+}
+
+#nprogress .bar {
+  background: #29d;
+
+  position: fixed;
+  z-index: 1031;
+  top: 0;
+  left: 0;
+
+  width: 100%;
+  height: 2px;
+}
+
+#nprogress .peg {
+  display: block;
+  position: absolute;
+  right: 0px;
+  width: 100px;
+  height: 100%;
+  box-shadow: 0 0 10px #29d, 0 0 5px #29d;
+  opacity: 1.0;
+
+  -webkit-transform: rotate(3deg) translate(0px, -4px);
+      -ms-transform: rotate(3deg) translate(0px, -4px);
+          transform: rotate(3deg) translate(0px, -4px);
+}
+
+#nprogress .spinner {
+  display: block;
+  position: fixed;
+  z-index: 1031;
+  top: 165px;
+  right: 35px;
+}
+
+@media (max-width: @screen-xs-max) {
+  #nprogress .spinner {
+    bottom: 15px;
+    right: 15px;
+    top: initial;
+  }
+}
+
+
+#nprogress .spinner-icon {
+  width: 18px;
+  height: 18px;
+  box-sizing: border-box;
+
+  border: solid 2px transparent;
+  border-top-color: #29d;
+  border-left-color: #29d;
+  border-radius: 50%;
+
+  -webkit-animation: nprogress-spinner 400ms linear infinite;
+          animation: nprogress-spinner 400ms linear infinite;
+}
+
+.nprogress-custom-parent {
+  overflow: hidden;
+  position: relative;
+}
+
+.nprogress-custom-parent #nprogress .spinner,
+.nprogress-custom-parent #nprogress .bar {
+  position: absolute;
+}
+
+@-webkit-keyframes nprogress-spinner {
+  0%   { -webkit-transform: rotate(0deg); }
+  100% { -webkit-transform: rotate(360deg); }
+}
+@keyframes nprogress-spinner {
+  0%   { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+
diff --git a/public/less/generics.less b/public/less/generics.less
index fee1157662..bca1b45649 100644
--- a/public/less/generics.less
+++ b/public/less/generics.less
@@ -15,6 +15,18 @@
 
 .define-if-not-set();
 
+#move_thread_modal .category-list {
+	height: 500px;
+	overflow-y: auto;
+	overflow-x: hidden;
+}
+
+.topic-watch-dropdown {
+	.help-text {
+		margin-left: 20px;
+	}
+}
+
 .category-list {
 	padding: 0;
 
@@ -91,4 +103,16 @@
 	&.avatar-rounded {
 		border-radius: 50%;
 	}
+}
+
+.ban-modal {
+	input[type="number"] {
+		width: 7rem;
+		text-align: center;
+		margin-left: 1rem;
+	}
+
+	.form-inline, .form-group {
+		width: 100%;
+	}
 }
\ No newline at end of file
diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js
index d5a5e1f8d3..62234df1e9 100644
--- a/public/src/admin/admin.js
+++ b/public/src/admin/admin.js
@@ -1,14 +1,21 @@
 "use strict";
-/*global config, translator, componentHandler, define, socket, app, ajaxify, utils, bootbox, Slideout, RELATIVE_PATH*/
+/*global config, translator, componentHandler, define, socket, app, ajaxify, utils, bootbox, Slideout, NProgress, RELATIVE_PATH*/
 
 (function() {
-	$(document).ready(function() {
-		setupKeybindings();
 
-		// on page reload show correct tab if url has #
+	$(window).on('action:ajaxify.end', function() {
+		showCorrectNavTab();
+	});
+
+	function showCorrectNavTab() {
+		// show correct tab if url has #
 		if (window.location.hash) {
 			$('.nav-pills a[href=' + window.location.hash + ']').tab('show');
 		}
+	}
+
+	$(document).ready(function() {
+		setupKeybindings();
 
 		if(!/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) {
 			require(['admin/modules/search'], function(search) {
@@ -20,6 +27,7 @@
 		app.alert = launchSnackbar;
 
 		configureSlidemenu();
+		setupNProgress();
 	});
 
 	$(window).on('action:ajaxify.contentLoaded', function(ev, data) {
@@ -31,6 +39,16 @@
 		componentHandler.upgradeDom();
 	});
 
+	function setupNProgress() {
+		$(window).on('action:ajaxify.start', function() {
+			NProgress.set(0.7);
+		});
+
+		$(window).on('action:ajaxify.end', function(ev, data) {
+			NProgress.done();
+		});
+	}
+
 	function setupKeybindings() {
 		require(['mousetrap'], function(mousetrap) {
 			mousetrap.bind('ctrl+shift+a r', function() {
diff --git a/public/src/admin/advanced/errors.js b/public/src/admin/advanced/errors.js
new file mode 100644
index 0000000000..2e72bcceb5
--- /dev/null
+++ b/public/src/admin/advanced/errors.js
@@ -0,0 +1,81 @@
+"use strict";
+/*global config, define, app, socket, ajaxify, bootbox, templates, Chart, utils */
+
+define('admin/advanced/errors', ['Chart'], function(Chart) {
+	var Errors = {};
+
+	Errors.init = function() {
+		Errors.setupCharts();
+
+		$('[data-action="clear"]').on('click', Errors.clear404);
+	};
+
+	Errors.clear404 = function() {
+		bootbox.confirm('Are you sure you wish to clear the 404 error logs?', function(ok) {
+			if (ok) {
+				socket.emit('admin.errors.clear', {}, function(err) {
+					ajaxify.refresh();
+					app.alertSuccess('"404 Not Found" errors cleared');
+				});
+			}
+		});
+	};
+
+	Errors.setupCharts = function() {
+		var notFoundCanvas = document.getElementById('not-found'),
+			tooBusyCanvas = document.getElementById('toobusy'),
+			dailyLabels = utils.getDaysArray();
+
+		dailyLabels = dailyLabels.slice(-7);
+
+		if (utils.isMobile()) {
+			Chart.defaults.global.showTooltips = false;
+		}
+
+		var data = {
+			'not-found': {
+				labels: dailyLabels,
+				datasets: [
+					{
+						label: "",
+						fillColor: "rgba(186,139,175,0.2)",
+						strokeColor: "rgba(186,139,175,1)",
+						pointColor: "rgba(186,139,175,1)",
+						pointStrokeColor: "#fff",
+						pointHighlightFill: "#fff",
+						pointHighlightStroke: "rgba(186,139,175,1)",
+						data: ajaxify.data.analytics['not-found']
+					}
+				]
+			},
+			'toobusy': {
+				labels: dailyLabels,
+				datasets: [
+					{
+						label: "",
+						fillColor: "rgba(151,187,205,0.2)",
+						strokeColor: "rgba(151,187,205,1)",
+						pointColor: "rgba(151,187,205,1)",
+						pointStrokeColor: "#fff",
+						pointHighlightFill: "#fff",
+						pointHighlightStroke: "rgba(151,187,205,1)",
+						data: ajaxify.data.analytics['toobusy']
+					}
+				]
+			}
+		};
+
+		notFoundCanvas.width = $(notFoundCanvas).parent().width();
+		tooBusyCanvas.width = $(tooBusyCanvas).parent().width();
+		new Chart(notFoundCanvas.getContext('2d')).Line(data['not-found'], {
+			responsive: true,
+			animation: false
+		});
+		new Chart(tooBusyCanvas.getContext('2d')).Line(data['toobusy'], {
+			responsive: true,
+			animation: false
+		});
+	};
+
+	return Errors;
+});
\ No newline at end of file
diff --git a/public/src/admin/extend/plugins.js b/public/src/admin/extend/plugins.js
index 9a130723bf..b4e8767184 100644
--- a/public/src/admin/extend/plugins.js
+++ b/public/src/admin/extend/plugins.js
@@ -16,21 +16,27 @@ define('admin/extend/plugins', function() {
 		$('#plugin-search').val('');
 
 		pluginsList.on('click', 'button[data-action="toggleActive"]', function() {
-			pluginID = $(this).parents('li').attr('data-plugin-id');
-			var btn = $(this);
+			var pluginEl = $(this).parents('li');
+			pluginID = pluginEl.attr('data-plugin-id');
+			var btn = $('#' + pluginID + ' [data-action="toggleActive"]');
 			socket.emit('admin.plugins.toggleActive', pluginID, function(err, status) {
 				btn.html('<i class="fa fa-power-off"></i> ' + (status.active ? 'Deactivate' : 'Activate'));
 				btn.toggleClass('btn-warning', status.active).toggleClass('btn-success', !status.active);
 
+				//clone it to active plugins tab
+				if (status.active && !$('#active #' + pluginID).length) {
+					$('#active ul').prepend(pluginEl.clone(true));
+				}
+
 				app.alert({
 					alert_id: 'plugin_toggled',
 					title: 'Plugin ' + (status.active ? 'Enabled' : 'Disabled'),
-					message: status.active ? 'Please reload your NodeBB to fully activate this plugin' : 'Plugin successfully deactivated',
+					message: status.active ? 'Please restart your NodeBB to fully activate this plugin' : 'Plugin successfully deactivated',
 					type: status.active ? 'warning' : 'success',
 					timeout: 5000,
 					clickfn: function() {
 						require(['admin/modules/instance'], function(instance) {
-							instance.reload();
+							instance.restart();
 						});
 					}
 				});
@@ -141,6 +147,7 @@ define('admin/extend/plugins', function() {
 		});
 
 		populateUpgradeablePlugins();
+		populateActivePlugins();
 	};
 
 	function confirmInstall(pluginID, callback) {
@@ -235,5 +242,13 @@ define('admin/extend/plugins', function() {
 		});
 	}
 
+	function populateActivePlugins() {
+		$('#installed ul li').each(function() {
+			if ($(this).hasClass('active')) {
+				$('#active ul').append($(this).clone(true));
+			}
+		});
+	}
+
 	return Plugins;
 });
diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js
index b4a5f19601..4683d20e60 100644
--- a/public/src/admin/manage/categories.js
+++ b/public/src/admin/manage/categories.js
@@ -167,6 +167,10 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri
 			});
 		});
 
+		if (!categories.length) {
+			continueRender();
+		}
+
 		function continueRender() {
 			templates.parse('admin/partials/categories/category-rows', {
 				cid: parentId,
diff --git a/public/src/admin/manage/category-analytics.js b/public/src/admin/manage/category-analytics.js
index 52a24ecfeb..cf78cfa5e3 100644
--- a/public/src/admin/manage/category-analytics.js
+++ b/public/src/admin/manage/category-analytics.js
@@ -1,7 +1,7 @@
 "use strict";
-/*global config, define, app, socket, ajaxify, bootbox, templates, Chart, utils */
+/*global config, define, app, socket, ajaxify, bootbox, templates, utils */
 
-define('admin/manage/category-analytics', [], function() {
+define('admin/manage/category-analytics', ['Chart'], function(Chart) {
 	var CategoryAnalytics = {};
 
 	CategoryAnalytics.init = function() {
@@ -80,7 +80,7 @@ define('admin/manage/category-analytics', [], function() {
 						data: ajaxify.data.analytics['posts:daily']
 					}
 				]
-			},
+			}
 		};
 
 		hourlyCanvas.width = $(hourlyCanvas).parent().width();
diff --git a/public/src/admin/manage/category.js b/public/src/admin/manage/category.js
index ced83105a3..b58d3295b9 100644
--- a/public/src/admin/manage/category.js
+++ b/public/src/admin/manage/category.js
@@ -5,9 +5,8 @@ define('admin/manage/category', [
 	'uploader',
 	'iconSelect',
 	'admin/modules/colorpicker',
-	'autocomplete',
-	'Chart'
-], function(uploader, iconSelect, colorpicker, autocomplete, Chart) {
+	'autocomplete'
+], function(uploader, iconSelect, colorpicker, autocomplete) {
 	var	Category = {};
 
 	Category.init = function() {
@@ -100,46 +99,17 @@ define('admin/manage/category', [
 			});
 		});
 
-		$('.copy-settings').on('click', function(e) {
-			e.preventDefault();
-			socket.emit('admin.categories.getNames', function(err, categories) {
-				if (err) {
-					return app.alertError(err.message);
-				}
-
-				templates.parse('admin/partials/categories/select-category', {
-					categories: categories
-				}, function(html) {
-					function submit() {
-						var formData = modal.find('form').serializeObject();
-
-						socket.emit('admin.categories.copySettingsFrom', {fromCid: formData['select-cid'], toCid: ajaxify.data.category.cid}, function(err) {
-							if (err) {
-								return app.alertError(err.message);
-							}
-							app.alertSuccess('Settings Copied!');
-							ajaxify.refresh();
-						});
-
-						modal.modal('hide');
-						return false;
+		$('.copy-settings').on('click', function() {
+			selectCategoryModal(function(cid) {
+				socket.emit('admin.categories.copySettingsFrom', {fromCid: cid, toCid: ajaxify.data.category.cid}, function(err) {
+					if (err) {
+						return app.alertError(err.message);
 					}
-
-					var modal = bootbox.dialog({
-						title: 'Select a Category',
-						message: html,
-						buttons: {
-							save: {
-								label: 'Copy',
-								className: 'btn-primary',
-								callback: submit
-							}
-						}
-					});
-
-					modal.find('form').on('submit', submit);
+					app.alertSuccess('Settings Copied!');
+					ajaxify.refresh();
 				});
 			});
+			return false;
 		});
 
 		$('.upload-button').on('click', function() {
@@ -229,6 +199,7 @@ define('admin/manage/category', [
 		$('.privilege-table-container').on('click', '[data-action="search.user"]', Category.addUserToPrivilegeTable);
 		$('.privilege-table-container').on('click', '[data-action="search.group"]', Category.addGroupToPrivilegeTable);
 		$('.privilege-table-container').on('click', '[data-action="copyToChildren"]', Category.copyPrivilegesToChildren);
+		$('.privilege-table-container').on('click', '[data-action="copyPrivilegesFrom"]', Category.copyPrivilegesFromCategory);
 
 		Category.exposeAssumedPrivileges();
 	};
@@ -345,7 +316,7 @@ define('admin/manage/category', [
 			autocomplete.user(inputEl, function(ev, ui) {
 				socket.emit('admin.categories.setPrivilege', {
 					cid: ajaxify.data.category.cid,
-					privilege: ['find', 'read'],
+					privilege: ['find', 'read', 'topics:read'],
 					set: true,
 					member: ui.item.user.uid
 				}, function(err) {
@@ -373,7 +344,7 @@ define('admin/manage/category', [
 			autocomplete.group(inputEl, function(ev, ui) {
 				socket.emit('admin.categories.setPrivilege', {
 					cid: ajaxify.data.category.cid,
-					privilege: ['groups:find', 'groups:read'],
+					privilege: ['groups:find', 'groups:read', 'groups:topics:read'],
 					set: true,
 					member: ui.item.group.name
 				}, function(err) {
@@ -397,5 +368,50 @@ define('admin/manage/category', [
 		});
 	};
 
+	Category.copyPrivilegesFromCategory = function() {
+		selectCategoryModal(function(cid) {
+			socket.emit('admin.categories.copyPrivilegesFrom', {toCid: ajaxify.data.category.cid, fromCid: cid}, function(err) {
+				if (err) {
+					return app.alertError(err.message);
+				}
+				ajaxify.refresh();
+			});
+		});
+	};
+
+	function selectCategoryModal(callback) {
+		socket.emit('admin.categories.getNames', function(err, categories) {
+			if (err) {
+				return app.alertError(err.message);
+			}
+
+			templates.parse('admin/partials/categories/select-category', {
+				categories: categories
+			}, function(html) {
+				function submit() {
+					var formData = modal.find('form').serializeObject();
+					callback(formData['select-cid']);
+					modal.modal('hide');
+					return false;
+				}
+
+				var modal = bootbox.dialog({
+					title: 'Select a Category',
+					message: html,
+					buttons: {
+						save: {
+							label: 'Copy',
+							className: 'btn-primary',
+							callback: submit
+						}
+					}
+				});
+
+				modal.find('form').on('submit', submit);
+			});
+		});
+	}
+
+
 	return Category;
 });
\ No newline at end of file
diff --git a/public/src/admin/manage/flags.js b/public/src/admin/manage/flags.js
index eaa839522a..e1ccde9c00 100644
--- a/public/src/admin/manage/flags.js
+++ b/public/src/admin/manage/flags.js
@@ -1,11 +1,12 @@
 "use strict";
-/*global define, socket, app, admin, utils, bootbox, RELATIVE_PATH*/
+/*global define, socket, app, utils, bootbox, ajaxify*/
 
 define('admin/manage/flags', [
 	'forum/infinitescroll',
 	'admin/modules/selectable',
-	'autocomplete'
-], function(infinitescroll, selectable, autocomplete) {
+	'autocomplete',
+	'Chart'
+], function(infinitescroll, selectable, autocomplete, Chart) {
 
 	var	Flags = {};
 
@@ -20,6 +21,7 @@ define('admin/manage/flags', [
 		handleDismissAll();
 		handleDelete();
 		handleInfiniteScroll();
+		handleGraphs();
 	};
 
 	function handleDismiss() {
@@ -101,5 +103,42 @@ define('admin/manage/flags', [
 		});
 	}
 
+	function handleGraphs() {
+		var dailyCanvas = document.getElementById('flags:daily');
+		var dailyLabels = utils.getDaysArray().map(function(text, idx) {
+			return idx % 3 ? '' : text;
+		});
+
+		if (utils.isMobile()) {
+			Chart.defaults.global.showTooltips = false;
+		}
+		var data = {
+			'flags:daily': {
+				labels: dailyLabels,
+				datasets: [
+					{
+						label: "",
+						fillColor: "rgba(151,187,205,0.2)",
+						strokeColor: "rgba(151,187,205,1)",
+						pointColor: "rgba(151,187,205,1)",
+						pointStrokeColor: "#fff",
+						pointHighlightFill: "#fff",
+						pointHighlightStroke: "rgba(151,187,205,1)",
+						data: ajaxify.data.analytics
+					}
+				]
+			}
+		};
+
+
+
+		dailyCanvas.width = $(dailyCanvas).parent().width();
+		new Chart(dailyCanvas.getContext('2d')).Line(data['flags:daily'], {
+			responsive: true,
+			animation: false
+		});
+
+	}
+
 	return Flags;
 });
\ No newline at end of file
diff --git a/public/src/admin/manage/group.js b/public/src/admin/manage/group.js
index 06284e4e88..32ff8aea80 100644
--- a/public/src/admin/manage/group.js
+++ b/public/src/admin/manage/group.js
@@ -173,7 +173,15 @@ define('admin/manage/group', [
 				if (err) {
 					return app.alertError(err.message);
 				}
-				app.alertSuccess('Changes saved!');
+
+				var newName = $('#change-group-name').val();
+
+				// If the group name changed, change url
+				if (groupName === newName) {
+					app.alertSuccess('Changes saved!');
+				} else {
+					ajaxify.go('admin/manage/groups/' + encodeURIComponent(newName), undefined, true);
+				}
 			});
 			return false;
 		});
diff --git a/public/src/admin/manage/users.js b/public/src/admin/manage/users.js
index 09c9e3a01e..ac40fdbe9a 100644
--- a/public/src/admin/manage/users.js
+++ b/public/src/admin/manage/users.js
@@ -47,25 +47,59 @@ define('admin/manage/users', ['admin/modules/selectable'], function(selectable)
 		$('.ban-user').on('click', function() {
 			var uids = getSelectedUids();
 			if (!uids.length) {
-				return false;
+				app.alertError('[[error:no-users-selected]]');
+				return false;	// specifically to keep the menu open
 			}
 
-			bootbox.confirm('Do you really want to ban?', function(confirm) {
+			bootbox.confirm('Do you really want to ban ' + (uids.length > 1 ? 'these users' : 'this user') + ' <strong>permanently</strong>?', function(confirm) {
 				if (confirm) {
-					socket.emit('user.banUsers', uids, done('User(s) banned!', '.ban', true));
+					socket.emit('user.banUsers', { uids: uids }, done('User(s) banned!', '.ban', true));
 				}
 			});
-			return false;
+		});
+
+		$('.ban-user-temporary').on('click', function() {
+			var uids = getSelectedUids();
+			if (!uids.length) {
+				app.alertError('[[error:no-users-selected]]');
+				return false;	// specifically to keep the menu open
+			}
+
+			templates.parse('admin/partials/temporary-ban', {}, function(html) {
+				bootbox.dialog({
+					className: 'ban-modal',
+					title: '[[user:ban_account]]',
+					message: html,
+					show: true,
+					buttons: {
+						close: {
+							label: '[[global:close]]',
+							className: 'btn-link'
+						},
+						submit: {
+							label: 'Ban ' + uids.length + (uids.length > 1 ? ' users' : ' user'),
+							callback: function() {
+								var formData = $('.ban-modal form').serializeArray().reduce(function(data, cur) {
+									data[cur.name] = cur.value;
+									return data;
+								}, {});
+								var until = Date.now() + formData.length * 1000*60*60 * (parseInt(formData.unit, 10) ? 24 : 1);
+								socket.emit('user.banUsers', { uids: uids, until: until }, done('User(s) banned!', '.ban', true));
+							}
+						}
+					}
+				});
+			});
 		});
 
 		$('.unban-user').on('click', function() {
 			var uids = getSelectedUids();
 			if (!uids.length) {
-				return;
+				app.alertError('[[error:no-users-selected]]');
+				return false;	// specifically to keep the menu open
 			}
 
 			socket.emit('user.unbanUsers', uids, done('User(s) unbanned!', '.ban', false));
-			return false;
 		});
 
 		$('.reset-lockout').on('click', function() {
@@ -75,7 +109,6 @@ define('admin/manage/users', ['admin/modules/selectable'], function(selectable)
 			}
 
 			socket.emit('admin.user.resetLockouts', uids, done('Lockout(s) reset!'));
-			return false;
 		});
 
 		$('.reset-flags').on('click', function() {
@@ -85,7 +118,6 @@ define('admin/manage/users', ['admin/modules/selectable'], function(selectable)
 			}
 
 			socket.emit('admin.user.resetFlags', uids, done('Flags(s) reset!'));
-			return false;
 		});
 
 		$('.admin-user').on('click', function() {
@@ -99,7 +131,6 @@ define('admin/manage/users', ['admin/modules/selectable'], function(selectable)
 			} else {
 				socket.emit('admin.user.makeAdmins', uids, done('User(s) are now administrators.', '.administrator', true));
 			}
-			return false;
 		});
 
 		$('.remove-admin-user').on('click', function() {
@@ -117,7 +148,6 @@ define('admin/manage/users', ['admin/modules/selectable'], function(selectable)
 					}
 				});
 			}
-			return false;
 		});
 
 		$('.validate-email').on('click', function() {
@@ -131,7 +161,6 @@ define('admin/manage/users', ['admin/modules/selectable'], function(selectable)
 					socket.emit('admin.user.validateEmail', uids, done('Emails validated', '.notvalidated', false));
 				}
 			});
-			return false;
 		});
 
 		$('.send-validation-email').on('click', function() {
@@ -158,7 +187,6 @@ define('admin/manage/users', ['admin/modules/selectable'], function(selectable)
 					socket.emit('admin.user.sendPasswordResetEmail', uids, done('Emails sent'));
 				}
 			});
-			return false;
 		});
 
 		$('.delete-user').on('click', function() {
@@ -180,7 +208,6 @@ define('admin/manage/users', ['admin/modules/selectable'], function(selectable)
 					});
 				}
 			});
-			return false;
 		});
 
 		function handleUserCreate() {
@@ -268,7 +295,27 @@ define('admin/manage/users', ['admin/modules/selectable'], function(selectable)
 
 		handleUserCreate();
 
+		handleInvite();
+
 	};
 
+	function handleInvite() {
+		$('[component="user/invite"]').on('click', function() {
+			bootbox.prompt('Email: ', function(email) {
+				if (!email) {
+					return;
+				}
+
+				socket.emit('user.invite', email, function(err) {
+					if (err) {
+						return app.alertError(err.message);
+					}
+					app.alertSuccess('An invitation email has been sent to ' + email);
+				});
+			});
+		});
+	}
+
+
 	return Users;
 });
diff --git a/public/src/admin/settings.js b/public/src/admin/settings.js
index c4b880f761..acfa654556 100644
--- a/public/src/admin/settings.js
+++ b/public/src/admin/settings.js
@@ -53,11 +53,11 @@ define('admin/settings', ['uploader', 'sounds'], function(uploader, sounds) {
 					}
 				}
 			} else if (field.is('textarea')) {
-				if (app.config[key]) {
+				if (app.config.hasOwnProperty(key)) {
 					field.val(app.config[key]);
 				}
 			} else if (field.is('select')) {
-				if (app.config[key]) {
+				if (app.config.hasOwnProperty(key)) {
 					field.val(app.config[key]);
 				}
 			}
diff --git a/public/src/admin/settings/general.js b/public/src/admin/settings/general.js
index 83ecff7907..0c36db401c 100644
--- a/public/src/admin/settings/general.js
+++ b/public/src/admin/settings/general.js
@@ -14,6 +14,9 @@ define('admin/settings/general', ['admin/settings'], function(Settings) {
 		$('button[data-action="removeTouchIcon"]').on('click', function() {
 			$('input[data-field="brand:touchIcon"]').val('');
 		});
+		$('button[data-action="removeOgImage"]').on('click', function() {
+			$('input[data-field="removeOgImage"]').val('');
+		});
 	};
 
 	return Module;
diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index e31786294b..211cbb15e4 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -61,20 +61,23 @@ $(document).ready(function() {
 			apiXHR.abort();
 		}
 
-		url = ajaxify.start(url, quiet);
+		if (!window.location.pathname.match(/\/(403|404)$/g)) {
+			app.previousUrl = window.location.href;
+		}
+
+		url = ajaxify.start(url);
 
 		$('body').removeClass(ajaxify.data.bodyClass);
 		$('#footer, #content').removeClass('hide').addClass('ajaxifying');
 
 		ajaxify.loadData(url, function(err, data) {
-			if (err) {
-				return onAjaxError(err, url, callback, quiet);
+
+			if (!err || (err && err.data && (parseInt(err.data.status, 10) !== 302 && parseInt(err.data.status, 10) !== 308))) {
+				ajaxify.updateHistory(url, quiet);
 			}
 
-			if (window.history && window.history.pushState) {
-				window.history[!quiet ? 'pushState' : 'replaceState']({
-					url: url
-				}, url, RELATIVE_PATH + '/' + url);
+			if (err) {
+				return onAjaxError(err, url, callback, quiet);
 			}
 
 			retry = true;
@@ -91,9 +94,10 @@ $(document).ready(function() {
 
 	ajaxify.handleRedirects = function(url) {
 		url = ajaxify.removeRelativePath(url.replace(/\/$/, '')).toLowerCase();
-		var isAdminRoute = url.startsWith('admin') && window.location.pathname.indexOf(RELATIVE_PATH + '/admin') !== 0;
+		var isClientToAdmin = url.startsWith('admin') && window.location.pathname.indexOf(RELATIVE_PATH + '/admin') !== 0;
+		var isAdminToClient = !url.startsWith('admin') && window.location.pathname.indexOf(RELATIVE_PATH + '/admin') === 0;
 		var uploadsOrApi = url.startsWith('uploads') || url.startsWith('api');
-		if (isAdminRoute || uploadsOrApi) {
+		if (isClientToAdmin || isAdminToClient || uploadsOrApi) {
 			window.open(RELATIVE_PATH + '/' + url, '_top');
 			return true;
 		}
@@ -101,19 +105,23 @@ $(document).ready(function() {
 	};
 
 
-	ajaxify.start = function(url, quiet) {
+	ajaxify.start = function(url) {
 		url = ajaxify.removeRelativePath(url.replace(/^\/|\/$/g, ''));
 
 		$(window).trigger('action:ajaxify.start', {url: url});
 
-		if (!window.location.pathname.match(/\/(403|404)$/g)) {
-			app.previousUrl = window.location.href;
-		}
-
-		ajaxify.currentPage = url.split(/[?#]/)[0];
 		return url;
 	};
 
+	ajaxify.updateHistory = function(url, quiet) {
+		ajaxify.currentPage = url.split(/[?#]/)[0];
+		if (window.history && window.history.pushState) {
+			window.history[!quiet ? 'pushState' : 'replaceState']({
+				url: url
+			}, url, RELATIVE_PATH + '/' + url);
+		}
+	};
+
 	function onAjaxError(err, url, callback, quiet) {
 		var data = err.data;
 		var textStatus = err.textStatus;
@@ -137,9 +145,10 @@ $(document).ready(function() {
 			} else if (status === 401) {
 				app.alertError('[[global:please_log_in]]');
 				app.previousUrl = url;
-				return ajaxify.go('login');
+				window.location.href = config.relative_path + '/login';
+				return;
 			} else if (status === 302 || status === 308) {
-				if (data.responseJSON.external) {
+				if (data.responseJSON && data.responseJSON.external) {
 					window.location.href = data.responseJSON.external;
 				} else if (typeof data.responseJSON === 'string') {
 					ajaxify.go(data.responseJSON.slice(1), callback, quiet);
@@ -302,6 +311,10 @@ $(document).ready(function() {
 				}
 			}
 
+			if (internalLink && $(this).attr('href').endsWith('.rss')) {
+				return;
+			}
+
 			if (hrefEmpty(this.href) || this.protocol === 'javascript:' || $(this).attr('href') === '#') {
 				return e.preventDefault();
 			}
diff --git a/public/src/app.js b/public/src/app.js
index 791aabd628..c40fdc4a2a 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -26,7 +26,8 @@ app.cacheBuster = null;
 	app.load = function() {
 		app.loadProgressiveStylesheet();
 
-		var url = ajaxify.start(window.location.pathname.slice(1) + window.location.search + window.location.hash, true);
+		var url = ajaxify.start(window.location.pathname.slice(1) + window.location.search + window.location.hash);
+		ajaxify.updateHistory(url, true);
 		ajaxify.end(url, app.template);
 
 		handleStatusChange();
@@ -117,7 +118,7 @@ app.cacheBuster = null;
 			title: '[[global:alert.success]]',
 			message: message,
 			type: 'success',
-			timeout: timeout ? timeout : 2000
+			timeout: timeout ? timeout : 5000
 		});
 	};
 
@@ -126,20 +127,23 @@ app.cacheBuster = null;
 			title: '[[global:alert.error]]',
 			message: message,
 			type: 'danger',
-			timeout: timeout ? timeout : 5000
+			timeout: timeout ? timeout : 10000
 		});
 	};
 
 	app.enterRoom = function (room, callback) {
 		callback = callback || function() {};
 		if (socket && app.user.uid && app.currentRoom !== room) {
+			var previousRoom = app.currentRoom;
+			app.currentRoom = room;
 			socket.emit('meta.rooms.enter', {
 				enter: room
 			}, function(err) {
 				if (err) {
+					app.currentRoom = previousRoom;
 					return app.alertError(err.message);
 				}
-				app.currentRoom = room;
+
 				callback();
 			});
 		}
@@ -455,26 +459,9 @@ app.cacheBuster = null;
 	};
 
 	app.newTopic = function (cid) {
-		cid = cid || ajaxify.data.cid;
-		if (cid) {
-			$(window).trigger('action:composer.topic.new', {
-				cid: cid
-			});
-		} else {
-			socket.emit('categories.getCategoriesByPrivilege', 'topics:create', function(err, categories) {
-				if (err) {
-					return app.alertError(err.message);
-				}
-				categories = categories.filter(function(category) {
-					return !category.link && !parseInt(category.parentCid, 10);
-				});
-				if (categories.length) {
-					$(window).trigger('action:composer.topic.new', {
-						cid: categories[0].cid
-					});
-				}
-			});
-		}
+		$(window).trigger('action:composer.topic.new', {
+			cid: cid || ajaxify.data.cid || 0
+		});
 	};
 
 	app.loadJQueryUI = function(callback) {
@@ -546,5 +533,5 @@ app.cacheBuster = null;
 		linkEl.href = config.relative_path + '/js-enabled.css';
 
 		document.head.appendChild(linkEl);
-	}
+	};
 }());
diff --git a/public/src/client/account/edit.js b/public/src/client/account/edit.js
index de5b01e809..db600a2f55 100644
--- a/public/src/client/account/edit.js
+++ b/public/src/client/account/edit.js
@@ -36,6 +36,7 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'],
 			website: $('#inputWebsite').val(),
 			birthday: $('#inputBirthday').val(),
 			location: $('#inputLocation').val(),
+			groupTitle: $('#groupTitle').val(),
 			signature: $('#inputSignature').val(),
 			aboutme: $('#inputAboutMe').val()
 		};
@@ -173,8 +174,9 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'],
 					} else {
 						socket.emit('user.deleteAccount', {}, function(err) {
 							if (err) {
-								app.alertError(err.message);
+								return app.alertError(err.message);
 							}
+							
 							window.location.href = config.relative_path + '/';
 						});
 					}
diff --git a/public/src/client/account/header.js b/public/src/client/account/header.js
index 520224d9ef..0e2477c6d1 100644
--- a/public/src/client/account/header.js
+++ b/public/src/client/account/header.js
@@ -103,18 +103,34 @@ define('forum/account/header', [
 	}
 
 	function banAccount() {
-		translator.translate('[[user:ban_account_confirm]]', function(translated) {
-			bootbox.confirm(translated, function(confirm) {
-				if (!confirm) {
-					return;
-				}
-				socket.emit('user.banUsers', [ajaxify.data.theirid], function(err) {
-					if (err) {
-						return app.alertError(err.message);
+		templates.parse('admin/partials/temporary-ban', {}, function(html) {
+			bootbox.dialog({
+				className: 'ban-modal',
+				title: '[[user:ban_account]]',
+				message: html,
+				show: true,
+				buttons: {
+					close: {
+						label: '[[global:close]]',
+						className: 'btn-link'
+					},
+					submit: {
+						label: '[[user:ban_account]]',
+						callback: function() {
+							var formData = $('.ban-modal form').serializeArray().reduce(function(data, cur) {
+								data[cur.name] = cur.value;
+								return data;
+							}, {});
+							var until = Date.now() + formData.length * 1000*60*60 * (parseInt(formData.unit, 10) ? 24 : 1);
+							socket.emit('user.banUsers', { uids: [ajaxify.data.theirid], until: until }, function(err) {
+								if (err) {
+									return app.alertError(err.message);
+								}
+								ajaxify.refresh();
+							});
+						}
 					}
-					components.get('account/ban').parent().addClass('hide');
-					components.get('account/unban').parent().removeClass('hide');
-				});
+				}
 			});
 		});
 	}
@@ -124,9 +140,7 @@ define('forum/account/header', [
 			if (err) {
 				return app.alertError(err.message);
 			}
-
-			components.get('account/ban').parent().removeClass('hide');
-			components.get('account/unban').parent().addClass('hide');
+			ajaxify.refresh();
 		});
 	}
 
diff --git a/public/src/client/account/settings.js b/public/src/client/account/settings.js
index 04312f2823..763b41b504 100644
--- a/public/src/client/account/settings.js
+++ b/public/src/client/account/settings.js
@@ -64,7 +64,7 @@ define('forum/account/settings', ['forum/account/header', 'components', 'csrf'],
 
 		$('#bootswatchSkin').on('change', function() {
 			var css = $('#bootswatchCSS'),
-				val = $(this).val() === 'default' ? config['theme:src'] : 'http://maxcdn.bootstrapcdn.com/bootswatch/latest/' + $(this).val() + '/bootstrap.min.css';
+				val = $(this).val() === 'default' ? config['theme:src'] : '//maxcdn.bootstrapcdn.com/bootswatch/latest/' + $(this).val() + '/bootstrap.min.css';
 
 			css.attr('href', val);
 		});
@@ -78,11 +78,12 @@ define('forum/account/settings', ['forum/account/header', 'components', 'csrf'],
 	};
 
 	function toggleCustomRoute() {
-		$('[data-property="homePageCustom"]').val('');
+
 		if ($('[data-property="homePageRoute"]').val() === 'custom') {
 			$('#homePageCustom').show();
-		}else{
+		} else {
 			$('#homePageCustom').hide();
+			$('[data-property="homePageCustom"]').val('');
 		}
 	}
 
diff --git a/public/src/client/category.js b/public/src/client/category.js
index a441ff5d08..10816286d9 100644
--- a/public/src/client/category.js
+++ b/public/src/client/category.js
@@ -59,20 +59,25 @@ define('forum/category', [
 		});
 
 		handleIgnoreWatch(cid);
+
+		$(window).trigger('action:topics.loaded', {topics: ajaxify.data.topics});
 	};
 
 	function handleIgnoreWatch(cid) {
-		$('.watch, .ignore').on('click', function() {
+		$('[component="category/watching"], [component="category/ignoring"]').on('click', function() {
 			var $this = $(this);
-			var command = $this.hasClass('watch') ? 'watch' : 'ignore';
+			var command = $this.attr('component') === 'category/watching' ? 'watch' : 'ignore';
 
 			socket.emit('categories.' + command, cid, function(err) {
 				if (err) {
 					return app.alertError(err.message);
 				}
 
-				$('.watch').toggleClass('hidden', command === 'watch');
-				$('.ignore').toggleClass('hidden', command === 'ignore');
+				$('[component="category/watching/menu"]').toggleClass('hidden', command !== 'watch');
+				$('[component="category/watching/check"]').toggleClass('fa-check', command === 'watch');
+
+				$('[component="category/ignoring/menu"]').toggleClass('hidden', command !== 'ignore');
+				$('[component="category/ignoring/check"]').toggleClass('fa-check', command === 'ignore');
 
 				app.alertSuccess('[[category:' + command + '.message]]');
 			});
diff --git a/public/src/client/chats.js b/public/src/client/chats.js
index 672a12b57a..619dbc9ec0 100644
--- a/public/src/client/chats.js
+++ b/public/src/client/chats.js
@@ -1,8 +1,15 @@
 'use strict';
 
-/* globals define, config, app, ajaxify, utils, socket, templates, bootbox */
+/* globals define, app, ajaxify, utils, socket, templates */
 
-define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll', 'translator', 'mousetrap'], function(components, S, sounds, infinitescroll, translator, mousetrap) {
+define('forum/chats', [
+	'components',
+	'translator',
+	'mousetrap',
+	'forum/chats/recent',
+	'forum/chats/search',
+	'forum/chats/messages'
+], function(components, translator, mousetrap, recentChats, search, messages) {
 	var Chats = {
 		initialised: false
 	};
@@ -26,11 +33,11 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
 			Chats.addHotkeys();
 		}
 
-		Chats.scrollToBottom($('.expanded-chat ul'));
+		messages.scrollToBottom($('.expanded-chat ul'));
 
 		Chats.initialised = true;
 
-		Chats.handleSearch();
+		search.init();
 
 		if (ajaxify.data.hasOwnProperty('roomId')) {
 			components.get('chat/input').focus();
@@ -68,29 +75,25 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
 			});
 		});
 
-		components.get('chat/messages')
-			.on('click', '[data-action="edit"]', function() {
-				var messageId = $(this).parents('[data-mid]').attr('data-mid');
-				var inputEl = components.get('chat/input');
-				Chats.prepEdit(inputEl, messageId, ajaxify.data.roomId);
-			})
-			.on('click', '[data-action="delete"]', function() {
-				var messageId = $(this).parents('[data-mid]').attr('data-mid');
-				Chats.delete(messageId, ajaxify.data.roomId);
-			});
+		Chats.addEditDeleteHandler(components.get('chat/messages'), ajaxify.data.roomId);
 
-		$('[component="chat/recent"]').on('scroll', function() {
-			var $this = $(this);
-			var bottom = ($this[0].scrollHeight - $this.height()) * 0.9;
-			if ($this.scrollTop() > bottom) {
-				loadMoreRecentChats();
-			}
-		});
+		recentChats.init();
 
 		Chats.addSinceHandler(ajaxify.data.roomId, $('.expanded-chat .chat-content'), $('.expanded-chat [data-since]'));
 		Chats.addRenameHandler(ajaxify.data.roomId, $('[component="chat/room/name"]'));
 	};
 
+	Chats.addEditDeleteHandler = function(element, roomId) {
+		element.on('click', '[data-action="edit"]', function() {
+			var messageId = $(this).parents('[data-mid]').attr('data-mid');
+			var inputEl = components.get('chat/input');
+			messages.prepEdit(inputEl, messageId, roomId);
+		}).on('click', '[data-action="delete"]', function() {
+			var messageId = $(this).parents('[data-mid]').attr('data-mid');
+			messages.delete(messageId, roomId);
+		});
+	};
+
 	Chats.addHotkeys = function() {
 		mousetrap.bind('ctrl+up', function() {
 			var activeContact = $('.chats-list .bg-primary'),
@@ -115,49 +118,11 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
 				var lastMid = message.attr('data-mid');
 				var inputEl = components.get('chat/input');
 
-				Chats.prepEdit(inputEl, lastMid, ajaxify.data.roomId);
+				messages.prepEdit(inputEl, lastMid, ajaxify.data.roomId);
 			}
 		});
 	};
 
-	Chats.prepEdit = function(inputEl, messageId, roomId) {
-		socket.emit('modules.chats.getRaw', { mid: messageId, roomId: roomId }, function(err, raw) {
-			if (err) {
-				return app.alertError(err.message);
-			}
-			// Populate the input field with the raw message content
-			if (inputEl.val().length === 0) {
-				// By setting the `data-mid` attribute, I tell the chat code that I am editing a
-				// message, instead of posting a new one.
-				inputEl.attr('data-mid', messageId).addClass('editing');
-				inputEl.val(raw);
-			}
-		});
-	};
-
-	Chats.delete = function(messageId, roomId) {
-		translator.translate('[[modules:chat.delete_message_confirm]]', function(translated) {
-			bootbox.confirm(translated, function(ok) {
-				if (!ok) {
-					return;
-				}
-
-				socket.emit('modules.chats.delete', {
-					messageId: messageId,
-					roomId: roomId
-				}, function(err) {
-					if (err) {
-						return app.alertError(err.message);
-					}
-
-					components.get('chat/message', messageId).slideUp('slow', function() {
-						$(this).remove();
-					});
-				});
-			});
-		});
-	};
-
 	Chats.addSinceHandler = function(roomId, chatContentEl, sinceEl) {
 		sinceEl.on('click', function() {
 			var since = $(this).attr('data-since');
@@ -190,25 +155,15 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
 	};
 
 	Chats.addSendHandlers = function(roomId, inputEl, sendEl) {
-
 		inputEl.off('keypress').on('keypress', function(e) {
 			if (e.which === 13 && !e.shiftKey) {
-				Chats.sendMessage(roomId, inputEl);
+				messages.sendMessage(roomId, inputEl);
 				return false;
 			}
 		});
 
-		inputEl.off('keyup').on('keyup', function() {
-			var val = !!$(this).val();
-			if ((val && $(this).attr('data-typing') === 'true') || (!val && $(this).attr('data-typing') === 'false')) {
-				return;
-			}
-
-			$(this).attr('data-typing', val);
-		});
-
 		sendEl.off('click').on('click', function() {
-			Chats.sendMessage(roomId, inputEl);
+			messages.sendMessage(roomId, inputEl);
 			inputEl.focus();
 			return false;
 		});
@@ -317,14 +272,14 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
 		if (!roomId) {
 			return;
 		}
-		socket.emit('modules.chats.get', {roomId: roomId, since: since}, function(err, messages) {
+		socket.emit('modules.chats.get', {roomId: roomId, since: since}, function(err, messageData) {
 			if (err) {
 				return app.alertError(err.message);
 			}
 
 			chatContentEl.find('[component="chat/message"]').remove();
 
-			Chats.appendChatMessage(chatContentEl, messages);
+			messages.appendChatMessage(chatContentEl, messageData);
 		});
 	};
 
@@ -338,34 +293,30 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
 		});
 	};
 
-	Chats.appendChatMessage = function(chatContentEl, data) {
-
-		var lastSpeaker = parseInt(chatContentEl.find('.chat-message').last().attr('data-uid'), 10);
-		if (!Array.isArray(data)) {
-			data.newSet = lastSpeaker !== data.fromuid;
-		}
-
-		Chats.parseMessage(data, function(html) {
-			onMessagesParsed(chatContentEl, html);
-		});
-	};
-
-	function onMessagesParsed(chatContentEl, html) {
-		var newMessage = $(html);
-
-		newMessage.appendTo(chatContentEl);
-		newMessage.find('.timeago').timeago();
-		newMessage.find('img:not(.not-responsive)').addClass('img-responsive');
-		Chats.scrollToBottom(chatContentEl);
-	}
-
 	Chats.addSocketListeners = function() {
 		socket.on('event:chats.receive', function(data) {
 			if (parseInt(data.roomId, 10) === parseInt(ajaxify.data.roomId, 10)) {
 				newMessage = data.self === 0;
 				data.message.self = data.self;
 
-				Chats.appendChatMessage($('.expanded-chat .chat-content'), data.message);
+				messages.appendChatMessage($('.expanded-chat .chat-content'), data.message);
+			} else {
+				if (ajaxify.currentPage.startsWith("chats")) {
+					var roomEl = $('[data-roomid=' + data.roomId + ']');
+
+					if (roomEl.length > 0) {
+						roomEl.addClass("unread");
+					} else {
+						var recentEl = components.get('chat/recent');
+						templates.parse('partials/chat_recent_room', {
+							rooms: { "roomId": data.roomId, "lastUser": data.message.fromUser, "usernames": data.message.fromUser.username, "unread": true }
+						}, function(html) {
+							translator.translate(html, function(translated) {
+							    recentEl.prepend(translated);
+							});
+						});
+					}
+				}
 			}
 		});
 
@@ -373,38 +324,22 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
 			app.updateUserStatus($('.chats-list [data-uid="' + data.uid + '"] [component="user/status"]'), data.status);
 		});
 
-		Chats.onChatEdit();
+		messages.onChatMessageEdit();
 
 		socket.on('event:chats.roomRename', function(data) {
 			$('[component="chat/room/name"]').val($('<div/>').html(data.newName).text());
 		});
 	};
 
-	Chats.onChatEdit = function() {
-		socket.on('event:chats.edit', function(data) {
-			data.messages.forEach(function(message) {
-				var self = parseInt(message.fromuid, 10) === parseInt(app.user.uid);
-				message.self = self ? 1 : 0;
-				Chats.parseMessage(message, function(html) {
-				    var body = components.get('chat/message', message.messageId);
-					if (body.length) {
-						body.replaceWith(html);
-						components.get('chat/message', message.messageId).find('.timeago').timeago();
-					}
-				});
-			});
-		});
-	};
-
 	Chats.resizeMainWindow = function() {
 		var	messagesList = $('.expanded-chat .chat-content');
 
 		if (messagesList.length) {
-			var	margin = $('.expanded-chat ul').outerHeight(true) - $('.expanded-chat ul').height(),
-				inputHeight = $('.chat-input').outerHeight(true),
-				fromTop = messagesList.offset().top,
-				searchHeight = $('.chat-search').height(),
-				searchListHeight = $('[component="chat/search/list"]').outerHeight(true) - $('[component="chat/search/list"]').height();
+			var margin = $('.expanded-chat ul').outerHeight(true) - $('.expanded-chat ul').height();
+			var inputHeight = $('.chat-input').outerHeight(true);
+			var fromTop = messagesList.offset().top;
+			var searchHeight = $('.chat-search').height();
+			var searchListHeight = $('[component="chat/search/list"]').outerHeight(true) - $('[component="chat/search/list"]').height();
 
 			messagesList.height($(window).height() - (fromTop + inputHeight + (margin * 4)));
 			components.get('chat/recent').height($('.expanded-chat').height() - (searchHeight + searchListHeight));
@@ -414,57 +349,6 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
 		Chats.setActive();
 	};
 
-	Chats.sendMessage = function(roomId, inputEl) {
-		var msg = inputEl.val();
-		var mid = inputEl.attr('data-mid');
-
-		if (msg.length > ajaxify.data.maximumChatMessageLength) {
-			return app.alertError('[[error:chat-message-too-long]]');
-		}
-
-		if (!msg.length) {
-			return;
-		}
-
-		inputEl.val('');
-		inputEl.removeAttr('data-mid');
-
-		if (!mid) {
-			socket.emit('modules.chats.send', {
-				roomId: roomId,
-				message: msg
-			}, function(err) {
-				if (err) {
-					if (err.message === '[[error:email-not-confirmed-chat]]') {
-						return app.showEmailConfirmWarning(err);
-					}
-					return app.alertError(err.message);
-				}
-
-				sounds.play('chat-outgoing');
-			});
-		} else {
-			socket.emit('modules.chats.edit', {
-				roomId: roomId,
-				mid: mid,
-				message: msg
-			}, function(err) {
-				if (err) {
-					return app.alertError(err.message);
-				}
-
-			});
-		}
-	};
-
-	Chats.scrollToBottom = function(containerEl) {
-		if (containerEl.length) {
-			containerEl.scrollTop(
-				containerEl[0].scrollHeight - containerEl.height()
-			);
-		}
-	};
-
 	Chats.setActive = function() {
 		if (ajaxify.data.roomId) {
 			socket.emit('modules.chats.markRead', ajaxify.data.roomId);
@@ -474,113 +358,6 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
 		$('.chats-list li[data-roomid="' + ajaxify.data.roomId + '"]').addClass('bg-primary');
 	};
 
-	Chats.parseMessage = function(data, callback) {
-		templates.parse('partials/chat_message' + (Array.isArray(data) ? 's' : ''), {
-			messages: data
-		}, function(html) {
-			translator.translate(html, callback);
-		});
-	};
 
-	function loadMoreRecentChats() {
-		var recentChats = $('[component="chat/recent"]');
-		if (recentChats.attr('loading')) {
-			return;
-		}
-		recentChats.attr('loading', 1);
-		socket.emit('modules.chats.getRecentChats', {
-			after: recentChats.attr('data-nextstart')
-		}, function(err, data) {
-			if (err) {
-				return app.alertError(err.message);
-			}
-
-			if (data && data.rooms.length) {
-				onRecentChatsLoaded(data, function() {
-					recentChats.removeAttr('loading');
-					recentChats.attr('data-nextstart', data.nextStart);
-				});
-			} else {
-				recentChats.removeAttr('loading');
-			}
-		});
-	}
-
-	function onRecentChatsLoaded(data, callback) {
-		if (!data.rooms.length) {
-			return callback();
-		}
-
-		app.parseAndTranslate('chats', 'rooms', data, function(html) {
-			$('[component="chat/recent"]').append(html);
-			html.find('.timeago').timeago();
-			callback();
-		});
-	}
-
-	Chats.handleSearch = function() {
-		var timeoutId = 0;
-
-		components.get('chat/search').on('keyup', function() {
-			if (timeoutId) {
-				clearTimeout(timeoutId);
-				timeoutId = 0;
-			}
-
-			timeoutId = setTimeout(doSearch, 250);
-		});
-
-		function doSearch() {
-			var username = components.get('chat/search').val();
-			var chatsListEl = $('[component="chat/search/list"]');
-
-			if (!username) {
-				return chatsListEl.empty();
-			}
-
-			socket.emit('user.search', {
-				query: username,
-				searchBy: 'username'
-			}, function(err, data) {
-				if (err) {
-					return app.alertError(err.message);
-				}
-
-				chatsListEl.empty();
-
-				if (data.users.length === 0) {
-					return chatsListEl.translateHtml('<li><div><span>[[users:no-users-found]]</span></div></li>');
-				}
-
-				data.users.forEach(function(userObj) {
-					function createUserImage() {
-						return (userObj.picture ?
-							'<img src="' +	userObj.picture + '" title="' +	userObj.username +'" />' :
-							'<div class="user-icon" style="background-color: ' + userObj['icon:bgColor'] + '">' + userObj['icon:text'] + '</div>') +
-							'<i class="fa fa-circle status ' + userObj.status + '"></i> ' + userObj.username;
-					}
-
-					var chatEl = $('<li component="chat/search/user" />')
-							.attr('data-uid', userObj.uid)
-							.appendTo(chatsListEl);
-
-					chatEl.append(createUserImage());
-
-					chatEl.on('click', function() {
-						socket.emit('modules.chats.hasPrivateChat', userObj.uid, function(err, roomId) {
-							if (err) {
-								return app.alertError(err.message);
-							}
-							if (roomId) {
-								ajaxify.go('chats/' + roomId);
-							} else {
-								app.newChat(userObj.uid);
-							}
-						});
-					});
-		        });
-			});
-	    }
-	};
 	return Chats;
 });
diff --git a/public/src/client/chats/messages.js b/public/src/client/chats/messages.js
new file mode 100644
index 0000000000..ab444e36a4
--- /dev/null
+++ b/public/src/client/chats/messages.js
@@ -0,0 +1,145 @@
+'use strict';
+
+/* globals define, socket, app, ajaxify, templates, bootbox */
+
+define('forum/chats/messages', ['components', 'sounds', 'translator'], function(components, sounds, translator) {
+
+	var messages = {};
+
+	messages.sendMessage = function(roomId, inputEl) {
+		var msg = inputEl.val();
+		var mid = inputEl.attr('data-mid');
+
+		if (msg.length > ajaxify.data.maximumChatMessageLength) {
+			return app.alertError('[[error:chat-message-too-long]]');
+		}
+
+		if (!msg.length) {
+			return;
+		}
+
+		inputEl.val('');
+		inputEl.removeAttr('data-mid');
+
+		if (!mid) {
+			socket.emit('modules.chats.send', {
+				roomId: roomId,
+				message: msg
+			}, function(err) {
+				if (err) {
+					if (err.message === '[[error:email-not-confirmed-chat]]') {
+						return app.showEmailConfirmWarning(err);
+					}
+					return app.alertError(err.message);
+				}
+
+				sounds.play('chat-outgoing');
+			});
+		} else {
+			socket.emit('modules.chats.edit', {
+				roomId: roomId,
+				mid: mid,
+				message: msg
+			}, function(err) {
+				if (err) {
+					return app.alertError(err.message);
+				}
+			});
+		}
+	};
+
+	messages.appendChatMessage = function(chatContentEl, data) {
+
+		var lastSpeaker = parseInt(chatContentEl.find('.chat-message').last().attr('data-uid'), 10);
+		if (!Array.isArray(data)) {
+			data.newSet = lastSpeaker !== data.fromuid;
+		}
+
+		messages.parseMessage(data, function(html) {
+			onMessagesParsed(chatContentEl, html);
+		});
+	};
+
+	function onMessagesParsed(chatContentEl, html) {
+		var newMessage = $(html);
+
+		newMessage.appendTo(chatContentEl);
+		newMessage.find('.timeago').timeago();
+		newMessage.find('img:not(.not-responsive)').addClass('img-responsive');
+		messages.scrollToBottom(chatContentEl);
+	}
+
+
+	messages.parseMessage = function(data, callback) {
+		templates.parse('partials/chat_message' + (Array.isArray(data) ? 's' : ''), {
+			messages: data
+		}, function(html) {
+			translator.translate(html, callback);
+		});
+	};
+
+
+	messages.scrollToBottom = function(containerEl) {
+		if (containerEl.length) {
+			containerEl.scrollTop(
+				containerEl[0].scrollHeight - containerEl.height()
+			);
+		}
+	};
+
+	messages.prepEdit = function(inputEl, messageId, roomId) {
+		socket.emit('modules.chats.getRaw', { mid: messageId, roomId: roomId }, function(err, raw) {
+			if (err) {
+				return app.alertError(err.message);
+			}
+			// Populate the input field with the raw message content
+			if (inputEl.val().length === 0) {
+				// By setting the `data-mid` attribute, I tell the chat code that I am editing a
+				// message, instead of posting a new one.
+				inputEl.attr('data-mid', messageId).addClass('editing');
+				inputEl.val(raw);
+			}
+		});
+	};
+
+	messages.onChatMessageEdit = function() {
+		socket.on('event:chats.edit', function(data) {
+			data.messages.forEach(function(message) {
+				var self = parseInt(message.fromuid, 10) === parseInt(app.user.uid);
+				message.self = self ? 1 : 0;
+				messages.parseMessage(message, function(html) {
+				    var body = components.get('chat/message', message.messageId);
+					if (body.length) {
+						body.replaceWith(html);
+						components.get('chat/message', message.messageId).find('.timeago').timeago();
+					}
+				});
+			});
+		});
+	};
+
+	messages.delete = function(messageId, roomId) {
+		translator.translate('[[modules:chat.delete_message_confirm]]', function(translated) {
+			bootbox.confirm(translated, function(ok) {
+				if (!ok) {
+					return;
+				}
+
+				socket.emit('modules.chats.delete', {
+					messageId: messageId,
+					roomId: roomId
+				}, function(err) {
+					if (err) {
+						return app.alertError(err.message);
+					}
+
+					components.get('chat/message', messageId).slideUp('slow', function() {
+						$(this).remove();
+					});
+				});
+			});
+		});
+	};
+
+	return messages;
+});
\ No newline at end of file
diff --git a/public/src/client/chats/recent.js b/public/src/client/chats/recent.js
new file mode 100644
index 0000000000..6905841269
--- /dev/null
+++ b/public/src/client/chats/recent.js
@@ -0,0 +1,57 @@
+'use strict';
+
+/* globals define, socket, app */
+
+define('forum/chats/recent', function() {
+
+	var recent = {};
+
+	recent.init = function() {
+		$('[component="chat/recent"]').on('scroll', function() {
+			var $this = $(this);
+			var bottom = ($this[0].scrollHeight - $this.height()) * 0.9;
+			if ($this.scrollTop() > bottom) {
+				loadMoreRecentChats();
+			}
+		});
+	};
+
+	function loadMoreRecentChats() {
+		var recentChats = $('[component="chat/recent"]');
+		if (recentChats.attr('loading')) {
+			return;
+		}
+		recentChats.attr('loading', 1);
+		socket.emit('modules.chats.getRecentChats', {
+			after: recentChats.attr('data-nextstart')
+		}, function(err, data) {
+			if (err) {
+				return app.alertError(err.message);
+			}
+
+			if (data && data.rooms.length) {
+				onRecentChatsLoaded(data, function() {
+					recentChats.removeAttr('loading');
+					recentChats.attr('data-nextstart', data.nextStart);
+				});
+			} else {
+				recentChats.removeAttr('loading');
+			}
+		});
+	}
+
+	function onRecentChatsLoaded(data, callback) {
+		if (!data.rooms.length) {
+			return callback();
+		}
+
+		app.parseAndTranslate('chats', 'rooms', data, function(html) {
+			$('[component="chat/recent"]').append(html);
+			html.find('.timeago').timeago();
+			callback();
+		});
+	}
+
+
+	return recent;
+});
\ No newline at end of file
diff --git a/public/src/client/chats/search.js b/public/src/client/chats/search.js
new file mode 100644
index 0000000000..3645db282f
--- /dev/null
+++ b/public/src/client/chats/search.js
@@ -0,0 +1,87 @@
+'use strict';
+
+/* globals define, socket, app, ajaxify */
+
+define('forum/chats/search', ['components'], function(components) {
+
+	var search = {};
+
+	search.init = function() {
+		var timeoutId = 0;
+
+		components.get('chat/search').on('keyup', function() {
+			if (timeoutId) {
+				clearTimeout(timeoutId);
+				timeoutId = 0;
+			}
+
+			timeoutId = setTimeout(doSearch, 250);
+		});
+	};
+
+	function doSearch() {
+		var username = components.get('chat/search').val();
+		var chatsListEl = $('[component="chat/search/list"]');
+
+		if (!username) {
+			return chatsListEl.empty();
+		}
+
+		socket.emit('user.search', {
+			query: username,
+			searchBy: 'username'
+		}, function(err, data) {
+			if (err) {
+				return app.alertError(err.message);
+			}
+
+			displayResults(chatsListEl, data);
+		});
+	}
+
+	function displayResults(chatsListEl, data) {
+		chatsListEl.empty();
+
+		if (!data.users.length) {
+			return chatsListEl.translateHtml('<li><div><span>[[users:no-users-found]]</span></div></li>');
+		}
+
+		data.users.forEach(function(userObj) {
+			var chatEl = displayUser(chatsListEl, userObj);
+			onUserClick(chatEl, userObj);
+		});
+	}
+
+	function displayUser(chatsListEl, userObj) {
+		function createUserImage() {
+			return (userObj.picture ?
+				'<img src="' +	userObj.picture + '" title="' +	userObj.username +'" />' :
+				'<div class="user-icon" style="background-color: ' + userObj['icon:bgColor'] + '">' + userObj['icon:text'] + '</div>') +
+				'<i class="fa fa-circle status ' + userObj.status + '"></i> ' + userObj.username;
+		}
+
+		var chatEl = $('<li component="chat/search/user" />')
+				.attr('data-uid', userObj.uid)
+				.appendTo(chatsListEl);
+
+		chatEl.append(createUserImage());
+		return chatEl;
+	}
+
+	function onUserClick(chatEl, userObj) {
+		chatEl.on('click', function() {
+			socket.emit('modules.chats.hasPrivateChat', userObj.uid, function(err, roomId) {
+				if (err) {
+					return app.alertError(err.message);
+				}
+				if (roomId) {
+					ajaxify.go('chats/' + roomId);
+				} else {
+					app.newChat(userObj.uid);
+				}
+			});
+		});
+	}
+
+	return search;
+});
\ No newline at end of file
diff --git a/public/src/client/footer.js b/public/src/client/footer.js
index d8e54d4fc3..f1d05d4bfe 100644
--- a/public/src/client/footer.js
+++ b/public/src/client/footer.js
@@ -13,6 +13,12 @@ define('forum/footer', ['notifications', 'chat', 'components', 'translator'], fu
 			.attr('data-content', count > 99 ? '99+' : count);
 	}
 
+	function updateUnreadNewTopicCount(count) {
+		$('#unread-new-count i')
+			.toggleClass('unread-count', count > 0)
+			.attr('data-content', count > 99 ? '99+' : count);
+	}
+
 	function updateUnreadChatCount(count) {
 		components.get('chat/icon')
 			.toggleClass('unread-count', count > 0)
@@ -61,6 +67,7 @@ define('forum/footer', ['notifications', 'chat', 'components', 'translator'], fu
 			}
 
 			updateUnreadTopicCount(data.unreadTopicCount);
+			updateUnreadNewTopicCount(data.unreadNewTopicCount);
 			updateUnreadChatCount(data.unreadChatCount);
 			Notifications.updateNotifCount(data.unreadNotificationCount);
 		});
diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js
index 49f1d221f6..c95120ef77 100644
--- a/public/src/client/groups/details.js
+++ b/public/src/client/groups/details.js
@@ -51,7 +51,7 @@ define('forum/groups/details', [
 		detailsPage.on('click', '[data-action]', function() {
 			var btnEl = $(this),
 				userRow = btnEl.parents('[data-uid]'),
-				ownerFlagEl = userRow.find('.member-name i'),
+				ownerFlagEl = userRow.find('.member-name > i'),
 				isOwner = !ownerFlagEl.hasClass('invisible') ? true : false,
 				uid = userRow.attr('data-uid'),
 				action = btnEl.attr('data-action');
diff --git a/public/src/client/login.js b/public/src/client/login.js
index ecbd607f05..ab8dc0fe8a 100644
--- a/public/src/client/login.js
+++ b/public/src/client/login.js
@@ -31,9 +31,13 @@ define('forum/login', ['csrf', 'translator'], function(csrf, translator) {
 						window.location.href = data + '?loggedin';
 					},
 					error: function(data, status) {
-						errorEl.find('p').translateText(data.responseText);
-						errorEl.show();
-						submitEl.removeClass('disabled');
+						if (data.status === 403 && data.responseText === 'Forbidden') {
+							window.location.href = config.relative_path + '/login?error=csrf-invalid';
+						} else {
+							errorEl.find('p').translateText(data.responseText);
+							errorEl.show();
+							submitEl.removeClass('disabled');
+						}
 					}
 				});
 			}
@@ -45,13 +49,19 @@ define('forum/login', ['csrf', 'translator'], function(csrf, translator) {
 			return false;
 		});
 
-		$('#content #username').focus();
+		if ($('#content #username').attr('readonly')) {
+			$('#content #password').val('').focus();
+		} else {
+			$('#content #username').focus();
+		}
+
 
 		// Add "returnTo" data if present
-		if (app.previousUrl) {
+		if (app.previousUrl && $('#returnTo').length === 0) {
 			var returnToEl = document.createElement('input');
 			returnToEl.type = 'hidden';
 			returnToEl.name = 'returnTo';
+			returnToEl.id = 'returnTo';
 			returnToEl.value = app.previousUrl;
 			$(returnToEl).appendTo(formEl);
 		}
diff --git a/public/src/client/recent.js b/public/src/client/recent.js
index e4223d519a..1f6536327d 100644
--- a/public/src/client/recent.js
+++ b/public/src/client/recent.js
@@ -1,12 +1,12 @@
 'use strict';
 
-/* globals define, app, socket, utils */
+/* globals define, app, socket, utils, ajaxify, config */
 
 define('forum/recent', ['forum/infinitescroll', 'components'], function(infinitescroll, components) {
 	var	Recent = {};
 
-	var newTopicCount = 0,
-		newPostCount = 0;
+	var newTopicCount = 0;
+	var newPostCount = 0;
 
 	$(window).on('action:ajaxify.start', function(ev, data) {
 		if (ajaxify.currentPage !== data.url) {
@@ -23,7 +23,11 @@ define('forum/recent', ['forum/infinitescroll', 'components'], function(infinite
 			$(this).addClass('hide');
 		});
 
-		infinitescroll.init(Recent.loadMoreTopics);
+		if (!config.usePagination) {
+			infinitescroll.init(Recent.loadMoreTopics);
+		}
+
+		$(window).trigger('action:topics.loaded', {topics: ajaxify.data.topics});
 	};
 
 	Recent.watchForNewPosts = function () {
@@ -35,13 +39,53 @@ define('forum/recent', ['forum/infinitescroll', 'components'], function(infinite
 	};
 
 	function onNewTopic(data) {
+		if (ajaxify.data.selectedCategory && parseInt(ajaxify.data.selectedCategory.cid, 10) !== parseInt(data.cid, 10)) {
+			return;
+		}
+
+		if (ajaxify.data.selectedFilter && ajaxify.data.selectedFilter.url === 'unread/watched') {
+			return;
+		}
+
 		++newTopicCount;
 		Recent.updateAlertText();
 	}
 
 	function onNewPost(data) {
-		++newPostCount;
-		Recent.updateAlertText();
+		function showAlert() {
+			++newPostCount;
+			Recent.updateAlertText();
+		}
+
+		var post = data.posts[0];
+		if (!post || !post.topic) {
+			return;
+		}
+		if (parseInt(post.topic.mainPid, 10) === parseInt(post.pid, 10)) {
+			return;
+		}
+
+		if (ajaxify.data.selectedCategory && parseInt(ajaxify.data.selectedCategory.cid, 10) !== parseInt(post.topic.cid, 10)) {
+			return;
+		}
+
+		if (ajaxify.data.selectedFilter && ajaxify.data.selectedFilter.url === 'unread/new') {
+			return;
+		}
+
+		if (ajaxify.data.selectedFilter && ajaxify.data.selectedFilter.url === 'unread/watched') {
+			socket.emit('topics.isFollowed', post.tid, function(err, isFollowed) {
+				if (err) {
+					app.alertError(err.message);
+				}
+				if (isFollowed) {
+					showAlert();
+				}
+			});
+			return;
+		}
+
+		showAlert();
 	}
 
 	Recent.removeListeners = function() {
diff --git a/public/src/client/register.js b/public/src/client/register.js
index da86c0231d..eecb2682bf 100644
--- a/public/src/client/register.js
+++ b/public/src/client/register.js
@@ -13,8 +13,7 @@ define('forum/register', ['csrf', 'translator'], function(csrf, translator) {
 			username = $('#username'),
 			password = $('#password'),
 			password_confirm = $('#password-confirm'),
-			register = $('#register'),
-			agreeTerms = $('#agree-terms');
+			register = $('#register');
 
 		handleLanguageOverride();
 
@@ -99,26 +98,18 @@ define('forum/register', ['csrf', 'translator'], function(csrf, translator) {
 					},
 					error: function(data) {
 						translator.translate(data.responseText, config.defaultLang, function(translated) {
-							errorEl.find('p').text(translated);
-							errorEl.removeClass('hidden');
-							registerBtn.removeClass('disabled');
+							if (data.status === 403 && data.responseText === 'Forbidden') {
+								window.location.href = config.relative_path + '/register?error=csrf-invalid';
+							} else {
+								errorEl.find('p').text(translated);
+								errorEl.removeClass('hidden');
+								registerBtn.removeClass('disabled');
+							}
 						});
 					}
 				});
 			});
 		});
-
-		if (agreeTerms.length) {
-			agreeTerms.on('click', function() {
-				if ($(this).prop('checked')) {
-					register.removeAttr('disabled');
-				} else {
-					register.attr('disabled', 'disabled');
-				}
-			});
-
-			register.attr('disabled', 'disabled');
-		}
 	};
 
 	function validateEmail(email, callback) {
diff --git a/public/src/client/tag.js b/public/src/client/tag.js
index 1758539b61..b475c7406b 100644
--- a/public/src/client/tag.js
+++ b/public/src/client/tag.js
@@ -16,7 +16,9 @@ define('forum/tag', ['forum/recent', 'forum/infinitescroll'], function(recent, i
 			loadMoreTopics();
 		});
 
-		infinitescroll.init(loadMoreTopics);
+		if (!config.usePagination) {
+			infinitescroll.init(loadMoreTopics);
+		}
 
 		function loadMoreTopics(direction) {
 			if(direction < 0 || !$('[component="category"]').length) {
diff --git a/public/src/client/topic.js b/public/src/client/topic.js
index ff0a255261..4c3c4daa81 100644
--- a/public/src/client/topic.js
+++ b/public/src/client/topic.js
@@ -71,7 +71,7 @@ define('forum/topic', [
 
 		handleTopicSearch();
 
-		$(window).trigger('action:topic.loaded');
+		$(window).trigger('action:topic.loaded', ajaxify.data);
 	};
 
 	function handleKeys() {
@@ -143,7 +143,7 @@ define('forum/topic', [
 			if (components.get('post/anchor', postIndex).length) {
 				return navigator.scrollToPostIndex(postIndex, true);
 			}
-		} else if (bookmark && (!config.usePagination || (config.usePagination && ajaxify.data.pagination.currentPage === 1)) && ajaxify.data.postcount > 5) {
+		} else if (bookmark && (!config.usePagination || (config.usePagination && ajaxify.data.pagination.currentPage === 1)) && ajaxify.data.postcount > ajaxify.data.bookmarkThreshold) {
 			navigator.update(0);
 			app.alert({
 				alert_id: 'bookmark',
@@ -242,37 +242,40 @@ define('forum/topic', [
 	Topic.navigatorCallback = function(index, elementCount, threshold) {
 		var path = ajaxify.removeRelativePath(window.location.pathname.slice(1));
 		if (!path.startsWith('topic')) {
-			return 1;
+			return;
 		}
 
-		if (!navigator.scrollActive) {
-			var parts = ajaxify.removeRelativePath(window.location.pathname.slice(1)).split('/');
-			var topicId = parts[1],
-				slug = parts[2];
-			var newUrl = 'topic/' + topicId + '/' + (slug ? slug : '');
-			if (index > 1) {
-				newUrl += '/' + index;
+		if (navigator.scrollActive) {
+			return;
+		}
+
+		posts.loadImages(threshold);
+
+		var newUrl = 'topic/' + ajaxify.data.slug + (index > 1 ? ('/' + index) : '');
+
+		if (newUrl !== currentUrl) {
+
+			if (Topic.replaceURLTimeout) {
+				clearTimeout(Topic.replaceURLTimeout);
 			}
 
-			posts.loadImages(threshold);
+			Topic.replaceURLTimeout = setTimeout(function() {
 
-			if (newUrl !== currentUrl) {
-				if (Topic.replaceURLTimeout) {
-					clearTimeout(Topic.replaceURLTimeout);
+				if (index >= elementCount && app.user.uid) {
+					socket.emit('topics.markAsRead', [ajaxify.data.tid]);
 				}
-				Topic.replaceURLTimeout = setTimeout(function() {
-					updateUserBookmark(index);
 
-					Topic.replaceURLTimeout = 0;
-					if (history.replaceState) {
-						var search = (window.location.search ? window.location.search : '');
-						history.replaceState({
-							url: newUrl + search
-						}, null, window.location.protocol + '//' + window.location.host + RELATIVE_PATH + '/' + newUrl + search);
-					}
-					currentUrl = newUrl;
-				}, 500);
-			}
+				updateUserBookmark(index);
+
+				Topic.replaceURLTimeout = 0;
+				if (history.replaceState) {
+					var search = (window.location.search ? window.location.search : '');
+					history.replaceState({
+						url: newUrl + search
+					}, null, window.location.protocol + '//' + window.location.host + RELATIVE_PATH + '/' + newUrl + search);
+				}
+				currentUrl = newUrl;
+			}, 500);
 		}
 	};
 
@@ -280,7 +283,7 @@ define('forum/topic', [
 		var bookmarkKey = 'topic:' + ajaxify.data.tid + ':bookmark';
 		var currentBookmark = ajaxify.data.bookmark || localStorage.getItem(bookmarkKey);
 
-		if (ajaxify.data.postcount > 5 && (!currentBookmark || parseInt(index, 10) > parseInt(currentBookmark, 10))) {
+		if (ajaxify.data.postcount > ajaxify.data.bookmarkThreshold && (!currentBookmark || parseInt(index, 10) > parseInt(currentBookmark, 10))) {
 			if (app.user.uid) {
 				socket.emit('topics.bookmark', {
 					'tid': ajaxify.data.tid,
diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js
index 07a73809ed..0c6ee5ea06 100644
--- a/public/src/client/topic/events.js
+++ b/public/src/client/topic/events.js
@@ -96,12 +96,14 @@ define('forum/topic/events', [
 		if (!data || !data.post) {
 			return;
 		}
-		var editedPostEl = components.get('post/content', data.post.pid),
-			editorEl = $('[data-pid="' + data.post.pid + '"] [component="post/editor"]'),
-			topicTitle = components.get('topic/title'),
-			breadCrumb = components.get('breadcrumb/current');
+		var editedPostEl = components.get('post/content', data.post.pid);
+		var editorEl = $('[data-pid="' + data.post.pid + '"] [component="post/editor"]');
+		var topicTitle = components.get('topic/title');
+		var navbarTitle = components.get('navbar/title').find('span');
+		var breadCrumb = components.get('breadcrumb/current');
 
 		if (topicTitle.length && data.topic.title && topicTitle.html() !== data.topic.title) {
+			ajaxify.data.title = data.topic.title;
 			var newUrl = 'topic/' + data.topic.slug + (window.location.search ? window.location.search : '');
 			history.replaceState({url: newUrl}, null, window.location.protocol + '//' + window.location.host + config.relative_path + '/' + newUrl);
 
@@ -111,6 +113,9 @@ define('forum/topic/events', [
 			breadCrumb.fadeOut(250, function() {
 				breadCrumb.html(data.topic.title).fadeIn(250);
 			});
+			navbarTitle.fadeOut(250, function() {
+				navbarTitle.html(data.topic.title).fadeIn(250);
+			});
 		}
 
 		editedPostEl.fadeOut(250, function() {
@@ -121,19 +126,19 @@ define('forum/topic/events', [
 			posts.unloadImages(editedPostEl.parent());
 			posts.loadImages();
 			editedPostEl.fadeIn(250);
-			$(window).trigger('action:posts.edited', data);
-		});
 
-		var editData = {
-			editor: data.editor,
-			editedISO: utils.toISOString(data.post.edited)
-		};
+			var editData = {
+				editor: data.editor,
+				editedISO: utils.toISOString(data.post.edited)
+			};
 
-		templates.parse('partials/topic/post-editor', editData, function(html) {
-			translator.translate(html, function(translated) {
-				html = $(translated);
-				editorEl.replaceWith(html);
-				html.find('.timeago').timeago();
+			templates.parse('partials/topic/post-editor', editData, function(html) {
+				translator.translate(html, function(translated) {
+					html = $(translated);
+					editorEl.replaceWith(html);
+					html.find('.timeago').timeago();
+					$(window).trigger('action:posts.edited', data);
+				});
 			});
 		});
 
diff --git a/public/src/client/topic/fork.js b/public/src/client/topic/fork.js
index a55b45220c..50888a9ca3 100644
--- a/public/src/client/topic/fork.js
+++ b/public/src/client/topic/fork.js
@@ -55,7 +55,8 @@ define('forum/topic/fork', ['components', 'postSelect'], function(components, po
 		forkCommit.attr('disabled', true);
 		socket.emit('topics.createTopicFromPosts', {
 			title: forkModal.find('#fork-title').val(),
-			pids: postSelect.pids
+			pids: postSelect.pids,
+			fromTid: ajaxify.data.tid
 		}, function(err, newTopic) {
 			function fadeOutAndRemove(pid) {
 				components.get('post', 'pid', pid).fadeOut(500, function() {
diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js
index d1961a29a6..71df716198 100644
--- a/public/src/client/topic/postTools.js
+++ b/public/src/client/topic/postTools.js
@@ -6,7 +6,11 @@ define('forum/topic/postTools', ['share', 'navigator', 'components', 'translator
 
 	var PostTools = {};
 
+	var staleReplyAnyway = false;
+
 	PostTools.init = function(tid) {
+		staleReplyAnyway = false;
+
 		renderMenu();
 
 		addPostHandlers(tid);
@@ -54,6 +58,8 @@ define('forum/topic/postTools', ['share', 'navigator', 'components', 'translator
 		postEl.find('[component="post/delete"]').toggleClass('hidden', isDeleted);
 		postEl.find('[component="post/restore"]').toggleClass('hidden', !isDeleted);
 		postEl.find('[component="post/purge"]').toggleClass('hidden', !isDeleted);
+
+		postEl.find('.dropdown-menu').html('');
 	};
 
 	PostTools.updatePostCount = function(postCount) {
@@ -168,15 +174,58 @@ define('forum/topic/postTools', ['share', 'navigator', 'components', 'translator
 
 		postContainer.on('click', '[component="post/edit"]', function() {
 			var btn = $(this);
-			$(window).trigger('action:composer.post.edit', {
-				pid: getData(btn, 'data-pid')
-			});
+
+			var timestamp = parseInt(getData(btn, 'data-timestamp'), 10);
+			var postEditDuration = parseInt(ajaxify.data.postEditDuration, 10);
+
+			if (checkDuration(postEditDuration, timestamp, 'post-edit-duration-expired')) {
+				$(window).trigger('action:composer.post.edit', {
+					pid: getData(btn, 'data-pid')
+				});
+			}
 		});
 
 		postContainer.on('click', '[component="post/delete"]', function() {
-			togglePostDelete($(this), tid);
+			var btn = $(this);
+			var timestamp = parseInt(getData(btn, 'data-timestamp'), 10);
+			var postDeleteDuration = parseInt(ajaxify.data.postDeleteDuration, 10);
+			if (checkDuration(postDeleteDuration, timestamp, 'post-delete-duration-expired')) {
+				togglePostDelete($(this), tid);
+			}
 		});
 
+		function checkDuration(duration, postTimestamp, languageKey) {
+			if (!ajaxify.data.privileges.isAdminOrMod && duration && Date.now() - postTimestamp > duration * 1000) {
+				var numDays = Math.floor(duration / 86400);
+				var numHours = Math.floor((duration % 86400) / 3600);
+				var numMinutes = Math.floor(((duration % 86400) % 3600) / 60);
+				var numSeconds = ((duration % 86400) % 3600) % 60;
+				var msg = '[[error:' + languageKey + ', ' + duration + ']]';
+				if (numDays) {
+					if (numHours) {
+						msg = '[[error:' + languageKey + '-days-hours, ' + numDays + ', ' + numHours + ']]';
+					} else {
+						msg = '[[error:' + languageKey + '-days, ' + numDays + ']]';
+					}
+				} else if (numHours) {
+					if (numMinutes) {
+						msg = '[[error:' + languageKey + '-hours-minutes, ' + numHours + ', ' + numMinutes + ']]';
+					} else {
+						msg = '[[error:' + languageKey + '-hours, ' + numHours + ']]';
+					}
+				} else if (numMinutes) {
+					if (numSeconds) {
+						msg = '[[error:' + languageKey + '-minutes-seconds, ' + numMinutes + ', ' + numSeconds + ']]';
+					} else {
+						msg = '[[error:' + languageKey + '-minutes, ' + numMinutes + ']]';
+					}
+				}
+				app.alertError(msg);
+				return false;
+			}
+			return true;
+		}
+
 		postContainer.on('click', '[component="post/restore"]', function() {
 			togglePostDelete($(this), tid);
 		});
@@ -195,81 +244,92 @@ define('forum/topic/postTools', ['share', 'navigator', 'components', 'translator
 	}
 
 	function onReplyClicked(button, tid) {
-		showStaleWarning(function(proceed) {
-			if (!proceed) {
-				var selectionText = '';
-				var selection = window.getSelection ? window.getSelection() : document.selection.createRange();
-				var content = button.parents('[component="post"]').find('[component="post/content"]').get(0);
+		var selectedText = getSelectedText(button);
 
-				if (content && selection.containsNode(content, true)) {
-					var bounds = document.createRange();
-					bounds.selectNodeContents(content);
-					var range = selection.getRangeAt(0).cloneRange();
-					if (range.compareBoundaryPoints(Range.START_TO_START, bounds) < 0) {
-						range.setStart(bounds.startContainer, bounds.startOffset);
-					}
-					if (range.compareBoundaryPoints(Range.END_TO_END, bounds) > 0) {
-						range.setEnd(bounds.endContainer, bounds.endOffset);
-					}
-					bounds.detach();
-					selectionText = range.toString();
-					range.detach();
-				}
+		showStaleWarning(function() {
+			var username = getUserName(button);
+			if (getData(button, 'data-uid') === '0' || !getData(button, 'data-userslug')) {
+				username = '';
+			}
 
-				var username = getUserName(button);
-				if (getData(button, 'data-uid') === '0' || !getData(button, 'data-userslug')) {
-					username = '';
-				}
+			var toPid = button.is('[component="post/reply"]') ? getData(button, 'data-pid') : null;
 
-				var toPid = button.is('[component="post/reply"]') ? getData(button, 'data-pid') : null;
-
-				if (selectionText.length) {
-					$(window).trigger('action:composer.addQuote', {
-						tid: tid,
-						slug: ajaxify.data.slug,
-						index: getData(button, 'data-index'),
-						pid: toPid,
-						topicName: ajaxify.data.titleRaw,
-						username: username,
-						text: selectionText
-					});
-				} else {
-					$(window).trigger('action:composer.post.new', {
-						tid: tid,
-						pid: toPid,
-						topicName: ajaxify.data.titleRaw,
-						text: username ? username + ' ' : ''
-					});
-				}
+			if (selectedText) {
+				$(window).trigger('action:composer.addQuote', {
+					tid: tid,
+					slug: ajaxify.data.slug,
+					index: getData(button, 'data-index'),
+					pid: toPid,
+					topicName: ajaxify.data.titleRaw,
+					username: username,
+					text: selectedText
+				});
+			} else {
+				$(window).trigger('action:composer.post.new', {
+					tid: tid,
+					pid: toPid,
+					topicName: ajaxify.data.titleRaw,
+					text: username ? username + ' ' : ''
+				});
 			}
 		});
 	}
 
 	function onQuoteClicked(button, tid) {
-		showStaleWarning(function(proceed) {
-			if (!proceed) {
-				var username = getUserName(button),
-					pid = getData(button, 'data-pid');
+		var selectedText = getSelectedText(button);
 
-				socket.emit('posts.getRawPost', pid, function(err, post) {
-					if(err) {
-						return app.alertError(err.message);
-					}
+		showStaleWarning(function() {
 
-					$(window).trigger('action:composer.addQuote', {
-						tid: tid,
-						slug: ajaxify.data.slug,
-						index: getData(button, 'data-index'),
-						pid: pid,
-						username: username,
-						topicName: ajaxify.data.titleRaw,
-						text: post
-					});
+			function quote(text) {
+				$(window).trigger('action:composer.addQuote', {
+					tid: tid,
+					slug: ajaxify.data.slug,
+					index: getData(button, 'data-index'),
+					pid: pid,
+					username: username,
+					topicName: ajaxify.data.titleRaw,
+					text: text
 				});
 			}
+
+			var username = getUserName(button);
+			var pid = getData(button, 'data-pid');
+
+			if (selectedText) {
+				return quote(selectedText);
+			}
+			socket.emit('posts.getRawPost', pid, function(err, post) {
+				if (err) {
+					return app.alertError(err.message);
+				}
+
+				quote(post);
+			});
 		});
 	}
 
+	function getSelectedText(button) {
+		var selectionText = '';
+		var selection = window.getSelection ? window.getSelection() : document.selection.createRange();
+		var content = button.parents('[component="post"]').find('[component="post/content"]').get(0);
+
+		if (selection && selection.containsNode && content && selection.containsNode(content, true)) {
+			var bounds = document.createRange();
+			bounds.selectNodeContents(content);
+			var range = selection.getRangeAt(0).cloneRange();
+			if (range.compareBoundaryPoints(Range.START_TO_START, bounds) < 0) {
+				range.setStart(bounds.startContainer, bounds.startOffset);
+			}
+			if (range.compareBoundaryPoints(Range.END_TO_END, bounds) > 0) {
+				range.setEnd(bounds.endContainer, bounds.endOffset);
+			}
+			bounds.detach();
+			selectionText = range.toString();
+			range.detach();
+		}
+		return selectionText;
+	}
+
 	function favouritePost(button, pid) {
 		var method = button.attr('data-favourited') === 'false' ? 'posts.favourite' : 'posts.unfavourite';
 
@@ -354,9 +414,9 @@ define('forum/topic/postTools', ['share', 'navigator', 'components', 'translator
 	}
 
 	function togglePostDelete(button, tid) {
-		var pid = getData(button, 'data-pid'),
-			postEl = components.get('post', 'pid', pid),
-			action = !postEl.hasClass('deleted') ? 'delete' : 'restore';
+		var pid = getData(button, 'data-pid');
+		var postEl = components.get('post', 'pid', pid);
+		var action = !postEl.hasClass('deleted') ? 'delete' : 'restore';
 
 		postAction(action, pid, tid);
 	}
@@ -454,39 +514,40 @@ define('forum/topic/postTools', ['share', 'navigator', 'components', 'translator
 	}
 
 	function showStaleWarning(callback) {
-		if (ajaxify.data.lastposttime < (Date.now() - (1000 * 60 * 60 * 24 * ajaxify.data.topicStaleDays))) {
-			translator.translate('[[topic:stale.warning]]', function(translated) {
-				var warning = bootbox.dialog({
-						title: '[[topic:stale.title]]',
-						message: translated,
-						buttons: {
-							reply: {
-								label: '[[topic:stale.reply_anyway]]',
-								className: 'btn-link',
-								callback: function() {
-									callback(false);
-								}
-							},
-							create: {
-								label: '[[topic:stale.create]]',
-								className: 'btn-primary',
-								callback: function() {
-									translator.translate('[[topic:link_back, ' + ajaxify.data.title + ', ' + config.relative_path + '/topic/' + ajaxify.data.slug + ']]', function(body) {
-										$(window).trigger('action:composer.topic.new', {
-											cid: ajaxify.data.cid,
-											body: body
-										});
+		if (staleReplyAnyway || ajaxify.data.lastposttime >= (Date.now() - (1000 * 60 * 60 * 24 * ajaxify.data.topicStaleDays))) {
+			return callback();
+		}
+
+		translator.translate('[[topic:stale.warning]]', function(translated) {
+			var warning = bootbox.dialog({
+					title: '[[topic:stale.title]]',
+					message: translated,
+					buttons: {
+						reply: {
+							label: '[[topic:stale.reply_anyway]]',
+							className: 'btn-link',
+							callback: function() {
+								staleReplyAnyway = true;
+								callback();
+							}
+						},
+						create: {
+							label: '[[topic:stale.create]]',
+							className: 'btn-primary',
+							callback: function() {
+								translator.translate('[[topic:link_back, ' + ajaxify.data.title + ', ' + config.relative_path + '/topic/' + ajaxify.data.slug + ']]', function(body) {
+									$(window).trigger('action:composer.topic.new', {
+										cid: ajaxify.data.cid,
+										body: body
 									});
-								}
+								});
 							}
 						}
-					});
+					}
+				});
 
-				warning.modal();
-			});
-		} else {
-			callback(false);
-		}
+			warning.modal();
+		});
 	}
 
 	return PostTools;
diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js
index 996dcbc6b9..c656b899a2 100644
--- a/public/src/client/topic/posts.js
+++ b/public/src/client/topic/posts.js
@@ -24,6 +24,7 @@ define('forum/topic/posts', [
 		}
 
 		data.loggedIn = app.user.uid ? true : false;
+		data.privileges = ajaxify.data.privileges;
 		data.posts.forEach(function(post) {
 			post.selfPost = !!app.user.uid && parseInt(post.uid, 10) === parseInt(app.user.uid, 10);
 			post.display_moderator_tools = post.selfPost || ajaxify.data.privileges.isAdminOrMod;
@@ -32,6 +33,7 @@ define('forum/topic/posts', [
 		});
 
 		updatePostCounts(data.posts);
+
 		ajaxify.data.postcount ++;
 		postTools.updatePostCount(ajaxify.data.postcount);
 
@@ -60,15 +62,26 @@ define('forum/topic/posts', [
 		ajaxify.data.pagination.pageCount = Math.max(1, Math.ceil((posts[0].topic.postcount - 1) / config.postsPerPage));
 		var direction = config.topicPostSort === 'oldest_to_newest' || config.topicPostSort === 'most_votes' ? 1 : -1;
 
-		var isPostVisible = (ajaxify.data.pagination.currentPage === ajaxify.data.pagination.pageCount && direction === 1) || (ajaxify.data.pagination.currentPage === 1 && direction === -1);
+		var isPostVisible = (ajaxify.data.pagination.currentPage === ajaxify.data.pagination.pageCount && direction === 1) ||
+							(ajaxify.data.pagination.currentPage === 1 && direction === -1);
 
 		if (isPostVisible) {
 			createNewPosts(data, components.get('post').not('[data-index=0]'), direction, scrollToPost);
 		} else if (ajaxify.data.scrollToMyPost && parseInt(posts[0].uid, 10) === parseInt(app.user.uid, 10)) {
 			pagination.loadPage(ajaxify.data.pagination.pageCount, scrollToPost);
+		} else {
+			updatePagination();
 		}
 	}
 
+	function updatePagination() {
+		$.get(config.relative_path + '/api/topic/pagination/' + ajaxify.data.tid, {page: ajaxify.data.pagination.currentPage}, function(paginationData) {
+			app.parseAndTranslate('partials/paginator', {pagination: paginationData}, function(html) {
+				$('[component="pagination"]').after(html).remove();
+			});
+		});
+	}
+
 	function onNewPostInfiniteScroll(data) {
 		var direction = config.topicPostSort === 'oldest_to_newest' || config.topicPostSort === 'most_votes' ? 1 : -1;
 
@@ -212,9 +225,6 @@ define('forum/topic/posts', [
 			if (data && data.posts && data.posts.length) {
 				createNewPosts(data, replies, direction, done);
 			} else {
-				if (app.user.uid) {
-					socket.emit('topics.markAsRead', [tid]);
-				}
 				navigator.update();
 				done();
 			}
@@ -230,7 +240,6 @@ define('forum/topic/posts', [
 		utils.addCommasToNumbers(posts.find('.formatted-number'));
 		utils.makeNumbersHumanReadable(posts.find('.human-readable-number'));
 		posts.find('.timeago').timeago();
-		Posts.wrapImagesInLinks(posts);
 
 		addBlockquoteEllipses(posts.find('[component="post/content"] > blockquote > blockquote'));
 		hidePostToolsForDeletedPosts(posts);
@@ -239,11 +248,14 @@ define('forum/topic/posts', [
 	Posts.unloadImages = function(posts) {
 		var images = posts.find('[component="post/content"] img:not(.not-responsive)');
 
-		images.each(function() {
-			$(this).attr('data-src', $(this).attr('src'));
-			$(this).attr('data-state', 'unloaded');
-			$(this).attr('src', 'about:blank');
-		});
+		if (config.delayImageLoading) {
+			images.each(function() {
+				$(this).attr('data-src', $(this).attr('src'));
+			}).attr('data-state', 'unloaded').attr('src', 'about:blank');
+		} else {
+			images.attr('data-state', 'loaded');
+			Posts.wrapImagesInLinks(posts);
+		}
 	};
 
 	Posts.loadImages = function(threshold) {
@@ -263,8 +275,11 @@ define('forum/topic/posts', [
 
 			var images = components.get('post/content').find('img[data-state="unloaded"]'),
 				visible = images.filter(function() {
-					return config.delayImageLoading ? utils.isElementInViewport(this) : true;
+					return utils.isElementInViewport(this);
 				}),
+				posts = $.unique(visible.map(function() {
+					return $(this).parents('[component="post"]').get(0);
+				})),
 				scrollTop = $(window).scrollTop(),
 				adjusting = false,
 				adjustQueue = [],
@@ -286,6 +301,9 @@ define('forum/topic/posts', [
 						adjustQueue.pop()();
 					} else {
 						adjusting = false;
+
+						Posts.wrapImagesInLinks(posts);
+						posts.length = 0;
 					}
 				},
 				oldHeight, newHeight;
@@ -304,9 +322,6 @@ define('forum/topic/posts', [
 				});
 
 				image.attr('src', image.attr('data-src'));
-				if (image.parent().attr('href') === 'about:blank') {
-					image.parent().attr('href', image.attr('data-src'));
-				}
 				image.removeAttr('data-src');
 			});
 		}, 250);
@@ -314,18 +329,27 @@ define('forum/topic/posts', [
 
 	Posts.wrapImagesInLinks = function(posts) {
 		posts.find('[component="post/content"] img:not(.emoji)').each(function() {
-			var $this = $(this);
+			var $this = $(this),
+				src = $this.attr('src'),
+				suffixRegex = /-resized(\.[\w]+)?$/;
+
+			if (utils.isRelativeUrl(src) && suffixRegex.test(src)) {
+				src = src.replace(suffixRegex, '$1');
+			}
+
 			if (!$this.parent().is('a')) {
-				$this.wrap('<a href="' + $this.attr('src') + '" target="_blank">');
+				$this.wrap('<a href="' + src + '" target="_blank">');
 			}
 		});
 	};
 
 	Posts.showBottomPostBar = function() {
 		var mainPost = components.get('post', 'index', 0);
+		var placeHolder = $('.post-bar-placeholder');
 		var posts = $('[component="post"]');
-		if (!!mainPost.length && posts.length > 1 && $('.post-bar').length < 2) {
-			$('.post-bar').clone().appendTo(mainPost);
+		if (!!mainPost.length && posts.length > 1 && $('.post-bar').length < 2 && placeHolder.length) {
+			$('.post-bar').clone().insertAfter(placeHolder);
+			placeHolder.remove();
 		} else if (mainPost.length && posts.length < 2) {
 			mainPost.find('.post-bar').remove();
 		}
diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js
index 7b5b9605f7..3110b92a4d 100644
--- a/public/src/client/topic/threadTools.js
+++ b/public/src/client/topic/threadTools.js
@@ -83,12 +83,18 @@ define('forum/topic/threadTools', [
 		deletePosts.init();
 		fork.init();
 
-		components.get('topic').on('click', '[component="topic/follow"], [component="topic/unfollow"]', follow);
-		components.get('topic/follow').off('click').on('click', follow);
-		components.get('topic/unfollow').off('click').on('click', follow);
+		$('.topic').on('click', '[component="topic/following"]', function() {
+			changeWatching('follow');
+		});
+		$('.topic').on('click', '[component="topic/not-following"]', function() {
+			changeWatching('unfollow');
+		});
+		$('.topic').on('click', '[component="topic/ignoring"]', function() {
+			changeWatching('ignore');
+		});
 
-		function follow() {
-			socket.emit('topics.toggleFollow', tid, function(err, state) {
+		function changeWatching(type) {
+			socket.emit('topics.changeWatching', {tid: tid, type: type}, function(err) {
 				if (err) {
 					return app.alert({
 						type: 'danger',
@@ -98,15 +104,24 @@ define('forum/topic/threadTools', [
 						timeout: 5000
 					});
 				}
-
-				setFollowState(state);
+				var message = '';
+				if (type === 'follow') {
+					message = '[[topic:following_topic.message]]';
+				} else if (type === 'unfollow') {
+					message = '[[topic:not_following_topic.message]]';
+				} else if (type === 'ignore') {
+					message = '[[topic:ignoring_topic.message]]';
+				}
+				setFollowState(type);
 
 				app.alert({
 					alert_id: 'follow_thread',
-					message: state ? '[[topic:following_topic.message]]' : '[[topic:not_following_topic.message]]',
+					message: message,
 					type: 'success',
 					timeout: 5000
 				});
+
+				$(window).trigger('action:topics.changeWatching', {tid: tid, type: type});
 			});
 
 			return false;
@@ -162,7 +177,7 @@ define('forum/topic/threadTools', [
 
 		components.get('topic/lock').toggleClass('hidden', data.isLocked);
 		components.get('topic/unlock').toggleClass('hidden', !data.isLocked);
-		components.get('topic/reply').toggleClass('hidden', isLocked);
+		components.get('topic/reply/container').toggleClass('hidden', isLocked);
 		components.get('topic/reply/locked').toggleClass('hidden', !isLocked);
 
 		threadEl.find('[component="post/reply"], [component="post/quote"], [component="post/edit"], [component="post/delete"]').toggleClass('hidden', isLocked);
@@ -195,8 +210,17 @@ define('forum/topic/threadTools', [
 	};
 
 	function setFollowState(state) {
-		components.get('topic/follow').toggleClass('hidden', state);
-		components.get('topic/unfollow').toggleClass('hidden', !state);
+		var menu = components.get('topic/following/menu');
+		menu.toggleClass('hidden', state !== 'follow');
+		components.get('topic/following/check').toggleClass('fa-check', state === 'follow');
+
+		menu = components.get('topic/not-following/menu');
+		menu.toggleClass('hidden', state !== 'unfollow');
+		components.get('topic/not-following/check').toggleClass('fa-check', state === 'unfollow');
+
+		menu = components.get('topic/ignoring/menu');
+		menu.toggleClass('hidden', state !== 'ignore' );
+		components.get('topic/ignoring/check').toggleClass('fa-check', state === 'ignore');
 	}
 
 
diff --git a/public/src/client/unread.js b/public/src/client/unread.js
index 47b96e54ad..4984d398b0 100644
--- a/public/src/client/unread.js
+++ b/public/src/client/unread.js
@@ -20,6 +20,8 @@ define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll', '
 
 		recent.watchForNewPosts();
 
+		$(window).trigger('action:topics.loaded', {topics: ajaxify.data.topics});
+
 		$('#markSelectedRead').on('click', function() {
 			var tids = topicSelect.getSelectedTids();
 			if(!tids.length) {
@@ -43,6 +45,7 @@ define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll', '
 				app.alertSuccess('[[unread:topics_marked_as_read.success]]');
 
 				$('[component="category"]').empty();
+				$('[component="pagination"]').addClass('hidden');
 				$('#category-no-topics').removeClass('hidden');
 				$('.markread').addClass('hidden');
 			});
@@ -78,7 +81,9 @@ define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll', '
 			loadMoreTopics();
 		});
 
-		infinitescroll.init(loadMoreTopics);
+		if (!config.usePagination) {
+			infinitescroll.init(loadMoreTopics);
+		}
 
 		function loadMoreTopics(direction) {
 			if(direction < 0 || !$('[component="category"]').length) {
@@ -88,7 +93,8 @@ define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll', '
 			var cid = params.cid;
 			infinitescroll.loadMore('topics.loadMoreUnreadTopics', {
 				after: $('[component="category"]').attr('data-nextstart'),
-				cid: cid
+				cid: cid,
+				filter: ajaxify.data.selectedFilter.filter
 			}, function(data, done) {
 				if (data.topics && data.topics.length) {
 					recent.onTopicsLoaded('unread', data.topics, true, done);
diff --git a/public/src/client/users.js b/public/src/client/users.js
index 4091390068..fe083a13e2 100644
--- a/public/src/client/users.js
+++ b/public/src/client/users.js
@@ -67,6 +67,7 @@ define('forum/users', ['translator'], function(translator) {
 				translated = $(translated);
 				$('#users-container').append(translated);
 				translated.find('span.timeago').timeago();
+				utils.addCommasToNumbers(translated.find('.formatted-number'));
 				$('#users-container .anon-user').appendTo($('#users-container'));
 			});
 		});
@@ -101,14 +102,15 @@ define('forum/users', ['translator'], function(translator) {
 		if (!username) {
 			return loadPage(page);
 		}
-
+		var activeSection = getActiveSection();
 		socket.emit('user.search', {
 			query: username,
 			page: page,
 			searchBy: 'username',
 			sortBy: $('.search select').val() || getSortBy(),
-			onlineOnly: $('.search .online-only').is(':checked') || (getActiveSection() === 'online'),
-			bannedOnly: getActiveSection() === 'banned'
+			onlineOnly: $('.search .online-only').is(':checked') || (activeSection === 'online'),
+			bannedOnly:  activeSection === 'banned',
+			flaggedOnly: activeSection === 'flagged'
 		}, function(err, data) {
 			if (err) {
 				return app.alertError(err.message);
@@ -167,8 +169,8 @@ define('forum/users', ['translator'], function(translator) {
 	}
 
 	function getActiveSection() {
-		var url = window.location.href,
-			parts = url.split('/');
+		var url = window.location.href;
+		var parts = url.split('/');
 		return parts[parts.length - 1];
 	}
 
diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index e860a0ff20..f2ff94bd55 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -1,7 +1,15 @@
 "use strict";
 /* globals app, define, socket, templates, utils, ajaxify */
 
-define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'translator'], function(components, taskbar, S, sounds, Chats, translator) {
+define('chat', [
+	'components',
+	'taskbar',
+	'string',
+	'sounds',
+	'forum/chats',
+	'forum/chats/messages',
+	'translator'
+], function(components, taskbar, S, sounds, Chats, ChatsMessages, translator) {
 
 	var module = {};
 	var newMessage = false;
@@ -35,11 +43,11 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra
 			if (module.modalExists(data.roomId)) {
 				var modal = module.getModal(data.roomId);
 
-				Chats.appendChatMessage(modal.find('.chat-content'), data.message);
+				ChatsMessages.appendChatMessage(modal.find('.chat-content'), data.message);
 
 				if (modal.is(':visible')) {
 					taskbar.updateActive(modal.attr('UUID'));
-					Chats.scrollToBottom(modal.find('.chat-content'));
+					ChatsMessages.scrollToBottom(modal.find('.chat-content'));
 				} else {
 					module.toggleNew(modal.attr('UUID'), true, true);
 				}
@@ -83,7 +91,7 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra
 			module.getModal(data.roomId).find('[component="chat/room/name"]').val($('<div/>').html(data.newName).text());
 		});
 
-		Chats.onChatEdit();
+		ChatsMessages.onChatMessageEdit();
 	};
 
 	module.loadChatsDropdown = function(chatsListEl) {
@@ -92,7 +100,9 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra
 				return app.alertError(err.message);
 			}
 
-			var rooms = data.rooms;
+			var rooms = data.rooms.filter(function(room) {
+			    return room.teaser;
+			});
 
 			chatsListEl.empty();
 
@@ -194,6 +204,7 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra
 
 				app.loadJQueryUI(function() {
 					chatModal.find('.modal-content').resizable({
+						handles: 'n, e, s, w, se',
 						minHeight: 250,
 						minWidth: 400
 					});
@@ -256,16 +267,7 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra
 					}
 				});
 
-				chatModal.find('[component="chat/messages"]')
-					.on('click', '[data-action="edit"]', function() {
-						var messageId = $(this).parents('[data-mid]').attr('data-mid');
-						var inputEl = chatModal.find('[component="chat/input"]');
-						Chats.prepEdit(inputEl, messageId, data.roomId);
-					})
-					.on('click', '[data-action="delete"]', function() {
-						var messageId = $(this).parents('[data-mid]').attr('data-mid');
-						Chats.delete(messageId, data.roomId);
-					});
+				Chats.addEditDeleteHandler(chatModal.find('[component="chat/messages"]'), data.roomId);
 
 				chatModal.find('[component="chat/controlsToggle"]').on('click', function() {
 					var messagesEl = chatModal.find('[component="chat/messages"]');
@@ -306,7 +308,7 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra
 		chatModal.find('#chat-message-input').focus();
 	};
 
-	module.close = function(chatModal, silent) {
+	module.close = function(chatModal) {
 		clearInterval(chatModal.attr('intervalId'));
 		chatModal.attr('intervalId', 0);
 		chatModal.remove();
@@ -338,7 +340,7 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra
 		chatModal.removeClass('hide');
 		checkStatus(chatModal);
 		taskbar.updateActive(uuid);
-		Chats.scrollToBottom(chatModal.find('.chat-content'));
+		ChatsMessages.scrollToBottom(chatModal.find('.chat-content'));
 		module.bringModalToTop(chatModal);
 		module.focusInput(chatModal);
 		socket.emit('modules.chats.markRead', chatModal.attr('roomId'));
@@ -365,11 +367,11 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra
 	};
 
 	module.calculateChatListHeight = function(modalEl) {
-		var totalHeight = modalEl.find('.modal-content').outerHeight() - modalEl.find('.modal-header').outerHeight(),
-			padding = parseInt(modalEl.find('.modal-body').css('padding-top'), 10) + parseInt(modalEl.find('.modal-body').css('padding-bottom'), 10),
-			contentMargin = parseInt(modalEl.find('.chat-content').css('margin-top'), 10) + parseInt(modalEl.find('.chat-content').css('margin-bottom'), 10),
-			sinceHeight = modalEl.find('.since-bar').outerHeight(true),
-			inputGroupHeight = modalEl.find('.input-group').outerHeight();
+		var totalHeight = modalEl.find('.modal-content').outerHeight() - modalEl.find('.modal-header').outerHeight();
+		var padding = parseInt(modalEl.find('.modal-body').css('padding-top'), 10) + parseInt(modalEl.find('.modal-body').css('padding-bottom'), 10);
+		var contentMargin = parseInt(modalEl.find('.chat-content').css('margin-top'), 10) + parseInt(modalEl.find('.chat-content').css('margin-bottom'), 10);
+		var sinceHeight = modalEl.find('.since-bar').outerHeight(true);
+		var inputGroupHeight = modalEl.find('.input-group').outerHeight();
 
 		return totalHeight - padding - contentMargin - inputGroupHeight;
 	};
diff --git a/public/src/modules/components.js b/public/src/modules/components.js
index f4de069e01..29d1ba64a9 100644
--- a/public/src/modules/components.js
+++ b/public/src/modules/components.js
@@ -3,6 +3,13 @@ define('components', function() {
 	var components = {};
 
 	components.core = {
+		'topic/teaser': function(tid) {
+			if (tid) {
+				return $('[component="category/topic"][data-tid="' + tid + '"] [component="topic/teaser"]');
+			} else {
+				return $('[component="topic/teaser"]');
+			}
+		},
 		'post': function(name, value) {
 			return $('[component="post"][data-' + name + '="' + value + '"]');
 		},
diff --git a/public/src/modules/iconSelect.js b/public/src/modules/iconSelect.js
index 53a5780b5a..b1f8a30112 100644
--- a/public/src/modules/iconSelect.js
+++ b/public/src/modules/iconSelect.js
@@ -20,6 +20,7 @@ define('iconSelect', function() {
 			var picker = bootbox.dialog({
 					onEscape: true,
 					backdrop: true,
+					show: false,
 					message: html,
 					title: 'Select an Icon',
 					buttons: {
@@ -41,9 +42,11 @@ define('iconSelect', function() {
 								var iconClass = $('.bootbox .selected').attr('class');
 								var categoryIconClass = $('<div/>').addClass(iconClass).removeClass('fa').removeClass('selected').attr('class');
 
-								el.attr('class', 'fa ' + (doubleSize ? 'fa-2x ' : '') + categoryIconClass);
-								el.val(categoryIconClass);
-								el.attr('value', categoryIconClass);
+								if (categoryIconClass) {
+									el.attr('class', 'fa ' + (doubleSize ? 'fa-2x ' : '') + categoryIconClass);
+									el.val(categoryIconClass);
+									el.attr('value', categoryIconClass);
+								}
 
 								onModified(el);
 							}
@@ -51,19 +54,41 @@ define('iconSelect', function() {
 					}
 				});
 
+			picker.on('show.bs.modal', function() {
+				var modalEl = $(this),
+					searchEl = modalEl.find('input');
+
+				if (selected) {
+					modalEl.find('.' + selected).addClass('selected');
+					searchEl.val(selected.replace('fa-', ''));
+				}
+			}).modal('show');
+
 			picker.on('shown.bs.modal', function() {
 				var modalEl = $(this),
 					searchEl = modalEl.find('input'),
 					icons = modalEl.find('.fa-icons i'),
 					submitEl = modalEl.find('button.btn-primary');
 
+				function changeSelection(newSelection) {
+					modalEl.find('i.selected').removeClass('selected');
+					if (newSelection) {
+						newSelection.addClass('selected');
+					} else if (searchEl.val().length === 0) {
+						if (selected) {
+							modalEl.find('.' + selected).addClass('selected');
+						}
+					} else {
+						modalEl.find('i:visible').first().addClass('selected');
+					}
+				}
+
 				// Focus on the input box
-				searchEl.focus();
+				searchEl.selectRange(0, searchEl.val().length);
 
 				modalEl.find('.icon-container').on('click', 'i', function() {
-					searchEl.val($(this).attr('class').replace('fa fa-', ''));
-					modalEl.find('.icon-container i').removeClass('selected');
-					$(this).addClass('selected');
+					searchEl.val($(this).attr('class').replace('fa fa-', '').replace('selected', ''));
+					changeSelection($(this));
 				});
 
 				searchEl.on('keyup', function(e) {
@@ -75,9 +100,8 @@ define('iconSelect', function() {
 								$(el).hide();
 							}
 						});
+						changeSelection();
 					} else {
-						// Pick first match
-						$('.icon-container i:visible').first().addClass('selected');
 						submitEl.click();
 					}
 				});
diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js
index 0d1747598c..0fb1a7f368 100644
--- a/public/src/modules/navigator.js
+++ b/public/src/modules/navigator.js
@@ -17,8 +17,15 @@ define('navigator', ['forum/pagination', 'components'], function(pagination, com
 		navigator.callback = callback;
 		toTop = toTop || function() {};
 		toBottom = toBottom || function() {};
+		var navigatorUpdateTimeoutId = 0;
 
-		$(window).off('scroll', navigator.update).on('scroll', navigator.update);
+		$(window).off('scroll', navigator.update).on('scroll', function() {
+			if (navigatorUpdateTimeoutId) {
+				clearTimeout(navigatorUpdateTimeoutId);
+				navigatorUpdateTimeoutId = 0;
+			}
+			navigatorUpdateTimeoutId = setTimeout(navigator.update, 100);
+		});
 
 		$('.pagination-block .dropdown-menu').off('click').on('click', function(e) {
 			e.stopPropagation();
diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.js
index 35f1e677dd..533199c31c 100644
--- a/public/src/modules/notifications.js
+++ b/public/src/modules/notifications.js
@@ -84,14 +84,11 @@ define('notifications', ['sounds', 'translator', 'components'], function(sound,
 				payload.message = notifData.bodyShort;
 				payload.type = 'info';
 				payload.clickfn = function() {
-					socket.emit('notifications.generatePath', notifData.nid, function(err, path) {
-						if (err) {
-							return app.alertError(err.message);
-						}
-						if (path) {
-							ajaxify.go(path);
-						}
-					});
+					if (notifData.path.startsWith('http') && notifData.path.startsWith('https')) {
+						window.location.href = notifData.path;
+					} else {
+						window.location.href = window.location.protocol + '//' + window.location.host + config.relative_path + notifData.path;
+					}
 				};
 			} else {
 				payload.message = '[[notifications:you_have_unread_notifications]]';
@@ -104,13 +101,15 @@ define('notifications', ['sounds', 'translator', 'components'], function(sound,
 			if (ajaxify.currentPage === 'notifications') {
 				ajaxify.refresh();
 			}
-			
-			if (!unreadNotifs[notifData.nid]) {
-				incrementNotifCount(1);
 
+			socket.emit('notifications.getCount', function(err, count) {
+				Notifications.updateNotifCount(count);
+			});
+
+			if (!unreadNotifs[notifData.nid]) {
 				sound.play('notification');
-				unreadNotifs[notifData.nid] = true;	
-			}			
+				unreadNotifs[notifData.nid] = true;
+			}
 		});
 
 		socket.on('event:notifications.updateCount', function(count) {
diff --git a/public/src/modules/settings/checkbox.js b/public/src/modules/settings/checkbox.js
index d091d0226d..865e89c0f3 100644
--- a/public/src/modules/settings/checkbox.js
+++ b/public/src/modules/settings/checkbox.js
@@ -15,6 +15,7 @@ define('settings/checkbox', function () {
 		},
 		set: function (element, value) {
 			element.prop('checked', value);
+			element.closest('.mdl-switch').toggleClass('is-checked', element.is(':checked'));
 		},
 		get: function (element, trim, empty) {
 			var value = element.prop('checked');
diff --git a/public/src/modules/share.js b/public/src/modules/share.js
index c0648009f0..6fe2f5f8bf 100644
--- a/public/src/modules/share.js
+++ b/public/src/modules/share.js
@@ -51,9 +51,8 @@ define('share', function() {
 	}
 
 	function getPostUrl(clickedElement) {
-		var parts = window.location.pathname.split('/');
-		var postIndex = parseInt(clickedElement.parents('[data-index]').attr('data-index'), 10);
-		return '/' + parts[1] + '/' + parts[2] + (parts[3] ? '/' + parts[3] : '') + (postIndex ? '/' + (postIndex + 1) : '');
+		var pid = parseInt(clickedElement.parents('[data-pid]').attr('data-pid'), 10);
+		return '/post' + (pid ? '/' + (pid) : '');
 	}
 
 	return module;
diff --git a/public/src/modules/sounds.js b/public/src/modules/sounds.js
index 4a6bb80f51..052e804f6e 100644
--- a/public/src/modules/sounds.js
+++ b/public/src/modules/sounds.js
@@ -8,18 +8,14 @@ define('sounds', ['buzz'], function(buzz) {
 	var eventSoundMapping;
 	var files;
 
-	socket.on('event:sounds.reloadMapping', loadMapping);
-
-	function loadMapping(callback) {
-		callback = callback || function() {};
+	socket.on('event:sounds.reloadMapping', function() {
 		socket.emit('modules.sounds.getMapping', function(err, mapping) {
 			if (err) {
 				return app.alertError('[sounds] Could not load sound mapping!');
 			}
 			eventSoundMapping = mapping;
-			callback();
 		});
-	}
+	});
 
 	function loadData(callback) {
 		socket.emit('modules.sounds.getData', function(err, data) {
diff --git a/public/src/modules/translator.js b/public/src/modules/translator.js
index b208a0af48..ad18721605 100644
--- a/public/src/modules/translator.js
+++ b/public/src/modules/translator.js
@@ -30,7 +30,6 @@
 		languages[language].loading = languages[language].loading || {};
 
 		if (languages[language].loaded[filename]) {
-			var existing = languages[language].loaded[filename];
 			for (var t in translations) {
 				if (translations.hasOwnProperty(t)) {
 					languages[language].loaded[filename][t] = translations[t];
@@ -72,10 +71,6 @@
 				languageCode = 'en';
 				break;
 
-			case 'cs':
-				languageCode = 'cz';
-				break;
-
 			case 'fa_IR':
 				languageCode = 'fa';
 				break;
@@ -109,17 +104,6 @@
 			$.getScript(RELATIVE_PATH + '/vendor/jquery/timeago/locales/jquery.timeago.' + languageCode + '-short.js').success(function() {
 				// Switch back to long-form
 				translator.toggleTimeagoShorthand();
-			}).fail(function() {
-				$.getScript(RELATIVE_PATH + '/vendor/jquery/timeago/locales/jquery.timeago.en-short.js').success(function() {
-					// Switch back to long-form
-					translator.toggleTimeagoShorthand();
-				});
-			});
-		}).fail(function() {
-			$.getScript(RELATIVE_PATH + '/vendor/jquery/timeago/locales/jquery.timeago.en-short.js').success(function() {
-				// Switch back to long-form
-				translator.toggleTimeagoShorthand();
-				$.getScript(RELATIVE_PATH + '/vendor/jquery/timeago/locales/jquery.timeago.en.js');
 			});
 		});
 
@@ -319,7 +303,7 @@
 					data = {};
 				}
 				callback(data);
-			}
+			};
 
 			if (err) {
 				if (err.code === 'ENOENT' && plugins.customLanguageFallbacks.hasOwnProperty(filename)) {
@@ -332,7 +316,7 @@
 						}
 
 						onData(data);
-					})
+					});
 				} else {
 					winston.error('[translator] Could not load `' + filename + '`: ' + err.message + '. Skipping...');
 					return callback({});
@@ -357,7 +341,7 @@
 				}
 				_translator.translate.apply(_translator, arguments);
 			}
-		}
+		};
 	}
 })(
 	typeof exports === 'object' ? exports :
diff --git a/public/src/modules/uploader.js b/public/src/modules/uploader.js
index 6a0d7f161a..c54c12c912 100644
--- a/public/src/modules/uploader.js
+++ b/public/src/modules/uploader.js
@@ -23,7 +23,7 @@ define('uploader', ['csrf', 'translator'], function(csrf, translator) {
 			title: data.title || '[[global:upload_file]]',
 			description: data.description || '',
 			button: data.button || '[[global:upload]]',
-			accept: data.accept ? data.accept.replace(/,/g, '&#44;') : ''
+			accept: data.accept ? data.accept.replace(/,/g, '&#44; ') : ''
 		}, function(uploadModal) {
 			uploadModal = $(uploadModal);
 
@@ -37,6 +37,7 @@ define('uploader', ['csrf', 'translator'], function(csrf, translator) {
 			uploadForm.find('#params').val(JSON.stringify(data.params));
 
 			uploadModal.find('#fileUploadSubmitBtn').on('click', function() {
+				$(this).addClass('disabled');
 				uploadForm.submit();
 			});
 
@@ -54,6 +55,9 @@ define('uploader', ['csrf', 'translator'], function(csrf, translator) {
 	function onSubmit(uploadModal, fileSize, callback) {
 		function showAlert(type, message) {
 			module.hideAlerts(uploadModal);
+			if (type === 'error') {
+				uploadModal.find('#fileUploadSubmitBtn').removeClass('disabled');
+			}
 			uploadModal.find('#alert-' + type).translateText(message).removeClass('hide');
 		}
 
diff --git a/public/src/utils.js b/public/src/utils.js
index 78e0013c25..a1ce6959a4 100644
--- a/public/src/utils.js
+++ b/public/src/utils.js
@@ -177,7 +177,7 @@
 		},
 
 		fileMimeType: function (path) {
-			utils.extensionToMimeType(utils.fileExtension(path));
+			return utils.extensionToMimeType(utils.fileExtension(path));
 		},
 
 		extensionToMimeType: function(extension) {
diff --git a/public/src/widgets.js b/public/src/widgets.js
index 2a8b052bba..ffa539c6ff 100644
--- a/public/src/widgets.js
+++ b/public/src/widgets.js
@@ -40,7 +40,8 @@
 			$.get(RELATIVE_PATH + '/api/widgets/render' + (config['cache-buster'] ? '?v=' + config['cache-buster'] : ''), {
 				locations: locations,
 				template: template + '.tpl',
-				url: url
+				url: url,
+				isMobile: utils.isMobile()
 			}, function(renderedAreas) {
 				for (var x=0; x<renderedAreas.length; ++x) {
 					var renderedWidgets = renderedAreas[x].widgets,
diff --git a/public/vendor/jquery/textcomplete/jquery.textcomplete.js b/public/vendor/jquery/textcomplete/jquery.textcomplete.js
index ad1d508450..e42ac31bbf 100644
--- a/public/vendor/jquery/textcomplete/jquery.textcomplete.js
+++ b/public/vendor/jquery/textcomplete/jquery.textcomplete.js
@@ -17,7 +17,7 @@
  * Repository: https://github.com/yuku-t/jquery-textcomplete
  * License:    MIT (https://github.com/yuku-t/jquery-textcomplete/blob/master/LICENSE)
  * Author:     Yuku Takahashi
- * Version:	   1.3.1
+ * Version:    1.3.4
  */
 
 if (typeof jQuery === 'undefined') {
@@ -796,8 +796,14 @@ if (typeof jQuery === 'undefined') {
       // (which makes our elements wrap onto the next line and corrupt the next item), if we're close to the right
       // edge, move left. We don't know how far to move left, so just keep nudging a bit.
       var tolerance = 30; // pixels. Make wider than vertical scrollbar because we might not be able to use that space.
-      while (this.$el.offset().left + this.$el.width() > $window.width() - tolerance) {
-        this.$el.offset({left: this.$el.offset().left - tolerance});
+      var lastOffset = this.$el.offset().left, offset;
+      var width = this.$el.width();
+      var maxLeft = $window.width() - tolerance;
+      while (lastOffset + width > maxLeft) {
+        this.$el.offset({left: lastOffset - tolerance});
+        offset = this.$el.offset().left;
+        if (offset >= lastOffset) { break; }
+        lastOffset = offset;
       }
     },
 
@@ -1056,9 +1062,28 @@ if (typeof jQuery === 'undefined') {
     _getCaretRelativePosition: function () {
       var p = $.fn.textcomplete.getCaretCoordinates(this.el, this.el.selectionStart);
       return {
-        top: p.top + parseInt(this.$el.css('line-height'), 10) - this.$el.scrollTop(),
+        top: p.top + this._calculateLineHeight() - this.$el.scrollTop(),
         left: p.left - this.$el.scrollLeft()
       };
+    },
+
+    _calculateLineHeight: function () {
+      var lineHeight = parseInt(this.$el.css('line-height'), 10);
+      if (isNaN(lineHeight)) {
+        // http://stackoverflow.com/a/4515470/1297336
+        var parentNode = this.el.parentNode;
+        var temp = document.createElement(this.el.nodeName);
+        var style = this.el.style;
+        temp.setAttribute(
+          'style',
+          'margin:0px;padding:0px;font-family:' + style.fontFamily + ';font-size:' + style.fontSize
+        );
+        temp.innerHTML = 'test';
+        parentNode.appendChild(temp);
+        lineHeight = temp.clientHeight;
+        parentNode.removeChild(temp);
+      }
+      return lineHeight;
     }
   });
 
@@ -1248,7 +1273,7 @@ if (typeof jQuery === 'undefined') {
 //
 // https://github.com/component/textarea-caret-position
 
-(function () {
+(function ($) {
 
 // The properties that we copy into a mirrored div.
 // Note that some browsers, such as Firefox,
@@ -1369,13 +1394,9 @@ function getCaretCoordinates(element, position, options) {
   return coordinates;
 }
 
-if (typeof module != 'undefined' && typeof module.exports != 'undefined') {
-  module.exports = getCaretCoordinates;
-} else if(isBrowser){
-  window.$.fn.textcomplete.getCaretCoordinates = getCaretCoordinates;
-}
+$.fn.textcomplete.getCaretCoordinates = getCaretCoordinates;
 
-}());
+}(jQuery));
 
 return jQuery;
-}));
\ No newline at end of file
+}));
diff --git a/public/vendor/jquery/timeago/locales/jquery.timeago.az-short.js b/public/vendor/jquery/timeago/locales/jquery.timeago.az-short.js
new file mode 100644
index 0000000000..a430a45768
--- /dev/null
+++ b/public/vendor/jquery/timeago/locales/jquery.timeago.az-short.js
@@ -0,0 +1,20 @@
+// Azerbaijani shortened
+jQuery.timeago.settings.strings = {
+  prefixAgo: null,
+  prefixFromNow: null,
+  suffixAgo: "",
+  suffixFromNow: "",
+  seconds: '1 dəq',
+  minute: '1 dəq',
+  minutes: '%d dəq',
+  hour: '1 saat',
+  hours: '%d saat',
+  day: '1 gün',
+  days: '%d gün',
+  month: '1 ay',
+  months: '%d ay',
+  year: '1 il',
+  years: '%d il',
+  wordSeparator: '',
+  numbers: []
+};
diff --git a/public/vendor/jquery/timeago/locales/jquery.timeago.az.js b/public/vendor/jquery/timeago/locales/jquery.timeago.az.js
new file mode 100644
index 0000000000..1e04a23a83
--- /dev/null
+++ b/public/vendor/jquery/timeago/locales/jquery.timeago.az.js
@@ -0,0 +1,20 @@
+// Azerbaijani
+jQuery.timeago.settings.strings = {
+  prefixAgo: null,
+  prefixFromNow: null,
+  suffixAgo: 'əvvəl',
+  suffixFromNow: 'sonra',
+  seconds: 'saniyələr',
+  minute: '1 dəqiqə',
+  minutes: '%d dəqiqə',
+  hour: '1 saat',
+  hours: '%d saat',
+  day: '1 gün',
+  days: '%d gün',
+  month: '1 ay',
+  months: '%d ay',
+  year: '1 il',
+  years: '%d il',
+  wordSeparator: '',
+  numbers: []
+};
diff --git a/public/vendor/jquery/timeago/locales/jquery.timeago.de-short.js b/public/vendor/jquery/timeago/locales/jquery.timeago.de-short.js
index 10f158de08..09427ec976 100644
--- a/public/vendor/jquery/timeago/locales/jquery.timeago.de-short.js
+++ b/public/vendor/jquery/timeago/locales/jquery.timeago.de-short.js
@@ -4,17 +4,17 @@ jQuery.timeago.settings.strings = {
   prefixFromNow: null,
   suffixAgo: "",
   suffixFromNow: "",
-  seconds: "sec",
-  minute: "1min",
-  minutes: "%dmin",
+  seconds: "s",
+  minute: "1m",
+  minutes: "%dm",
   hour: "1h",
   hours: "%dh",
-  day: "1d",
-  days: "%dd",
-  month: "1Mon",
-  months: "%dMon",
-  year: "1Jhr",
-  years: "%dJhr",
+  day: "1T.",
+  days: "%dT.",
+  month: "1Mt.",
+  months: "%dMt.",
+  year: "1J.",
+  years: "%dJ.",
   wordSeparator: " ",
   numbers: []
 };
diff --git a/public/vendor/jquery/timeago/locales/jquery.timeago.ja.js b/public/vendor/jquery/timeago/locales/jquery.timeago.ja.js
index fd81f275d0..95a7cd2a7a 100644
--- a/public/vendor/jquery/timeago/locales/jquery.timeago.ja.js
+++ b/public/vendor/jquery/timeago/locales/jquery.timeago.ja.js
@@ -11,8 +11,8 @@ jQuery.timeago.settings.strings = {
   hours: "約 %d 時間",
   day: "約 1 日",
   days: "約 %d 日",
-  month: "約 1 月",
-  months: "約 %d 月",
+  month: "約 1 ヶ月",
+  months: "約 %d ヶ月",
   year: "約 1 年",
   years: "約 %d 年",
   wordSeparator: ""
diff --git a/public/vendor/jquery/timeago/locales/jquery.timeago.lv.js b/public/vendor/jquery/timeago/locales/jquery.timeago.lv.js
new file mode 100644
index 0000000000..eb02391563
--- /dev/null
+++ b/public/vendor/jquery/timeago/locales/jquery.timeago.lv.js
@@ -0,0 +1,20 @@
+//Latvian
+jQuery.timeago.settings.strings = {
+  prefixAgo: "pirms",
+  prefixFromNow: null,
+  suffixAgo: null,
+  suffixFromNow: "no šī brīža",
+  seconds: "%d sek.",
+  minute: "min.",
+  minutes: "%d min.",
+  hour: "st.",
+  hours: "%d st.",
+  day: "1 d.",
+  days: "%d d.",
+  month: "mēnesis.",
+  months: "%d mēnesis.",
+  year: "gads",
+  years: "%d gads",
+  wordSeparator: " ",
+  numbers: []
+};
diff --git a/public/vendor/jquery/timeago/locales/jquery.timeago.sl.js b/public/vendor/jquery/timeago/locales/jquery.timeago.sl.js
index 57d4f6020c..b8ab587d82 100644
--- a/public/vendor/jquery/timeago/locales/jquery.timeago.sl.js
+++ b/public/vendor/jquery/timeago/locales/jquery.timeago.sl.js
@@ -28,7 +28,7 @@
         },
         month: "en mesec",
         months: function (value) {
-            return numpf(value, ["%d mescov", "%d mesec", "%d mesca", "%d mesce"]);
+            return numpf(value, ["%d mesecev", "%d mesec", "%d meseca", "%d mesece"]);
         },
         year: "eno leto",
         years: function (value) {
diff --git a/public/vendor/jquery/timeago/locales/jquery.timeago.sr.js b/public/vendor/jquery/timeago/locales/jquery.timeago.sr.js
new file mode 100644
index 0000000000..c75a972e77
--- /dev/null
+++ b/public/vendor/jquery/timeago/locales/jquery.timeago.sr.js
@@ -0,0 +1,49 @@
+// Serbian
+(function () {
+    var numpf;
+
+    numpf = function (n, f, s, t) {
+        var n10;
+        n10 = n % 10;
+        if (n10 === 1 && (n === 1 || n > 20)) {
+            return f;
+        } else if (n10 > 1 && n10 < 5 && (n > 20 || n < 10)) {
+            return s;
+        } else {
+            return t;
+        }
+    };
+
+    jQuery.timeago.settings.strings = {
+        prefixAgo: "пре",
+        prefixFromNow: "за",
+        suffixAgo: null,
+        suffixFromNow: null,
+        second: "секунд",
+        seconds: function (value) {
+            return numpf(value, "%d секунд", "%d секунде", "%d секунди");
+        },
+        minute: "један минут",
+        minutes: function (value) {
+            return numpf(value, "%d минут", "%d минута", "%d минута");
+        },
+        hour: "један сат",
+        hours: function (value) {
+            return numpf(value, "%d сат", "%d сата", "%d сати");
+        },
+        day: "један дан",
+        days: function (value) {
+            return numpf(value, "%d дан", "%d дана", "%d дана");
+        },
+        month: "месец дана",
+        months: function (value) {
+            return numpf(value, "%d месец", "%d месеца", "%d месеци");
+        },
+        year: "годину дана",
+        years: function (value) {
+            return numpf(value, "%d годину", "%d године", "%d година");
+        },
+        wordSeparator: " "
+    };
+
+}).call(this);
diff --git a/public/vendor/jquery/timeago/locales/jquery.timeago.tr-short.js b/public/vendor/jquery/timeago/locales/jquery.timeago.tr-short.js
new file mode 100644
index 0000000000..ebc2277b49
--- /dev/null
+++ b/public/vendor/jquery/timeago/locales/jquery.timeago.tr-short.js
@@ -0,0 +1,20 @@
+// Turkish shortened
+jQuery.timeago.settings.strings = {
+  prefixAgo: null,
+  prefixFromNow: null,
+  suffixAgo: "",
+  suffixFromNow: "",
+  seconds: "1sn",
+  minute: "1d",
+  minutes: "%dd",
+  hour: "1s",
+  hours: "%ds",
+  day: "1g",
+  days: "%dg",
+  month: "1ay",
+  months: "%day",
+  year: "1y",
+  years: "%dy",
+  wordSeparator: " ",
+  numbers: []
+};
diff --git a/public/vendor/nprogress.min.js b/public/vendor/nprogress.min.js
new file mode 100644
index 0000000000..09998a166f
--- /dev/null
+++ b/public/vendor/nprogress.min.js
@@ -0,0 +1,3 @@
+/* NProgress, (c) 2013, 2014 Rico Sta. Cruz - http://ricostacruz.com/nprogress
+ * @license MIT */
+!function(n,t){"object"==typeof exports?module.exports=t():n.NProgress=t()}(this,function(){function n(n,t,e){return t>n?t:n>e?e:n}function t(n){return 100*(-1+n)}function e(n,e,r){var i;return i="translate3d"===c.positionUsing?{transform:"translate3d("+t(n)+"%,0,0)"}:"translate"===c.positionUsing?{transform:"translate("+t(n)+"%,0)"}:{"margin-left":t(n)+"%"},i.transition="all "+e+"ms "+r,i}function r(n,t){var e="string"==typeof n?n:o(n);return e.indexOf(" "+t+" ")>=0}function i(n,t){var e=o(n),i=e+t;r(e,t)||(n.className=i.substring(1))}function s(n,t){var e,i=o(n);r(n,t)&&(e=i.replace(" "+t+" "," "),n.className=e.substring(1,e.length-1))}function o(n){return(" "+(n.className||"")+" ").replace(/\s+/gi," ")}function a(n){n&&n.parentNode&&n.parentNode.removeChild(n)}var u={};u.version="0.1.6";var c=u.settings={minimum:.08,easing:"ease",positionUsing:"",speed:200,trickle:!0,trickleRate:.02,trickleSpeed:800,showSpinner:!0,barSelector:'[role="bar"]',spinnerSelector:'[role="spinner"]',parent:"body",template:'<div class="bar" role="bar"><div class="peg"></div></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'};u.configure=function(n){var t,e;for(t in n)e=n[t],void 0!==e&&n.hasOwnProperty(t)&&(c[t]=e);return this},u.status=null,u.set=function(t){var r=u.isStarted();t=n(t,c.minimum,1),u.status=1===t?null:t;var i=u.render(!r),s=i.querySelector(c.barSelector),o=c.speed,a=c.easing;return i.offsetWidth,l(function(n){""===c.positionUsing&&(c.positionUsing=u.getPositioningCSS()),f(s,e(t,o,a)),1===t?(f(i,{transition:"none",opacity:1}),i.offsetWidth,setTimeout(function(){f(i,{transition:"all "+o+"ms linear",opacity:0}),setTimeout(function(){u.remove(),n()},o)},o)):setTimeout(n,o)}),this},u.isStarted=function(){return"number"==typeof u.status},u.start=function(){u.status||u.set(0);var n=function(){setTimeout(function(){u.status&&(u.trickle(),n())},c.trickleSpeed)};return c.trickle&&n(),this},u.done=function(n){return n||u.status?u.inc(.3+.5*Math.random()).set(1):this},u.inc=function(t){var e=u.status;return e?("number"!=typeof t&&(t=(1-e)*n(Math.random()*e,.1,.95)),e=n(e+t,0,.994),u.set(e)):u.start()},u.trickle=function(){return u.inc(Math.random()*c.trickleRate)},function(){var n=0,t=0;u.promise=function(e){return e&&"resolved"!=e.state()?(0==t&&u.start(),n++,t++,e.always(function(){t--,0==t?(n=0,u.done()):u.set((n-t)/n)}),this):this}}(),u.render=function(n){if(u.isRendered())return document.getElementById("nprogress");i(document.documentElement,"nprogress-busy");var e=document.createElement("div");e.id="nprogress",e.innerHTML=c.template;var r,s=e.querySelector(c.barSelector),o=n?"-100":t(u.status||0),l=document.querySelector(c.parent);return f(s,{transition:"all 0 linear",transform:"translate3d("+o+"%,0,0)"}),c.showSpinner||(r=e.querySelector(c.spinnerSelector),r&&a(r)),l!=document.body&&i(l,"nprogress-custom-parent"),l.appendChild(e),e},u.remove=function(){s(document.documentElement,"nprogress-busy"),s(document.querySelector(c.parent),"nprogress-custom-parent");var n=document.getElementById("nprogress");n&&a(n)},u.isRendered=function(){return!!document.getElementById("nprogress")},u.getPositioningCSS=function(){var n=document.body.style,t="WebkitTransform"in n?"Webkit":"MozTransform"in n?"Moz":"msTransform"in n?"ms":"OTransform"in n?"O":"";return t+"Perspective"in n?"translate3d":t+"Transform"in n?"translate":"margin"};var l=function(){function n(){var e=t.shift();e&&e(n)}var t=[];return function(e){t.push(e),1==t.length&&n()}}(),f=function(){function n(n){return n.replace(/^-ms-/,"ms-").replace(/-([\da-z])/gi,function(n,t){return t.toUpperCase()})}function t(n){var t=document.body.style;if(n in t)return n;for(var e,r=i.length,s=n.charAt(0).toUpperCase()+n.slice(1);r--;)if(e=i[r]+s,e in t)return e;return n}function e(e){return e=n(e),s[e]||(s[e]=t(e))}function r(n,t,r){t=e(t),n.style[t]=r}var i=["Webkit","O","Moz","ms"],s={};return function(n,t){var e,i,s=arguments;if(2==s.length)for(e in t)i=t[e],void 0!==i&&t.hasOwnProperty(e)&&r(n,e,i);else r(n,s[1],s[2])}}();return u});
\ No newline at end of file
diff --git a/src/analytics.js b/src/analytics.js
index c1ede42eba..bbb1c06794 100644
--- a/src/analytics.js
+++ b/src/analytics.js
@@ -187,4 +187,11 @@ var db = require('./database');
 		}, callback);
 	};
 
+	Analytics.getErrorAnalytics = function(callback) {
+		async.parallel({
+			'not-found': async.apply(Analytics.getDailyStatsForSet, 'analytics:errors:404', Date.now(), 7),
+			'toobusy': async.apply(Analytics.getDailyStatsForSet, 'analytics:errors:503', Date.now(), 7)
+		}, callback);
+	};
+
 }(exports));
\ No newline at end of file
diff --git a/src/categories.js b/src/categories.js
index cd2b18a787..539a643f80 100644
--- a/src/categories.js
+++ b/src/categories.js
@@ -305,4 +305,23 @@ var privileges = require('./privileges');
 		return tree;
 	};
 
+	Categories.getIgnorers = function(cid, start, stop, callback) {
+		db.getSortedSetRevRange('cid:' + cid + ':ignorers', start, stop, callback);
+	};
+
+	Categories.filterIgnoringUids = function(cid, uids, callback) {
+		async.waterfall([
+			function (next){
+				db.sortedSetScores('cid:' + cid + ':ignorers', uids, next);
+			},
+			function (scores, next) {
+				var readingUids = uids.filter(function(uid, index) {
+					return uid && !!scores[index];
+				});
+				next(null, readingUids);
+			}
+		], callback);
+	};
+
+
 }(exports));
diff --git a/src/categories/create.js b/src/categories/create.js
index f6338f8ef2..dfa722c4f0 100644
--- a/src/categories/create.js
+++ b/src/categories/create.js
@@ -48,7 +48,7 @@ module.exports = function(Categories) {
 			function(data, next) {
 				category = data.category;
 
-				var defaultPrivileges = ['find', 'read', 'topics:create', 'topics:reply'];
+				var defaultPrivileges = ['find', 'read', 'topics:read', 'topics:create', 'topics:reply'];
 
 				async.series([
 					async.apply(db.setObject, 'category:' + category.cid, category),
@@ -57,12 +57,12 @@ module.exports = function(Categories) {
 					async.apply(db.sortedSetAdd, 'cid:' + parentCid + ':children', category.order, category.cid),
 					async.apply(privileges.categories.give, defaultPrivileges, category.cid, 'administrators'),
 					async.apply(privileges.categories.give, defaultPrivileges, category.cid, 'registered-users'),
-					async.apply(privileges.categories.give, ['find', 'read'], category.cid, 'guests')
+					async.apply(privileges.categories.give, ['find', 'read', 'topics:read'], category.cid, 'guests')
 				], next);
 			},
 			function(results, next) {
 				if (data.cloneFromCid && parseInt(data.cloneFromCid, 10)) {
-					return Categories.copySettingsFrom(data.cloneFromCid, category.cid, next);
+					return Categories.copySettingsFrom(data.cloneFromCid, category.cid, !data.parentCid, next);
 				}
 				next(null, category);
 			},
@@ -81,7 +81,7 @@ module.exports = function(Categories) {
 		return [backgrounds[index], text[index]];
 	};
 
-	Categories.copySettingsFrom = function(fromCid, toCid, callback) {
+	Categories.copySettingsFrom = function(fromCid, toCid, copyParent, callback) {
 		var destination;
 		async.waterfall([
 			function (next) {
@@ -97,12 +97,13 @@ module.exports = function(Categories) {
 				destination = results.destination;
 
 				var tasks = [];
-				if (utils.isNumber(results.source.parentCid)) {
-					tasks.push(async.apply(db.sortedSetAdd, 'cid:' + results.source.parentCid + ':children', results.source.order, toCid));
+
+				if (copyParent && utils.isNumber(destination.parentCid)) {
+					tasks.push(async.apply(db.sortedSetRemove, 'cid:' + destination.parentCid + ':children', toCid));
 				}
 
-				if (destination && utils.isNumber(destination.parentCid)) {
-					tasks.push(async.apply(db.sortedSetRemove, 'cid:' + destination.parentCid + ':children', toCid));
+				if (copyParent && utils.isNumber(results.source.parentCid)) {
+					tasks.push(async.apply(db.sortedSetAdd, 'cid:' + results.source.parentCid + ':children', results.source.order, toCid));
 				}
 
 				destination.description = results.source.description;
@@ -114,7 +115,10 @@ module.exports = function(Categories) {
 				destination.numRecentReplies = results.source.numRecentReplies;
 				destination.class = results.source.class;
 				destination.imageClass = results.source.imageClass;
-				destination.parentCid = results.source.parentCid || 0;
+
+				if (copyParent) {
+					destination.parentCid = results.source.parentCid || 0;
+				}
 
 				tasks.push(async.apply(db.setObject, 'category:' + toCid, destination));
 
@@ -129,12 +133,7 @@ module.exports = function(Categories) {
 	};
 
 	Categories.copyPrivilegesFrom = function(fromCid, toCid, callback) {
-		var privilegeList = [
-			'find', 'read', 'topics:create', 'topics:reply', 'purge', 'mods',
-			'groups:find', 'groups:read', 'groups:topics:create', 'groups:topics:reply', 'groups:purge', 'groups:moderate'
-		];
-
-		async.each(privilegeList, function(privilege, next) {
+		async.each(privileges.privilegeList, function(privilege, next) {
 			copyPrivilege(privilege, fromCid, toCid, next);
 		}, callback);
 	};
diff --git a/src/categories/delete.js b/src/categories/delete.js
index 8d99bb60d1..63f9fe324b 100644
--- a/src/categories/delete.js
+++ b/src/categories/delete.js
@@ -1,10 +1,12 @@
 'use strict';
 
-var async = require('async'),
-	db = require('../database'),
-	batch = require('../batch'),
-	plugins = require('../plugins'),
-	topics = require('../topics');
+var async = require('async');
+var db = require('../database');
+var batch = require('../batch');
+var plugins = require('../plugins');
+var topics = require('../topics');
+var privileges = require('../privileges');
+var groups = require('../groups');
 
 module.exports = function(Categories) {
 
@@ -38,9 +40,15 @@ module.exports = function(Categories) {
 					'cid:' + cid + ':tids:posts',
 					'cid:' + cid + ':pids',
 					'cid:' + cid + ':read_by_uid',
+					'cid:' + cid + ':ignorers',
 					'cid:' + cid + ':children',
 					'category:' + cid
 				], next);
+			},
+			function(next) {
+				async.each(privileges.privilegeList, function(privilege, next) {
+					groups.destroy('cid:' + cid + ':privileges:' + privilege, next);
+				}, next);
 			}
 		], callback);
 	}
@@ -77,7 +85,7 @@ module.exports = function(Categories) {
 					}
 				], next);
 			}
-		], function(err, results) {
+		], function(err) {
 			callback(err);
 		});
 	}
diff --git a/src/categories/recentreplies.js b/src/categories/recentreplies.js
index 7d42f053ff..7a5e1cc1e8 100644
--- a/src/categories/recentreplies.js
+++ b/src/categories/recentreplies.js
@@ -1,17 +1,19 @@
 
 'use strict';
 
-var async = require('async'),
-	winston = require('winston'),
-	validator = require('validator'),
-	_ = require('underscore'),
+var async = require('async');
+var winston = require('winston');
+var validator = require('validator');
+var _ = require('underscore');
 
-	db = require('../database'),
-	posts = require('../posts'),
-	topics = require('../topics'),
-	privileges = require('../privileges');
+var db = require('../database');
+var posts = require('../posts');
+var topics = require('../topics');
+var categories = require('../categories');
+var privileges = require('../privileges');
 
 module.exports = function(Categories) {
+
 	Categories.getRecentReplies = function(cid, uid, count, callback) {
 		if (!parseInt(count, 10)) {
 			return callback(null, []);
@@ -105,18 +107,33 @@ module.exports = function(Categories) {
 			function (next) {
 				topics.getTopicsFields(tids, ['tid', 'mainPid', 'slug', 'title', 'teaserPid', 'cid', 'postcount'], next);
 			},
-			function (_topicData, next) {
+			function(_topicData, next) {
 				topicData = _topicData;
 				topicData.forEach(function(topic) {
-					topic.teaserPid = topic.teaserPid || topic.mainPid;
+					if (topic) {
+						topic.teaserPid = topic.teaserPid || topic.mainPid;
+					}
+				});
+				var cids = _topicData.map(function(topic) {
+					return topic && topic.cid;
+				}).filter(function(cid, index, array) {
+					return cid && array.indexOf(cid) === index;
 				});
 
-				topics.getTeasers(topicData, next);
+				async.parallel({
+					categoryData: async.apply(categories.getCategoriesFields, cids, ['cid', 'parentCid']),
+					teasers: async.apply(topics.getTeasers, _topicData),
+				}, next);
 			},
-			function (teasers, next) {
-				teasers.forEach(function(teaser, index) {
+			function (results, next) {
+				var parentCids = {};
+				results.categoryData.forEach(function(category) {
+					parentCids[category.cid] = category.parentCid;
+				});
+				results.teasers.forEach(function(teaser, index) {
 					if (teaser) {
 						teaser.cid = topicData[index].cid;
+						teaser.parentCid = parseInt(parentCids[teaser.cid]) || 0;
 						teaser.tid = teaser.uid = teaser.user.uid = undefined;
 						teaser.topic = {
 							slug: topicData[index].slug,
@@ -124,8 +141,8 @@ module.exports = function(Categories) {
 						};
 					}
 				});
-				teasers = teasers.filter(Boolean);
-				next(null, teasers);
+				results.teasers = results.teasers.filter(Boolean);
+				next(null, results.teasers);
 			}
 		], callback);
 	}
@@ -133,7 +150,8 @@ module.exports = function(Categories) {
 	function assignTopicsToCategories(categories, topics) {
 		categories.forEach(function(category) {
 			category.posts = topics.filter(function(topic) {
-				return topic.cid && parseInt(topic.cid, 10) === parseInt(category.cid, 10);
+				return topic.cid && (parseInt(topic.cid, 10) === parseInt(category.cid, 10) ||
+					parseInt(topic.parentCid, 10) === parseInt(category.cid, 10));
 			}).sort(function(a, b) {
 				return b.pid - a.pid;
 			}).slice(0, parseInt(category.numRecentReplies, 10));
diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js
index 789393703a..2c99a981c3 100644
--- a/src/controllers/accounts.js
+++ b/src/controllers/accounts.js
@@ -3,6 +3,7 @@
 var accountsController = {
 	profile: require('./accounts/profile'),
 	edit: require('./accounts/edit'),
+	info: require('./accounts/info'),
 	settings: require('./accounts/settings'),
 	groups: require('./accounts/groups'),
 	follow: require('./accounts/follow'),
diff --git a/src/controllers/accounts/edit.js b/src/controllers/accounts/edit.js
index 2ae429b248..9f63df0894 100644
--- a/src/controllers/accounts/edit.js
+++ b/src/controllers/accounts/edit.js
@@ -10,6 +10,7 @@ var user = require('../../user');
 var meta = require('../../meta');
 var plugins = require('../../plugins');
 var helpers = require('../helpers');
+var groups = require('../../groups');
 var accountHelpers = require('./helpers');
 
 var editController = {};
@@ -25,7 +26,13 @@ editController.get = function(req, res, callback) {
 		userData.maximumProfileImageSize = parseInt(meta.config.maximumProfileImageSize, 10);
 		userData.allowProfileImageUploads = parseInt(meta.config.allowProfileImageUploads) === 1;
 		userData.allowAccountDelete = parseInt(meta.config.allowAccountDelete, 10) === 1;
-		
+
+		userData.groups = userData.groups.filter(function(group) {
+			return group && group.userTitleEnabled && !groups.isPrivilegeGroup(group.name) && group.name !== 'registered-users';
+		});
+		userData.groups.forEach(function(group) {
+			group.selected = group.name === userData.groupTitle;
+		});
 
 		userData.title = '[[pages:account/edit, ' + userData.username + ']]';
 		userData.breadcrumbs = helpers.buildBreadcrumbs([{text: userData.username, url: '/user/' + userData.userslug}, {text: '[[user:edit]]'}]);
@@ -33,7 +40,7 @@ editController.get = function(req, res, callback) {
 
 		plugins.fireHook('filter:user.account.edit', userData, function(err, userData) {
 			if (err) {
-				return next(err);
+				return callback(err);
 			}
 
 			res.render('account/edit', userData);
@@ -121,7 +128,7 @@ editController.uploadPicture = function (req, res, next) {
 			if (!isAllowed) {
 				return helpers.notAllowed(req, res);
 			}
-			
+
 			user.uploadPicture(updateUid, userPhoto, next);
 		}
 	], function(err, image) {
diff --git a/src/controllers/accounts/helpers.js b/src/controllers/accounts/helpers.js
index 8acbdc08c8..12a891a673 100644
--- a/src/controllers/accounts/helpers.js
+++ b/src/controllers/accounts/helpers.js
@@ -133,7 +133,7 @@ helpers.getBaseUser = function(userslug, callerUID, callback) {
 
 			async.parallel({
 				user: function(next) {
-					user.getUserFields(uid, ['uid', 'username', 'userslug', 'picture', 'cover:url', 'cover:position', 'status', 'lastonline'], next);
+					user.getUserFields(uid, ['uid', 'username', 'userslug', 'picture', 'cover:url', 'cover:position', 'status', 'lastonline', 'groupTitle'], next);
 				},
 				isAdmin: function(next) {
 					user.isAdministrator(callerUID, next);
@@ -141,6 +141,9 @@ helpers.getBaseUser = function(userslug, callerUID, callback) {
 				isGlobalModerator: function(next) {
 					user.isGlobalModerator(callerUID, next);
 				},
+				isFollowing: function(next) {
+					user.isFollowing(callerUID, uid, next);
+				},
 				profile_links: function(next) {
 					plugins.fireHook('filter:user.profileLinks', [], next);
 				}
@@ -155,6 +158,7 @@ helpers.getBaseUser = function(userslug, callerUID, callback) {
 			results.user.theirid = results.user.uid;
 			results.user.status = user.getStatus(results.user);
 			results.user.isSelf = parseInt(callerUID, 10) === parseInt(results.user.uid, 10);
+			results.user.isFollowing = results.isFollowing;
 			results.user.showHidden = results.user.isSelf || results.isAdmin || results.isGlobalModerator;
 			results.user.profile_links = filterLinks(results.profile_links, results.user.isSelf);
 
diff --git a/src/controllers/accounts/info.js b/src/controllers/accounts/info.js
new file mode 100644
index 0000000000..6547db8076
--- /dev/null
+++ b/src/controllers/accounts/info.js
@@ -0,0 +1,28 @@
+'use strict';
+
+var async = require('async'),
+	_ = require('underscore'),
+
+	user = require('../../user'),
+	helpers = require('../helpers'),
+	accountHelpers = require('./helpers');
+
+var infoController = {};
+
+infoController.get = function(req, res, next) {
+	accountHelpers.getBaseUser(req.params.userslug, req.uid, function(err, userData) {
+		async.parallel({
+			ips: async.apply(user.getIPs, res.locals.uid, 4),
+			history: async.apply(user.getModerationHistory, res.locals.uid)
+		}, function(err, data) {
+			data = _.extend(userData, data);
+
+			userData.title = '[[pages:account/info]]';
+			userData.breadcrumbs = helpers.buildBreadcrumbs([{text: userData.username, url: '/user/' + userData.userslug}, {text: '[[user:settings]]'}]);
+
+			res.render('account/info', data);
+		});
+	});
+};
+
+module.exports = infoController;
\ No newline at end of file
diff --git a/src/controllers/accounts/profile.js b/src/controllers/accounts/profile.js
index e52b5f4861..74e919d8f5 100644
--- a/src/controllers/accounts/profile.js
+++ b/src/controllers/accounts/profile.js
@@ -54,7 +54,7 @@ profileController.get = function(req, res, callback) {
 				},
 				aboutme: function(next) {
 					if (userData.aboutme) {
-						plugins.fireHook('filter:parse.raw', userData.aboutme, next);
+						plugins.fireHook('filter:parse.aboutme', userData.aboutme, next);
 					} else {
 						next();
 					}
diff --git a/src/controllers/accounts/settings.js b/src/controllers/accounts/settings.js
index b5b020c118..75d07a0846 100644
--- a/src/controllers/accounts/settings.js
+++ b/src/controllers/accounts/settings.js
@@ -96,8 +96,22 @@ settingsController.get = function(req, res, callback) {
 			{ "name": "Yeti", "value": "yeti" }
 		];
 
+		var isCustom = true;
 		userData.homePageRoutes.forEach(function(route) {
 			route.selected = route.route === userData.settings.homePageRoute;
+			if (route.selected) {
+				isCustom = false;
+			}
+		});
+
+		if (isCustom && userData.settings.homePageRoute === 'none') {
+			isCustom = false;
+		}
+
+		userData.homePageRoutes.push({
+		 	route: 'custom',
+		 	name: 'Custom',
+		 	selected: isCustom
 		});
 
 		userData.bootswatchSkinOptions.forEach(function(skin) {
@@ -116,6 +130,8 @@ settingsController.get = function(req, res, callback) {
 
 		userData.allowUserHomePage = parseInt(meta.config.allowUserHomePage, 10) === 1;
 
+		userData.inTopicSearchAvailable = plugins.hasListeners('filter:topic.search');
+
 		userData.title = '[[pages:account/settings]]';
 		userData.breadcrumbs = helpers.buildBreadcrumbs([{text: userData.username, url: '/user/' + userData.userslug}, {text: '[[user:settings]]'}]);
 
@@ -142,40 +158,28 @@ function getHomePageRoutes(callback) {
 					name: 'Category: ' + category.name
 				};
 			});
-			next(null, categoryData);
+
+			categoryData = categoryData || [];
+
+			plugins.fireHook('filter:homepage.get', {routes: [
+				{
+					route: 'categories',
+					name: 'Categories'
+				},
+				{
+					route: 'recent',
+					name: 'Recent'
+				},
+				{
+					route: 'popular',
+					name: 'Popular'
+				}
+			].concat(categoryData)}, next);
+		},
+		function (data, next) {
+			next(null, data.routes);
 		}
-	], function(err, categoryData) {
-		if (err) {
-			return callback(err);
-		}
-		categoryData = categoryData || [];
-
-		plugins.fireHook('filter:homepage.get', {routes: [
-			{
-				route: 'categories',
-				name: 'Categories'
-			},
-			{
-				route: 'recent',
-				name: 'Recent'
-			},
-			{
-				route: 'popular',
-				name: 'Popular'
-			}
-		].concat(categoryData)}, function(err, data) {
-			if (err) {
-				return callback(err);
-			}
-
-			data.routes.push({
-				route: 'custom',
-				name: 'Custom'
-			});
-
-			callback(null, data.routes);
-		});
-	});
+	], callback);
 }
 
 
diff --git a/src/controllers/admin.js b/src/controllers/admin.js
index 2bba60cae6..c3ce96d205 100644
--- a/src/controllers/admin.js
+++ b/src/controllers/admin.js
@@ -14,6 +14,7 @@ var adminController = {
 	},
 	events: require('./admin/events'),
 	logs: require('./admin/logs'),
+	errors: require('./admin/errors'),
 	database: require('./admin/database'),
 	postCache: require('./admin/postCache'),
 	plugins: require('./admin/plugins'),
diff --git a/src/controllers/admin/errors.js b/src/controllers/admin/errors.js
new file mode 100644
index 0000000000..4b59932965
--- /dev/null
+++ b/src/controllers/admin/errors.js
@@ -0,0 +1,30 @@
+'use strict';
+
+var async = require('async'),
+	json2csv = require('json-2-csv').json2csv;
+
+var meta = require('../../meta'),
+	analytics = require('../../analytics');
+
+var errorsController = {};
+
+errorsController.get = function(req, res) {
+	async.parallel({
+		'not-found': async.apply(meta.errors.get, true),
+		analytics: async.apply(analytics.getErrorAnalytics)
+	}, function(err, data) {
+		res.render('admin/advanced/errors', data);
+	});
+};
+
+errorsController.export = function(req, res) {
+	async.waterfall([
+		async.apply(meta.errors.get, false),
+		async.apply(json2csv)
+	], function(err, csv) {
+		res.set('Content-Type', 'text/csv').set('Content-Disposition', 'attachment; filename="404.csv"').send(csv);
+	});
+};
+
+
+module.exports = errorsController;
\ No newline at end of file
diff --git a/src/controllers/admin/flags.js b/src/controllers/admin/flags.js
index cb2f830365..340eda0a9d 100644
--- a/src/controllers/admin/flags.js
+++ b/src/controllers/admin/flags.js
@@ -2,6 +2,7 @@
 
 var async = require('async');
 var posts = require('../../posts');
+var analytics = require('../../analytics');
 
 var flagsController = {};
 
@@ -13,20 +14,28 @@ flagsController.get = function(req, res, next) {
 
 	async.waterfall([
 		function (next) {
-			if (byUsername) {
-				posts.getUserFlags(byUsername, sortBy, req.uid, start, stop, next);
-			} else {
-				var set = sortBy === 'count' ? 'posts:flags:count' : 'posts:flagged';
-				posts.getFlags(set, req.uid, start, stop, next);
-			}
+			async.parallel({
+				posts: function(next) {
+					if (byUsername) {
+						posts.getUserFlags(byUsername, sortBy, req.uid, start, stop, next);
+					} else {
+						var set = sortBy === 'count' ? 'posts:flags:count' : 'posts:flagged';
+						posts.getFlags(set, req.uid, start, stop, next);
+					}
+				},
+				analytics: function(next) {
+					analytics.getDailyStatsForSet('analytics:flags', Date.now(), 30, next);
+				}
+			}, next);
 		}
-	], function (err, posts) {
+	], function (err, results) {
 		if (err) {
 			return next(err);
 		}
 		var data = {
-			posts: posts, 
-			next: stop + 1, 
+			posts: results.posts,
+			analytics: results.analytics,
+			next: stop + 1,
 			byUsername: byUsername,
 			title: '[[pages:flagged-posts]]'
 		};
diff --git a/src/controllers/admin/uploads.js b/src/controllers/admin/uploads.js
index aea79e3934..90dae8a243 100644
--- a/src/controllers/admin/uploads.js
+++ b/src/controllers/admin/uploads.js
@@ -1,21 +1,21 @@
 "use strict";
 
-var fs = require('fs'),
-	path = require('path'),
-	async = require('async'),
-	nconf = require('nconf'),
-	winston = require('winston'),
-	file = require('../../file'),
-	image = require('../../image'),
-	plugins = require('../../plugins');
+var fs = require('fs');
+var path = require('path');
+var async = require('async');
+var nconf = require('nconf');
+var winston = require('winston');
+var file = require('../../file');
+var image = require('../../image');
+var plugins = require('../../plugins');
 
+var allowedImageTypes = ['image/png', 'image/jpeg', 'image/pjpeg', 'image/jpg', 'image/gif', 'image/svg+xml'];
 
 var uploadsController = {};
 
 uploadsController.uploadCategoryPicture = function(req, res, next) {
 	var uploadedFile = req.files.files[0];
-	var allowedTypes = ['image/png', 'image/jpeg', 'image/jpg', 'image/gif', 'image/svg+xml'],
-		params = null;
+	var params = null;
 
 	try {
 		params = JSON.parse(req.body.params);
@@ -28,7 +28,7 @@ uploadsController.uploadCategoryPicture = function(req, res, next) {
 		return next(e);
 	}
 
-	if (validateUpload(req, res, next, uploadedFile, allowedTypes)) {
+	if (validateUpload(req, res, next, uploadedFile, allowedImageTypes)) {
 		var filename =  'category-' + params.cid + path.extname(uploadedFile.name);
 		uploadImage(filename, 'category', uploadedFile, req, res, next);
 	}
@@ -124,10 +124,14 @@ uploadsController.uploadDefaultAvatar = function(req, res, next) {
 	upload('avatar-default', req, res, next);
 };
 
+uploadsController.uploadOgImage = function(req, res, next) {
+	upload('og:image', req, res, next);
+};
+
 function upload(name, req, res, next) {
 	var uploadedFile = req.files.files[0];
-	var allowedTypes = ['image/png', 'image/jpeg', 'image/pjpeg', 'image/jpg', 'image/gif'];
-	if (validateUpload(req, res, next, uploadedFile, allowedTypes)) {
+
+	if (validateUpload(req, res, next, uploadedFile, allowedImageTypes)) {
 		var filename = name + path.extname(uploadedFile.name);
 		uploadImage(filename, 'system', uploadedFile, req, res, next);
 	}
diff --git a/src/controllers/admin/users.js b/src/controllers/admin/users.js
index 7e5bd530d6..e682045fce 100644
--- a/src/controllers/admin/users.js
+++ b/src/controllers/admin/users.js
@@ -28,6 +28,10 @@ usersController.noPosts = function(req, res, next) {
 	getUsersByScore('users:postcount', 'noposts', 0, 0, req, res, next);
 };
 
+usersController.flagged = function(req, res, next) {
+	getUsersByScore('users:flags', 'mostflags', 1, '+inf', req, res, next);
+};
+
 usersController.inactive = function(req, res, next) {
 	var timeRange = 1000 * 60 * 60 * 24 * 30 * (parseInt(req.query.months, 10) || 3);
 	var cutoff = Date.now() - timeRange;
@@ -166,6 +170,12 @@ function render(req, res, data) {
 	data.search_display = 'hidden';
 	data.pagination = pagination.create(data.page, data.pageCount, req.query);
 	data.requireEmailConfirmation = parseInt(meta.config.requireEmailConfirmation, 10) === 1;
+
+	var registrationType = meta.config.registrationType;
+
+	data.inviteOnly = registrationType === 'invite-only' || registrationType === 'admin-invite-only';
+	data.adminInviteOnly = registrationType === 'admin-invite-only';
+
 	res.render('admin/manage/users', data);
 }
 
diff --git a/src/controllers/api.js b/src/controllers/api.js
index 8a109aa9df..35f894e002 100644
--- a/src/controllers/api.js
+++ b/src/controllers/api.js
@@ -12,6 +12,8 @@ var categories = require('../categories');
 var privileges = require('../privileges');
 var plugins = require('../plugins');
 var widgets = require('../widgets');
+var helpers = require('../controllers/helpers');
+var accountHelpers = require('../controllers/accounts/helpers');
 
 var apiController = {};
 
@@ -51,7 +53,7 @@ apiController.getConfig = function(req, res, next) {
 	config['theme:id'] = meta.config['theme:id'];
 	config['theme:src'] = meta.config['theme:src'];
 	config.defaultLang = meta.config.defaultLang || 'en_GB';
-	config.userLang = req.query.lang || config.defaultLang;
+	config.userLang = req.query.lang ? validator.escape(req.query.lang) : config.defaultLang;
 	config.loggedIn = !!req.user;
 	config['cache-buster'] = meta.config['cache-buster'] || '';
 	config.requireEmailConfirmation = parseInt(meta.config.requireEmailConfirmation, 10) === 1;
@@ -74,7 +76,7 @@ apiController.getConfig = function(req, res, next) {
 				config.topicsPerPage = settings.topicsPerPage;
 				config.postsPerPage = settings.postsPerPage;
 				config.notificationSounds = settings.notificationSounds;
-				config.userLang = req.query.lang || settings.userLang || config.defaultLang;
+				config.userLang = (req.query.lang ? validator.escape(req.query.lang) : null) || settings.userLang || config.defaultLang;
 				config.openOutgoingLinksInNewTab = settings.openOutgoingLinksInNewTab;
 				config.topicPostSort = settings.topicPostSort || config.topicPostSort;
 				config.categoryTopicSort = settings.categoryTopicSort || config.categoryTopicSort;
@@ -117,6 +119,7 @@ apiController.renderWidgets = function(req, res, next) {
 			template: areas.template,
 			url: areas.url,
 			locations: areas.locations,
+			isMobile: req.query.isMobile === 'true'
 		},
 		req,
 		res,
@@ -128,99 +131,152 @@ apiController.renderWidgets = function(req, res, next) {
 	});
 };
 
-apiController.getObject = function(req, res, next) {
-	apiController.getObjectByType(req.uid, req.params.type, req.params.id, function(err, results) {
-		if (err) {
-			return next(err);
+apiController.getPostData = function(pid, uid, callback) {
+	async.parallel({
+		privileges: function(next) {
+			privileges.posts.get([pid], uid, next);
+		},
+		post: function(next) {
+			posts.getPostData(pid, next);
+		}
+	}, function(err, results) {
+		if (err || !results.post) {
+			return callback(err);
 		}
 
-		res.json(results);
+		var post = results.post;
+		var privileges = results.privileges[0];
+
+		if (!privileges.read || !privileges['topics:read']) {
+			return callback();
+		}
+
+		post.ip = privileges.isAdminOrMod ? post.ip : undefined;
+		var selfPost = uid && uid === parseInt(post.uid, 10);
+		if (post.deleted && !(privileges.isAdminOrMod || selfPost)) {
+			post.content = '[[topic:post_is_deleted]]';
+		}
+		callback(null, post);
 	});
 };
 
-apiController.getObjectByType = function(uid, type, id, callback) {
+apiController.getTopicData = function(tid, uid, callback) {
+	async.parallel({
+		privileges: function(next) {
+			privileges.topics.get(tid, uid, next);
+		},
+		topic: function(next) {
+			topics.getTopicData(tid, next);
+		}
+	}, function(err, results) {
+		if (err || !results.topic) {
+			return callback(err);
+		}
+
+		if (!results.privileges.read || !results.privileges['topics:read'] || (parseInt(results.topic.deleted, 10) && !results.privileges.view_deleted)) {
+			return callback();
+		}
+		callback(null, results.topic);
+	});
+};
+
+apiController.getCategoryData = function(cid, uid, callback) {
+	async.parallel({
+		privileges: function(next) {
+			privileges.categories.get(cid, uid, next);
+		},
+		category: function(next) {
+			categories.getCategoryData(cid, next);
+		}
+	}, function(err, results) {
+		if (err || !results.category) {
+			return callback(err);
+		}
+
+		if (!results.privileges.read) {
+			return callback();
+		}
+		callback(null, results.category);
+	});
+};
+
+
+apiController.getObject = function(req, res, next) {
 	var methods = {
-		post: {
-			canRead: privileges.posts.can,
-			data: posts.getPostData
-		},
-		topic: {
-			canRead: privileges.topics.can,
-			data: topics.getTopicData
-		},
-		category: {
-			canRead: privileges.categories.can,
-			data: categories.getCategoryData
-		}
+		post: apiController.getPostData,
+		topic: apiController.getTopicData,
+		category: apiController.getCategoryData
 	};
-
-	if (!methods[type]) {
-		return callback();
+	var method = methods[req.params.type];
+	if (!method) {
+		return next();
 	}
-
-	async.waterfall([
-		function (next) {
-			methods[type].canRead('read', id, uid, next);
-		},
-		function (canRead, next) {
-			if (!canRead) {
-				return next(new Error('[[error:no-privileges]]'));
-			}
-			methods[type].data(id, next);
+	method(req.params.id, req.uid, function(err, result) {
+		if (err || !result) {
+			return next(err);
 		}
-	], callback);
+
+		res.json(result);
+	});
+};
+
+apiController.getCurrentUser = function(req, res, next) {
+	if (!req.uid) {
+		return helpers.notAllowed(req, res);
+	}
+	async.waterfall([
+		function(next) {
+			user.getUserField(req.uid, 'userslug', next);
+		},
+		function(userslug, next) {
+			accountHelpers.getUserDataByUserSlug(userslug, req.uid, next);
+		}
+	], function(err, userData) {
+		if (err) {
+			return next(err);
+		}
+		res.json(userData);
+	});
 };
 
 apiController.getUserByUID = function(req, res, next) {
-	var uid = req.params.uid ? req.params.uid : 0;
-
-	apiController.getUserDataByUID(req.uid, uid, function(err, data) {
-		if (err) {
-			return next(err);
-		}
-		res.json(data);
-	});
+	byType('uid', req, res, next);
 };
 
 apiController.getUserByUsername = function(req, res, next) {
-	var username = req.params.username ? req.params.username : 0;
-
-	apiController.getUserDataByUsername(req.uid, username, function(err, data) {
-		if (err) {
-			return next(err);
-		}
-		res.json(data);
-	});
+	byType('username', req, res, next);
 };
 
 apiController.getUserByEmail = function(req, res, next) {
-	var email = req.params.email ? req.params.email : 0;
+	byType('email', req, res, next);
+};
 
-	apiController.getUserDataByEmail(req.uid, email, function(err, data) {
-		if (err) {
+function byType(type, req, res, next) {
+	apiController.getUserDataByField(req.uid, type, req.params[type], function(err, data) {
+		if (err || !data) {
 			return next(err);
 		}
 		res.json(data);
 	});
-};
+}
 
-apiController.getUserDataByUsername = function(callerUid, username, callback) {
+apiController.getUserDataByField = function(callerUid, field, fieldValue, callback) {
 	async.waterfall([
-		function(next) {
-			user.getUidByUsername(username, next);
+		function (next) {
+			if (field === 'uid') {
+				next(null, fieldValue);
+			} else if (field === 'username') {
+				user.getUidByUsername(fieldValue, next);
+			} else if (field === 'email') {
+				user.getUidByEmail(fieldValue, next);
+			} else {
+				next();
+			}
 		},
-		function(uid, next) {
-			apiController.getUserDataByUID(callerUid, uid, next);
-		}
-	], callback);
-};
-
-apiController.getUserDataByEmail = function(callerUid, email, callback) {
-	async.waterfall([
-		function(next) {
-			user.getUidByEmail(email, next);
-		},
-		function(uid, next) {
+		function (uid, next) {
+			if (!uid) {
+				return next();
+			}
 			apiController.getUserDataByUID(callerUid, uid, next);
 		}
 	], callback);
diff --git a/src/controllers/authentication.js b/src/controllers/authentication.js
index 8db2c9e580..bb575a3c76 100644
--- a/src/controllers/authentication.js
+++ b/src/controllers/authentication.js
@@ -33,7 +33,7 @@ authenticationController.register = function(req, res, next) {
 
 	async.waterfall([
 		function(next) {
-			if (registrationType === 'invite-only') {
+			if (registrationType === 'invite-only' || registrationType === 'admin-invite-only') {
 				user.verifyInvitation(userData, next);
 			} else {
 				next();
@@ -59,7 +59,7 @@ authenticationController.register = function(req, res, next) {
 			plugins.fireHook('filter:register.check', {req: req, res: res, userData: userData}, next);
 		},
 		function(data, next) {
-			if (registrationType === 'normal' || registrationType === 'invite-only') {
+			if (registrationType === 'normal' || registrationType === 'invite-only' || registrationType === 'admin-invite-only') {
 				registerAndLoginUser(req, res, userData, next);
 			} else if (registrationType === 'admin-approval') {
 				addToApprovalQueue(req, userData, next);
@@ -81,6 +81,27 @@ authenticationController.register = function(req, res, next) {
 function registerAndLoginUser(req, res, userData, callback) {
 	var uid;
 	async.waterfall([
+		function(next) {
+			plugins.fireHook('filter:register.interstitial', {
+				userData: userData,
+				interstitials: []
+			}, function(err, data) {
+				// If interstitials are found, save registration attempt into session and abort
+				var deferRegistration = data.interstitials.length;
+
+				if (!deferRegistration) {
+					return next();
+				} else {
+					userData.register = true;
+					req.session.registration = userData;
+					if (res.locals.isAPI) {
+						return res.json({ referrer: nconf.get('relative_path') + '/register/complete' });
+					} else {
+						return res.redirect(nconf.get('relative_path') + '/register/complete');
+					}
+				}
+			});
+		},
 		function(next) {
 			user.create(userData, next);
 		},
@@ -111,6 +132,54 @@ function addToApprovalQueue(req, userData, callback) {
 	], callback);
 }
 
+authenticationController.registerComplete = function(req, res, next) {
+	// For the interstitials that respond, execute the callback with the form body
+	plugins.fireHook('filter:register.interstitial', {
+		userData: req.session.registration,
+		interstitials: []
+	}, function(err, data) {
+		var callbacks = data.interstitials.reduce(function(memo, cur) {
+			if (cur.hasOwnProperty('callback') && typeof cur.callback === 'function') {
+				memo.push(async.apply(cur.callback, req.session.registration, req.body));
+			}
+
+			return memo;
+		}, []);
+
+		var done = function() {
+			delete req.session.registration;
+
+			if (req.session.returnTo) {
+				res.redirect(req.session.returnTo);
+			} else {
+				res.redirect(nconf.get('relative_path') + '/');
+			}
+		}
+
+		async.parallel(callbacks, function(err) {
+			if (err) {
+				req.flash('error', err.message);
+				return res.redirect(nconf.get('relative_path') + '/register/complete');
+			}
+
+			if (req.session.registration.register === true) {
+				res.locals.processLogin = true;
+				registerAndLoginUser(req, res, req.session.registration, done);
+			} else {
+				// Clear registration data in session
+				done();
+			}
+		});
+	});
+};
+
+authenticationController.registerAbort = function(req, res, next) {
+	// End the session and redirect to home
+	req.session.destroy(function() {
+		res.redirect(nconf.get('relative_path') + '/');
+	});
+};
+
 authenticationController.login = function(req, res, next) {
 	// Handle returnTo data
 	if (req.body.hasOwnProperty('returnTo') && !req.session.returnTo) {
@@ -208,6 +277,8 @@ authenticationController.onSuccessfulLogin = function(req, uid, callback) {
 	var uuid = utils.generateUUID();
 	req.session.meta = {};
 
+	delete req.session.forceLogin;
+
 	// Associate IP used during login with user account
 	user.logIP(uid, req.ip);
 	req.session.meta.ip = req.ip;
@@ -263,10 +334,13 @@ authenticationController.localLogin = function(req, username, password, next) {
 		function (next) {
 			async.parallel({
 				userData: function(next) {
-					db.getObjectFields('user:' + uid, ['password', 'banned', 'passwordExpiry'], next);
+					db.getObjectFields('user:' + uid, ['password', 'passwordExpiry'], next);
 				},
 				isAdmin: function(next) {
 					user.isAdministrator(uid, next);
+				},
+				banned: function(next) {
+					user.isBanned(uid, next);
 				}
 			}, next);
 		},
@@ -278,13 +352,13 @@ authenticationController.localLogin = function(req, username, password, next) {
 			if (!result.isAdmin && parseInt(meta.config.allowLocalLogin, 10) === 0) {
 				return next(new Error('[[error:local-login-disabled]]'));
 			}
-
 			if (!userData || !userData.password) {
 				return next(new Error('[[error:invalid-user-data]]'));
 			}
-			if (userData.banned && parseInt(userData.banned, 10) === 1) {
+			if (result.banned) {
 				return next(new Error('[[error:user-banned]]'));
 			}
+
 			Password.compare(password, userData.password, next);
 		},
 		function (passwordMatch, next) {
@@ -305,9 +379,10 @@ authenticationController.logout = function(req, res, next) {
 				return next(err);
 			}
 			req.logout();
+			req.session.destroy();
+
+			user.setUserField(uid, 'lastonline', Date.now() - 300000);
 
-			// action:user.loggedOut deprecated in > v0.9.3
-			plugins.fireHook('action:user.loggedOut', {req: req, res: res, uid: uid});
 			plugins.fireHook('static:user.loggedOut', {req: req, res: res, uid: uid}, function() {
 				res.status(200).send('');
 			});
diff --git a/src/controllers/categories.js b/src/controllers/categories.js
index aa882b9b43..642467c6b0 100644
--- a/src/controllers/categories.js
+++ b/src/controllers/categories.js
@@ -1,14 +1,11 @@
 "use strict";
 
-
 var async = require('async');
 var nconf = require('nconf');
 var validator = require('validator');
 
 var categories = require('../categories');
 var meta = require('../meta');
-var plugins = require('../plugins');
-
 var helpers = require('./helpers');
 
 var categoriesController = {};
@@ -28,14 +25,14 @@ categoriesController.list = function(req, res, next) {
 		content: 'website'
 	}];
 
-	if (meta.config['brand:logo']) {
-		var brandLogo = meta.config['brand:logo'];
-		if (!brandLogo.startsWith('http')) {
-			brandLogo = nconf.get('url') + brandLogo;
+	var ogImage = meta.config['og:image'] || meta.config['brand:logo'] || '';
+	if (ogImage) {
+		if (!ogImage.startsWith('http')) {
+			ogImage = nconf.get('url') + ogImage;
 		}
 		res.locals.metaTags.push({
 			property: 'og:image',
-			content: brandLogo
+			content: ogImage
 		});
 	}
 
@@ -51,34 +48,32 @@ categoriesController.list = function(req, res, next) {
 			categories.flattenCategories(allCategories, categoryData);
 
 			categories.getRecentTopicReplies(allCategories, req.uid, next);
-		},
-		function (next) {
-			var data = {
-				title: '[[pages:categories]]',
-				categories: categoryData
-			};
-
-			if (req.path.startsWith('/api/categories') || req.path.startsWith('/categories')) {
-				data.breadcrumbs = helpers.buildBreadcrumbs([{text: data.title}]);
-			}
-
-			data.categories.forEach(function(category) {
-				if (category && Array.isArray(category.posts) && category.posts.length) {
-					category.teaser = {
-						url: nconf.get('relative_path') + '/topic/' + category.posts[0].topic.slug + '/' + category.posts[0].index,
-						timestampISO: category.posts[0].timestampISO,
-						pid: category.posts[0].pid
-					};
-				}
-			});
-
-			plugins.fireHook('filter:categories.build', {req: req, res: res, templateData: data}, next);
 		}
-	], function(err, data) {
+	], function(err) {
 		if (err) {
 			return next(err);
 		}
-		res.render('categories', data.templateData);
+
+		var data = {
+			title: '[[pages:categories]]',
+			categories: categoryData
+		};
+
+		if (req.path.startsWith('/api/categories') || req.path.startsWith('/categories')) {
+			data.breadcrumbs = helpers.buildBreadcrumbs([{text: data.title}]);
+		}
+
+		data.categories.forEach(function(category) {
+			if (category && Array.isArray(category.posts) && category.posts.length) {
+				category.teaser = {
+					url: nconf.get('relative_path') + '/topic/' + category.posts[0].topic.slug + '/' + category.posts[0].index,
+					timestampISO: category.posts[0].timestampISO,
+					pid: category.posts[0].pid
+				};
+			}
+		});
+
+		res.render('categories', data);
 	});
 };
 
diff --git a/src/controllers/category.js b/src/controllers/category.js
index f80ad122a7..f2bc7510c6 100644
--- a/src/controllers/category.js
+++ b/src/controllers/category.js
@@ -9,7 +9,6 @@ var privileges = require('../privileges');
 var user = require('../user');
 var categories = require('../categories');
 var meta = require('../meta');
-var plugins = require('../plugins');
 var pagination = require('../pagination');
 var helpers = require('./helpers');
 var utils = require('../../public/src/utils');
@@ -143,65 +142,63 @@ categoryController.get = function(req, res, callback) {
 			categories.getRecentTopicReplies(allCategories, req.uid, function(err) {
 				next(err, categoryData);
 			});
-		},
-		function (categoryData, next) {
-			categoryData.privileges = userPrivileges;
-			categoryData.showSelect = categoryData.privileges.editable;
-
-			res.locals.metaTags = [
-				{
-					name: 'title',
-					content: categoryData.name
-				},
-				{
-					property: 'og:title',
-					content: categoryData.name
-				},
-				{
-					name: 'description',
-					content: categoryData.description
-				},
-				{
-					property: "og:type",
-					content: 'website'
-				}
-			];
-
-			if (categoryData.backgroundImage) {
-				res.locals.metaTags.push({
-					name: 'og:image',
-					content: categoryData.backgroundImage
-				});
-			}
-
-			res.locals.linkTags = [
-				{
-					rel: 'alternate',
-					type: 'application/rss+xml',
-					href: nconf.get('url') + '/category/' + cid + '.rss'
-				},
-				{
-					rel: 'up',
-					href: nconf.get('url')
-				}
-			];
-
-			categoryData['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1;
-			categoryData.rssFeedUrl = nconf.get('relative_path') + '/category/' + categoryData.cid + '.rss';
-			categoryData.title = categoryData.name;
-			categoryData.pagination = pagination.create(currentPage, pageCount);
-			categoryData.pagination.rel.forEach(function(rel) {
-				rel.href = nconf.get('url') + '/category/' + categoryData.slug + rel.href;
-				res.locals.linkTags.push(rel);
-			});
-
-			plugins.fireHook('filter:category.build', {req: req, res: res, templateData: categoryData}, next);
 		}
-	], function (err, data) {
+	], function (err, categoryData) {
 		if (err) {
 			return callback(err);
 		}
-		res.render('category', data.templateData);
+
+		categoryData.privileges = userPrivileges;
+		categoryData.showSelect = categoryData.privileges.editable;
+
+		res.locals.metaTags = [
+			{
+				name: 'title',
+				content: categoryData.name
+			},
+			{
+				property: 'og:title',
+				content: categoryData.name
+			},
+			{
+				name: 'description',
+				content: categoryData.description
+			},
+			{
+				property: "og:type",
+				content: 'website'
+			}
+		];
+
+		if (categoryData.backgroundImage) {
+			res.locals.metaTags.push({
+				name: 'og:image',
+				content: categoryData.backgroundImage
+			});
+		}
+
+		res.locals.linkTags = [
+			{
+				rel: 'alternate',
+				type: 'application/rss+xml',
+				href: nconf.get('url') + '/category/' + cid + '.rss'
+			},
+			{
+				rel: 'up',
+				href: nconf.get('url')
+			}
+		];
+
+		categoryData['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1;
+		categoryData.rssFeedUrl = nconf.get('relative_path') + '/category/' + categoryData.cid + '.rss';
+		categoryData.title = categoryData.name;
+		categoryData.pagination = pagination.create(currentPage, pageCount);
+		categoryData.pagination.rel.forEach(function(rel) {
+			rel.href = nconf.get('url') + '/category/' + categoryData.slug + rel.href;
+			res.locals.linkTags.push(rel);
+		});
+
+		res.render('category', categoryData);
 	});
 };
 
diff --git a/src/controllers/groups.js b/src/controllers/groups.js
index 837ba3b1f6..106df26075 100644
--- a/src/controllers/groups.js
+++ b/src/controllers/groups.js
@@ -1,14 +1,15 @@
 "use strict";
 
-var async = require('async'),
-	nconf = require('nconf'),
-	validator = require('validator'),
-	meta = require('../meta'),
-	groups = require('../groups'),
-	user = require('../user'),
-	helpers = require('./helpers'),
-	plugins = require('../plugins'),
-	groupsController = {};
+var async = require('async');
+var nconf = require('nconf');
+var validator = require('validator');
+
+var meta = require('../meta');
+var groups = require('../groups');
+var user = require('../user');
+var helpers = require('./helpers');
+
+var groupsController = {};
 
 groupsController.list = function(req, res, next) {
 	var sort = req.query.sort || 'alpha';
@@ -81,24 +82,23 @@ groupsController.details = function(req, res, callback) {
 				posts: function(next) {
 					groups.getLatestMemberPosts(res.locals.groupName, 10, req.uid, next);
 				},
-				isAdmin: async.apply(user.isAdministrator, req.uid)
+				isAdminOrGlobalMod: async.apply(user.isAdminOrGlobalMod, req.uid)
 			}, next);
-		},
-		function (results, next) {
-			if (!results.group) {
-				return callback();
-			}
-			results.title = '[[pages:group, ' + results.group.displayName + ']]';
-			results.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[pages:groups]]', url: '/groups' }, {text: results.group.displayName}]);
-			results.allowPrivateGroups = parseInt(meta.config.allowPrivateGroups, 10) === 1;
-			plugins.fireHook('filter:group.build', {req: req, res: res, templateData: results}, next);
 		}
 	], function(err, results) {
 		if (err) {
 			return callback(err);
 		}
 
-		res.render('groups/details', results.templateData);
+		if (!results.group) {
+			return callback();
+		}
+		results.group.isOwner = results.group.isOwner || results.isAdminOrGlobalMod;
+		results.title = '[[pages:group, ' + results.group.displayName + ']]';
+		results.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[pages:groups]]', url: '/groups' }, {text: results.group.displayName}]);
+		results.allowPrivateGroups = parseInt(meta.config.allowPrivateGroups, 10) === 1;
+
+		res.render('groups/details', results);
 	});
 };
 
diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js
index 058a1849b1..c91d68acc7 100644
--- a/src/controllers/helpers.js
+++ b/src/controllers/helpers.js
@@ -1,40 +1,49 @@
 'use strict';
 
-var nconf = require('nconf'),
-	async = require('async'),
-	validator = require('validator'),
+var nconf = require('nconf');
+var async = require('async');
+var validator = require('validator');
+var winston = require('winston');
 
-	translator = require('../../public/src/modules/translator'),
-	categories = require('../categories'),
-	plugins = require('../plugins'),
-	meta = require('../meta');
+var categories = require('../categories');
+var plugins = require('../plugins');
+var meta = require('../meta');
 
 var helpers = {};
 
 helpers.notAllowed = function(req, res, error) {
-	if (req.uid) {
-		if (res.locals.isAPI) {
-			res.status(403).json({
-				path: req.path.replace(/^\/api/, ''),
-				loggedIn: !!req.uid, error: error,
-				title: '[[global:403.title]]'
-			});
-		} else {
-			res.status(403).render('403', {
-				path: req.path,
-				loggedIn: !!req.uid, error: error,
-				title: '[[global:403.title]]'
-			});
+	plugins.fireHook('filter:helpers.notAllowed', {
+		req: req,
+		res: res,
+		error: error
+	}, function(err, data) {
+		if (err) {
+			return winston.error(err);
 		}
-	} else {
-		if (res.locals.isAPI) {
-			req.session.returnTo = nconf.get('relative_path') + req.url.replace(/^\/api/, '');
-			res.status(401).json('not-authorized');
+		if (req.uid) {
+			if (res.locals.isAPI) {
+				res.status(403).json({
+					path: req.path.replace(/^\/api/, ''),
+					loggedIn: !!req.uid, error: error,
+					title: '[[global:403.title]]'
+				});
+			} else {
+				res.status(403).render('403', {
+					path: req.path,
+					loggedIn: !!req.uid, error: error,
+					title: '[[global:403.title]]'
+				});
+			}
 		} else {
-			req.session.returnTo = nconf.get('relative_path') + req.url;
-			res.redirect(nconf.get('relative_path') + '/login');
+			if (res.locals.isAPI) {
+				req.session.returnTo = nconf.get('relative_path') + req.url.replace(/^\/api/, '');
+				res.status(401).json('not-authorized');
+			} else {
+				req.session.returnTo = nconf.get('relative_path') + req.url;
+				res.redirect(nconf.get('relative_path') + '/login');
+			}
 		}
-	}
+	});
 };
 
 helpers.redirect = function(res, url) {
@@ -71,6 +80,13 @@ helpers.buildCategoryBreadcrumbs = function(cid, callback) {
 			return callback(err);
 		}
 
+		if (!meta.config.homePageRoute && meta.config.homePageCustom) {
+			breadcrumbs.unshift({
+				text: '[[global:header.categories]]',
+				url: nconf.get('relative_path') + '/categories'
+			});
+		}
+
 		breadcrumbs.unshift({
 			text: '[[global:home]]',
 			url: nconf.get('relative_path') + '/'
diff --git a/src/controllers/index.js b/src/controllers/index.js
index d0cc1fe83e..d6d9d74c55 100644
--- a/src/controllers/index.js
+++ b/src/controllers/index.js
@@ -3,6 +3,7 @@
 var async = require('async');
 var nconf = require('nconf');
 var validator = require('validator');
+var winston = require('winston');
 
 var meta = require('../meta');
 var user = require('../user');
@@ -12,6 +13,7 @@ var helpers = require('./helpers');
 
 var Controllers = {
 	topics: require('./topics'),
+	posts: require('./posts'),
 	categories: require('./categories'),
 	category: require('./category'),
 	unread: require('./unread'),
@@ -30,7 +32,7 @@ var Controllers = {
 
 
 Controllers.home = function(req, res, next) {
-	var route = meta.config.homePageRoute || meta.config.homePageCustom || 'categories';
+	var route = meta.config.homePageRoute || (meta.config.homePageCustom || '').replace(/^\/+/, '') || 'categories';
 
 	user.getSettings(req.uid, function(err, settings) {
 		if (err) {
@@ -95,26 +97,48 @@ Controllers.reset = function(req, res, next) {
 };
 
 Controllers.login = function(req, res, next) {
-	var data = {},
-		loginStrategies = require('../routes/authentication').getLoginStrategies(),
-		registrationType = meta.config.registrationType || 'normal';
+	var data = {};
+	var loginStrategies = require('../routes/authentication').getLoginStrategies();
+	var registrationType = meta.config.registrationType || 'normal';
+
+	var allowLoginWith = (meta.config.allowLoginWith || 'username-email');
+
+	var errorText;
+	if (req.query.error === 'csrf-invalid') {
+		errorText = '[[error:csrf-invalid]]';
+	}
 
 	data.alternate_logins = loginStrategies.length > 0;
 	data.authentication = loginStrategies;
 	data.allowLocalLogin = parseInt(meta.config.allowLocalLogin, 10) === 1 || parseInt(req.query.local, 10) === 1;
 	data.allowRegistration = registrationType === 'normal' || registrationType === 'admin-approval';
-	data.allowLoginWith = '[[login:' + (meta.config.allowLoginWith || 'username-email') + ']]';
+	data.allowLoginWith = '[[login:' + allowLoginWith + ']]';
 	data.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[global:login]]'}]);
-	data.error = req.flash('error')[0];
+	data.error = req.flash('error')[0] || errorText;
 	data.title = '[[pages:login]]';
 
 	if (!data.allowLocalLogin && !data.allowRegistration && data.alternate_logins && data.authentication.length === 1) {
-		return helpers.redirect(res, {
-			external: data.authentication[0].url
+		if (res.locals.isAPI) {
+			return helpers.redirect(res, {
+				external: data.authentication[0].url
+			});
+		} else {
+			return res.redirect(data.authentication[0].url);
+		}
+	}
+	if (req.uid) {
+		user.getUserFields(req.uid, ['username', 'email'], function(err, user) {
+			if (err) {
+				return next(err);
+			}
+			data.username = allowLoginWith === 'email' ? user.email : user.username;
+			data.alternate_logins = [];
+			res.render('login', data);
 		});
+	} else {
+		res.render('login', data);
 	}
 
-	res.render('login', data);
 };
 
 Controllers.register = function(req, res, next) {
@@ -124,6 +148,11 @@ Controllers.register = function(req, res, next) {
 		return next();
 	}
 
+	var errorText;
+	if (req.query.error === 'csrf-invalid') {
+		errorText = '[[error:csrf-invalid]]';
+	}
+
 	async.waterfall([
 		function(next) {
 			if (registrationType === 'invite-only' || registrationType === 'admin-invite-only') {
@@ -134,32 +163,56 @@ Controllers.register = function(req, res, next) {
 		},
 		function(next) {
 			plugins.fireHook('filter:parse.post', {postData: {content: meta.config.termsOfUse || ''}}, next);
-		},
-		function(tos, next) {
-			var loginStrategies = require('../routes/authentication').getLoginStrategies();
-			var data = {
-				'register_window:spansize': loginStrategies.length ? 'col-md-6' : 'col-md-12',
-				'alternate_logins': !!loginStrategies.length
-			};
-
-			data.authentication = loginStrategies;
-
-			data.minimumUsernameLength = parseInt(meta.config.minimumUsernameLength, 10);
-			data.maximumUsernameLength = parseInt(meta.config.maximumUsernameLength, 10);
-			data.minimumPasswordLength = parseInt(meta.config.minimumPasswordLength, 10);
-			data.termsOfUse = tos.postData.content;
-			data.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[register:register]]'}]);
-			data.regFormEntry = [];
-			data.error = req.flash('error')[0];
-			data.title = '[[pages:register]]';
-
-			plugins.fireHook('filter:register.build', {req: req, res: res, templateData: data}, next);
 		}
-	], function(err, data) {
+	], function(err, termsOfUse) {
 		if (err) {
 			return next(err);
 		}
-		res.render('register', data.templateData);
+		var loginStrategies = require('../routes/authentication').getLoginStrategies();
+		var data = {
+			'register_window:spansize': loginStrategies.length ? 'col-md-6' : 'col-md-12',
+			'alternate_logins': !!loginStrategies.length
+		};
+
+		data.authentication = loginStrategies;
+
+		data.minimumUsernameLength = parseInt(meta.config.minimumUsernameLength, 10);
+		data.maximumUsernameLength = parseInt(meta.config.maximumUsernameLength, 10);
+		data.minimumPasswordLength = parseInt(meta.config.minimumPasswordLength, 10);
+		data.termsOfUse = termsOfUse.postData.content;
+		data.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[register:register]]'}]);
+		data.regFormEntry = [];
+		data.error = req.flash('error')[0] || errorText;
+		data.title = '[[pages:register]]';
+
+		res.render('register', data);
+	});
+};
+
+Controllers.registerInterstitial = function(req, res, next) {
+	if (!req.session.hasOwnProperty('registration')) {
+		return res.redirect(nconf.get('relative_path') + '/register');
+	}
+
+	plugins.fireHook('filter:register.interstitial', {
+		userData: req.session.registration,
+		interstitials: []
+	}, function(err, data) {
+		if (!data.interstitials.length) {
+			return next();
+		}
+
+		var renders = data.interstitials.map(function(interstitial) {
+			return async.apply(req.app.render.bind(req.app), interstitial.template, interstitial.data || {});
+		});
+		var errors = req.flash('error');
+
+		async.parallel(renders, function(err, sections) {
+			res.render('registerComplete', {
+				errors: errors,
+				sections: sections
+			});
+		});
 	});
 };
 
@@ -185,7 +238,7 @@ Controllers.compose = function(req, res, next) {
 	});
 };
 
-Controllers.confirmEmail = function(req, res, next) {
+Controllers.confirmEmail = function(req, res) {
 	user.email.confirm(req.params.code, function (err) {
 		res.render('confirm', {
 			error: err ? err.message : '',
@@ -197,6 +250,10 @@ Controllers.confirmEmail = function(req, res, next) {
 Controllers.sitemap = {};
 Controllers.sitemap.render = function(req, res, next) {
 	sitemap.render(function(err, tplData) {
+		if (err) {
+			return next(err);
+		}
+
 		Controllers.render('sitemap', tplData, function(err, xml) {
 			res.header('Content-Type', 'application/xml');
 			res.send(xml);
@@ -307,13 +364,13 @@ Controllers.manifest = function(req, res) {
 	res.status(200).json(manifest);
 };
 
-Controllers.outgoing = function(req, res, next) {
-	var url = req.query.url,
-		data = {
-			url: validator.escape(url),
-			title: meta.config.title,
-			breadcrumbs: helpers.buildBreadcrumbs([{text: '[[notifications:outgoing_link]]'}])
-		};
+Controllers.outgoing = function(req, res) {
+	var url = req.query.url;
+	var data = {
+		url: validator.escape(String(url)),
+		title: meta.config.title,
+		breadcrumbs: helpers.buildBreadcrumbs([{text: '[[notifications:outgoing_link]]'}])
+	};
 
 	if (url) {
 		res.render('outgoing', data);
@@ -329,4 +386,73 @@ Controllers.termsOfUse = function(req, res, next) {
 	res.render('tos', {termsOfUse: meta.config.termsOfUse});
 };
 
+Controllers.handle404 = function(req, res) {
+	var relativePath = nconf.get('relative_path');
+	var isLanguage = new RegExp('^' + relativePath + '/language/.*/.*.json');
+	var isClientScript = new RegExp('^' + relativePath + '\\/src\\/.+\\.js');
+
+	if (plugins.hasListeners('action:meta.override404')) {
+		return plugins.fireHook('action:meta.override404', {
+			req: req,
+			res: res,
+			error: {}
+		});
+	}
+
+	if (isClientScript.test(req.url)) {
+		res.type('text/javascript').status(200).send('');
+	} else if (isLanguage.test(req.url)) {
+		res.status(200).json({});
+	} else if (req.path.startsWith(relativePath + '/uploads') || (req.get('accept') && req.get('accept').indexOf('text/html') === -1) || req.path === '/favicon.ico') {
+		meta.errors.log404(req.path || '');
+		res.sendStatus(404);
+	} else if (req.accepts('html')) {
+		if (process.env.NODE_ENV === 'development') {
+			winston.warn('Route requested but not found: ' + req.url);
+		}
+
+		meta.errors.log404(req.path.replace(/^\/api/, '') || '');
+		res.status(404);
+
+		var path = String(req.path || '');
+
+		if (res.locals.isAPI) {
+			return res.json({path: validator.escape(path.replace(/^\/api/, '')), title: '[[global:404.title]]'});
+		}
+
+		req.app.locals.middleware.buildHeader(req, res, function() {
+			res.render('404', {path: validator.escape(path), title: '[[global:404.title]]'});
+		});
+	} else {
+		res.status(404).type('txt').send('Not found');
+	}
+};
+
+Controllers.handleErrors = function(err, req, res, next) {
+	switch (err.code) {
+		case 'EBADCSRFTOKEN':
+			winston.error(req.path + '\n', err.message);
+			return res.sendStatus(403);
+		case 'blacklisted-ip':
+			return res.status(403).type('text/plain').send(err.message);
+	}
+
+	if (parseInt(err.status, 10) === 302 && err.path) {
+		return res.locals.isAPI ? res.status(302).json(err.path) : res.redirect(err.path);
+	}
+
+	winston.error(req.path + '\n', err.stack);
+
+	res.status(err.status || 500);
+
+	var path = String(req.path || '');
+	if (res.locals.isAPI) {
+		res.json({path: validator.escape(path), error: err.message});
+	} else {
+		req.app.locals.middleware.buildHeader(req, res, function() {
+			res.render('500', {path: validator.escape(path), error: validator.escape(String(err.message))});
+		});
+	}
+};
+
 module.exports = Controllers;
diff --git a/src/controllers/popular.js b/src/controllers/popular.js
index 813f3527b8..353fd9e33c 100644
--- a/src/controllers/popular.js
+++ b/src/controllers/popular.js
@@ -1,15 +1,15 @@
 
 'use strict';
 
-var nconf = require('nconf'),
-	topics = require('../topics'),
-	plugins = require('../plugins'),
-	meta = require('../meta'),
-	helpers = require('./helpers');
+var nconf = require('nconf');
+var topics = require('../topics');
+var meta = require('../meta');
+var helpers = require('./helpers');
 
 var popularController = {};
 
-var anonCache = {}, lastUpdateTime = 0;
+var anonCache = {};
+var lastUpdateTime = 0;
 
 var terms = {
 	daily: 'day',
@@ -48,7 +48,8 @@ popularController.get = function(req, res, next) {
 			topics: topics,
 			'feeds:disableRSS': parseInt(meta.config['feeds:disableRSS'], 10) === 1,
 			rssFeedUrl: nconf.get('relative_path') + '/popular/' + (req.params.term || 'daily') + '.rss',
-			title: '[[pages:popular-' + term + ']]'
+			title: '[[pages:popular-' + term + ']]',
+			term: term
 		};
 
 		if (req.path.startsWith('/api/popular') || req.path.startsWith('/popular')) {
@@ -66,12 +67,7 @@ popularController.get = function(req, res, next) {
 			lastUpdateTime = Date.now();
 		}
 
-		plugins.fireHook('filter:popular.build', {req: req, res: res, term: term, templateData: data}, function(err, data) {
-			if (err) {
-				return next(err);
-			}
-			res.render('popular', data.templateData);
-		});
+		res.render('popular', data);
 	});
 };
 
diff --git a/src/controllers/posts.js b/src/controllers/posts.js
new file mode 100644
index 0000000000..be96fa7e43
--- /dev/null
+++ b/src/controllers/posts.js
@@ -0,0 +1,24 @@
+"use strict";
+
+var posts = require('../posts');
+var helpers = require('./helpers');
+
+var postsController = {};
+
+postsController.redirectToPost = function(req, res, callback) {
+	var pid = parseInt(req.params.pid, 10);
+	if (!pid) {
+		return callback();
+	}
+
+	posts.generatePostPath(pid, req.uid, function(err, path) {
+		if (err || !path) {
+			return callback(err);
+		}
+
+		helpers.redirect(res, path);
+	});
+};
+
+
+module.exports = postsController;
diff --git a/src/controllers/recent.js b/src/controllers/recent.js
index 242d26ac12..fe9355c533 100644
--- a/src/controllers/recent.js
+++ b/src/controllers/recent.js
@@ -1,38 +1,68 @@
 
 'use strict';
 
-var nconf = require('nconf');
 var async = require('async');
+var nconf = require('nconf');
+
+var db = require('../database');
+var privileges = require('../privileges');
+var user = require('../user');
 var topics = require('../topics');
 var meta = require('../meta');
 var helpers = require('./helpers');
-var plugins = require('../plugins');
+var pagination = require('../pagination');
 
 var recentController = {};
 
 recentController.get = function(req, res, next) {
-
-	var stop = (parseInt(meta.config.topicsPerList, 10) || 20) - 1;
+	var page = parseInt(req.query.page, 10) || 1;
+	var pageCount = 1;
+	var stop = 0;
+	var topicCount = 0;
+	var settings;
 
 	async.waterfall([
 		function (next) {
-			topics.getTopicsFromSet('topics:recent', req.uid, 0, stop, next);
+			async.parallel({
+				settings: function(next) {
+					user.getSettings(req.uid, next);
+				},
+				tids: function (next) {
+					db.getSortedSetRevRange('topics:recent', 0, 199, next);
+				}
+			}, next);
 		},
-		function (data, next) {
-			data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1;
-			data.rssFeedUrl = nconf.get('relative_path') + '/recent.rss';
-			data.title = '[[pages:recent]]';
-			if (req.path.startsWith('/api/recent') || req.path.startsWith('/recent')) {
-				data.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[recent:title]]'}]);
-			}
+		function (results, next) {
+			settings = results.settings;
+			privileges.topics.filterTids('read', results.tids, req.uid, next);
+		},
+		function (tids, next) {
+			var start = Math.max(0, (page - 1) * settings.topicsPerPage);
+			stop = start + settings.topicsPerPage - 1;
 
-			plugins.fireHook('filter:recent.build', {req: req, res: res, templateData: data}, next);
+			topicCount = tids.length;
+			pageCount = Math.max(1, Math.ceil(topicCount / settings.topicsPerPage));
+			tids = tids.slice(start, stop + 1);
+
+			topics.getTopicsByTids(tids, req.uid, next);
 		}
-	], function(err, data) {
+	], function(err, topics) {
 		if (err) {
 			return next(err);
 		}
-		res.render('recent', data.templateData);
+
+		var data = {};
+		data.topics = topics;
+		data.nextStart = stop + 1;
+		data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1;
+		data.rssFeedUrl = nconf.get('relative_path') + '/recent.rss';
+		data.title = '[[pages:recent]]';
+		data.pagination = pagination.create(page, pageCount);
+		if (req.path.startsWith('/api/recent') || req.path.startsWith('/recent')) {
+			data.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[recent:title]]'}]);
+		}
+
+		res.render('recent', data);
 	});
 };
 
diff --git a/src/controllers/search.js b/src/controllers/search.js
index dee14e7c1f..2a7f6b145c 100644
--- a/src/controllers/search.js
+++ b/src/controllers/search.js
@@ -1,14 +1,14 @@
 
 'use strict';
 
-var async = require('async'),
+var async = require('async');
 
-	meta = require('../meta'),
-	plugins = require('../plugins'),
-	search = require('../search'),
-	categories = require('../categories'),
-	pagination = require('../pagination'),
-	helpers = require('./helpers');
+var meta = require('../meta');
+var plugins = require('../plugins');
+var search = require('../search');
+var categories = require('../categories');
+var pagination = require('../pagination');
+var helpers = require('./helpers');
 
 
 var searchController = {};
@@ -61,12 +61,7 @@ searchController.search = function(req, res, next) {
 		searchData.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[global:search]]'}]);
 		searchData.expandSearch = !req.params.term;
 
-		plugins.fireHook('filter:search.build', {data: data, results: searchData}, function(err, data) {
-			if (err) {
-				return next(err);
-			}
-			res.render('search', data.results);
-		});
+		res.render('search', searchData);
 	});
 };
 
diff --git a/src/controllers/tags.js b/src/controllers/tags.js
index af8f6058c0..45ab3424aa 100644
--- a/src/controllers/tags.js
+++ b/src/controllers/tags.js
@@ -5,15 +5,16 @@ var async = require('async');
 var nconf = require('nconf');
 var validator = require('validator');
 
-var meta = require('../meta');
+var user = require('../user');
 var topics = require('../topics');
+var pagination = require('../pagination');
 var helpers =  require('./helpers');
 
 var tagsController = {};
 
 tagsController.getTag = function(req, res, next) {
 	var tag = validator.escape(req.params.tag);
-	var stop = (parseInt(meta.config.topicsPerList, 10) || 20) - 1;
+	var page = parseInt(req.query.page, 10) || 1;
 
 	var templateData = {
 		topics: [],
@@ -21,18 +22,33 @@ tagsController.getTag = function(req, res, next) {
 		breadcrumbs: helpers.buildBreadcrumbs([{text: '[[tags:tags]]', url: '/tags'}, {text: tag}]),
 		title: '[[pages:tag, ' + tag + ']]'
 	};
-
+	var settings;
+	var topicCount = 0;
 	async.waterfall([
 		function (next) {
-			topics.getTagTids(req.params.tag, 0, stop, next);
+			user.getSettings(req.uid, next);
 		},
-		function (tids, next) {
-			if (Array.isArray(tids) && !tids.length) {
+		function (_settings, next) {
+			settings = _settings;
+			var start = Math.max(0, (page - 1) * settings.topicsPerPage);
+			var stop = start + settings.topicsPerPage - 1;
+			templateData.nextStart = stop + 1;
+			async.parallel({
+				topicCount: function(next) {
+					topics.getTagTopicCount(tag, next);
+				},
+				tids: function(next) {
+					topics.getTagTids(req.params.tag, start, stop, next);
+				}
+			}, next);
+		},
+		function (results, next) {
+			if (Array.isArray(results.tids) && !results.tids.length) {
 				topics.deleteTag(req.params.tag);
 				return res.render('tag', templateData);
 			}
-
-			topics.getTopics(tids, req.uid, next);
+			topicCount = results.topicCount;
+			topics.getTopics(results.tids, req.uid, next);
 		}
 	], function(err, topics) {
 		if (err) {
@@ -54,7 +70,9 @@ tagsController.getTag = function(req, res, next) {
 			}
 		];
 		templateData.topics = topics;
-		templateData.nextStart = stop + 1;
+
+		var pageCount =	Math.max(1, Math.ceil(topicCount / settings.topicsPerPage));
+		templateData.pagination = pagination.create(page, pageCount);
 
 		res.render('tag', templateData);
 	});
diff --git a/src/controllers/topics.js b/src/controllers/topics.js
index c3c2847778..1e41cfe981 100644
--- a/src/controllers/topics.js
+++ b/src/controllers/topics.js
@@ -50,7 +50,7 @@ topicsController.get = function(req, res, callback) {
 
 			userPrivileges = results.privileges;
 
-			if (!userPrivileges.read || (parseInt(results.topic.deleted, 10) && !userPrivileges.view_deleted)) {
+			if (!userPrivileges.read || !userPrivileges['topics:read'] || (parseInt(results.topic.deleted, 10) && !userPrivileges.view_deleted)) {
 				return helpers.notAllowed(req, res);
 			}
 
@@ -170,8 +170,10 @@ topicsController.get = function(req, res, callback) {
 			var ogImageUrl = '';
 			if (topicData.thumb) {
 				ogImageUrl = topicData.thumb;
-			} else if (postAtIndex && postAtIndex.user && postAtIndex.user.picture){
+			} else if (postAtIndex && postAtIndex.user && postAtIndex.user.picture) {
 				ogImageUrl = postAtIndex.user.picture;
+			} else if (meta.config['og:image']) {
+				ogImageUrl = meta.config['og:image'];
 			} else if (meta.config['brand:logo']) {
 				ogImageUrl = meta.config['brand:logo'];
 			} else {
@@ -261,6 +263,9 @@ topicsController.get = function(req, res, callback) {
 		data['reputation:disabled'] = parseInt(meta.config['reputation:disabled'], 10) === 1;
 		data['downvote:disabled'] = parseInt(meta.config['downvote:disabled'], 10) === 1;
 		data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1;
+		data.bookmarkThreshold = parseInt(meta.config.bookmarkThreshold, 10) || 5;
+		data.postEditDuration = parseInt(meta.config.postEditDuration, 10) || 0;
+		data.postDeleteDuration = parseInt(meta.config.postDeleteDuration, 10) || 0;
 		data.scrollToMyPost = settings.scrollToMyPost;
 		data.rssFeedUrl = nconf.get('relative_path') + '/topic/' + data.tid + '.rss';
 		data.pagination = pagination.create(currentPage, pageCount);
@@ -287,12 +292,7 @@ topicsController.get = function(req, res, callback) {
 			});
 		}
 
-		plugins.fireHook('filter:topic.build', {req: req, res: res, templateData: data}, function(err, data) {
-			if (err) {
-				return callback(err);
-			}
-			res.render('topic', data.templateData);
-		});
+		res.render('topic', data);
 	});
 };
 
@@ -331,5 +331,37 @@ topicsController.teaser = function(req, res, next) {
 	});
 };
 
+topicsController.pagination = function(req, res, callback) {
+	var tid = req.params.topic_id;
+	var currentPage = parseInt(req.query.page, 10) || 1;
+
+	if (!utils.isNumber(tid)) {
+		return callback();
+	}
+
+	async.parallel({
+		privileges: async.apply(privileges.topics.get, tid, req.uid),
+		settings: async.apply(user.getSettings, req.uid),
+		topic: async.apply(topics.getTopicData, tid)
+	}, function (err, results) {
+		if (err || !results.topic) {
+			return callback(err);
+		}
+
+		if (!results.privileges.read || (parseInt(results.topic.deleted, 10) && !results.privileges.view_deleted)) {
+			return helpers.notAllowed(req, res);
+		}
+
+		var postCount = parseInt(results.topic.postcount, 10);
+		var pageCount = Math.max(1, Math.ceil((postCount - 1) / results.settings.postsPerPage));
+
+		var paginationData = pagination.create(currentPage, pageCount);
+		paginationData.rel.forEach(function(rel) {
+			rel.href = nconf.get('url') + '/topic/' + results.topic.slug + rel.href;
+		});
+
+		res.json(paginationData);
+	});
+};
 
 module.exports = topicsController;
diff --git a/src/controllers/unread.js b/src/controllers/unread.js
index d81774661f..82efcd2dd3 100644
--- a/src/controllers/unread.js
+++ b/src/controllers/unread.js
@@ -2,69 +2,128 @@
 'use strict';
 
 var async = require('async');
-var meta = require('../meta');
+var querystring = require('querystring');
+
 var categories = require('../categories');
 var privileges = require('../privileges');
-var user = require('../user')
+var pagination = require('../pagination');
+var user = require('../user');
 var topics = require('../topics');
 var helpers = require('./helpers');
-var plugins = require('../plugins');
 
 var unreadController = {};
 
+var validFilter = {'': true, 'new': true, 'watched': true};
+
 unreadController.get = function(req, res, next) {
-	var stop = (parseInt(meta.config.topicsPerList, 10) || 20) - 1;
+	var page = parseInt(req.query.page, 10) || 1;
 	var results;
 	var cid = req.query.cid;
+	var filter = req.params.filter || '';
 
+	if (!validFilter[filter]) {
+		return next();
+	}
+	var settings;
 	async.waterfall([
 		function(next) {
 			async.parallel({
 				watchedCategories: function(next) {
-					user.getWatchedCategories(req.uid, next);
+					getWatchedCategories(req.uid, cid, next);
 				},
-				unreadTopics: function(next) {
-					topics.getUnreadTopics(cid, req.uid, 0, stop, next);
+				settings: function(next) {
+					user.getSettings(req.uid, next);
 				}
 			}, next);
 		},
 		function(_results, next) {
 			results = _results;
-
-			privileges.categories.filterCids('read', results.watchedCategories, req.uid, next);
-		},
-		function(cids, next) {
-			categories.getCategoriesFields(cids, ['cid', 'name', 'slug', 'icon', 'link', 'color', 'bgColor'], next);
-		},
-		function(categories, next) {
-			categories = categories.filter(function(category) {
-				return category && !category.link;
-			});
-			categories.forEach(function(category) {
-				category.selected = parseInt(category.cid, 10) === parseInt(cid, 10);
-				if (category.selected) {
-					results.unreadTopics.selectedCategory = category;
-				}
-			});
-			results.unreadTopics.categories = categories;
-
-			results.unreadTopics.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[unread:title]]'}]);
-			results.unreadTopics.title = '[[pages:unread]]';
-
-			plugins.fireHook('filter:unread.build', {req: req, res: res, templateData: results.unreadTopics}, next);
+			settings = results.settings;
+			var start = Math.max(0, (page - 1) * settings.topicsPerPage);
+			var stop = start + settings.topicsPerPage - 1;
+			topics.getUnreadTopics(cid, req.uid, start, stop, filter, next);
 		}
 	], function(err, data) {
 		if (err) {
 			return next(err);
 		}
 
-		res.render('unread', data.templateData);
+		data.pageCount = Math.max(1, Math.ceil(data.topicCount / settings.topicsPerPage));
+		data.pagination = pagination.create(page, data.pageCount, req.query);
+
+		if (settings.usePagination && (page < 1 || page > data.pageCount)) {
+			req.query.page = Math.max(1, Math.min(data.pageCount, page));
+			return helpers.redirect(res, '/unread?' + querystring.stringify(req.query));
+		}
+
+		data.categories = results.watchedCategories.categories;
+		data.selectedCategory = results.watchedCategories.selectedCategory;
+
+		data.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[unread:title]]'}]);
+		data.title = '[[pages:unread]]';
+		data.filters = [{
+			name: '[[unread:all-topics]]',
+			url: 'unread',
+			selected: filter === '',
+			filter: ''
+		}, {
+			name: '[[unread:new-topics]]',
+			url: 'unread/new',
+			selected: filter === 'new',
+			filter: 'new'
+		}, {
+			name: '[[unread:watched-topics]]',
+			url: 'unread/watched',
+			selected: filter === 'watched',
+			filter: 'watched'
+		}];
+
+		data.selectedFilter = data.filters.filter(function(filter) {
+			return filter && filter.selected;
+		})[0];
+
+		data.querystring = req.query.cid ? ('?cid=' + req.query.cid) : '';
+
+		res.render('unread', data);
 	});
 };
 
+function getWatchedCategories(uid, selectedCid, callback) {
+	async.waterfall([
+		function (next) {
+			user.getWatchedCategories(uid, next);
+		},
+		function (cids, next) {
+			privileges.categories.filterCids('read', cids, uid, next);
+		},
+		function (cids, next) {
+			categories.getCategoriesFields(cids, ['cid', 'name', 'slug', 'icon', 'link', 'color', 'bgColor'], next);
+		},
+		function (categoryData, next) {
+			categoryData = categoryData.filter(function(category) {
+				return category && !category.link;
+			});
+			var selectedCategory;
+			categoryData.forEach(function(category) {
+				category.selected = parseInt(category.cid, 10) === parseInt(selectedCid, 10);
+				if (category.selected) {
+					selectedCategory = category;
+				}
+			});
+			next(null, {categories: categoryData, selectedCategory: selectedCategory});
+		}
+	], callback);
+}
+
 
 unreadController.unreadTotal = function(req, res, next) {
-	topics.getTotalUnread(req.uid, function (err, data) {
+	var filter = req.params.filter || '';
+
+	if (!validFilter[filter]) {
+		return next();
+	}
+
+	topics.getTotalUnread(req.uid, filter, function (err, data) {
 		if (err) {
 			return next(err);
 		}
diff --git a/src/controllers/uploads.js b/src/controllers/uploads.js
index 59253c5666..16bc3b7c31 100644
--- a/src/controllers/uploads.js
+++ b/src/controllers/uploads.js
@@ -6,6 +6,7 @@ var async = require('async');
 var nconf = require('nconf');
 var validator = require('validator');
 var winston = require('winston');
+var mime = require('mime');
 
 var meta = require('../meta');
 var file = require('../file');
@@ -14,7 +15,7 @@ var image = require('../image');
 
 var uploadsController = {};
 
-uploadsController.upload = function(req, res, filesIterator, next) {
+uploadsController.upload = function(req, res, filesIterator) {
 	var files = req.files.files;
 
 	if (!req.user && meta.config.allowGuestUploads !== '1') {
@@ -63,11 +64,57 @@ uploadsController.uploadPost = function(req, res, next) {
 					return next(new Error('[[error:uploads-are-disabled]]'));
 				}
 				uploadFile(req.uid, uploadedFile, next);
+			},
+			function(fileObj, next) {
+				if (!isImage || parseInt(meta.config.maximumImageWidth, 10) === 0) {
+					// Not an image, or resizing disabled. No need to resize.
+					return next(null, fileObj);
+				}
+
+				resizeImage(fileObj, next);
 			}
 		], next);
 	}, next);
 };
 
+function resizeImage(fileObj, callback) {
+	var fullPath;
+	async.waterfall([
+		function(next) {
+			fullPath = path.join(nconf.get('base_dir'), nconf.get('upload_path'), '..', fileObj.url);
+
+			image.size(fullPath, next);
+		},
+		function (imageData, next) {
+			if (imageData.width < parseInt(meta.config.maximumImageWidth, 10) || 760) {
+				return callback(null, fileObj);
+			}
+
+			var dirname = path.dirname(fullPath);
+			var extname = path.extname(fullPath);
+			var basename = path.basename(fullPath, extname);
+
+			image.resizeImage({
+				path: fullPath,
+				target: path.join(dirname, basename + '-resized' + extname),
+				extension: extname,
+				width: parseInt(meta.config.maximumImageWidth, 10) || 760
+			}, next);
+		},
+		function (next) {
+
+			// Return the resized version to the composer/postData
+			var dirname = path.dirname(fileObj.url);
+			var extname = path.extname(fileObj.url);
+			var basename = path.basename(fileObj.url, extname);
+
+			fileObj.url = path.join(dirname, basename + '-resized' + extname);
+
+			next(null, fileObj);
+		}
+	], callback);
+}
+
 uploadsController.uploadThumb = function(req, res, next) {
 	if (parseInt(meta.config.allowTopicsThumbnail, 10) !== 1) {
 		deleteTempFiles(req.files.files);
@@ -138,6 +185,9 @@ function uploadFile(uid, uploadedFile, callback) {
 	if (meta.config.hasOwnProperty('allowedFileExtensions')) {
 		var allowed = file.allowedExtensions();
 		var extension = path.extname(uploadedFile.name);
+		if (!extension) {
+			extension = '.' + mime.extension(uploadedFile.type);
+		}
 		if (allowed.length > 0 && allowed.indexOf(extension) === -1) {
 			return callback(new Error('[[error:invalid-file-type, ' + allowed.join('&#44; ') + ']]'));
 		}
@@ -147,9 +197,14 @@ function uploadFile(uid, uploadedFile, callback) {
 }
 
 function saveFileToLocal(uploadedFile, callback) {
+	var extension = path.extname(uploadedFile.name);
+	if (!extension && uploadedFile.type) {
+		extension = '.' + mime.extension(uploadedFile.type);
+	}
+
 	var filename = uploadedFile.name || 'upload';
 
-	filename = Date.now() + '-' + validator.escape(filename).substr(0, 255);
+	filename = Date.now() + '-' + validator.escape(filename.replace(extension, '')).substr(0, 255) + extension;
 	file.saveFileToLocal(filename, 'files', uploadedFile.path, function(err, upload) {
 		if (err) {
 			return callback(err);
diff --git a/src/controllers/users.js b/src/controllers/users.js
index 31ac0bd1cc..4ee7e5a9ec 100644
--- a/src/controllers/users.js
+++ b/src/controllers/users.js
@@ -5,7 +5,6 @@ var user = require('../user');
 var meta = require('../meta');
 
 var pagination = require('../pagination');
-var plugins = require('../plugins');
 var db = require('../database');
 var helpers = require('./helpers');
 
@@ -70,6 +69,20 @@ usersController.getBannedUsers = function(req, res, next) {
 	});
 };
 
+usersController.getFlaggedUsers = function(req, res, next) {
+	usersController.getUsers('users:flags', req.uid, req.query.page, function(err, userData) {
+		if (err) {
+			return next(err);
+		}
+
+		if (!userData.isAdminOrGlobalMod) {
+			return next();
+		}
+
+		render(req, res, userData, next);
+	});
+};
+
 usersController.renderUsersPage = function(set, req, res, next) {
 	usersController.getUsers(set, req.uid, req.query.page, function(err, userData) {
 		if (err) {
@@ -80,23 +93,16 @@ usersController.renderUsersPage = function(set, req, res, next) {
 };
 
 usersController.getUsers = function(set, uid, page, callback) {
-	var setToTitles = {
-		'users:postcount': '[[pages:users/sort-posts]]',
-		'users:reputation': '[[pages:users/sort-reputation]]',
-		'users:joindate': '[[pages:users/latest]]',
-		'users:online': '[[pages:users/online]]',
-		'users:banned': '[[pages:users/banned]]'
+	var setToData = {
+		'users:postcount': {title: '[[pages:users/sort-posts]]', crumb: '[[users:top_posters]]'},
+		'users:reputation': {title: '[[pages:users/sort-reputation]]', crumb: '[[users:most_reputation]]'},
+		'users:joindate': {title: '[[pages:users/latest]]', crumb: '[[global:users]]'},
+		'users:online': {title: '[[pages:users/online]]', crumb: '[[global:online]]'},
+		'users:banned': {title: '[[pages:users/banned]]', crumb: '[[user:banned]]'},
+		'users:flags': {title: '[[pages:users/most-flags]]', crumb: '[[users:most_flags]]'},
 	};
 
-	var setToCrumbs = {
-		'users:postcount': '[[users:top_posters]]',
-		'users:reputation': '[[users:most_reputation]]',
-		'users:joindate': '[[global:users]]',
-		'users:online': '[[global:online]]',
-		'users:banned': '[[user:banned]]'
-	};
-
-	var breadcrumbs = [{text: setToCrumbs[set]}];
+	var breadcrumbs = [{text: setToData[set].crumb}];
 
 	if (set !== 'users:joindate') {
 		breadcrumbs.unshift({text: '[[global:users]]', url: '/users'});
@@ -127,7 +133,8 @@ usersController.getUsers = function(set, uid, page, callback) {
 			loadmore_display: results.usersData.count > (stop - start + 1) ? 'block' : 'hide',
 			users: results.usersData.users,
 			pagination: pagination.create(page, pageCount),
-			title: setToTitles[set] || '[[pages:users/latest]]',
+			userCount: results.usersData.count,
+			title: setToData[set].title || '[[pages:users/latest]]',
 			breadcrumbs: helpers.buildBreadcrumbs(breadcrumbs),
 			setName: set,
 			isAdminOrGlobalMod: results.isAdministrator || results.isGlobalMod
@@ -148,6 +155,8 @@ usersController.getUsersAndCount = function(set, uid, start, stop, callback) {
 				db.sortedSetCount('users:online', now - 300000, '+inf', next);
 			} else if (set === 'users:banned') {
 				db.sortedSetCard('users:banned', next);
+			} else if (set === 'users:flags') {
+				db.sortedSetCard('users:flags', next);
 			} else {
 				db.getObjectField('global', 'userCount', next);
 			}
@@ -165,26 +174,22 @@ usersController.getUsersAndCount = function(set, uid, start, stop, callback) {
 };
 
 function render(req, res, data, next) {
-	plugins.fireHook('filter:users.build', {req: req, res: res, templateData: data }, function(err, data) {
+	var registrationType = meta.config.registrationType;
+
+	data.maximumInvites = meta.config.maximumInvites;
+	data.inviteOnly = registrationType === 'invite-only' || registrationType === 'admin-invite-only';
+	data.adminInviteOnly = registrationType === 'admin-invite-only';
+	data['reputation:disabled'] = parseInt(meta.config['reputation:disabled'], 10) === 1;
+
+	user.getInvitesNumber(req.uid, function(err, numInvites) {
 		if (err) {
 			return next(err);
 		}
 
-		var registrationType = meta.config.registrationType;
+		res.append('X-Total-Count', data.userCount);
+		data.invites = numInvites;
 
-		data.templateData.maximumInvites = meta.config.maximumInvites;
-		data.templateData.inviteOnly = registrationType === 'invite-only' || registrationType === 'admin-invite-only';
-		data.templateData.adminInviteOnly = registrationType === 'admin-invite-only';
-		data.templateData['reputation:disabled'] = parseInt(meta.config['reputation:disabled'], 10) === 1;
-
-		user.getInvitesNumber(req.uid, function(err, num) {
-			if (err) {
-				return next(err);
-			}
-
-			data.templateData.invites = num;
-			res.render('users', data.templateData);
-		});
+		res.render('users', data);
 	});
 }
 
diff --git a/src/database/mongo.js b/src/database/mongo.js
index 0e7e8e2d2a..7dd854e4cf 100644
--- a/src/database/mongo.js
+++ b/src/database/mongo.js
@@ -37,8 +37,8 @@
 		},
 		{
 			name: "mongo:database",
-			description: "Which database to use",
-			'default': nconf.get('mongo:database') || 0
+			description: "MongoDB database name",
+			'default': nconf.get('mongo:database') || 'nodebb'
 		}
 	];
 
@@ -74,7 +74,7 @@
 			nconf.set('mongo:port', 27017);
 		}
 		if (!nconf.get('mongo:database')) {
-			nconf.set('mongo:database', '0');
+			nconf.set('mongo:database', 'nodebb');
 		}
 
 		var hosts = nconf.get('mongo:host').split(',');
diff --git a/src/database/mongo/sorted.js b/src/database/mongo/sorted.js
index d8a9205ce0..9e9f72969e 100644
--- a/src/database/mongo/sorted.js
+++ b/src/database/mongo/sorted.js
@@ -520,7 +520,7 @@ module.exports = function(db, module) {
 			return callback();
 		}
 		var data = {};
-		value = helpers.fieldToString(value);
+		value = helpers.valueToString(value);
 		data.score = parseInt(increment, 10);
 
 		db.collection('objects').findAndModify({_key: key, value: value}, {}, {$inc: data}, {new: true, upsert: true}, function(err, result) {
diff --git a/src/emailer.js b/src/emailer.js
index 34b5250908..27c64c4986 100644
--- a/src/emailer.js
+++ b/src/emailer.js
@@ -90,6 +90,7 @@ var fallbackTransport;
 			},
 			function (results, next) {
 				var data = {
+					_raw: params,
 					to: email,
 					from: meta.config['email:from'] || 'no-reply@' + getHostname(),
 					from_name: meta.config['email:from_name'] || 'NodeBB',
@@ -113,7 +114,11 @@ var fallbackTransport;
 				}
 			}
 		], function (err) {
-			callback(err);
+			if (err && err.code === 'ENOENT') {
+				callback(new Error('[[error:sendmail-not-found]]'));
+			} else {
+				callback(err);
+			}
 		});
 	};
 
diff --git a/src/favourites.js b/src/favourites.js
index e5d8eb3e0a..543b41af98 100644
--- a/src/favourites.js
+++ b/src/favourites.js
@@ -46,8 +46,7 @@ var meta = require('./meta');
 					db.sortedSetAdd('users:reputation', newreputation, postData.uid);
 				}
 
-				adjustPostVotes(postData, uid, type, unvote, function(err, votes) {
-					postData.votes = votes;
+				adjustPostVotes(postData, uid, type, unvote, function(err) {
 					callback(err, {
 						user: {
 							reputation: newreputation
@@ -91,11 +90,10 @@ var meta = require('./meta');
 				if (err) {
 					return callback(err);
 				}
-				var voteCount = parseInt(results.upvotes, 10) - parseInt(results.downvotes, 10);
-
-				posts.updatePostVoteCount(postData, voteCount, function(err) {
-					callback(err, voteCount);
-				});
+				postData.upvotes = parseInt(results.upvotes, 10);
+				postData.downvotes = parseInt(results.downvotes, 10);
+				postData.votes = postData.upvotes - postData.downvotes;
+				posts.updatePostVoteCount(postData, callback);
 			});
 		});
 	}
diff --git a/src/file.js b/src/file.js
index 1c1cab7781..001e1324cb 100644
--- a/src/file.js
+++ b/src/file.js
@@ -50,6 +50,13 @@ file.base64ToLocal = function(imageData, uploadPath, callback) {
 };
 
 file.isFileTypeAllowed = function(path, callback) {
+	var plugins = require('./plugins');
+	if (plugins.hasListeners('filter:file.isFileTypeAllowed')) {
+		return plugins.fireHook('filter:file.isFileTypeAllowed', path, function(err) {
+			callback(err);
+		});
+	}
+
 	// Attempt to read the file, if it passes, file type is allowed
 	jimp.read(path, function(err) {
 		callback(err);
@@ -95,4 +102,4 @@ file.existsSync = function(path) {
 	return !!exists;
 };
 
-module.exports = file;
\ No newline at end of file
+module.exports = file;
diff --git a/src/groups.js b/src/groups.js
index 2df5dc3ce2..e572c30110 100644
--- a/src/groups.js
+++ b/src/groups.js
@@ -349,7 +349,9 @@ var utils = require('../public/src/utils');
 
 	Groups.getLatestMemberPosts = function(groupName, max, uid, callback) {
 		async.waterfall([
-			async.apply(Groups.getMembers, groupName, 0, -1),
+			function(next) {
+				Groups.getMembers(groupName, 0, -1, next);
+			},
 			function(uids, next) {
 				if (!Array.isArray(uids) || !uids.length) {
 					return callback(null, []);
diff --git a/src/groups/cover.js b/src/groups/cover.js
index 89ef97df94..99f2791a2e 100644
--- a/src/groups/cover.js
+++ b/src/groups/cover.js
@@ -6,6 +6,7 @@ var path = require('path');
 var fs = require('fs');
 var crypto = require('crypto');
 var Jimp = require('jimp');
+var mime = require('mime');
 
 var db = require('../database');
 var file = require('../file');
@@ -29,6 +30,7 @@ module.exports = function(Groups) {
 
 		var tempPath = data.file ? data.file : '';
 		var url;
+		var type = data.file ? mime.lookup(data.file) : 'image/png';
 
 		async.waterfall([
 			function (next) {
@@ -41,7 +43,8 @@ module.exports = function(Groups) {
 				tempPath = _tempPath;
 				uploadsController.uploadGroupCover(uid, {
 					name: 'groupCover',
-					path: tempPath
+					path: tempPath,
+					type: type
 				}, next);
 			},
 			function (uploadData, next) {
@@ -54,7 +57,8 @@ module.exports = function(Groups) {
 			function (next) {
 				uploadsController.uploadGroupCover(uid, {
 					name: 'groupCoverThumb',
-					path: tempPath
+					path: tempPath,
+					type: type
 				}, next);
 			},
 			function (uploadData, next) {
@@ -104,7 +108,7 @@ module.exports = function(Groups) {
 		md5sum = md5sum.digest('hex');
 
 		// Save image
-		var tempPath = path.join(nconf.get('base_dir'), nconf.get('upload_path'), md5sum);
+		var tempPath = path.join(nconf.get('base_dir'), nconf.get('upload_path'), md5sum) + '.png';
 		var buffer = new Buffer(imageData.slice(imageData.indexOf('base64') + 7), 'base64');
 
 		fs.writeFile(tempPath, buffer, {
diff --git a/src/groups/create.js b/src/groups/create.js
index 2910d96294..353c0aca49 100644
--- a/src/groups/create.js
+++ b/src/groups/create.js
@@ -1,10 +1,10 @@
 'use strict';
 
-var async = require('async'),
-	meta = require('../meta'),
-	plugins = require('../plugins'),
-	utils = require('../../public/src/utils'),
-	db = require('../database');
+var async = require('async');
+var meta = require('../meta');
+var plugins = require('../plugins');
+var utils = require('../../public/src/utils');
+var db = require('../database');
 
 module.exports = function(Groups) {
 
@@ -79,6 +79,10 @@ module.exports = function(Groups) {
 			return callback(new Error('[[error:group-name-too-short]]'));
 		}
 
+		if (name.length > (parseInt(meta.config.maximumGroupNameLength, 10) || 255)) {
+			return callback(new Error('[[error:group-name-too-long]]'));
+		}
+
 		if (name.indexOf('/') !== -1) {
 			return callback(new Error('[[error:invalid-group-name]]'));
 		}
diff --git a/src/groups/delete.js b/src/groups/delete.js
index 8e665249a8..8c7b194d28 100644
--- a/src/groups/delete.js
+++ b/src/groups/delete.js
@@ -1,9 +1,9 @@
 'use strict';
 
-var async = require('async'),
-	plugins = require('../plugins'),
-	utils = require('../../public/src/utils'),
-	db = require('./../database');
+var async = require('async');
+var plugins = require('../plugins');
+var utils = require('../../public/src/utils');
+var db = require('./../database');
 
 module.exports = function(Groups) {
 
@@ -39,7 +39,9 @@ module.exports = function(Groups) {
 						}, next);
 					});
 				}
-			], callback);
+			], function(err) {
+				callback(err);
+			});
 		});
 	};
 };
diff --git a/src/groups/membership.js b/src/groups/membership.js
index 747fa9d3d7..b570d1fbe7 100644
--- a/src/groups/membership.js
+++ b/src/groups/membership.js
@@ -1,84 +1,99 @@
 'use strict';
 
-var	async = require('async'),
-	winston = require('winston'),
-	_ = require('underscore'),
+var	async = require('async');
+var winston = require('winston');
+var _ = require('underscore');
 
-	user = require('../user'),
-	utils = require('../../public/src/utils'),
-	plugins = require('../plugins'),
-	notifications = require('../notifications'),
-	db = require('./../database');
+var user = require('../user');
+var utils = require('../../public/src/utils');
+var plugins = require('../plugins');
+var notifications = require('../notifications');
+var db = require('./../database');
 
 module.exports = function(Groups) {
+
 	Groups.join = function(groupName, uid, callback) {
-		function join() {
-			var tasks = [
-				async.apply(db.sortedSetAdd, 'group:' + groupName + ':members', Date.now(), uid),
-				async.apply(db.incrObjectField, 'group:' + groupName, 'memberCount')
-			];
-
-			async.waterfall([
-				function(next) {
-					async.parallel({
-						isAdmin: function(next) {
-							user.isAdministrator(uid, next);
-						},
-						isHidden: function(next) {
-							Groups.isHidden(groupName, next);
-						}
-					}, next);
-				},
-				function(results, next) {
-					if (results.isAdmin) {
-						tasks.push(async.apply(db.setAdd, 'group:' + groupName + ':owners', uid));
-					}
-					if (!results.isHidden) {
-						tasks.push(async.apply(db.sortedSetIncrBy, 'groups:visible:memberCount', 1, groupName));
-					}
-					async.parallel(tasks, next);
-				},
-				function(results, next) {
-					user.setGroupTitle(groupName, uid, next);
-				},
-				function(next) {
-					plugins.fireHook('action:group.join', {
-						groupName: groupName,
-						uid: uid
-					});
-					next();
-				}
-			], callback);
-		}
-
 		callback = callback || function() {};
 
 		if (!groupName) {
 			return callback(new Error('[[error:invalid-data]]'));
 		}
 
-		Groups.exists(groupName, function(err, exists) {
-			if (err) {
+		async.waterfall([
+			function(next) {
+				Groups.isMember(uid, groupName, next);
+			},
+			function(isMember, next) {
+				if (isMember) {
+					return callback();
+				}
+				Groups.exists(groupName, next);
+			},
+			function(exists, next) {
+				if (exists) {
+					return next();
+				}
+				Groups.create({
+					name: groupName,
+					description: '',
+					hidden: 1
+				}, function(err) {
+					if (err && err.message !== '[[error:group-already-exists]]') {
+						winston.error('[groups.join] Could not create new hidden group: ' + err.message);
+						return callback(err);
+					}
+					next();
+				});
+			},
+			function(next) {
+				async.parallel({
+					isAdmin: function(next) {
+						user.isAdministrator(uid, next);
+					},
+					isHidden: function(next) {
+						Groups.isHidden(groupName, next);
+					}
+				}, next);
+			},
+			function(results, next) {
+				var tasks = [
+					async.apply(db.sortedSetAdd, 'group:' + groupName + ':members', Date.now(), uid),
+					async.apply(db.incrObjectField, 'group:' + groupName, 'memberCount')
+				];
+				if (results.isAdmin) {
+					tasks.push(async.apply(db.setAdd, 'group:' + groupName + ':owners', uid));
+				}
+				if (!results.isHidden) {
+					tasks.push(async.apply(db.sortedSetIncrBy, 'groups:visible:memberCount', 1, groupName));
+				}
+				async.parallel(tasks, next);
+			},
+			function(results, next) {
+				setGroupTitleIfNotSet(groupName, uid, next);
+			},
+			function(next) {
+				plugins.fireHook('action:group.join', {
+					groupName: groupName,
+					uid: uid
+				});
+				next();
+			}
+		], callback);
+	};
+
+	function setGroupTitleIfNotSet(groupName, uid, callback) {
+		if (groupName === 'registered-users' || Groups.isPrivilegeGroup(groupName)) {
+			return callback();
+		}
+
+		db.getObjectField('user:' + uid, 'groupTitle', function(err, currentTitle) {
+			if (err || (currentTitle || currentTitle === '')) {
 				return callback(err);
 			}
 
-			if (exists) {
-				return join();
-			}
-
-			Groups.create({
-				name: groupName,
-				description: '',
-				hidden: 1
-			}, function(err) {
-				if (err && err.message !== '[[error:group-already-exists]]') {
-					winston.error('[groups.join] Could not create new hidden group: ' + err.message);
-					return callback(err);
-				}
-				join();
-			});
+			user.setUserField(uid, 'groupTitle', groupName, callback);
 		});
-	};
+	}
 
 	Groups.requestMembership = function(groupName, uid, callback) {
 		async.waterfall([
@@ -189,38 +204,52 @@ module.exports = function(Groups) {
 	Groups.leave = function(groupName, uid, callback) {
 		callback = callback || function() {};
 
-		var tasks = [
-			async.apply(db.sortedSetRemove, 'group:' + groupName + ':members', uid),
-			async.apply(db.setRemove, 'group:' + groupName + ':owners', uid),
-			async.apply(db.decrObjectField, 'group:' + groupName, 'memberCount')
-		];
-
-		async.parallel(tasks, function(err) {
-			if (err) {
-				return callback(err);
-			}
-
-			plugins.fireHook('action:group.leave', {
-				groupName: groupName,
-				uid: uid
-			});
-
-			Groups.getGroupFields(groupName, ['hidden', 'memberCount'], function(err, groupData) {
-				if (err || !groupData) {
-					return callback(err);
+		async.waterfall([
+			function(next) {
+				Groups.isMember(uid, groupName, next);
+			},
+			function(isMember, next) {
+				if (!isMember) {
+					return callback();
 				}
 
+				Groups.exists(groupName, next);
+			},
+			function(exists, next) {
+				if (!exists) {
+					return callback();
+				}
+				async.parallel([
+					async.apply(db.sortedSetRemove, 'group:' + groupName + ':members', uid),
+					async.apply(db.setRemove, 'group:' + groupName + ':owners', uid),
+					async.apply(db.decrObjectField, 'group:' + groupName, 'memberCount')
+				], next);
+			},
+			function(results, next) {
+				Groups.getGroupFields(groupName, ['hidden', 'memberCount'], next);
+			},
+			function(groupData, next) {
+				if (!groupData) {
+					return callback();
+				}
 				if (parseInt(groupData.hidden, 10) === 1 && parseInt(groupData.memberCount, 10) === 0) {
-					Groups.destroy(groupName, callback);
+					Groups.destroy(groupName, next);
 				} else {
 					if (parseInt(groupData.hidden, 10) !== 1) {
-						db.sortedSetAdd('groups:visible:memberCount', groupData.memberCount, groupName, callback);
+						db.sortedSetAdd('groups:visible:memberCount', groupData.memberCount, groupName, next);
 					} else {
-						callback();
+						next();
 					}
 				}
-			});
-		});
+			},
+			function(next) {
+				plugins.fireHook('action:group.leave', {
+					groupName: groupName,
+					uid: uid
+				});
+				next();
+			}
+		], callback);
 	};
 
 	Groups.leaveAllGroups = function(uid, callback) {
@@ -414,7 +443,7 @@ module.exports = function(Groups) {
 		}
 		db.getSetMembers('group:' + groupName + ':pending', callback);
 	};
-	
+
 	Groups.kick = function(uid, groupName, isOwner, callback) {
 		if (isOwner) {
 			// If the owners set only contains one member, error out!
diff --git a/src/groups/update.js b/src/groups/update.js
index f48ff96d21..27d2cddc00 100644
--- a/src/groups/update.js
+++ b/src/groups/update.js
@@ -168,7 +168,7 @@ module.exports = function(Groups) {
 				return callback(err);
 			}
 
-			if (parseInt(group.system, 10) === 1 || parseInt(group.hidden, 10) === 1) {
+			if (parseInt(group.system, 10) === 1) {
 				return callback();
 			}
 
diff --git a/src/image.js b/src/image.js
index f4b85acd4d..fca120d1e5 100644
--- a/src/image.js
+++ b/src/image.js
@@ -11,10 +11,11 @@ image.resizeImage = function(data, callback) {
 	if (plugins.hasListeners('filter:image.resize')) {
 		plugins.fireHook('filter:image.resize', {
 			path: data.path,
+			target: data.target,
 			extension: data.extension,
 			width: data.width,
 			height: data.height
-		}, function(err, data) {
+		}, function(err) {
 			callback(err);
 		});
 	} else {
@@ -26,28 +27,42 @@ image.resizeImage = function(data, callback) {
 			var w = image.bitmap.width,
 				h = image.bitmap.height,
 				origRatio = w/h,
-				desiredRatio = data.width/data.height,
+				desiredRatio = data.width && data.height ? data.width/data.height : origRatio,
 				x = 0,
 				y = 0,
 				crop;
 
-			if (desiredRatio > origRatio) {
-				desiredRatio = 1/desiredRatio;
-			}
-			if (origRatio >= 1) {
-				y = 0;	// height is the smaller dimension here
-				x = Math.floor((w/2) - (h * desiredRatio / 2));
-				crop = async.apply(image.crop.bind(image), x, y, h * desiredRatio, h);
+			if (origRatio !== desiredRatio) {
+				if (desiredRatio > origRatio) {
+					desiredRatio = 1/desiredRatio;
+				}
+				if (origRatio >= 1) {
+					y = 0;	// height is the smaller dimension here
+					x = Math.floor((w/2) - (h * desiredRatio / 2));
+					crop = async.apply(image.crop.bind(image), x, y, h * desiredRatio, h);
+				} else {
+					x = 0;	// width is the smaller dimension here
+					y = Math.floor(h/2 - (w * desiredRatio / 2));
+					crop = async.apply(image.crop.bind(image), x, y, w, w * desiredRatio);
+				}
 			} else {
-				x = 0;	// width is the smaller dimension here
-				y = Math.floor(h/2 - (w * desiredRatio / 2));
-				crop = async.apply(image.crop.bind(image), x, y, w, w * desiredRatio);
+				// Simple resize given either width, height, or both
+				crop = async.apply(setImmediate);
 			}
 
 			async.waterfall([
 				crop,
-				function(image, next) {
-					image.resize(data.width, data.height, next);
+				function(_image, next) {
+					if (typeof _image === 'function' && !next) {
+						next = _image;
+						_image = image;
+					}
+
+					if ((data.width && data.height) || (w > data.width) || (h > data.height)) {
+						_image.resize(data.width || Jimp.AUTO, data.height || Jimp.AUTO, next);
+					} else {
+						next(null, image);
+					}
 				},
 				function(image, next) {
 					image.write(data.target || data.path, next);
@@ -64,7 +79,7 @@ image.normalise = function(path, extension, callback) {
 		plugins.fireHook('filter:image.normalise', {
 			path: path,
 			extension: extension
-		}, function(err, data) {
+		}, function(err) {
 			callback(err);
 		});
 	} else {
@@ -79,6 +94,20 @@ image.normalise = function(path, extension, callback) {
 	}
 };
 
+image.size = function(path, callback) {
+	if (plugins.hasListeners('filter:image.size')) {
+		plugins.fireHook('filter:image.size', {
+			path: path,
+		}, function(err, image) {
+			callback(err, image);
+		});
+	} else {
+		new Jimp(path, function(err, data) {
+			callback(err, data ? data.bitmap : null);
+		});
+	}
+}
+
 image.convertImageToBase64 = function(path, callback) {
 	fs.readFile(path, function(err, data) {
 		callback(err, data ? data.toString('base64') : null);
diff --git a/src/languages.js b/src/languages.js
index de1d82bcff..2ad64fd588 100644
--- a/src/languages.js
+++ b/src/languages.js
@@ -3,8 +3,48 @@
 var	fs = require('fs'),
 	path = require('path'),
 	async = require('async'),
+	LRU = require('lru-cache'),
+	_ = require('underscore');
 
-	Languages = {};
+var plugins = require('./plugins');
+
+var Languages = {};
+
+Languages.init = function(next) {
+	if (Languages.hasOwnProperty('_cache')) {
+		Languages._cache.reset();
+	} else {
+		Languages._cache = LRU(100);
+	}
+
+	next();
+};
+
+Languages.get = function(code, key, callback) {
+	var combined = [code, key].join('/');
+
+	if (Languages._cache.has(combined)) {
+		return callback(null, Languages._cache.get(combined));
+	}
+
+	var languageData;
+
+	fs.readFile(path.join(__dirname, '../public/language/', code, key), { encoding: 'utf-8' }, function(err, data) {
+		// If language file in core cannot be read, then no language file present
+		try {
+			languageData = JSON.parse(data) || {};
+		} catch (e) {
+			languageData = {};
+		}
+
+		if (plugins.customLanguages.hasOwnProperty(combined)) {
+			_.extendOwn(languageData, plugins.customLanguages[combined]);
+		}
+
+		Languages._cache.set(combined, languageData);
+		callback(null, languageData);
+	});
+};
 
 Languages.list = function(callback) {
 	var	languagesPath = path.join(__dirname, '../public/language'),
diff --git a/src/messaging/create.js b/src/messaging/create.js
index 3b2b5dcf26..cf78affb64 100644
--- a/src/messaging/create.js
+++ b/src/messaging/create.js
@@ -55,7 +55,8 @@ module.exports = function(Messaging) {
 				message = {
 					content: content,
 					timestamp: timestamp,
-					fromuid: fromuid
+					fromuid: fromuid,
+					roomId: roomId
 				};
 
 				plugins.fireHook('filter:messaging.save', message, next);
diff --git a/src/meta.js b/src/meta.js
index ffc85c98bf..1cbd1af0ae 100644
--- a/src/meta.js
+++ b/src/meta.js
@@ -8,6 +8,7 @@ var async = require('async'),
 
 	user = require('./user'),
 	groups = require('./groups'),
+	languages = require('./languages'),
 	emitter = require('./emitter'),
 	pubsub = require('./pubsub'),
 	auth = require('./routes/authentication'),
@@ -23,6 +24,7 @@ var async = require('async'),
 	require('./meta/sounds')(Meta);
 	require('./meta/settings')(Meta);
 	require('./meta/logs')(Meta);
+	require('./meta/errors')(Meta);
 	require('./meta/tags')(Meta);
 	require('./meta/dependencies')(Meta);
 	Meta.templates = require('./meta/templates');
@@ -59,13 +61,14 @@ var async = require('async'),
 				plugins.fireHook('static:app.reload', {}, next);
 			},
 			async.apply(plugins.clearRequireCache),
-			async.apply(plugins.reload),
-			async.apply(plugins.reloadRoutes),
 			async.apply(Meta.css.minify),
 			async.apply(Meta.js.minify, 'nodebb.min.js'),
 			async.apply(Meta.js.minify, 'acp.min.js'),
 			async.apply(Meta.sounds.init),
+			async.apply(languages.init),
 			async.apply(Meta.templates.compile),
+			async.apply(plugins.reload),
+			async.apply(plugins.reloadRoutes),
 			async.apply(auth.reloadRoutes),
 			function(next) {
 				Meta.config['cache-buster'] = utils.generateUUID();
diff --git a/src/meta/configs.js b/src/meta/configs.js
index 3ff42f66ae..69cc375b85 100644
--- a/src/meta/configs.js
+++ b/src/meta/configs.js
@@ -135,4 +135,4 @@ module.exports = function(Meta) {
 		db.deleteObjectField('config', field);
 	};
 
-};
\ No newline at end of file
+};
diff --git a/src/meta/css.js b/src/meta/css.js
index 264267d7c6..478acab284 100644
--- a/src/meta/css.js
+++ b/src/meta/css.js
@@ -5,7 +5,6 @@ var winston = require('winston'),
 	fs = require('fs'),
 	path = require('path'),
 	less = require('less'),
-	crypto = require('crypto'),
 	async = require('async'),
 	autoprefixer = require('autoprefixer'),
 	postcss = require('postcss'),
@@ -43,8 +42,7 @@ module.exports = function(Meta) {
 					path.join(__dirname, '../../public/vendor/fontawesome/less'),
 					path.join(__dirname, '../../public/vendor/bootstrap/less')
 				],
-				source = '@import "font-awesome";',
-				acpSource = '@import "font-awesome";';
+				source = '@import "font-awesome";';
 
 			plugins.lessFiles = filterMissingFiles(plugins.lessFiles);
 			plugins.cssFiles = filterMissingFiles(plugins.cssFiles);
@@ -66,6 +64,8 @@ module.exports = function(Meta) {
 					return callback(err);
 				}
 
+				var acpSource = source;
+
 				source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/css/smoothness/jquery-ui-1.10.4.custom.min.css";';
 				source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.css";';
 				source += '\n@import (inline) "..' + path.sep + 'public/vendor/colorpicker/colorpicker.css";';
@@ -196,7 +196,7 @@ module.exports = function(Meta) {
 				Meta.css[destination] = result.css;
 
 				// Save the compiled CSS in public/ so things like nginx can serve it
-				if (nconf.get('isPrimary') === 'true') {
+				if (nconf.get('isPrimary') === 'true' && (nconf.get('local-assets') === undefined || nconf.get('local-assets') !== false)) {
 					return Meta.css.commitToFile(destination, function() {
 						if (typeof callback === 'function') {
 							callback(null, result.css);
diff --git a/src/meta/errors.js b/src/meta/errors.js
new file mode 100644
index 0000000000..4449a55f57
--- /dev/null
+++ b/src/meta/errors.js
@@ -0,0 +1,35 @@
+'use strict';
+
+var async = require('async'),
+	winston = require('winston'),
+	validator = require('validator');
+
+var db = require('../database'),
+	analytics = require('../analytics');
+
+module.exports = function(Meta) {
+
+	Meta.errors = {};
+
+	Meta.errors.log404 = function(route, callback) {
+		callback = callback || function() {};
+		route = route.replace(/\/$/, '');	// remove trailing slashes
+		analytics.increment('errors:404');
+		db.sortedSetIncrBy('errors:404', 1, route, callback);
+	};
+
+	Meta.errors.get = function(escape, callback) {
+		db.getSortedSetRevRangeByScoreWithScores('errors:404', 0, -1, '+inf', '-inf', function(err, data) {
+			data = data.map(function(nfObject) {
+				nfObject.value = escape ? validator.escape(nfObject.value) : nfObject.value;
+				return nfObject;
+			});
+
+			callback(null, data);
+		});
+	};
+
+	Meta.errors.clear = function(callback) {
+		db.delete('errors:404', callback);
+	};
+};
diff --git a/src/meta/js.js b/src/meta/js.js
index 63c265a9cf..9d8b1d6c34 100644
--- a/src/meta/js.js
+++ b/src/meta/js.js
@@ -79,31 +79,38 @@ module.exports = function(Meta) {
 			],
 
 			// modules listed below are routed through express (/src/modules) so they can be defined anonymously
-			modules: [
-				'./node_modules/chart.js/Chart.js',
-				'./node_modules/mousetrap/mousetrap.js',
+			modules: {
+				"Chart.js": './node_modules/chart.js/Chart.js',
+				"mousetrap.js": './node_modules/mousetrap/mousetrap.js',
 
-				'public/vendor/buzz/buzz.js'
-			]
+				"buzz.js": 'public/vendor/buzz/buzz.js'
+			}
 		}
 	};
 
 	Meta.js.bridgeModules = function(app, callback) {
 		// Add routes for AMD-type modules to serve those files
-		var numBridged = 0;
+		var numBridged = 0,
+			addRoute = function(relPath) {
+				var relativePath = nconf.get('relative_path');
+				
+				app.get(relativePath + '/src/modules/' + relPath, function(req, res) {
+					return res.sendFile(path.join(__dirname, '../../', Meta.js.scripts.modules[relPath]), {
+						maxAge: app.enabled('cache') ? 5184000000 : 0
+					});
+				});
+			};
 
 		async.series([
 			function(next) {
-				async.each(Meta.js.scripts.modules, function(localPath, next) {
-					app.get(path.join('/src/modules/', path.basename(localPath)), function(req, res) {
-						return res.sendFile(path.join(__dirname, '../../', localPath), {
-							maxAge: app.enabled('cache') ? 5184000000 : 0
-						});
-					});
+				for(var relPath in Meta.js.scripts.modules) {
+					if (Meta.js.scripts.modules.hasOwnProperty(relPath)) {
+						addRoute(relPath);
+						++numBridged;
+					}
+				}
 
-					++numBridged;
-					next();
-				}, next);
+				next();
 			}
 		], function(err) {
 			if (err) {
@@ -154,11 +161,18 @@ module.exports = function(Meta) {
 					});
 				}
 
-				Meta.js.commitToFile(target, function() {					
+				if (nconf.get('local-assets') === undefined || nconf.get('local-assets') !== false) {
+					return Meta.js.commitToFile(target, function() {
+						if (typeof callback === 'function') {
+							callback();
+						}
+					});
+				} else {
+					emitter.emit('meta:js.compiled');
 					if (typeof callback === 'function') {
-						callback();
+						return callback();
 					}
-				});
+				}
 
 				break;
 			case 'error':
diff --git a/src/meta/sounds.js b/src/meta/sounds.js
index 4b85f681cb..c802458b14 100644
--- a/src/meta/sounds.js
+++ b/src/meta/sounds.js
@@ -83,7 +83,9 @@ module.exports = function(Meta) {
 				fs.readdir(path.join(__dirname, '../../public/uploads/sounds'), next);
 			},
 			function(uploaded, next) {
-				uploaded = uploaded.map(function(filename) {
+				uploaded = uploaded.filter(function(filename) {
+					return !filename.startsWith('.');
+				}).map(function(filename) {
 					return path.join(__dirname, '../../public/uploads/sounds', filename);
 				});
 
@@ -93,6 +95,21 @@ module.exports = function(Meta) {
 						return;
 					}
 
+					if (nconf.get('local-assets') === false) {
+						// Don't regenerate the public/sounds/ directory. Instead, create a mapping for the router to use
+						Meta.sounds._filePathHash = filePaths.reduce(function(hash, filePath) {
+							hash[path.basename(filePath)] = filePath;
+							return hash;
+						}, {});
+
+						winston.verbose('[sounds] Sounds OK');
+						if (typeof next === 'function') {
+							return next();
+						} else {
+							return;
+						}
+					}
+
 					// Clear the sounds directory
 					async.series([
 						function(next) {
@@ -121,8 +138,8 @@ module.exports = function(Meta) {
 								winston.error('[sounds] Could not initialise sounds: ' + err.message);
 							}
 
-							if (typeof callback === 'function') {
-								callback();
+							if (typeof next === 'function') {
+								next();
 							}
 						});
 					});
diff --git a/src/middleware/admin.js b/src/middleware/admin.js
index ceeabdca99..2ee0f7fd80 100644
--- a/src/middleware/admin.js
+++ b/src/middleware/admin.js
@@ -112,7 +112,8 @@ middleware.renderHeader = function(req, res, data, next) {
 				scripts: results.scripts,
 				'cache-buster': meta.config['cache-buster'] ? 'v=' + meta.config['cache-buster'] : '',
 				env: process.env.NODE_ENV ? true : false,
-				title: (acpPath || 'Dashboard') + ' | NodeBB Admin Control Panel'
+				title: (acpPath || 'Dashboard') + ' | NodeBB Admin Control Panel',
+				bodyClass: data.bodyClass
 			};
 
 			templateValues.template = {name: res.locals.template};
diff --git a/src/middleware/header.js b/src/middleware/header.js
index c1ed6d60c2..dccefcddf7 100644
--- a/src/middleware/header.js
+++ b/src/middleware/header.js
@@ -77,17 +77,21 @@ module.exports = function(app, middleware) {
 				user.isGlobalModerator(req.uid, next);
 			},
 			user: function(next) {
+				var userData = {
+					uid: 0,
+					username: '[[global:guest]]',
+					userslug: '',
+					email: '',
+					picture: meta.config.defaultAvatar,
+					status: 'offline',
+					banned: false,
+					reputation: 0,
+					'email:confirmed': false
+				};
 				if (req.uid) {
-					user.getUserFields(req.uid, ['username', 'userslug', 'email', 'picture', 'status', 'email:confirmed', 'banned'], next);
+					user.getUserFields(req.uid, Object.keys(userData), next);
 				} else {
-					next(null, {
-						username: '[[global:guest]]',
-						userslug: '',
-						picture: meta.config.defaultAvatar,
-						status: 'offline',
-						banned: false,
-						uid: 0
-					});
+					next(null, userData);
 				}
 			},
 			navigation: async.apply(navigation.get),
diff --git a/src/middleware/index.js b/src/middleware/index.js
index 1cbac02323..867af6fed2 100644
--- a/src/middleware/index.js
+++ b/src/middleware/index.js
@@ -62,6 +62,10 @@ module.exports = function(app) {
 		cookie.secure = true;
 	}
 
+	if (relativePath !== '') {
+		cookie.path = relativePath;
+	}
+
 	app.use(session({
 		store: db.sessionStore,
 		secret: nconf.get('secret'),
diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js
index d09270c3c9..cbede05028 100644
--- a/src/middleware/middleware.js
+++ b/src/middleware/middleware.js
@@ -1,30 +1,32 @@
 "use strict";
 
-var app,
-	middleware = {
-		admin: {}
-	},
-	async = require('async'),
-	path = require('path'),
-	csrf = require('csurf'),
-	_ = require('underscore'),
+var app;
+var middleware = {
+	admin: {}
+};
+var async = require('async');
+var fs = require('fs');
+var path = require('path');
+var csrf = require('csurf');
+var _ = require('underscore');
 
-	validator = require('validator'),
-	nconf = require('nconf'),
-	ensureLoggedIn = require('connect-ensure-login'),
-	toobusy = require('toobusy-js'),
+var validator = require('validator');
+var nconf = require('nconf');
+var ensureLoggedIn = require('connect-ensure-login');
+var toobusy = require('toobusy-js');
 
-	plugins = require('../plugins'),
-	meta = require('../meta'),
-	user = require('../user'),
-	groups = require('../groups'),
+var plugins = require('../plugins');
+var languages = require('../languages');
+var meta = require('../meta');
+var user = require('../user');
+var groups = require('../groups');
 
-	analytics = require('../analytics'),
+var analytics = require('../analytics');
 
-	controllers = {
-		api: require('./../controllers/api'),
-		helpers: require('../controllers/helpers')
-	};
+var controllers = {
+	api: require('./../controllers/api'),
+	helpers: require('../controllers/helpers')
+};
 
 toobusy.maxLag(parseInt(meta.config.eventLoopLagThreshold, 10) || 100);
 toobusy.interval(parseInt(meta.config.eventLoopInterval, 10) || 500);
@@ -87,7 +89,9 @@ middleware.addHeaders = function (req, res, next) {
 	headers = _.pick(headers, Boolean);		// Remove falsy headers
 
 	for(var key in headers) {
-		res.setHeader(key, headers[key]);
+		if (headers.hasOwnProperty(key)) {
+			res.setHeader(key, headers[key]);
+		}
 	}
 
 	next();
@@ -103,6 +107,10 @@ middleware.pluginHooks = function(req, res, next) {
 };
 
 middleware.redirectToAccountIfLoggedIn = function(req, res, next) {
+	if (req.session.forceLogin) {
+		return next();
+	}
+
 	if (!req.user) {
 		return next();
 	}
@@ -159,16 +167,59 @@ middleware.checkAccountPermissions = function(req, res, next) {
 	});
 };
 
+middleware.redirectUidToUserslug = function(req, res, next) {
+	var uid = parseInt(req.params.uid, 10);
+	if (!uid) {
+		return next();
+	}
+	user.getUserField(uid, 'userslug', function(err, userslug) {
+		if (err || !userslug) {
+			return next(err);
+		}
+
+		var path = req.path.replace(/^\/api/, '')
+				.replace('uid', 'user')
+				.replace(uid, function() { return userslug; });
+		controllers.helpers.redirect(res, path);
+	});
+};
+
 middleware.isAdmin = function(req, res, next) {
 	if (!req.uid) {
 		return controllers.helpers.notAllowed(req, res);
 	}
 
 	user.isAdministrator(req.uid, function (err, isAdmin) {
-		if (err || isAdmin) {
+		if (err) {
 			return next(err);
 		}
 
+		if (isAdmin) {
+			user.hasPassword(req.uid, function(err, hasPassword) {
+				if (err) {
+					return next(err);
+				}
+
+				if (!hasPassword) {
+					return next();
+				}
+
+				var loginTime = req.session.meta ? req.session.meta.datetime : 0;
+				if (loginTime && parseInt(loginTime, 10) > Date.now() - 3600000) {
+					return next();
+				}
+
+				req.session.returnTo = req.path.replace(/^\/api/, '');
+				req.session.forceLogin = 1;
+				if (res.locals.isAPI) {
+					res.status(401).json({});
+				} else {
+					res.redirect(nconf.get('relative_path') + '/login');
+				}
+			});
+			return;
+		}
+
 		if (res.locals.isAPI) {
 			return controllers.helpers.notAllowed(req, res);
 		}
@@ -251,6 +302,7 @@ middleware.privateUploads = function(req, res, next) {
 
 middleware.busyCheck = function(req, res, next) {
 	if (global.env === 'production' && (!meta.config.hasOwnProperty('eventLoopCheckEnabled') || parseInt(meta.config.eventLoopCheckEnabled, 10) === 1) && toobusy()) {
+		analytics.increment('errors:503');
 		res.status(503).type('text/html').sendFile(path.join(__dirname, '../../public/503.html'));
 	} else {
 		next();
@@ -263,6 +315,54 @@ middleware.applyBlacklist = function(req, res, next) {
 	});
 };
 
+middleware.processLanguages = function(req, res, next) {
+	var code = req.params.code;
+	var key = req.path.match(/[\w]+\.json/);
+
+	if (code && key) {
+		languages.get(code, key[0], function(err, language) {
+			res.status(200).json(language);
+		});
+	} else {
+		res.status(404).json('{}');
+	}
+};
+
+middleware.processTimeagoLocales = function(req, res, next) {
+	var fallback = req.path.indexOf('-short') === -1 ? 'jquery.timeago.en.js' : 'jquery.timeago.en-short.js',
+		localPath = path.join(__dirname, '../../public/vendor/jquery/timeago/locales', req.path),
+		exists;
+
+	try {
+		exists = fs.accessSync(localPath, fs.F_OK | fs.R_OK);
+	} catch(e) {
+		exists = false;
+	}
+
+	if (exists) {
+		res.status(200).sendFile(localPath, {
+			maxAge: app.enabled('cache') ? 5184000000 : 0
+		});
+	} else {
+		res.status(200).sendFile(path.join(__dirname, '../../public/vendor/jquery/timeago/locales', fallback), {
+			maxAge: app.enabled('cache') ? 5184000000 : 0
+		});
+	}
+};
+
+middleware.registrationComplete = function(req, res, next) {
+	// If the user's session contains registration data, redirect the user to complete registration
+	if (!req.session.hasOwnProperty('registration')) {
+		return next();
+	} else {
+		if (!req.path.endsWith('/register/complete')) {
+			controllers.helpers.redirect(res, '/register/complete');
+		} else {
+			return next();
+		}
+	}
+};
+
 module.exports = function(webserver) {
 	app = webserver;
 	middleware.admin = require('./admin')(webserver);
diff --git a/src/middleware/render.js b/src/middleware/render.js
index 79911f71bd..63c5662268 100644
--- a/src/middleware/render.js
+++ b/src/middleware/render.js
@@ -1,6 +1,9 @@
 'use strict';
 
 var nconf = require('nconf');
+var validator = require('validator');
+
+var plugins = require('../plugins');
 var translator = require('../../public/src/modules/translator');
 
 module.exports = function(middleware) {
@@ -9,78 +12,87 @@ module.exports = function(middleware) {
 		// res.render post-processing, modified from here: https://gist.github.com/mrlannigan/5051687
 		var render = res.render;
 		res.render = function(template, options, fn) {
-			var self = this,
-				req = this.req,
-				defaultFn = function(err, str){
-					if (err) {
-						return next(err);
-					}
+			var self = this;
+			var req = this.req;
+			var defaultFn = function(err, str) {
+				if (err) {
+					return next(err);
+				}
+
+				self.send(str);
+			};
 
-					self.send(str);
-				};
 			options = options || {};
-
 			if ('function' === typeof options) {
 				fn = options;
 				options = {};
 			}
 
-			options.loggedIn = !!req.uid;
-			options.relative_path = nconf.get('relative_path');
-			options.template = {name: template};
-			options.template[template] = true;
-			options.bodyClass = buildBodyClass(req);
-
-			res.locals.template = template;
-			options._locals = undefined;
-
-			if (res.locals.isAPI) {
-				if (req.route && req.route.path === '/api/') {
-					options.title = '[[pages:home]]';
-				}
-
-				return res.json(options);
-			}
-
-			if ('function' !== typeof fn) {
-				fn = defaultFn;
-			}
-
-			var ajaxifyData = JSON.stringify(options);
-			ajaxifyData = ajaxifyData.replace(/<\//g, '<\\/');
-
-			render.call(self, template, options, function(err, str) {
+			plugins.fireHook('filter:' + template + '.build', {req: req, res: res, templateData: options}, function(err, data) {
 				if (err) {
-					return fn(err);
+					return next(err);
 				}
 
-				str = (res.locals.postHeader ? res.locals.postHeader : '') + str + (res.locals.preFooter ? res.locals.preFooter : '');
+				options = data.templateData;
 
-				if (res.locals.footer) {
-					str = str + res.locals.footer;
-				} else if (res.locals.adminFooter) {
-					str = str + res.locals.adminFooter;
+				options.loggedIn = !!req.uid;
+				options.relative_path = nconf.get('relative_path');
+				options.template = {name: template};
+				options.template[template] = true;
+				options.url = (req.baseUrl + req.path).replace(/^\/api/, '');
+				options.bodyClass = buildBodyClass(req);
+
+				res.locals.template = template;
+				options._locals = undefined;
+
+				if (res.locals.isAPI) {
+					if (req.route && req.route.path === '/api/') {
+						options.title = '[[pages:home]]';
+					}
+
+					return res.json(options);
 				}
 
-				if (res.locals.renderHeader || res.locals.renderAdminHeader) {
-					var method = res.locals.renderHeader ? middleware.renderHeader : middleware.admin.renderHeader;
-					method(req, res, options, function(err, template) {
-						if (err) {
-							return fn(err);
-						}
-						str = template + str;
-						var language = res.locals.config ? res.locals.config.userLang || 'en_GB' : 'en_GB';
-						language = req.query.lang || language;
-						translator.translate(str, language, function(translated) {
-							translated = translator.unescape(translated);
-							translated = translated + '<script id="ajaxify-data" type="application/json">' + ajaxifyData + '</script>';
-							fn(err, translated);
+				if ('function' !== typeof fn) {
+					fn = defaultFn;
+				}
+
+				var ajaxifyData = JSON.stringify(options);
+				ajaxifyData = ajaxifyData.replace(/<\//g, '<\\/');
+
+				render.call(self, template, options, function(err, str) {
+					if (err) {
+						return fn(err);
+					}
+
+					str = (res.locals.postHeader ? res.locals.postHeader : '') + str + (res.locals.preFooter ? res.locals.preFooter : '');
+
+					if (res.locals.footer) {
+						str = str + res.locals.footer;
+					} else if (res.locals.adminFooter) {
+						str = str + res.locals.adminFooter;
+					}
+
+					if (res.locals.renderHeader || res.locals.renderAdminHeader) {
+						var method = res.locals.renderHeader ? middleware.renderHeader : middleware.admin.renderHeader;
+						method(req, res, options, function(err, template) {
+							if (err) {
+								return fn(err);
+							}
+							str = template + str;
+							var language = res.locals.config ? res.locals.config.userLang || 'en_GB' : 'en_GB';
+							language = req.query.lang ? validator.escape(req.query.lang) : language;
+							translator.translate(str, language, function(translated) {
+								translated = translator.unescape(translated);
+								translated = translated + '<script id="ajaxify-data" type="application/json">' + ajaxifyData + '</script>';
+								fn(err, translated);
+							});
 						});
-					});
-				} else {
-					str = str + '<script id="ajaxify-data" type="application/json">' + ajaxifyData + '</script>';
-					fn(err, str);
-				}
+					} else {
+						str = str + '<script id="ajaxify-data" type="application/json">' + ajaxifyData + '</script>';
+						fn(err, str);
+					}
+				});
 			});
 		};
 
@@ -88,7 +100,7 @@ module.exports = function(middleware) {
 	};
 
 	function buildBodyClass(req) {
-		var clean = req.path.replace(/^\/api/, '').replace(/^\//, '');
+		var clean = req.path.replace(/^\/api/, '').replace(/^\/|\/$/g, '');
 		var parts = clean.split('/').slice(0, 3);
 		parts.forEach(function(p, index) {
 			parts[index] = index ? parts[0] + '-' + p : 'page-' + (p || 'home');
diff --git a/src/navigation/admin.js b/src/navigation/admin.js
index a803b5465b..7db567b90b 100644
--- a/src/navigation/admin.js
+++ b/src/navigation/admin.js
@@ -62,12 +62,7 @@ function getAvailable(callback) {
 		return item;
 	});
 
-	// DEPRECATION: backwards compatibility for filter:header.build, will be removed soon.
-	plugins.fireHook('filter:header.build', {navigation: []}, function(err, data) {
-		core = core.concat(data.navigation);
-
-		plugins.fireHook('filter:navigation.available', core, callback);
-	});
+	plugins.fireHook('filter:navigation.available', core, callback);
 }
 
 module.exports = admin;
\ No newline at end of file
diff --git a/src/notifications.js b/src/notifications.js
index 94cb5313b8..f95eb52248 100644
--- a/src/notifications.js
+++ b/src/notifications.js
@@ -1,17 +1,18 @@
 'use strict';
 
-var async = require('async'),
-	winston = require('winston'),
-	cron = require('cron').CronJob,
-	nconf = require('nconf'),
-	S = require('string'),
-	_ = require('underscore'),
+var async = require('async');
+var winston = require('winston');
+var cron = require('cron').CronJob;
+var nconf = require('nconf');
+var S = require('string');
+var _ = require('underscore');
 
-	db = require('./database'),
-	User = require('./user'),
-	groups = require('./groups'),
-	meta = require('./meta'),
-	plugins = require('./plugins');
+var db = require('./database');
+var User = require('./user');
+var groups = require('./groups');
+var meta = require('./meta');
+var plugins = require('./plugins');
+var utils = require('../public/src/utils');
 
 (function(Notifications) {
 
@@ -45,6 +46,8 @@ var async = require('async'),
 					return next(null, null);
 				}
 
+				notification.datetimeISO = utils.toISOString(notification.datetime);
+
 				if (notification.bodyLong) {
 					notification.bodyLong = S(notification.bodyLong).escapeHTML().s;
 				}
@@ -81,6 +84,21 @@ var async = require('async'),
 		});
 	};
 
+	Notifications.filterExists = function(nids, callback) {
+		// Removes nids that have been pruned
+		db.isSortedSetMembers('notifications', nids, function(err, exists) {
+			if (err) {
+				return callback(err);
+			}
+
+			nids = nids.filter(function(notifId, idx) {
+				return exists[idx];
+			});
+
+			callback(null, nids);
+		});
+	};
+
 	Notifications.findRelated = function(mergeIds, set, callback) {
 		// A related notification is one in a zset that has the same mergeId
 		var _nids;
@@ -197,44 +215,46 @@ var async = require('async'),
 	};
 
 	function pushToUids(uids, notification, callback) {
+		var oneWeekAgo = Date.now() - 604800000;
 		var unreadKeys = [];
 		var readKeys = [];
 
-		uids.forEach(function(uid) {
-			unreadKeys.push('uid:' + uid + ':notifications:unread');
-			readKeys.push('uid:' + uid + ':notifications:read');
-		});
+		async.waterfall([
+			function (next) {
+				plugins.fireHook('filter:notification.push', {notification: notification, uids: uids}, next);
+			},
+			function (data, next) {
+				uids = data.uids;
+				notification = data.notification;
+
+				uids.forEach(function(uid) {
+					unreadKeys.push('uid:' + uid + ':notifications:unread');
+					readKeys.push('uid:' + uid + ':notifications:read');
+				});
 
-		var oneWeekAgo = Date.now() - 604800000;
-		async.series([
-			function(next) {
 				db.sortedSetsAdd(unreadKeys, notification.datetime, notification.nid, next);
 			},
-			function(next) {
+			function (next) {
 				db.sortedSetsRemove(readKeys, notification.nid, next);
 			},
-			function(next) {
+			function (next) {
 				db.sortedSetsRemoveRangeByScore(unreadKeys, '-inf', oneWeekAgo, next);
 			},
-			function(next) {
+			function (next) {
 				db.sortedSetsRemoveRangeByScore(readKeys, '-inf', oneWeekAgo, next);
-			}
-		], function(err) {
-			if (err) {
-				return callback(err);
-			}
+			},
+			function (next) {
+				var websockets = require('./socket.io');
+				if (websockets.server) {
+					uids.forEach(function(uid) {
+						websockets.in('uid_' + uid).emit('event:new_notification', notification);
+					});
+				}
 
-			plugins.fireHook('action:notification.pushed', {notification: notification, uids: uids});
-
-			var websockets = require('./socket.io');
-			if (websockets.server) {
-				uids.forEach(function(uid) {
-					websockets.in('uid_' + uid).emit('event:new_notification', notification);
-				});
+				plugins.fireHook('action:notification.pushed', {notification: notification, uids: uids});
+				next();
 			}
-
-			callback();
-		});
+		], callback);
 	}
 
 	Notifications.pushGroup = function(notification, groupName, callback) {
@@ -248,6 +268,23 @@ var async = require('async'),
 		});
 	};
 
+	Notifications.rescind = function(nid, callback) {
+		callback = callback || function() {};
+
+		async.parallel([
+			async.apply(db.sortedSetRemove, 'notifications', nid),
+			async.apply(db.delete, 'notifications:' + nid)
+		], function(err) {
+			if (err) {
+				winston.error('Encountered error rescinding notification (' + nid + '): ' + err.message);
+			} else {
+				winston.verbose('[notifications/rescind] Rescinded notification "' + nid + '"');
+			}
+
+			callback(err, nid);
+		});
+	};
+
 	Notifications.markRead = function(nid, uid, callback) {
 		callback = callback || function() {};
 		if (!parseInt(uid, 10) || !nid) {
@@ -391,7 +428,6 @@ var async = require('async'),
 	Notifications.merge = function(notifications, callback) {
 		// When passed a set of notification objects, merge any that can be merged
 		var mergeIds = [
-				'notifications:favourited_your_post_in',
 				'notifications:upvoted_your_post_in',
 				'notifications:user_started_following_you',
 				'notifications:user_posted_to',
@@ -438,7 +474,7 @@ var async = require('async'),
 				}
 
 				switch(mergeId) {
-					case 'notifications:favourited_your_post_in':	// intentional fall-through
+					// intentional fall-through
 					case 'notifications:upvoted_your_post_in':
 					case 'notifications:user_started_following_you':
 					case 'notifications:user_posted_to':
diff --git a/src/plugins.js b/src/plugins.js
index 853c6f44f2..da7f25eefe 100644
--- a/src/plugins.js
+++ b/src/plugins.js
@@ -31,7 +31,7 @@ var middleware;
 	Plugins.lessFiles = [];
 	Plugins.clientScripts = [];
 	Plugins.acpScripts = [];
-	Plugins.customLanguages = [];
+	Plugins.customLanguages = {};
 	Plugins.customLanguageFallbacks = {};
 	Plugins.libraryPaths = [];
 	Plugins.versionWarning = [];
@@ -85,12 +85,22 @@ var middleware;
 		Plugins.acpScripts.length = 0;
 		Plugins.libraryPaths.length = 0;
 
-		Plugins.registerHook('core', {
-			hook: 'static:app.load',
-			method: addLanguages
-		});
+		// Plugins.registerHook('core', {
+		// 	hook: 'static:app.load',
+		// 	method: addLanguages
+		// });
 
 		async.waterfall([
+			function(next) {
+				// Build language code list
+				fs.readdir(path.join(__dirname, '../public/language'), function(err, directories) {
+					Plugins.languageCodes = directories.filter(function(code) {
+						return code !== 'TODO';
+					});
+
+					next();
+				});
+			},
 			function(next) {
 				db.getSortedSetRange('plugins:active', 0, -1, next);
 			},
@@ -415,27 +425,28 @@ var middleware;
 		], next);
 	};
 
-	function addLanguages(params, callback) {
-		Plugins.customLanguages.forEach(function(lang) {
-			params.router.get('/language' + lang.route, function(req, res, next) {
-				res.json(lang.file);
-			});
+	// function addLanguages(params, callback) {
+	// 	Plugins.customLanguages.forEach(function(lang) {
+	// 		console.log('route for', '/language/' + lang.route);
+	// 		params.router.get('/language' + lang.route, function(req, res, next) {
+	// 			res.json(lang.file);
+	// 		});
 
-			var components = lang.route.split('/'),
-				language = components[1],
-				filename = components[2].replace('.json', '');
+	// 		var components = lang.route.split('/'),
+	// 			language = components[1],
+	// 			filename = components[2].replace('.json', '');
 
-			translator.addTranslation(language, filename, lang.file);
-		});
+	// 		translator.addTranslation(language, filename, lang.file);
+	// 	});
 
-		for(var resource in Plugins.customLanguageFallbacks) {
-			params.router.get('/language/:lang/' + resource + '.json', function(req, res, next) {
-				winston.verbose('[translator] No resource file found for ' + req.params.lang + '/' + path.basename(req.path, '.json') + ', using provided fallback language file');
-				res.sendFile(Plugins.customLanguageFallbacks[path.basename(req.path, '.json')]);
-			});
-		}
+	// 	for(var resource in Plugins.customLanguageFallbacks) {
+	// 		params.router.get('/language/:lang/' + resource + '.json', function(req, res, next) {
+	// 			winston.verbose('[translator] No resource file found for ' + req.params.lang + '/' + path.basename(req.path, '.json') + ', using provided fallback language file');
+	// 			res.sendFile(Plugins.customLanguageFallbacks[path.basename(req.path, '.json')]);
+	// 		});
+	// 	}
 
-		callback(null);
-	}
+	// 	callback(null);
+	// }
 
 }(exports));
diff --git a/src/plugins/hooks.js b/src/plugins/hooks.js
index 3330608154..c2dde7b92a 100644
--- a/src/plugins/hooks.js
+++ b/src/plugins/hooks.js
@@ -5,11 +5,8 @@ var winston = require('winston'),
 
 module.exports = function(Plugins) {
 	Plugins.deprecatedHooks = {
-		'filter:user.delete': 'static:user.delete',
-		'filter:user.custom_fields': null,
-		'action:user.loggedOut': 'static:user.loggedOut'
+		'filter:user.custom_fields': null	// remove in v1.1.0
 	};
-
 	/*
 		`data` is an object consisting of (* is required):
 			`data.hook`*, the name of the NodeBB hook
@@ -29,12 +26,19 @@ module.exports = function(Plugins) {
 		var method;
 
 		if (Object.keys(Plugins.deprecatedHooks).indexOf(data.hook) !== -1) {
-			winston.warn('[plugins/' + id + '] Hook `' + data.hook + '` is deprecated, ' + 
+			winston.warn('[plugins/' + id + '] Hook `' + data.hook + '` is deprecated, ' +
 				(Plugins.deprecatedHooks[data.hook] ?
 					'please use `' + Plugins.deprecatedHooks[data.hook] + '` instead.' :
 					'there is no alternative.'
 				)
 			);
+		} else {
+			// handle hook's startsWith, i.e. action:homepage.get
+			var parts = data.hook.split(':');
+			if (parts.length > 2) {
+				parts.pop();
+			}
+			var hook = parts.join(':');
 		}
 
 		if (data.hook && data.method) {
@@ -165,4 +169,4 @@ module.exports = function(Plugins) {
 	Plugins.hasListeners = function(hook) {
 		return !!(Plugins.loadedHooks[hook] && Plugins.loadedHooks[hook].length > 0);
 	};
-};
\ No newline at end of file
+};
diff --git a/src/plugins/load.js b/src/plugins/load.js
index 676008a85c..a70fce41ab 100644
--- a/src/plugins/load.js
+++ b/src/plugins/load.js
@@ -171,14 +171,40 @@ module.exports = function(Plugins) {
 	};
 
 	function mapClientModules(pluginData, callback) {
+		if (!pluginData.hasOwnProperty('modules')) {
+			return callback();
+		}
+
+		var modules = {};
+
 		if (Array.isArray(pluginData.modules)) {
 			if (global.env === 'development') {
 				winston.verbose('[plugins] Found ' + pluginData.modules.length + ' AMD-style module(s) for plugin ' + pluginData.id);
 			}
 
-			meta.js.scripts.modules = meta.js.scripts.modules.concat(pluginData.modules.map(function(file) {
-				return path.join('./node_modules/', pluginData.id, file);
-			}));
+			var strip = pluginData.hasOwnProperty('modulesStrip') ? parseInt(pluginData.modulesStrip, 10) : 0;
+
+			pluginData.modules.forEach(function(file) {
+				if (strip) {
+					modules[file.replace(new RegExp('\.?(\/[^\/]+){' + strip + '}\/'), '')] = path.join('./node_modules/', pluginData.id, file);
+				} else {
+					modules[path.basename(file)] = path.join('./node_modules/', pluginData.id, file);
+				}
+			});
+
+			meta.js.scripts.modules = _.extend(meta.js.scripts.modules, modules);
+		} else {
+			var keys = Object.keys(pluginData.modules);
+
+			if (global.env === 'development') {
+				winston.verbose('[plugins] Found ' + keys.length + ' AMD-style module(s) for plugin ' + pluginData.id);
+			}
+
+			for (var name in pluginData.modules) {
+				modules[name] = path.join('./node_modules/', pluginData.id, pluginData.modules[name]);
+			}
+
+			meta.js.scripts.modules = _.extend(meta.js.scripts.modules, modules);
 		}
 
 		callback();
@@ -193,28 +219,34 @@ module.exports = function(Plugins) {
 			fallbackMap = {};
 
 		utils.walk(pathToFolder, function(err, languages) {
-			var arr = [];
-
 			async.each(languages, function(pathToLang, next) {
 				fs.readFile(pathToLang, function(err, file) {
 					if (err) {
 						return next(err);
 					}
-					var json;
+					var data;
+					var route = pathToLang.replace(pathToFolder + '/', '');
 
 					try {
-						json = JSON.parse(file.toString());
+						data = JSON.parse(file.toString());
 					} catch (err) {
 						winston.error('[plugins] Unable to parse custom language file: ' + pathToLang + '\r\n' + err.stack);
 						return next(err);
 					}
 
-					arr.push({
-						file: json,
-						route: pathToLang.replace(pathToFolder, '')
-					});
+					Plugins.customLanguages[route] = Plugins.customLanguages[route] || {};
+					_.extendOwn(Plugins.customLanguages[route], data);
 
 					if (pluginData.defaultLang && pathToLang.endsWith(pluginData.defaultLang + '/' + path.basename(pathToLang))) {
+						Plugins.languageCodes.map(function(code) {
+							if (pluginData.defaultLang !== code) {
+								return code + '/' + path.basename(pathToLang);
+							} else {
+								return null;
+							}
+						}).filter(Boolean).forEach(function(key) {
+							Plugins.customLanguages[key] = _.defaults(Plugins.customLanguages[key] || {}, data);
+						});
 						fallbackMap[path.basename(pathToLang, '.json')] = path.join(pathToFolder, pluginData.defaultLang, path.basename(pathToLang));
 					}
 
@@ -225,7 +257,7 @@ module.exports = function(Plugins) {
 					return callback(err);
 				}
 
-				Plugins.customLanguages = Plugins.customLanguages.concat(arr);
+				// do I need this either?
 				_.extendOwn(Plugins.customLanguageFallbacks, fallbackMap);
 
 				callback();
diff --git a/src/posts.js b/src/posts.js
index a3d19e7a7f..8a494be7c7 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -1,14 +1,14 @@
 'use strict';
 
-var async = require('async'),
-	_ = require('underscore'),
+var async = require('async');
+var _ = require('underscore');
 
-	db = require('./database'),
-	utils = require('../public/src/utils'),
-	user = require('./user'),
-	topics = require('./topics'),
-	privileges = require('./privileges'),
-	plugins = require('./plugins');
+var db = require('./database');
+var utils = require('../public/src/utils');
+var user = require('./user');
+var topics = require('./topics');
+var privileges = require('./privileges');
+var plugins = require('./plugins');
 
 (function(Posts) {
 
@@ -55,7 +55,9 @@ var async = require('async'),
 					if (!post) {
 						return next();
 					}
-
+					post.upvotes = parseInt(post.upvotes, 10) || 0;
+					post.downvotes = parseInt(post.downvotes, 10) || 0;
+					post.votes = post.upvotes - post.downvotes;
 					post.timestampISO = utils.toISOString(post.timestamp);
 					post.editedISO = parseInt(post.edited, 10) !== 0 ? utils.toISOString(post.edited) : '';
 					Posts.parsePost(post, next);
@@ -219,14 +221,14 @@ var async = require('async'),
 		});
 	};
 
-	Posts.updatePostVoteCount = function(postData, voteCount, callback) {
+	Posts.updatePostVoteCount = function(postData, callback) {
 		if (!postData || !postData.pid || !postData.tid) {
 			return callback();
 		}
 		async.parallel([
 			function (next) {
 				if (postData.uid) {
-					db.sortedSetAdd('uid:' + postData.uid + ':posts:votes', voteCount, postData.pid, next);
+					db.sortedSetAdd('uid:' + postData.uid + ':posts:votes', postData.votes, postData.pid, next);
 				} else {
 					next();
 				}
@@ -240,12 +242,12 @@ var async = require('async'),
 						if (parseInt(mainPid, 10) === parseInt(postData.pid, 10)) {
 							return next();
 						}
-						db.sortedSetAdd('tid:' + postData.tid + ':posts:votes', voteCount, postData.pid, next);
+						db.sortedSetAdd('tid:' + postData.tid + ':posts:votes', postData.votes, postData.pid, next);
 					}
 				], next);
 			},
 			function (next) {
-				Posts.setPostField(postData.pid, 'votes', voteCount, next);
+				Posts.setPostFields(postData.pid, {upvotes: postData.upvotes, downvotes: postData.downvotes}, next);
 			}
 		], function(err) {
 			callback(err);
diff --git a/src/posts/category.js b/src/posts/category.js
index 68ae42474b..2d8fd97cc0 100644
--- a/src/posts/category.js
+++ b/src/posts/category.js
@@ -1,8 +1,8 @@
 
 'use strict';
 
-var async = require('async'),
-	topics = require('../topics');
+var async = require('async');
+var topics = require('../topics');
 
 module.exports = function(Posts) {
 
@@ -13,7 +13,7 @@ module.exports = function(Posts) {
 			},
 			function(tid, next) {
 				topics.getTopicField(tid, 'cid', next);
-			}			
+			}
 		], callback);
 	};
 
diff --git a/src/posts/create.js b/src/posts/create.js
index 041d662915..e84fdaaf3d 100644
--- a/src/posts/create.js
+++ b/src/posts/create.js
@@ -1,23 +1,24 @@
 'use strict';
 
-var async = require('async'),
-	_ = require('underscore'),
+var async = require('async');
+var _ = require('underscore');
 
-	meta = require('../meta'),
-	db = require('../database'),
-	plugins = require('../plugins'),
-	user = require('../user'),
-	topics = require('../topics'),
-	categories = require('../categories');
+var meta = require('../meta');
+var db = require('../database');
+var plugins = require('../plugins');
+var user = require('../user');
+var topics = require('../topics');
+var categories = require('../categories');
 
 
 module.exports = function(Posts) {
+
 	Posts.create = function(data, callback) {
 		// This is an internal method, consider using Topics.reply instead
-		var uid = data.uid,
-			tid = data.tid,
-			content = data.content.toString(),
-			timestamp = data.timestamp || Date.now();
+		var uid = data.uid;
+		var tid = data.tid;
+		var content = data.content.toString();
+		var timestamp = data.timestamp || Date.now();
 
 		if (!uid && parseInt(uid, 10) !== 0) {
 			return callback(new Error('[[error:invalid-uid]]'));
@@ -38,7 +39,6 @@ module.exports = function(Posts) {
 					'content': content,
 					'timestamp': timestamp,
 					'reputation': 0,
-					'votes': 0,
 					'editor': '',
 					'edited': 0,
 					'deleted': 0
diff --git a/src/posts/delete.js b/src/posts/delete.js
index a77c153cb2..e28f3f8e36 100644
--- a/src/posts/delete.js
+++ b/src/posts/delete.js
@@ -24,15 +24,15 @@ module.exports = function(Posts) {
 			},
 			function (_post, next) {
 				postData = _post;
-				topics.getTopicField(_post.tid, 'cid', next);
+				topics.getTopicFields(_post.tid, ['tid', 'cid', 'pinned'], next);
 			},
-			function (cid, next) {
+			function (topicData, next) {
 				async.parallel([
 					function(next) {
-						updateTopicTimestamp(postData.tid, next);
+						updateTopicTimestamp(topicData, next);
 					},
 					function(next) {
-						db.sortedSetRemove('cid:' + cid + ':pids', pid, next);
+						db.sortedSetRemove('cid:' + topicData.cid + ':pids', pid, next);
 					},
 					function(next) {
 						Posts.dismissFlag(pid, next);
@@ -40,10 +40,11 @@ module.exports = function(Posts) {
 					function(next) {
 						topics.updateTeaser(postData.tid, next);
 					}
-				], function(err) {
-					plugins.fireHook('action:post.delete', pid);
-					next(err, postData);
-				});
+				], next);
+			},
+			function (results, next) {
+				plugins.fireHook('action:post.delete', pid);
+				next(null, postData);
 			}
 		], callback);
 	};
@@ -62,45 +63,56 @@ module.exports = function(Posts) {
 			},
 			function (_post, next) {
 				postData = _post;
-				topics.getTopicField(_post.tid, 'cid', next);
+				topics.getTopicFields(_post.tid, ['tid', 'cid', 'pinned'], next);
 			},
-			function (cid, next) {
-				postData.cid = cid;
+			function (topicData, next) {
+				postData.cid = topicData.cid;
 				async.parallel([
 					function(next) {
-						updateTopicTimestamp(postData.tid, next);
+						updateTopicTimestamp(topicData, next);
 					},
 					function(next) {
-						db.sortedSetAdd('cid:' + cid + ':pids', postData.timestamp, pid, next);
+						db.sortedSetAdd('cid:' + topicData.cid + ':pids', postData.timestamp, pid, next);
 					},
 					function(next) {
 						topics.updateTeaser(postData.tid, next);
 					}
-				], function(err) {
-					plugins.fireHook('action:post.restore', _.clone(postData));
-					next(err, postData);
-				});
+				], next);
+			},
+			function (results, next) {
+				plugins.fireHook('action:post.restore', _.clone(postData));
+				next(null, postData);
 			}
 		], callback);
 	};
 
-	function updateTopicTimestamp(tid, callback) {
-		topics.getLatestUndeletedPid(tid, function(err, pid) {
-			if(err || !pid) {
-				return callback(err);
+	function updateTopicTimestamp(topicData, callback) {
+		var timestamp;
+		async.waterfall([
+			function (next) {
+				topics.getLatestUndeletedPid(topicData.tid, next);
+			},
+			function (pid, next) {
+				if (!parseInt(pid, 10)) {
+					return callback();
+				}
+				Posts.getPostField(pid, 'timestamp', next);
+			},
+			function (_timestamp, next) {
+				timestamp = _timestamp;
+				if (!parseInt(timestamp, 10)) {
+					return callback();
+				}
+				topics.updateTimestamp(topicData.tid, timestamp, next);
+			},
+			function (next) {
+				if (parseInt(topicData.pinned, 10) !== 1) {
+					db.sortedSetAdd('cid:' + topicData.cid + ':tids', timestamp, topicData.tid, next);
+				} else {
+					next();
+				}
 			}
-
-			Posts.getPostField(pid, 'timestamp', function(err, timestamp) {
-				if (err) {
-					return callback(err);
-				}
-
-				if (timestamp) {
-					return topics.updateTimestamp(tid, timestamp, callback);
-				}
-				callback();
-			});
-		});
+		], callback);
 	}
 
 	Posts.purge = function(pid, uid, callback) {
@@ -160,7 +172,7 @@ module.exports = function(Posts) {
 					return callback(err);
 				}
 
-				topics.getTopicFields(postData.tid, ['cid'], function(err, topicData) {
+				topics.getTopicFields(postData.tid, ['tid', 'cid', 'pinned'], function(err, topicData) {
 					if (err) {
 						return callback(err);
 					}
@@ -178,9 +190,15 @@ module.exports = function(Posts) {
 						function(next) {
 							topics.updateTeaser(postData.tid, next);
 						},
+						function (next) {
+							updateTopicTimestamp(topicData, next);
+						},
 						function(next) {
 							db.sortedSetIncrBy('cid:' + topicData.cid + ':tids:posts', -1, postData.tid, next);
 						},
+						function(next) {
+							db.sortedSetIncrBy('tid:' + postData.tid + ':posters', -1, postData.uid, next);
+						},
 						function(next) {
 							user.incrementUserPostCountBy(postData.uid, -1, next);
 						}
diff --git a/src/posts/flags.js b/src/posts/flags.js
index 3adb6541f2..9eae966cda 100644
--- a/src/posts/flags.js
+++ b/src/posts/flags.js
@@ -2,10 +2,10 @@
 
 'use strict';
 
-var async = require('async'),
-	db = require('../database'),
-	user = require('../user');
-
+var async = require('async');
+var db = require('../database');
+var user = require('../user');
+var analytics = require('../analytics');
 
 module.exports = function(Posts) {
 
@@ -13,52 +13,59 @@ module.exports = function(Posts) {
 		if (!parseInt(uid, 10) || !reason) {
 			return callback();
 		}
-		async.parallel({
-			hasFlagged: async.apply(hasFlagged, post.pid, uid),
-			exists: async.apply(Posts.exists, post.pid)
-		}, function(err, results) {
-			if (err || !results.exists) {
-				return callback(err || new Error('[[error:no-post]]'));
-			}
 
-			if (results.hasFlagged) {
-				return callback(new Error('[[error:already-flagged]]'));
-			}
-			var now = Date.now();
-
-			async.parallel([
-				function(next) {
-					db.sortedSetAdd('posts:flagged', now, post.pid, next);
-				},
-				function(next) {
-					db.sortedSetIncrBy('posts:flags:count', 1, post.pid, next);
-				},
-				function(next) {
-					db.incrObjectField('post:' + post.pid, 'flags', next);
-				},
-				function(next) {
-					db.sortedSetAdd('pid:' + post.pid + ':flag:uids', now, uid, next);
-				},
-				function(next) {
-					db.sortedSetAdd('pid:' + post.pid + ':flag:uid:reason', 0, uid + ':' + reason, next);
-				},
-				function(next) {
-					if (parseInt(post.uid, 10)) {
-						db.sortedSetAdd('uid:' + post.uid + ':flag:pids', now, post.pid, next);
-					} else {
-						next();
-					}
-				},
-				function(next) {
-					if (parseInt(post.uid, 10)) {
-						db.setAdd('uid:' + post.uid + ':flagged_by', uid, next);
-					} else {
-						next();
-					}
+		async.waterfall([
+			function(next) {
+				async.parallel({
+					hasFlagged: async.apply(hasFlagged, post.pid, uid),
+					exists: async.apply(Posts.exists, post.pid)
+				}, next);
+			},
+			function(results, next) {
+				if (!results.exists) {
+					return next(new Error('[[error:no-post]]'));
 				}
-			], function(err) {
-				callback(err);
-			});
+
+				if (results.hasFlagged) {
+					return next(new Error('[[error:already-flagged]]'));
+				}
+
+				var now = Date.now();
+				async.parallel([
+					function(next) {
+						db.sortedSetAdd('posts:flagged', now, post.pid, next);
+					},
+					function(next) {
+						db.sortedSetIncrBy('posts:flags:count', 1, post.pid, next);
+					},
+					function(next) {
+						db.incrObjectField('post:' + post.pid, 'flags', next);
+					},
+					function(next) {
+						db.sortedSetAdd('pid:' + post.pid + ':flag:uids', now, uid, next);
+					},
+					function(next) {
+						db.sortedSetAdd('pid:' + post.pid + ':flag:uid:reason', 0, uid + ':' + reason, next);
+					},
+					function(next) {
+						if (parseInt(post.uid, 10)) {
+							async.parallel([
+								async.apply(db.sortedSetIncrBy, 'users:flags', 1, post.uid),
+								async.apply(db.incrObjectField, 'user:' + post.uid, 'flags'),
+								async.apply(db.sortedSetAdd, 'uid:' + post.uid + ':flag:pids', now, post.pid)
+							], next);
+						} else {
+							next();
+						}
+					}
+				], next);
+			}
+		], function(err) {
+			if (err) {
+				return callback(err);
+			}
+			analytics.increment('flags');
+			callback();
 		});
 	};
 
@@ -67,32 +74,58 @@ module.exports = function(Posts) {
 	}
 
 	Posts.dismissFlag = function(pid, callback) {
-		async.parallel([
+		async.waterfall([
 			function(next) {
-				db.getObjectField('post:' + pid, 'uid', function(err, uid) {
-					if (err) {
-						return next(err);
-					}
-
-					db.sortedSetsRemove([
-						'posts:flagged',
-						'posts:flags:count',
-						'uid:' + uid + ':flag:pids'
-					], pid, next);
-				});
+				db.getObjectFields('post:' + pid, ['pid', 'uid', 'flags'], next);
 			},
-			function(next) {
-				db.deleteObjectField('post:' + pid, 'flags', next);
+			function(postData, next) {
+				if (!postData.pid) {
+					return callback();
+				}
+				async.parallel([
+					function(next) {
+						if (parseInt(postData.uid, 10)) {
+							if (parseInt(postData.flags, 10) > 0) {
+								async.parallel([
+									async.apply(db.sortedSetIncrBy, 'users:flags', -postData.flags, postData.uid),
+									async.apply(db.incrObjectFieldBy, 'user:' + postData.uid, 'flags', -postData.flags)
+								], next);
+							} else {
+								next();
+							}
+						}
+					},
+					function(next) {
+						db.sortedSetsRemove([
+							'posts:flagged',
+							'posts:flags:count',
+							'uid:' + postData.uid + ':flag:pids'
+						], pid, next);
+					},
+					function(next) {
+						async.series([
+							function(next) {
+								db.getSortedSetRange('pid:' + pid + ':flag:uids', 0, -1, function(err, uids) {
+									async.each(uids, function(uid, next) {
+										var nid = 'post_flag:' + pid + ':uid:' + uid;
+										async.parallel([
+											async.apply(db.delete, 'notifications:' + nid),
+											async.apply(db.sortedSetRemove, 'notifications', 'post_flag:' + pid + ':uid:' + uid)
+										], next);
+									}, next);
+								});
+							},
+							async.apply(db.delete, 'pid:' + pid + ':flag:uids')
+						], next);
+					},
+					async.apply(db.deleteObjectField, 'post:' + pid, 'flags'),
+					async.apply(db.delete, 'pid:' + pid + ':flag:uid:reason')
+				], next);
 			},
-			function(next) {
-				db.delete('pid:' + pid + ':flag:uids', next);
-			},
-			function(next) {
-				db.delete('pid:' + pid + ':flag:uid:reason', next);
+			function(results, next) {
+				db.sortedSetsRemoveRangeByScore(['users:flags'], '-inf', 0, next);
 			}
-		], function(err) {
-			callback(err);
-		});
+		], callback);
 	};
 
 	Posts.dismissAllFlags = function(callback) {
@@ -100,7 +133,16 @@ module.exports = function(Posts) {
 			if (err) {
 				return callback(err);
 			}
-			async.eachLimit(pids, 50, Posts.dismissFlag, callback);
+			async.eachSeries(pids, Posts.dismissFlag, callback);
+		});
+	};
+
+	Posts.dismissUserFlags = function(uid, callback) {
+		db.getSortedSetRange('uid:' + uid + ':flag:pids', 0, -1, function(err, pids) {
+			if (err) {
+				return callback(err);
+			}
+			async.eachSeries(pids, Posts.dismissFlag, callback);
 		});
 	};
 
diff --git a/src/posts/parse.js b/src/posts/parse.js
index 1af374305d..19e6430681 100644
--- a/src/posts/parse.js
+++ b/src/posts/parse.js
@@ -1,10 +1,15 @@
-
 'use strict';
 
+var nconf = require('nconf');
+var url = require('url');
+var winston = require('winston');
+
 var cache = require('./cache');
 var plugins = require('../plugins');
 var translator = require('../../public/src/modules/translator');
 
+var urlRegex = /href="([^"]+)"/g;
+
 module.exports = function(Posts) {
 
 	Posts.parsePost = function(postData, callback) {
@@ -40,4 +45,32 @@ module.exports = function(Posts) {
 
 		plugins.fireHook('filter:parse.signature', {userData: userData, uid: uid}, callback);
 	};
+
+	Posts.relativeToAbsolute = function(content) {
+		// Turns relative links in post body to absolute urls
+		var parsed, current, absolute;
+
+		while ((current = urlRegex.exec(content)) !== null) {
+			if (current[1]) {
+				try {
+					parsed = url.parse(current[1]);
+					if (!parsed.protocol) {
+						if (current[1].startsWith('/')) {
+							// Internal link
+							absolute = nconf.get('url') + current[1];
+						} else {
+							// External link
+							absolute = '//' + current[1];
+						}
+
+						content = content.slice(0, current.index + 6) + absolute + content.slice(current.index + 6 + current[1].length);
+					}
+				} catch(err) {
+					winston.verbose(err.messsage);
+				}
+			}
+		}
+
+		return content;
+	};
 };
diff --git a/src/posts/summary.js b/src/posts/summary.js
index 3cb5586bc6..885a0e444d 100644
--- a/src/posts/summary.js
+++ b/src/posts/summary.js
@@ -1,15 +1,15 @@
 
 'use strict';
 
-var async = require('async'),
-	validator = require('validator'),
-	S = require('string'),
+var async = require('async');
+var validator = require('validator');
+var S = require('string');
 
-	db = require('../database'),
-	user = require('../user'),
-	plugins = require('../plugins'),
-	categories = require('../categories'),
-	utils = require('../../public/src/utils');
+var db = require('../database');
+var user = require('../user');
+var plugins = require('../plugins');
+var categories = require('../categories');
+var utils = require('../../public/src/utils');
 
 
 module.exports = function(Posts) {
@@ -30,9 +30,7 @@ module.exports = function(Posts) {
 				return callback(err);
 			}
 
-			posts = posts.filter(function(p) {
-				return !!p && parseInt(p.deleted, 10) !== 1;
-			});
+			posts = posts.filter(Boolean);
 
 			var uids = [], topicKeys = [];
 			for(var i=0; i<posts.length; ++i) {
@@ -66,10 +64,11 @@ module.exports = function(Posts) {
 				for (var i=0; i<posts.length; ++i) {
 					posts[i].index = utils.isNumber(results.indices[i]) ? parseInt(results.indices[i], 10) + 1 : 1;
 					posts[i].isMainPost = posts[i].index - 1 === 0;
+					posts[i].deleted = parseInt(posts[i].deleted, 10) === 1;
 				}
 
 				posts = posts.filter(function(post) {
-					return results.topics[post.tid] && parseInt(results.topics[post.tid].deleted, 10) !== 1;
+					return results.topics[post.tid];
 				});
 
 				async.map(posts, function(post, next) {
@@ -119,6 +118,7 @@ module.exports = function(Posts) {
 			var cids = topics.map(function(topic) {
 				if (topic) {
 					topic.title = validator.escape(topic.title);
+					topic.deleted = parseInt(topic.deleted, 10) === 1;
 				}
 				return topic && topic.cid;
 			}).filter(function(topic, index, array) {
@@ -146,4 +146,4 @@ module.exports = function(Posts) {
 		}
 		return content;
 	}
-};
\ No newline at end of file
+};
diff --git a/src/posts/tools.js b/src/posts/tools.js
index 64ddf155d7..40d150d049 100644
--- a/src/posts/tools.js
+++ b/src/posts/tools.js
@@ -34,10 +34,10 @@ module.exports = function(Posts) {
 					return next(new Error('[[error:post-already-restored]]'));
 				}
 
-				privileges.posts.canEdit(pid, uid, next);
+				privileges.posts.canDelete(pid, uid, next);
 			},
-			function (canEdit, next) {
-				if (!canEdit) {
+			function (canDelete, next) {
+				if (!canDelete) {
 					return next(new Error('[[error:no-privileges]]'));
 				}
 
diff --git a/src/posts/topics.js b/src/posts/topics.js
index a9946fdace..a653e69b03 100644
--- a/src/posts/topics.js
+++ b/src/posts/topics.js
@@ -1,8 +1,10 @@
 
 'use strict';
 
-var async = require('async'),
-	topics = require('../topics');
+var async = require('async');
+
+var topics = require('../topics');
+var utils = require('../../public/src/utils');
 
 module.exports = function(Posts) {
 
@@ -42,4 +44,45 @@ module.exports = function(Posts) {
 		], callback);
 	};
 
+	Posts.generatePostPath = function (pid, uid, callback) {
+		Posts.generatePostPaths([pid], uid, function(err, paths) {
+			callback(err, Array.isArray(paths) && paths.length ? paths[0] : null);
+		});
+	};
+
+	Posts.generatePostPaths = function (pids, uid, callback) {
+		async.waterfall([
+			function (next) {
+				Posts.getPostsFields(pids, ['pid', 'tid'], next);
+			},
+			function (postData, next) {
+				async.parallel({
+					indices: function(next) {
+						Posts.getPostIndices(postData, uid, next);
+					},
+					topics: function(next) {
+						var tids = postData.map(function(post) {
+							return post ? post.tid : null;
+						});
+
+						topics.getTopicsFields(tids, ['slug'], next);
+					}
+				}, next);
+			},
+			function (results, next) {
+				var paths = pids.map(function(pid, index) {
+					var slug = results.topics[index] ? results.topics[index].slug : null;
+					var postIndex = utils.isNumber(results.indices[index]) ? parseInt(results.indices[index], 10) + 1 : null;
+
+					if (slug && postIndex) {
+						return '/topic/' + slug + '/' + postIndex;
+					}
+					return null;
+				});
+
+				next(null, paths);
+			}
+		], callback);
+	};
+
 };
\ No newline at end of file
diff --git a/src/posts/user.js b/src/posts/user.js
index cd675cbfa3..275264f808 100644
--- a/src/posts/user.js
+++ b/src/posts/user.js
@@ -1,66 +1,49 @@
 'use strict';
 
-var async = require('async'),
-	validator = require('validator'),
-
-	db = require('../database'),
-	user = require('../user'),
-	groups = require('../groups'),
-	meta = require('../meta'),
-	plugins = require('../plugins');
+var async = require('async');
+var validator = require('validator');
 
+var user = require('../user');
+var groups = require('../groups');
+var meta = require('../meta');
+var plugins = require('../plugins');
 
 module.exports = function(Posts) {
 
 	Posts.getUserInfoForPosts = function(uids, uid, callback) {
 		var groupsMap = {};
-		var userSettings;
-		async.parallel({
-			groupTitles: function(next) {
-				var keys = uids.map(function(uid) {
-					return 'user:' + uid + ':settings';
-				});
-				async.waterfall([
-					function (next) {
-						db.getObjectsFields(keys, ['groupTitle'], next);
-					},
-					function (_userSettings, next) {
-						userSettings = _userSettings;
-						var groupKeys = userSettings.filter(function(userSetting) {
-							return userSetting && userSetting.groupTitle;
-						}).map(function(userSetting) {
-							return userSetting.groupTitle;
-						}).filter(function(groupTitle, index, array) {
-							return groupTitle && array.indexOf(groupTitle) === index;
-						});
-						groups.getGroupsData(groupKeys, next);
-					},
-					function (groupsData, next) {
-						groupsData.forEach(function(group) {
-							if (group && group.userTitleEnabled) {
-								groupsMap[group.name] = {
-									name: group.name,
-									slug: group.slug,
-									labelColor: group.labelColor,
-									icon: group.icon,
-									userTitle: group.userTitle
-								};
-							}
-						});
-						next(null, userSettings);
-					}
-				], next);
+		var userData;
+		async.waterfall([
+			function(next) {
+				user.getUsersFields(uids, ['uid', 'username', 'fullname', 'userslug', 'reputation', 'postcount', 'picture', 'signature', 'banned', 'status', 'lastonline', 'groupTitle'], next);
 			},
-			userData: function(next) {
-				user.getUsersFields(uids, ['uid', 'username', 'fullname', 'userslug', 'reputation', 'postcount', 'picture', 'signature', 'banned', 'status', 'lastonline'], next);
+			function(_userData, next) {
+				userData = _userData;
+				var groupTitles = userData.map(function(userData) {
+					return userData && userData.groupTitle;
+				}).filter(function(groupTitle, index, array) {
+					return groupTitle && array.indexOf(groupTitle) === index;
+				});
+				groups.getGroupsData(groupTitles, next);
 			}
-		}, function(err, results) {
+		], function(err, groupsData) {
 			if (err) {
 				return callback(err);
 			}
 
-			var userData = results.userData;
-			userData.forEach(function(userData, i) {
+			groupsData.forEach(function(group) {
+				if (group && group.userTitleEnabled) {
+					groupsMap[group.name] = {
+						name: group.name,
+						slug: group.slug,
+						labelColor: group.labelColor,
+						icon: group.icon,
+						userTitle: group.userTitle
+					};
+				}
+			});
+
+			userData.forEach(function(userData) {
 				userData.uid = userData.uid || 0;
 				userData.username = userData.username || '[[global:guest]]';
 				userData.userslug = userData.userslug || '';
@@ -69,7 +52,6 @@ module.exports = function(Posts) {
 				userData.banned = parseInt(userData.banned, 10) === 1;
 				userData.picture = userData.picture || '';
 				userData.status = user.getStatus(userData);
-				userData.groupTitle = results.groupTitles[i].groupTitle;
 				userData.signature = validator.escape(userData.signature || '');
 				userData.fullname = validator.escape(userData.fullname || '');
 			});
@@ -77,7 +59,7 @@ module.exports = function(Posts) {
 			async.map(userData, function(userData, next) {
 				async.parallel({
 					isMemberOfGroup: function (next) {
-						if (!userData.groupTitle) {
+						if (!userData.groupTitle || !groupsMap[userData.groupTitle]) {
 							return next();
 						}
 						groups.isMember(userData.uid, userData.groupTitle, next);
diff --git a/src/privileges.js b/src/privileges.js
index 5c12365597..49bb370b0b 100644
--- a/src/privileges.js
+++ b/src/privileges.js
@@ -2,6 +2,11 @@
 
 var privileges = {};
 
+privileges.userPrivilegeList = ['find', 'read', 'topics:read', 'topics:create', 'topics:reply', 'purge', 'mods'];
+privileges.groupPrivilegeList = ['groups:find', 'groups:read', 'groups:topics:read', 'groups:topics:create', 'groups:topics:reply', 'groups:purge', 'groups:moderate'];
+
+privileges.privilegeList = privileges.userPrivilegeList.concat(privileges.groupPrivilegeList);
+
 require('./privileges/categories')(privileges);
 require('./privileges/topics')(privileges);
 require('./privileges/posts')(privileges);
diff --git a/src/privileges/categories.js b/src/privileges/categories.js
index d51edbb9a8..382d89e4e4 100644
--- a/src/privileges/categories.js
+++ b/src/privileges/categories.js
@@ -1,14 +1,14 @@
 
 'use strict';
 
-var async = require('async'),
-	_ = require('underscore'),
+var async = require('async');
+var _ = require('underscore');
 
-	user = require('../user'),
-	categories = require('../categories'),
-	groups = require('../groups'),
-	helpers = require('./helpers'),
-	plugins = require('../plugins');
+var user = require('../user');
+var categories = require('../categories');
+var groups = require('../groups');
+var helpers = require('./helpers');
+var plugins = require('../plugins');
 
 module.exports = function(privileges) {
 
@@ -18,21 +18,15 @@ module.exports = function(privileges) {
 		// Method used in admin/category controller to show all users/groups with privs in that given cid
 
 		var privilegeLabels = [
-			{name: 'Find category'},
-			{name: 'Access & Read'},
+			{name: 'Find Category'},
+			{name: 'Access Category'},
+			{name: 'Access Topics'},
 			{name: 'Create Topics'},
 			{name: 'Reply to Topics'},
 			{name: 'Purge'},
 			{name: 'Moderate'}
 		];
 
-		var userPrivilegeList = [
-			'find', 'read', 'topics:create', 'topics:reply', 'purge', 'mods'
-		];
-		var groupPrivilegeList = [
-			'groups:find', 'groups:read', 'groups:topics:create', 'groups:topics:reply', 'groups:purge', 'groups:moderate'
-		];
-
 		async.parallel({
 			labels: function(next) {
 				async.parallel({
@@ -41,12 +35,12 @@ module.exports = function(privileges) {
 				}, next);
 			},
 			users: function(next) {
-				var privileges;
+				var userPrivileges;
 				async.waterfall([
-					async.apply(plugins.fireHook, 'filter:privileges.list', userPrivilegeList),
-					function(privs, next) {
-						privileges = privs;
-						groups.getMembersOfGroups(privs.map(function(privilege) {
+					async.apply(plugins.fireHook, 'filter:privileges.list', privileges.userPrivilegeList),
+					function(_privs, next) {
+						userPrivileges = _privs;
+						groups.getMembersOfGroups(userPrivileges.map(function(privilege) {
 							return 'cid:' + cid + ':privileges:' + privilege;
 						}), next);
 					},
@@ -67,8 +61,8 @@ module.exports = function(privileges) {
 
 							memberData.forEach(function(member) {
 								member.privileges = {};
-								for(var x=0,numPrivs=privileges.length;x<numPrivs;x++) {
-									member.privileges[privileges[x]] = memberSets[x].indexOf(parseInt(member.uid, 10)) !== -1;
+								for(var x=0,numPrivs=userPrivileges.length;x<numPrivs;x++) {
+									member.privileges[userPrivileges[x]] = memberSets[x].indexOf(parseInt(member.uid, 10)) !== -1;
 								}
 							});
 
@@ -78,12 +72,12 @@ module.exports = function(privileges) {
 				], next);
 			},
 			groups: function(next) {
-				var privileges;
+				var groupPrivileges;
 				async.waterfall([
-					async.apply(plugins.fireHook, 'filter:privileges.groups.list', groupPrivilegeList),
-					function(privs, next) {
-						privileges = privs;
-						groups.getMembersOfGroups(privs.map(function(privilege) {
+					async.apply(plugins.fireHook, 'filter:privileges.groups.list', privileges.groupPrivilegeList),
+					function(_privs, next) {
+						groupPrivileges = _privs;
+						groups.getMembersOfGroups(groupPrivileges.map(function(privilege) {
 							return 'cid:' + cid + ':privileges:' + privilege;
 						}), next);
 					},
@@ -118,8 +112,8 @@ module.exports = function(privileges) {
 							var memberData = groupNames.map(function(member) {
 								memberPrivs = {};
 
-								for(var x=0,numPrivs=privileges.length;x<numPrivs;x++) {
-									memberPrivs[privileges[x]] = memberSets[x].indexOf(member) !== -1;
+								for(var x=0,numPrivs=groupPrivileges.length;x<numPrivs;x++) {
+									memberPrivs[groupPrivileges[x]] = memberSets[x].indexOf(member) !== -1;
 								}
 								return {
 									name: member,
@@ -162,6 +156,9 @@ module.exports = function(privileges) {
 			'topics:create': function(next) {
 				helpers.isUserAllowedTo('topics:create', uid, [cid], next);
 			},
+			'topics:read': function(next) {
+				helpers.isUserAllowedTo('topics:read', uid, [cid], next);
+			},
 			read: function(next) {
 				helpers.isUserAllowedTo('read', uid, [cid], next);
 			},
@@ -182,6 +179,7 @@ module.exports = function(privileges) {
 				cid: cid,
 				uid: uid,
 				'topics:create': results['topics:create'][0] || isAdminOrMod,
+				'topics:read': results['topics:read'][0] || isAdminOrMod,
 				editable: isAdminOrMod,
 				view_deleted: isAdminOrMod,
 				read: results.read[0] || isAdminOrMod,
@@ -251,6 +249,21 @@ module.exports = function(privileges) {
 			return array.indexOf(cid) === index;
 		});
 
+		privileges.categories.getBase(privilege, cids, uid, function(err, results) {
+			if (err) {
+				return callback(err);
+			}
+
+			cids = cids.filter(function(cid, index) {
+				return !results.categories[index].disabled &&
+					(results.allowedTo[index] || results.isAdmin || results.isModerators[index]);
+			});
+
+			callback(null, cids.filter(Boolean));
+		});
+	};
+
+	privileges.categories.getBase = function(privilege, cids, uid, callback) {
 		async.parallel({
 			categories: function(next) {
 				categories.getCategoriesFields(cids, ['disabled'], next);
@@ -264,18 +277,7 @@ module.exports = function(privileges) {
 			isAdmin: function(next) {
 				user.isAdministrator(uid, next);
 			}
-		}, function(err, results) {
-			if (err) {
-				return callback(err);
-			}
-
-			cids = cids.filter(function(cid, index) {
-				return !results.categories[index].disabled &&
-					(results.allowedTo[index] || results.isAdmin || results.isModerators[index]);
-			});
-
-			callback(null, cids.filter(Boolean));
-		});
+		}, callback);
 	};
 
 	privileges.categories.filterUids = function(privilege, cid, uids, callback) {
@@ -352,6 +354,9 @@ module.exports = function(privileges) {
 			'topics:create': function(next) {
 				groups.isMember(uid, 'cid:' + cid + ':privileges:topics:create', next);
 			},
+			'topics:read': function(next) {
+				groups.isMember(uid, 'cid:' + cid + ':privileges:topics:read', next);
+			},
 			'topics:reply': function(next) {
 				groups.isMember(uid, 'cid:' + cid + ':privileges:topics:reply', next);
 			},
@@ -372,6 +377,9 @@ module.exports = function(privileges) {
 			},
 			'groups:topics:reply': function(next) {
 				groups.isMember(groupName, 'cid:' + cid + ':privileges:groups:topics:reply', next);
+			},
+			'groups:topics:read': function(next) {
+				groups.isMember(groupName, 'cid:' + cid + ':privileges:groups:topics:read', next);
 			}
 		}, callback);
 	};
diff --git a/src/privileges/posts.js b/src/privileges/posts.js
index 8291fcd4e4..a0d06f3600 100644
--- a/src/privileges/posts.js
+++ b/src/privileges/posts.js
@@ -19,17 +19,20 @@ module.exports = function(privileges) {
 			return callback(null, []);
 		}
 
-		async.parallel({
-			isAdmin: function(next){
-				user.isAdministrator(uid, next);
+		async.waterfall([
+			function(next) {
+				posts.getCidsByPids(pids, next);
 			},
-			isModerator: function(next) {
-				posts.isModerator(pids, uid, next);
-			},
-			isOwner: function(next) {
-				posts.isOwner(pids, uid, next);
+			function(cids, next) {
+				async.parallel({
+					isAdmin: async.apply(user.isAdministrator, uid),
+					isModerator: async.apply(posts.isModerator, pids, uid),
+					isOwner: async.apply(posts.isOwner, pids, uid),
+					'topics:read': async.apply(helpers.isUserAllowedTo, 'topics:read', uid, cids),
+					read: async.apply(helpers.isUserAllowedTo, 'read', uid, cids),
+				}, next);
 			}
-		}, function(err, results) {
+		], function(err, results) {
 			if (err) {
 				return callback(err);
 			}
@@ -37,11 +40,16 @@ module.exports = function(privileges) {
 			var privileges = [];
 
 			for (var i=0; i<pids.length; ++i) {
-				var editable = results.isAdmin || results.isModerator[i] || results.isOwner[i];
+				var isAdminOrMod = results.isAdmin || results.isModerator[i];
+				var editable = isAdminOrMod || results.isOwner[i];
+
 				privileges.push({
 					editable: editable,
 					view_deleted: editable,
-					move: results.isAdmin || results.isModerator[i]
+					move: isAdminOrMod,
+					isAdminOrMod: isAdminOrMod,
+					'topics:read': results['topics:read'][i] || isAdminOrMod,
+					read: results.read[i] || isAdminOrMod
 				});
 			}
 
@@ -63,22 +71,57 @@ module.exports = function(privileges) {
 		if (!Array.isArray(pids) || !pids.length) {
 			return callback(null, []);
 		}
-		posts.getCidsByPids(pids, function(err, cids) {
-			if (err) {
-				return callback(err);
-			}
+		var cids;
+		var postData;
+		var tids;
+		var tidToTopic = {};
 
-			pids = pids.map(function(pid, index) {
-				return {pid: pid, cid: cids[index]};
-			});
+		async.waterfall([
+			function (next) {
+				posts.getPostsFields(pids, ['uid', 'tid', 'deleted'], next);
+			},
+			function (_posts, next) {
+				postData = _posts;
+				tids = _posts.map(function(post) {
+					return post && post.tid;
+				}).filter(function(tid, index, array) {
+					return tid && array.indexOf(tid) === index;
+				});
+				topics.getTopicsFields(tids, ['deleted', 'cid'], next);
+			},
+			function (topicData, next) {
 
-			privileges.categories.filterCids(privilege, cids, uid, function(err, cids) {
-				if (err) {
-					return callback(err);
-				}
+				topicData.forEach(function(topic, index) {
+					if (topic) {
+						tidToTopic[tids[index]] = topic;
+					}
+				});
 
-				pids = pids.filter(function(post) {
-					return cids.indexOf(post.cid) !== -1;
+				cids = postData.map(function(post, index) {
+					if (post) {
+						post.pid = pids[index];
+						post.topic = tidToTopic[post.tid];
+					}
+					return tidToTopic[post.tid] && tidToTopic[post.tid].cid;
+				}).filter(function(cid, index, array) {
+					return cid && array.indexOf(cid) === index;
+				});
+
+				privileges.categories.getBase(privilege, cids, uid, next);
+			},
+			function (results, next) {
+
+				var isModOf = {};
+				cids = cids.filter(function(cid, index) {
+					isModOf[cid] = results.isModerators[index];
+					return !results.categories[index].disabled &&
+						(results.allowedTo[index] || results.isAdmin || results.isModerators[index]);
+				});
+
+
+				pids = postData.filter(function(post) {
+					return post.topic && cids.indexOf(post.topic.cid) !== -1 &&
+						((parseInt(post.topic.deleted, 10) !== 1 && parseInt(post.deleted, 10) !== 1) || results.isAdmin || isModOf[post.cid]);
 				}).map(function(post) {
 					return post.pid;
 				});
@@ -87,11 +130,11 @@ module.exports = function(privileges) {
 					privilege: privilege,
 					uid: uid,
 					pids: pids
-				},  function(err, data) {
-					callback(err, data ? data.pids : null);
+				}, function(err, data) {
+					next(err, data ? data.pids : null);
 				});
-			});
-		});
+			}
+		], callback);
 	};
 
 	privileges.posts.canEdit = function(pid, uid, callback) {
@@ -115,6 +158,38 @@ module.exports = function(privileges) {
 		});
 	};
 
+	privileges.posts.canDelete = function(pid, uid, callback) {
+		var postData;
+		async.waterfall([
+			function(next) {
+				posts.getPostFields(pid, ['tid', 'timestamp'], next);
+			},
+			function(_postData, next) {
+				postData = _postData;
+				async.parallel({
+					isAdminOrMod: async.apply(isAdminOrMod, pid, uid),
+					isLocked: async.apply(topics.isLocked, postData.tid),
+					isOwner: async.apply(posts.isOwner, pid, uid)
+				}, next);
+			}
+		], function(err, results) {
+			if (err) {
+				return callback(err);
+			}
+			if (results.isAdminOrMod) {
+				return callback(null, true);
+			}
+			if (results.isLocked) {
+				return callback(new Error('[[error:topic-locked]]'));
+			}
+			var postDeleteDuration = parseInt(meta.config.postDeleteDuration, 10);
+			if (postDeleteDuration && (Date.now() - parseInt(postData.timestamp, 10) > postDeleteDuration * 1000)) {
+				return callback(new Error('[[error:post-delete-duration-expired, ' + meta.config.postDeleteDuration + ']]'));
+			}
+			callback(null, results.isOwner);
+		});
+	};
+
 	privileges.posts.canMove = function(pid, uid, callback) {
 		posts.isMain(pid, function(err, isMain) {
 			if (err || isMain) {
diff --git a/src/privileges/topics.js b/src/privileges/topics.js
index 83e635fde9..d1c8958045 100644
--- a/src/privileges/topics.js
+++ b/src/privileges/topics.js
@@ -21,9 +21,10 @@ module.exports = function(privileges) {
 				topic = _topic;
 				async.parallel({
 					'topics:reply': async.apply(helpers.isUserAllowedTo, 'topics:reply', uid, [topic.cid]),
+					'topics:read': async.apply(helpers.isUserAllowedTo, 'topics:read', uid, [topic.cid]),
 					read: async.apply(helpers.isUserAllowedTo, 'read', uid, [topic.cid]),
 					isOwner: function(next) {
-						next(null, parseInt(uid, 10) === parseInt(topic.uid, 10));
+						next(null, !!parseInt(uid, 10) && parseInt(uid, 10) === parseInt(topic.uid, 10));
 					},
 					isAdministrator: async.apply(user.isAdministrator, uid),
 					isModerator: async.apply(user.isModerator, uid, topic.cid),
@@ -44,6 +45,7 @@ module.exports = function(privileges) {
 			plugins.fireHook('filter:privileges.topics.get', {
 				'topics:reply': (results['topics:reply'][0] && !locked) || isAdminOrMod,
 				read: results.read[0] || isAdminOrMod,
+				'topics:read': results['topics:read'][0] || isAdminOrMod,
 				view_thread_tools: editable || deletable,
 				editable: editable,
 				deletable: deletable,
@@ -70,56 +72,44 @@ module.exports = function(privileges) {
 		if (!Array.isArray(tids) || !tids.length) {
 			return callback(null, []);
 		}
-
+		var cids;
+		var topicsData;
 		async.waterfall([
 			function(next) {
 				topics.getTopicsFields(tids, ['tid', 'cid', 'deleted'], next);
 			},
-			function(topicsData, next) {
-				var cids = topicsData.map(function(topic) {
+			function(_topicsData, next) {
+				topicsData = _topicsData;
+				cids = topicsData.map(function(topic) {
 					return topic.cid;
 				}).filter(function(cid, index, array) {
 					return cid && array.indexOf(cid) === index;
 				});
 
-				async.parallel({
-					categories: function(next) {
-						categories.getCategoriesFields(cids, ['disabled'], next);
-					},
-					allowedTo: function(next) {
-						helpers.isUserAllowedTo(privilege, uid, cids, next);
-					},
-					isModerators: function(next) {
-						user.isModerator(uid, cids, next);
-					},
-					isAdmin: function(next) {
-						user.isAdministrator(uid, next);
-					}
-				}, function(err, results) {
-					if (err) {
-						return next(err);
-					}
-					var isModOf = {};
-					cids = cids.filter(function(cid, index) {
-						isModOf[cid] = results.isModerators[index];
-						return !results.categories[index].disabled &&
-							(results.allowedTo[index] || results.isAdmin || results.isModerators[index]);
-					});
+				privileges.categories.getBase(privilege, cids, uid, next);
+			},
+			function(results, next) {
 
-					tids = topicsData.filter(function(topic) {
-						return cids.indexOf(topic.cid) !== -1 &&
-							(parseInt(topic.deleted, 10) !== 1 || results.isAdmin || isModOf[topic.cid]);
-					}).map(function(topic) {
-						return topic.tid;
-					});
+				var isModOf = {};
+				cids = cids.filter(function(cid, index) {
+					isModOf[cid] = results.isModerators[index];
+					return !results.categories[index].disabled &&
+						(results.allowedTo[index] || results.isAdmin || results.isModerators[index]);
+				});
 
-					plugins.fireHook('filter:privileges.topics.filter', {
-						privilege: privilege,
-						uid: uid,
-						tids: tids
-					}, function(err, data) {
-						next(err, data ? data.tids : null);
-					});
+				tids = topicsData.filter(function(topic) {
+					return cids.indexOf(topic.cid) !== -1 &&
+						(parseInt(topic.deleted, 10) !== 1 || results.isAdmin || isModOf[topic.cid]);
+				}).map(function(topic) {
+					return topic.tid;
+				});
+
+				plugins.fireHook('filter:privileges.topics.filter', {
+					privilege: privilege,
+					uid: uid,
+					tids: tids
+				}, function(err, data) {
+					next(err, data ? data.tids : null);
 				});
 			}
 		], callback);
diff --git a/src/rewards/index.js b/src/rewards/index.js
index 1b46b190d9..c811ce933c 100644
--- a/src/rewards/index.js
+++ b/src/rewards/index.js
@@ -90,7 +90,7 @@ function filterCompletedRewards(uid, rewards, callback) {
 				return true;
 			}
 
-			return (userRewards[reward.id] > reward.claimable) ? false : true;
+			return (userRewards[reward.id] >= reward.claimable) ? false : true;
 		});
 
 		callback(false, rewards);
diff --git a/src/routes/accounts.js b/src/routes/accounts.js
index 8c7a505d0b..e60d2bcc99 100644
--- a/src/routes/accounts.js
+++ b/src/routes/accounts.js
@@ -5,7 +5,9 @@ var setupPageRoute = helpers.setupPageRoute;
 
 module.exports = function (app, middleware, controllers) {
 	var middlewares = [middleware.checkGlobalPrivacySettings];
-	var accountMiddlewares = [middleware.checkGlobalPrivacySettings, middleware.checkAccountPermissions];
+	var accountMiddlewares = [middleware.checkGlobalPrivacySettings, middleware.checkAccountPermissions, middleware.exposeUid];
+
+	setupPageRoute(app, '/uid/:uid/:section?', middleware, [], middleware.redirectUidToUserslug);
 
 	setupPageRoute(app, '/user/:userslug', middleware, middlewares, controllers.accounts.profile.get);
 	setupPageRoute(app, '/user/:userslug/following', middleware, middlewares, controllers.accounts.follow.getFollowing);
@@ -23,6 +25,7 @@ module.exports = function (app, middleware, controllers) {
 	setupPageRoute(app, '/user/:userslug/edit/username', middleware, accountMiddlewares, controllers.accounts.edit.username);
 	setupPageRoute(app, '/user/:userslug/edit/email', middleware, accountMiddlewares, controllers.accounts.edit.email);
 	setupPageRoute(app, '/user/:userslug/edit/password', middleware, accountMiddlewares, controllers.accounts.edit.password);
+	setupPageRoute(app, '/user/:userslug/info', middleware, accountMiddlewares, controllers.accounts.info.get);
 	setupPageRoute(app, '/user/:userslug/settings', middleware, accountMiddlewares, controllers.accounts.settings.get);
 
 	app.delete('/user/:userslug/session/:uuid', accountMiddlewares, controllers.accounts.session.revoke);
diff --git a/src/routes/admin.js b/src/routes/admin.js
index 6ce4fb5f48..543b9e8489 100644
--- a/src/routes/admin.js
+++ b/src/routes/admin.js
@@ -15,6 +15,7 @@ function apiRoutes(router, middleware, controllers) {
 	router.post('/uploadfavicon', middlewares, controllers.admin.uploads.uploadFavicon);
 	router.post('/uploadTouchIcon', middlewares, controllers.admin.uploads.uploadTouchIcon);
 	router.post('/uploadlogo', middlewares, controllers.admin.uploads.uploadLogo);
+	router.post('/uploadOgImage', middlewares, controllers.admin.uploads.uploadOgImage);
 	router.post('/upload/sound', middlewares, controllers.admin.uploads.uploadSound);
 	router.post('/uploadDefaultAvatar', middlewares, controllers.admin.uploads.uploadDefaultAvatar);
 }
@@ -64,6 +65,7 @@ function addRoutes(router, middleware, controllers) {
 	router.get('/manage/users/not-validated', middlewares, controllers.admin.users.notValidated);
 	router.get('/manage/users/no-posts', middlewares, controllers.admin.users.noPosts);
 	router.get('/manage/users/inactive', middlewares, controllers.admin.users.inactive);
+	router.get('/manage/users/flagged', middlewares, controllers.admin.users.flagged);
 	router.get('/manage/users/banned', middlewares, controllers.admin.users.banned);
 	router.get('/manage/registration', middlewares, controllers.admin.users.registrationQueue);
 
@@ -81,6 +83,8 @@ function addRoutes(router, middleware, controllers) {
 	router.get('/advanced/database', middlewares, controllers.admin.database.get);
 	router.get('/advanced/events', middlewares, controllers.admin.events.get);
 	router.get('/advanced/logs', middlewares, controllers.admin.logs.get);
+	router.get('/advanced/errors', middlewares, controllers.admin.errors.get);
+	router.get('/advanced/errors/export', middlewares, controllers.admin.errors.export);
 	router.get('/advanced/post-cache', middlewares, controllers.admin.postCache.get);
 
 	router.get('/development/logger', middlewares, controllers.admin.logger.get);
diff --git a/src/routes/api.js b/src/routes/api.js
index 34cf142b37..ee983f1cd5 100644
--- a/src/routes/api.js
+++ b/src/routes/api.js
@@ -12,6 +12,7 @@ module.exports =  function(app, middleware, controllers) {
 	router.get('/config', middleware.applyCSRF, controllers.api.getConfig);
 	router.get('/widgets/render', controllers.api.renderWidgets);
 
+	router.get('/me', middleware.checkGlobalPrivacySettings, controllers.api.getCurrentUser);
 	router.get('/user/uid/:uid', middleware.checkGlobalPrivacySettings, controllers.api.getUserByUID);
 	router.get('/user/username/:username', middleware.checkGlobalPrivacySettings, controllers.api.getUserByUsername);
 	router.get('/user/email/:email', middleware.checkGlobalPrivacySettings, controllers.api.getUserByEmail);
@@ -22,8 +23,9 @@ module.exports =  function(app, middleware, controllers) {
 
 	router.get('/categories/:cid/moderators', controllers.api.getModerators);
 	router.get('/recent/posts/:term?', controllers.api.getRecentPosts);
-	router.get('/unread/total', middleware.authenticate, controllers.unread.unreadTotal);
+	router.get('/unread/:filter?/total', middleware.authenticate, controllers.unread.unreadTotal);
 	router.get('/topic/teaser/:topic_id', controllers.topics.teaser);
+	router.get('/topic/pagination/:topic_id', controllers.topics.pagination);
 
 	var multipart = require('connect-multiparty');
 	var multipartMiddleware = multipart();
diff --git a/src/routes/authentication.js b/src/routes/authentication.js
index 8e1824cad6..d8561f2528 100644
--- a/src/routes/authentication.js
+++ b/src/routes/authentication.js
@@ -52,7 +52,8 @@
 			loginStrategies.forEach(function(strategy) {
 				if (strategy.url) {
 					router.get(strategy.url, passport.authenticate(strategy.name, {
-						scope: strategy.scope
+						scope: strategy.scope,
+						prompt: strategy.prompt || undefined
 					}));
 				}
 
@@ -63,6 +64,8 @@
 			});
 
 			router.post('/register', Auth.middleware.applyCSRF, Auth.middleware.applyBlacklist, controllers.authentication.register);
+			router.post('/register/complete', Auth.middleware.applyCSRF, Auth.middleware.applyBlacklist, controllers.authentication.registerComplete);
+			router.get('/register/abort', controllers.authentication.registerAbort);
 			router.post('/login', Auth.middleware.applyCSRF, Auth.middleware.applyBlacklist, controllers.authentication.login);
 			router.post('/logout', Auth.middleware.applyCSRF, controllers.authentication.logout);
 
diff --git a/src/routes/feeds.js b/src/routes/feeds.js
index 09f3f1826e..3ceefbb4d6 100644
--- a/src/routes/feeds.js
+++ b/src/routes/feeds.js
@@ -38,7 +38,7 @@ function generateForTopic(req, res, callback) {
 			if (parseInt(results.topic.deleted, 10) && !results.privileges.view_deleted) {
 				return callback();
 			}
-			if (!results.privileges.read) {
+			if (!results.privileges.read || !results.privileges['topics:read']) {
 				return helpers.notAllowed(req, res);
 			}
 			userPrivileges = results.privileges;
diff --git a/src/routes/helpers.js b/src/routes/helpers.js
index 3dcca80bc4..378e2bdbc8 100644
--- a/src/routes/helpers.js
+++ b/src/routes/helpers.js
@@ -3,7 +3,7 @@
 var helpers = {};
 
 helpers.setupPageRoute = function(router, name, middleware, middlewares, controller) {
-	middlewares = middlewares.concat([middleware.pageView, middleware.pluginHooks]);
+	middlewares = middlewares.concat([middleware.registrationComplete, middleware.pageView, middleware.pluginHooks]);
 
 	router.get(name, middleware.busyCheck, middleware.buildHeader, middlewares, controller);
 	router.get('/api' + name, middlewares, controller);
diff --git a/src/routes/index.js b/src/routes/index.js
index a80eb2e46a..1e51f5d59e 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -1,23 +1,24 @@
 "use strict";
 
-var nconf = require('nconf'),
-	path = require('path'),
-	async = require('async'),
-	winston = require('winston'),
-	controllers = require('../controllers'),
-	plugins = require('../plugins'),
-	express = require('express'),
-	validator = require('validator'),
+var nconf = require('nconf');
+var path = require('path');
+var async = require('async');
+var winston = require('winston');
+var controllers = require('../controllers');
+var plugins = require('../plugins');
+var user = require('../user');
+var express = require('express');
+var validator = require('validator');
 
-	accountRoutes = require('./accounts'),
+var accountRoutes = require('./accounts');
 
-	metaRoutes = require('./meta'),
-	apiRoutes = require('./api'),
-	adminRoutes = require('./admin'),
-	feedRoutes = require('./feeds'),
-	pluginRoutes = require('./plugins'),
-	authRoutes = require('./authentication'),
-	helpers = require('./helpers');
+var metaRoutes = require('./meta');
+var apiRoutes = require('./api');
+var adminRoutes = require('./admin');
+var feedRoutes = require('./feeds');
+var pluginRoutes = require('./plugins');
+var authRoutes = require('./authentication');
+var helpers = require('./helpers');
 
 var setupPageRoute = helpers.setupPageRoute;
 
@@ -28,6 +29,7 @@ function mainRoutes(app, middleware, controllers) {
 
 	setupPageRoute(app, '/login', middleware, loginRegisterMiddleware, controllers.login);
 	setupPageRoute(app, '/register', middleware, loginRegisterMiddleware, controllers.register);
+	setupPageRoute(app, '/register/complete', middleware, [], controllers.registerInterstitial);
 	setupPageRoute(app, '/compose', middleware, [], controllers.compose);
 	setupPageRoute(app, '/confirm/:code', middleware, [], controllers.confirmEmail);
 	setupPageRoute(app, '/outgoing', middleware, [], controllers.outgoing);
@@ -46,6 +48,10 @@ function topicRoutes(app, middleware, controllers) {
 	setupPageRoute(app, '/topic/:topic_id/:slug?', middleware, [], controllers.topics.get);
 }
 
+function postRoutes(app, middleware, controllers) {
+	setupPageRoute(app, '/post/:pid', middleware, [], controllers.posts.redirectToPost);
+}
+
 function tagRoutes(app, middleware, controllers) {
 	setupPageRoute(app, '/tags/:tag', middleware, [middleware.privateTagListing], controllers.tags.getTag);
 	setupPageRoute(app, '/tags', middleware, [middleware.privateTagListing], controllers.tags.getTags);
@@ -55,7 +61,7 @@ function categoryRoutes(app, middleware, controllers) {
 	setupPageRoute(app, '/categories', middleware, [], controllers.categories.list);
 	setupPageRoute(app, '/popular/:term?', middleware, [], controllers.popular.get);
 	setupPageRoute(app, '/recent', middleware, [], controllers.recent.get);
-	setupPageRoute(app, '/unread', middleware, [middleware.authenticate], controllers.unread.get);
+	setupPageRoute(app, '/unread/:filter?', middleware, [middleware.authenticate], controllers.unread.get);
 
 	setupPageRoute(app, '/category/:category_id/:slug/:topic_index', middleware, [], controllers.category.get);
 	setupPageRoute(app, '/category/:category_id/:slug?', middleware, [], controllers.category.get);
@@ -69,9 +75,9 @@ function userRoutes(app, middleware, controllers) {
 	setupPageRoute(app, '/users/sort-posts', middleware, middlewares, controllers.users.getUsersSortedByPosts);
 	setupPageRoute(app, '/users/sort-reputation', middleware, middlewares, controllers.users.getUsersSortedByReputation);
 	setupPageRoute(app, '/users/banned', middleware, middlewares, controllers.users.getBannedUsers);
+	setupPageRoute(app, '/users/flagged', middleware, middlewares, controllers.users.getFlaggedUsers);
 }
 
-
 function groupRoutes(app, middleware, controllers) {
 	var middlewares = [middleware.checkGlobalPrivacySettings, middleware.exposeGroupName];
 
@@ -80,13 +86,25 @@ function groupRoutes(app, middleware, controllers) {
 	setupPageRoute(app, '/groups/:slug/members', middleware, middlewares, controllers.groups.members);
 }
 
-module.exports = function(app, middleware) {
-	var router = express.Router(),
-		pluginRouter = express.Router(),
-		authRouter = express.Router(),
+module.exports = function(app, middleware, hotswapIds) {
+	var routers = [
+			express.Router(),	// plugin router
+			express.Router(),	// main app router
+			express.Router()	// auth router
+		],
+		router = routers[1],
+		pluginRouter = routers[0],
+		authRouter = routers[2],
 		relativePath = nconf.get('relative_path'),
 		ensureLoggedIn = require('connect-ensure-login');
 
+	if (Array.isArray(hotswapIds) && hotswapIds.length) {
+		for(var idx,x=0;x<hotswapIds.length;x++) {
+			idx = routers.push(express.Router()) - 1;
+			routers[idx].hotswapId = hotswapIds[x];
+		}
+	}
+
 	pluginRouter.render = function() {
 		app.render.apply(app, arguments);
 	};
@@ -112,6 +130,7 @@ module.exports = function(app, middleware) {
 
 	mainRoutes(router, middleware, controllers);
 	topicRoutes(router, middleware, controllers);
+	postRoutes(router, middleware, controllers);
 	globalModRoutes(router, middleware, controllers);
 	tagRoutes(router, middleware, controllers);
 	categoryRoutes(router, middleware, controllers);
@@ -119,98 +138,27 @@ module.exports = function(app, middleware) {
 	userRoutes(router, middleware, controllers);
 	groupRoutes(router, middleware, controllers);
 
-	app.use(relativePath, pluginRouter);
-	app.use(relativePath, router);
-	app.use(relativePath, authRouter);
+	for(var x=0;x<routers.length;x++) {
+		app.use(relativePath, routers[x]);
+	}
 
 	if (process.env.NODE_ENV === 'development') {
 		require('./debug')(app, middleware, controllers);
 	}
 
 	app.use(middleware.privateUploads);
-
+	app.use('/language/:code', middleware.processLanguages);
 	app.use(relativePath, express.static(path.join(__dirname, '../../', 'public'), {
 		maxAge: app.enabled('cache') ? 5184000000 : 0
 	}));
-
-	handle404(app, middleware);
-	handleErrors(app, middleware);
-
+	app.use('/vendor/jquery/timeago/locales', middleware.processTimeagoLocales);
+	app.use(controllers.handle404);
+	app.use(controllers.handleErrors);
 
 	// Add plugin routes
 	async.series([
 		async.apply(plugins.reloadRoutes),
-		async.apply(authRoutes.reloadRoutes)
+		async.apply(authRoutes.reloadRoutes),
+		async.apply(user.addInterstitials)
 	]);
 };
-
-function handle404(app, middleware) {
-	var relativePath = nconf.get('relative_path');
-	var isLanguage = new RegExp('^' + relativePath + '/language/.*/.*.json');
-	var isClientScript = new RegExp('^' + relativePath + '\\/src\\/.+\\.js');
-
-	app.use(function(req, res) {
-		if (plugins.hasListeners('action:meta.override404')) {
-			return plugins.fireHook('action:meta.override404', {
-				req: req,
-				res: res,
-				error: {}
-			});
-		}
-
-		if (isClientScript.test(req.url)) {
-			res.type('text/javascript').status(200).send('');
-		} else if (isLanguage.test(req.url)) {
-			res.status(200).json({});
-		} else if (req.path.startsWith(relativePath + '/uploads')) {
-			res.status(404).send('');
-		} else if (req.path === '/favicon.ico') {
-			res.status(404).send('');
-		} else if (req.accepts('html')) {
-			if (process.env.NODE_ENV === 'development') {
-				winston.warn('Route requested but not found: ' + req.url);
-			}
-
-			res.status(404);
-
-			if (res.locals.isAPI) {
-				return res.json({path: validator.escape(req.path.replace(/^\/api/, '') || ''), title: '[[global:404.title]]'});
-			}
-
-			middleware.buildHeader(req, res, function() {
-				res.render('404', {path: validator.escape(req.path || ''), title: '[[global:404.title]]'});
-			});
-		} else {
-			res.status(404).type('txt').send('Not found');
-		}
-	});
-}
-
-function handleErrors(app, middleware) {
-	app.use(function(err, req, res, next) {
-		switch (err.code) {
-			case 'EBADCSRFTOKEN':
-				winston.error(req.path + '\n', err.message);
-				return res.sendStatus(403);
-			case 'blacklisted-ip':
-				return res.status(403).type('text/plain').send(err.message);
-		}
-
-		if (parseInt(err.status, 10) === 302 && err.path) {
-			return res.locals.isAPI ? res.status(302).json(err.path) : res.redirect(err.path);
-		}
-
-		winston.error(req.path + '\n', err.stack);
-
-		res.status(err.status || 500);
-
-		if (res.locals.isAPI) {
-			res.json({path: validator.escape(req.path || ''), error: err.message});
-		} else {
-			middleware.buildHeader(req, res, function() {
-				res.render('500', {path: validator.escape(req.path || ''), error: validator.escape(err.message)});
-			});
-		}
-	});
-}
-
diff --git a/src/routes/meta.js b/src/routes/meta.js
index 65757566de..b459db2972 100644
--- a/src/routes/meta.js
+++ b/src/routes/meta.js
@@ -1,11 +1,14 @@
 "use strict";
 
-var meta = require('../meta'),
-	middleware = require('../middleware');
+var path = require('path');
+var nconf = require('nconf');
+
+var meta = require('../meta');
 
 
-function sendMinifiedJS(req, res, next) {
-	var cache = meta.js.target['nodebb.min.js'] ? meta.js.target['nodebb.min.js'].cache : '';
+function sendMinifiedJS(req, res) {
+	var target = path.basename(req.path);
+	var cache = meta.js.target[target] ? meta.js.target[target].cache : '';
 	res.type('text/javascript').send(cache);
 }
 
@@ -19,18 +22,29 @@ function sendMinifiedJS(req, res, next) {
 // 	}
 // };
 
-function sendStylesheet(req, res, next) {
+function sendStylesheet(req, res) {
 	res.type('text/css').status(200).send(meta.css.cache);
 }
 
-function sendACPStylesheet(req, res, next) {
+function sendACPStylesheet(req, res) {
 	res.type('text/css').status(200).send(meta.css.acpCache);
 }
 
+function sendSoundFile(req, res, next) {
+	var resolved = meta.sounds._filePathHash[path.basename(req.path)];
+
+	if (resolved) {
+		res.status(200).sendFile(resolved);
+	} else {
+		next();
+	}
+}
+
 module.exports = function(app, middleware, controllers) {
 	app.get('/stylesheet.css', middleware.addExpiresHeaders, sendStylesheet);
 	app.get('/admin.css', middleware.addExpiresHeaders, sendACPStylesheet);
 	app.get('/nodebb.min.js', middleware.addExpiresHeaders, sendMinifiedJS);
+	app.get('/acp.min.js', middleware.addExpiresHeaders, sendMinifiedJS);
 	// app.get('/nodebb.min.js.map', middleware.addExpiresHeaders, sendJSSourceMap);
 	app.get('/sitemap.xml', controllers.sitemap.render);
 	app.get('/sitemap/pages.xml', controllers.sitemap.getPages);
@@ -39,4 +53,8 @@ module.exports = function(app, middleware, controllers) {
 	app.get('/robots.txt', controllers.robots);
 	app.get('/manifest.json', controllers.manifest);
 	app.get('/css/previews/:theme', controllers.admin.themes.get);
+
+	if (nconf.get('local-assets') === false) {
+		app.get('/sounds/*', middleware.addExpiresHeaders, sendSoundFile);
+	}
 };
diff --git a/src/routes/plugins.js b/src/routes/plugins.js
index 0123433db9..18c928e3af 100644
--- a/src/routes/plugins.js
+++ b/src/routes/plugins.js
@@ -26,6 +26,15 @@ module.exports = function(app, middleware, controllers) {
 			return next();
 		}
 
-		res.sendFile(matches[0]);
+		res.sendFile(matches[0], {}, function(err) {
+			if (err) {
+				if (err.code === 'ENOENT') {
+					// File doesn't exist, this isn't an error, to send to 404 handler
+					return next();
+				} else {
+					return next(err);
+				}
+			}
+		});
 	});
 };
\ No newline at end of file
diff --git a/src/sitemap.js b/src/sitemap.js
index 00bb195809..acda852ae9 100644
--- a/src/sitemap.js
+++ b/src/sitemap.js
@@ -45,47 +45,30 @@ sitemap.render = function(callback) {
 	});
 };
 
-sitemap.getStaticUrls = function(callback) {
-	callback(null, [{
-		url: '',
-		changefreq: 'weekly',
-		priority: '0.6'
-	}, {
-		url: '/recent',
-		changefreq: 'daily',
-		priority: '0.4'
-	}, {
-		url: '/users',
-		changefreq: 'daily',
-		priority: '0.4'
-	}, {
-		url: '/groups',
-		changefreq: 'daily',
-		priority: '0.4'
-	}]);
-};
-
 sitemap.getPages = function(callback) {
-	if (sitemap.maps.pages && sitemap.maps.pages.cache.length) {
+	if (
+		sitemap.maps.pages &&
+		Date.now() < parseInt(sitemap.maps.pages.cacheSetTimestamp, 10) + parseInt(sitemap.maps.pages.cacheResetPeriod, 10)
+	) {
 		return sitemap.maps.pages.toXML(callback);
 	}
 
 	var urls = [{
 			url: '',
 			changefreq: 'weekly',
-			priority: '0.6'
+			priority: 0.6
 		}, {
 			url: '/recent',
 			changefreq: 'daily',
-			priority: '0.4'
+			priority: 0.4
 		}, {
 			url: '/users',
 			changefreq: 'daily',
-			priority: '0.4'
+			priority: 0.4
 		}, {
 			url: '/groups',
 			changefreq: 'daily',
-			priority: '0.4'
+			priority: 0.4
 		}];
 
 	sitemap.maps.pages = sm.createSitemap({
@@ -98,7 +81,10 @@ sitemap.getPages = function(callback) {
 };
 
 sitemap.getCategories = function(callback) {
-	if (sitemap.maps.categories && sitemap.maps.categories.cache.length) {
+	if (
+		sitemap.maps.categories &&
+		Date.now() < parseInt(sitemap.maps.categories.cacheSetTimestamp, 10) + parseInt(sitemap.maps.categories.cacheResetPeriod, 10)
+	) {
 		return sitemap.maps.categories.toXML(callback);
 	}
 
@@ -113,7 +99,7 @@ sitemap.getCategories = function(callback) {
 				categoryUrls.push({
 					url: '/category/' + category.slug,
 					changefreq: 'weekly',
-					priority: '0.4'
+					priority: 0.4
 				});
 			}
 		});
@@ -137,7 +123,10 @@ sitemap.getTopicPage = function(page, callback) {
 	var min = (parseInt(page, 10) - 1) * numTopics;
 	var max = min + numTopics;
 
-	if (sitemap.maps.topics[page-1] && sitemap.maps.topics[page-1].cache.length) {
+	if (
+		sitemap.maps.topics[page-1] &&
+		Date.now() < parseInt(sitemap.maps.topics[page-1].cacheSetTimestamp, 10) + parseInt(sitemap.maps.topics[page-1].cacheResetPeriod, 10)
+	) {
 		return sitemap.maps.topics[page-1].toXML(callback);
 	}
 
@@ -164,7 +153,7 @@ sitemap.getTopicPage = function(page, callback) {
 					url: '/topic/' + topic.slug,
 					lastmodISO: utils.toISOString(topic.lastposttime),
 					changefreq: 'daily',
-					priority: '0.6'
+					priority: 0.6
 				});
 			}
 		});
diff --git a/src/socket.io/admin.js b/src/socket.io/admin.js
index 6dd22134ba..8a1df2931e 100644
--- a/src/socket.io/admin.js
+++ b/src/socket.io/admin.js
@@ -33,7 +33,8 @@ var	async = require('async'),
 		settings: {},
 		email: {},
 		analytics: {},
-		logs: {}
+		logs: {},
+		errors: {}
 	};
 
 SocketAdmin.before = function(socket, method, data, next) {
@@ -255,6 +256,11 @@ SocketAdmin.logs.clear = function(socket, data, callback) {
 	meta.logs.clear(callback);
 };
 
+SocketAdmin.errors.clear = function(socket, data, callback) {
+	console.log('clearing errors?');
+	meta.errors.clear(callback);
+};
+
 SocketAdmin.getMoreEvents = function(socket, next, callback) {
 	var start = parseInt(next, 10);
 	if (start < 0) {
diff --git a/src/socket.io/admin/categories.js b/src/socket.io/admin/categories.js
index 3b35847366..8e24359e7a 100644
--- a/src/socket.io/admin/categories.js
+++ b/src/socket.io/admin/categories.js
@@ -72,44 +72,35 @@ Categories.getPrivilegeSettings = function(socket, cid, callback) {
 };
 
 Categories.copyPrivilegesToChildren = function(socket, cid, callback) {
-	async.parallel({
-		category: function(next) {
-			categories.getCategories([cid], socket.uid, next);
-		},
-		privileges: function(next) {
-			privileges.categories.list(cid, next);
-		}
-	}, function(err, results) {
+	categories.getCategories([cid], socket.uid, function(err, categories) {		
 		if (err) {
 			return callback(err);
 		}
-		var category = results.category[0];
+		var category = categories[0];
 
 		async.eachSeries(category.children, function(child, next) {
-			copyPrivilegesToChildrenRecursive(child, results.privileges.groups, next);
+			copyPrivilegesToChildrenRecursive(cid, child, next);
 		}, callback);
 	});
 };
 
-function copyPrivilegesToChildrenRecursive(category, privilegeGroups, callback) {
-	async.eachSeries(privilegeGroups, function(privGroup, next) {
-		var privs = Object.keys(privGroup.privileges);
-		async.each(privs, function(privilege, next) {
-			var isSet = privGroup.privileges[privilege];
-			groups[isSet ? 'join' : 'leave']('cid:' + category.cid + ':privileges:' + privilege, privGroup.name, next);
-		}, next);
-	}, function(err) {
+function copyPrivilegesToChildrenRecursive(parentCid, category, callback) {
+	categories.copyPrivilegesFrom(parentCid, category.cid, function(err) {
 		if (err) {
 			return callback(err);
 		}
 		async.eachSeries(category.children, function(child, next) {
-			copyPrivilegesToChildrenRecursive(child, privilegeGroups, next);
+			copyPrivilegesToChildrenRecursive(parentCid, child, next);
 		}, callback);
 	});
 }
 
 Categories.copySettingsFrom = function(socket, data, callback) {
-	categories.copySettingsFrom(data.fromCid, data.toCid, callback);
+	categories.copySettingsFrom(data.fromCid, data.toCid, true, callback);
+};
+
+Categories.copyPrivilegesFrom = function(socket, data, callback) {
+	categories.copyPrivilegesFrom(data.fromCid, data.toCid, callback);
 };
 
 module.exports = Categories;
\ No newline at end of file
diff --git a/src/socket.io/admin/groups.js b/src/socket.io/admin/groups.js
index 206604ec8f..c912008210 100644
--- a/src/socket.io/admin/groups.js
+++ b/src/socket.io/admin/groups.js
@@ -5,8 +5,10 @@ var groups = require('../../groups'),
 	Groups = {};
 
 Groups.create = function(socket, data, callback) {
-	if(!data) {
+	if (!data) {
 		return callback(new Error('[[error:invalid-data]]'));
+	} else if (groups.isPrivilegeGroup(data.name)) {
+		return callback(new Error('[[error:invalid-group-name]]'));
 	}
 
 	groups.create({
diff --git a/src/socket.io/admin/user.js b/src/socket.io/admin/user.js
index 2633425dc4..ed7b4b378d 100644
--- a/src/socket.io/admin/user.js
+++ b/src/socket.io/admin/user.js
@@ -185,25 +185,15 @@ User.search = function(socket, data, callback) {
 			return user && user.uid;
 		});
 
-		async.parallel({
-			users: function(next) {
-				user.getUsersFields(uids, ['email'], next);
-			},
-			flagCounts: function(next) {
-				var sets = uids.map(function(uid) {
-					return 'uid:' + uid + ':flagged_by';
-				});
-				db.setsCount(sets, next);
-			}
-		}, function(err, results) {
+		user.getUsersFields(uids, ['email', 'flags'], function(err, userInfo) {
 			if (err) {
 				return callback(err);
 			}
 
 			userData.forEach(function(user, index) {
-				if (user) {
-					user.email = (results.users[index] && results.users[index].email) || '';
-					user.flags = results.flagCounts[index] || 0;
+				if (user && userInfo[index]) {
+					user.email = userInfo[index].email || '';
+					user.flags = userInfo[index].flags || 0;
 				}
 			});
 
diff --git a/src/socket.io/categories.js b/src/socket.io/categories.js
index 262a5e8a41..545938d718 100644
--- a/src/socket.io/categories.js
+++ b/src/socket.io/categories.js
@@ -193,7 +193,7 @@ SocketCategories.isModerator = function(socket, cid, callback) {
 };
 
 SocketCategories.getCategory = function(socket, cid, callback) {
-	apiController.getObjectByType(socket.uid, 'category', cid, callback);
+	apiController.getCategoryData(cid, socket.uid, callback);
 };
 
 module.exports = SocketCategories;
diff --git a/src/socket.io/groups.js b/src/socket.io/groups.js
index a54db76b05..4e48a9649b 100644
--- a/src/socket.io/groups.js
+++ b/src/socket.io/groups.js
@@ -170,6 +170,8 @@ SocketGroups.create = function(socket, data, callback) {
 		return callback(new Error('[[error:no-privileges]]'));
 	} else if (parseInt(meta.config.allowGroupCreation, 10) !== 1) {
 		return callback(new Error('[[error:group-creation-disabled]]'));
+	} else if (groups.isPrivilegeGroup(data.name)) {
+		return callback(new Error('[[error:invalid-group-name]]'));
 	}
 
 
diff --git a/src/socket.io/helpers.js b/src/socket.io/helpers.js
index e4621811ca..706604ec6e 100644
--- a/src/socket.io/helpers.js
+++ b/src/socket.io/helpers.js
@@ -3,8 +3,8 @@
 var async = require('async');
 var winston = require('winston');
 var S = require('string');
-var nconf = require('nconf');
 
+var db = require('../database');
 var websockets = require('./index');
 var user = require('../user');
 var posts = require('../posts');
@@ -28,6 +28,9 @@ SocketHelpers.notifyNew = function(uid, type, result) {
 		function(uids, next) {
 			privileges.topics.filterUids('read', result.posts[0].topic.tid, uids, next);
 		},
+		function(uids, next) {
+			filterTidCidIgnorers(uids, result.posts[0].topic.tid, result.posts[0].topic.cid, next);
+		},
 		function(uids, next) {
 			plugins.fireHook('filter:sockets.sendNewPostToUids', {uidsTo: uids, uidFrom: uid, type: type}, next);
 		}
@@ -49,28 +52,56 @@ SocketHelpers.notifyNew = function(uid, type, result) {
 	});
 };
 
-SocketHelpers.sendNotificationToPostOwner = function(pid, fromuid, notification) {
+function filterTidCidIgnorers(uids, tid, cid, callback) {
+	async.waterfall([
+		function (next) {
+			async.parallel({
+				topicFollowed: function(next) {
+					db.isSetMembers('tid:' + tid + ':followers', uids, next);
+				},
+				topicIgnored: function(next) {
+					db.isSetMembers('tid:' + tid + ':ignorers', uids, next);
+				},
+				categoryIgnored: function(next) {
+					db.sortedSetScores('cid:' + cid + ':ignorers', uids, next);
+				}
+			}, next);
+		},
+		function (results, next) {
+			uids = uids.filter(function(uid, index) {
+				return results.topicFollowed[index] ||
+					(!results.topicFollowed[index] && !results.topicIgnored[index] && !results.categoryIgnored[index]);
+			});
+			next(null, uids);
+		}
+	], callback);
+}
+
+SocketHelpers.sendNotificationToPostOwner = function(pid, fromuid, command, notification) {
 	if (!pid || !fromuid || !notification) {
 		return;
 	}
-	posts.getPostFields(pid, ['tid', 'uid', 'content'], function(err, postData) {
-		if (err) {
-			return;
-		}
-
-		if (!postData.uid || fromuid === parseInt(postData.uid, 10)) {
-			return;
-		}
-
-		async.parallel({
-			username: async.apply(user.getUserField, fromuid, 'username'),
-			topicTitle: async.apply(topics.getTopicField, postData.tid, 'title'),
-			postObj: async.apply(posts.parsePost, postData)
-		}, function(err, results) {
-			if (err) {
+	fromuid = parseInt(fromuid, 10);
+	var postData;
+	async.waterfall([
+		function (next) {
+			posts.getPostFields(pid, ['tid', 'uid', 'content'], next);
+		},
+		function (_postData, next) {
+			postData = _postData;
+			privileges.posts.can('read', pid, postData.uid, next);
+		},
+		function (canRead, next) {
+			if (!canRead || !postData.uid || fromuid === parseInt(postData.uid, 10)) {
 				return;
 			}
-
+			async.parallel({
+				username: async.apply(user.getUserField, fromuid, 'username'),
+				topicTitle: async.apply(topics.getTopicField, postData.tid, 'title'),
+				postObj: async.apply(posts.parsePost, postData)
+			}, next);
+		},
+		function (results, next) {
 			var title = S(results.topicTitle).decodeHTMLEntities().s;
 			var titleEscaped = title.replace(/%/g, '&#37;').replace(/,/g, '&#44;');
 
@@ -78,45 +109,71 @@ SocketHelpers.sendNotificationToPostOwner = function(pid, fromuid, notification)
 				bodyShort: '[[' + notification + ', ' + results.username + ', ' + titleEscaped + ']]',
 				bodyLong: results.postObj.content,
 				pid: pid,
-				nid: 'post:' + pid + ':uid:' + fromuid,
+				path: '/post/' + pid,
+				nid: command + ':post:' + pid + ':uid:' + fromuid,
 				from: fromuid,
 				mergeId: notification + '|' + pid,
 				topicTitle: results.topicTitle
-			}, function(err, notification) {
-				if (!err && notification) {
-					notifications.push(notification, [postData.uid]);
-				}
-			});
-		});
+			}, next);
+		}
+	], function(err, notification) {
+		if (err) {
+			return winston.error(err);
+		}
+		if (notification) {
+			notifications.push(notification, [postData.uid]);
+		}
 	});
 };
 
 
-SocketHelpers.sendNotificationToTopicOwner = function(tid, fromuid, notification) {
+SocketHelpers.sendNotificationToTopicOwner = function(tid, fromuid, command, notification) {
 	if (!tid || !fromuid || !notification) {
 		return;
 	}
 
-	async.parallel({
-		username: async.apply(user.getUserField, fromuid, 'username'),
-		topicData: async.apply(topics.getTopicFields, tid, ['uid', 'slug', 'title']),
-	}, function(err, results) {
-		if (err || fromuid === parseInt(results.topicData.uid, 10)) {
-			return;
-		}
+	fromuid = parseInt(fromuid, 10);
 
-		var title = S(results.topicData.title).decodeHTMLEntities().s;
-		var titleEscaped = title.replace(/%/g, '&#37;').replace(/,/g, '&#44;');
-
-		notifications.create({
-			bodyShort: '[[' + notification + ', ' + results.username + ', ' + titleEscaped + ']]',
-			path: nconf.get('relative_path') + '/topic/' + results.topicData.slug,
-			nid: 'tid:' + tid + ':uid:' + fromuid,
-			from: fromuid
-		}, function(err, notification) {
-			if (!err && notification) {
-				notifications.push(notification, [results.topicData.uid]);
+	var ownerUid;
+	async.waterfall([
+		function (next) {
+			async.parallel({
+				username: async.apply(user.getUserField, fromuid, 'username'),
+				topicData: async.apply(topics.getTopicFields, tid, ['uid', 'slug', 'title']),
+			}, next);
+		},
+		function (results, next) {
+			if (fromuid === parseInt(results.topicData.uid, 10)) {
+				return;
 			}
+			ownerUid = results.topicData.uid;
+			var title = S(results.topicData.title).decodeHTMLEntities().s;
+			var titleEscaped = title.replace(/%/g, '&#37;').replace(/,/g, '&#44;');
+
+			notifications.create({
+				bodyShort: '[[' + notification + ', ' + results.username + ', ' + titleEscaped + ']]',
+				path: '/topic/' + results.topicData.slug,
+				nid: command + ':tid:' + tid + ':uid:' + fromuid,
+				from: fromuid
+			}, next);
+		}
+	], function(err, notification) {
+		if (err) {
+			return winston.error(err);
+		}
+		if (notification && parseInt(ownerUid, 10)) {
+			notifications.push(notification, [ownerUid]);
+		}
+	});
+};
+
+SocketHelpers.rescindUpvoteNotification = function(pid, fromuid) {
+	var nid = 'upvote:post:' + pid + ':uid:' + fromuid;
+	notifications.rescind(nid);
+
+	posts.getPostField(pid, 'uid', function(err, uid) {
+		user.notifications.getUnreadCount(uid, function(err, count) {
+			websockets.in('uid_' + uid).emit('event:notifications.updateCount', count);
 		});
 	});
 };
diff --git a/src/socket.io/index.js b/src/socket.io/index.js
index 8f6f3c4c5a..772166687a 100644
--- a/src/socket.io/index.js
+++ b/src/socket.io/index.js
@@ -6,213 +6,221 @@ var async = require('async');
 var nconf = require('nconf');
 var cookieParser = require('cookie-parser')(nconf.get('secret'));
 var winston = require('winston');
+var url = require('url');
 
 var db = require('../database');
 var logger = require('../logger');
 var ratelimit = require('../middleware/ratelimit');
 
-var Sockets = {};
-var Namespaces = {};
+(function(Sockets) {
+	var Namespaces = {};
+	var io;
 
-var io;
+	Sockets.init = function (server) {
+		requireModules();
 
-Sockets.init = function(server) {
-	requireModules();
+		io = new SocketIO({
+			path: nconf.get('relative_path') + '/socket.io'
+		});
 
-	io = new SocketIO({
-		path: nconf.get('relative_path') + '/socket.io'
-	});
+		addRedisAdapter(io);
 
-	addRedisAdapter(io);
+		io.use(socketioWildcard);
+		io.use(authorize);
 
-	io.use(socketioWildcard);
-	io.use(authorize);
+		io.on('connection', onConnection);
 
-	io.on('connection', onConnection);
+		io.listen(server, {
+			transports: nconf.get('socket.io:transports')
+		});
 
-	io.listen(server, {
-		transports: nconf.get('socket.io:transports')
-	});
-
-	Sockets.server = io;
-};
-
-function onConnection(socket) {
-	socket.ip = socket.request.headers['x-forwarded-for'] || socket.request.connection.remoteAddress;
-
-	logger.io_one(socket, socket.uid);
-
-	onConnect(socket);
-
-	socket.on('*', function(payload) {
-		onMessage(socket, payload);
-	});
-}
-
-function onConnect(socket) {
-	if (socket.uid) {
-		socket.join('uid_' + socket.uid);
-		socket.join('online_users');
-	} else {
-		socket.join('online_guests');
-	}
-}
-
-
-function onMessage(socket, payload) {
-	if (!payload.data.length) {
-		return winston.warn('[socket.io] Empty payload');
-	}
-
-	var eventName = payload.data[0];
-	var params = payload.data[1];
-	var callback = typeof payload.data[payload.data.length - 1] === 'function' ? payload.data[payload.data.length - 1] : function() {};
-
-	if (!eventName) {
-		return winston.warn('[socket.io] Empty method name');
-	}
-
-	var parts = eventName.toString().split('.');
-	var namespace = parts[0];
-	var methodToCall = parts.reduce(function(prev, cur) {
-		if (prev !== null && prev[cur]) {
-			return prev[cur];
-		} else {
-			return null;
-		}
-	}, Namespaces);
-
-	if(!methodToCall) {
-		if (process.env.NODE_ENV === 'development') {
-			winston.warn('[socket.io] Unrecognized message: ' + eventName);
-		}
-		return;
-	}
-
-	socket.previousEvents = socket.previousEvents || [];
-	socket.previousEvents.push(eventName);
-	if (socket.previousEvents.length > 20) {
-		socket.previousEvents.shift();
-	}
-
-	if (!eventName.startsWith('admin.') && ratelimit.isFlooding(socket)) {
-		winston.warn('[socket.io] Too many emits! Disconnecting uid : ' + socket.uid + '. Events : ' + socket.previousEvents);
-		return socket.disconnect();
-	}
-
-	async.waterfall([
-		function (next) {
-			validateSession(socket, next);
-		},
-		function (next) {
-			if (Namespaces[namespace].before) {
-				Namespaces[namespace].before(socket, eventName, params, next);
-			} else {
-				next();
-			}
-		},
-		function (next) {
-			methodToCall(socket, params, next);
-		}
-	], function(err, result) {
-		callback(err ? {message: err.message} : null, result);
-	});
-}
-
-function requireModules() {
-	var modules = ['admin', 'categories', 'groups', 'meta', 'modules',
-		'notifications', 'plugins', 'posts', 'topics', 'user', 'blacklist'
-	];
-
-	modules.forEach(function(module) {
-		Namespaces[module] = require('./' + module);
-	});
-}
-
-function validateSession(socket, callback) {
-	var req = socket.request;
-	if (!req.signedCookies || !req.signedCookies['express.sid']) {
-		return callback(new Error('[[error:invalid-session]]'));
-	}
-	db.sessionStore.get(req.signedCookies['express.sid'], function(err, sessionData) {
-		if (err || !sessionData) {
-			return callback(err || new Error('[[error:invalid-session]]'));
-		}
-
-		callback();
-	});
-}
-
-function authorize(socket, callback) {
-	var request = socket.request;
-
-	if (!request) {
-		return callback(new Error('[[error:not-authorized]]'));
-	}
-
-	async.waterfall([
-		function(next) {
-			cookieParser(request, {}, next);
-		},
-		function(next) {
-			db.sessionStore.get(request.signedCookies['express.sid'], function(err, sessionData) {
-				if (err) {
-					return next(err);
-				}
-				if (sessionData && sessionData.passport && sessionData.passport.user) {
-					request.session = sessionData;
-					socket.uid = parseInt(sessionData.passport.user, 10);
-				} else {
-					socket.uid = 0;
-				}
-				next();
-			});
-		}
-	], callback);
-}
-
-function addRedisAdapter(io) {
-	if (nconf.get('redis')) {
-		var redisAdapter = require('socket.io-redis');
-		var redis = require('../database/redis');
-		var pub = redis.connect({return_buffers: true});
-		var sub = redis.connect({return_buffers: true});
-
-		io.adapter(redisAdapter({pubClient: pub, subClient: sub}));
-	} else if (nconf.get('isCluster') === 'true') {
-		winston.warn('[socket.io] Clustering detected, you are advised to configure Redis as a websocket store.');
-	}
-}
-
-Sockets.in = function(room) {
-	return io.in(room);
-};
-
-Sockets.getUserSocketCount = function(uid) {
-	if (!io) {
-		return 0;
-	}
-
-	var room = io.sockets.adapter.rooms['uid_' + uid];
-	return room ? room.length : 0;
-};
-
-
-Sockets.reqFromSocket = function(socket) {
-	var headers = socket.request.headers;
-	var host = headers.host;
-	var referer = headers.referer || '';
-
-	return {
-		ip: headers['x-forwarded-for'] || socket.ip,
-		host: host,
-		protocol: socket.request.connection.encrypted ? 'https' : 'http',
-		secure: !!socket.request.connection.encrypted,
-		url: referer,
-		path: referer.substr(referer.indexOf(host) + host.length),
-		headers: headers
+		Sockets.server = io;
+	};
+
+	function onConnection(socket) {
+		socket.ip = socket.request.headers['x-forwarded-for'] || socket.request.connection.remoteAddress;
+
+		logger.io_one(socket, socket.uid);
+
+		onConnect(socket);
+
+		socket.on('*', function (payload) {
+			onMessage(socket, payload);
+		});
+	}
+
+	function onConnect(socket) {
+		if (socket.uid) {
+			socket.join('uid_' + socket.uid);
+			socket.join('online_users');
+		} else {
+			socket.join('online_guests');
+		}
+	}
+
+	function onMessage(socket, payload) {
+		if (!payload.data.length) {
+			return winston.warn('[socket.io] Empty payload');
+		}
+
+		var eventName = payload.data[0];
+		var params = payload.data[1];
+		var callback = typeof payload.data[payload.data.length - 1] === 'function' ? payload.data[payload.data.length - 1] : function () {
+		};
+
+		if (!eventName) {
+			return winston.warn('[socket.io] Empty method name');
+		}
+
+		var parts = eventName.toString().split('.');
+		var namespace = parts[0];
+		var methodToCall = parts.reduce(function (prev, cur) {
+			if (prev !== null && prev[cur]) {
+				return prev[cur];
+			} else {
+				return null;
+			}
+		}, Namespaces);
+
+		if (!methodToCall) {
+			if (process.env.NODE_ENV === 'development') {
+				winston.warn('[socket.io] Unrecognized message: ' + eventName);
+			}
+			return;
+		}
+
+		socket.previousEvents = socket.previousEvents || [];
+		socket.previousEvents.push(eventName);
+		if (socket.previousEvents.length > 20) {
+			socket.previousEvents.shift();
+		}
+
+		if (!eventName.startsWith('admin.') && ratelimit.isFlooding(socket)) {
+			winston.warn('[socket.io] Too many emits! Disconnecting uid : ' + socket.uid + '. Events : ' + socket.previousEvents);
+			return socket.disconnect();
+		}
+
+		async.waterfall([
+			function (next) {
+				validateSession(socket, next);
+			},
+			function (next) {
+				if (Namespaces[namespace].before) {
+					Namespaces[namespace].before(socket, eventName, params, next);
+				} else {
+					next();
+				}
+			},
+			function (next) {
+				methodToCall(socket, params, next);
+			}
+		], function (err, result) {
+			callback(err ? {message: err.message} : null, result);
+		});
+	}
+
+	function requireModules() {
+		var modules = ['admin', 'categories', 'groups', 'meta', 'modules',
+			'notifications', 'plugins', 'posts', 'topics', 'user', 'blacklist'
+		];
+
+		modules.forEach(function (module) {
+			Namespaces[module] = require('./' + module);
+		});
+	}
+
+	function validateSession(socket, callback) {
+		var req = socket.request;
+		if (!req.signedCookies || !req.signedCookies['express.sid']) {
+			return callback(new Error('[[error:invalid-session]]'));
+		}
+		db.sessionStore.get(req.signedCookies['express.sid'], function (err, sessionData) {
+			if (err || !sessionData) {
+				return callback(err || new Error('[[error:invalid-session]]'));
+			}
+
+			callback();
+		});
+	}
+
+	function authorize(socket, callback) {
+		var request = socket.request;
+
+		if (!request) {
+			return callback(new Error('[[error:not-authorized]]'));
+		}
+
+		async.waterfall([
+			function (next) {
+				cookieParser(request, {}, next);
+			},
+			function (next) {
+				db.sessionStore.get(request.signedCookies['express.sid'], function (err, sessionData) {
+					if (err) {
+						return next(err);
+					}
+					if (sessionData && sessionData.passport && sessionData.passport.user) {
+						request.session = sessionData;
+						socket.uid = parseInt(sessionData.passport.user, 10);
+					} else {
+						socket.uid = 0;
+					}
+					next();
+				});
+			}
+		], callback);
+	}
+
+	function addRedisAdapter(io) {
+		if (nconf.get('redis')) {
+			var redisAdapter = require('socket.io-redis');
+			var redis = require('../database/redis');
+			var pub = redis.connect({return_buffers: true});
+			var sub = redis.connect({return_buffers: true});
+
+			io.adapter(redisAdapter({pubClient: pub, subClient: sub}));
+		} else if (nconf.get('isCluster') === 'true') {
+			winston.warn('[socket.io] Clustering detected, you are advised to configure Redis as a websocket store.');
+		}
+	}
+
+	Sockets.in = function (room) {
+		return io.in(room);
+	};
+
+	Sockets.getUserSocketCount = function (uid) {
+		if (!io) {
+			return 0;
+		}
+
+		var room = io.sockets.adapter.rooms['uid_' + uid];
+		return room ? room.length : 0;
 	};
-};
 
 
-module.exports = Sockets;
+	Sockets.reqFromSocket = function (socket, payload, event) {
+		var headers = socket.request.headers;
+		var host = headers.host;
+		var referer = headers.referer || '';
+		var data = ((payload || {}).data || []);
+
+		if (!host) {
+			host = url.parse(referer).host;
+		}
+
+		return {
+			uid: socket.uid,
+			params: data[1],
+			method: event || data[0],
+			body: payload,
+			ip: headers['x-forwarded-for'] || socket.ip,
+			host: host,
+			protocol: socket.request.connection.encrypted ? 'https' : 'http',
+			secure: !!socket.request.connection.encrypted,
+			url: referer,
+			path: referer.substr(referer.indexOf(host) + host.length),
+			headers: headers
+		};
+	};
+
+})(exports);
diff --git a/src/socket.io/notifications.js b/src/socket.io/notifications.js
index 121ede2a96..db6753bc40 100644
--- a/src/socket.io/notifications.js
+++ b/src/socket.io/notifications.js
@@ -56,28 +56,4 @@ SocketNotifs.markAllRead = function(socket, data, callback) {
 	notifications.markAllRead(socket.uid, callback);
 };
 
-SocketNotifs.generatePath = function(socket, nid, callback) {
-	if (!socket.uid) {
-		return callback(new Error('[[error:no-privileges]]'));;
-	}
-	async.waterfall([
-		function (next) {
-			notifications.get(nid, next);
-		},
-		function (notification, next) {
-			if (!notification) {
-				return next(null, '');
-			}
-			user.notifications.generateNotificationPaths([notification], socket.uid, next);
-		},
-		function (notificationsData, next) {
-			if (notificationsData && notificationsData.length) {
-				next(null, notificationsData[0].path);
-			} else {
-				next();
-			}
-		}
-	], callback);
-};
-
 module.exports = SocketNotifs;
diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js
index 5e31e0c611..3251c3700c 100644
--- a/src/socket.io/posts.js
+++ b/src/socket.io/posts.js
@@ -38,9 +38,6 @@ SocketPosts.reply = function(socket, data, callback) {
 
 		var result = {
 			posts: [postData],
-			privileges: {
-				'topics:reply': true
-			},
 			'reputation:disabled': parseInt(meta.config['reputation:disabled'], 10) === 1,
 			'downvote:disabled': parseInt(meta.config['downvote:disabled'], 10) === 1,
 		};
@@ -52,10 +49,6 @@ SocketPosts.reply = function(socket, data, callback) {
 		user.updateOnlineUsers(socket.uid);
 
 		socketHelpers.notifyNew(socket.uid, 'newPost', result);
-
-		if (data.lock) {
-			socketTopics.doTopicAction('lock', 'event:topic_locked', socket, {tids: [postData.topic.tid], cid: postData.topic.cid});
-		}
 	});
 };
 
@@ -80,17 +73,7 @@ SocketPosts.getRawPost = function(socket, pid, callback) {
 };
 
 SocketPosts.getPost = function(socket, pid, callback) {
-	async.waterfall([
-		function(next) {
-			apiController.getObjectByType(socket.uid, 'post', pid, next);
-		},
-		function(postData, next) {
-			if (parseInt(postData.deleted, 10) === 1) {
-				return next(new Error('[[error:no-post]]'));
-			}
-			next(null, postData);
-		}
-	], callback);
+	apiController.getPostData(pid, socket.uid, callback);
 };
 
 SocketPosts.loadMoreFavourites = function(socket, data, callback) {
@@ -118,8 +101,8 @@ function loadMorePosts(set, uid, data, callback) {
 		return callback(new Error('[[error:invalid-data]]'));
 	}
 
-	var start = Math.max(0, parseInt(data.after, 10)),
-		stop = start + 9;
+	var start = Math.max(0, parseInt(data.after, 10));
+	var stop = start + 9;
 
 	posts.getPostSummariesFromSet(set, uid, start, stop, callback);
 }
diff --git a/src/socket.io/posts/favourites.js b/src/socket.io/posts/favourites.js
index 3d93afac08..c3c4f23de9 100644
--- a/src/socket.io/posts/favourites.js
+++ b/src/socket.io/posts/favourites.js
@@ -92,7 +92,7 @@ module.exports = function(SocketPosts) {
 	};
 
 	SocketPosts.favourite = function(socket, data, callback) {
-		favouriteCommand(socket, 'favourite', 'favourited', 'notifications:favourited_your_post_in', data, callback);
+		favouriteCommand(socket, 'favourite', 'favourited', '', data, callback);
 	};
 
 	SocketPosts.unfavourite = function(socket, data, callback) {
@@ -103,7 +103,7 @@ module.exports = function(SocketPosts) {
 		if (!socket.uid) {
 			return callback(new Error('[[error:not-logged-in]]'))
 		}
-		if(!data || !data.pid || !data.room_id) {
+		if (!data || !data.pid || !data.room_id) {
 			return callback(new Error('[[error:invalid-data]]'));
 		}
 		async.parallel({
@@ -152,7 +152,9 @@ module.exports = function(SocketPosts) {
 			}
 
 			if (result && notification) {
-				socketHelpers.sendNotificationToPostOwner(data.pid, socket.uid, notification);
+				socketHelpers.sendNotificationToPostOwner(data.pid, socket.uid, command, notification);
+			} else if (result && command === 'unvote') {
+				socketHelpers.rescindUpvoteNotification(data.pid, socket.uid);
 			}
 			callback();
 		});
diff --git a/src/socket.io/posts/flag.js b/src/socket.io/posts/flag.js
index bbf7a4721c..2ad5dcd2b8 100644
--- a/src/socket.io/posts/flag.js
+++ b/src/socket.io/posts/flag.js
@@ -23,8 +23,8 @@ module.exports = function(SocketPosts) {
 			return callback(new Error('[[error:invalid-data]]'));
 		}
 
-		var flaggingUser = {},
-			post;
+		var flaggingUser = {};
+		var post;
 
 		async.waterfall([
 			function (next) {
@@ -40,9 +40,7 @@ module.exports = function(SocketPosts) {
 			},
 			function (topicData, next) {
 				post.topic = topicData;
-				next();
-			},
-			function (next) {
+
 				async.parallel({
 					isAdminOrMod: function(next) {
 						privileges.categories.isAdminOrMod(post.topic.cid, socket.uid, next);
@@ -90,6 +88,7 @@ module.exports = function(SocketPosts) {
 					bodyShort: '[[notifications:user_flagged_post_in, ' + flaggingUser.username + ', ' + titleEscaped + ']]',
 					bodyLong: post.content,
 					pid: data.pid,
+					path: '/post/' + data.pid,
 					nid: 'post_flag:' + data.pid + ':uid:' + socket.uid,
 					from: socket.uid,
 					mergeId: 'notifications:user_flagged_post_in|' + data.pid,
diff --git a/src/socket.io/posts/move.js b/src/socket.io/posts/move.js
index 637ef7da1f..e73ad58a9a 100644
--- a/src/socket.io/posts/move.js
+++ b/src/socket.io/posts/move.js
@@ -28,7 +28,7 @@ module.exports = function(SocketPosts) {
 				topics.movePostToTopic(data.pid, data.tid, next);
 			},
 			function (next) {
-				socketHelpers.sendNotificationToPostOwner(data.pid, socket.uid, 'notifications:moved_your_post');
+				socketHelpers.sendNotificationToPostOwner(data.pid, socket.uid, 'move', 'notifications:moved_your_post');
 				next();
 			}
 		], callback);
diff --git a/src/socket.io/topics.js b/src/socket.io/topics.js
index c96a77265e..48f24700b1 100644
--- a/src/socket.io/topics.js
+++ b/src/socket.io/topics.js
@@ -36,10 +36,6 @@ SocketTopics.post = function(socket, data, callback) {
 			return callback(err);
 		}
 
-		if (data.lock) {
-			SocketTopics.doTopicAction('lock', 'event:topic_locked', socket, {tids: [result.topicData.tid], cid: result.topicData.cid});
-		}
-
 		callback(null, result.topicData);
 
 		socket.emit('event:new_post', {posts: [result.postData]});
@@ -69,11 +65,18 @@ SocketTopics.createTopicFromPosts = function(socket, data, callback) {
 		return callback(new Error('[[error:invalid-data]]'));
 	}
 
-	topics.createTopicFromPosts(socket.uid, data.title, data.pids, callback);
+	topics.createTopicFromPosts(socket.uid, data.title, data.pids, data.fromTid, callback);
 };
 
-SocketTopics.toggleFollow = function(socket, tid, callback) {
-	followCommand(topics.toggleFollow, socket, tid, callback);
+SocketTopics.changeWatching = function(socket, data, callback) {
+	if (!data.tid || !data.type) {
+		return callback(new Error('[[error:invalid-data]]'));
+	}
+	var commands = ['follow', 'unfollow', 'ignore'];
+	if (commands.indexOf(data.type) === -1) {
+		return callback(new Error('[[error:invalid-command]]'));
+	}
+	followCommand(topics[data.type], socket, data.tid, callback);
 };
 
 SocketTopics.follow = function(socket, tid, callback) {
@@ -88,6 +91,12 @@ function followCommand(method, socket, tid, callback) {
 	method(tid, socket.uid, callback);
 }
 
+SocketTopics.isFollowed = function(socket, tid, callback) {
+	topics.isFollowing([tid], socket.uid, function(err, isFollowing) {
+		callback(err, Array.isArray(isFollowing) && isFollowing.length ? isFollowing[0] : false);
+	});
+};
+
 SocketTopics.search = function(socket, data, callback) {
 	topics.search(data.tid, data.term, callback);
 };
@@ -102,17 +111,7 @@ SocketTopics.isModerator = function(socket, tid, callback) {
 };
 
 SocketTopics.getTopic = function (socket, tid, callback) {
-	async.waterfall([
-		function (next) {
-			apiController.getObjectByType(socket.uid, 'topic', tid, next);
-		},
-		function (topicData, next) {
-			if (parseInt(topicData.deleted, 10) === 1) {
-				return next(new Error('[[error:no-topic]]'));
-			}
-			next(null, topicData);
-		}
-	], callback);
+	apiController.getTopicData(tid, socket.uid, callback);
 };
 
 module.exports = SocketTopics;
diff --git a/src/socket.io/topics/infinitescroll.js b/src/socket.io/topics/infinitescroll.js
index 5c45c6e4fb..5f089bd52e 100644
--- a/src/socket.io/topics/infinitescroll.js
+++ b/src/socket.io/topics/infinitescroll.js
@@ -96,10 +96,10 @@ module.exports = function(SocketTopics) {
 			return callback(new Error('[[error:invalid-data]]'));
 		}
 
-		var start = parseInt(data.after, 10),
-			stop = start + 9;
+		var start = parseInt(data.after, 10);
+		var stop = start + 9;
 
-		topics.getUnreadTopics(data.cid, socket.uid, start, stop, callback);
+		topics.getUnreadTopics(data.cid, socket.uid, start, stop, data.filter, callback);
 	};
 
 	SocketTopics.loadMoreFromSet = function(socket, data, callback) {
diff --git a/src/socket.io/topics/move.js b/src/socket.io/topics/move.js
index 80fc2e3772..a25947aab5 100644
--- a/src/socket.io/topics/move.js
+++ b/src/socket.io/topics/move.js
@@ -40,7 +40,7 @@ module.exports = function(SocketTopics) {
 
 				socketHelpers.emitToTopicAndCategory('event:topic_moved', topicData);
 
-				socketHelpers.sendNotificationToTopicOwner(tid, socket.uid, 'notifications:moved_your_topic');
+				socketHelpers.sendNotificationToTopicOwner(tid, socket.uid, 'move', 'notifications:moved_your_topic');
 
 				next();
 			});
diff --git a/src/socket.io/topics/unread.js b/src/socket.io/topics/unread.js
index 056b80b041..a5582d6892 100644
--- a/src/socket.io/topics/unread.js
+++ b/src/socket.io/topics/unread.js
@@ -46,7 +46,7 @@ module.exports = function(SocketTopics) {
 	};
 
 	SocketTopics.markCategoryTopicsRead = function(socket, cid, callback) {
-		topics.getUnreadTids(cid, socket.uid, 0, -1, function(err, tids) {
+		topics.getUnreadTids(cid, socket.uid, '', function(err, tids) {
 			if (err) {
 				return callback(err);
 			}
diff --git a/src/socket.io/user.js b/src/socket.io/user.js
index 06acacd520..c38bcc5bbf 100644
--- a/src/socket.io/user.js
+++ b/src/socket.io/user.js
@@ -155,7 +155,7 @@ SocketUser.follow = function(socket, data, callback) {
 				bodyShort: '[[notifications:user_started_following_you, ' + userData.username + ']]',
 				nid: 'follow:' + data.uid + ':uid:' + socket.uid,
 				from: socket.uid,
-				path: '/user/' + userData.userslug,
+				path: '/uid/' + socket.uid,
 				mergeId: 'notifications:user_started_following_you'
 			}, next);
 		},
@@ -245,6 +245,7 @@ SocketUser.getUnreadCounts = function(socket, data, callback) {
 	}
 	async.parallel({
 		unreadTopicCount: async.apply(topics.getTotalUnread, socket.uid),
+		unreadNewTopicCount: async.apply(topics.getTotalUnread, socket.uid, 'new'),
 		unreadChatCount: async.apply(messaging.getUnreadCount, socket.uid),
 		unreadNotificationCount: async.apply(user.notifications.getUnreadCount, socket.uid)
 	}, callback);
@@ -338,15 +339,15 @@ SocketUser.invite = function(socket, email, callback) {
 };
 
 SocketUser.getUserByUID = function(socket, uid, callback) {
-	apiController.getUserDataByUID(socket.uid, uid, callback);
+	apiController.getUserDataByField(socket.uid, 'uid', uid, callback);
 };
 
 SocketUser.getUserByUsername = function(socket, username, callback) {
-	apiController.getUserDataByUsername(socket.uid, username, callback);
+	apiController.getUserDataByField(socket.uid, 'username', username, callback);
 };
 
 SocketUser.getUserByEmail = function(socket, email, callback) {
-	apiController.getUserDataByEmail(socket.uid, email, callback);
+	apiController.getUserDataByField(socket.uid, 'email', email, callback);
 };
 
 
diff --git a/src/socket.io/user/ban.js b/src/socket.io/user/ban.js
index 574490b74d..d52251d76d 100644
--- a/src/socket.io/user/ban.js
+++ b/src/socket.io/user/ban.js
@@ -7,12 +7,20 @@ var events = require('../../events');
 
 module.exports = function(SocketUser) {
 
-	SocketUser.banUsers = function(socket, uids, callback) {
-		toggleBan(socket.uid, uids, SocketUser.banUser, function(err) {
+	SocketUser.banUsers = function(socket, data, callback) {
+		// Backwards compatibility
+		if (Array.isArray(data)) {
+			data = {
+				uids: data,
+				until: 0
+			}
+		}
+
+		toggleBan(socket.uid, data.uids, banUser.bind(null, data.until || 0), function(err) {
 			if (err) {
 				return callback(err);
 			}
-			async.each(uids, function(uid, next) {
+			async.each(data.uids, function(uid, next) {
 				events.log({
 					type: 'user-ban',
 					uid: socket.uid,
@@ -45,7 +53,7 @@ module.exports = function(SocketUser) {
 		], callback);
 	}
 
-	SocketUser.banUser = function(uid, callback) {
+	function banUser(until, uid, callback) {
 		async.waterfall([
 			function (next) {
 				user.isAdministrator(uid, next);
@@ -54,7 +62,7 @@ module.exports = function(SocketUser) {
 				if (isAdmin) {
 					return next(new Error('[[error:cant-ban-other-admins]]'));
 				}
-				user.ban(uid, next);
+				user.ban(uid, until, next);
 			},
 			function (next) {
 				websockets.in('uid_' + uid).emit('event:banned');
diff --git a/src/socket.io/user/search.js b/src/socket.io/user/search.js
index ecef1127c2..76b1daa3a7 100644
--- a/src/socket.io/user/search.js
+++ b/src/socket.io/user/search.js
@@ -20,6 +20,7 @@ module.exports = function(SocketUser) {
 			sortBy: data.sortBy,
 			onlineOnly: data.onlineOnly,
 			bannedOnly: data.bannedOnly,
+			flaggedOnly: data.flaggedOnly,
 			uid: socket.uid
 		}, function(err, result) {
 			if (err) {
diff --git a/src/topics.js b/src/topics.js
index 385d3ae558..0470fe621c 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -131,6 +131,9 @@ var social = require('./social');
 					hasRead: function(next) {
 						Topics.hasReadTopics(tids, uid, next);
 					},
+					isIgnored: function(next) {
+						Topics.isIgnoring(tids, uid, next);
+					},
 					bookmarks: function(next) {
 						Topics.getUserBookmarks(tids, uid, next);
 					},
@@ -157,7 +160,8 @@ var social = require('./social');
 						topics[i].pinned = parseInt(topics[i].pinned, 10) === 1;
 						topics[i].locked = parseInt(topics[i].locked, 10) === 1;
 						topics[i].deleted = parseInt(topics[i].deleted, 10) === 1;
-						topics[i].unread = !results.hasRead[i];
+						topics[i].ignored = results.isIgnored[i];
+						topics[i].unread = !results.hasRead[i] && !results.isIgnored[i];
 						topics[i].bookmark = results.bookmarks[i];
 						topics[i].unreplied = !topics[i].teaser;
 					}
@@ -184,6 +188,7 @@ var social = require('./social');
 					threadTools: async.apply(plugins.fireHook, 'filter:topic.thread_tools', {topic: topicData, uid: uid, tools: []}),
 					tags: async.apply(Topics.getTopicTagsObjects, topicData.tid),
 					isFollowing: async.apply(Topics.isFollowing, [topicData.tid], uid),
+					isIgnoring: async.apply(Topics.isIgnoring, [topicData.tid], uid),
 					bookmark: async.apply(Topics.getUserBookmark, topicData.tid, uid),
 					postSharing: async.apply(social.getActivePostSharing)
 				}, next);
@@ -194,6 +199,8 @@ var social = require('./social');
 				topicData.thread_tools = results.threadTools.tools;
 				topicData.tags = results.tags;
 				topicData.isFollowing = results.isFollowing[0];
+				topicData.isNotFollowing = !results.isFollowing[0] && !results.isIgnoring[0];
+				topicData.isIgnoring = results.isIgnoring[0];
 				topicData.bookmark = results.bookmark;
 				topicData.postSharing = results.postSharing;
 
@@ -328,4 +335,79 @@ var social = require('./social');
 		}
 	};
 
+	Topics.getTopicBookmarks = function( tid, callback ){
+		db.getSortedSetRangeWithScores(['tid:' + tid + ':bookmarks'], 0, -1, callback );
+	};
+
+	Topics.updateTopicBookmarks = function(tid, pids, callback) {
+		var maxIndex;
+
+		async.waterfall([
+			function(next) {
+				Topics.getPostCount(tid, next);
+			},
+			function(postcount, next) {
+				maxIndex = postcount;
+				Topics.getTopicBookmarks(tid, next);
+			},
+			function(bookmarks, next) {
+				var forkedPosts = pids.map(function(pid) {
+					return {pid: pid, tid: tid};
+				});
+
+				var uidData = bookmarks.map(function(bookmark) {
+					return {
+						uid: bookmark.value,
+						bookmark: bookmark.score
+					};
+				});
+
+				async.map(uidData, function(data, mapCallback) {
+					posts.getPostIndices(forkedPosts, data.uid, function(err, indices) {
+						if (err) {
+							return callback(err);
+						}
+						data.postIndices = indices;
+						mapCallback(null, data);
+					});
+				}, function(err, results) {
+					if (err) {
+						return callback(err);
+					}
+					async.map(results, function(data, mapCallback) {
+						var uid = data.uid;
+						var bookmark = data.bookmark;
+						bookmark = bookmark < maxIndex ? bookmark : maxIndex;
+						var postIndices = data.postIndices;
+
+						for (var i = 0; i < postIndices.length && postIndices[i] < data.bookmark; ++i ){
+							--bookmark;
+						}
+
+						if (parseInt(bookmark, 10) !== parseInt(data.bookmark, 10)) {
+							mapCallback( null, { uid: uid, bookmark: bookmark } );
+						} else {
+							mapCallback( null, null );
+						}
+					}, function(err, results) {
+						if (err) {
+							return callback(err);
+						}
+
+						async.map(results, function(ui, cb) {
+							if( ui && ui.bookmark) {
+								Topics.setUserBookmark(tid, ui.uid, ui.bookmark, cb);
+							} else {
+								return cb(null, null);
+							}
+						}, function(err) {
+							next(err);
+						});
+					});
+				});
+			}
+		], function(err){
+			callback(err);
+		});
+	};
 }(exports));
diff --git a/src/topics/create.js b/src/topics/create.js
index dea303709c..a173c1d661 100644
--- a/src/topics/create.js
+++ b/src/topics/create.js
@@ -112,11 +112,9 @@ module.exports = function(Topics) {
 				if (!canCreate) {
 					return next(new Error('[[error:no-privileges]]'));
 				}
-
-				if (!guestHandleValid(data)) {
-					return next(new Error('[[error:guest-handle-invalid]]'));
-				}
-
+				guestHandleValid(data, next);
+			},
+			function (next) {
 				user.isReadyToPost(data.uid, data.cid, next);
 			},
 			function(next) {
@@ -212,11 +210,9 @@ module.exports = function(Topics) {
 				if (!results.canReply) {
 					return next(new Error('[[error:no-privileges]]'));
 				}
-
-				if (!guestHandleValid(data)) {
-					return next(new Error('[[error:guest-handle-invalid]]'));
-				}
-
+				guestHandleValid(data, next);
+			},
+			function(next) {
 				user.isReadyToPost(uid, cid, next);
 			},
 			function(next) {
@@ -274,7 +270,7 @@ module.exports = function(Topics) {
 						posts.getUserInfoForPosts([postData.uid], uid, next);
 					},
 					topicInfo: function(next) {
-						Topics.getTopicFields(tid, ['tid', 'title', 'slug', 'cid', 'postcount'], next);
+						Topics.getTopicFields(tid, ['tid', 'title', 'slug', 'cid', 'postcount', 'mainPid'], next);
 					},
 					parents: function(next) {
 						Topics.addParentPosts([postData], next);
@@ -316,12 +312,19 @@ module.exports = function(Topics) {
 		callback();
 	}
 
-	function guestHandleValid(data) {
-		if (parseInt(meta.config.allowGuestHandles, 10) === 1 && parseInt(data.uid, 10) === 0 &&
-			data.handle && data.handle.length > meta.config.maximumUsernameLength) {
-			return false;
+	function guestHandleValid(data, callback) {
+		if (parseInt(meta.config.allowGuestHandles, 10) === 1 && parseInt(data.uid, 10) === 0 && data.handle) {
+			if (data.handle.length > meta.config.maximumUsernameLength) {
+				return callback(new Error('[[error:guest-handle-invalid]]'));
+			}
+			user.existsBySlug(utils.slugify(data.handle), function(err, exists) {
+				if (err || exists) {
+					return callback(err || new Error('[[error:username-taken]]'));
+				}
+				callback();
+			});
 		}
-		return true;
+		callback();
 	}
 
 };
diff --git a/src/topics/delete.js b/src/topics/delete.js
index 97d617d878..a960ff0421 100644
--- a/src/topics/delete.js
+++ b/src/topics/delete.js
@@ -1,12 +1,12 @@
 'use strict';
 
-var async = require('async'),
-	db = require('../database'),
+var async = require('async');
+var db = require('../database');
 
-	user = require('../user'),
-	posts = require('../posts'),
-	plugins = require('../plugins'),
-	batch = require('../batch');
+var user = require('../user');
+var posts = require('../posts');
+var plugins = require('../plugins');
+var batch = require('../batch');
 
 
 module.exports = function(Topics) {
@@ -113,9 +113,11 @@ module.exports = function(Topics) {
 			function(next) {
 				db.deleteAll([
 					'tid:' + tid + ':followers',
+					'tid:' + tid + ':ignorers',
 					'tid:' + tid + ':posts',
 					'tid:' + tid + ':posts:votes',
-					'tid:' + tid + ':bookmarks'
+					'tid:' + tid + ':bookmarks',
+					'tid:' + tid + ':posters'
 				], next);
 			},
 			function(next) {
diff --git a/src/topics/follow.js b/src/topics/follow.js
index c05a796741..e74d85d23c 100644
--- a/src/topics/follow.js
+++ b/src/topics/follow.js
@@ -8,10 +8,12 @@ var winston = require('winston');
 
 var db = require('../database');
 var user = require('../user');
+var posts = require('../posts');
 var notifications = require('../notifications');
 var privileges = require('../privileges');
 var meta = require('../meta');
 var emailer = require('../emailer');
+var plugins = require('../plugins');
 
 module.exports = function(Topics) {
 
@@ -43,6 +45,18 @@ module.exports = function(Topics) {
 	};
 
 	Topics.follow = function(tid, uid, callback) {
+		setWatching(follow, unignore, 'action:topic.follow', tid, uid, callback);
+	};
+
+	Topics.unfollow = function(tid, uid, callback) {
+		setWatching(unfollow, unignore, 'action:topic.unfollow', tid, uid, callback);
+	};
+
+	Topics.ignore = function(tid, uid, callback) {
+		setWatching(ignore, unfollow, 'action:topic.ignore', tid, uid, callback);
+	};
+
+	function setWatching(method1, method2, hook, tid, uid, callback) {
 		callback = callback || function() {};
 		if (!parseInt(uid, 10)) {
 			return callback();
@@ -55,33 +69,62 @@ module.exports = function(Topics) {
 				if (!exists) {
 					return next(new Error('[[error:no-topic]]'));
 				}
-				db.setAdd('tid:' + tid + ':followers', uid, next);
+				method1(tid, uid, next);
 			},
-			function(next) {
-				db.sortedSetAdd('uid:' + uid + ':followed_tids', Date.now(), tid, next);
-			}
+			function (next) {
+				method2(tid, uid, next);
+			},
+			async.apply(plugins.fireHook, hook, {uid: uid, tid: tid})
 		], callback);
-	};
+	}
 
-	Topics.unfollow = function(tid, uid, callback) {
-		callback = callback || function() {};
+	function follow(tid, uid, callback) {
+		addToSets('tid:' + tid + ':followers', 'uid:' + uid + ':followed_tids', tid, uid, callback);
+	}
+
+	function unfollow(tid, uid, callback) {
+		removeFromSets('tid:'+ tid + ':followers', 'uid:' + uid + ':followed_tids', tid, uid, callback);
+	}
+
+	function ignore(tid, uid, callback) {
+		addToSets('tid:' + tid + ':ignorers', 'uid:' + uid + ':ignored_tids', tid, uid, callback);
+	}
+
+	function unignore(tid, uid, callback) {
+		removeFromSets('tid:'+ tid + ':ignorers', 'uid:' + uid + ':ignored_tids', tid, uid, callback);
+	}
+
+	function addToSets(set1, set2, tid, uid, callback) {
 		async.waterfall([
 			function (next) {
-				Topics.exists(tid, next);
-			},
-			function (exists, next) {
-				if (!exists) {
-					return next(new Error('[[error:no-topic]]'));
-				}
-				db.setRemove('tid:' + tid + ':followers', uid, next);
+				db.setAdd(set1, uid, next);
 			},
 			function(next) {
-				db.sortedSetRemove('uid:' + uid + ':followed_tids', tid, next);
+				db.sortedSetAdd(set2, Date.now(), tid, next);
 			}
 		], callback);
-	};
+	}
+
+	function removeFromSets(set1, set2, tid, uid, callback) {
+		async.waterfall([
+			function (next) {
+				db.setRemove(set1, uid, next);
+			},
+			function(next) {
+				db.sortedSetRemove(set2, tid, next);
+			}
+		], callback);
+	}
 
 	Topics.isFollowing = function(tids, uid, callback) {
+		isIgnoringOrFollowing('followers', tids, uid, callback);
+	};
+
+	Topics.isIgnoring = function(tids, uid, callback) {
+		isIgnoringOrFollowing('ignorers', tids, uid, callback);
+	};
+
+	function isIgnoringOrFollowing(set, tids, uid, callback) {
 		if (!Array.isArray(tids)) {
 			return callback();
 		}
@@ -89,15 +132,33 @@ module.exports = function(Topics) {
 			return callback(null, tids.map(function() { return false; }));
 		}
 		var keys = tids.map(function(tid) {
-			return 'tid:' + tid + ':followers';
+			return 'tid:' + tid + ':' + set;
 		});
 		db.isMemberOfSets(keys, uid, callback);
-	};
+	}
 
 	Topics.getFollowers = function(tid, callback) {
 		db.getSetMembers('tid:' + tid + ':followers', callback);
 	};
 
+	Topics.getIgnorers = function(tid, callback) {
+		db.getSetMembers('tid:' + tid + ':ignorers', callback);
+	};
+
+	Topics.filterIgnoringUids = function(tid, uids, callback) {
+		async.waterfall([
+			function (next){
+				db.isSetMembers('tid:' + tid + ':ignorers', uids, next);
+			},
+			function (isMembers, next){
+				var readingUids = uids.filter(function(uid, index) {
+					return uid && isMembers[index];
+				});
+				next(null, readingUids);
+			}
+		], callback);
+	};
+
 	Topics.notifyFollowers = function(postData, exceptUid, callback) {
 		callback = callback || function() {};
 		var followers;
@@ -134,10 +195,13 @@ module.exports = function(Topics) {
 					titleEscaped = title.replace(/%/g, '&#37;').replace(/,/g, '&#44;');
 				}
 
+				postData.content = posts.relativeToAbsolute(postData.content);
+
 				notifications.create({
 					bodyShort: '[[notifications:user_posted_to, ' + postData.user.username + ', ' + titleEscaped + ']]',
 					bodyLong: postData.content,
 					pid: postData.pid,
+					path: '/post/' + postData.pid,
 					nid: 'new_post:tid:' + postData.topic.tid + ':pid:' + postData.pid + ':uid:' + exceptUid,
 					tid: postData.topic.tid,
 					from: exceptUid,
@@ -162,16 +226,19 @@ module.exports = function(Topics) {
 						if (err) {
 							return next(err);
 						}
+
 						if (data.userSettings.sendPostNotifications) {
 							emailer.send('notif_post', toUid, {
 								pid: postData.pid,
 								subject: '[' + (meta.config.title || 'NodeBB') + '] ' + title,
 								intro: '[[notifications:user_posted_to, ' + postData.user.username + ', ' + titleEscaped + ']]',
-								postBody: postData.content.replace(/"\/\//g, '"http://'),
+								postBody: postData.content.replace(/"\/\//g, '"https://'),
 								site_title: meta.config.title || 'NodeBB',
 								username: data.userData.username,
 								userslug: data.userData.userslug,
 								url: nconf.get('url') + '/topic/' + postData.topic.tid,
+								topicSlug: postData.topic.slug,
+								postCount: postData.topic.postcount,
 								base_url: nconf.get('url')
 							}, next);
 						} else {
diff --git a/src/topics/fork.js b/src/topics/fork.js
index 948cb3207e..b2e16f069d 100644
--- a/src/topics/fork.js
+++ b/src/topics/fork.js
@@ -13,7 +13,7 @@ var meta = require('../meta');
 
 module.exports = function(Topics) {
 
-	Topics.createTopicFromPosts = function(uid, title, pids, callback) {
+	Topics.createTopicFromPosts = function(uid, title, pids, fromTid, callback) {
 		if (title) {
 			title = title.trim();
 		}
@@ -55,6 +55,9 @@ module.exports = function(Topics) {
 				}
 				Topics.create({uid: results.postData.uid, title: title, cid: cid}, next);
 			},
+			function(results, next) {
+				Topics.updateTopicBookmarks(fromTid, pids, function(){ next( null, results );} );
+			},
 			function(_tid, next) {
 				function move(pid, next) {
 					privileges.posts.canEdit(pid, uid, function(err, canEdit) {
@@ -87,7 +90,7 @@ module.exports = function(Topics) {
 				if (!exists) {
 					return next(new Error('[[error:no-topic]]'));
 				}
-				posts.getPostFields(pid, ['tid', 'timestamp', 'votes'], next);
+				posts.getPostFields(pid, ['tid', 'uid', 'timestamp', 'upvotes', 'downvotes'], next);
 			},
 			function(post, next) {
 				if (!post || !post.tid) {
@@ -101,7 +104,7 @@ module.exports = function(Topics) {
 				postData = post;
 				postData.pid = pid;
 
-				Topics.removePostFromTopic(postData.tid, pid, next);
+				Topics.removePostFromTopic(postData.tid, postData, next);
 			},
 			function(next) {
 				async.parallel([
@@ -118,7 +121,7 @@ module.exports = function(Topics) {
 						posts.setPostField(pid, 'tid', tid, next);
 					},
 					function(next) {
-						Topics.addPostToTopic(tid, pid, postData.timestamp, postData.votes, next);
+						Topics.addPostToTopic(tid, postData, next);
 					}
 				], next);
 			},
diff --git a/src/topics/popular.js b/src/topics/popular.js
index 88d5a6819a..5ab53ae613 100644
--- a/src/topics/popular.js
+++ b/src/topics/popular.js
@@ -1,10 +1,8 @@
 
 'use strict';
 
-var async = require('async'),
-	db = require('../database'),
-	privileges = require('../privileges');
-
+var async = require('async');
+var privileges = require('../privileges');
 
 module.exports = function(Topics) {
 
diff --git a/src/topics/posts.js b/src/topics/posts.js
index 445eab4637..6bdf103420 100644
--- a/src/topics/posts.js
+++ b/src/topics/posts.js
@@ -22,7 +22,7 @@ module.exports = function(Topics) {
 				Topics.updateTimestamp(postData.tid, postData.timestamp, next);
 			},
 			function(next) {
-				Topics.addPostToTopic(postData.tid, postData.pid, postData.timestamp, 0, next);
+				Topics.addPostToTopic(postData.tid, postData, next);
 			}
 		], callback);
 	};
@@ -264,38 +264,54 @@ module.exports = function(Topics) {
 		);
 	};
 
-	Topics.addPostToTopic = function(tid, pid, timestamp, votes, callback) {
-		Topics.getTopicField(tid, 'mainPid', function(err, mainPid) {
-			if (err) {
-				return callback(err);
+	Topics.addPostToTopic = function(tid, postData, callback) {
+		async.waterfall([
+			function (next) {
+				Topics.getTopicField(tid, 'mainPid', next);
+			},
+			function (mainPid, next) {
+				if (!parseInt(mainPid, 10)) {
+					Topics.setTopicField(tid, 'mainPid', postData.pid, next);
+				} else {
+					async.parallel([
+						function(next) {
+							db.sortedSetAdd('tid:' + tid + ':posts', postData.timestamp, postData.pid, next);
+						},
+						function(next) {
+							var upvotes = parseInt(postData.upvotes, 10) || 0;
+							var downvotes = parseInt(postData.downvotes, 10) || 0;
+							var votes = upvotes - downvotes;
+							db.sortedSetAdd('tid:' + tid + ':posts:votes', votes, postData.pid, next);
+						}
+					], function(err) {
+						next(err);
+					});
+				}
+			},
+			function (next) {
+				db.sortedSetIncrBy('tid:' + tid + ':posters', 1, postData.uid, next);
+			},
+			function (count, next) {
+				Topics.updateTeaser(tid, next);
 			}
-			if (!parseInt(mainPid, 10)) {
-				Topics.setTopicField(tid, 'mainPid', pid, callback);
-			} else {
-				async.parallel([
-					function(next) {
-						db.sortedSetAdd('tid:' + tid + ':posts', timestamp, pid, next);
-					},
-					function(next) {
-						db.sortedSetAdd('tid:' + tid + ':posts:votes', votes, pid, next);
-					}
-				], function(err) {
-					if (err) {
-						return callback(err);
-					}
-					Topics.updateTeaser(tid, callback);
-				});
-			}
-		});
+		], callback);
 	};
 
-	Topics.removePostFromTopic = function(tid, pid, callback) {
-		db.sortedSetsRemove(['tid:' + tid + ':posts', 'tid:' + tid + ':posts:votes'], pid, function(err) {
-			if (err) {
-				return callback(err);
+	Topics.removePostFromTopic = function(tid, postData, callback) {
+		async.waterfall([
+			function (next) {
+				db.sortedSetsRemove([
+					'tid:' + tid + ':posts',
+					'tid:' + tid + ':posts:votes'
+				], postData.pid, next);
+			},
+			function (next) {
+				db.sortedSetIncrBy('tid:' + tid + ':posters', -1, postData.uid, next);
+			},
+			function (count, next) {
+				Topics.updateTeaser(tid, next);
 			}
-			Topics.updateTeaser(tid, callback);
-		});
+		], callback);
 	};
 
 	Topics.getPids = function(tid, callback) {
diff --git a/src/topics/recent.js b/src/topics/recent.js
index 7139f58991..c6fa7c7425 100644
--- a/src/topics/recent.js
+++ b/src/topics/recent.js
@@ -4,6 +4,7 @@
 
 var async = require('async');
 var db = require('../database');
+var plugins = require('../plugins');
 
 module.exports = function(Topics) {
 	var terms = {
@@ -63,6 +64,19 @@ module.exports = function(Topics) {
 
 	Topics.updateRecent = function(tid, timestamp, callback) {
 		callback = callback || function() {};
-		db.sortedSetAdd('topics:recent', timestamp, tid, callback);
+		if (plugins.hasListeners('filter:topics.updateRecent')) {
+			plugins.fireHook('filter:topics.updateRecent', {tid: tid, timestamp: timestamp}, function(err, data) {
+				if (err) {
+					return callback(err);
+				}
+				if (data && data.tid && data.timestamp) {
+					db.sortedSetAdd('topics:recent', data.timestamp, data.tid, callback);
+				} else {
+					callback();
+				}
+			});
+		} else {
+			db.sortedSetAdd('topics:recent', timestamp, tid, callback);
+		}
 	};
 };
diff --git a/src/topics/teaser.js b/src/topics/teaser.js
index 5d730de74d..9c752946ee 100644
--- a/src/topics/teaser.js
+++ b/src/topics/teaser.js
@@ -2,16 +2,14 @@
 
 'use strict';
 
-var async = require('async'),
-	S = require('string'),
-
-	meta = require('../meta'),
-	db = require('../database'),
-	user = require('../user'),
-	posts = require('../posts'),
-	plugins = require('../plugins'),
-	utils = require('../../public/src/utils');
+var async = require('async');
+var S = require('string');
 
+var meta = require('../meta');
+var user = require('../user');
+var posts = require('../posts');
+var plugins = require('../plugins');
+var utils = require('../../public/src/utils');
 
 module.exports = function(Topics) {
 
@@ -28,7 +26,24 @@ module.exports = function(Topics) {
 		topics.forEach(function(topic) {
 			counts.push(topic && (parseInt(topic.postcount, 10) || 0));
 			if (topic) {
-				teaserPids.push(meta.config.teaserPost === 'first' ? topic.mainPid : topic.teaserPid);
+				if (topic.teaserPid === 'null') {
+					delete topic.teaserPid;
+				}
+
+				switch(meta.config.teaserPost) {
+					case 'first':
+						teaserPids.push(topic.mainPid);
+						break;
+
+					case 'last-post':
+						teaserPids.push(topic.teaserPid || topic.mainPid);
+						break;
+
+					case 'last-reply':	// intentional fall-through
+					default:
+						teaserPids.push(topic.teaserPid);
+						break;
+				}
 			}
 		});
 
@@ -74,7 +89,7 @@ module.exports = function(Topics) {
 						tidToPost[topic.tid].index = meta.config.teaserPost === 'first' ? 1 : counts[index];
 						if (tidToPost[topic.tid].content) {
 							var s = S(tidToPost[topic.tid].content);
-							tidToPost[topic.tid].content = s.stripTags.apply(s, utils.stripTags.concat(['img'])).s;
+							tidToPost[topic.tid].content = s.stripTags.apply(s, utils.stripTags).s;
 						}
 					}
 					return tidToPost[topic.tid];
@@ -115,7 +130,11 @@ module.exports = function(Topics) {
 			}
 
 			pid = pid || null;
-			Topics.setTopicField(tid, 'teaserPid', pid, callback);
+			if (pid) {
+				Topics.setTopicField(tid, 'teaserPid', pid, callback);
+			} else {
+				Topics.deleteTopicField(tid, 'teaserPid', callback);
+			}
 		});
 	};
 };
\ No newline at end of file
diff --git a/src/topics/unread.js b/src/topics/unread.js
index 28846640b7..61fef8b65e 100644
--- a/src/topics/unread.js
+++ b/src/topics/unread.js
@@ -14,13 +14,18 @@ var utils = require('../../public/src/utils');
 
 module.exports = function(Topics) {
 
-	Topics.getTotalUnread = function(uid, callback) {
-		Topics.getUnreadTids(0, uid, 0, 99, function(err, tids) {
-			callback(err, tids ? tids.length : 0);
+	Topics.getTotalUnread = function(uid, filter, callback) {
+		if (!callback) {
+			callback = filter;
+			filter = '';
+		}
+		Topics.getUnreadTids(0, uid, filter, function(err, tids) {
+			callback(err, Array.isArray(tids) ? tids.length : 0);
 		});
 	};
 
-	Topics.getUnreadTopics = function(cid, uid, start, stop, callback) {
+
+	Topics.getUnreadTopics = function(cid, uid, start, stop, filter, callback) {
 
 		var unreadTopics = {
 			showSelect: true,
@@ -30,12 +35,21 @@ module.exports = function(Topics) {
 
 		async.waterfall([
 			function(next) {
-				Topics.getUnreadTids(cid, uid, start, stop, next);
+				Topics.getUnreadTids(cid, uid, filter, next);
 			},
 			function(tids, next) {
+				unreadTopics.topicCount = tids.length;
+
 				if (!tids.length) {
 					return next(null, []);
 				}
+
+				if (stop === -1) {
+					tids = tids.slice(start);
+				} else {
+					tids = tids.slice(start, stop + 1);
+				}
+
 				Topics.getTopicsByTids(tids, uid, next);
 			},
 			function(topicData, next) {
@@ -54,7 +68,7 @@ module.exports = function(Topics) {
 		return Date.now() - (parseInt(meta.config.unreadCutoff, 10) || 2) * 86400000;
 	};
 
-	Topics.getUnreadTids = function(cid, uid, start, stop, callback) {
+	Topics.getUnreadTids = function(cid, uid, filter, callback) {
 		uid = parseInt(uid, 10);
 		if (uid === 0) {
 			return callback(null, []);
@@ -62,65 +76,92 @@ module.exports = function(Topics) {
 
 		var cutoff = Topics.unreadCutoff();
 
-		async.parallel({
-			ignoredCids: function(next) {
-				user.getIgnoredCategories(uid, next);
+		var ignoredCids;
+
+		async.waterfall([
+			function (next) {
+				async.parallel({
+					ignoredCids: function(next) {
+						if (filter === 'watched') {
+							return next(null, []);
+						}
+						user.getIgnoredCategories(uid, next);
+					},
+					ignoredTids: function(next) {
+						user.getIgnoredTids(uid, 0, -1, next);
+					},
+					recentTids: function(next) {
+						db.getSortedSetRevRangeByScoreWithScores('topics:recent', 0, -1, '+inf', cutoff, next);
+					},
+					userScores: function(next) {
+						db.getSortedSetRevRangeByScoreWithScores('uid:' + uid + ':tids_read', 0, -1, '+inf', cutoff, next);
+					},
+					tids_unread: function(next) {
+						db.getSortedSetRevRangeWithScores('uid:' + uid + ':tids_unread', 0, -1, next);
+					}
+				}, next);
 			},
-			recentTids: function(next) {
-				db.getSortedSetRevRangeByScoreWithScores('topics:recent', 0, -1, '+inf', cutoff, next);
+			function (results, next) {
+				if (results.recentTids && !results.recentTids.length && !results.tids_unread.length) {
+					return callback(null, []);
+				}
+
+				ignoredCids = results.ignoredCids;
+
+				var userRead = {};
+				results.userScores.forEach(function(userItem) {
+					userRead[userItem.value] = userItem.score;
+				});
+
+				results.recentTids = results.recentTids.concat(results.tids_unread);
+				results.recentTids.sort(function(a, b) {
+					return b.score - a.score;
+				});
+
+				var tids = results.recentTids.filter(function(recentTopic) {
+					if (results.ignoredTids.indexOf(recentTopic.value.toString()) !== -1) {
+						return false;
+					}
+					switch (filter) {
+						case 'new':
+							return !userRead[recentTopic.value];
+						default:
+							return !userRead[recentTopic.value] || recentTopic.score > userRead[recentTopic.value];
+					}
+				}).map(function(topic) {
+					return topic.value;
+				}).filter(function(tid, index, array) {
+					return array.indexOf(tid) === index;
+				});
+
+				if (filter === 'watched') {
+					filterWatchedTids(uid, tids, next);
+				} else {
+					next(null, tids);
+				}
 			},
-			userScores: function(next) {
-				db.getSortedSetRevRangeByScoreWithScores('uid:' + uid + ':tids_read', 0, -1, '+inf', cutoff, next);
-			},
-			tids_unread: function(next) {
-				db.getSortedSetRevRangeWithScores('uid:' + uid + ':tids_unread', 0, -1, next);
+			function (tids, next) {
+
+				tids = tids.slice(0, 200);
+
+				filterTopics(uid, tids, cid, ignoredCids, filter, next);
 			}
-		}, function(err, results) {
+		], callback);
+	};
+
+	function filterWatchedTids(uid, tids, callback) {
+		db.sortedSetScores('uid:' + uid + ':followed_tids', tids, function(err, scores) {
 			if (err) {
 				return callback(err);
 			}
-
-			if (results.recentTids && !results.recentTids.length && !results.tids_unread.length) {
-				return callback(null, []);
-			}
-
-			var userRead = {};
-			results.userScores.forEach(function(userItem) {
-				userRead[userItem.value] = userItem.score;
-			});
-
-			results.recentTids = results.recentTids.concat(results.tids_unread);
-			results.recentTids.sort(function(a, b) {
-				return b.score - a.score;
-			});
-
-			var tids = results.recentTids.filter(function(recentTopic) {
-				return !userRead[recentTopic.value] || recentTopic.score > userRead[recentTopic.value];
-			}).map(function(topic) {
-				return topic.value;
-			}).filter(function(tid, index, array) {
-				return array.indexOf(tid) === index;
-			});
-
-			tids = tids.slice(0, 100);
-
-			filterTopics(uid, tids, cid, results.ignoredCids, function(err, tids) {
-				if (err) {
-					return callback(err);
-				}
-
-				if (stop === -1) {
-					tids = tids.slice(start);
-				} else {
-					tids = tids.slice(start, stop + 1);
-				}
-
-				callback(null, tids);
+			tids = tids.filter(function(tid, index) {
+				return tid && !!scores[index];
 			});
+			callback(null, tids);
 		});
-	};
+	}
 
-	function filterTopics(uid, tids, cid, ignoredCids, callback) {
+	function filterTopics(uid, tids, cid, ignoredCids, filter, callback) {
 		if (!Array.isArray(ignoredCids) || !tids.length) {
 			return callback(null, tids);
 		}
@@ -130,11 +171,24 @@ module.exports = function(Topics) {
 				privileges.topics.filterTids('read', tids, uid, next);
 			},
 			function(tids, next) {
-				Topics.getTopicsFields(tids, ['tid', 'cid'], next);
+				async.parallel({
+					topics: function(next) {
+						Topics.getTopicsFields(tids, ['tid', 'cid'], next);
+					},
+					isTopicsFollowed: function(next) {
+						if (filter === 'watched' || filter === 'new') {
+							return next(null, []);
+						}
+						db.sortedSetScores('uid:' + uid + ':followed_tids', tids, next);
+					}
+				}, next);
 			},
-			function(topics, next) {
-				tids = topics.filter(function(topic) {
-					return topic && topic.cid && ignoredCids.indexOf(topic.cid.toString()) === -1 && (!cid || parseInt(cid, 10) === parseInt(topic.cid, 10));
+			function(results, next) {
+				var topics = results.topics;
+				tids = topics.filter(function(topic, index) {
+					return topic && topic.cid &&
+						(!!results.isTopicsFollowed[index] || ignoredCids.indexOf(topic.cid.toString()) === -1) &&
+						(!cid || parseInt(cid, 10) === parseInt(topic.cid, 10));
 				}).map(function(topic) {
 					return topic.tid;
 				});
@@ -201,7 +255,7 @@ module.exports = function(Topics) {
 				async.parallel({
 					markRead: async.apply(db.sortedSetAdd, 'uid:' + uid + ':tids_read', scores, tids),
 					markUnread: async.apply(db.sortedSetRemove, 'uid:' + uid + ':tids_unread', tids),
-					topicData: async.apply(	Topics.getTopicsFields, tids, ['cid'])
+					topicData: async.apply(Topics.getTopicsFields, tids, ['cid'])
 				}, next);
 			},
 			function (results, next) {
diff --git a/src/topics/user.js b/src/topics/user.js
index 4db380efdf..09cb4a7e87 100644
--- a/src/topics/user.js
+++ b/src/topics/user.js
@@ -2,10 +2,9 @@
 
 'use strict';
 
-var async = require('async'),
-	db = require('../database'),
-	posts = require('../posts');
-
+var async = require('async');
+var db = require('../database');
+var posts = require('../posts');
 
 module.exports = function(Topics) {
 
@@ -20,22 +19,6 @@ module.exports = function(Topics) {
 	};
 
 	Topics.getUids = function(tid, callback) {
-		async.waterfall([
-			function(next) {
-				Topics.getPids(tid, next);
-			},
-			function(pids, next) {
-				posts.getPostsFields(pids, ['uid'], next);
-			},
-			function(postData, next) {
-				var uids = postData.map(function(post) {
-					return post && post.uid;
-				}).filter(function(uid, index, array) {
-					return uid && array.indexOf(uid) === index;
-				});
-
-				next(null, uids);
-			}
-		], callback);
+		db.getSortedSetRevRangeByScore('tid:' + tid + ':posters', 0, -1, '+inf', 1, callback);
 	};
 };
\ No newline at end of file
diff --git a/src/upgrade.js b/src/upgrade.js
index f6f1ce0093..895520d193 100644
--- a/src/upgrade.js
+++ b/src/upgrade.js
@@ -6,11 +6,11 @@ var db = require('./database'),
 
 	Upgrade = {},
 
-	minSchemaDate = Date.UTC(2015, 7, 18),		// This value gets updated every new MINOR version
+	minSchemaDate = Date.UTC(2015, 10, 6),		// This value gets updated every new MAJOR version
 	schemaDate, thisSchemaDate,
 
 	// IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema
-	latestSchema = Date.UTC(2016, 1, 25);
+	latestSchema = Date.UTC(2016, 5, 13);
 
 Upgrade.check = function(callback) {
 	db.get('schemaDate', function(err, value) {
@@ -62,88 +62,6 @@ Upgrade.upgrade = function(callback) {
 				}
 			});
 		},
-		function(next) {
-			thisSchemaDate = Date.UTC(2015, 8, 30);
-			if (schemaDate < thisSchemaDate) {
-				updatesMade = true;
-				winston.info('[2015/09/30] Converting default Gravatar image to default User Avatar');
-
-				async.waterfall([
-					async.apply(db.isObjectField, 'config', 'customGravatarDefaultImage'),
-					function(keyExists, _next) {
-						if (keyExists) {
-							_next();
-						} else {
-							winston.info('[2015/09/30] Converting default Gravatar image to default User Avatar skipped');
-							Upgrade.update(thisSchemaDate, next);
-							next();
-						}
-					},
-					async.apply(db.getObjectField, 'config', 'customGravatarDefaultImage'),
-					async.apply(db.setObjectField, 'config', 'defaultAvatar'),
-					async.apply(db.deleteObjectField, 'config', 'customGravatarDefaultImage')
-				], function(err) {
-					if (err) {
-						return next(err);
-					}
-
-					winston.info('[2015/09/30] Converting default Gravatar image to default User Avatar done');
-					Upgrade.update(thisSchemaDate, next);
-				});
-			} else {
-				winston.info('[2015/09/30] Converting default Gravatar image to default User Avatar skipped');
-				next();
-			}
-		},
-		function(next) {
-			thisSchemaDate = Date.UTC(2015, 10, 6);
-			if (schemaDate < thisSchemaDate) {
-				updatesMade = true;
-				winston.info('[2015/11/06] Removing gravatar');
-
-				db.getSortedSetRange('users:joindate', 0, -1, function(err, uids) {
-					if (err) {
-						return next(err);
-					}
-
-					async.eachLimit(uids, 500, function(uid, next) {
-						db.getObjectFields('user:' + uid, ['picture', 'gravatarpicture'], function(err, userData) {
-							if (err) {
-								return next(err);
-							}
-
-							if (!userData.picture || !userData.gravatarpicture) {
-								return next();
-							}
-
-							if (userData.gravatarpicture === userData.picture) {
-								async.series([
-									function (next) {
-										db.setObjectField('user:' + uid, 'picture', '', next);
-									},
-									function (next) {
-										db.deleteObjectField('user:' + uid, 'gravatarpicture', next);
-									}
-								], next);
-							} else {
-								db.deleteObjectField('user:' + uid, 'gravatarpicture', next);
-							}
-						});
-					}, function(err) {
-						if (err) {
-							return next(err);
-						}
-
-						winston.info('[2015/11/06] Gravatar pictures removed!');
-						Upgrade.update(thisSchemaDate, next);
-					});
-				});
-
-			} else {
-				winston.info('[2015/11/06] Gravatar removal skipped');
-				next();
-			}
-		},
 		function(next) {
 			thisSchemaDate = Date.UTC(2015, 11, 15);
 
@@ -438,6 +356,267 @@ Upgrade.upgrade = function(callback) {
 				winston.info('[2016/02/25] Social: Post Sharing skipped!');
 				next();
 			}
+		},
+		function(next) {
+			thisSchemaDate = Date.UTC(2016, 3, 14);
+
+			if (schemaDate < thisSchemaDate) {
+				updatesMade = true;
+				winston.info('[2016/04/14] Group title from settings to user profile');
+
+				var user = require('./user');
+				var batch = require('./batch');
+				var count = 0;
+				batch.processSortedSet('users:joindate', function(uids, next) {
+					winston.info('upgraded ' + count + ' users');
+					user.getMultipleUserSettings(uids, function(err, settings) {
+						if (err) {
+							return next(err);
+						}
+						count += uids.length;
+						settings = settings.filter(function(setting) {
+							return setting && setting.groupTitle;
+						});
+
+						async.each(settings, function(setting, next) {
+							db.setObjectField('user:' + setting.uid, 'groupTitle', setting.groupTitle, next);
+						}, next);
+					});
+				}, {}, function(err) {
+					if (err) {
+						return next(err);
+					}
+
+					winston.info('[2016/04/14] Group title from settings to user profile done');
+					Upgrade.update(thisSchemaDate, next);
+				});
+			} else {
+				winston.info('[2016/04/14] Group title from settings to user profile skipped!');
+				next();
+			}
+		},
+		function(next) {
+			thisSchemaDate = Date.UTC(2016, 3, 18);
+
+			if (schemaDate < thisSchemaDate) {
+				updatesMade = true;
+				winston.info('[2016/04/19] Users post count per tid');
+
+				var batch = require('./batch');
+				var topics = require('./topics');
+				var count = 0;
+				batch.processSortedSet('topics:tid', function(tids, next) {
+					winston.info('upgraded ' + count + ' topics');
+					count += tids.length;
+					async.each(tids, function(tid, next) {
+						db.delete('tid:' + tid + ':posters', function(err) {
+							if (err) {
+								return next(err);
+							}
+							topics.getPids(tid, function(err, pids) {
+								if (err) {
+									return next(err);
+								}
+
+								if (!pids.length) {
+									return next();
+								}
+
+								async.eachSeries(pids, function(pid, next) {
+									db.getObjectField('post:' + pid, 'uid', function(err, uid) {
+										if (err) {
+											return next(err);
+										}
+										if (!parseInt(uid, 10)) {
+											return next();
+										}
+										db.sortedSetIncrBy('tid:' + tid + ':posters', 1, uid, next);
+									});
+								}, next);
+							});
+						});
+					}, next);
+				}, {}, function(err) {
+					if (err) {
+						return next(err);
+					}
+
+					winston.info('[2016/04/19] Users post count per tid done');
+					Upgrade.update(thisSchemaDate, next);
+				});
+			} else {
+				winston.info('[2016/04/19] Users post count per tid skipped!');
+				next();
+			}
+		},
+		function(next) {
+			thisSchemaDate = Date.UTC(2016, 3, 29);
+
+			if (schemaDate < thisSchemaDate) {
+				updatesMade = true;
+				winston.info('[2016/04/29] Dismiss flags from deleted topics');
+
+				var posts = require('./posts'),
+					topics = require('./topics');
+
+				var pids, tids;
+
+				async.waterfall([
+					async.apply(db.getSortedSetRange, 'posts:flagged', 0, -1),
+					function(_pids, next) {
+						pids = _pids;
+						posts.getPostsFields(pids, ['tid'], next);
+					},
+					function(_tids, next) {
+						tids = _tids.map(function(a) {
+							return a.tid;
+						});
+
+						topics.getTopicsFields(tids, ['deleted'], next);
+					},
+					function(state, next) {
+						var toDismiss = state.map(function(a, idx) {
+							return parseInt(a.deleted, 10) === 1 ? pids[idx] : null;
+						}).filter(Boolean);
+
+						winston.info('[2016/04/29] ' + toDismiss.length + ' dismissable flags found');
+						async.each(toDismiss, posts.dismissFlag, next);
+					}
+				], function(err) {
+					if (err) {
+						return next(err);
+					}
+
+					winston.info('[2016/04/29] Dismiss flags from deleted topics done');
+					Upgrade.update(thisSchemaDate, next);
+				});
+			} else {
+				winston.info('[2016/04/29] Dismiss flags from deleted topics skipped!');
+				next();
+			}
+		},
+		function(next) {
+			thisSchemaDate = Date.UTC(2016, 4, 28);
+
+			if (schemaDate < thisSchemaDate) {
+				updatesMade = true;
+				winston.info('[2016/05/28] Giving topics:read privs to any group that was previously allowed to Find & Access Category');
+
+				var groupsAPI = require('./groups');
+				var privilegesAPI = require('./privileges');
+
+				db.getSortedSetRange('categories:cid', 0, -1, function(err, cids) {
+					async.eachSeries(cids, function(cid, next) {
+						privilegesAPI.categories.list(cid, function(err, data) {
+							var groups = data.groups;
+							var users = data.users;
+
+							async.waterfall([
+								function(next) {
+									async.eachSeries(groups, function(group, next) {
+										if (group.privileges['groups:read']) {
+											return groupsAPI.join('cid:' + cid + ':privileges:groups:topics:read', group.name, function(err) {
+												if (!err) {
+													winston.info('cid:' + cid + ':privileges:groups:topics:read granted to gid: ' + group.name);
+												}
+
+												return next(err);
+											});
+										}
+
+										next(null);
+									}, next);
+								},
+								function(next) {
+									async.eachSeries(users, function(user, next) {
+										if (user.privileges.read) {
+											return groupsAPI.join('cid:' + cid + ':privileges:topics:read', user.uid, function(err) {
+												if (!err) {
+													winston.info('cid:' + cid + ':privileges:topics:read granted to uid: ' + user.uid);
+												}
+
+												return next(err);
+											});
+										}
+
+										next(null);
+									}, next);
+								}
+							], function(err) {
+								if (!err) {
+									winston.info('-- cid ' + cid + ' upgraded');
+								}
+
+								next(err);
+							});
+						});
+					}, function(err) {
+						if (err) {
+							return next(err);
+						}
+
+						winston.info('[2016/05/28] Giving topics:read privs to any group that was previously allowed to Find & Access Category - done');
+						Upgrade.update(thisSchemaDate, next);
+					});
+				});
+			} else {
+				winston.info('[2016/05/28] Giving topics:read privs to any group that was previously allowed to Find & Access Category - skipped!');
+				next();
+			}
+		},
+		function(next) {
+			thisSchemaDate = Date.UTC(2016, 5, 13);
+
+			if (schemaDate < thisSchemaDate) {
+				updatesMade = true;
+				winston.info('[2016/06/13] Store upvotes/downvotes separately');
+
+				var batch = require('./batch');
+				var posts = require('./posts');
+				var count = 0;
+				batch.processSortedSet('posts:pid', function(pids, next) {
+					winston.info('upgraded ' + count + ' posts');
+					count += pids.length;
+					async.each(pids, function(pid, next) {
+						async.parallel({
+							upvotes: function(next) {
+								db.setCount('pid:' + pid + ':upvote', next);
+							},
+							downvotes: function(next) {
+								db.setCount('pid:' + pid + ':downvote', next);
+							}
+						}, function(err, results) {
+							if (err) {
+								return next(err);
+							}
+							var data = {};
+
+							if (parseInt(results.upvotes, 10) > 0) {
+								data.upvotes = results.upvotes;
+							}
+							if (parseInt(results.downvotes, 10) > 0) {
+								data.downvotes = results.downvotes;
+							}
+
+							if (Object.keys(data).length) {
+								posts.setPostFields(pid, data, next);
+							} else {
+								next();
+							}
+						}, next);
+					}, next);
+				}, {}, function(err) {
+					if (err) {
+						return next(err);
+					}
+
+					winston.info('[2016/06/13] Store upvotes/downvotes separately done');
+					Upgrade.update(thisSchemaDate, next);
+				});
+			} else {
+				winston.info('[2016/06/13] Store upvotes/downvotes separately skipped!');
+				next();
+			}
 		}
 		// Add new schema updates here
 		// IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema IN LINE 24!!!
diff --git a/src/user.js b/src/user.js
index 19c60fc1fd..19f9974cba 100644
--- a/src/user.js
+++ b/src/user.js
@@ -1,12 +1,13 @@
 'use strict';
 
-var	async = require('async'),
+var	async = require('async');
 
-	plugins = require('./plugins'),
-	db = require('./database'),
-	topics = require('./topics'),
-	privileges = require('./privileges'),
-	utils = require('../public/src/utils');
+var plugins = require('./plugins');
+var db = require('./database');
+var topics = require('./topics');
+var privileges = require('./privileges');
+var meta = require('./meta');
+var utils = require('../public/src/utils');
 
 (function(User) {
 
@@ -19,6 +20,7 @@ var	async = require('async'),
 	require('./user/auth')(User);
 	require('./user/create')(User);
 	require('./user/posts')(User);
+	require('./user/topics')(User);
 	require('./user/categories')(User);
 	require('./user/follow')(User);
 	require('./user/profile')(User);
@@ -31,6 +33,7 @@ var	async = require('async'),
 	require('./user/approval')(User);
 	require('./user/invite')(User);
 	require('./user/password')(User);
+	require('./user/info')(User);
 
 	User.updateLastOnlineTime = function(uid, callback) {
 		callback = callback || function() {};
@@ -87,7 +90,8 @@ var	async = require('async'),
 	};
 
 	User.getUsers = function(uids, uid, callback) {
-		var fields = ['uid', 'username', 'userslug', 'picture', 'status', 'banned', 'joindate', 'postcount', 'reputation', 'email:confirmed', 'lastonline'];
+		var fields = ['uid', 'username', 'userslug', 'picture', 'status', 'flags',
+			'banned', 'joindate', 'postcount', 'reputation', 'email:confirmed', 'lastonline'];
 
 		async.waterfall([
 			function (next) {
@@ -254,5 +258,61 @@ var	async = require('async'),
 		});
 	};
 
+	User.isBanned = function(uid, callback) {
+		async.waterfall([
+			async.apply(User.getUserField, uid, 'banned'),
+			function(banned, next) {
+				banned = parseInt(banned, 10) === 1;
+				if (!banned) {
+					return next(null, banned);
+				} else {
+					// If they are banned, see if the ban has expired
+					db.sortedSetScore('users:banned:expire', uid, function(err, score) {
+						var stillBanned = Date.now() < score;
+
+						if (!stillBanned) {
+							async.parallel([
+								async.apply(db.sortedSetRemove.bind(db), 'users:banned:expire', uid),
+								async.apply(db.sortedSetRemove.bind(db), 'users:banned', uid),
+								async.apply(User.setUserField, uid, 'banned', 0)
+							], function(err) {
+								next(err, false);
+							});
+						} else {
+							next(err, true);
+						}
+					});
+				}
+			}
+		], callback);
+	};
+
+	User.addInterstitials = function(callback) {
+		plugins.registerHook('core', {
+			hook: 'filter:register.interstitial',
+			method: function(data, callback) {
+				if (meta.config.termsOfUse && !data.userData.acceptTos) {
+					data.interstitials.push({
+						template: 'partials/acceptTos',
+						data: {
+							termsOfUse: meta.config.termsOfUse
+						},
+						callback: function(userData, formData, next) {
+							if (formData['agree-terms'] === 'on') {
+								userData.acceptTos = true;
+							}
+
+							next(userData.acceptTos ? null : new Error('[[register:terms_of_use_error]]'));
+						}
+					});
+				}
+
+				callback(null, data);
+			}
+		});
+
+		callback();
+	};
+
 
 }(exports));
diff --git a/src/user/admin.js b/src/user/admin.js
index 004e048c93..cf09c0a4ed 100644
--- a/src/user/admin.js
+++ b/src/user/admin.js
@@ -3,6 +3,7 @@
 
 var async = require('async');
 var db = require('../database');
+var posts = require('../posts');
 var plugins = require('../plugins');
 
 module.exports = function(User) {
@@ -21,9 +22,7 @@ module.exports = function(User) {
 				return callback(err);
 			}
 
-			callback(null, ips.map(function(ip) {
-				return {ip:ip};
-			}));
+			callback(null, ips);
 		});
 	};
 
@@ -52,29 +51,50 @@ module.exports = function(User) {
 		], callback);
 	};
 
-	User.ban = function(uid, callback) {
-		async.waterfall([
-			function (next) {
-				User.setUserField(uid, 'banned', 1, next);
-			},
-			function (next) {
-				db.sortedSetAdd('users:banned', Date.now(), uid, next);
-			},
-			function (next) {
-				plugins.fireHook('action:user.banned', {uid: uid});
-				next();
+	User.ban = function(uid, until, callback) {
+		// "until" (optional) is unix timestamp in milliseconds
+		if (!callback && typeof until === 'function') {
+			callback = until;
+			until = 0;
+		}
+
+		until = parseInt(until, 10);
+		if (isNaN(until)) {
+			return callback(new Error('[[error:ban-expiry-missing]]'));
+		}
+
+		var tasks = [
+			async.apply(User.setUserField, uid, 'banned', 1),
+			async.apply(db.sortedSetAdd, 'users:banned', Date.now(), uid),
+			async.apply(db.sortedSetAdd, 'uid:' + uid + ':bans', Date.now(), until)
+		];
+
+		if (until > 0 && Date.now() < until) {
+			tasks.push(async.apply(db.sortedSetAdd, 'users:banned:expire', until, uid));
+		} else {
+			until = 0;
+		}
+
+		async.series(tasks, function (err) {
+			if (err) {
+				return callback(err);
 			}
-		], callback);
+
+			plugins.fireHook('action:user.banned', {
+				uid: uid,
+				until: until > 0 ? until : undefined
+			});
+			callback();
+		});
 	};
 
 	User.unban = function(uid, callback) {
-		db.delete('uid:' + uid + ':flagged_by');
 		async.waterfall([
 			function (next) {
 				User.setUserField(uid, 'banned', 0, next);
 			},
 			function (next) {
-				db.sortedSetRemove('users:banned', uid, next);
+				db.sortedSetsRemove(['users:banned', 'users:banned:expire'], uid, next);
 			},
 			function (next) {
 				plugins.fireHook('action:user.unbanned', {uid: uid});
@@ -87,9 +107,9 @@ module.exports = function(User) {
 		if (!Array.isArray(uids) || !uids.length) {
 			return callback();
 		}
-		var keys = uids.map(function(uid) {
-			return 'uid:' + uid + ':flagged_by';
-		});
-		db.deleteAll(keys, callback);
+
+		async.eachSeries(uids, function(uid, next) {
+			posts.dismissUserFlags(uid, next);
+		}, callback);
 	};
 };
diff --git a/src/user/approval.js b/src/user/approval.js
index 94e0f097e5..8ccd5192aa 100644
--- a/src/user/approval.js
+++ b/src/user/approval.js
@@ -128,7 +128,7 @@ module.exports = function(User) {
 		async.parallel([
 			async.apply(db.sortedSetRemove, 'registration:queue', username),
 			async.apply(db.delete, 'registration:queue:name:' + username)
-		], function(err, results) {
+		], function(err) {
 			callback(err);
 		});
 	}
@@ -178,11 +178,11 @@ module.exports = function(User) {
 						if (err) {
 							return next(null, user);
 						}
-						if (response.statusCode === 200) {
+						if (response.statusCode === 200 && body) {
 							user.spamData = body;
-							user.usernameSpam = body.username.frequency > 0 || body.username.appears > 0;
-							user.emailSpam = body.email.frequency > 0 || body.email.appears > 0;
-							user.ipSpam = body.ip.frequency > 0 || body.ip.appears > 0;
+							user.usernameSpam = body.username ? (body.username.frequency > 0 || body.username.appears > 0) : true;
+							user.emailSpam = body.email ? (body.email.frequency > 0 || body.email.appears > 0) : true;
+							user.ipSpam = body.ip ? (body.ip.frequency > 0 || body.ip.appears > 0) : true;
 						}
 
 						next(null, user);
diff --git a/src/user/auth.js b/src/user/auth.js
index 99bdfb8c94..f2fa917962 100644
--- a/src/user/auth.js
+++ b/src/user/auth.js
@@ -1,10 +1,10 @@
 'use strict';
 
-var async = require('async'),
-	winston = require('winston'),
-	db = require('../database'),
-	meta = require('../meta'),
-	events = require('../events');
+var async = require('async');
+var winston = require('winston');
+var db = require('../database');
+var meta = require('../meta');
+var events = require('../events');
 
 module.exports = function(User) {
 	User.auth = {};
diff --git a/src/user/categories.js b/src/user/categories.js
index 612b5ec14e..7a87f5e441 100644
--- a/src/user/categories.js
+++ b/src/user/categories.js
@@ -45,6 +45,9 @@ module.exports = function(User) {
 					return next(new Error('[[error:no-category]]'));
 				}
 				db.sortedSetAdd('uid:' + uid + ':ignored:cids', Date.now(), cid, next);
+			},
+			function (next) {
+				db.sortedSetAdd('cid:' + cid + ':ignorers', Date.now(), uid, next);
 			}
 		], callback);
 	};
@@ -63,6 +66,9 @@ module.exports = function(User) {
 					return next(new Error('[[error:no-category]]'));
 				}
 				db.sortedSetRemove('uid:' + uid + ':ignored:cids', cid, next);
+			},
+			function (next) {
+				db.sortedSetRemove('cid:' + cid + ':ignorers', uid, next);
 			}
 		], callback);
 	};
diff --git a/src/user/create.js b/src/user/create.js
index ae69f1ad5d..bd79270a93 100644
--- a/src/user/create.js
+++ b/src/user/create.js
@@ -8,11 +8,9 @@ var plugins = require('../plugins');
 var groups = require('../groups');
 var meta = require('../meta');
 
-
 module.exports = function(User) {
 
 	User.create = function(data, callback) {
-
 		data.username = data.username.trim();
 		data.userslug = utils.slugify(data.username);
 		if (data.email !== undefined) {
diff --git a/src/user/data.js b/src/user/data.js
index 66fedbefcd..8e179ca119 100644
--- a/src/user/data.js
+++ b/src/user/data.js
@@ -55,6 +55,16 @@ module.exports = function(User) {
 				return callback(err);
 			}
 
+			if (fields.indexOf('banned') !== -1) {
+				// Also retrieve ban expiry for these users
+				db.sortedSetScores('users:banned:expire', uids, function(err, scores) {
+					users = users.map(function(userObj, idx) {
+						userObj.banned_until = scores[idx] || 0;
+						userObj.banned_until_readable = scores[idx] ? new Date(scores[idx]).toString() : 'Not Banned';
+					});
+				});
+			}
+
 			modifyUserData(users, fieldsToRemove, callback);
 		});
 	};
diff --git a/src/user/delete.js b/src/user/delete.js
index 61319825f7..6c5a92e225 100644
--- a/src/user/delete.js
+++ b/src/user/delete.js
@@ -102,8 +102,12 @@ module.exports = function(User) {
 					},
 					function(next) {
 						var keys = [
-							'uid:' + uid + ':notifications:read', 'uid:' + uid + ':notifications:unread',
-							'uid:' + uid + ':favourites', 'uid:' + uid + ':followed_tids', 'user:' + uid + ':settings',
+							'uid:' + uid + ':notifications:read',
+							'uid:' + uid + ':notifications:unread',
+							'uid:' + uid + ':favourites',
+							'uid:' + uid + ':followed_tids',
+							'uid:' + uid + ':ignored_tids',
+							'user:' + uid + ':settings',
 							'uid:' + uid + ':topics', 'uid:' + uid + ':posts',
 							'uid:' + uid + ':chats', 'uid:' + uid + ':chats:unread',
 							'uid:' + uid + ':chat:rooms', 'uid:' + uid + ':chat:rooms:unread',
@@ -121,10 +125,6 @@ module.exports = function(User) {
 					},
 					function(next) {
 						groups.leaveAllGroups(uid, next);
-					},
-					function(next) {
-						// Deprecated as of v0.7.4, remove in v1.0.0
-						plugins.fireHook('filter:user.delete', uid, next);
 					}
 				], next);
 			},
diff --git a/src/user/info.js b/src/user/info.js
new file mode 100644
index 0000000000..a9ca675eab
--- /dev/null
+++ b/src/user/info.js
@@ -0,0 +1,73 @@
+'use strict';
+
+var async = require('async'),
+	_ = require('underscore');
+
+var db = require('../database'),
+	posts = require('../posts'),
+	topics = require('../topics');
+
+module.exports = function(User) {
+	User.getModerationHistory = function(uid, callback) {
+		async.waterfall([
+			function(next) {
+				async.parallel({
+					flags: async.apply(db.getSortedSetRevRangeByScoreWithScores, 'uid:' + uid + ':flag:pids', 0, 20, '+inf', '-inf'),
+					bans: async.apply(db.getSortedSetRevRangeByScoreWithScores, 'uid:' + uid + ':bans', 0, 20, '+inf', '-inf')
+				}, next);
+			},
+			async.apply(getFlagMetadata),
+			async.apply(formatBanData)
+		], function(err, data) {
+			callback(err, data);
+		});
+	};
+
+	function getFlagMetadata(data, callback) {
+		// Retrieve post title & slug from flags list
+		posts.getPostsFields(data.flags.map(function(flagObj) {
+			return parseInt(flagObj.value, 10);
+		}), ['tid'], function(err, postData) {
+			if (err) {
+				return callback(err);
+			}
+
+			var tids = postData.map(function(post) {
+				return post.tid;
+			});
+
+			topics.getTopicsFields(tids, ['title'], function(err, topicData) {
+				data.flags = data.flags.map(function(flagObj, idx) {
+					flagObj.pid = flagObj.value;
+					flagObj.timestamp = flagObj.score;
+					flagObj.timestampISO = new Date(flagObj.score).toISOString();
+					flagObj.timestampReadable = new Date(flagObj.score).toString();
+
+					delete flagObj.value;
+					delete flagObj.score;
+
+					return _.extend(flagObj, topicData[idx]);
+				});
+
+				callback(null, data);
+			});
+		});
+	}
+
+	function formatBanData(data, callback) {
+		data.bans = data.bans.map(function(banObj) {
+			banObj.until = parseInt(banObj.value, 10);
+			banObj.untilReadable = new Date(banObj.until).toString();
+			banObj.timestamp = parseInt(banObj.score, 10);
+			banObj.timestampReadable = new Date(banObj.score).toString();
+			banObj.timestampISO = new Date(banObj.score).toISOString();
+
+			delete banObj.value;
+			delete banObj.score;
+
+			return banObj;
+		});
+
+		setImmediate(callback, null, data);
+	}
+}
\ No newline at end of file
diff --git a/src/user/notifications.js b/src/user/notifications.js
index 9ad100db2b..b08cb6aaff 100644
--- a/src/user/notifications.js
+++ b/src/user/notifications.js
@@ -1,19 +1,14 @@
 
 'use strict';
 
-var async = require('async'),
-	nconf = require('nconf'),
-	winston = require('winston'),
-	S = require('string'),
+var async = require('async');
+var winston = require('winston');
+var S = require('string');
 
-	user = require('../user'),
-	db = require('../database'),
-	meta = require('../meta'),
-	notifications = require('../notifications'),
-	posts = require('../posts'),
-	topics = require('../topics'),
-	privileges = require('../privileges'),
-	utils = require('../../public/src/utils');
+var db = require('../database');
+var meta = require('../meta');
+var notifications = require('../notifications');
+var privileges = require('../privileges');
 
 (function(UserNotifications) {
 
@@ -103,89 +98,13 @@ var async = require('async'),
 			if (err) {
 				return callback(err);
 			}
-
-			UserNotifications.generateNotificationPaths(notifications, uid, callback);
-		});
-	};
-
-	UserNotifications.generateNotificationPaths = function (notifications, uid, callback) {
-		var pids = notifications.map(function(notification) {
-			return notification ? notification.pid : null;
-		});
-
-		generatePostPaths(pids, uid, function(err, pidToPaths) {
-			if (err) {
-				return callback(err);
-			}
-
-			notifications = notifications.map(function(notification, index) {
-				if (!notification) {
-					return null;
-				}
-
-				notification.path = pidToPaths[notification.pid] || notification.path || null;
-
-				if (notification.nid.startsWith('follow')) {
-					notification.path = '/user/' + notification.user.userslug;
-				}
-
-				notification.datetimeISO = utils.toISOString(notification.datetime);
-				return notification;
-			}).filter(function(notification) {
-				// Remove notifications that do not resolve to a path
-				return notification && notification.path !== null;
+			notifications = notifications.filter(function(notification) {
+				return notification && notification.path;
 			});
-
 			callback(null, notifications);
 		});
 	};
 
-	function generatePostPaths(pids, uid, callback) {
-		pids = pids.filter(Boolean);
-		var postKeys = pids.map(function(pid) {
-			return 'post:' + pid;
-		});
-
-		db.getObjectsFields(postKeys, ['pid', 'tid'], function(err, postData) {
-			if (err) {
-				return callback(err);
-			}
-
-			var topicKeys = postData.map(function(post) {
-				return post ? 'topic:' + post.tid : null;
-			});
-
-			async.parallel({
-				indices: function(next) {
-					posts.getPostIndices(postData, uid, next);
-				},
-				topics: function(next) {
-					db.getObjectsFields(topicKeys, ['slug', 'deleted'], next);
-				}
-			}, function(err, results) {
-				if (err) {
-					return callback(err);
-				}
-
-				var pidToPaths = {};
-				pids.forEach(function(pid, index) {
-					if (parseInt(results.topics[index].deleted, 10) === 1) {
-						pidToPaths[pid] = null;
-						return;
-					}
-
-					var slug = results.topics[index] ? results.topics[index].slug : null;
-					var postIndex = utils.isNumber(results.indices[index]) ? parseInt(results.indices[index], 10) + 1 : null;
-
-					if (slug && postIndex) {
-						pidToPaths[pid] = '/topic/' + slug + '/' + postIndex;
-					}
-				});
-
-				callback(null, pidToPaths);
-			});
-		});
-	}
 
 	UserNotifications.getDailyUnread = function(uid, callback) {
 		var yesterday = Date.now() - (1000 * 60 * 60 * 24);	// Approximate, can be more or less depending on time changes, makes no difference really.
@@ -211,6 +130,7 @@ var async = require('async'),
 		// Collapse any notifications with identical mergeIds
 		async.waterfall([
 			async.apply(db.getSortedSetRevRange, 'uid:' + uid + ':notifications:unread', 0, 99),
+			async.apply(notifications.filterExists),
 			function(nids, next) {
 				var keys = nids.map(function(nid) {
 					return 'notifications:' + nid;
@@ -280,13 +200,20 @@ var async = require('async'),
 	};
 
 	UserNotifications.sendTopicNotificationToFollowers = function(uid, topicData, postData) {
-		db.getSortedSetRange('followers:' + uid, 0, -1, function(err, followers) {
-			if (err || !Array.isArray(followers) || !followers.length) {
-				return;
-			}
-
-			privileges.categories.filterUids('read', topicData.cid, followers, function(err, followers) {
-				if (err || !followers.length) {
+		var followers;
+		async.waterfall([
+			function (next) {
+				db.getSortedSetRange('followers:' + uid, 0, -1, next);
+			},
+			function (followers, next) {
+				if (!Array.isArray(followers) || !followers.length) {
+					return;
+				}
+				privileges.categories.filterUids('read', topicData.cid, followers, next);
+			},
+			function (_followers, next) {
+				followers = _followers;
+				if (!followers.length) {
 					return;
 				}
 
@@ -299,15 +226,20 @@ var async = require('async'),
 					bodyShort: '[[notifications:user_posted_topic, ' + postData.user.username + ', ' + title + ']]',
 					bodyLong: postData.content,
 					pid: postData.pid,
+					path: '/post/' + postData.pid,
 					nid: 'tid:' + postData.tid + ':uid:' + uid,
 					tid: postData.tid,
 					from: uid
-				}, function(err, notification) {
-					if (!err && notification) {
-						notifications.push(notification, followers);
-					}
-				});
-			});
+				}, next);
+			}
+		], function(err, notification) {
+			if (err) {
+				return winston.error(err);
+			}
+
+			if (notification) {
+				notifications.push(notification, followers);
+			}
 		});
 	};
 
diff --git a/src/user/picture.js b/src/user/picture.js
index c9a760f10e..385050fcf2 100644
--- a/src/user/picture.js
+++ b/src/user/picture.js
@@ -57,11 +57,15 @@ module.exports = function(User) {
 						}, next);
 					},
 					function(next) {
-						if (convertToPNG) {
-							image.normalise(picture.path, extension, next);
-						} else {
-							next();
+						if (!convertToPNG) {
+							return next();
 						}
+						async.series([
+							async.apply(image.normalise, picture.path, extension),
+							async.apply(fs.rename, picture.path + '.png', picture.path)
+						], function(err) {
+							next(err);
+						});
 					},
 					function(next) {
 						User.getUserField(updateUid, 'uploadedpicture', next);
@@ -225,4 +229,4 @@ module.exports = function(User) {
 	User.removeCoverPicture = function(data, callback) {
 		db.deleteObjectField('user:' + data.uid, 'cover:url', callback);
 	};
-};
\ No newline at end of file
+};
diff --git a/src/user/posts.js b/src/user/posts.js
index 78a2db0923..c5d8cfba1a 100644
--- a/src/user/posts.js
+++ b/src/user/posts.js
@@ -1,9 +1,9 @@
 'use strict';
 
-var async = require('async'),
-	db = require('../database'),
-	meta = require('../meta'),
-	privileges = require('../privileges');
+var async = require('async');
+var db = require('../database');
+var meta = require('../meta');
+var privileges = require('../privileges');
 
 module.exports = function(User) {
 
@@ -83,13 +83,6 @@ module.exports = function(User) {
 		db.sortedSetAdd('uid:' + uid + ':posts', timestamp, pid, callback);
 	};
 
-	User.addTopicIdToUser = function(uid, tid, timestamp, callback) {
-		async.parallel([
-			async.apply(db.sortedSetAdd, 'uid:' + uid + ':topics', timestamp, tid),
-			async.apply(User.incrementUserFieldBy, uid, 'topiccount', 1)
-		], callback);
-	};
-
 	User.incrementUserPostCountBy = function(uid, value, callback) {
 		callback = callback || function() {};
 		User.incrementUserFieldBy(uid, 'postcount', value, function(err, newpostcount) {
diff --git a/src/user/profile.js b/src/user/profile.js
index 50aa92c1d0..8b2a83f152 100644
--- a/src/user/profile.js
+++ b/src/user/profile.js
@@ -7,12 +7,13 @@ var S = require('string');
 var utils = require('../../public/src/utils');
 var meta = require('../meta');
 var db = require('../database');
+var groups = require('../groups');
 var plugins = require('../plugins');
 
 module.exports = function(User) {
 
 	User.updateProfile = function(uid, data, callback) {
-		var fields = ['username', 'email', 'fullname', 'website', 'location', 'birthday', 'signature', 'aboutme'];
+		var fields = ['username', 'email', 'fullname', 'website', 'location', 'groupTitle', 'birthday', 'signature', 'aboutme', 'picture', 'uploadedpicture'];
 
 		plugins.fireHook('filter:user.updateProfile', {uid: uid, data: data, fields: fields}, function(err, data) {
 			if (err) {
@@ -100,7 +101,21 @@ module.exports = function(User) {
 				});
 			}
 
-			async.series([isAboutMeValid, isSignatureValid, isEmailAvailable, isUsernameAvailable], function(err) {
+			function isGroupTitleValid(next) {
+				if (data.groupTitle === 'registered-users' || groups.isPrivilegeGroup(data.groupTitle)) {
+					next(new Error('[[error:invalid-group-title]]'));
+				} else {
+					next();
+				}
+			}
+
+			async.series([
+				isAboutMeValid, 
+				isSignatureValid, 
+				isEmailAvailable, 
+				isUsernameAvailable,
+				isGroupTitleValid
+			], function(err) {
 				if (err) {
 					return callback(err);
 				}
diff --git a/src/user/search.js b/src/user/search.js
index b2a1e83a80..6bb7084b1f 100644
--- a/src/user/search.js
+++ b/src/user/search.js
@@ -1,10 +1,10 @@
 
 'use strict';
 
-var async = require('async'),
-	meta = require('../meta'),
-	plugins = require('../plugins'),
-	db = require('../database');
+var async = require('async');
+var meta = require('../meta');
+var plugins = require('../plugins');
+var db = require('../database');
 
 module.exports = function(User) {
 
@@ -84,7 +84,7 @@ module.exports = function(User) {
 	function filterAndSortUids(uids, data, callback) {
 		var sortBy = data.sortBy || 'joindate';
 
-		var fields = ['uid', 'status', 'lastonline', 'banned', sortBy];
+		var fields = ['uid', 'status', 'lastonline', 'banned', 'flags', sortBy];
 
 		User.getUsersFields(uids, fields, function(err, userData) {
 			if (err) {
@@ -96,13 +96,19 @@ module.exports = function(User) {
 					return user && user.status !== 'offline' && (Date.now() - parseInt(user.lastonline, 10) < 300000);
 				});
 			}
-			
-			if(data.bannedOnly) {
+
+			if (data.bannedOnly) {
 				userData = userData.filter(function(user) {
 					return user && user.banned;
 				});
 			}
 
+			if (data.flaggedOnly) {
+				userData = userData.filter(function(user) {
+					return user && parseInt(user.flags, 10) > 0;
+				});
+			}
+
 			sortUsers(userData, sortBy);
 
 			uids = userData.map(function(user) {
diff --git a/src/user/settings.js b/src/user/settings.js
index e37e012f7e..8856819a2f 100644
--- a/src/user/settings.js
+++ b/src/user/settings.js
@@ -1,10 +1,10 @@
 
 'use strict';
 
-var	async = require('async'),
-	meta = require('../meta'),
-	db = require('../database'),
-	plugins = require('../plugins');
+var async = require('async');
+var meta = require('../meta');
+var db = require('../database');
+var plugins = require('../plugins');
 
 module.exports = function(User) {
 
@@ -123,7 +123,7 @@ module.exports = function(User) {
 			topicSearchEnabled: data.topicSearchEnabled,
 			delayImageLoading: data.delayImageLoading,
 			groupTitle: data.groupTitle,
-			homePageRoute: data.homePageCustom || data.homePageRoute,
+			homePageRoute: (data.homePageCustom || data.homePageRoute || '').replace(/^\//, ''),
 			scrollToMyPost: data.scrollToMyPost
 		};
 
@@ -162,17 +162,4 @@ module.exports = function(User) {
 	User.setSetting = function(uid, key, value, callback) {
 		db.setObjectField('user:' + uid + ':settings', key, value, callback);
 	};
-
-	User.setGroupTitle = function(groupName, uid, callback) {
-		if (groupName === 'registered-users') {
-			return callback();
-		}
-		db.getObjectField('user:' + uid + ':settings', 'groupTitle', function(err, currentTitle) {
-			if (err || (currentTitle || currentTitle === '')) {
-				return callback(err);
-			}
-
-			User.setSetting(uid, 'groupTitle', groupName, callback);
-		});
-	};
 };
diff --git a/src/user/topics.js b/src/user/topics.js
new file mode 100644
index 0000000000..2df535a1ce
--- /dev/null
+++ b/src/user/topics.js
@@ -0,0 +1,19 @@
+'use strict';
+
+var async = require('async');
+var db = require('../database');
+
+module.exports = function(User) {
+
+	User.getIgnoredTids = function(uid, start, stop, callback) {
+		db.getSortedSetRevRange('uid:' + uid + ':ignored_tids', start, stop, callback);
+	};
+
+	User.addTopicIdToUser = function(uid, tid, timestamp, callback) {
+		async.parallel([
+			async.apply(db.sortedSetAdd, 'uid:' + uid + ':topics', timestamp, tid),
+			async.apply(User.incrementUserFieldBy, uid, 'topiccount', 1)
+		], callback);
+	};
+
+};
\ No newline at end of file
diff --git a/src/views/admin/advanced/errors.tpl b/src/views/admin/advanced/errors.tpl
new file mode 100644
index 0000000000..d3c23e78b7
--- /dev/null
+++ b/src/views/admin/advanced/errors.tpl
@@ -0,0 +1,66 @@
+<div class="row">
+	<div class="col-lg-9">
+		<div class="row">
+			<div class="col-sm-6 text-center">
+				<div class="panel panel-default">
+					<div class="panel-body">
+						<div><canvas id="not-found" height="250"></canvas></div>
+					</div>
+					<div class="panel-footer"><small><strong>Figure 1</strong> &ndash; <code>404 Not Found</code> events per day</small></div>
+				</div>
+			</div>
+			<div class="col-sm-6 text-center">
+				<div class="panel panel-default">
+					<div class="panel-body">
+						<div><canvas id="toobusy" height="250"></canvas></div>
+					</div>
+					<div class="panel-footer"><small><strong>Figure 2</strong> &ndash; <code>503 Service Unavailable</code> events per day</small></div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="col-lg-3 acp-sidebar">
+		<div class="panel panel-default">
+			<div class="panel-heading">Manage Error Log</div>
+			<div class="panel-body">
+				<div class="btn-group-vertical btn-block" role="group">
+					<a class="btn btn-info" target="_top" href="{config.relative_path}/admin/advanced/errors/export"><i class="fa fa-download"></i> Export Error Log (CSV)</a>
+					<button class="btn btn-danger" data-action="clear"><i class="fa fa-trash"></i> Clear Error Log</button>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="row">
+	<div class="col-xs-12">
+		<div class="panel panel-default">
+			<div class="panel-heading"><i class="fa fa-exclamation-triangle"></i> 404 Not Found</div>
+			<div class="panel-body">
+				<table class="table table-striped">
+					<thead>
+						<th>Route</th>
+						<th>Count</th>
+					</thead>
+					<tbody>
+						<!-- BEGIN not-found -->
+						<tr>
+							<td>{../value}</td>
+							<td>{../score}</td>
+						</tr>
+						<!-- END not-found -->
+						<!-- IF !not-found.length -->
+						<tr>
+							<td colspan="2">
+								<div class="alert alert-success">
+									Hooray! There are no routes that were not found.
+								</div>
+							</td>
+						</tr>
+						<!-- ENDIF !not-found.length -->
+					</tbody>
+				</table>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/src/views/admin/extend/plugins.tpl b/src/views/admin/extend/plugins.tpl
index ac6781c66b..730c2a56a0 100644
--- a/src/views/admin/extend/plugins.tpl
+++ b/src/views/admin/extend/plugins.tpl
@@ -1,5 +1,6 @@
 <ul class="nav nav-pills">
 	<li class="active"><a href="#installed" data-toggle="tab">Installed Plugins</a></li>
+	<li><a href="#active" data-toggle="tab">Active Plugins</a></li>
 	<li><a href="#download" data-toggle="tab">Download Plugins</a></li>
 	<li><a href="#upgrade" data-toggle="tab">Upgradable Plugins</a></li>
 </ul>
@@ -15,6 +16,9 @@
 					<!-- END installed -->
 				</ul>
 			</div>
+			<div class="tab-pane fade" id="active">
+				<ul class="active"></ul>
+			</div>
 			<div class="tab-pane fade" id="download">
 				<ul class="download">
 					<!-- BEGIN download -->
diff --git a/src/views/admin/general/sounds.tpl b/src/views/admin/general/sounds.tpl
index dfdbae512d..f32e81191b 100644
--- a/src/views/admin/general/sounds.tpl
+++ b/src/views/admin/general/sounds.tpl
@@ -1,5 +1,5 @@
 <div class="sounds settings" class="row">
-	<div class="col-xs-9">
+	<div class="col-xs-12">
 		<form role="form">
 			<div class="row">
 				<div class="col-sm-2 col-xs-12 settings-header">Notifications</div>
@@ -15,7 +15,7 @@
 							</select>
 						</div>
 						<div class="btn-group col-xs-3">
-							<button type="button" class="form-control btn btn-sm btn-default" data-action="play">Play <i class="fa fa-play"></i></button>
+							<button type="button" class="form-control btn btn-sm btn-default" data-action="play"><span class="hidden-xs">Play </span><i class="fa fa-play"></i></button>
 						</div>
 					</div>
 				</div>
@@ -35,7 +35,7 @@
 							</select>
 						</div>
 						<div class="btn-group col-xs-3">
-							<button type="button" class="form-control btn btn-sm btn-default" data-action="play">Play <i class="fa fa-play"></i></button>
+							<button type="button" class="form-control btn btn-sm btn-default" data-action="play"><span class="hidden-xs">Play </span><i class="fa fa-play"></i></button>
 						</div>
 					</div>
 
@@ -50,33 +50,22 @@
 							</select>
 						</div>
 						<div class="btn-group col-xs-3">
-							<button type="button" class="form-control btn btn-sm btn-default" data-action="play">Play <i class="fa fa-play"></i></button>
+							<button type="button" class="form-control btn btn-sm btn-default" data-action="play"><span class="hidden-xs">Play </span><i class="fa fa-play"></i></button>
 						</div>
 					</div>
+					
+					<div class="input-group">
+						<span class="input-group-btn">
+							<input data-action="upload" data-title="Upload Sound" data-route="{config.relative_path}/api/admin/upload/sound" type="button" class="btn btn-primary" value="Upload New Sound"></input>
+						</span>
+					</div>
 				</div>
 			</div>
 		</form>
 	</div>
 
-	<div class="col-xs-3">
-		<div class="panel">
-			<div class="panel-body">
-				<div class="input-group">
-					<span class="input-group-btn">
-						<input data-action="upload" data-title="Upload Sound" data-route="{config.relative_path}/api/admin/upload/sound" type="button" class="btn btn-primary btn-block" value="Upload New Sound"></input>
-					</span>
-				</div>
-			</div>
-		</div>
-	</div>
 </div>
 
 <button id="save" class="floating-button mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored">
 	<i class="material-icons">save</i>
-</button>
-
-<script>
-	require(['admin/settings'], function(Settings) {
-		Settings.init();
-	});
-</script>
\ No newline at end of file
+</button>
\ No newline at end of file
diff --git a/src/views/admin/header.tpl b/src/views/admin/header.tpl
index 476ebda7a6..03cab80005 100644
--- a/src/views/admin/header.tpl
+++ b/src/views/admin/header.tpl
@@ -54,12 +54,13 @@
 		<script type="text/javascript" src="{relative_path}/vendor/jquery/js/jquery-ui-1.10.4.custom.js?{cache-buster}"></script>
 		<script type="text/javascript" src="{relative_path}/vendor/snackbar/snackbar.min.js?{cache-buster}"></script>
 		<script type="text/javascript" src="{relative_path}/vendor/slideout/slideout.min.js?{cache-buster}"></script>
+		<script type="text/javascript" src="{relative_path}/vendor/nprogress.min.js?{cache-buster}"></script>
 
 		<!-- BEGIN scripts -->
 		<script type="text/javascript" src="{scripts.src}"></script>
 		<!-- END scripts -->
 	</head>
 
-	<body class="admin">
+	<body class="admin {bodyClass}">
 		<!-- IMPORT admin/partials/menu.tpl -->
 		<div class="container" id="content">
\ No newline at end of file
diff --git a/src/views/admin/manage/flags.tpl b/src/views/admin/manage/flags.tpl
index d5807ce88e..1bd1726b97 100644
--- a/src/views/admin/manage/flags.tpl
+++ b/src/views/admin/manage/flags.tpl
@@ -1,32 +1,48 @@
 <div class="flags">
-	<div class="col-lg-9">
+
+	<div class="col-lg-12">
+
+		<div class="text-center">
+			<div class="panel panel-default">
+				<div class="panel-body">
+					<div><canvas id="flags:daily" height="250"></canvas></div>
+					<p>
+
+					</p>
+				</div>
+				<div class="panel-footer"><small>Daily flags</small></div>
+			</div>
+		</div>
+
+		<form id="flag-search" method="GET" action="flags">
+			<div class="form-group">
+				<div>
+					<div>
+						<label>Flags by user</label>
+						<input type="text" class="form-control" id="byUsername" placeholder="Search flagged posts by username" name="byUsername" value="{byUsername}">
+					</div>
+				</div>
+			</div>
+
+			<div class="form-group">
+				<label>Sort By</label>
+				<div>
+					<div>
+						<select id="flag-sort-by" class="form-control" name="sortBy">
+							<option value="count">Most Flags</option>
+							<option value="time">Most Recent</option>
+						</select>
+					</div>
+				</div>
+			</div>
+
+			<button type="submit" class="btn btn-primary">Search</button>
+			<button class="btn btn-primary" id="dismissAll">Dismiss All</button>
+		</form>
+
+		<hr/>
+
 		<div data-next="{next}">
-			<form id="flag-search" method="GET" action="flags">
-				<div class="form-group">
-					<div class="row">
-						<div class="col-md-6">
-							<label>Flags by user</label>
-							<input type="text" class="form-control" id="byUsername" placeholder="Search flagged posts by username" name="byUsername" value="{byUsername}">
-						</div>
-					</div>
-				</div>
-
-				<div class="form-group">
-					<label>Sort By</label>
-					<div class="row">
-						<div class="col-md-6">
-							<select id="flag-sort-by" class="form-control" name="sortBy">
-								<option value="count">Most Flags</option>
-								<option value="time">Most Recent</option>
-							</select>
-						</div>
-					</div>
-				</div>
-
-				<button type="submit" class="btn btn-primary">Search</button>
-			</form>
-			<br />
-			<hr/>
 
 			<div class="post-container" data-next="{next}">
 				<!-- IF !posts.length -->
@@ -53,7 +69,6 @@
 								</a>
 								<div class="content">
 									<p>{posts.content}</p>
-									<p class="fade-out"></p>
 								</div>
 								<small>
 									<span class="pull-right">
@@ -83,8 +98,8 @@
 							</ul>
 						</blockquote>
 						<div class="btn-group">
-							<button class="btn btn-sm btn-success dismiss">Dismiss</button>
-							<button class="btn btn-sm btn-danger delete">Delete</button>
+							<button class="btn btn-sm btn-success dismiss">Dismiss this Flag</button>
+							<button class="btn btn-sm btn-danger delete">Delete the Post</button>
 						</div>
 					</div>
 				</div>
@@ -92,15 +107,4 @@
 			</div>
 		</div>
 	</div>
-
-	<div class="col-lg-3 acp-sidebar">
-		<div class="panel panel-default">
-			<div class="panel-heading">Flags Control Panel</div>
-			<div class="panel-body">
-				<div>
-					<button class="btn btn-primary" id="dismissAll">Dismiss All</button>
-				</div>
-			</div>
-		</div>
-	</div>
 </div>
diff --git a/src/views/admin/manage/registration.tpl b/src/views/admin/manage/registration.tpl
index d293d8cfa4..f751eca74d 100644
--- a/src/views/admin/manage/registration.tpl
+++ b/src/views/admin/manage/registration.tpl
@@ -5,7 +5,7 @@
 	<!-- IF !users.length -->
 	<p class="panel-body">
 		There are no users in the registration queue. <br>
-		To enable this feature, go to <a href="{config.relative_path}/admin/settings/user">Settings -> User -> Authentication</a> and set
+		To enable this feature, go to <a href="{config.relative_path}/admin/settings/user">Settings &rarr; User &rarr; Authentication</a> and set
 		<strong>Registration Type</strong> to "Admin Approval".
 	</p>
 	<!-- ENDIF !users.length -->
@@ -13,8 +13,8 @@
 		<tr>
 			<th>Name</th>
 			<th>Email</th>
-			<th>IP</th>
-			<th>Time</th>
+			<th class="hidden-xs">IP</th>
+			<th class="hidden-xs">Time</th>
 			<th></th>
 		</tr>
 		<!-- BEGIN users -->
@@ -35,7 +35,7 @@
 				<!-- ENDIF users.emailSpam -->
 				{users.email}
 			</td>
-			<td>
+			<td class="hidden-xs">
 				<!-- IF users.ipSpam -->
 				<i class="fa fa-times-circle text-danger" title="Frequency: {users.spamData.ip.frequency} Appears: {users.spamData.ip.appears}"></i>
 				<!-- ELSE -->
@@ -43,7 +43,7 @@
 				<!-- ENDIF users.ipSpam -->
 				{users.ip}
 			</td>
-			<td>
+			<td class="hidden-xs">
 				<span class="timeago" title="{users.timestampISO}"></span>
 			</td>
 			<td>
diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl
index cfdc7bb72c..6683f6e887 100644
--- a/src/views/admin/manage/users.tpl
+++ b/src/views/admin/manage/users.tpl
@@ -8,6 +8,7 @@
 					<li><a href='{config.relative_path}/admin/manage/users/not-validated'>Not validated</a></li>
 					<li><a href='{config.relative_path}/admin/manage/users/no-posts'>No Posts</a></li>
 					<li><a href='{config.relative_path}/admin/manage/users/inactive'>Inactive</a></li>
+					<li><a href='{config.relative_path}/admin/manage/users/flagged'>Most Flags</a></li>
 					<li><a href='{config.relative_path}/admin/manage/users/banned'>Banned</a></li>
 					<li><a href='{config.relative_path}/admin/manage/users/search'>User Search</a></li>
 
@@ -22,12 +23,13 @@
 							<li><a href="#" class="send-validation-email"><i class="fa fa-fw fa-mail-forward"></i> Send Validation Email</a></li>
 							<li><a href="#" class="password-reset-email"><i class="fa fa-fw fa-key"></i> Send Password Reset Email</a></li>
 							<li class="divider"></li>
-							<li><a href="#" class="ban-user"><i class="fa fa-fw fa-gavel"></i> Ban User</a></li>
-							<li><a href="#" class="unban-user"><i class="fa fa-fw fa-comment-o"></i> Unban User</a></li>
+							<li><a href="#" class="ban-user"><i class="fa fa-fw fa-gavel"></i> Ban User(s)</a></li>
+							<li><a href="#" class="ban-user-temporary"><i class="fa fa-fw fa-clock-o"></i> Ban User(s) Temporarily</a></li>
+							<li><a href="#" class="unban-user"><i class="fa fa-fw fa-comment-o"></i> Unban User(s)</a></li>
 							<li><a href="#" class="reset-lockout"><i class="fa fa-fw fa-unlock"></i> Reset Lockout</a></li>
 							<li><a href="#" class="reset-flags"><i class="fa fa-fw fa-flag"></i> Reset Flags</a></li>
 							<li class="divider"></li>
-							<li><a href="#" class="delete-user"><i class="fa fa-fw fa-trash-o"></i> Delete User</a></li>
+							<li><a href="#" class="delete-user"><i class="fa fa-fw fa-trash-o"></i> Delete User(s)</a></li>
 						</ul>
 					</div>
 				</ul>
@@ -70,7 +72,7 @@
 								<!-- ENDIF !users.email:confirmed -->
 								<!-- ENDIF config.requireEmailConfirmation -->
 								<span class="administrator label label-primary <!-- IF !users.administrator -->hide<!-- ENDIF !users.administrator -->">Admin</span>
-								<span class="ban label label-danger <!-- IF !users.banned -->hide<!-- ENDIF !users.banned -->">Banned</span>
+								<span class="ban label label-danger <!-- IF !users.banned -->hide<!-- ENDIF !users.banned -->">Banned<!-- IF users.banned_until --> <i class="fa fa-clock-o" title="Banned until {../banned_until_readable}"></i><!-- ENDIF users.banned_until --></span>
 							</div>
 						</div>
 
@@ -84,7 +86,7 @@
 						posts {users.postcount}
 
 						<!-- IF users.flags -->
-						<div><small><span><i class="fa fa-flag"></i> {users.flags}</span></small></div>
+						<div><small><span><i class="fa fa-flag"></i> <a href="{config.relative_path}/admin/manage/flags?byUsername={users.username}">{users.flags}</a></span></small></div>
 						<!-- ENDIF users.flags -->
 					</div>
 					<!-- END users -->
@@ -139,8 +141,15 @@
 		<div class="panel panel-default">
 			<div class="panel-heading">Users Control Panel</div>
 			<div class="panel-body">
-				<button id="createUser" class="btn btn-primary">New User</button>
-				<a target="_blank" href="{config.relative_path}/api/admin/users/csv" class="btn btn-primary">Download CSV</a>
+				<button id="createUser" class="btn btn-primary form-control">New User</button>
+				<a target="_blank" href="{config.relative_path}/api/admin/users/csv" class="btn btn-primary form-control">Download CSV</a>
+
+				<!-- IF inviteOnly -->
+				<!-- IF loggedIn -->
+				<button component="user/invite" class="btn btn-success form-control"><i class="fa fa-users"></i> Invite</button>
+				<!-- ENDIF loggedIn -->
+				<!-- ENDIF inviteOnly -->
+
 			</div>
 		</div>
 	</div>
diff --git a/src/views/admin/partials/categories/groups.tpl b/src/views/admin/partials/categories/groups.tpl
index aa2da68cfc..eb432bfd27 100644
--- a/src/views/admin/partials/categories/groups.tpl
+++ b/src/views/admin/partials/categories/groups.tpl
@@ -5,8 +5,9 @@
 			Privileges <span class="caret"></span>
 		</button>
 		<ul class="dropdown-menu" role="menu">
-			<li role="presentation"><a href="#" data-priv="groups:find" class="<!-- IF groups.privileges.groups:find -->active<!-- ENDIF groups.privileges.groups:find -->">Find category</a></li>
-			<li role="presentation"><a href="#" data-priv="groups:read" class="<!-- IF groups.privileges.groups:read -->active<!-- ENDIF groups.privileges.groups:read -->">Access &amp; Read</a></li>
+			<li role="presentation"><a href="#" data-priv="groups:find" class="<!-- IF groups.privileges.groups:find -->active<!-- ENDIF groups.privileges.groups:find -->">Find Category</a></li>
+			<li role="presentation"><a href="#" data-priv="groups:read" class="<!-- IF groups.privileges.groups:read -->active<!-- ENDIF groups.privileges.groups:read -->">Access Category</a></li>
+			<li role="presentation"><a href="#" data-priv="groups:topics:read" class="<!-- IF groups.privileges.groups:topics:read -->active<!-- ENDIF groups.privileges.groups:topics:read -->">Access Topics</a></li>
 			<li role="presentation"><a href="#" data-priv="groups:topics:create" class="<!-- IF groups.privileges.groups:topics:create -->active<!-- ENDIF groups.privileges.groups:topics:create -->">Create Topics</a></li>
 			<li role="presentation"><a href="#" data-priv="groups:topics:reply" class="<!-- IF groups.privileges.groups:topics:reply -->active<!-- ENDIF groups.privileges.groups:topics:reply -->">Reply to Topics</a></li>
 		</ul>
diff --git a/src/views/admin/partials/categories/privileges.tpl b/src/views/admin/partials/categories/privileges.tpl
index b5605c0935..497fa71ac0 100644
--- a/src/views/admin/partials/categories/privileges.tpl
+++ b/src/views/admin/partials/categories/privileges.tpl
@@ -58,6 +58,7 @@
 								<div class="btn-toolbar">
 									<button type="button" class="btn btn-primary pull-right" data-ajaxify="false" data-action="search.group"> Add Group</button>
 									<button type="button" class="btn btn-info pull-right" data-ajaxify="false" data-action="copyToChildren"> Copy to Children</button>
+									<button type="button" class="btn btn-info pull-right" data-ajaxify="fakse" data-action="copyPrivilegesFrom"> Copy From Category</button>
 								</div>
 							</td>
 						</tr>
diff --git a/src/views/admin/partials/categories/users.tpl b/src/views/admin/partials/categories/users.tpl
index 40991fcf3a..9ec7c262fd 100644
--- a/src/views/admin/partials/categories/users.tpl
+++ b/src/views/admin/partials/categories/users.tpl
@@ -5,8 +5,9 @@
 			Privileges <span class="caret"></span>
 		</button>
 		<ul class="dropdown-menu" role="menu">
-			<li role="presentation"><a href="#" data-priv="find" class="<!-- IF users.privileges.find -->active<!-- ENDIF users.privileges.find -->">Find category</a></li>
-			<li role="presentation"><a href="#" data-priv="read" class="<!-- IF users.privileges.read -->active<!-- ENDIF users.privileges.read -->">Access &amp; Read</a></li>
+			<li role="presentation"><a href="#" data-priv="find" class="<!-- IF users.privileges.find -->active<!-- ENDIF users.privileges.find -->">Find Category</a></li>
+			<li role="presentation"><a href="#" data-priv="read" class="<!-- IF users.privileges.read -->active<!-- ENDIF users.privileges.read -->">Access Category</a></li>
+			<li role="presentation"><a href="#" data-priv="topics:read" class="<!-- IF users.privileges.topics:read -->active<!-- ENDIF users.privileges.topics:read -->">Access Topics</a></li>
 			<li role="presentation"><a href="#" data-priv="topics:create" class="<!-- IF users.privileges.topics:create -->active<!-- ENDIF users.privileges.topics:create -->">Create Topics</a></li>
 			<li role="presentation"><a href="#" data-priv="topics:reply" class="<!-- IF users.privileges.topics:reply -->active<!-- ENDIF users.privileges.topics:reply -->">Reply to Topics</a></li>
 			<li role="presentation" class="divider"></li>
diff --git a/src/views/admin/partials/installed_plugin_item.tpl b/src/views/admin/partials/installed_plugin_item.tpl
index b0399df5e2..3c95bcc2c1 100644
--- a/src/views/admin/partials/installed_plugin_item.tpl
+++ b/src/views/admin/partials/installed_plugin_item.tpl
@@ -1,5 +1,5 @@
 					<!-- IF !installed.error -->
-					<li id="{installed.id}" data-plugin-id="{installed.id}" data-version="{installed.version}" class="clearfix">
+					<li id="{installed.id}" data-plugin-id="{installed.id}" data-version="{installed.version}" class="clearfix <!-- IF installed.active -->active<!-- ENDIF installed.active -->">
 						<div class="pull-right">
 							<!-- IF installed.isTheme -->
 							<a href="{config.relative_path}/admin/appearance/themes" class="btn btn-info">Themes</a>
diff --git a/src/views/admin/partials/menu.tpl b/src/views/admin/partials/menu.tpl
index 8d0f0f853d..38c5e5eeb8 100644
--- a/src/views/admin/partials/menu.tpl
+++ b/src/views/admin/partials/menu.tpl
@@ -95,6 +95,7 @@
 			<li><a href="{relative_path}/admin/advanced/database">Database</a></li>
 			<li><a href="{relative_path}/admin/advanced/events">Events</a></li>
 			<li><a href="{relative_path}/admin/advanced/logs">Logs</a></li>
+			<li><a href="{relative_path}/admin/advanced/errors">Errors</a></li>
 			<li><a href="{relative_path}/admin/advanced/post-cache">Post Cache</a></li>
 			<!-- IF env -->
 			<li><a href="{relative_path}/admin/development/logger">Logger</a></li>
@@ -106,11 +107,11 @@
 <main id="panel">
 	<nav class="header" id="header">
 		<div class="pull-left">
-			<button id="mobile-menu">
+			<div id="mobile-menu">
 				<div class="bar"></div>
 				<div class="bar"></div>
 				<div class="bar"></div>
-			</button>
+			</div>
 			<h1 id="main-page-title"></h1>
 		</div>
 
@@ -247,6 +248,7 @@
 					<li><a href="{relative_path}/admin/advanced/database">Database</a></li>
 					<li><a href="{relative_path}/admin/advanced/events">Events</a></li>
 					<li><a href="{relative_path}/admin/advanced/logs">Logs</a></li>
+					<li><a href="{relative_path}/admin/advanced/errors">Errors</a></li>
 					<li><a href="{relative_path}/admin/advanced/post-cache">Post Cache</a></li>
 					<!-- IF env -->
 					<li><a href="{relative_path}/admin/development/logger">Logger</a></li>
@@ -254,4 +256,12 @@
 				</ul>
 			</li>
 		</ul>
+
+		<ul class="nav navbar-nav navbar-right hidden-xs reconnect-spinner">
+			<li>
+				<a href="#" id="reconnect" class="hide" title="Connection to {title} has been lost, attempting to reconnect...">
+					<i class="fa fa-check"></i>
+				</a>
+			</li>
+		</ul>
 	</nav>
\ No newline at end of file
diff --git a/src/views/admin/partials/temporary-ban.tpl b/src/views/admin/partials/temporary-ban.tpl
new file mode 100644
index 0000000000..a3f032a3b6
--- /dev/null
+++ b/src/views/admin/partials/temporary-ban.tpl
@@ -0,0 +1,13 @@
+<form class="form-inline">
+	<div class="form-group text-center">
+		<label for="days">Ban Length</label>
+		<input class="form-control" name="length" type="number" min="1" value="1" /><br />
+		<label>Hours</label>
+		<input type="radio" name="unit" value="0" checked />
+		<label>Days</label>
+		<input type="radio" name="unit" value="1" />
+	</div>
+	<p class="help-block">
+		Enter the length of time for the ban. Note that a time of 0 will be a considered a permanent ban.
+	</p>
+</form>
\ No newline at end of file
diff --git a/src/views/admin/partials/widget-settings.tpl b/src/views/admin/partials/widget-settings.tpl
new file mode 100644
index 0000000000..dfb7f8f4bc
--- /dev/null
+++ b/src/views/admin/partials/widget-settings.tpl
@@ -0,0 +1,18 @@
+<br />
+<label>Title:</label>
+<input type="text" class="form-control" name="title" placeholder="Title (only shown on some containers)" /><br />
+
+<label>Container:</label>
+<textarea rows="4" class="form-control container-html" name="container" placeholder="Drag and drop a container or enter HTML here."></textarea>
+
+<div class="checkbox">
+<label><input name="hide-guests" type="checkbox"> Hide from anonymous users?</label>
+</div>
+
+<div class="checkbox">
+<label><input name="hide-registered" type="checkbox"> Hide from registered users?</input></label>
+</div>
+
+<div class="checkbox">
+<label><input name="hide-mobile" type="checkbox"> Hide on mobile?</input></label>
+</div>
diff --git a/src/views/admin/settings/general.tpl b/src/views/admin/settings/general.tpl
index fa41b38f61..79cba3caf7 100644
--- a/src/views/admin/settings/general.tpl
+++ b/src/views/admin/settings/general.tpl
@@ -50,6 +50,7 @@
 				</span>
 			</div>
 		</div>
+
 		<div class="form-group">
 			<label for="brand:logo:url">URL</label>
 			<input id ="brand:logo:url" type="text" class="form-control" placeholder="The URL of the site logo" data-field="brand:logo:url" />
@@ -61,6 +62,17 @@
 			<label for="brand:logo:alt">Alt Text</label>
 			<input id ="brand:logo:alt" type="text" class="form-control" placeholder="Alternative text for accessibility" data-field="brand:logo:alt" />
 		</div>
+
+		<div class="form-group">
+			<label for="og_image">og:image</label>
+			<div class="input-group">
+				<input id="og_image" type="text" class="form-control" placeholder="" data-field="og:image" data-action="upload" data-target="og_image" data-route="{config.relative_path}/api/admin/uploadOgImage" readonly />
+				<span class="input-group-btn">
+					<input data-action="upload" data-target="og_image" data-route="{config.relative_path}/api/admin/uploadOgImage" type="button" class="btn btn-default" value="Upload"></input>
+					<button data-action="removeOgImage" type="button" class="btn btn-default btn-danger"><i class="fa fa-times"></i></button>
+				</span>
+			</div>
+		</div>
 	</div>
 </div>
 
diff --git a/src/views/admin/settings/group.tpl b/src/views/admin/settings/group.tpl
index 13b5121b24..8e1ee54b3f 100644
--- a/src/views/admin/settings/group.tpl
+++ b/src/views/admin/settings/group.tpl
@@ -28,6 +28,9 @@
 			<p class="help-block">
 				If enabled, users can create groups <em>(Default: disabled)</em>
 			</p>
+
+			<label>Maximum Group Name Length</label>
+			<input class="form-control" type="text" placeholder="255" data-field="maximumGroupNameLength" />
 		</form>
 	</div>
 </div>
diff --git a/src/views/admin/settings/post.tpl b/src/views/admin/settings/post.tpl
index 590f0e18cd..4ac9aa3d2a 100644
--- a/src/views/admin/settings/post.tpl
+++ b/src/views/admin/settings/post.tpl
@@ -48,6 +48,10 @@
 				<label for="postEditDuration">Number of seconds users are allowed to edit posts after posting. (0 disabled)</label>
 				<input id="postEditDuration" type="text" class="form-control" value="0" data-field="postEditDuration">
 			</div>
+			<div class="form-group">
+				<label for="postDeleteDuration">Number of seconds users are allowed to delete posts after posting. (0 disabled)</label>
+				<input id="postDeleteDuration" type="text" class="form-control" value="0" data-field="postDeleteDuration">
+			</div>
 			<div class="form-group">
 				<label for="minimumTitleLength">Minimum Title Length</label>
 				<input id="minimumTitleLength" type="text" class="form-control" value="3" data-field="minimumTitleLength">
@@ -83,7 +87,8 @@
 			<div class="form-group">
 				<label>Teaser Post</label>
 				<select class="form-control" data-field="teaserPost">
-					<option value="last">Last</option>
+					<option value="last-post">Last &ndash; Show the latest post, including the original post, if no replies</option>
+					<option value="last-reply">Last &ndash; Show the latest reply, or a "No replies" placeholder if no replies</option>
 					<option value="first">First</option>
 				</select>
 			</div>
@@ -100,6 +105,10 @@
 				<label for="unreadCutoff">Unread cutoff days</label>
 				<input id="unreadCutoff" type="text" class="form-control" value="2" data-field="unreadCutoff">
 			</div>
+			<div class="form-group">
+ 				<label for="bookmarkthreshold">Minimum posts in topic before tracking last read</label>
+ 				<input id="bookmarkthreshold" type="text" class="form-control" value="5" data-field="bookmarkThreshold">
+ 			</div>
 		</form>
 	</div>
 </div>
diff --git a/src/views/admin/settings/uploads.tpl b/src/views/admin/settings/uploads.tpl
index 4881f8dcd7..4358dee47e 100644
--- a/src/views/admin/settings/uploads.tpl
+++ b/src/views/admin/settings/uploads.tpl
@@ -28,8 +28,19 @@
 			</div>
 			
 			<div class="form-group">
-				<label for="maximumFileSize">Maximum File Size</label>
+				<label for="maximumImageWidth">Resize images down to specified width (in pixels)</label>
+				<input type="text" class="form-control" value="760" data-field="maximumImageWidth" placeholder="760">
+				<p class="help-block">
+					(in pixels, default: 760 pixels, set to 0 to disable)
+				</p>
+			</div>
+
+			<div class="form-group">
+				<label for="maximumFileSize">Maximum File Size (in KiB)</label>
 				<input type="text" class="form-control" value="2048" data-field="maximumFileSize">
+				<p class="help-block">
+					(in kilobytes, default: 2048 KiB)
+				</p>
 			</div>
 
 			<div class="checkbox">
diff --git a/src/views/admin/settings/user.tpl b/src/views/admin/settings/user.tpl
index 55c54149c6..33972e267c 100644
--- a/src/views/admin/settings/user.tpl
+++ b/src/views/admin/settings/user.tpl
@@ -32,26 +32,6 @@
 					<option value="email">Email Only</option>
 				</select>
 			</div>
-
-			<div class="form-group">
-				<label>Registration Type</label>
-				<select class="form-control" data-field="registrationType">
-					<option value="normal">Normal</option>
-					<option value="admin-approval">Admin Approval</option>
-					<option value="invite-only">Invite Only</option>
-					<option value="admin-invite-only">Admin Invite Only</option>
-					<option value="disabled">No registration</option>
-				</select>
-			</div>
-
-			<div class="form-group">
-				<label>Maximum Invitations per User</label>
-				<input type="number" class="form-control" data-field="maximumInvites" placeholder="0">
-				<p class="help-block">
-					0 for no restriction. Admins get infinite invitations<br>
-					Only applicable for "Invite Only"
-				</p>
-			</div>
 		</form>
 	</div>
 </div>
@@ -139,6 +119,31 @@
 	<div class="col-sm-2 col-xs-12 settings-header">User Registration</div>
 	<div class="col-sm-10 col-xs-12">
 		<form>
+			<div class="form-group">
+				<label>Registration Type</label>
+				<select class="form-control" data-field="registrationType">
+					<option value="normal">Normal</option>
+					<option value="admin-approval">Admin Approval</option>
+					<option value="invite-only">Invite Only</option>
+					<option value="admin-invite-only">Admin Invite Only</option>
+					<option value="disabled">No registration</option>
+				</select>
+				<p class="help-block">
+					Normal - Users can register from the /register page.<br/>
+					Admin Approval - User registrations are placed in an <a href="{config.relative_path}/admin/manage/registration">approval queue</a> for administrators.<br/>
+					Invite Only - Users can invite others from the <a href="{config.relative_path}/users" target="_blank">users</a> page.<br/>
+					Admin Invite Only - Only administrators can invite others from <a href="{config.relative_path}/users" target="_blank">users</a> and <a href="{config.relative_path}/admin/manage/users">admin/manage/users</a> pages.<br/>
+					No registration - No user registration.<br/>
+				</p>
+			</div>
+			<div class="form-group">
+				<label>Maximum Invitations per User</label>
+				<input type="number" class="form-control" data-field="maximumInvites" placeholder="0">
+				<p class="help-block">
+					0 for no restriction. Admins get infinite invitations<br>
+					Only applicable for "Invite Only"
+				</p>
+			</div>
 			<div class="form-group">
 				<label>Minimum Username Length</label>
 				<input type="text" class="form-control" value="2" data-field="minimumUsernameLength">
diff --git a/src/views/partials/data/topic.tpl b/src/views/partials/data/topic.tpl
index d7fd1deb50..ea6fea2a3c 100644
--- a/src/views/partials/data/topic.tpl
+++ b/src/views/partials/data/topic.tpl
@@ -1 +1 @@
-data-index="{posts.index}" data-pid="{posts.pid}" data-uid="{posts.uid}" data-username="{posts.user.username}" data-userslug="{posts.user.userslug}" itemscope itemtype="http://schema.org/Comment"
\ No newline at end of file
+data-index="{posts.index}" data-pid="{posts.pid}" data-uid="{posts.uid}" data-timestamp="{posts.timestamp}" data-username="{posts.user.username}" data-userslug="{posts.user.userslug}" itemscope itemtype="http://schema.org/Comment"
\ No newline at end of file
diff --git a/src/views/partials/fontawesome.tpl b/src/views/partials/fontawesome.tpl
index a179bfdd49..4ac0f1e01f 100644
--- a/src/views/partials/fontawesome.tpl
+++ b/src/views/partials/fontawesome.tpl
@@ -4,7 +4,7 @@
 		<input type="text" class="form-control" id="fa-filter" data-action="filter" placeholder="e.g. umbrella" />
 	</div>
 	<div class="row fa-icons">
-		<i class="fa fa-500px"></i> <i class="fa fa-adjust"></i> <i class="fa fa-adn"></i> <i class="fa fa-align-center"></i> <i class="fa fa-align-justify"></i> <i class="fa fa-align-left"></i> <i class="fa fa-align-right"></i> <i class="fa fa-amazon"></i> <i class="fa fa-ambulance"></i> <i class="fa fa-anchor"></i> <i class="fa fa-android"></i> <i class="fa fa-angellist"></i> <i class="fa fa-angle-double-down"></i> <i class="fa fa-angle-double-left"></i> <i class="fa fa-angle-double-right"></i> <i class="fa fa-angle-double-up"></i> <i class="fa fa-angle-down"></i> <i class="fa fa-angle-left"></i> <i class="fa fa-angle-right"></i> <i class="fa fa-angle-up"></i> <i class="fa fa-apple"></i> <i class="fa fa-archive"></i> <i class="fa fa-area-chart"></i> <i class="fa fa-arrow-circle-down"></i> <i class="fa fa-arrow-circle-left"></i> <i class="fa fa-arrow-circle-o-down"></i> <i class="fa fa-arrow-circle-o-left"></i> <i class="fa fa-arrow-circle-o-right"></i> <i class="fa fa-arrow-circle-o-up"></i> <i class="fa fa-arrow-circle-right"></i> <i class="fa fa-arrow-circle-up"></i> <i class="fa fa-arrow-down"></i> <i class="fa fa-arrow-left"></i> <i class="fa fa-arrow-right"></i> <i class="fa fa-arrow-up"></i> <i class="fa fa-arrows"></i> <i class="fa fa-arrows-alt"></i> <i class="fa fa-arrows-h"></i> <i class="fa fa-arrows-v"></i> <i class="fa fa-asterisk"></i> <i class="fa fa-at"></i> <i class="fa fa-automobile"></i> <i class="fa fa-backward"></i> <i class="fa fa-balance-scale"></i> <i class="fa fa-ban"></i> <i class="fa fa-bank"></i> <i class="fa fa-bar-chart"></i> <i class="fa fa-bar-chart-o"></i> <i class="fa fa-barcode"></i> <i class="fa fa-bars"></i> <i class="fa fa-battery-0"></i> <i class="fa fa-battery-1"></i> <i class="fa fa-battery-2"></i> <i class="fa fa-battery-3"></i> <i class="fa fa-battery-4"></i> <i class="fa fa-battery-empty"></i> <i class="fa fa-battery-full"></i> <i class="fa fa-battery-half"></i> <i class="fa fa-battery-quarter"></i> <i class="fa fa-battery-three-quarters"></i> <i class="fa fa-bed"></i> <i class="fa fa-beer"></i> <i class="fa fa-behance"></i> <i class="fa fa-behance-square"></i> <i class="fa fa-bell"></i> <i class="fa fa-bell-o"></i> <i class="fa fa-bell-slash"></i> <i class="fa fa-bell-slash-o"></i> <i class="fa fa-bicycle"></i> <i class="fa fa-binoculars"></i> <i class="fa fa-birthday-cake"></i> <i class="fa fa-bitbucket"></i> <i class="fa fa-bitbucket-square"></i> <i class="fa fa-bitcoin"></i> <i class="fa fa-black-tie"></i> <i class="fa fa-bluetooth"></i> <i class="fa fa-bluetooth-b"></i> <i class="fa fa-bold"></i> <i class="fa fa-bolt"></i> <i class="fa fa-bomb"></i> <i class="fa fa-book"></i> <i class="fa fa-bookmark"></i> <i class="fa fa-bookmark-o"></i> <i class="fa fa-briefcase"></i> <i class="fa fa-btc"></i> <i class="fa fa-bug"></i> <i class="fa fa-building"></i> <i class="fa fa-building-o"></i> <i class="fa fa-bullhorn"></i> <i class="fa fa-bullseye"></i> <i class="fa fa-bus"></i> <i class="fa fa-buysellads"></i> <i class="fa fa-cab"></i> <i class="fa fa-calculator"></i> <i class="fa fa-calendar"></i> <i class="fa fa-calendar-check-o"></i> <i class="fa fa-calendar-minus-o"></i> <i class="fa fa-calendar-o"></i> <i class="fa fa-calendar-plus-o"></i> <i class="fa fa-calendar-times-o"></i> <i class="fa fa-camera"></i> <i class="fa fa-camera-retro"></i> <i class="fa fa-car"></i> <i class="fa fa-caret-down"></i> <i class="fa fa-caret-left"></i> <i class="fa fa-caret-right"></i> <i class="fa fa-caret-square-o-down"></i> <i class="fa fa-caret-square-o-left"></i> <i class="fa fa-caret-square-o-right"></i> <i class="fa fa-caret-square-o-up"></i> <i class="fa fa-caret-up"></i> <i class="fa fa-cart-arrow-down"></i> <i class="fa fa-cart-plus"></i> <i class="fa fa-cc"></i> <i class="fa fa-cc-amex"></i> <i class="fa fa-cc-diners-club"></i> <i class="fa fa-cc-discover"></i> <i class="fa fa-cc-jcb"></i> <i class="fa fa-cc-mastercard"></i> <i class="fa fa-cc-paypal"></i> <i class="fa fa-cc-stripe"></i> <i class="fa fa-cc-visa"></i> <i class="fa fa-certificate"></i> <i class="fa fa-chain"></i> <i class="fa fa-chain-broken"></i> <i class="fa fa-check"></i> <i class="fa fa-check-circle"></i> <i class="fa fa-check-circle-o"></i> <i class="fa fa-check-square"></i> <i class="fa fa-check-square-o"></i> <i class="fa fa-chevron-circle-down"></i> <i class="fa fa-chevron-circle-left"></i> <i class="fa fa-chevron-circle-right"></i> <i class="fa fa-chevron-circle-up"></i> <i class="fa fa-chevron-down"></i> <i class="fa fa-chevron-left"></i> <i class="fa fa-chevron-right"></i> <i class="fa fa-chevron-up"></i> <i class="fa fa-child"></i> <i class="fa fa-chrome"></i> <i class="fa fa-circle"></i> <i class="fa fa-circle-o"></i> <i class="fa fa-circle-o-notch"></i> <i class="fa fa-circle-thin"></i> <i class="fa fa-clipboard"></i> <i class="fa fa-clock-o"></i> <i class="fa fa-clone"></i> <i class="fa fa-close"></i> <i class="fa fa-cloud"></i> <i class="fa fa-cloud-download"></i> <i class="fa fa-cloud-upload"></i> <i class="fa fa-cny"></i> <i class="fa fa-code"></i> <i class="fa fa-code-fork"></i> <i class="fa fa-codepen"></i> <i class="fa fa-codiepie"></i> <i class="fa fa-coffee"></i> <i class="fa fa-cog"></i> <i class="fa fa-cogs"></i> <i class="fa fa-columns"></i> <i class="fa fa-comment"></i> <i class="fa fa-comment-o"></i> <i class="fa fa-commenting"></i> <i class="fa fa-commenting-o"></i> <i class="fa fa-comments"></i> <i class="fa fa-comments-o"></i> <i class="fa fa-compass"></i> <i class="fa fa-compress"></i> <i class="fa fa-connectdevelop"></i> <i class="fa fa-contao"></i> <i class="fa fa-copy"></i> <i class="fa fa-copyright"></i> <i class="fa fa-creative-commons"></i> <i class="fa fa-credit-card"></i> <i class="fa fa-credit-card-alt"></i> <i class="fa fa-crop"></i> <i class="fa fa-crosshairs"></i> <i class="fa fa-css3"></i> <i class="fa fa-cube"></i> <i class="fa fa-cubes"></i> <i class="fa fa-cut"></i> <i class="fa fa-cutlery"></i> <i class="fa fa-dashboard"></i> <i class="fa fa-dashcube"></i> <i class="fa fa-database"></i> <i class="fa fa-dedent"></i> <i class="fa fa-delicious"></i> <i class="fa fa-desktop"></i> <i class="fa fa-deviantart"></i> <i class="fa fa-diamond"></i> <i class="fa fa-digg"></i> <i class="fa fa-dollar"></i> <i class="fa fa-dot-circle-o"></i> <i class="fa fa-download"></i> <i class="fa fa-dribbble"></i> <i class="fa fa-dropbox"></i> <i class="fa fa-drupal"></i> <i class="fa fa-edge"></i> <i class="fa fa-edit"></i> <i class="fa fa-eject"></i> <i class="fa fa-ellipsis-h"></i> <i class="fa fa-ellipsis-v"></i> <i class="fa fa-empire"></i> <i class="fa fa-envelope"></i> <i class="fa fa-envelope-o"></i> <i class="fa fa-envelope-square"></i> <i class="fa fa-eraser"></i> <i class="fa fa-eur"></i> <i class="fa fa-euro"></i> <i class="fa fa-exchange"></i> <i class="fa fa-exclamation"></i> <i class="fa fa-exclamation-circle"></i> <i class="fa fa-exclamation-triangle"></i> <i class="fa fa-expand"></i> <i class="fa fa-expeditedssl"></i> <i class="fa fa-external-link"></i> <i class="fa fa-external-link-square"></i> <i class="fa fa-eye"></i> <i class="fa fa-eye-slash"></i> <i class="fa fa-eyedropper"></i> <i class="fa fa-facebook"></i> <i class="fa fa-facebook-f"></i> <i class="fa fa-facebook-official"></i> <i class="fa fa-facebook-square"></i> <i class="fa fa-fast-backward"></i> <i class="fa fa-fast-forward"></i> <i class="fa fa-fax"></i> <i class="fa fa-feed"></i> <i class="fa fa-female"></i> <i class="fa fa-fighter-jet"></i> <i class="fa fa-file"></i> <i class="fa fa-file-archive-o"></i> <i class="fa fa-file-audio-o"></i> <i class="fa fa-file-code-o"></i> <i class="fa fa-file-excel-o"></i> <i class="fa fa-file-image-o"></i> <i class="fa fa-file-movie-o"></i> <i class="fa fa-file-o"></i> <i class="fa fa-file-pdf-o"></i> <i class="fa fa-file-photo-o"></i> <i class="fa fa-file-picture-o"></i> <i class="fa fa-file-powerpoint-o"></i> <i class="fa fa-file-sound-o"></i> <i class="fa fa-file-text"></i> <i class="fa fa-file-text-o"></i> <i class="fa fa-file-video-o"></i> <i class="fa fa-file-word-o"></i> <i class="fa fa-file-zip-o"></i> <i class="fa fa-files-o"></i> <i class="fa fa-film"></i> <i class="fa fa-filter"></i> <i class="fa fa-fire"></i> <i class="fa fa-fire-extinguisher"></i> <i class="fa fa-firefox"></i> <i class="fa fa-flag"></i> <i class="fa fa-flag-checkered"></i> <i class="fa fa-flag-o"></i> <i class="fa fa-flash"></i> <i class="fa fa-flask"></i> <i class="fa fa-flickr"></i> <i class="fa fa-floppy-o"></i> <i class="fa fa-folder"></i> <i class="fa fa-folder-o"></i> <i class="fa fa-folder-open"></i> <i class="fa fa-folder-open-o"></i> <i class="fa fa-font"></i> <i class="fa fa-fonticons"></i> <i class="fa fa-fort-awesome"></i> <i class="fa fa-forumbee"></i> <i class="fa fa-forward"></i> <i class="fa fa-foursquare"></i> <i class="fa fa-frown-o"></i> <i class="fa fa-futbol-o"></i> <i class="fa fa-gamepad"></i> <i class="fa fa-gavel"></i> <i class="fa fa-gbp"></i> <i class="fa fa-ge"></i> <i class="fa fa-gear"></i> <i class="fa fa-gears"></i> <i class="fa fa-genderless"></i> <i class="fa fa-get-pocket"></i> <i class="fa fa-gg"></i> <i class="fa fa-gg-circle"></i> <i class="fa fa-gift"></i> <i class="fa fa-git"></i> <i class="fa fa-git-square"></i> <i class="fa fa-github"></i> <i class="fa fa-github-alt"></i> <i class="fa fa-github-square"></i> <i class="fa fa-gittip"></i> <i class="fa fa-glass"></i> <i class="fa fa-globe"></i> <i class="fa fa-google"></i> <i class="fa fa-google-plus"></i> <i class="fa fa-google-plus-square"></i> <i class="fa fa-google-wallet"></i> <i class="fa fa-graduation-cap"></i> <i class="fa fa-gratipay"></i> <i class="fa fa-group"></i> <i class="fa fa-h-square"></i> <i class="fa fa-hacker-news"></i> <i class="fa fa-hand-grab-o"></i> <i class="fa fa-hand-lizard-o"></i> <i class="fa fa-hand-o-down"></i> <i class="fa fa-hand-o-left"></i> <i class="fa fa-hand-o-right"></i> <i class="fa fa-hand-o-up"></i> <i class="fa fa-hand-paper-o"></i> <i class="fa fa-hand-peace-o"></i> <i class="fa fa-hand-pointer-o"></i> <i class="fa fa-hand-rock-o"></i> <i class="fa fa-hand-scissors-o"></i> <i class="fa fa-hand-spock-o"></i> <i class="fa fa-hand-stop-o"></i> <i class="fa fa-hashtag"></i> <i class="fa fa-hdd-o"></i> <i class="fa fa-header"></i> <i class="fa fa-headphones"></i> <i class="fa fa-heart"></i> <i class="fa fa-heart-o"></i> <i class="fa fa-heartbeat"></i> <i class="fa fa-history"></i> <i class="fa fa-home"></i> <i class="fa fa-hospital-o"></i> <i class="fa fa-hotel"></i> <i class="fa fa-hourglass"></i> <i class="fa fa-hourglass-1"></i> <i class="fa fa-hourglass-2"></i> <i class="fa fa-hourglass-3"></i> <i class="fa fa-hourglass-end"></i> <i class="fa fa-hourglass-half"></i> <i class="fa fa-hourglass-o"></i> <i class="fa fa-hourglass-start"></i> <i class="fa fa-houzz"></i> <i class="fa fa-html5"></i> <i class="fa fa-i-cursor"></i> <i class="fa fa-ils"></i> <i class="fa fa-image"></i> <i class="fa fa-inbox"></i> <i class="fa fa-indent"></i> <i class="fa fa-industry"></i> <i class="fa fa-info"></i> <i class="fa fa-info-circle"></i> <i class="fa fa-inr"></i> <i class="fa fa-instagram"></i> <i class="fa fa-institution"></i> <i class="fa fa-internet-explorer"></i> <i class="fa fa-intersex"></i> <i class="fa fa-ioxhost"></i> <i class="fa fa-italic"></i> <i class="fa fa-joomla"></i> <i class="fa fa-jpy"></i> <i class="fa fa-jsfiddle"></i> <i class="fa fa-key"></i> <i class="fa fa-keyboard-o"></i> <i class="fa fa-krw"></i> <i class="fa fa-language"></i> <i class="fa fa-laptop"></i> <i class="fa fa-lastfm"></i> <i class="fa fa-lastfm-square"></i> <i class="fa fa-leaf"></i> <i class="fa fa-leanpub"></i> <i class="fa fa-legal"></i> <i class="fa fa-lemon-o"></i> <i class="fa fa-level-down"></i> <i class="fa fa-level-up"></i> <i class="fa fa-life-bouy"></i> <i class="fa fa-life-buoy"></i> <i class="fa fa-life-ring"></i> <i class="fa fa-life-saver"></i> <i class="fa fa-lightbulb-o"></i> <i class="fa fa-line-chart"></i> <i class="fa fa-link"></i> <i class="fa fa-linkedin"></i> <i class="fa fa-linkedin-square"></i> <i class="fa fa-linux"></i> <i class="fa fa-list"></i> <i class="fa fa-list-alt"></i> <i class="fa fa-list-ol"></i> <i class="fa fa-list-ul"></i> <i class="fa fa-location-arrow"></i> <i class="fa fa-lock"></i> <i class="fa fa-long-arrow-down"></i> <i class="fa fa-long-arrow-left"></i> <i class="fa fa-long-arrow-right"></i> <i class="fa fa-long-arrow-up"></i> <i class="fa fa-magic"></i> <i class="fa fa-magnet"></i> <i class="fa fa-mail-forward"></i> <i class="fa fa-mail-reply"></i> <i class="fa fa-mail-reply-all"></i> <i class="fa fa-male"></i> <i class="fa fa-map"></i> <i class="fa fa-map-marker"></i> <i class="fa fa-map-o"></i> <i class="fa fa-map-pin"></i> <i class="fa fa-map-signs"></i> <i class="fa fa-mars"></i> <i class="fa fa-mars-double"></i> <i class="fa fa-mars-stroke"></i> <i class="fa fa-mars-stroke-h"></i> <i class="fa fa-mars-stroke-v"></i> <i class="fa fa-maxcdn"></i> <i class="fa fa-meanpath"></i> <i class="fa fa-medium"></i> <i class="fa fa-medkit"></i> <i class="fa fa-meh-o"></i> <i class="fa fa-mercury"></i> <i class="fa fa-microphone"></i> <i class="fa fa-microphone-slash"></i> <i class="fa fa-minus"></i> <i class="fa fa-minus-circle"></i> <i class="fa fa-minus-square"></i> <i class="fa fa-minus-square-o"></i> <i class="fa fa-mixcloud"></i> <i class="fa fa-mobile"></i> <i class="fa fa-mobile-phone"></i> <i class="fa fa-modx"></i> <i class="fa fa-money"></i> <i class="fa fa-moon-o"></i> <i class="fa fa-mortar-board"></i> <i class="fa fa-motorcycle"></i> <i class="fa fa-mouse-pointer"></i> <i class="fa fa-music"></i> <i class="fa fa-navicon"></i> <i class="fa fa-neuter"></i> <i class="fa fa-newspaper-o"></i> <i class="fa fa-object-group"></i> <i class="fa fa-object-ungroup"></i> <i class="fa fa-odnoklassniki"></i> <i class="fa fa-odnoklassniki-square"></i> <i class="fa fa-opencart"></i> <i class="fa fa-openid"></i> <i class="fa fa-opera"></i> <i class="fa fa-optin-monster"></i> <i class="fa fa-outdent"></i> <i class="fa fa-pagelines"></i> <i class="fa fa-paint-brush"></i> <i class="fa fa-paper-plane"></i> <i class="fa fa-paper-plane-o"></i> <i class="fa fa-paperclip"></i> <i class="fa fa-paragraph"></i> <i class="fa fa-paste"></i> <i class="fa fa-pause"></i> <i class="fa fa-pause-circle"></i> <i class="fa fa-pause-circle-o"></i> <i class="fa fa-paw"></i> <i class="fa fa-paypal"></i> <i class="fa fa-pencil"></i> <i class="fa fa-pencil-square"></i> <i class="fa fa-pencil-square-o"></i> <i class="fa fa-percent"></i> <i class="fa fa-phone"></i> <i class="fa fa-phone-square"></i> <i class="fa fa-photo"></i> <i class="fa fa-picture-o"></i> <i class="fa fa-pie-chart"></i> <i class="fa fa-pied-piper"></i> <i class="fa fa-pied-piper-alt"></i> <i class="fa fa-pinterest"></i> <i class="fa fa-pinterest-p"></i> <i class="fa fa-pinterest-square"></i> <i class="fa fa-plane"></i> <i class="fa fa-play"></i> <i class="fa fa-play-circle"></i> <i class="fa fa-play-circle-o"></i> <i class="fa fa-plug"></i> <i class="fa fa-plus"></i> <i class="fa fa-plus-circle"></i> <i class="fa fa-plus-square"></i> <i class="fa fa-plus-square-o"></i> <i class="fa fa-power-off"></i> <i class="fa fa-print"></i> <i class="fa fa-product-hunt"></i> <i class="fa fa-puzzle-piece"></i> <i class="fa fa-qq"></i> <i class="fa fa-qrcode"></i> <i class="fa fa-question"></i> <i class="fa fa-question-circle"></i> <i class="fa fa-quote-left"></i> <i class="fa fa-quote-right"></i> <i class="fa fa-ra"></i> <i class="fa fa-random"></i> <i class="fa fa-rebel"></i> <i class="fa fa-recycle"></i> <i class="fa fa-reddit"></i> <i class="fa fa-reddit-alien"></i> <i class="fa fa-reddit-square"></i> <i class="fa fa-refresh"></i> <i class="fa fa-registered"></i> <i class="fa fa-remove"></i> <i class="fa fa-renren"></i> <i class="fa fa-reorder"></i> <i class="fa fa-repeat"></i> <i class="fa fa-reply"></i> <i class="fa fa-reply-all"></i> <i class="fa fa-retweet"></i> <i class="fa fa-rmb"></i> <i class="fa fa-road"></i> <i class="fa fa-rocket"></i> <i class="fa fa-rotate-left"></i> <i class="fa fa-rotate-right"></i> <i class="fa fa-rouble"></i> <i class="fa fa-rss"></i> <i class="fa fa-rss-square"></i> <i class="fa fa-rub"></i> <i class="fa fa-ruble"></i> <i class="fa fa-rupee"></i> <i class="fa fa-safari"></i> <i class="fa fa-save"></i> <i class="fa fa-scissors"></i> <i class="fa fa-scribd"></i> <i class="fa fa-search"></i> <i class="fa fa-search-minus"></i> <i class="fa fa-search-plus"></i> <i class="fa fa-sellsy"></i> <i class="fa fa-send"></i> <i class="fa fa-send-o"></i> <i class="fa fa-server"></i> <i class="fa fa-share"></i> <i class="fa fa-share-alt"></i> <i class="fa fa-share-alt-square"></i> <i class="fa fa-share-square"></i> <i class="fa fa-share-square-o"></i> <i class="fa fa-shekel"></i> <i class="fa fa-sheqel"></i> <i class="fa fa-shield"></i> <i class="fa fa-ship"></i> <i class="fa fa-shirtsinbulk"></i> <i class="fa fa-shopping-bag"></i> <i class="fa fa-shopping-basket"></i> <i class="fa fa-shopping-cart"></i> <i class="fa fa-sign-in"></i> <i class="fa fa-sign-out"></i> <i class="fa fa-signal"></i> <i class="fa fa-simplybuilt"></i> <i class="fa fa-sitemap"></i> <i class="fa fa-skyatlas"></i> <i class="fa fa-skype"></i> <i class="fa fa-slack"></i> <i class="fa fa-sliders"></i> <i class="fa fa-slideshare"></i> <i class="fa fa-smile-o"></i> <i class="fa fa-soccer-ball-o"></i> <i class="fa fa-sort"></i> <i class="fa fa-sort-alpha-asc"></i> <i class="fa fa-sort-alpha-desc"></i> <i class="fa fa-sort-amount-asc"></i> <i class="fa fa-sort-amount-desc"></i> <i class="fa fa-sort-asc"></i> <i class="fa fa-sort-desc"></i> <i class="fa fa-sort-down"></i> <i class="fa fa-sort-numeric-asc"></i> <i class="fa fa-sort-numeric-desc"></i> <i class="fa fa-sort-up"></i> <i class="fa fa-soundcloud"></i> <i class="fa fa-space-shuttle"></i> <i class="fa fa-spinner"></i> <i class="fa fa-spoon"></i> <i class="fa fa-spotify"></i> <i class="fa fa-square"></i> <i class="fa fa-square-o"></i> <i class="fa fa-stack-exchange"></i> <i class="fa fa-stack-overflow"></i> <i class="fa fa-star"></i> <i class="fa fa-star-half"></i> <i class="fa fa-star-half-empty"></i> <i class="fa fa-star-half-full"></i> <i class="fa fa-star-half-o"></i> <i class="fa fa-star-o"></i> <i class="fa fa-steam"></i> <i class="fa fa-steam-square"></i> <i class="fa fa-step-backward"></i> <i class="fa fa-step-forward"></i> <i class="fa fa-stethoscope"></i> <i class="fa fa-sticky-note"></i> <i class="fa fa-sticky-note-o"></i> <i class="fa fa-stop"></i> <i class="fa fa-stop-circle"></i> <i class="fa fa-stop-circle-o"></i> <i class="fa fa-street-view"></i> <i class="fa fa-strikethrough"></i> <i class="fa fa-stumbleupon"></i> <i class="fa fa-stumbleupon-circle"></i> <i class="fa fa-subscript"></i> <i class="fa fa-subway"></i> <i class="fa fa-suitcase"></i> <i class="fa fa-sun-o"></i> <i class="fa fa-superscript"></i> <i class="fa fa-support"></i> <i class="fa fa-table"></i> <i class="fa fa-tablet"></i> <i class="fa fa-tachometer"></i> <i class="fa fa-tag"></i> <i class="fa fa-tags"></i> <i class="fa fa-tasks"></i> <i class="fa fa-taxi"></i> <i class="fa fa-television"></i> <i class="fa fa-tencent-weibo"></i> <i class="fa fa-terminal"></i> <i class="fa fa-text-height"></i> <i class="fa fa-text-width"></i> <i class="fa fa-th"></i> <i class="fa fa-th-large"></i> <i class="fa fa-th-list"></i> <i class="fa fa-thumb-tack"></i> <i class="fa fa-thumbs-down"></i> <i class="fa fa-thumbs-o-down"></i> <i class="fa fa-thumbs-o-up"></i> <i class="fa fa-thumbs-up"></i> <i class="fa fa-ticket"></i> <i class="fa fa-times"></i> <i class="fa fa-times-circle"></i> <i class="fa fa-times-circle-o"></i> <i class="fa fa-tint"></i> <i class="fa fa-toggle-down"></i> <i class="fa fa-toggle-left"></i> <i class="fa fa-toggle-off"></i> <i class="fa fa-toggle-on"></i> <i class="fa fa-toggle-right"></i> <i class="fa fa-toggle-up"></i> <i class="fa fa-trademark"></i> <i class="fa fa-train"></i> <i class="fa fa-transgender"></i> <i class="fa fa-transgender-alt"></i> <i class="fa fa-trash"></i> <i class="fa fa-trash-o"></i> <i class="fa fa-tree"></i> <i class="fa fa-trello"></i> <i class="fa fa-tripadvisor"></i> <i class="fa fa-trophy"></i> <i class="fa fa-truck"></i> <i class="fa fa-try"></i> <i class="fa fa-tty"></i> <i class="fa fa-tumblr"></i> <i class="fa fa-tumblr-square"></i> <i class="fa fa-turkish-lira"></i> <i class="fa fa-tv"></i> <i class="fa fa-twitch"></i> <i class="fa fa-twitter"></i> <i class="fa fa-twitter-square"></i> <i class="fa fa-umbrella"></i> <i class="fa fa-underline"></i> <i class="fa fa-undo"></i> <i class="fa fa-university"></i> <i class="fa fa-unlink"></i> <i class="fa fa-unlock"></i> <i class="fa fa-unlock-alt"></i> <i class="fa fa-unsorted"></i> <i class="fa fa-upload"></i> <i class="fa fa-usb"></i> <i class="fa fa-usd"></i> <i class="fa fa-user"></i> <i class="fa fa-user-md"></i> <i class="fa fa-user-plus"></i> <i class="fa fa-user-secret"></i> <i class="fa fa-user-times"></i> <i class="fa fa-users"></i> <i class="fa fa-venus"></i> <i class="fa fa-venus-double"></i> <i class="fa fa-venus-mars"></i> <i class="fa fa-viacoin"></i> <i class="fa fa-video-camera"></i> <i class="fa fa-vimeo"></i> <i class="fa fa-vimeo-square"></i> <i class="fa fa-vine"></i> <i class="fa fa-vk"></i> <i class="fa fa-volume-down"></i> <i class="fa fa-volume-off"></i> <i class="fa fa-volume-up"></i> <i class="fa fa-warning"></i> <i class="fa fa-wechat"></i> <i class="fa fa-weibo"></i> <i class="fa fa-weixin"></i> <i class="fa fa-whatsapp"></i> <i class="fa fa-wheelchair"></i> <i class="fa fa-wifi"></i> <i class="fa fa-wikipedia-w"></i> <i class="fa fa-windows"></i> <i class="fa fa-won"></i> <i class="fa fa-wordpress"></i> <i class="fa fa-wrench"></i> <i class="fa fa-xing"></i> <i class="fa fa-xing-square"></i> <i class="fa fa-y-combinator"></i> <i class="fa fa-y-combinator-square"></i> <i class="fa fa-yahoo"></i> <i class="fa fa-yc"></i> <i class="fa fa-yc-square"></i> <i class="fa fa-yelp"></i> <i class="fa fa-yen"></i> <i class="fa fa-youtube"></i> <i class="fa fa-youtube-play"></i> <i class="fa fa-youtube-square"></i>
+		<i class="fa fa-500px"></i><i class="fa fa-adjust"></i><i class="fa fa-adn"></i><i class="fa fa-align-center"></i><i class="fa fa-align-justify"></i><i class="fa fa-align-left"></i><i class="fa fa-align-right"></i><i class="fa fa-amazon"></i><i class="fa fa-ambulance"></i><i class="fa fa-american-sign-language-interpreting"></i><i class="fa fa-anchor"></i><i class="fa fa-android"></i><i class="fa fa-angellist"></i><i class="fa fa-angle-double-down"></i><i class="fa fa-angle-double-left"></i><i class="fa fa-angle-double-right"></i><i class="fa fa-angle-double-up"></i><i class="fa fa-angle-down"></i><i class="fa fa-angle-left"></i><i class="fa fa-angle-right"></i><i class="fa fa-angle-up"></i><i class="fa fa-apple"></i><i class="fa fa-archive"></i><i class="fa fa-area-chart"></i><i class="fa fa-arrow-circle-down"></i><i class="fa fa-arrow-circle-left"></i><i class="fa fa-arrow-circle-o-down"></i><i class="fa fa-arrow-circle-o-left"></i><i class="fa fa-arrow-circle-o-right"></i><i class="fa fa-arrow-circle-o-up"></i><i class="fa fa-arrow-circle-right"></i><i class="fa fa-arrow-circle-up"></i><i class="fa fa-arrow-down"></i><i class="fa fa-arrow-left"></i><i class="fa fa-arrow-right"></i><i class="fa fa-arrow-up"></i><i class="fa fa-arrows"></i><i class="fa fa-arrows-alt"></i><i class="fa fa-arrows-h"></i><i class="fa fa-arrows-v"></i><i class="fa fa-asl-interpreting"></i><i class="fa fa-assistive-listening-systems"></i><i class="fa fa-asterisk"></i><i class="fa fa-at"></i><i class="fa fa-audio-description"></i><i class="fa fa-automobile"></i><i class="fa fa-backward"></i><i class="fa fa-balance-scale"></i><i class="fa fa-ban"></i><i class="fa fa-bank"></i><i class="fa fa-bar-chart"></i><i class="fa fa-bar-chart-o"></i><i class="fa fa-barcode"></i><i class="fa fa-bars"></i><i class="fa fa-battery-0"></i><i class="fa fa-battery-1"></i><i class="fa fa-battery-2"></i><i class="fa fa-battery-3"></i><i class="fa fa-battery-4"></i><i class="fa fa-battery-empty"></i><i class="fa fa-battery-full"></i><i class="fa fa-battery-half"></i><i class="fa fa-battery-quarter"></i><i class="fa fa-battery-three-quarters"></i><i class="fa fa-bed"></i><i class="fa fa-beer"></i><i class="fa fa-behance"></i><i class="fa fa-behance-square"></i><i class="fa fa-bell"></i><i class="fa fa-bell-o"></i><i class="fa fa-bell-slash"></i><i class="fa fa-bell-slash-o"></i><i class="fa fa-bicycle"></i><i class="fa fa-binoculars"></i><i class="fa fa-birthday-cake"></i><i class="fa fa-bitbucket"></i><i class="fa fa-bitbucket-square"></i><i class="fa fa-bitcoin"></i><i class="fa fa-black-tie"></i><i class="fa fa-blind"></i><i class="fa fa-bluetooth"></i><i class="fa fa-bluetooth-b"></i><i class="fa fa-bold"></i><i class="fa fa-bolt"></i><i class="fa fa-bomb"></i><i class="fa fa-book"></i><i class="fa fa-bookmark"></i><i class="fa fa-bookmark-o"></i><i class="fa fa-braille"></i><i class="fa fa-briefcase"></i><i class="fa fa-btc"></i><i class="fa fa-bug"></i><i class="fa fa-building"></i><i class="fa fa-building-o"></i><i class="fa fa-bullhorn"></i><i class="fa fa-bullseye"></i><i class="fa fa-bus"></i><i class="fa fa-buysellads"></i><i class="fa fa-cab"></i><i class="fa fa-calculator"></i><i class="fa fa-calendar"></i><i class="fa fa-calendar-check-o"></i><i class="fa fa-calendar-minus-o"></i><i class="fa fa-calendar-o"></i><i class="fa fa-calendar-plus-o"></i><i class="fa fa-calendar-times-o"></i><i class="fa fa-camera"></i><i class="fa fa-camera-retro"></i><i class="fa fa-car"></i><i class="fa fa-caret-down"></i><i class="fa fa-caret-left"></i><i class="fa fa-caret-right"></i><i class="fa fa-caret-square-o-down"></i><i class="fa fa-caret-square-o-left"></i><i class="fa fa-caret-square-o-right"></i><i class="fa fa-caret-square-o-up"></i><i class="fa fa-caret-up"></i><i class="fa fa-cart-arrow-down"></i><i class="fa fa-cart-plus"></i><i class="fa fa-cc"></i><i class="fa fa-cc-amex"></i><i class="fa fa-cc-diners-club"></i><i class="fa fa-cc-discover"></i><i class="fa fa-cc-jcb"></i><i class="fa fa-cc-mastercard"></i><i class="fa fa-cc-paypal"></i><i class="fa fa-cc-stripe"></i><i class="fa fa-cc-visa"></i><i class="fa fa-certificate"></i><i class="fa fa-chain"></i><i class="fa fa-chain-broken"></i><i class="fa fa-check"></i><i class="fa fa-check-circle"></i><i class="fa fa-check-circle-o"></i><i class="fa fa-check-square"></i><i class="fa fa-check-square-o"></i><i class="fa fa-chevron-circle-down"></i><i class="fa fa-chevron-circle-left"></i><i class="fa fa-chevron-circle-right"></i><i class="fa fa-chevron-circle-up"></i><i class="fa fa-chevron-down"></i><i class="fa fa-chevron-left"></i><i class="fa fa-chevron-right"></i><i class="fa fa-chevron-up"></i><i class="fa fa-child"></i><i class="fa fa-chrome"></i><i class="fa fa-circle"></i><i class="fa fa-circle-o"></i><i class="fa fa-circle-o-notch"></i><i class="fa fa-circle-thin"></i><i class="fa fa-clipboard"></i><i class="fa fa-clock-o"></i><i class="fa fa-clone"></i><i class="fa fa-close"></i><i class="fa fa-cloud"></i><i class="fa fa-cloud-download"></i><i class="fa fa-cloud-upload"></i><i class="fa fa-cny"></i><i class="fa fa-code"></i><i class="fa fa-code-fork"></i><i class="fa fa-codepen"></i><i class="fa fa-codiepie"></i><i class="fa fa-coffee"></i><i class="fa fa-cog"></i><i class="fa fa-cogs"></i><i class="fa fa-columns"></i><i class="fa fa-comment"></i><i class="fa fa-comment-o"></i><i class="fa fa-commenting"></i><i class="fa fa-commenting-o"></i><i class="fa fa-comments"></i><i class="fa fa-comments-o"></i><i class="fa fa-compass"></i><i class="fa fa-compress"></i><i class="fa fa-connectdevelop"></i><i class="fa fa-contao"></i><i class="fa fa-copy"></i><i class="fa fa-copyright"></i><i class="fa fa-creative-commons"></i><i class="fa fa-credit-card"></i><i class="fa fa-credit-card-alt"></i><i class="fa fa-crop"></i><i class="fa fa-crosshairs"></i><i class="fa fa-css3"></i><i class="fa fa-cube"></i><i class="fa fa-cubes"></i><i class="fa fa-cut"></i><i class="fa fa-cutlery"></i><i class="fa fa-dashboard"></i><i class="fa fa-dashcube"></i><i class="fa fa-database"></i><i class="fa fa-deaf"></i><i class="fa fa-deafness"></i><i class="fa fa-dedent"></i><i class="fa fa-delicious"></i><i class="fa fa-desktop"></i><i class="fa fa-deviantart"></i><i class="fa fa-diamond"></i><i class="fa fa-digg"></i><i class="fa fa-dollar"></i><i class="fa fa-dot-circle-o"></i><i class="fa fa-download"></i><i class="fa fa-dribbble"></i><i class="fa fa-dropbox"></i><i class="fa fa-drupal"></i><i class="fa fa-edge"></i><i class="fa fa-edit"></i><i class="fa fa-eject"></i><i class="fa fa-ellipsis-h"></i><i class="fa fa-ellipsis-v"></i><i class="fa fa-empire"></i><i class="fa fa-envelope"></i><i class="fa fa-envelope-o"></i><i class="fa fa-envelope-square"></i><i class="fa fa-envira"></i><i class="fa fa-eraser"></i><i class="fa fa-eur"></i><i class="fa fa-euro"></i><i class="fa fa-exchange"></i><i class="fa fa-exclamation"></i><i class="fa fa-exclamation-circle"></i><i class="fa fa-exclamation-triangle"></i><i class="fa fa-expand"></i><i class="fa fa-expeditedssl"></i><i class="fa fa-external-link"></i><i class="fa fa-external-link-square"></i><i class="fa fa-eye"></i><i class="fa fa-eye-slash"></i><i class="fa fa-eyedropper"></i><i class="fa fa-facebook"></i><i class="fa fa-facebook-f"></i><i class="fa fa-facebook-official"></i><i class="fa fa-facebook-square"></i><i class="fa fa-fast-backward"></i><i class="fa fa-fast-forward"></i><i class="fa fa-fax"></i><i class="fa fa-feed"></i><i class="fa fa-female"></i><i class="fa fa-fighter-jet"></i><i class="fa fa-file"></i><i class="fa fa-file-archive-o"></i><i class="fa fa-file-audio-o"></i><i class="fa fa-file-code-o"></i><i class="fa fa-file-excel-o"></i><i class="fa fa-file-image-o"></i><i class="fa fa-file-movie-o"></i><i class="fa fa-file-o"></i><i class="fa fa-file-pdf-o"></i><i class="fa fa-file-photo-o"></i><i class="fa fa-file-picture-o"></i><i class="fa fa-file-powerpoint-o"></i><i class="fa fa-file-sound-o"></i><i class="fa fa-file-text"></i><i class="fa fa-file-text-o"></i><i class="fa fa-file-video-o"></i><i class="fa fa-file-word-o"></i><i class="fa fa-file-zip-o"></i><i class="fa fa-files-o"></i><i class="fa fa-film"></i><i class="fa fa-filter"></i><i class="fa fa-fire"></i><i class="fa fa-fire-extinguisher"></i><i class="fa fa-firefox"></i><i class="fa fa-first-order"></i><i class="fa fa-flag"></i><i class="fa fa-flag-checkered"></i><i class="fa fa-flag-o"></i><i class="fa fa-flash"></i><i class="fa fa-flask"></i><i class="fa fa-flickr"></i><i class="fa fa-floppy-o"></i><i class="fa fa-folder"></i><i class="fa fa-folder-o"></i><i class="fa fa-folder-open"></i><i class="fa fa-folder-open-o"></i><i class="fa fa-font"></i><i class="fa fa-fonticons"></i><i class="fa fa-fort-awesome"></i><i class="fa fa-forumbee"></i><i class="fa fa-forward"></i><i class="fa fa-foursquare"></i><i class="fa fa-frown-o"></i><i class="fa fa-futbol-o"></i><i class="fa fa-gamepad"></i><i class="fa fa-gavel"></i><i class="fa fa-gbp"></i><i class="fa fa-ge"></i><i class="fa fa-gear"></i><i class="fa fa-gears"></i><i class="fa fa-genderless"></i><i class="fa fa-get-pocket"></i><i class="fa fa-gg"></i><i class="fa fa-gg-circle"></i><i class="fa fa-gift"></i><i class="fa fa-git"></i><i class="fa fa-git-square"></i><i class="fa fa-github"></i><i class="fa fa-github-alt"></i><i class="fa fa-github-square"></i><i class="fa fa-gitlab"></i><i class="fa fa-gittip"></i><i class="fa fa-glass"></i><i class="fa fa-glide"></i><i class="fa fa-glide-g"></i><i class="fa fa-globe"></i><i class="fa fa-google"></i><i class="fa fa-google-plus"></i><i class="fa fa-google-plus-square"></i><i class="fa fa-google-wallet"></i><i class="fa fa-graduation-cap"></i><i class="fa fa-gratipay"></i><i class="fa fa-group"></i><i class="fa fa-h-square"></i><i class="fa fa-hacker-news"></i><i class="fa fa-hand-grab-o"></i><i class="fa fa-hand-lizard-o"></i><i class="fa fa-hand-o-down"></i><i class="fa fa-hand-o-left"></i><i class="fa fa-hand-o-right"></i><i class="fa fa-hand-o-up"></i><i class="fa fa-hand-paper-o"></i><i class="fa fa-hand-peace-o"></i><i class="fa fa-hand-pointer-o"></i><i class="fa fa-hand-rock-o"></i><i class="fa fa-hand-scissors-o"></i><i class="fa fa-hand-spock-o"></i><i class="fa fa-hand-stop-o"></i><i class="fa fa-hard-of-hearing"></i><i class="fa fa-hashtag"></i><i class="fa fa-hdd-o"></i><i class="fa fa-header"></i><i class="fa fa-headphones"></i><i class="fa fa-heart"></i><i class="fa fa-heart-o"></i><i class="fa fa-heartbeat"></i><i class="fa fa-history"></i><i class="fa fa-home"></i><i class="fa fa-hospital-o"></i><i class="fa fa-hotel"></i><i class="fa fa-hourglass"></i><i class="fa fa-hourglass-1"></i><i class="fa fa-hourglass-2"></i><i class="fa fa-hourglass-3"></i><i class="fa fa-hourglass-end"></i><i class="fa fa-hourglass-half"></i><i class="fa fa-hourglass-o"></i><i class="fa fa-hourglass-start"></i><i class="fa fa-houzz"></i><i class="fa fa-html5"></i><i class="fa fa-i-cursor"></i><i class="fa fa-ils"></i><i class="fa fa-image"></i><i class="fa fa-inbox"></i><i class="fa fa-indent"></i><i class="fa fa-industry"></i><i class="fa fa-info"></i><i class="fa fa-info-circle"></i><i class="fa fa-inr"></i><i class="fa fa-instagram"></i><i class="fa fa-institution"></i><i class="fa fa-internet-explorer"></i><i class="fa fa-intersex"></i><i class="fa fa-ioxhost"></i><i class="fa fa-italic"></i><i class="fa fa-joomla"></i><i class="fa fa-jpy"></i><i class="fa fa-jsfiddle"></i><i class="fa fa-key"></i><i class="fa fa-keyboard-o"></i><i class="fa fa-krw"></i><i class="fa fa-language"></i><i class="fa fa-laptop"></i><i class="fa fa-lastfm"></i><i class="fa fa-lastfm-square"></i><i class="fa fa-leaf"></i><i class="fa fa-leanpub"></i><i class="fa fa-legal"></i><i class="fa fa-lemon-o"></i><i class="fa fa-level-down"></i><i class="fa fa-level-up"></i><i class="fa fa-life-bouy"></i><i class="fa fa-life-buoy"></i><i class="fa fa-life-ring"></i><i class="fa fa-life-saver"></i><i class="fa fa-lightbulb-o"></i><i class="fa fa-line-chart"></i><i class="fa fa-link"></i><i class="fa fa-linkedin"></i><i class="fa fa-linkedin-square"></i><i class="fa fa-linux"></i><i class="fa fa-list"></i><i class="fa fa-list-alt"></i><i class="fa fa-list-ol"></i><i class="fa fa-list-ul"></i><i class="fa fa-location-arrow"></i><i class="fa fa-lock"></i><i class="fa fa-long-arrow-down"></i><i class="fa fa-long-arrow-left"></i><i class="fa fa-long-arrow-right"></i><i class="fa fa-long-arrow-up"></i><i class="fa fa-low-vision"></i><i class="fa fa-magic"></i><i class="fa fa-magnet"></i><i class="fa fa-mail-forward"></i><i class="fa fa-mail-reply"></i><i class="fa fa-mail-reply-all"></i><i class="fa fa-male"></i><i class="fa fa-map"></i><i class="fa fa-map-marker"></i><i class="fa fa-map-o"></i><i class="fa fa-map-pin"></i><i class="fa fa-map-signs"></i><i class="fa fa-mars"></i><i class="fa fa-mars-double"></i><i class="fa fa-mars-stroke"></i><i class="fa fa-mars-stroke-h"></i><i class="fa fa-mars-stroke-v"></i><i class="fa fa-maxcdn"></i><i class="fa fa-meanpath"></i><i class="fa fa-medium"></i><i class="fa fa-medkit"></i><i class="fa fa-meh-o"></i><i class="fa fa-mercury"></i><i class="fa fa-microphone"></i><i class="fa fa-microphone-slash"></i><i class="fa fa-minus"></i><i class="fa fa-minus-circle"></i><i class="fa fa-minus-square"></i><i class="fa fa-minus-square-o"></i><i class="fa fa-mixcloud"></i><i class="fa fa-mobile"></i><i class="fa fa-mobile-phone"></i><i class="fa fa-modx"></i><i class="fa fa-money"></i><i class="fa fa-moon-o"></i><i class="fa fa-mortar-board"></i><i class="fa fa-motorcycle"></i><i class="fa fa-mouse-pointer"></i><i class="fa fa-music"></i><i class="fa fa-navicon"></i><i class="fa fa-neuter"></i><i class="fa fa-newspaper-o"></i><i class="fa fa-object-group"></i><i class="fa fa-object-ungroup"></i><i class="fa fa-odnoklassniki"></i><i class="fa fa-odnoklassniki-square"></i><i class="fa fa-opencart"></i><i class="fa fa-openid"></i><i class="fa fa-opera"></i><i class="fa fa-optin-monster"></i><i class="fa fa-outdent"></i><i class="fa fa-pagelines"></i><i class="fa fa-paint-brush"></i><i class="fa fa-paper-plane"></i><i class="fa fa-paper-plane-o"></i><i class="fa fa-paperclip"></i><i class="fa fa-paragraph"></i><i class="fa fa-paste"></i><i class="fa fa-pause"></i><i class="fa fa-pause-circle"></i><i class="fa fa-pause-circle-o"></i><i class="fa fa-paw"></i><i class="fa fa-paypal"></i><i class="fa fa-pencil"></i><i class="fa fa-pencil-square"></i><i class="fa fa-pencil-square-o"></i><i class="fa fa-percent"></i><i class="fa fa-phone"></i><i class="fa fa-phone-square"></i><i class="fa fa-photo"></i><i class="fa fa-picture-o"></i><i class="fa fa-pie-chart"></i><i class="fa fa-pied-piper"></i><i class="fa fa-pied-piper-alt"></i><i class="fa fa-pied-piper-pp"></i><i class="fa fa-pinterest"></i><i class="fa fa-pinterest-p"></i><i class="fa fa-pinterest-square"></i><i class="fa fa-plane"></i><i class="fa fa-play"></i><i class="fa fa-play-circle"></i><i class="fa fa-play-circle-o"></i><i class="fa fa-plug"></i><i class="fa fa-plus"></i><i class="fa fa-plus-circle"></i><i class="fa fa-plus-square"></i><i class="fa fa-plus-square-o"></i><i class="fa fa-power-off"></i><i class="fa fa-print"></i><i class="fa fa-product-hunt"></i><i class="fa fa-puzzle-piece"></i><i class="fa fa-qq"></i><i class="fa fa-qrcode"></i><i class="fa fa-question"></i><i class="fa fa-question-circle"></i><i class="fa fa-question-circle-o"></i><i class="fa fa-quote-left"></i><i class="fa fa-quote-right"></i><i class="fa fa-ra"></i><i class="fa fa-random"></i><i class="fa fa-rebel"></i><i class="fa fa-recycle"></i><i class="fa fa-reddit"></i><i class="fa fa-reddit-alien"></i><i class="fa fa-reddit-square"></i><i class="fa fa-refresh"></i><i class="fa fa-registered"></i><i class="fa fa-remove"></i><i class="fa fa-renren"></i><i class="fa fa-reorder"></i><i class="fa fa-repeat"></i><i class="fa fa-reply"></i><i class="fa fa-reply-all"></i><i class="fa fa-resistance"></i><i class="fa fa-retweet"></i><i class="fa fa-rmb"></i><i class="fa fa-road"></i><i class="fa fa-rocket"></i><i class="fa fa-rotate-left"></i><i class="fa fa-rotate-right"></i><i class="fa fa-rouble"></i><i class="fa fa-rss"></i><i class="fa fa-rss-square"></i><i class="fa fa-rub"></i><i class="fa fa-ruble"></i><i class="fa fa-rupee"></i><i class="fa fa-safari"></i><i class="fa fa-save"></i><i class="fa fa-scissors"></i><i class="fa fa-scribd"></i><i class="fa fa-search"></i><i class="fa fa-search-minus"></i><i class="fa fa-search-plus"></i><i class="fa fa-sellsy"></i><i class="fa fa-send"></i><i class="fa fa-send-o"></i><i class="fa fa-server"></i><i class="fa fa-share"></i><i class="fa fa-share-alt"></i><i class="fa fa-share-alt-square"></i><i class="fa fa-share-square"></i><i class="fa fa-share-square-o"></i><i class="fa fa-shekel"></i><i class="fa fa-sheqel"></i><i class="fa fa-shield"></i><i class="fa fa-ship"></i><i class="fa fa-shirtsinbulk"></i><i class="fa fa-shopping-bag"></i><i class="fa fa-shopping-basket"></i><i class="fa fa-shopping-cart"></i><i class="fa fa-sign-in"></i><i class="fa fa-sign-language"></i><i class="fa fa-sign-out"></i><i class="fa fa-signal"></i><i class="fa fa-signing"></i><i class="fa fa-simplybuilt"></i><i class="fa fa-sitemap"></i><i class="fa fa-skyatlas"></i><i class="fa fa-skype"></i><i class="fa fa-slack"></i><i class="fa fa-sliders"></i><i class="fa fa-slideshare"></i><i class="fa fa-smile-o"></i><i class="fa fa-snapchat"></i><i class="fa fa-snapchat-ghost"></i><i class="fa fa-snapchat-square"></i><i class="fa fa-soccer-ball-o"></i><i class="fa fa-sort"></i><i class="fa fa-sort-alpha-asc"></i><i class="fa fa-sort-alpha-desc"></i><i class="fa fa-sort-amount-asc"></i><i class="fa fa-sort-amount-desc"></i><i class="fa fa-sort-asc"></i><i class="fa fa-sort-desc"></i><i class="fa fa-sort-down"></i><i class="fa fa-sort-numeric-asc"></i><i class="fa fa-sort-numeric-desc"></i><i class="fa fa-sort-up"></i><i class="fa fa-soundcloud"></i><i class="fa fa-space-shuttle"></i><i class="fa fa-spinner"></i><i class="fa fa-spoon"></i><i class="fa fa-spotify"></i><i class="fa fa-square"></i><i class="fa fa-square-o"></i><i class="fa fa-stack-exchange"></i><i class="fa fa-stack-overflow"></i><i class="fa fa-star"></i><i class="fa fa-star-half"></i><i class="fa fa-star-half-empty"></i><i class="fa fa-star-half-full"></i><i class="fa fa-star-half-o"></i><i class="fa fa-star-o"></i><i class="fa fa-steam"></i><i class="fa fa-steam-square"></i><i class="fa fa-step-backward"></i><i class="fa fa-step-forward"></i><i class="fa fa-stethoscope"></i><i class="fa fa-sticky-note"></i><i class="fa fa-sticky-note-o"></i><i class="fa fa-stop"></i><i class="fa fa-stop-circle"></i><i class="fa fa-stop-circle-o"></i><i class="fa fa-street-view"></i><i class="fa fa-strikethrough"></i><i class="fa fa-stumbleupon"></i><i class="fa fa-stumbleupon-circle"></i><i class="fa fa-subscript"></i><i class="fa fa-subway"></i><i class="fa fa-suitcase"></i><i class="fa fa-sun-o"></i><i class="fa fa-superscript"></i><i class="fa fa-support"></i><i class="fa fa-table"></i><i class="fa fa-tablet"></i><i class="fa fa-tachometer"></i><i class="fa fa-tag"></i><i class="fa fa-tags"></i><i class="fa fa-tasks"></i><i class="fa fa-taxi"></i><i class="fa fa-television"></i><i class="fa fa-tencent-weibo"></i><i class="fa fa-terminal"></i><i class="fa fa-text-height"></i><i class="fa fa-text-width"></i><i class="fa fa-th"></i><i class="fa fa-th-large"></i><i class="fa fa-th-list"></i><i class="fa fa-themeisle"></i><i class="fa fa-thumb-tack"></i><i class="fa fa-thumbs-down"></i><i class="fa fa-thumbs-o-down"></i><i class="fa fa-thumbs-o-up"></i><i class="fa fa-thumbs-up"></i><i class="fa fa-ticket"></i><i class="fa fa-times"></i><i class="fa fa-times-circle"></i><i class="fa fa-times-circle-o"></i><i class="fa fa-tint"></i><i class="fa fa-toggle-down"></i><i class="fa fa-toggle-left"></i><i class="fa fa-toggle-off"></i><i class="fa fa-toggle-on"></i><i class="fa fa-toggle-right"></i><i class="fa fa-toggle-up"></i><i class="fa fa-trademark"></i><i class="fa fa-train"></i><i class="fa fa-transgender"></i><i class="fa fa-transgender-alt"></i><i class="fa fa-trash"></i><i class="fa fa-trash-o"></i><i class="fa fa-tree"></i><i class="fa fa-trello"></i><i class="fa fa-tripadvisor"></i><i class="fa fa-trophy"></i><i class="fa fa-truck"></i><i class="fa fa-try"></i><i class="fa fa-tty"></i><i class="fa fa-tumblr"></i><i class="fa fa-tumblr-square"></i><i class="fa fa-turkish-lira"></i><i class="fa fa-tv"></i><i class="fa fa-twitch"></i><i class="fa fa-twitter"></i><i class="fa fa-twitter-square"></i><i class="fa fa-umbrella"></i><i class="fa fa-underline"></i><i class="fa fa-undo"></i><i class="fa fa-universal-access"></i><i class="fa fa-university"></i><i class="fa fa-unlink"></i><i class="fa fa-unlock"></i><i class="fa fa-unlock-alt"></i><i class="fa fa-unsorted"></i><i class="fa fa-upload"></i><i class="fa fa-usb"></i><i class="fa fa-usd"></i><i class="fa fa-user"></i><i class="fa fa-user-md"></i><i class="fa fa-user-plus"></i><i class="fa fa-user-secret"></i><i class="fa fa-user-times"></i><i class="fa fa-users"></i><i class="fa fa-venus"></i><i class="fa fa-venus-double"></i><i class="fa fa-venus-mars"></i><i class="fa fa-viacoin"></i><i class="fa fa-viadeo"></i><i class="fa fa-viadeo-square"></i><i class="fa fa-video-camera"></i><i class="fa fa-vimeo"></i><i class="fa fa-vimeo-square"></i><i class="fa fa-vine"></i><i class="fa fa-vk"></i><i class="fa fa-volume-control-phone"></i><i class="fa fa-volume-down"></i><i class="fa fa-volume-off"></i><i class="fa fa-volume-up"></i><i class="fa fa-warning"></i><i class="fa fa-wechat"></i><i class="fa fa-weibo"></i><i class="fa fa-weixin"></i><i class="fa fa-whatsapp"></i><i class="fa fa-wheelchair"></i><i class="fa fa-wheelchair-alt"></i><i class="fa fa-wifi"></i><i class="fa fa-wikipedia-w"></i><i class="fa fa-windows"></i><i class="fa fa-won"></i><i class="fa fa-wordpress"></i><i class="fa fa-wpbeginner"></i><i class="fa fa-wpforms"></i><i class="fa fa-wrench"></i><i class="fa fa-xing"></i><i class="fa fa-xing-square"></i><i class="fa fa-y-combinator"></i><i class="fa fa-y-combinator-square"></i><i class="fa fa-yahoo"></i><i class="fa fa-yc"></i><i class="fa fa-yc-square"></i><i class="fa fa-yelp"></i><i class="fa fa-yen"></i><i class="fa fa-yoast"></i><i class="fa fa-youtube"></i><i class="fa fa-youtube-play"></i><i class="fa fa-youtube-square"></i>
 	</div>
 	<p class="help-block text-center">
 		For a full list of icons, please consult:
diff --git a/src/views/partials/requirejs-config.tpl b/src/views/partials/requirejs-config.tpl
index 2d7332afd9..addb5cfcaa 100644
--- a/src/views/partials/requirejs-config.tpl
+++ b/src/views/partials/requirejs-config.tpl
@@ -6,7 +6,8 @@
 		paths: {
 			'forum': '../client',
 			'admin': '../admin',
-			'vendor': '../../vendor'
+			'vendor': '../../vendor',
+			'plugins': '../../plugins'
 		}
 	});
 </script>
\ No newline at end of file
diff --git a/src/webserver.js b/src/webserver.js
index e667862561..48d8167d3b 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -12,6 +12,7 @@ var path = require('path'),
 
 	emailer = require('./emailer'),
 	meta = require('./meta'),
+	languages = require('./languages'),
 	logger = require('./logger'),
 	plugins = require('./plugins'),
 	middleware = require('./middleware'),
@@ -45,7 +46,7 @@ server.on('error', function(err) {
 module.exports.listen = function() {
 	emailer.registerApp(app);
 
-	middleware = middleware(app);
+	app.locals.middleware = middleware = middleware(app);
 
 	helpers.register();
 
@@ -92,6 +93,7 @@ function initializeNodeBB(callback) {
 				async.apply(!skipJS ? meta.js.minify : meta.js.getFromFile, 'acp.min.js'),
 				async.apply(meta.css.minify),
 				async.apply(meta.sounds.init),
+				async.apply(languages.init),
 				async.apply(meta.blacklist.load)
 			], next);
 		},
@@ -101,8 +103,9 @@ function initializeNodeBB(callback) {
 				middleware: middleware
 			}, next);
 		},
-		function(next) {
-			routes(app, middleware);
+		async.apply(plugins.fireHook, 'filter:hotswap.prepare', []),
+		function(hotswapIds, next) {
+			routes(app, middleware, hotswapIds);
 			next();
 		}
 	], callback);
diff --git a/src/widgets/admin.js b/src/widgets/admin.js
index 110f523e21..03f16f3a0a 100644
--- a/src/widgets/admin.js
+++ b/src/widgets/admin.js
@@ -1,8 +1,9 @@
 "use strict";
 
-
-var async = require('async'),
-	plugins = require('../plugins');
+var fs = require('fs');
+var path = require('path');
+var async = require('async');
+var plugins = require('../plugins');
 
 var admin = {};
 
@@ -22,6 +23,9 @@ admin.get = function(callback) {
 		},
 		widgets: function(next) {
 			plugins.fireHook('filter:widgets.getWidgets', [], next);
+		},
+		adminTemplate: function(next) {
+			fs.readFile(path.resolve(__dirname, '../../public/templates/admin/partials/widget-settings.tpl'), 'utf8', next);
 		}
 	}, function(err, widgetData) {
 		if (err) {
@@ -34,17 +38,14 @@ admin.get = function(callback) {
 				area.data = areaData;
 				next(err);
 			});
-
 		}, function(err) {
 			if (err) {
 				return callback(err);
 			}
-			for (var w in widgetData.widgets) {
-				if (widgetData.widgets.hasOwnProperty(w)) {
-					// if this gets anymore complicated, it needs to be a template
-					widgetData.widgets[w].content += "<br /><label>Title:</label><input type=\"text\" class=\"form-control\" name=\"title\" placeholder=\"Title (only shown on some containers)\" /><br /><label>Container:</label><textarea rows=\"4\" class=\"form-control container-html\" name=\"container\" placeholder=\"Drag and drop a container or enter HTML here.\"></textarea><div class=\"checkbox\"><label><input name=\"hide-guests\" type=\"checkbox\"> Hide from anonymous users?</label></div><div class=\"checkbox\"><label><input name=\"hide-registered\" type=\"checkbox\"> Hide from registered users?</input></label></div>";
-				}
-			}
+
+			widgetData.widgets.forEach(function(w) {
+				w.content += widgetData.adminTemplate;
+			});
 
 			var templates = [],
 				list = {}, index = 0;
diff --git a/src/widgets/index.js b/src/widgets/index.js
index c1421b44b6..5debdf3b26 100644
--- a/src/widgets/index.js
+++ b/src/widgets/index.js
@@ -1,12 +1,12 @@
 "use strict";
 
-var async = require('async'),
-	winston = require('winston'),
-	templates = require('templates.js'),
+var async = require('async');
+var winston = require('winston');
+var templates = require('templates.js');
 
-	plugins = require('../plugins'),
-	translator = require('../../public/src/modules/translator'),
-	db = require('../database');
+var plugins = require('../plugins');
+var translator = require('../../public/src/modules/translator');
+var db = require('../database');
 
 var widgets = {};
 
@@ -30,7 +30,10 @@ widgets.render = function(uid, area, req, res, callback) {
 			}
 
 			async.map(widgetsByLocation[location], function(widget, next) {
-				if (!widget || !widget.data || (!!widget.data['hide-registered'] && uid !== 0) || (!!widget.data['hide-guests'] && uid === 0)) {
+				if (!widget || !widget.data ||
+					(!!widget.data['hide-registered'] && uid !== 0) ||
+					(!!widget.data['hide-guests'] && uid === 0) ||
+					(!!widget.data['hide-mobile'] && area.isMobile)) {
 					return next();
 				}
 
@@ -133,13 +136,21 @@ widgets.reset = function(callback) {
 		{ name: 'Draft Zone', template: 'global', location: 'sidebar' }
 	];
 
-	plugins.fireHook('filter:widgets.getAreas', defaultAreas, function(err, areas) {
+	async.parallel({
+		areas: function(next) {
+			plugins.fireHook('filter:widgets.getAreas', defaultAreas, next);
+		},
+		drafts: function(next) {
+			widgets.getArea('global', 'drafts', next);
+		}
+	}, function(err, results) {
 		if (err) {
 			return callback(err);
 		}
-		var drafts = [];
 
-		async.each(areas, function(area, next) {
+		var drafts = results.drafts || [];
+
+		async.each(results.areas, function(area, next) {
 			widgets.getArea(area.template, area.location, function(err, areaData) {
 				if (err) {
 					return next(err);
diff --git a/tests/topics.js b/tests/topics.js
index fe00db7646..0c04d875bf 100644
--- a/tests/topics.js
+++ b/tests/topics.js
@@ -7,6 +7,8 @@ var db = require('./mocks/databasemock');
 var topics = require('../src/topics');
 var categories = require('../src/categories');
 var User = require('../src/user');
+var groups = require('../src/groups');
+var async = require('async');
 
 describe('Topic\'s', function() {
 	var topic,
@@ -55,28 +57,28 @@ describe('Topic\'s', function() {
 		});
 
 		it('should fail to create new topic with invalid user id', function(done) {
-			topics.post({uid: null, title: topic.title, content: topic.content, cid: topic.categoryId}, function(err, result) {
+			topics.post({uid: null, title: topic.title, content: topic.content, cid: topic.categoryId}, function(err) {
 				assert.equal(err.message, '[[error:no-privileges]]');
 				done();
 			});
 		});
 
 		it('should fail to create new topic with empty title', function(done) {
-			topics.post({uid: topic.userId, title: '', content: topic.content, cid: topic.categoryId}, function(err, result) {
+			topics.post({uid: topic.userId, title: '', content: topic.content, cid: topic.categoryId}, function(err) {
 				assert.ok(err);
 				done();
 			});
 		});
 
 		it('should fail to create new topic with empty content', function(done) {
-			topics.post({uid: topic.userId, title: topic.title, content: '', cid: topic.categoryId}, function(err, result) {
+			topics.post({uid: topic.userId, title: topic.title, content: '', cid: topic.categoryId}, function(err) {
 				assert.ok(err);
 				done();
 			});
 		});
 
 		it('should fail to create new topic with non-existant category id', function(done) {
-			topics.post({uid: topic.userId, title: topic.title, content: topic.content, cid: 99}, function(err, result) {
+			topics.post({uid: topic.userId, title: topic.title, content: topic.content, cid: 99}, function(err) {
 				assert.equal(err.message, '[[error:no-category]]', 'received no error');
 				done();
 			});
@@ -105,21 +107,21 @@ describe('Topic\'s', function() {
 		});
 
 		it('should fail to create new reply with invalid user id', function(done) {
-			topics.reply({uid: null, content: 'test post', tid: newTopic.tid}, function(err, result) {
+			topics.reply({uid: null, content: 'test post', tid: newTopic.tid}, function(err) {
 				assert.equal(err.message, '[[error:no-privileges]]');
 				done();
 			});
 		});
 
 		it('should fail to create new reply with empty content', function(done) {
-			topics.reply({uid: topic.userId, content: '', tid: newTopic.tid}, function(err, result) {
+			topics.reply({uid: topic.userId, content: '', tid: newTopic.tid}, function(err) {
 				assert.ok(err);
 				done();
 			});
 		});
 
 		it('should fail to create new reply with invalid topic id', function(done) {
-			topics.reply({uid: null, content: 'test post', tid: 99}, function(err, result) {
+			topics.reply({uid: null, content: 'test post', tid: 99}, function(err) {
 				assert.equal(err.message, '[[error:no-topic]]');
 				done();
 			});
@@ -187,6 +189,203 @@ describe('Topic\'s', function() {
 		});
 	});
 
+	describe('.ignore', function(){
+		var newTid;
+		var uid;
+		var newTopic;
+		before(function(done){
+			uid = topic.userId;
+			async.waterfall([
+				function(done){
+					topics.post({uid: topic.userId, title: 'Topic to be ignored', content: 'Just ignore me, please!', cid: topic.categoryId}, function(err, result) {
+						newTopic = result.topicData;
+						newTid = newTopic.tid;
+						done();
+					});
+				},
+				function(done){
+					topics.markUnread( newTid, uid, done );
+				}
+			],done);
+		});
+
+		it('should not appear in the unread list', function(done){
+			async.waterfall([
+				function(done){
+					topics.ignore( newTid, uid, done );
+				},
+				function(done){
+					topics.getUnreadTopics(0, uid, 0, -1, '', done );
+				},
+				function(results, done){
+					var topics = results.topics;
+					var tids = topics.map( function(topic){ return topic.tid; } );
+					assert.equal(tids.indexOf(newTid), -1, 'The topic appeared in the unread list.');
+					done();
+				}
+			], done);
+		});
+
+		it('should not appear as unread in the recent list', function(done){
+			async.waterfall([
+				function(done){
+					topics.ignore( newTid, uid, done );
+				},
+				function(done){
+					topics.getLatestTopics( uid, 0, -1, 'year', done );
+				},
+				function(results, done){
+					var topics = results.topics;
+					var topic;
+					var i;
+					for(i = 0; i < topics.length; ++i){
+						if( topics[i].tid == newTid ){
+							assert.equal(false, topics[i].unread, 'ignored topic was marked as unread in recent list');
+							return done();
+						}
+					}
+					assert.ok(topic, 'topic didn\'t appear in the recent list');
+					done();
+				}
+			], done);
+		});
+
+		it('should appear as unread again when marked as reading', function(done){
+			async.waterfall([
+				function(done){
+					topics.ignore( newTid, uid, done );
+				},
+				function(done){
+					topics.follow( newTid, uid, done );
+				},
+				function(done){
+					topics.getUnreadTopics(0, uid, 0, -1, '', done );
+				},
+				function(results, done){
+					var topics = results.topics;
+					var tids = topics.map( function(topic){ return topic.tid; } );
+					assert.notEqual(tids.indexOf(newTid), -1, 'The topic did not appear in the unread list.');
+					done();
+				}
+			], done);
+		});
+
+		it('should appear as unread again when marked as following', function(done){
+			async.waterfall([
+				function(done){
+					topics.ignore( newTid, uid, done );
+				},
+				function(done){
+					topics.follow( newTid, uid, done );
+				},
+				function(done){
+					topics.getUnreadTopics(0, uid, 0, -1, '', done );
+				},
+				function(results, done){
+					var topics = results.topics;
+					var tids = topics.map( function(topic){ return topic.tid; } );
+					assert.notEqual(tids.indexOf(newTid), -1, 'The topic did not appear in the unread list.');
+					done();
+				}
+			], done);
+		});
+	});
+
+
+
+	describe('.fork', function(){
+		var newTopic;
+		var replies = [];
+		var topicPids;
+		var originalBookmark = 5;
+		function postReply( next ){
+			topics.reply({uid: topic.userId, content: 'test post ' + replies.length, tid: newTopic.tid},
+				function(err, result) {
+					assert.equal(err, null, 'was created with error');
+					assert.ok(result);
+					replies.push( result );
+					next();
+				}
+			);
+		}
+
+		before( function(done) {
+			async.waterfall(
+				[
+				function(next){
+					groups.join('administrators', topic.userId, next);
+				},
+				function( next ){
+					topics.post({uid: topic.userId, title: topic.title, content: topic.content, cid: topic.categoryId}, function(err, result) {
+						assert.ifError( err );
+						newTopic = result.topicData;
+						next();
+					});
+				},
+				function( next ){ postReply( next );},
+				function( next ){ postReply( next );},
+				function( next ){ postReply( next );},
+				function( next ){ postReply( next );},
+				function( next ){ postReply( next );},
+				function( next ){ postReply( next );},
+				function( next ){ postReply( next );},
+				function( next ){ postReply( next );},
+				function( next ){ postReply( next );},
+				function( next ){ postReply( next );},
+				function( next ){ postReply( next );},
+				function( next ){ postReply( next );},
+				function( next ){
+					topicPids = replies.map( function( reply ){ return reply.pid; } );
+					topics.setUserBookmark( newTopic.tid, topic.userId, originalBookmark, next );
+				}],
+				done );
+		});
+
+		it('should have 12 replies', function(done) {
+			assert.equal( 12, replies.length );
+			done();
+		});
+
+		it('should not update the user\'s bookmark', function(done){
+			async.waterfall([
+				function(next){
+					topics.createTopicFromPosts(
+						topic.userId,
+						'Fork test, no bookmark update',
+						topicPids.slice( -2 ),
+						newTopic.tid,
+						next );
+				},
+				function( forkedTopicData, next){
+					topics.getUserBookmark( newTopic.tid, topic.userId, next );
+				},
+				function( bookmark, next ){
+					assert.equal( originalBookmark, bookmark );
+					next();
+				}
+			],done);
+		});
+
+		it('should update the user\'s bookmark ', function(done){
+			async.waterfall([
+				function(next){
+					topics.createTopicFromPosts(
+						topic.userId,
+						'Fork test, no bookmark update',
+						topicPids.slice( 1, 3 ),
+						newTopic.tid,
+						next );
+				},
+				function( forkedTopicData, next){
+					topics.getUserBookmark( newTopic.tid, topic.userId, next );
+				},
+				function( bookmark, next ){
+					assert.equal( originalBookmark - 2, bookmark );
+					next();
+				}
+			],done);
+		});
+	});
 
 	after(function() {
 		db.flushdb();