From 65329b9bd75d2566a328170b6edaa1eb86109e1f Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Mon, 10 Jul 2017 12:21:17 -0400
Subject: [PATCH 01/67] closes nodebb-plugin-markdown#85

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index eb3e7872d7..63651e2ba7 100644
--- a/package.json
+++ b/package.json
@@ -55,11 +55,11 @@
     "morgan": "^1.3.2",
     "mousetrap": "^1.5.3",
     "nconf": "~0.8.2",
-    "nodebb-plugin-composer-default": "4.4.18",
+    "nodebb-plugin-composer-default": "4.4.19",
     "nodebb-plugin-dbsearch": "2.0.4",
     "nodebb-plugin-emoji-extended": "1.1.1",
     "nodebb-plugin-emoji-one": "1.2.1",
-    "nodebb-plugin-markdown": "7.1.1",
+    "nodebb-plugin-markdown": "7.1.2",
     "nodebb-plugin-mentions": "2.1.5",
     "nodebb-plugin-soundpack-default": "1.0.0",
     "nodebb-plugin-spam-be-gone": "0.5.0",

From 923bd86662dab4063c11a2fa5a1d3414775510c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Mon, 10 Jul 2017 12:54:45 -0400
Subject: [PATCH 02/67] Widgets refactor (#5817)

* widgets refactor

render widgets server side
widgets can use all the data the template can use

* fix tests
---
 public/src/ajaxify.js              |  2 +-
 public/src/widgets.js              | 97 +++++++++++++-----------------
 src/controllers/api.js             | 50 +++++----------
 src/database/mongo/helpers.js      |  2 +-
 src/middleware/render.js           | 12 ++++
 src/routes/api.js                  |  1 -
 src/views/admin/extend/widgets.tpl | 22 +++----
 src/widgets/admin.js               |  2 +-
 src/widgets/index.js               | 64 ++++++++++++++------
 test/controllers.js                | 13 ++--
 10 files changed, 135 insertions(+), 130 deletions(-)

diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index 9ca9052dc9..e2303c501c 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -204,7 +204,7 @@ $(document).ready(function () {
 		}
 		ajaxify.loadScript(tpl_url, done);
 
-		ajaxify.widgets.render(tpl_url, url, done);
+		ajaxify.widgets.render(tpl_url, done);
 
 		$(window).trigger('action:ajaxify.contentLoaded', { url: url, tpl: tpl_url });
 
diff --git a/public/src/widgets.js b/public/src/widgets.js
index f5f667d2a7..90b2d355c7 100644
--- a/public/src/widgets.js
+++ b/public/src/widgets.js
@@ -1,6 +1,5 @@
 'use strict';
 
-
 (function (ajaxify) {
 	ajaxify.widgets = {};
 
@@ -14,77 +13,63 @@
 		});
 	};
 
-	ajaxify.widgets.render = function (template, url, callback) {
+	ajaxify.widgets.render = function (template, callback) {
 		callback = callback || function () {};
+
 		if (template.match(/^admin/)) {
 			return callback();
 		}
 
-		var widgetLocations = ['sidebar', 'footer', 'header'];
+		var locations = Object.keys(ajaxify.data.widgets);
 
-		$('#content [widget-area]').each(function () {
-			var location = $(this).attr('widget-area');
-			if ($.inArray(location, widgetLocations) === -1) {
-				widgetLocations.push(location);
+		locations.forEach(function (location) {
+			var area = $('#content [widget-area="' + location + '"]');
+			if (area.length) {
+				return;
 			}
-		});
 
-		$.get(config.relative_path + '/api/widgets/render?' + config['cache-buster'], {
-			locations: widgetLocations,
-			template: template + '.tpl',
-			url: url,
-			cid: ajaxify.data.cid,
-			isMobile: utils.isMobile(),
-		}, function (renderedAreas) {
-			for (var x = 0; x < renderedAreas.length; x += 1) {
-				var renderedWidgets = renderedAreas[x].widgets;
-				var location = renderedAreas[x].location;
-				var html = '';
+			var widgetsAtLocation = ajaxify.data.widgets[location] || [];
+			var html = '';
 
-				for (var i = 0; i < renderedWidgets.length; i += 1) {
-					html += templates.parse(renderedWidgets[i].html, {});
-				}
+			widgetsAtLocation.forEach(function (widget) {
+				html += widget.html;
 
-				var area = $('#content [widget-area="' + location + '"]');
-
-				if (!area.length && window.location.pathname.indexOf('/admin') === -1 && renderedWidgets.length) {
-					if (location === 'footer' && !$('#content [widget-area="footer"]').length) {
-						$('#content').append($('<div class="row"><div widget-area="footer" class="col-xs-12"></div></div>'));
-					} else if (location === 'sidebar' && !$('#content [widget-area="sidebar"]').length) {
-						if ($('[component="account/cover"]').length) {
-							$('[component="account/cover"]').nextAll().wrapAll($('<div class="row"><div class="col-lg-9 col-xs-12"></div><div widget-area="sidebar" class="col-lg-3 col-xs-12"></div></div></div>'));
-						} else if ($('[component="groups/cover"]').length) {
-							$('[component="groups/cover"]').nextAll().wrapAll($('<div class="row"><div class="col-lg-9 col-xs-12"></div><div widget-area="sidebar" class="col-lg-3 col-xs-12"></div></div></div>'));
-						} else {
-							$('#content > *').wrapAll($('<div class="row"><div class="col-lg-9 col-xs-12"></div><div widget-area="sidebar" class="col-lg-3 col-xs-12"></div></div></div>'));
-						}
-					} else if (location === 'header' && !$('#content [widget-area="header"]').length) {
-						$('#content').prepend($('<div class="row"><div widget-area="header" class="col-xs-12"></div></div>'));
+				if (location === 'footer' && !$('#content [widget-area="footer"]').length) {
+					$('#content').append($('<div class="row"><div widget-area="footer" class="col-xs-12"></div></div>'));
+				} else if (location === 'sidebar' && !$('#content [widget-area="sidebar"]').length) {
+					if ($('[component="account/cover"]').length) {
+						$('[component="account/cover"]').nextAll().wrapAll($('<div class="row"><div class="col-lg-9 col-xs-12"></div><div widget-area="sidebar" class="col-lg-3 col-xs-12"></div></div></div>'));
+					} else if ($('[component="groups/cover"]').length) {
+						$('[component="groups/cover"]').nextAll().wrapAll($('<div class="row"><div class="col-lg-9 col-xs-12"></div><div widget-area="sidebar" class="col-lg-3 col-xs-12"></div></div></div>'));
+					} else {
+						$('#content > *').wrapAll($('<div class="row"><div class="col-lg-9 col-xs-12"></div><div widget-area="sidebar" class="col-lg-3 col-xs-12"></div></div></div>'));
 					}
-
-					area = $('#content [widget-area="' + location + '"]');
+				} else if (location === 'header' && !$('#content [widget-area="header"]').length) {
+					$('#content').prepend($('<div class="row"><div widget-area="header" class="col-xs-12"></div></div>'));
 				}
+			});
 
+			area = $('#content [widget-area="' + location + '"]');
+			if (html && area.length) {
 				area.html(html);
-
-				if (renderedWidgets.length) {
-					area.removeClass('hidden');
-					ajaxify.widgets.reposition(location);
-				}
 			}
 
-			var widgetAreas = $('#content [widget-area]');
-			widgetAreas.find('img:not(.not-responsive)').addClass('img-responsive');
-			widgetAreas.find('.timeago').timeago();
-			widgetAreas.find('img[title].teaser-pic,img[title].user-img').each(function () {
-				$(this).tooltip({
-					placement: 'top',
-					title: $(this).attr('title'),
-				});
-			});
-			$(window).trigger('action:widgets.loaded', {});
-
-			callback(renderedAreas);
+			if (widgetsAtLocation.length) {
+				area.removeClass('hidden');
+				ajaxify.widgets.reposition(location);
+			}
 		});
+
+		var widgetAreas = $('#content [widget-area]');
+		widgetAreas.find('img:not(.not-responsive)').addClass('img-responsive');
+		widgetAreas.find('.timeago').timeago();
+		widgetAreas.find('img[title].teaser-pic,img[title].user-img').each(function () {
+			$(this).tooltip({
+				placement: 'top',
+				title: $(this).attr('title'),
+			});
+		});
+		$(window).trigger('action:widgets.loaded', {});
+		callback();
 	};
 }(ajaxify || {}));
diff --git a/src/controllers/api.js b/src/controllers/api.js
index 5ec2f55697..b464748f49 100644
--- a/src/controllers/api.js
+++ b/src/controllers/api.js
@@ -11,12 +11,11 @@ var topics = require('../topics');
 var categories = require('../categories');
 var privileges = require('../privileges');
 var plugins = require('../plugins');
-var widgets = require('../widgets');
 var translator = require('../translator');
 
 var apiController = module.exports;
 
-apiController.getConfig = function (req, res, next) {
+apiController.loadConfig = function (req, callback) {
 	var config = {};
 	config.environment = process.env.NODE_ENV;
 	config.relative_path = nconf.get('relative_path');
@@ -59,7 +58,7 @@ apiController.getConfig = function (req, res, next) {
 	config.requireEmailConfirmation = parseInt(meta.config.requireEmailConfirmation, 10) === 1;
 	config.topicPostSort = meta.config.topicPostSort || 'oldest_to_newest';
 	config.categoryTopicSort = meta.config.categoryTopicSort || 'newest_to_oldest';
-	config.csrf_token = req.csrfToken();
+	config.csrf_token = req.csrfToken && req.csrfToken();
 	config.searchEnabled = plugins.hasListeners('filter:search.query');
 	config.bootswatchSkin = meta.config.bootswatchSkin || 'noskin';
 	config.defaultBootswatchSkin = meta.config.bootswatchSkin || 'noskin';
@@ -80,7 +79,7 @@ apiController.getConfig = function (req, res, next) {
 
 	async.waterfall([
 		function (next) {
-			if (!req.user) {
+			if (!req.uid) {
 				return next(null, config);
 			}
 			user.getSettings(req.uid, next);
@@ -98,41 +97,22 @@ apiController.getConfig = function (req, res, next) {
 			config.bootswatchSkin = (settings.bootswatchSkin && settings.bootswatchSkin !== 'default') ? settings.bootswatchSkin : config.bootswatchSkin;
 			plugins.fireHook('filter:config.get', config, next);
 		},
-	], function (err, config) {
-		if (err) {
-			return next(err);
-		}
-
-		if (res.locals.isAPI) {
-			res.json(config);
-		} else {
-			next(null, config);
-		}
-	});
+	], callback);
 };
 
-
-apiController.renderWidgets = function (req, res, next) {
-	if (!req.query.template || !req.query.locations) {
-		return res.status(200).json({});
-	}
-
-	widgets.render(req.uid,
-		{
-			template: req.query.template,
-			url: req.query.url,
-			locations: req.query.locations,
-			isMobile: req.query.isMobile === 'true',
-			cid: req.query.cid,
+apiController.getConfig = function (req, res, next) {
+	async.waterfall([
+		function (next) {
+			apiController.loadConfig(req, next);
 		},
-		req,
-		res,
-		function (err, widgets) {
-			if (err) {
-				return next(err);
+		function (config, next) {
+			if (res.locals.isAPI) {
+				res.json(config);
+			} else {
+				next(null, config);
 			}
-			res.status(200).json(widgets);
-		});
+		},
+	], next);
 };
 
 apiController.getPostData = function (pid, uid, callback) {
diff --git a/src/database/mongo/helpers.js b/src/database/mongo/helpers.js
index 47f8434c77..7a791c9fca 100644
--- a/src/database/mongo/helpers.js
+++ b/src/database/mongo/helpers.js
@@ -6,7 +6,7 @@ helpers.toMap = function (data) {
 	var map = {};
 	for (var i = 0; i < data.length; i += 1) {
 		map[data[i]._key] = data[i];
-		data[i]._key = undefined;
+		delete data[i]._key;
 	}
 	return map;
 };
diff --git a/src/middleware/render.js b/src/middleware/render.js
index e37b994445..bf3cb03638 100644
--- a/src/middleware/render.js
+++ b/src/middleware/render.js
@@ -7,6 +7,7 @@ var winston = require('winston');
 
 var plugins = require('../plugins');
 var translator = require('../translator');
+var widgets = require('../widgets');
 
 module.exports = function (middleware) {
 	middleware.processRender = function (req, res, next) {
@@ -49,6 +50,17 @@ module.exports = function (middleware) {
 				function (data, next) {
 					options = data.templateData;
 
+					widgets.render(req.uid, {
+						template: template + '.tpl',
+						url: options.url,
+						templateData: options,
+						req: req,
+						res: res,
+					}, next);
+				},
+				function (data, next) {
+					options.widgets = data;
+
 					res.locals.template = template;
 					options._locals = undefined;
 
diff --git a/src/routes/api.js b/src/routes/api.js
index 9b5a7f77c7..34f14f5a8c 100644
--- a/src/routes/api.js
+++ b/src/routes/api.js
@@ -9,7 +9,6 @@ module.exports = function (app, middleware, controllers) {
 	app.use('/api', router);
 
 	router.get('/config', middleware.applyCSRF, controllers.api.getConfig);
-	router.get('/widgets/render', controllers.api.renderWidgets);
 
 	router.get('/me', middleware.checkGlobalPrivacySettings, controllers.user.getCurrentUser);
 	router.get('/user/uid/:uid', middleware.checkGlobalPrivacySettings, controllers.user.getUserByUID);
diff --git a/src/views/admin/extend/widgets.tpl b/src/views/admin/extend/widgets.tpl
index 07b8b5c193..0e2d2a848c 100644
--- a/src/views/admin/extend/widgets.tpl
+++ b/src/views/admin/extend/widgets.tpl
@@ -32,32 +32,32 @@
 			<div class="panel-body">
 				<div class="available-widgets">
 					<p>[[admin/extend/widgets:explanation]]</p>
-					<!-- IF !widgets.length -->
+					<!-- IF !availableWidgets.length -->
 					<div class="alert alert-info">[[none-installed, {config.relative_path}/admin/extend/plugins]]</div>
-					<!-- ENDIF !widgets.length -->
+					<!-- ENDIF !availableWidgets.length -->
 					<p>
 						<select id="widget-selector" class="form-control">
-							<!-- BEGIN widgets -->
-							<option value="{widgets.widget}">{widgets.name}</option>
-							<!-- END widgets -->
+							<!-- BEGIN availableWidgets -->
+							<option value="{availableWidgets.widget}">{availableWidgets.name}</option>
+							<!-- END availableWidgets -->
 						</select>
 					</p>
 					<div class="row">
-						<!-- BEGIN widgets -->
+						<!-- BEGIN availableWidgets -->
 						<div class="col-xs-12">
-							<div data-widget="{widgets.widget}" class="panel widget-panel panel-default pointer hide">
+							<div data-widget="{availableWidgets.widget}" class="panel widget-panel panel-default pointer hide">
 								<div class="panel-heading">
-									<strong>{widgets.name}</strong>
-									<small><br />{widgets.description}</small>
+									<strong>{availableWidgets.name}</strong>
+									<small><br />{availableWidgets.description}</small>
 								</div>
 								<div class="panel-body hidden">
 									<form>
-										{widgets.content}
+										{availableWidgets.content}
 									</form>
 								</div>
 							</div>
 						</div>
-						<!-- END widgets -->
+						<!-- END availableWidgets -->
 					</div>
 				</div>
 			</div>
diff --git a/src/widgets/admin.js b/src/widgets/admin.js
index dde3aca43d..4ca05571f5 100644
--- a/src/widgets/admin.js
+++ b/src/widgets/admin.js
@@ -72,7 +72,7 @@ admin.get = function (callback) {
 			callback(false, {
 				templates: templates,
 				areas: widgetData.areas,
-				widgets: widgetData.widgets,
+				availableWidgets: widgetData.widgets,
 			});
 		});
 	});
diff --git a/src/widgets/index.js b/src/widgets/index.js
index 2e228dab63..982b40c696 100644
--- a/src/widgets/index.js
+++ b/src/widgets/index.js
@@ -3,27 +3,35 @@
 var async = require('async');
 var winston = require('winston');
 var templates = require('templates.js');
+var _ = require('lodash');
 
 var plugins = require('../plugins');
 var translator = require('../translator');
 var db = require('../database');
+var apiController = require('../controllers/api');
 
 var widgets = module.exports;
 
-widgets.render = function (uid, area, req, res, callback) {
-	if (!area.locations || !area.template) {
+widgets.render = function (uid, options, callback) {
+	if (!options.template) {
 		return callback(new Error('[[error:invalid-data]]'));
 	}
 
 	async.waterfall([
 		function (next) {
-			widgets.getAreas(['global', area.template], area.locations, next);
+			widgets.getWidgetDataForTemplates(['global', options.template], next);
 		},
 		function (data, next) {
 			var widgetsByLocation = {};
 
-			async.map(area.locations, function (location, done) {
-				widgetsByLocation[location] = data.global[location].concat(data[area.template][location]);
+			delete data.global.drafts;
+
+			var locations = _.uniq(Object.keys(data.global).concat(Object.keys(data[options.template])));
+
+			var returnData = {};
+
+			async.each(locations, function (location, done) {
+				widgetsByLocation[location] = (data.global[location] || []).concat(data[options.template][location] || []);
 
 				if (!widgetsByLocation[location].length) {
 					return done(null, { location: location, widgets: [] });
@@ -33,28 +41,43 @@ widgets.render = function (uid, area, req, res, callback) {
 					if (!widget || !widget.data ||
 						(!!widget.data['hide-registered'] && uid !== 0) ||
 						(!!widget.data['hide-guests'] && uid === 0) ||
-						(!!widget.data['hide-mobile'] && area.isMobile)) {
+						(!!widget.data['hide-mobile'] && options.req.useragent.isMobile)) {
 						return next();
 					}
 
-					renderWidget(widget, uid, area, req, res, next);
-				}, function (err, result) {
-					done(err, { location: location, widgets: result.filter(Boolean) });
+					renderWidget(widget, uid, options, next);
+				}, function (err, renderedWidgets) {
+					if (err) {
+						return done(err);
+					}
+					returnData[location] = renderedWidgets.filter(Boolean);
+					done();
 				});
-			}, next);
+			}, function (err) {
+				next(err, returnData);
+			});
 		},
 	], callback);
 };
 
-function renderWidget(widget, uid, area, req, res, callback) {
+function renderWidget(widget, uid, options, callback) {
 	async.waterfall([
 		function (next) {
+			if (options.res.locals.isAPI) {
+				apiController.loadConfig(options.req, next);
+			} else {
+				next(null, options.res.locals.config);
+			}
+		},
+		function (config, next) {
+			var templateData = _.assign(options.templateData, { config: config });
 			plugins.fireHook('filter:widget.render:' + widget.widget, {
 				uid: uid,
-				area: area,
+				area: options,
+				templateData: templateData,
 				data: widget.data,
-				req: req,
-				res: res,
+				req: options.req,
+				res: options.res,
 			}, next);
 		},
 		function (data, next) {
@@ -84,23 +107,28 @@ function renderWidget(widget, uid, area, req, res, callback) {
 	], callback);
 }
 
-widgets.getAreas = function (templates, locations, callback) {
+widgets.getWidgetDataForTemplates = function (templates, callback) {
 	var keys = templates.map(function (tpl) {
 		return 'widgets:' + tpl;
 	});
+
 	async.waterfall([
 		function (next) {
-			db.getObjectsFields(keys, locations, next);
+			db.getObjects(keys, next);
 		},
 		function (data, next) {
 			var returnData = {};
 
 			templates.forEach(function (template, index) {
 				returnData[template] = returnData[template] || {};
+
+				var templateWidgetData = data[index] || {};
+				var locations = Object.keys(templateWidgetData);
+
 				locations.forEach(function (location) {
-					if (data && data[index] && data[index][location]) {
+					if (templateWidgetData && templateWidgetData[location]) {
 						try {
-							returnData[template][location] = JSON.parse(data[index][location]);
+							returnData[template][location] = JSON.parse(templateWidgetData[location]);
 						} catch (err) {
 							winston.error('can not parse widget data. template:  ' + template + ' location: ' + location);
 							returnData[template][location] = [];
diff --git a/test/controllers.js b/test/controllers.js
index 34c515fc7a..6a3882ea5e 100644
--- a/test/controllers.js
+++ b/test/controllers.js
@@ -687,22 +687,23 @@ describe('Controllers', function () {
 			], done);
 		});
 
-		it('should return {} if there is no template or locations', function (done) {
-			request(nconf.get('url') + '/api/widgets/render', { json: true }, function (err, res, body) {
+		it('should return {} if there are no widgets', function (done) {
+			request(nconf.get('url') + '/api/category/' + cid, { json: true }, function (err, res, body) {
 				assert.ifError(err);
 				assert.equal(res.statusCode, 200);
-				assert(body);
-				assert.equal(Object.keys(body), 0);
+				assert(body.widgets);
+				assert.equal(Object.keys(body.widgets), 0);
 				done();
 			});
 		});
 
 		it('should render templates', function (done) {
-			var url = nconf.get('url') + '/api/widgets/render?template=categories.tpl&url=&isMobile=false&locations%5B%5D=sidebar&locations%5B%5D=footer&locations%5B%5D=header';
+			var url = nconf.get('url') + '/api/categories';
 			request(url, { json: true }, function (err, res, body) {
 				assert.ifError(err);
 				assert.equal(res.statusCode, 200);
-				assert(body);
+				assert(body.widgets);
+				assert(body.widgets.sidebar);
 				done();
 			});
 		});

From bece6808a2994568e707898d30b17d683f12ac9b Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Mon, 10 Jul 2017 13:04:01 -0400
Subject: [PATCH 03/67] up themes for widgets refactor

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 63651e2ba7..c007894688 100644
--- a/package.json
+++ b/package.json
@@ -64,10 +64,10 @@
     "nodebb-plugin-soundpack-default": "1.0.0",
     "nodebb-plugin-spam-be-gone": "0.5.0",
     "nodebb-rewards-essentials": "0.0.9",
-    "nodebb-theme-lavender": "4.0.4",
-    "nodebb-theme-persona": "5.0.11",
+    "nodebb-theme-lavender": "4.0.5",
+    "nodebb-theme-persona": "5.0.12",
     "nodebb-theme-slick": "1.1.0",
-    "nodebb-theme-vanilla": "6.0.8",
+    "nodebb-theme-vanilla": "6.0.9",
     "nodebb-widget-essentials": "3.0.0",
     "nodemailer": "2.6.4",
     "nodemailer-sendmail-transport": "1.0.0",

From 4e7447c9d6e1e11b94e0cbeaf5842c2d9f39c90a Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Mon, 10 Jul 2017 14:05:48 -0400
Subject: [PATCH 04/67] remove ajaxify.widgets.reposition

---
 public/src/widgets.js | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/public/src/widgets.js b/public/src/widgets.js
index 90b2d355c7..082b291624 100644
--- a/public/src/widgets.js
+++ b/public/src/widgets.js
@@ -3,16 +3,6 @@
 (function (ajaxify) {
 	ajaxify.widgets = {};
 
-	ajaxify.widgets.reposition = function (location) {
-		$('body [has-widget-class]').each(function () {
-			var $this = $(this);
-			if ($this.attr('has-widget-target') === location) {
-				$this.removeClass();
-				$this.addClass($this.attr('has-widget-class'));
-			}
-		});
-	};
-
 	ajaxify.widgets.render = function (template, callback) {
 		callback = callback || function () {};
 
@@ -56,7 +46,6 @@
 
 			if (widgetsAtLocation.length) {
 				area.removeClass('hidden');
-				ajaxify.widgets.reposition(location);
 			}
 		});
 

From e036e26238a0bbecbca6375d777e998a7bdc6a72 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Mon, 10 Jul 2017 14:55:57 -0400
Subject: [PATCH 05/67] closes #5813

---
 src/controllers/index.js                   |  4 +--
 src/upgrades/1.6.0/robots-config-change.js | 35 ++++++++++++++++++++++
 src/views/admin/settings/web-crawler.tpl   |  2 +-
 3 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 src/upgrades/1.6.0/robots-config-change.js

diff --git a/src/controllers/index.js b/src/controllers/index.js
index 0f15d2f4ab..84c20ade81 100644
--- a/src/controllers/index.js
+++ b/src/controllers/index.js
@@ -291,8 +291,8 @@ Controllers.confirmEmail = function (req, res) {
 Controllers.robots = function (req, res) {
 	res.set('Content-Type', 'text/plain');
 
-	if (meta.config['robots.txt']) {
-		res.send(meta.config['robots.txt']);
+	if (meta.config['robots:txt']) {
+		res.send(meta.config['robots:txt']);
 	} else {
 		res.send('User-agent: *\n' +
 			'Disallow: ' + nconf.get('relative_path') + '/admin/\n' +
diff --git a/src/upgrades/1.6.0/robots-config-change.js b/src/upgrades/1.6.0/robots-config-change.js
new file mode 100644
index 0000000000..3a18872bbc
--- /dev/null
+++ b/src/upgrades/1.6.0/robots-config-change.js
@@ -0,0 +1,35 @@
+'use strict';
+
+var async = require('async');
+var db = require('../../database');
+
+module.exports = {
+	name: 'Fix incorrect robots.txt schema',
+	timestamp: Date.UTC(2017, 6, 10),
+	method: function (callback) {
+		async.waterfall([
+			function (next) {
+				db.getObject('config', next);
+			},
+			function (config, next) {
+				if (!config) {
+					return callback();
+				}
+				// fix mongo nested data
+				if (config.robots && config.robots.txt) {
+					db.setObjectField('config', 'robots:txt', config.robots.txt, next);
+				} else if (typeof config['robots.txt'] === 'string' && config['robots.txt']) {
+					db.setObjectField('config', 'robots:txt', config['robots.txt'], next);
+				} else {
+					next();
+				}
+			},
+			function (next) {
+				db.deleteObjectField('config', 'robots', next);
+			},
+			function (next) {
+				db.deleteObjectField('config', 'robots.txt', next);
+			},
+		], callback);
+	},
+};
diff --git a/src/views/admin/settings/web-crawler.tpl b/src/views/admin/settings/web-crawler.tpl
index 276a4fb0aa..45f7156ed9 100644
--- a/src/views/admin/settings/web-crawler.tpl
+++ b/src/views/admin/settings/web-crawler.tpl
@@ -5,7 +5,7 @@
 	<div class="col-sm-10 col-xs-12">
 		<form>
 			<strong>[[admin/settings/web-crawler:robots-txt]]</strong><br />
-			<textarea class="form-control" data-field="robots.txt"></textarea>
+			<textarea class="form-control" data-field="robots:txt"></textarea>
 		</form>
 	</div>
 </div>

From 59aeee6516136629d442216b03797577fc607301 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Mon, 10 Jul 2017 15:26:58 -0400
Subject: [PATCH 06/67] remove addExpiresHeaders

---
 src/middleware/headers.js | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/middleware/headers.js b/src/middleware/headers.js
index 190de28b0e..eb11ff8718 100644
--- a/src/middleware/headers.js
+++ b/src/middleware/headers.js
@@ -23,17 +23,5 @@ module.exports = function (middleware) {
 
 		next();
 	};
-
-	middleware.addExpiresHeaders = function (req, res, next) {
-		if (req.app.enabled('cache')) {
-			res.setHeader('Cache-Control', 'public, max-age=5184000');
-			res.setHeader('Expires', new Date(Date.now() + 5184000000).toUTCString());
-		} else {
-			res.setHeader('Cache-Control', 'public, max-age=0');
-			res.setHeader('Expires', new Date().toUTCString());
-		}
-
-		next();
-	};
 };
 

From 45d940ad2bccc9ccd10718424d62485679836959 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Mon, 10 Jul 2017 16:34:18 -0400
Subject: [PATCH 07/67] added one more client-side hook for search @barisusakli

---
 public/src/client/search.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/src/client/search.js b/public/src/client/search.js
index b9e0aff09e..38a34fc818 100644
--- a/public/src/client/search.js
+++ b/public/src/client/search.js
@@ -119,6 +119,10 @@ define('forum/search', ['search', 'autocomplete', 'storage'], function (searchMo
 				$('#show-as-topics').prop('checked', isTopic).parent().toggleClass('active', isTopic);
 				$('#show-as-posts').prop('checked', isPost).parent().toggleClass('active', isPost);
 			}
+
+			$(window).trigger('action:search.fillOutForm', {
+				form: formData,
+			});
 		}
 	}
 

From dc110e2e3ff4fe8cc095f9d5b09bfaccb2c628db Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Tue, 11 Jul 2017 13:44:51 -0400
Subject: [PATCH 08/67] closes #5818

---
 src/meta/tags.js         | 6 +++---
 src/middleware/header.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/meta/tags.js b/src/meta/tags.js
index 34ed3c43a9..0938980f22 100644
--- a/src/meta/tags.js
+++ b/src/meta/tags.js
@@ -10,7 +10,7 @@ var Meta = require('../meta');
 
 var Tags = module.exports;
 
-Tags.parse = function (req, meta, link, callback) {
+Tags.parse = function (req, data, meta, link, callback) {
 	async.parallel({
 		tags: function (next) {
 			var defaultTags = [{
@@ -50,7 +50,7 @@ Tags.parse = function (req, meta, link, callback) {
 				});
 			}
 
-			plugins.fireHook('filter:meta.getMetaTags', defaultTags, next);
+			plugins.fireHook('filter:meta.getMetaTags', { req: req, data: data, defaultTags: defaultTags }, next);
 		},
 		links: function (next) {
 			var defaultLinks = [{
@@ -101,7 +101,7 @@ Tags.parse = function (req, meta, link, callback) {
 					href: nconf.get('relative_path') + '/assets/uploads/system/touchicon-192.png',
 				});
 			}
-			plugins.fireHook('filter:meta.getLinkTags', defaultLinks, next);
+			plugins.fireHook('filter:meta.getLinkTags', { req: req, data: data, defaultLinks: defaultLinks }, next);
 		},
 	}, function (err, results) {
 		if (err) {
diff --git a/src/middleware/header.js b/src/middleware/header.js
index fe95b11a27..a30034df69 100644
--- a/src/middleware/header.js
+++ b/src/middleware/header.js
@@ -105,7 +105,7 @@ module.exports = function (middleware) {
 						});
 					},
 					navigation: async.apply(navigation.get),
-					tags: async.apply(meta.tags.parse, req, res.locals.metaTags, res.locals.linkTags),
+					tags: async.apply(meta.tags.parse, req, data, res.locals.metaTags, res.locals.linkTags),
 					banned: async.apply(user.isBanned, req.uid),
 					banReason: async.apply(user.getBannedReason, req.uid),
 				}, next);

From 2d875a99cb6e27b9b16d6fc9dfd45931dfdedb51 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Tue, 11 Jul 2017 13:59:29 -0400
Subject: [PATCH 09/67] fix data

---
 src/meta/tags.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/meta/tags.js b/src/meta/tags.js
index 0938980f22..4224f85dee 100644
--- a/src/meta/tags.js
+++ b/src/meta/tags.js
@@ -108,7 +108,7 @@ Tags.parse = function (req, data, meta, link, callback) {
 			return callback(err);
 		}
 
-		meta = results.tags.concat(meta || []).map(function (tag) {
+		meta = results.tags.defaultTags.concat(meta || []).map(function (tag) {
 			if (!tag || typeof tag.content !== 'string') {
 				winston.warn('Invalid meta tag. ', tag);
 				return tag;
@@ -139,7 +139,7 @@ Tags.parse = function (req, data, meta, link, callback) {
 			addIfNotExists(meta, 'property', 'og:image:height', 200);
 		}
 
-		link = results.links.concat(link || []);
+		link = results.links.defaultLinks.concat(link || []);
 
 		callback(null, {
 			meta: meta,

From 12d53c95ca4cfe972f5687235abedd91bc9716a0 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Tue, 11 Jul 2017 14:14:55 -0400
Subject: [PATCH 10/67] up composer

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c007894688..e56ff845c8 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "morgan": "^1.3.2",
     "mousetrap": "^1.5.3",
     "nconf": "~0.8.2",
-    "nodebb-plugin-composer-default": "4.4.19",
+    "nodebb-plugin-composer-default": "5.0.0",
     "nodebb-plugin-dbsearch": "2.0.4",
     "nodebb-plugin-emoji-extended": "1.1.1",
     "nodebb-plugin-emoji-one": "1.2.1",

From 593ea572c9b172ae5c3cbc024de863cb51f23491 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Tue, 11 Jul 2017 14:32:57 -0400
Subject: [PATCH 11/67] up markdown

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e56ff845c8..6592fe6b18 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "nodebb-plugin-dbsearch": "2.0.4",
     "nodebb-plugin-emoji-extended": "1.1.1",
     "nodebb-plugin-emoji-one": "1.2.1",
-    "nodebb-plugin-markdown": "7.1.2",
+    "nodebb-plugin-markdown": "8.0.0",
     "nodebb-plugin-mentions": "2.1.5",
     "nodebb-plugin-soundpack-default": "1.0.0",
     "nodebb-plugin-spam-be-gone": "0.5.0",

From 701ba7388372547e5711d8c5c513d5b186f80729 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Tue, 11 Jul 2017 15:40:41 -0400
Subject: [PATCH 12/67] updated homepage route logic so that it is all
 contained in the local function (and plugin hook receives all entries,
 including custom) @barisusakli

---
 src/controllers/accounts/settings.js | 59 +++++++++++++++++-----------
 1 file changed, 35 insertions(+), 24 deletions(-)

diff --git a/src/controllers/accounts/settings.js b/src/controllers/accounts/settings.js
index 2f360f883c..0bcdc75c9c 100644
--- a/src/controllers/accounts/settings.js
+++ b/src/controllers/accounts/settings.js
@@ -34,9 +34,6 @@ settingsController.get = function (req, res, callback) {
 				languages: function (next) {
 					languages.list(next);
 				},
-				homePageRoutes: function (next) {
-					getHomePageRoutes(next);
-				},
 				soundsMapping: function (next) {
 					meta.sounds.getUserSoundMap(userData.uid, next);
 				},
@@ -45,7 +42,6 @@ settingsController.get = function (req, res, callback) {
 		function (results, next) {
 			userData.settings = results.settings;
 			userData.languages = results.languages;
-			userData.homePageRoutes = results.homePageRoutes;
 
 			var types = [
 				'notification',
@@ -89,6 +85,12 @@ settingsController.get = function (req, res, callback) {
 
 			plugins.fireHook('filter:user.customSettings', { settings: results.settings, customSettings: [], uid: req.uid }, next);
 		},
+		function (data, next) {
+			getHomePageRoutes(userData, function (err, routes) {
+				userData.homePageRoutes = routes;
+				next(err, data);
+			});
+		},
 		function (data, next) {
 			userData.customSettings = data.customSettings;
 			userData.disableEmailSubscriptions = parseInt(meta.config.disableEmailSubscriptions, 10) === 1;
@@ -128,24 +130,6 @@ 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) {
 			skin.selected = skin.value === userData.settings.bootswatchSkin;
 		});
@@ -168,7 +152,7 @@ settingsController.get = function (req, res, callback) {
 };
 
 
-function getHomePageRoutes(callback) {
+function getHomePageRoutes(userData, callback) {
 	async.waterfall([
 		function (next) {
 			db.getSortedSetRange('cid:0:children', 0, -1, next);
@@ -206,9 +190,36 @@ function getHomePageRoutes(callback) {
 					route: 'popular',
 					name: 'Popular',
 				},
-			].concat(categoryData) }, next);
+			].concat(categoryData, [
+				{
+					route: 'custom',
+					name: 'Custom',
+				},
+			]) }, next);
 		},
 		function (data, next) {
+			// Set selected for each route
+			var customIdx;
+			var hasSelected = false;
+			data.routes = data.routes.map(function (route, idx) {
+				if (route.route === userData.settings.homePageRoute) {
+					route.selected = true;
+					hasSelected = true;
+				} else {
+					route.selected = false;
+				}
+
+				if (route.route === 'custom') {
+					customIdx = idx;
+				}
+
+				return route;
+			});
+
+			if (!hasSelected && customIdx && userData.settings.homePageRoute !== 'none') {
+				data.routes[customIdx].selected = true;
+			}
+
 			next(null, data.routes);
 		},
 	], callback);

From 0b101fa3eb55ddc3e1a28836846fcde09f566852 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Tue, 11 Jul 2017 16:18:20 -0400
Subject: [PATCH 13/67] composer-default

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6592fe6b18..fbe4ad5246 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "morgan": "^1.3.2",
     "mousetrap": "^1.5.3",
     "nconf": "~0.8.2",
-    "nodebb-plugin-composer-default": "5.0.0",
+    "nodebb-plugin-composer-default": "5.0.1",
     "nodebb-plugin-dbsearch": "2.0.4",
     "nodebb-plugin-emoji-extended": "1.1.1",
     "nodebb-plugin-emoji-one": "1.2.1",

From 0e0d961f7c1159294477b158844775c1b38051d1 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Tue, 11 Jul 2017 16:40:04 -0400
Subject: [PATCH 14/67] dont change templateData

---
 src/widgets/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/widgets/index.js b/src/widgets/index.js
index 982b40c696..d14016cf42 100644
--- a/src/widgets/index.js
+++ b/src/widgets/index.js
@@ -70,7 +70,7 @@ function renderWidget(widget, uid, options, callback) {
 			}
 		},
 		function (config, next) {
-			var templateData = _.assign(options.templateData, { config: config });
+			var templateData = _.assign({ }, options.templateData, { config: config });
 			plugins.fireHook('filter:widget.render:' + widget.widget, {
 				uid: uid,
 				area: options,

From 71e3fea55b5cc388e3f1e1ae25e4a8f40897aa5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Tue, 11 Jul 2017 19:18:47 -0400
Subject: [PATCH 15/67] closes #5802

---
 .../dismiss_flags_from_deleted_topics.js      | 66 ++++++++++++++++++-
 1 file changed, 65 insertions(+), 1 deletion(-)

diff --git a/src/upgrades/1.1.0/dismiss_flags_from_deleted_topics.js b/src/upgrades/1.1.0/dismiss_flags_from_deleted_topics.js
index 6cbf6b7254..37e2fce239 100644
--- a/src/upgrades/1.1.0/dismiss_flags_from_deleted_topics.js
+++ b/src/upgrades/1.1.0/dismiss_flags_from_deleted_topics.js
@@ -34,8 +34,72 @@ module.exports = {
 				}).filter(Boolean);
 
 				winston.verbose('[2016/04/29] ' + toDismiss.length + ' dismissable flags found');
-				async.each(toDismiss, posts.dismissFlag, next);
+				async.each(toDismiss, dismissFlag, next);
 			},
 		], callback);
 	},
 };
+
+// copied from core since this function was removed
+// https://github.com/NodeBB/NodeBB/blob/v1.x.x/src/posts/flags.js
+function dismissFlag(pid, callback) {
+	async.waterfall([
+		function (next) {
+			db.getObjectFields('post:' + pid, ['pid', 'uid', '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();
+						}
+					} 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) {
+								if (err) {
+									return next(err);
+								}
+
+								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'),
+				async.apply(db.deleteObjectFields, 'post:' + pid, ['flag:state', 'flag:assignee', 'flag:notes', 'flag:history']),
+			], next);
+		},
+		function (results, next) {
+			db.sortedSetsRemoveRangeByScore(['users:flags'], '-inf', 0, next);
+		},
+	], callback);
+}

From d478deb4fee4c5c0b79c50ce65cb99f75f6b986b Mon Sep 17 00:00:00 2001
From: "Misty (Bot)" <deploy@nodebb.org>
Date: Wed, 12 Jul 2017 09:23:22 +0000
Subject: [PATCH 16/67] Latest translations and fallbacks

---
 .../pt-BR/admin/appearance/customise.json     |  4 ++--
 .../pt-BR/admin/development/info.json         |  4 ++--
 .../pt-BR/admin/general/dashboard.json        | 18 ++++++++---------
 .../pt-BR/admin/general/languages.json        |  2 +-
 .../pt-BR/admin/manage/categories.json        |  2 +-
 .../language/pt-BR/admin/manage/groups.json   |  2 +-
 .../pt-BR/admin/settings/advanced.json        |  2 +-
 .../pt-BR/admin/settings/general.json         |  2 +-
 .../language/pt-BR/admin/settings/post.json   |  4 ++--
 .../pt-BR/admin/settings/reputation.json      |  2 +-
 .../language/pt-BR/admin/settings/user.json   |  6 +++---
 public/language/pt-BR/email.json              |  8 ++++----
 public/language/pt-BR/error.json              |  8 ++++----
 public/language/pt-BR/global.json             |  4 ++--
 public/language/pt-BR/groups.json             |  2 +-
 public/language/pt-BR/modules.json            |  2 +-
 public/language/pt-BR/notifications.json      | 20 +++++++++----------
 public/language/pt-BR/topic.json              |  4 ++--
 public/language/pt-BR/user.json               |  4 ++--
 public/language/zh-CN/global.json             |  4 ++--
 public/language/zh-CN/topic.json              |  2 +-
 21 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/public/language/pt-BR/admin/appearance/customise.json b/public/language/pt-BR/admin/appearance/customise.json
index b09feb1da0..b03e02e9f3 100644
--- a/public/language/pt-BR/admin/appearance/customise.json
+++ b/public/language/pt-BR/admin/appearance/customise.json
@@ -7,6 +7,6 @@
 	"custom-header.description": "Adicione HTML pessoal aqui (ex. JavaScript, Meta Tags, Tags, etc), os quais serão acrescentados ao final da seção <code>&lt;head&gt;</code> do markup do seu fórum.",
 	"custom-header.enable": "Ligar o Cabeçalho Personalizado",
 
-	"custom-css.livereload": "Enable Live Reload",
-	"custom-css.livereload.description": "Enable this to force all sessions on every device under your account to refresh whenever you click save"
+	"custom-css.livereload": "Habilitar Recarregamento Automático",
+	"custom-css.livereload.description": "Ligue isso para forçar com que todas as sessões em todos os dispositivos em tua conta atualizem quando quer que você clique em salvar"
 }
\ No newline at end of file
diff --git a/public/language/pt-BR/admin/development/info.json b/public/language/pt-BR/admin/development/info.json
index 4d754e5d85..f877120a7f 100644
--- a/public/language/pt-BR/admin/development/info.json
+++ b/public/language/pt-BR/admin/development/info.json
@@ -1,12 +1,12 @@
 {
 	"you-are-on": "Informação - Você está em <strong>%1:%2</strong>",
-	"nodes-responded": "%1 nodes responded within %2ms!",
+	"nodes-responded": "%1 nodes respondidos dentro de %2ms!",
 	"host": "host",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "online",
 	"git": "git",
-	"memory": "memory",
+	"memory": "memória",
 	"load": "carregar",
 	"uptime": "tempo rodando",
 
diff --git a/public/language/pt-BR/admin/general/dashboard.json b/public/language/pt-BR/admin/general/dashboard.json
index c6621b2593..8f28d3d0fb 100644
--- a/public/language/pt-BR/admin/general/dashboard.json
+++ b/public/language/pt-BR/admin/general/dashboard.json
@@ -5,14 +5,14 @@
 	"users": "Usuários",
 	"posts": "Posts",
 	"topics": "Tópicos",
-	"page-views-seven": "Last 7 Days",
-	"page-views-thirty": "Last 30 Days",
-	"page-views-last-day": "Last 24 hours",
-	"page-views-custom": "Custom Date Range",
-	"page-views-custom-start": "Range Start",
-	"page-views-custom-end": "Range End",
-	"page-views-custom-help": "Enter a date range of page views you would like to view. If no date picker is available, the accepted format is <code>YYYY-MM-DD</code>",
-	"page-views-custom-error": "Please enter a valid date range in the format <code>YYYY-MM-DD</code>",
+	"page-views-seven": "Últimos 7 Dias",
+	"page-views-thirty": "Últimos 30 Dias",
+	"page-views-last-day": "Últimas 24 horas",
+	"page-views-custom": "Alcançe de Data Personalizado",
+	"page-views-custom-start": "Ínicio do Alcance",
+	"page-views-custom-end": "Fim do Alcance",
+	"page-views-custom-help": "Entre uma data de alcance de visualizações de página que você quer ver. Se nenhum selecionador de data estiver disponível, o formato aceito é  <code>AAAA-MM-DD</code>",
+	"page-views-custom-error": "Por favor entre com um alcance de data válido no formato <code>AAAA-MM-DD</code>",
 
 	"stats.day": "Dia",
 	"stats.week": "Semana",
@@ -26,7 +26,7 @@
 	"upgrade-available": "<p>Uma nova versão (v%1) foi lançada. Leve em consideração <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">atualizar o seu NodeBB</a>.</p>",
 	"prerelease-upgrade-available": "<p>Esta versão um pre-release antigo do NodeBB. Uma nova versão (v%1) foi lançada. Leve em consideração <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">atualizar o seu NodeBB</a>.</p>",
 	"prerelease-warning": "<p>Esta é uma versão <strong>pre-release</strong> do NodeBB. Bugs inesperados podem ocorrer. <i class=\"fa fa-exclamation-triangle\"></i></p>",
-	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
+	"running-in-development": "<span>O fórum está sendo executado em modo de desenvolvedor. O fórum pode estar abrto à potenciais vulnerabilidades; por favor, entre em contato com o seu administrador de sistemas.</span>",
 
 	"notices": "Avisos",
 	"restart-not-required": "Reiniciar não é necessário",
diff --git a/public/language/pt-BR/admin/general/languages.json b/public/language/pt-BR/admin/general/languages.json
index fe5213d0dc..53fa515534 100644
--- a/public/language/pt-BR/admin/general/languages.json
+++ b/public/language/pt-BR/admin/general/languages.json
@@ -2,5 +2,5 @@
 	"language-settings": "Configurações de Idioma",
 	"description": "O idioma padrão determina as configurações de idioma para todos os usuários que estiverem visitando o seu fórum. <br />Usuários individuais podem sobrepor o idioma padrão em sua página de configurações de conta.",
 	"default-language": "Idioma Padrão",
-	"auto-detect": "Auto Detect Language Setting for Guests"
+	"auto-detect": "Auto Detectar Configurações de Idioma para Convidados"
 }
\ No newline at end of file
diff --git a/public/language/pt-BR/admin/manage/categories.json b/public/language/pt-BR/admin/manage/categories.json
index f2f06cf835..f63e2d327d 100644
--- a/public/language/pt-BR/admin/manage/categories.json
+++ b/public/language/pt-BR/admin/manage/categories.json
@@ -10,7 +10,7 @@
 	"custom-class": "Classe Personalizada",
 	"num-recent-replies": "# de Respostas Recentes",
 	"ext-link": "Link Externo",
-	"is-section": "Treat this category as a section",
+	"is-section": "Trate estacategoria como uma seção",
 	"upload-image": "Fazer upload de Imagem",
 	"delete-image": "Remover",
 	"category-image": "Imagem da Categoria",
diff --git a/public/language/pt-BR/admin/manage/groups.json b/public/language/pt-BR/admin/manage/groups.json
index 6ec69b4ac5..2fb3557563 100644
--- a/public/language/pt-BR/admin/manage/groups.json
+++ b/public/language/pt-BR/admin/manage/groups.json
@@ -1,7 +1,7 @@
 {
 	"name": "Nome do Grupo",
 	"description": "Descrição do Grupo",
-	"member-count": "Member Count",
+	"member-count": "Número de Membros",
 	"system": "Grupo do Sistema",
 	"edit": "Editar",
 	"search-placeholder": "Procurar",
diff --git a/public/language/pt-BR/admin/settings/advanced.json b/public/language/pt-BR/admin/settings/advanced.json
index 87f5545286..8d4cbdf5de 100644
--- a/public/language/pt-BR/admin/settings/advanced.json
+++ b/public/language/pt-BR/admin/settings/advanced.json
@@ -6,7 +6,7 @@
 	"headers.allow-from": "Defina ALLOW-FROM para Colocar o NodeBB em um iFrame",
 	"headers.powered-by": "Personalizar o cabeçalho de \"Powered By\" enviado pelo NodeBB",
 	"headers.acao": "Access-Control-Allow-Origin",
-	"headers.acao-help": "To deny access to all sites, leave empty",
+	"headers.acao-help": "Para impedir o acesso à todos os sites, deixe vazio",
 	"headers.acam": "Access-Control-Allow-Methods",
 	"headers.acah": "Access-Control-Allow-Headers",
 	"traffic-management": "Administração de Tráfego",
diff --git a/public/language/pt-BR/admin/settings/general.json b/public/language/pt-BR/admin/settings/general.json
index cccd319950..7d5ec37639 100644
--- a/public/language/pt-BR/admin/settings/general.json
+++ b/public/language/pt-BR/admin/settings/general.json
@@ -28,5 +28,5 @@
 	"outgoing-links": "Links Externos",
 	"outgoing-links.warning-page": "Utilizar Página de Aviso de Links Externos",
 	"search-default-sort-by": "Padrão de ordenação de pesquisa por",
-	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page"
+	"outgoing-links.whitelist": "Domínios para colocar na lista branca de passar pela página de aviso"
 }
\ No newline at end of file
diff --git a/public/language/pt-BR/admin/settings/post.json b/public/language/pt-BR/admin/settings/post.json
index 902000e386..35739bee69 100644
--- a/public/language/pt-BR/admin/settings/post.json
+++ b/public/language/pt-BR/admin/settings/post.json
@@ -29,8 +29,8 @@
 	"unread": "Configurações de Não-Lidos",
 	"unread.cutoff": "Data de corte de não-lidos",
 	"unread.min-track-last": "Mínimo de posts no tópico antes de rastrear o último lido",
-	"recent": "Recent Settings",
-	"recent.categoryFilter.disable": "Disable filtering of topics in ignored categories on the /recent page",
+	"recent": "Configurações Recentes",
+	"recent.categoryFilter.disable": "Desailitar filtragem de tópicos em categorias ignoradas na página /recente",
 	"signature": "Configurações de Assinatura",
 	"signature.disable": "Desabilitar assinaturas",
 	"signature.no-links": "Desabilitar links em assinaturas",
diff --git a/public/language/pt-BR/admin/settings/reputation.json b/public/language/pt-BR/admin/settings/reputation.json
index 86d774ff99..3dbd88f69b 100644
--- a/public/language/pt-BR/admin/settings/reputation.json
+++ b/public/language/pt-BR/admin/settings/reputation.json
@@ -2,7 +2,7 @@
 	"reputation": "Configurações de Reputação",
 	"disable": "Desabilitar o Sistema de Reputação",
 	"disable-down-voting": "Desabilitar Baixo Votar",
-	"votes-are-public": "All Votes Are Public",
+	"votes-are-public": "Todos os Votos São Públicos",
 	"thresholds": "Limiares de Atividade",
 	"min-rep-downvote": "Reputação mínima para votar negativamente em posts",
 	"min-rep-flag": "Reputação mínima para sinalizar posts"
diff --git a/public/language/pt-BR/admin/settings/user.json b/public/language/pt-BR/admin/settings/user.json
index a849488cc9..ac07df60f3 100644
--- a/public/language/pt-BR/admin/settings/user.json
+++ b/public/language/pt-BR/admin/settings/user.json
@@ -34,12 +34,12 @@
 	"registration.max-invites": "Máximo de Convites por Usuário",
 	"max-invites": "Máximo de Convites por Usuário",
 	"max-invites-help": "0 para nenhuma restrição. Administradores tem convites infinitos<br>Apenas aplicável para \"Apenas Convite\"",
-	"invite-expiration": "Invite expiration",
-	"invite-expiration-help": "# of days invitations expire in.",
+	"invite-expiration": "Vencimento do convite",
+	"invite-expiration-help": "núm. de dias em que o convite vence.",
 	"min-username-length": "Tamanho Mínimo do Nome de Usuário",
 	"max-username-length": "Tamanho Máximo do Nome de Usuário",
 	"min-password-length": "Tamanho Mínimo da Senha",
-	"min-password-strength": "Minimum Password Strength",
+	"min-password-strength": "Força Mínima da Senha",
 	"max-about-me-length": "Tamanho Máximo do Sobre Mim",
 	"terms-of-use": "Termos de Uso do Fórum <small>(Deixar em branco para desabilitar)</small>",
 	"user-search": "Pesquisa de Usuário",
diff --git a/public/language/pt-BR/email.json b/public/language/pt-BR/email.json
index 766152ee05..b70c27d5c2 100644
--- a/public/language/pt-BR/email.json
+++ b/public/language/pt-BR/email.json
@@ -32,9 +32,9 @@
     "notif.post.unsub.info": "Esta notificação de postagem foi enviada para você devido as suas configurações de assinatura.",
     "test.text1": "Este é um e-mail de teste, para verificar que o enviador de emails está corretamente configurado no seu NodeBB.",
     "unsub.cta": "Clique aqui para alterar estas configurações",
-    "banned.subject": "You have been banned from %1",
-    "banned.text1": "The user %1 has been banned from %2.",
-    "banned.text2": "This ban will last until %1.",
-    "banned.text3": "This is the reason why you have been banned:",
+    "banned.subject": "Você foi banido de %1",
+    "banned.text1": "O usuário %1 foi banido de %2.",
+    "banned.text2": "Este banimento dururá até %1.",
+    "banned.text3": "Este é o motivo pelo qual você foi banido:",
     "closing": "Obrigado!"
 }
\ No newline at end of file
diff --git a/public/language/pt-BR/error.json b/public/language/pt-BR/error.json
index 0463e2ad5e..2b203a4ad3 100644
--- a/public/language/pt-BR/error.json
+++ b/public/language/pt-BR/error.json
@@ -1,6 +1,6 @@
 {
     "invalid-data": "Dados Inválidos",
-    "invalid-json": "Invalid JSON",
+    "invalid-json": "JSON Inválido",
     "not-logged-in": "Você não parece estar logado.",
     "account-locked": "Sua conta foi temporariamente bloqueada ",
     "search-requires-login": "É necessário ter uma conta para pesquisar - por favor efetue o login ou cadastre-se.",
@@ -13,7 +13,7 @@
     "invalid-title": "Título inválido!",
     "invalid-user-data": "Dados de Usuário Inválidos",
     "invalid-password": "Senha Inválida",
-    "invalid-login-credentials": "Invalid login credentials",
+    "invalid-login-credentials": "Credenciais de login inválidas",
     "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.",
@@ -32,7 +32,7 @@
     "password-too-long": "A senha é muito grande",
     "user-banned": "Usuário banido",
     "user-banned-reason": "Desculpa, esta conta foi banida (Motivo: %1)",
-    "user-banned-reason-until": "Sorry, this account has been banned until %1 (Reason: %2)",
+    "user-banned-reason-until": "Desculpe, esta conta foi banida até %1 (Motivo: %2)",
     "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": "Por favor forneça uma data para o fim deste banimento",
@@ -107,7 +107,7 @@
     "chat-disabled": "O sistema de chat foi desabilitado",
     "too-many-messages": "Você enviou muitas mensagens, por favor aguarde um momento.",
     "invalid-chat-message": "Mensagem de chat inválida",
-    "chat-message-too-long": "Chat messages can not be longer than %1 characters.",
+    "chat-message-too-long": "Mensagens de chat não podem ter mais do que %1 caracteres.",
     "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",
diff --git a/public/language/pt-BR/global.json b/public/language/pt-BR/global.json
index f173968642..57cfa84c16 100644
--- a/public/language/pt-BR/global.json
+++ b/public/language/pt-BR/global.json
@@ -104,6 +104,6 @@
     "cookies.accept": "Entendi!",
     "cookies.learn_more": "Saber Mais",
     "edited": "Editado",
-    "disabled": "Disabled",
-    "select": "Select"
+    "disabled": "Desligado",
+    "select": "Escolha"
 }
\ No newline at end of file
diff --git a/public/language/pt-BR/groups.json b/public/language/pt-BR/groups.json
index 9edc536dfa..5c411ec37c 100644
--- a/public/language/pt-BR/groups.json
+++ b/public/language/pt-BR/groups.json
@@ -27,7 +27,7 @@
     "details.disableJoinRequests": "Desabilitar pedidos de participação",
     "details.grant": "Conceder/Retomar a Posse",
     "details.kick": "Chutar",
-    "details.kick_confirm": "Are you sure you want to remove this member from the group?",
+    "details.kick_confirm": "Você tem certeza que deseja remover este membro do grupo?",
     "details.owner_options": "Administração do Grupo",
     "details.group_name": "Nome do Grupo",
     "details.member_count": "Número de Membros",
diff --git a/public/language/pt-BR/modules.json b/public/language/pt-BR/modules.json
index 0a2425ce03..9a61633ba3 100644
--- a/public/language/pt-BR/modules.json
+++ b/public/language/pt-BR/modules.json
@@ -20,7 +20,7 @@
     "chat.three_months": "3 Meses",
     "chat.delete_message_confirm": "Tem certeza que deseja excluir esta mensagem?",
     "chat.add-users-to-room": "Adicionar usuários à sala",
-    "chat.confirm-chat-with-dnd-user": "This user has set their status to DnD(Do not disturb). Do you still want to chat with them?",
+    "chat.confirm-chat-with-dnd-user": "Este usuário definiu seu estado como DnD(Do not disturb─Não perturbe). Você ainda assim quer conversar com ele?",
     "composer.compose": "Compor",
     "composer.show_preview": "Exibir Pré-visualização",
     "composer.hide_preview": "Esconder Pré-visualização",
diff --git a/public/language/pt-BR/notifications.json b/public/language/pt-BR/notifications.json
index 2f2aaed17a..f7a14a5aa1 100644
--- a/public/language/pt-BR/notifications.json
+++ b/public/language/pt-BR/notifications.json
@@ -10,15 +10,15 @@
     "return_to": "Voltar para %1",
     "new_notification": "Nova Notificação",
     "you_have_unread_notifications": "Você possui notificações não lidas.",
-    "all": "All",
-    "topics": "Topics",
-    "replies": "Replies",
-    "chat": "Chats",
-    "follows": "Follows",
-    "upvote": "Upvotes",
-    "new-flags": "New Flags",
-    "my-flags": "Flags assigned to me",
-    "bans": "Bans",
+    "all": "Tudo",
+    "topics": "Tópicos",
+    "replies": "Respostas",
+    "chat": "Conversas",
+    "follows": "Seguindo",
+    "upvote": "Cimavotos",
+    "new-flags": "Novas Sinalizações",
+    "my-flags": "Sinalizações designadas à mim",
+    "bans": "Banimentos",
     "new_message_from": "Nova mensagem de <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> deu voto positivo para seu post em <strong>%2</strong>.",
     "upvoted_your_post_in_dual": "<strong>%1</strong> e <strong>%2</strong> deram voto positivo ao seu post em <strong>%3</strong>.",
@@ -40,7 +40,7 @@
     "user_started_following_you_multiple": "<strong>%1</strong> e %2 outros começaram a lhe acompanhar.",
     "new_register": "<strong>%1</strong> lhe enviou um pedido de cadastro.",
     "new_register_multiple": "Há <strong>%1</strong> pedidos de registro aguardando revisão.",
-    "flag_assigned_to_you": "<strong>Flag %1</strong> has been assigned to you",
+    "flag_assigned_to_you": "A Sinalização %1</strong> foi desiganada para você",
     "email-confirmed": "Email Confirmado",
     "email-confirmed-message": "Obrigado por validar o seu email. Agora sua conta está plenamente ativada.",
     "email-confirm-error-message": "Houve um problema ao validar o seu endereço de email. Talvez o código era invalido ou tenha expirado.",
diff --git a/public/language/pt-BR/topic.json b/public/language/pt-BR/topic.json
index 8e6ed0aa7e..6ae93feb95 100644
--- a/public/language/pt-BR/topic.json
+++ b/public/language/pt-BR/topic.json
@@ -14,7 +14,7 @@
     "quote": "Citar",
     "reply": "Responder",
     "replies_to_this_post": "%1 Respostas",
-    "one_reply_to_this_post": "1 Reply",
+    "one_reply_to_this_post": "1 Resposta",
     "last_reply_time": "Última resposta",
     "reply-as-topic": "Responder como tópico",
     "guest-login-reply": "Entre para responder",
@@ -59,7 +59,7 @@
     "thread_tools.unlock": "Destrancar Tópico",
     "thread_tools.move": "Mover Tópico",
     "thread_tools.move_all": "Mover Tudo",
-    "thread_tools.select_category": "Select Category",
+    "thread_tools.select_category": "Escolha a Categoria",
     "thread_tools.fork": "Ramificar Tópico",
     "thread_tools.delete": "Deletar Tópico",
     "thread_tools.delete-posts": "Deletar Posts",
diff --git a/public/language/pt-BR/user.json b/public/language/pt-BR/user.json
index e242fc41b4..9b3ff880e8 100644
--- a/public/language/pt-BR/user.json
+++ b/public/language/pt-BR/user.json
@@ -60,7 +60,7 @@
     "username_taken_workaround": "O nome de usuário que você escolheu já existia, então nós o alteramos um pouquinho. Agora você é conhecido como <strong>%1</strong>",
     "password_same_as_username": "A sua senha é igual ao seu nome de usuário, por favor escolha outra senha.",
     "password_same_as_email": "Tua senha é a mesma que o teu email, por favor escolha outra senha.",
-    "weak_password": "Weak password.",
+    "weak_password": "Senha fraca.",
     "upload_picture": "Carregar Foto",
     "upload_a_picture": "Carregue uma Foto",
     "remove_uploaded_picture": "Remover Foto Enviada",
@@ -132,5 +132,5 @@
     "info.email-history": "Histórico do Email",
     "info.moderation-note": "Nota da Moderação",
     "info.moderation-note.success": "Nota da moderação salva",
-    "info.moderation-note.add": "Add note"
+    "info.moderation-note.add": "Adicionar nota"
 }
\ No newline at end of file
diff --git a/public/language/zh-CN/global.json b/public/language/zh-CN/global.json
index 8cc6f51c61..3fca087799 100644
--- a/public/language/zh-CN/global.json
+++ b/public/language/zh-CN/global.json
@@ -104,6 +104,6 @@
     "cookies.accept": "知道了！",
     "cookies.learn_more": "了解更多",
     "edited": "已编辑",
-    "disabled": "Disabled",
-    "select": "Select"
+    "disabled": "禁用",
+    "select": "选择"
 }
\ No newline at end of file
diff --git a/public/language/zh-CN/topic.json b/public/language/zh-CN/topic.json
index 84cfc9924f..63d808ecd6 100644
--- a/public/language/zh-CN/topic.json
+++ b/public/language/zh-CN/topic.json
@@ -59,7 +59,7 @@
     "thread_tools.unlock": "解锁主题",
     "thread_tools.move": "移动主题",
     "thread_tools.move_all": "移动全部",
-    "thread_tools.select_category": "Select Category",
+    "thread_tools.select_category": "选择版块",
     "thread_tools.fork": "分割主题",
     "thread_tools.delete": "删除主题",
     "thread_tools.delete-posts": "删除这些帖子",

From e613064b06120e8aff24f5f37382accfc2f77737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Wed, 12 Jul 2017 17:21:15 -0400
Subject: [PATCH 17/67] closes #5819

---
 public/language/en-GB/admin/extend/plugins.json    | 4 ++--
 public/language/en-GB/admin/general/dashboard.json | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/language/en-GB/admin/extend/plugins.json b/public/language/en-GB/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/en-GB/admin/extend/plugins.json
+++ b/public/language/en-GB/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/en-GB/admin/general/dashboard.json b/public/language/en-GB/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/en-GB/admin/general/dashboard.json
+++ b/public/language/en-GB/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 

From bca79da8c648955154ec21b364d2194848f75500 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Wed, 12 Jul 2017 19:29:41 -0400
Subject: [PATCH 18/67] closes #4197

add in-topic search support to dbsearch
prevent multiple click handlers on in-topic search widget(each click was
causing multiple scrolls)
fix index
---
 package.json                    | 2 +-
 public/src/client/topic.js      | 2 +-
 public/src/modules/navigator.js | 2 +-
 public/src/modules/search.js    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index fbe4ad5246..935f3d130e 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "mousetrap": "^1.5.3",
     "nconf": "~0.8.2",
     "nodebb-plugin-composer-default": "5.0.1",
-    "nodebb-plugin-dbsearch": "2.0.4",
+    "nodebb-plugin-dbsearch": "2.0.5",
     "nodebb-plugin-emoji-extended": "1.1.1",
     "nodebb-plugin-emoji-one": "1.2.1",
     "nodebb-plugin-markdown": "8.0.0",
diff --git a/public/src/client/topic.js b/public/src/client/topic.js
index 08a707f029..0a0d857663 100644
--- a/public/src/client/topic.js
+++ b/public/src/client/topic.js
@@ -99,7 +99,7 @@ define('forum/topic', [
 
 	function handleTopicSearch() {
 		require(['search', 'mousetrap'], function (search, mousetrap) {
-			$('.topic-search')
+			$('.topic-search').off('click')
 				.on('click', '.prev', function () {
 					search.topicDOM.prev();
 				})
diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js
index a7fd657cac..d8b8cb4fe2 100644
--- a/public/src/modules/navigator.js
+++ b/public/src/modules/navigator.js
@@ -245,7 +245,7 @@ define('navigator', ['forum/pagination', 'components'], function (pagination, co
 			}
 		}
 
-		var page = Math.max(1, Math.ceil(index / config.postsPerPage));
+		var page = Math.max(1, Math.ceil((index + 1) / config.postsPerPage));
 
 		if (parseInt(page, 10) !== ajaxify.data.pagination.currentPage) {
 			pagination.loadPage(page, function () {
diff --git a/public/src/modules/search.js b/public/src/modules/search.js
index ce24bd4c40..daf9fae820 100644
--- a/public/src/modules/search.js
+++ b/public/src/modules/search.js
@@ -156,7 +156,7 @@ define('search', ['navigator', 'translator', 'storage'], function (nav, translat
 					return app.alertError(err.message);
 				}
 
-				nav.scrollToPost(postIndex, true);
+				nav.scrollToIndex(postIndex, true);
 			});
 		} else {
 			translator.translate('[[search:no-matches]]', function (text) {

From e6d0dde7b41a1b1877210c1f1c1f3241902c8900 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Wed, 12 Jul 2017 19:35:20 -0400
Subject: [PATCH 19/67] up dbsearch

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 935f3d130e..821dbc2aec 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "mousetrap": "^1.5.3",
     "nconf": "~0.8.2",
     "nodebb-plugin-composer-default": "5.0.1",
-    "nodebb-plugin-dbsearch": "2.0.5",
+    "nodebb-plugin-dbsearch": "2.0.6",
     "nodebb-plugin-emoji-extended": "1.1.1",
     "nodebb-plugin-emoji-one": "1.2.1",
     "nodebb-plugin-markdown": "8.0.0",

From 0f5be5ae255b47e6de4aeb02df061559ae17cf0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Wed, 12 Jul 2017 19:44:35 -0400
Subject: [PATCH 20/67] remove plugin.hook check

---
 src/topics.js  | 12 ++++--------
 test/topics.js |  7 -------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/topics.js b/src/topics.js
index 3952f7b402..81bfccefc2 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -326,12 +326,8 @@ Topics.isLocked = function (tid, callback) {
 };
 
 Topics.search = function (tid, term, callback) {
-	if (plugins.hasListeners('filter:topic.search')) {
-		plugins.fireHook('filter:topic.search', {
-			tid: tid,
-			term: term,
-		}, callback);
-	} else {
-		callback(new Error('[[error:no-plugins-available]]'), []);
-	}
+	plugins.fireHook('filter:topic.search', {
+		tid: tid,
+		term: term,
+	}, callback);
 };
diff --git a/test/topics.js b/test/topics.js
index a1d0bda512..0592b9d030 100644
--- a/test/topics.js
+++ b/test/topics.js
@@ -1505,13 +1505,6 @@ describe('Topic\'s', function () {
 			});
 		});
 
-		it('should error if no search plugin', function (done) {
-			socketTopics.search({ uid: adminUid }, { tid: topic.tid, term: 'test' }, function (err) {
-				assert.equal(err.message, '[[error:no-plugins-available]]');
-				done();
-			});
-		});
-
 		it('should return results', function (done) {
 			var plugins = require('../src/plugins');
 			plugins.registerHook('myTestPlugin', {

From 4056283fd50ac89cdaaca482ea78a0146028787b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Wed, 12 Jul 2017 19:47:08 -0400
Subject: [PATCH 21/67] always return array

---
 src/topics.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/topics.js b/src/topics.js
index 81bfccefc2..8dd5df0c13 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -329,5 +329,7 @@ Topics.search = function (tid, term, callback) {
 	plugins.fireHook('filter:topic.search', {
 		tid: tid,
 		term: term,
-	}, callback);
+	}, function (err, pids) {
+		callback(err, Array.isArray(pids) ? pids : []);
+	});
 };

From 5888a5ffc455d61b89f0b4384fc0c0ba063584f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Wed, 12 Jul 2017 20:10:19 -0400
Subject: [PATCH 22/67] closes #5010

init plugin hooks before resetting widgets, the areas are returned by
`filter:widgets.getAreas`
---
 src/reset.js         | 13 ++++++++-----
 src/widgets/index.js |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/reset.js b/src/reset.js
index 4b45821ddf..3d2fab2e0f 100644
--- a/src/reset.js
+++ b/src/reset.js
@@ -10,7 +10,6 @@ var events = require('./events');
 
 var Reset = {};
 
-
 Reset.reset = function (callback) {
 	db.init(function (err) {
 		if (err) {
@@ -163,10 +162,14 @@ function resetPlugins(callback) {
 }
 
 function resetWidgets(callback) {
-	require('./widgets').reset(function (err) {
-		winston.info('[reset] All Widgets moved to Draft Zone');
-		callback(err);
-	});
+	async.waterfall([
+		require('./plugins').reload,
+		require('./widgets').reset,
+		function (next) {
+			winston.info('[reset] All Widgets moved to Draft Zone');
+			next();
+		},
+	], callback);
 }
 
 module.exports = Reset;
diff --git a/src/widgets/index.js b/src/widgets/index.js
index d14016cf42..9071989722 100644
--- a/src/widgets/index.js
+++ b/src/widgets/index.js
@@ -193,7 +193,7 @@ widgets.reset = function (callback) {
 		function (results, next) {
 			drafts = results.drafts || [];
 
-			async.each(results.areas, function (area, next) {
+			async.eachSeries(results.areas, function (area, next) {
 				async.waterfall([
 					function (next) {
 						widgets.getArea(area.template, area.location, next);

From 0e4fba7c6cb3d06fcdf52382c5f3e1fee16b4009 Mon Sep 17 00:00:00 2001
From: "Misty (Bot)" <deploy@nodebb.org>
Date: Thu, 13 Jul 2017 09:23:25 +0000
Subject: [PATCH 23/67] Latest translations and fallbacks

---
 public/language/he/error.json                |  6 +-
 public/language/sr/admin/settings/email.json | 42 +++++-----
 public/language/sr/admin/settings/post.json  | 86 ++++++++++----------
 3 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/public/language/he/error.json b/public/language/he/error.json
index f5e33a6e10..4a7e36b65e 100644
--- a/public/language/he/error.json
+++ b/public/language/he/error.json
@@ -49,7 +49,7 @@
     "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": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "הנך רשאי לערוך פוסט למשך %1 שעות %2 דקות מרגע פרסומו.",
     "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",
@@ -75,8 +75,8 @@
     "still-uploading": "אנא המתן לסיום ההעלאות",
     "file-too-big": "הגודל המקסימלי של הקובץ הוא %1 קילובייט - אנא העלה קובץ קטן יותר",
     "guest-upload-disabled": "העלאת אורחים אינה מאופשרת",
-    "already-bookmarked": "You have already bookmarked this post",
-    "already-unbookmarked": "You have already unbookmarked this post",
+    "already-bookmarked": "כבר הוספת פוסט זה לרשימת המסומנים",
+    "already-unbookmarked": "כבר הסרת פוסט זה מרשימת המסומנים",
     "cant-ban-other-admins": "אינך יכול לחסום מנהלים אחרים!",
     "cant-remove-last-admin": "אתה המנהל היחיד. הוסף משתמש אחר לניהול לפני שאתה מוריד את עצמך מניהול",
     "cant-delete-admin": "משתמש זה מוגדר כמנהל. על מנת למחוק את המשתמש, עליך להסיר קודם את גישותיו.",
diff --git a/public/language/sr/admin/settings/email.json b/public/language/sr/admin/settings/email.json
index 1e92c88490..861b1f67f3 100644
--- a/public/language/sr/admin/settings/email.json
+++ b/public/language/sr/admin/settings/email.json
@@ -1,25 +1,25 @@
 {
-	"email-settings": "Email Settings",
-	"address": "Email Address",
-	"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
-	"from": "From Name",
+	"email-settings": "Podešavanje Email-a",
+	"address": "Email adresa",
+	"address-help": "Označena email adresa se odnosi na email koga će primalac videti \"Od\" i \"Odgovori\" poljima.",
+	"from": "Od koga",
 	"from-help": "The from name to display in the email.",
-	"gmail-routing": "Gmail Routing",
-	"gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to <a href=\"https://www.google.com/settings/security/lesssecureapps\">configure your GMail account to allow less secure apps</a>.",
-	"gmail-routing-help2": "For more information about this workaround, <a href=\"https://nodemailer.com/using-gmail/\">please consult this NodeMailer article on the issue.</a> An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. <a href=\"{config.relative_path}/admin/extend/plugins\">Browse available plugins here</a>.",
-	"gmail-transport": "Route emails through a Gmail/Google Apps account",
-	"gmail-transport.username": "Username",
-	"gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.",
-	"gmail-transport.password": "Password",
-	"template": "Edit Email Template",
-	"template.select": "Select Email Template",
-	"template.revert": "Revert to Original",
-	"testing": "Email Testing",
-	"testing.select": "Select Email Template",
-	"testing.send": "Send Test Email",
-	"testing.send-help": "The test email will be sent to the currently logged in user's email address.",
-	"subscriptions": "Email Subscriptions",
-	"subscriptions.disable": "Disable subscriber notification emails",
+	"gmail-routing": "Gmail rutiranje",
+	"gmail-routing-help1": "Imamo izveštaje da Gmail rutiranje nije radilo na nalogu za povećanom bezbednošću. U takvom slučaju, moraćete da <a href=\"https://www.google.com/settings/security/lesssecureapps\">podesite Vaš GMail nalog da prihvati aplikacije sa manjom bezbednoću</a>.",
+	"gmail-routing-help2": "Za više informacija o ovome, <a href=\"https://nodemailer.com/using-gmail/\">molimo konsultujte ovaj NodeMailer članak o ovom problemu.</a> Alternativa bi bila da iskoristite \"third-party\" email plugin-ove kao što su SendGrid, Mailgun, itd. <a href=\"{config.relative_path}/admin/extend/plugins\">Pogledajte plugin-ove ovde</a>.",
+	"gmail-transport": "Rutiraj email-ove kroz nalog Gmail/Google aplikacije.",
+	"gmail-transport.username": "Korisničko ime",
+	"gmail-transport.username-help": "Unesite punu email adresu ovde, pogotovo ako koristite Google aplikacije na upravljanom domenu.",
+	"gmail-transport.password": "Lozinka",
+	"template": "Promeni šablon Email-a",
+	"template.select": "Izaberi šablon Email-a",
+	"template.revert": "Vrati na Originalno podešavanje.",
+	"testing": "Testiranje Email-a",
+	"testing.select": "Izaberi šablon Email-a",
+	"testing.send": "Pošalji probni Email",
+	"testing.send-help": "Probni email će biti poslat na adresu trenutno ulogovanog korisnika",
+	"subscriptions": "Email subskripcije",
+	"subscriptions.disable": "Onemogući notifikacije o email subskripcijama",
 	"subscriptions.hour": "Digest Hour",
-	"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>"
+	"subscriptions.hour-help": "Molim unesite broj koji označava satnicu kada da pošalje zakazani sažeti email (nrp. <code>0</code> za ponoć, <code>17</code> za 5:00 pm). Uzmite u obzir da će se slanje događati po satnici samog servara, i da vrlo verovatno se ne poklapa sa satnicom vašeg sistema. <br /> Trenutno vreme servera je: <span id=\"serverTime\"></span><br /> Sledeći dnevni sažeti email zakazan je za slanje u <span id=\"nextDigestTime\"></span>"
 }
\ No newline at end of file
diff --git a/public/language/sr/admin/settings/post.json b/public/language/sr/admin/settings/post.json
index aca8b39d64..a7e7dd7a98 100644
--- a/public/language/sr/admin/settings/post.json
+++ b/public/language/sr/admin/settings/post.json
@@ -1,46 +1,46 @@
 {
-	"sorting": "Post Sorting",
-	"sorting.post-default": "Default Post Sorting",
-	"sorting.oldest-to-newest": "Oldest to Newest",
-	"sorting.newest-to-oldest": "Newest to Oldest",
-	"sorting.most-votes": "Most Votes",
-	"sorting.topic-default": "Default Topic Sorting",
-	"restrictions": "Posting Restrictions",
-	"restrictions.seconds-between": "Seconds between Posts",
-	"restrictions.seconds-between-new": "Seconds between Posts for New Users",
-	"restrictions.rep-threshold": "Reputation threshold before this restriction is lifted",
-	"restrictions.seconds-defore-new": "Seconds before new user can post",
-	"restrictions.seconds-edit-after": "Number of seconds users are allowed to edit posts after posting. (0 disabled)",
-	"restrictions.seconds-delete-after": "Number of seconds users are allowed to delete posts after posting. (0 disabled)",
-	"restrictions.replies-no-delete": "Number of replies after users are disallowed to delete their own topics. (0 disabled)",
-	"restrictions.min-title-length": "Minimum Title Length",
-	"restrictions.max-title-length": "Maximum Title Length",
-	"restrictions.min-post-length": "Minimum Post Length",
-	"restrictions.max-post-length": "Maximum Post Length",
-	"restrictions.days-until-stale": "Days until Topic is considered stale",
-	"restrictions.stale-help": "If a topic is considered \"stale\", then a warning will be shown to users who attempt to reply to that topic.",
-	"timestamp": "Timestamp",
+	"sorting": "Sortiranje postova",
+	"sorting.post-default": "Uobičajeno sortiranje postova",
+	"sorting.oldest-to-newest": "Od starijih ka novijim",
+	"sorting.newest-to-oldest": "Od novijih ka starijim",
+	"sorting.most-votes": "Najviše glasova",
+	"sorting.topic-default": "Uobičajeno sortiranje tema",
+	"restrictions": "Restrikcije postavljanja",
+	"restrictions.seconds-between": "Sekundi između postova",
+	"restrictions.seconds-between-new": "Sekundi između postova za Novog korisnika",
+	"restrictions.rep-threshold": "Prag reputacije pre nego što su restrikcije skinute",
+	"restrictions.seconds-defore-new": "Sekundi pre nego što novi korisnik može da postuje",
+	"restrictions.seconds-edit-after": "Broj sekundi posle kojih korisnik može da preuredi post pošto ga je postavio. (0 onemogućeno)",
+	"restrictions.seconds-delete-after": "Broj sekundi posle korisniku nije više dozvnoljeno da obriše svoj post posle postavljanja. (0 onemogućeno)",
+	"restrictions.replies-no-delete": "Broj sekundi posle korisniku nije više dozvnoljeno da obriše svoju temu. (0 onemogućeno)",
+	"restrictions.min-title-length": "Minimum karaktera za Naslov",
+	"restrictions.max-title-length": "Maksimum karaktera za Naslov",
+	"restrictions.min-post-length": "Minimum karaktera za Post",
+	"restrictions.max-post-length": "Maksimum karaktera za Post",
+	"restrictions.days-until-stale": "Broj dana koliko je potrebno da prodje pre nego što tema se smatra ustajalom",
+	"restrictions.stale-help": "Ako se tema smatra \"ustajalom\",  onda će upozorenje biti prikazano korisnicima koji su odgovarali na tu temu.",
+	"timestamp": "Vremenski žig",
 	"timestamp.cut-off": "Date cut-off (in days)",
-	"timestamp.cut-off-help": "Dates &amp; times will be shown in a relative manner (e.g. \"3 hours ago\" / \"5 days ago\"), and localised into various\n\t\t\t\t\tlanguages. After a certain point, this text can be switched to display the localised date itself\n\t\t\t\t\t(e.g. 5 Nov 2016 15:30).<br /><em>(Default: <code>30</code>, or one month). Set to 0 to always display dates, leave blank to always display relative times.</em>",
-	"teaser": "Teaser Post",
-	"teaser.last-post": "Last &ndash; Show the latest post, including the original post, if no replies",
-	"teaser.last-reply": "Last &ndash; Show the latest reply, or a \"No replies\" placeholder if no replies",
-	"teaser.first": "First",
-	"unread": "Unread Settings",
-	"unread.cutoff": "Unread cutoff days",
-	"unread.min-track-last": "Minimum posts in topic before tracking last read",
-	"recent": "Recent Settings",
-	"recent.categoryFilter.disable": "Disable filtering of topics in ignored categories on the /recent page",
-	"signature": "Signature Settings",
-	"signature.disable": "Disable signatures",
-	"signature.no-links": "Disable links in signatures",
-	"signature.no-images": "Disable images in signatures",
-	"signature.max-length": "Maximum Signature Length",
-	"composer": "Composer Settings",
-	"composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.",
-	"composer.show-help": "Show \"Help\" tab",
-	"composer.enable-plugin-help": "Allow plugins to add content to the help tab",
-	"composer.custom-help": "Custom Help Text",
-	"ip-tracking": "IP Tracking",
-	"ip-tracking.each-post": "Track IP Address for each post"
+	"timestamp.cut-off-help": "Datumi &amp; vreme će biti pokazano na relativan način (npr. \"pre 3 sata\" / \"pre 5 dana\"), i lokalizovano na različite\n\t\t\t\t\tjezike. Posle određenog vremena, ovaj tekst može biti promenjen na lokalizovani datum\n\t\t\t\t\t(npr. 5 Nov 2016 15:30).<br /><em>(Uobičajeno: <code>30</code>, ili jedan mesec). Postavi na 0 da uvek prikaže datume, ostavi prazno da uvek prikaže relativno vreme.</em>",
+	"teaser": "Post zadirkivač",
+	"teaser.last-post": "Poslednji &ndashč Pokazuje poslednji post, uključujući originalni post, ako nema odgovora",
+	"teaser.last-reply": "Poslednji &ndashč Pokaži najnoviji odgovor, ili ako \"Nema odgovora\" placeholder ako nema odgovora",
+	"teaser.first": "Prvi",
+	"unread": "Nepročitana podešavanja",
+	"unread.cutoff": "Nepročitano tokom prekinutih dana",
+	"unread.min-track-last": "Minimum postova u temi, pre praćenja poslednjeg pročitanog",
+	"recent": "Nedavna Podešavanja",
+	"recent.categoryFilter.disable": "Onemogući filtriranje tema u ignorisanim kategorijama na /recent stranici",
+	"signature": "Podešavanja Potpisa",
+	"signature.disable": "Onemogući potpise",
+	"signature.no-links": "Onemogući linkove u potpisima",
+	"signature.no-images": "Onemogući slike u potpisima",
+	"signature.max-length": "Minimum karaktera u Potpisu",
+	"composer": "Podešavanje Composer-a",
+	"composer-help": "Sledeća podešavanja upravljaju funkcionalnošću i/ili izgledom prikazanom kompozera post-a\n\t\t\t\tprema korisnicima kada prave nove teme, ili odgovaraju na postojeće.",
+	"composer.show-help": "Prikaži tab \"Pomoć\"",
+	"composer.enable-plugin-help": "Dozvoli plugin-ovima da dodaju sadržaj na tab-u \"pomoć\"",
+	"composer.custom-help": "Prilagođen tekst za pomoć",
+	"ip-tracking": "Praćenje IP adrese",
+	"ip-tracking.each-post": "Prati IP Adresu za svaki post"
 }
\ No newline at end of file

From 6ba913d6e64e76b9406fcf62c7250a4d46cc3fc7 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Thu, 13 Jul 2017 14:02:42 -0400
Subject: [PATCH 24/67] up themes

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 821dbc2aec..dcf8d58a27 100644
--- a/package.json
+++ b/package.json
@@ -65,9 +65,9 @@
     "nodebb-plugin-spam-be-gone": "0.5.0",
     "nodebb-rewards-essentials": "0.0.9",
     "nodebb-theme-lavender": "4.0.5",
-    "nodebb-theme-persona": "5.0.12",
+    "nodebb-theme-persona": "5.0.13",
     "nodebb-theme-slick": "1.1.0",
-    "nodebb-theme-vanilla": "6.0.9",
+    "nodebb-theme-vanilla": "6.0.10",
     "nodebb-widget-essentials": "3.0.0",
     "nodemailer": "2.6.4",
     "nodemailer-sendmail-transport": "1.0.0",

From 5a9ae8f4c7946bd41a3c1d9354107dd35ba2e25e Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Thu, 13 Jul 2017 17:18:01 -0400
Subject: [PATCH 25/67] rearrange menu items

---
 src/views/admin/partials/menu.tpl | 32 +++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/views/admin/partials/menu.tpl b/src/views/admin/partials/menu.tpl
index ee1eb8f4a0..fb7f35807a 100644
--- a/src/views/admin/partials/menu.tpl
+++ b/src/views/admin/partials/menu.tpl
@@ -15,10 +15,10 @@
 		<h3 class="menu-section-title">[[admin/menu:section-manage]]</h3>
 		<ul class="menu-section-list">
 			<li><a href="{relative_path}/admin/manage/categories">[[admin/menu:manage/categories]]</a></li>
-			<li><a href="{relative_path}/admin/manage/tags">[[admin/menu:manage/tags]]</a></li>
 			<li><a href="{relative_path}/admin/manage/users">[[admin/menu:manage/users]]</a></li>
-			<li><a href="{relative_path}/admin/manage/registration">[[admin/menu:manage/registration]]</a></li>
 			<li><a href="{relative_path}/admin/manage/groups">[[admin/menu:manage/groups]]</a></li>
+			<li><a href="{relative_path}/admin/manage/tags">[[admin/menu:manage/tags]]</a></li>
+			<li><a href="{relative_path}/admin/manage/registration">[[admin/menu:manage/registration]]</a></li>
 			<li><a href="{relative_path}/admin/manage/ip-blacklist">[[admin/menu:manage/ip-blacklist]]</a></li>
 		</ul>
 	</section>
@@ -27,16 +27,16 @@
 		<h3 class="menu-section-title">[[admin/menu:section-settings]]</h3>
 		<ul class="menu-section-list">
 			<li><a href="{relative_path}/admin/settings/general">[[admin/menu:section-general]]</a></li>
-			<li><a href="{relative_path}/admin/settings/reputation">[[admin/menu:settings/reputation]]</a></li>
-			<li><a href="{relative_path}/admin/settings/email">[[admin/menu:settings/email]]</a></li>
 			<li><a href="{relative_path}/admin/settings/user">[[admin/menu:settings/user]]</a></li>
 			<li><a href="{relative_path}/admin/settings/group">[[admin/menu:settings/group]]</a></li>
+			<li><a href="{relative_path}/admin/settings/tags">[[admin/menu:manage/tags]]</a></li>
+			<li><a href="{relative_path}/admin/settings/post">[[admin/menu:settings/post]]</a></li>
+			<li><a href="{relative_path}/admin/settings/email">[[admin/menu:settings/email]]</a></li>
+			<li><a href="{relative_path}/admin/settings/reputation">[[admin/menu:settings/reputation]]</a></li>
 			<li><a href="{relative_path}/admin/settings/guest">[[admin/menu:settings/guest]]</a></li>
 			<li><a href="{relative_path}/admin/settings/uploads">[[admin/menu:settings/uploads]]</a></li>
-			<li><a href="{relative_path}/admin/settings/post">[[admin/menu:settings/post]]</a></li>
 			<li><a href="{relative_path}/admin/settings/chat">[[admin/menu:settings/chat]]</a></li>
 			<li><a href="{relative_path}/admin/settings/pagination">[[admin/menu:settings/pagination]]</a></li>
-			<li><a href="{relative_path}/admin/settings/tags">[[admin/menu:manage/tags]]</a></li>
 			<li><a href="{relative_path}/admin/settings/notifications">[[admin/menu:settings/notifications]]</a></li>
 			<li><a href="{relative_path}/admin/settings/cookies">[[admin/menu:settings/cookies]]</a></li>
 			<li><a href="{relative_path}/admin/settings/web-crawler">[[admin/menu:settings/web-crawler]]</a></li>
@@ -94,9 +94,9 @@
 		<ul class="menu-section-list">
 			<li><a href="{relative_path}/admin/advanced/database">[[admin/menu:advanced/database]]</a></li>
 			<li><a href="{relative_path}/admin/advanced/events">[[admin/menu:advanced/events]]</a></li>
-			<li><a href="{relative_path}/admin/advanced/logs">[[admin/menu:advanced/logs]]</a></li>
-			<li><a href="{relative_path}/admin/advanced/errors">[[admin/menu:advanced/errors]]</a></li>
 			<li><a href="{relative_path}/admin/advanced/cache">[[admin/menu:advanced/cache]]</a></li>
+			<li><a href="{relative_path}/admin/advanced/errors">[[admin/menu:advanced/errors]]</a></li>
+			<li><a href="{relative_path}/admin/advanced/logs">[[admin/menu:advanced/logs]]</a></li>
 			<!-- IF env -->
 			<li><a href="{relative_path}/admin/development/logger">[[admin/menu:development/logger]]</a></li>
 			<!-- ENDIF env -->
@@ -187,10 +187,10 @@
 				<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">[[admin/menu:section-manage]]</a>
 				<ul class="dropdown-menu" role="menu">
 					<li><a href="{relative_path}/admin/manage/categories">[[admin/menu:manage/categories]]</a></li>
-					<li><a href="{relative_path}/admin/manage/tags">[[admin/menu:manage/tags]]</a></li>
 					<li><a href="{relative_path}/admin/manage/users">[[admin/menu:manage/users]]</a></li>
-					<li><a href="{relative_path}/admin/manage/registration">[[admin/menu:manage/registration]]</a></li>
 					<li><a href="{relative_path}/admin/manage/groups">[[admin/menu:manage/groups]]</a></li>
+					<li><a href="{relative_path}/admin/manage/tags">[[admin/menu:manage/tags]]</a></li>
+					<li><a href="{relative_path}/admin/manage/registration">[[admin/menu:manage/registration]]</a></li>
 					<li><a href="{relative_path}/admin/manage/ip-blacklist">[[admin/menu:manage/ip-blacklist]]</a></li>
 				</ul>
 			</li>
@@ -198,16 +198,16 @@
 				<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">[[admin/menu:section-settings]]</a>
 				<ul class="dropdown-menu" role="menu">
 					<li><a href="{relative_path}/admin/settings/general">[[admin/menu:section-general]]</a></li>
-					<li><a href="{relative_path}/admin/settings/reputation">[[admin/menu:settings/reputation]]</a></li>
-					<li><a href="{relative_path}/admin/settings/email">[[admin/menu:settings/email]]</a></li>
 					<li><a href="{relative_path}/admin/settings/user">[[admin/menu:settings/user]]</a></li>
 					<li><a href="{relative_path}/admin/settings/group">[[admin/menu:settings/group]]</a></li>
+					<li><a href="{relative_path}/admin/settings/tags">[[admin/menu:manage/tags]]</a></li>
+					<li><a href="{relative_path}/admin/settings/post">[[admin/menu:settings/post]]</a></li>
+					<li><a href="{relative_path}/admin/settings/email">[[admin/menu:settings/email]]</a></li>
+					<li><a href="{relative_path}/admin/settings/reputation">[[admin/menu:settings/reputation]]</a></li>
 					<li><a href="{relative_path}/admin/settings/guest">[[admin/menu:settings/guest]]</a></li>
 					<li><a href="{relative_path}/admin/settings/uploads">[[admin/menu:settings/uploads]]</a></li>
-					<li><a href="{relative_path}/admin/settings/post">[[admin/menu:settings/post]]</a></li>
 					<li><a href="{relative_path}/admin/settings/chat">[[admin/menu:settings/chat]]</a></li>
 					<li><a href="{relative_path}/admin/settings/pagination">[[admin/menu:settings/pagination]]</a></li>
-					<li><a href="{relative_path}/admin/settings/tags">[[admin/menu:manage/tags]]</a></li>
 					<li><a href="{relative_path}/admin/settings/notifications">[[admin/menu:settings/notifications]]</a></li>
 					<li><a href="{relative_path}/admin/settings/cookies">[[admin/menu:settings/cookies]]</a></li>
 					<li><a href="{relative_path}/admin/settings/web-crawler">[[admin/menu:settings/web-crawler]]</a></li>
@@ -264,9 +264,9 @@
 				<ul class="dropdown-menu" role="menu">
 					<li><a href="{relative_path}/admin/advanced/database">[[admin/menu:advanced/database]]</a></li>
 					<li><a href="{relative_path}/admin/advanced/events">[[admin/menu:advanced/events]]</a></li>
-					<li><a href="{relative_path}/admin/advanced/logs">[[admin/menu:advanced/logs]]</a></li>
-					<li><a href="{relative_path}/admin/advanced/errors">[[admin/menu:advanced/errors]]</a></li>
 					<li><a href="{relative_path}/admin/advanced/cache">[[admin/menu:advanced/cache]]</a></li>
+					<li><a href="{relative_path}/admin/advanced/errors">[[admin/menu:advanced/errors]]</a></li>
+					<li><a href="{relative_path}/admin/advanced/logs">[[admin/menu:advanced/logs]]</a></li>
 					<!-- IF env -->
 					<li><a href="{relative_path}/admin/development/logger">[[admin/menu:development/logger]]</a></li>
 					<!-- ENDIF env -->

From 3a0bc15a7a9cbd7893d70d92465c5ceca0b10a96 Mon Sep 17 00:00:00 2001
From: "Misty (Bot)" <deploy@nodebb.org>
Date: Mon, 10 Jul 2017 15:22:44 +0000
Subject: [PATCH 26/67] Incremented version number - v1.5.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dcf8d58a27..49eb729b89 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "nodebb",
   "license": "GPL-3.0",
   "description": "NodeBB Forum",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "homepage": "http://www.nodebb.org",
   "repository": {
     "type": "git",

From f8bfe79cf45edd45314c801501973813cd5b2ef0 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 14 Jul 2017 16:23:16 -0400
Subject: [PATCH 27/67] remove tid from recent_tids

---
 src/topics/delete.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/topics/delete.js b/src/topics/delete.js
index 67e8bdf230..a344ee87dd 100644
--- a/src/topics/delete.js
+++ b/src/topics/delete.js
@@ -195,6 +195,7 @@ module.exports = function (Topics) {
 							'cid:' + topicData.cid + ':tids',
 							'cid:' + topicData.cid + ':tids:pinned',
 							'cid:' + topicData.cid + ':tids:posts',
+							'cid:' + topicData.cid + ':recent_tids',
 							'cid:' + topicData.cid + ':uid:' + topicData.uid + ':tids',
 							'uid:' + topicData.uid + ':topics',
 						], tid, next);

From 9dee81b37faf5cdc0e31f05a548ca196a175e568 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 14 Jul 2017 17:29:31 -0400
Subject: [PATCH 28/67] closes #5830

---
 public/src/client/topic.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/src/client/topic.js b/public/src/client/topic.js
index 0a0d857663..57d276d986 100644
--- a/public/src/client/topic.js
+++ b/public/src/client/topic.js
@@ -23,7 +23,7 @@ define('forum/topic', [
 			Topic.replaceURLTimeout = 0;
 		}
 
-		if (data.url && !data.url.startsWith('topic/')) {
+		if (!String(data.url).startsWith('topic/')) {
 			navigator.disable();
 			components.get('navbar/title').find('span').text('').hide();
 			app.removeAlert('bookmark');

From 0a4b76357a5230e5eb62a39cf815d31f2c061262 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 14 Jul 2017 17:29:53 -0400
Subject: [PATCH 29/67] #5830

---
 public/src/client/category.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/src/client/category.js b/public/src/client/category.js
index a91f32b03e..c852d199ff 100644
--- a/public/src/client/category.js
+++ b/public/src/client/category.js
@@ -16,7 +16,7 @@ define('forum/category', [
 	var Category = {};
 
 	$(window).on('action:ajaxify.start', function (ev, data) {
-		if (data.url && !data.url.startsWith('category/')) {
+		if (!String(data.url).startsWith('category/')) {
 			navigator.disable();
 
 			removeListeners();

From 67ca1881bdbe1dba855a1bc62ddc7a45fd5e7491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Sat, 15 Jul 2017 16:24:46 -0400
Subject: [PATCH 30/67] closes #5831

---
 src/categories/recentreplies.js | 29 ++++++++++++++++++++++++++---
 src/topics/tools.js             | 17 ++++++++++++++---
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/src/categories/recentreplies.js b/src/categories/recentreplies.js
index 38f7f0a087..193300dc0e 100644
--- a/src/categories/recentreplies.js
+++ b/src/categories/recentreplies.js
@@ -59,6 +59,25 @@ module.exports = function (Categories) {
 		], callback);
 	};
 
+	Categories.updateRecentTidForCid = function (cid, callback) {
+		async.waterfall([
+			function (next) {
+				db.getSortedSetRevRange('cid:' + cid + ':pids', 0, 0, next);
+			},
+			function (pid, next) {
+				pid = pid[0];
+				posts.getPostField(pid, 'tid', next);
+			},
+			function (tid, next) {
+				if (!parseInt(tid, 10)) {
+					return next();
+				}
+
+				Categories.updateRecentTid(cid, tid, next);
+			},
+		], callback);
+	};
+
 	Categories.getRecentTopicReplies = function (categoryData, uid, callback) {
 		if (!Array.isArray(categoryData) || !categoryData.length) {
 			return callback();
@@ -180,8 +199,11 @@ module.exports = function (Categories) {
 
 	Categories.moveRecentReplies = function (tid, oldCid, cid, callback) {
 		callback = callback || function () {};
-		updatePostCount(tid, oldCid, cid);
+
 		async.waterfall([
+			function (next) {
+				updatePostCount(tid, oldCid, cid, next);
+			},
 			function (next) {
 				topics.getPids(tid, next);
 			},
@@ -212,7 +234,6 @@ module.exports = function (Categories) {
 	};
 
 	function updatePostCount(tid, oldCid, newCid, callback) {
-		callback = callback || function () {};
 		async.waterfall([
 			function (next) {
 				topics.getTopicField(tid, 'postcount', next);
@@ -228,7 +249,9 @@ module.exports = function (Categories) {
 					function (next) {
 						db.incrObjectFieldBy('category:' + newCid, 'post_count', postCount, next);
 					},
-				], next);
+				], function (err) {
+					next(err);
+				});
 			},
 		], callback);
 	}
diff --git a/src/topics/tools.js b/src/topics/tools.js
index db112e9daa..fffecbd943 100644
--- a/src/topics/tools.js
+++ b/src/topics/tools.js
@@ -50,6 +50,9 @@ module.exports = function (Topics) {
 
 				Topics[isDelete ? 'delete' : 'restore'](tid, uid, next);
 			},
+			function (next) {
+				categories.updateRecentTidForCid(topicData.cid, next);
+			},
 			function (next) {
 				topicData.deleted = isDelete ? 1 : 0;
 
@@ -261,7 +264,8 @@ module.exports = function (Topics) {
 				db.sortedSetsRemove([
 					'cid:' + topicData.cid + ':tids',
 					'cid:' + topicData.cid + ':tids:pinned',
-					'cid:' + topicData.cid + ':tids:posts',	// post count
+					'cid:' + topicData.cid + ':tids:posts',
+					'cid:' + topicData.cid + ':recent_tids',
 				], tid, next);
 			},
 			function (next) {
@@ -283,8 +287,9 @@ module.exports = function (Topics) {
 			},
 			function (next) {
 				oldCid = topic.cid;
-				categories.moveRecentReplies(tid, oldCid, cid);
-
+				categories.moveRecentReplies(tid, oldCid, cid, next);
+			},
+			function (next) {
 				async.parallel([
 					function (next) {
 						categories.incrementCategoryFieldBy(oldCid, 'topic_count', -1, next);
@@ -292,6 +297,12 @@ module.exports = function (Topics) {
 					function (next) {
 						categories.incrementCategoryFieldBy(cid, 'topic_count', 1, next);
 					},
+					function (next) {
+						categories.updateRecentTid(cid, tid, next);
+					},
+					function (next) {
+						categories.updateRecentTidForCid(oldCid, next);
+					},
 					function (next) {
 						Topics.setTopicFields(tid, {
 							cid: cid,

From cc4f4e72828420ca49e1cd6079896874fcccb053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Sat, 15 Jul 2017 16:57:41 -0400
Subject: [PATCH 31/67] style changes

---
 src/controllers/categories.js | 47 ++++++++++++++++-------------------
 src/socket.io/topics/move.js  | 15 +++++------
 2 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/src/controllers/categories.js b/src/controllers/categories.js
index 9a17a47fc2..25e384c0ed 100644
--- a/src/controllers/categories.js
+++ b/src/controllers/categories.js
@@ -7,7 +7,7 @@ var categories = require('../categories');
 var meta = require('../meta');
 var helpers = require('./helpers');
 
-var categoriesController = {};
+var categoriesController = module.exports;
 
 categoriesController.list = function (req, res, next) {
 	res.locals.metaTags = [{
@@ -34,32 +34,27 @@ categoriesController.list = function (req, res, next) {
 
 			categories.getRecentTopicReplies(allCategories, req.uid, next);
 		},
-	], function (err) {
-		if (err) {
-			return next(err);
-		}
+		function () {
+			var data = {
+				title: '[[pages:categories]]',
+				categories: categoryData,
+			};
 
-		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,
-				};
+			if (req.path.startsWith('/api/categories') || req.path.startsWith('/categories')) {
+				data.breadcrumbs = helpers.buildBreadcrumbs([{ text: data.title }]);
 			}
-		});
 
-		res.render('categories', data);
-	});
+			data.categories.forEach(function (category) {
+				if (category && Array.isArray(category.posts) && category.posts.length) {
+					category.teaser = {
+						url: nconf.get('relative_path') + '/post/' + category.posts[0].pid,
+						timestampISO: category.posts[0].timestampISO,
+						pid: category.posts[0].pid,
+					};
+				}
+			});
+
+			res.render('categories', data);
+		},
+	], next);
 };
-
-module.exports = categoriesController;
diff --git a/src/socket.io/topics/move.js b/src/socket.io/topics/move.js
index 9faffa910b..efd6562d18 100644
--- a/src/socket.io/topics/move.js
+++ b/src/socket.io/topics/move.js
@@ -30,17 +30,14 @@ module.exports = function (SocketTopics) {
 					topicData.tid = tid;
 					topics.tools.move(tid, data.cid, socket.uid, next);
 				},
-			], function (err) {
-				if (err) {
-					return next(err);
-				}
+				function (next) {
+					socketHelpers.emitToTopicAndCategory('event:topic_moved', topicData);
 
-				socketHelpers.emitToTopicAndCategory('event:topic_moved', topicData);
+					socketHelpers.sendNotificationToTopicOwner(tid, socket.uid, 'move', 'notifications:moved_your_topic');
 
-				socketHelpers.sendNotificationToTopicOwner(tid, socket.uid, 'move', 'notifications:moved_your_topic');
-
-				next();
-			});
+					next();
+				},
+			], next);
 		}, callback);
 	};
 

From 8e8507c9e6552070d5f72176010019389ce36b45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Sun, 16 Jul 2017 15:35:22 -0400
Subject: [PATCH 32/67] up widget essentials

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 49eb729b89..6768b56be1 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
     "nodebb-theme-persona": "5.0.13",
     "nodebb-theme-slick": "1.1.0",
     "nodebb-theme-vanilla": "6.0.10",
-    "nodebb-widget-essentials": "3.0.0",
+    "nodebb-widget-essentials": "3.0.1",
     "nodemailer": "2.6.4",
     "nodemailer-sendmail-transport": "1.0.0",
     "nodemailer-smtp-transport": "^2.4.1",

From b983be2919a593502177109bd20830e02d5a92db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Mon, 17 Jul 2017 15:29:36 -0400
Subject: [PATCH 33/67] fix colspans in category privilege tab

---
 src/views/admin/partials/categories/privileges.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/admin/partials/categories/privileges.tpl b/src/views/admin/partials/categories/privileges.tpl
index 2ec8fa2026..e55a2eaf20 100644
--- a/src/views/admin/partials/categories/privileges.tpl
+++ b/src/views/admin/partials/categories/privileges.tpl
@@ -5,7 +5,7 @@
 								<th class="arrowed" colspan="3">
 									[[admin/manage/categories:privileges.section-viewing]]
 								</th>
-								<th class="arrowed" colspan="7">
+								<th class="arrowed" colspan="8">
 									[[admin/manage/categories:privileges.section-posting]]
 								</th>
 								<th class="arrowed" colspan="2">
@@ -61,7 +61,7 @@
 								<th class="arrowed" colspan="3">
 									[[admin/manage/categories:privileges.section-viewing]]
 								</th>
-								<th class="arrowed" colspan="7">
+								<th class="arrowed" colspan="8">
 									[[admin/manage/categories:privileges.section-posting]]
 								</th>
 								<th class="arrowed" colspan="2">

From c1452db0ba98e4a98555cdb61722a9f178fcaad0 Mon Sep 17 00:00:00 2001
From: dbolack-ab <dbolack@abquintic.com>
Date: Mon, 17 Jul 2017 17:15:24 -0500
Subject: [PATCH 34/67] =?UTF-8?q?Adds=20the=20filter:uploadStored=20hook?=
 =?UTF-8?q?=20which=20fires=20after=20the=20file=20is=20saved=E2=80=A6=20(?=
 =?UTF-8?q?#5798)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Adds the filter:uploadStored hook which fires after the file is saved in the async waterfall and passes:
                       var storedFile = {
                       url: nconf.get('relative_path') + upload.url,
                       path: upload.path,
                       name: uploadedFile.name,
               }
               plugins.fireHook( 'filter:uploadStored', { uploadedFile: uploadedFile, storedFile: storedFile } );

* Corrections per PR. Should match style guide.

* Correction attempts take 2.

Per:

/home/travis/build/NodeBB/NodeBB/src/controllers/uploads.js

  234:5    error  Missing semicolon                            semi

  235:3    error  Expected indentation of 3 tabs but found 2   indent

  235:19   error  There should be no spaces inside this paren  space-in-parens

  235:105  error  There should be no spaces inside this paren  space-in-parens

  236:3    error  Expected indentation of 3 tabs but found 2   indent

* next() shouldn't fire twice, but I see no documentation suggesting that the paramaters will fire correctly.

Previous comments imply it is preferred to have fireHook fire fof the callback rather than having it happen next,  so I'm wrapping next in an anonymous function to ensure it passes the parameters.

If this is not the preferred method, please provide a thorough correction.

* Meh. Figuring out this style requirement is so hit and miss.

* Corrected for proper callback? technique.

Might blow up on style. Will watch.
---
 src/controllers/uploads.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/controllers/uploads.js b/src/controllers/uploads.js
index ab651d1325..733ddc95ec 100644
--- a/src/controllers/uploads.js
+++ b/src/controllers/uploads.js
@@ -227,10 +227,17 @@ function saveFileToLocal(uploadedFile, callback) {
 			file.saveFileToLocal(filename, 'files', uploadedFile.path, next);
 		},
 		function (upload, next) {
-			next(null, {
+			var storedFile = {
 				url: nconf.get('relative_path') + upload.url,
 				path: upload.path,
 				name: uploadedFile.name,
+			};
+
+			plugins.fireHook('filter:uploadStored', { uploadedFile: uploadedFile, storedFile: storedFile }, function (err, data) {
+				if (err) {
+					return next(err);
+				}
+				next(null, data.storedFile);
 			});
 		},
 	], callback);

From eecc680761ba4a0a4830c65121e88d067005958b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Mon, 17 Jul 2017 18:16:23 -0400
Subject: [PATCH 35/67] style

---
 src/controllers/uploads.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/controllers/uploads.js b/src/controllers/uploads.js
index 733ddc95ec..e539c79bc6 100644
--- a/src/controllers/uploads.js
+++ b/src/controllers/uploads.js
@@ -233,12 +233,10 @@ function saveFileToLocal(uploadedFile, callback) {
 				name: uploadedFile.name,
 			};
 
-			plugins.fireHook('filter:uploadStored', { uploadedFile: uploadedFile, storedFile: storedFile }, function (err, data) {
-				if (err) {
-					return next(err);
-				}
-				next(null, data.storedFile);
-			});
+			plugins.fireHook('filter:uploadStored', { uploadedFile: uploadedFile, storedFile: storedFile }, next);
+		},
+		function (data, next) {
+			next(null, data.storedFile);
 		},
 	], callback);
 }

From 9b491e4c2ee4300685fbae4ddfe5f235a29961f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stjepan=20Osojni=C4=8Dki?= <sosojni@hotmail.com>
Date: Tue, 18 Jul 2017 00:16:48 +0200
Subject: [PATCH 36/67] Add post images hook (#5828)

* Add post images hook

This hook would allow plugins to manipulate images inside posts  after images are manipulated by nodebb (for example, delay loading). Without this hook we can manipulate images by searching post data for them and manipulate that data, but any change on that level is either erased by nodebb once image loading starts (if delay is turned on) or it disables native image behaviour by changing image code so native behaviour is not triggered.
Hook at this place works for both delayed loading turned on and off.
Usage for this kind of hook was talked about here: https://community.nodebb.org/topic/10960/opening-uploaded-images-in-modal-windows

* trying to fix Travis error

* Update images.js

Hook moved out of wrapImagesInLinks function to places where images are actually loaded. One of the places is inside unloadImage function but in place where loading is happening because of failed if check (delayImageLoading not se in users configuration).
---
 public/src/client/topic/images.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/src/client/topic/images.js b/public/src/client/topic/images.js
index 65ad386371..e121eda7c2 100644
--- a/public/src/client/topic/images.js
+++ b/public/src/client/topic/images.js
@@ -20,6 +20,7 @@ define('forum/topic/images', [
 		} else {
 			images.attr('data-state', 'loaded');
 			Images.wrapImagesInLinks(posts);
+			$(window).trigger('action:images.loaded');
 		}
 	};
 
@@ -75,6 +76,7 @@ define('forum/topic/images', [
 					adjusting = false;
 
 					Images.wrapImagesInLinks(posts);
+					$(window).trigger('action:images.loaded');
 					posts.length = 0;
 				}
 			}

From 018d5d7819ce7429f41f02533effb8a3d191ac9d Mon Sep 17 00:00:00 2001
From: "Misty (Bot)" <deploy@nodebb.org>
Date: Tue, 18 Jul 2017 09:24:12 +0000
Subject: [PATCH 37/67] Latest translations and fallbacks

---
 public/language/vi/admin/advanced/database.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/language/vi/admin/advanced/database.json b/public/language/vi/admin/advanced/database.json
index 27aaa79b67..29e08a3f7b 100644
--- a/public/language/vi/admin/advanced/database.json
+++ b/public/language/vi/admin/advanced/database.json
@@ -27,8 +27,8 @@
 	"redis.blocked-clients": "Người dùng vi phạm",
 	"redis.used-memory": "Bộ nhớ đã sử dụng",
 	"redis.memory-frag-ratio": "Memory Fragmentation Ratio",
-	"redis.total-connections-recieved": "Total Connections Received",
-	"redis.total-commands-processed": "Total Commands Processed",
+	"redis.total-connections-recieved": "Tổng số kết nối nhận được",
+	"redis.total-commands-processed": "Tổng số kết nối đã thực thi",
 	"redis.iops": "Instantaneous Ops. Per Second",
 	"redis.keyspace-hits": "Keyspace Hits",
 	"redis.keyspace-misses": "Keyspace Misses",

From 43a70270efcc862af87021f78792eeba9a88276e Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Tue, 18 Jul 2017 11:31:18 -0400
Subject: [PATCH 38/67] closes #5835

---
 public/language/en-GB/admin/settings/uploads.json | 6 +++---
 src/views/admin/settings/uploads.tpl              | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/language/en-GB/admin/settings/uploads.json b/public/language/en-GB/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/en-GB/admin/settings/uploads.json
+++ b/public/language/en-GB/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/src/views/admin/settings/uploads.tpl b/src/views/admin/settings/uploads.tpl
index 32e432adfc..9ccb2c6c9b 100644
--- a/src/views/admin/settings/uploads.tpl
+++ b/src/views/admin/settings/uploads.tpl
@@ -99,7 +99,7 @@
 
 			<div class="form-group">
 				<label>[[admin/settings/uploads:max-profile-image-size]]</label>
-				<input type="text" class="form-control" placeholder="Maximum size of uploaded user images in kilobytes" data-field="maximumProfileImageSize" />
+				<input type="text" class="form-control" placeholder="Maximum size of uploaded user images in kibibytes" data-field="maximumProfileImageSize" />
 				<p class="help-block">
 					[[admin/settings/uploads:max-profile-image-size-help]]
 				</p>
@@ -107,7 +107,7 @@
 
 			<div class="form-group">
 				<label>[[admin/settings/uploads:max-cover-image-size]]</label>
-				<input type="text" class="form-control" placeholder="Maximum size of uploaded cover images in kilobytes" data-field="maximumCoverImageSize" />
+				<input type="text" class="form-control" placeholder="Maximum size of uploaded cover images in kibibytes" data-field="maximumCoverImageSize" />
 				<p class="help-block">
 					[[admin/settings/uploads:max-cover-image-size-help]]
 				</p>

From 18181260e7b0e19181fc499a8dbfc91891d50fd5 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Tue, 18 Jul 2017 13:36:21 -0400
Subject: [PATCH 39/67] closes #5836

---
 src/groups/membership.js |  4 ++++
 test/groups.js           | 26 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/src/groups/membership.js b/src/groups/membership.js
index 1fc06cb5a5..8ffd845443 100644
--- a/src/groups/membership.js
+++ b/src/groups/membership.js
@@ -28,6 +28,10 @@ module.exports = function (Groups) {
 			return callback(new Error('[[error:invalid-data]]'));
 		}
 
+		if (!uid) {
+			return callback(new Error('[[error:invalid-uid]]'));
+		}
+
 		async.waterfall([
 			function (next) {
 				Groups.isMember(uid, groupName, next);
diff --git a/test/groups.js b/test/groups.js
index e914953e10..d245f5744d 100644
--- a/test/groups.js
+++ b/test/groups.js
@@ -411,6 +411,32 @@ describe('Groups', function () {
 				});
 			});
 		});
+
+		it('should fail to add user to group if group name is invalid', function (done) {
+			Groups.join(0, 1, function (err) {
+				assert.equal(err.message, '[[error:invalid-data]]');
+				Groups.join(null, 1, function (err) {
+					assert.equal(err.message, '[[error:invalid-data]]');
+					Groups.join(undefined, 1, function (err) {
+						assert.equal(err.message, '[[error:invalid-data]]');
+						done();
+					});
+				});
+			});
+		});
+
+		it('should fail to add user to group if uid is invalid', function (done) {
+			Groups.join('Test', 0, function (err) {
+				assert.equal(err.message, '[[error:invalid-uid]]');
+				Groups.join('Test', null, function (err) {
+					assert.equal(err.message, '[[error:invalid-uid]]');
+					Groups.join('Test', undefined, function (err) {
+						assert.equal(err.message, '[[error:invalid-uid]]');
+						done();
+					});
+				});
+			});
+		});
 	});
 
 	describe('.leave()', function () {

From efea8f8e99661e8054b28cac1166ce62f84e2b08 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Tue, 18 Jul 2017 14:58:57 -0400
Subject: [PATCH 40/67] closes #5784

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6768b56be1..47730889a4 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "morgan": "^1.3.2",
     "mousetrap": "^1.5.3",
     "nconf": "~0.8.2",
-    "nodebb-plugin-composer-default": "5.0.1",
+    "nodebb-plugin-composer-default": "5.0.2",
     "nodebb-plugin-dbsearch": "2.0.6",
     "nodebb-plugin-emoji-extended": "1.1.1",
     "nodebb-plugin-emoji-one": "1.2.1",

From e02f354ec9a258a22ecc44e1f2f431f7511dc4a4 Mon Sep 17 00:00:00 2001
From: "Misty (Bot)" <deploy@nodebb.org>
Date: Wed, 19 Jul 2017 09:23:24 +0000
Subject: [PATCH 41/67] Latest translations and fallbacks

---
 public/language/cs/search.json | 22 +++++------
 public/language/cs/user.json   | 68 +++++++++++++++++-----------------
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/public/language/cs/search.json b/public/language/cs/search.json
index b4ae4ca7db..7500385c23 100644
--- a/public/language/cs/search.json
+++ b/public/language/cs/search.json
@@ -2,33 +2,33 @@
     "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
     "no-matches": "No matches found",
     "advanced-search": "Pokročilé hledání",
-    "in": "In",
+    "in": "v",
     "titles": "Titles",
     "titles-posts": "Titles and Posts",
-    "posted-by": "Posted by",
-    "in-categories": "In Categories",
+    "posted-by": "Napsal",
+    "in-categories": "V kategoriích",
     "search-child-categories": "Search child categories",
-    "has-tags": "Has tags",
+    "has-tags": "Obsahuje značky",
     "reply-count": "Reply Count",
-    "at-least": "At least",
-    "at-most": "At most",
+    "at-least": "Nejméně",
+    "at-most": "Nejvíce",
     "relevance": "Relevance",
-    "post-time": "Post time",
+    "post-time": "Čas příspěvku",
     "newer-than": "Novější než",
     "older-than": "Starší než",
-    "any-date": "Any date",
+    "any-date": "Jakékoliv datum",
     "yesterday": "Včera",
     "one-week": "Jeden týden",
     "two-weeks": "Dva týdny",
     "one-month": "Jeden měsíc",
-    "three-months": "Three months",
+    "three-months": "Tři měsíce",
     "six-months": "Šest měsíců",
     "one-year": "Jeden rok",
     "sort-by": "Řadit dle",
     "last-reply-time": "Čas poslední odpovědi",
-    "topic-title": "Topic title",
+    "topic-title": "Název tématu",
     "number-of-replies": "Počet odpovědí",
-    "number-of-views": "Number of views",
+    "number-of-views": "Počet zobrazení",
     "topic-start-date": "Topic start date",
     "username": "Uživatelské jméno",
     "category": "Kategorie",
diff --git a/public/language/cs/user.json b/public/language/cs/user.json
index 63560d8b42..bcd94715cf 100644
--- a/public/language/cs/user.json
+++ b/public/language/cs/user.json
@@ -6,7 +6,7 @@
     "postcount": "Počet příspěvků",
     "email": "E-mail",
     "confirm_email": "Potvrdit e-mail",
-    "account_info": "Account Info",
+    "account_info": "Informace o účtu",
     "ban_account": "Zablokovat účet",
     "ban_account_confirm": "Opravdu chcete zablokovat tohoto uživatele?",
     "unban_account": "Odblokovat účet",
@@ -23,7 +23,7 @@
     "profile": "Profil",
     "profile_views": "Zobrazení profilu",
     "reputation": "Reputace",
-    "bookmarks": "Bookmarks",
+    "bookmarks": "Záložky",
     "watched": "Sledován",
     "followers": "Sledují ho",
     "following": "Sleduje",
@@ -31,8 +31,8 @@
     "signature": "Podpis",
     "birthday": "Datum narození",
     "chat": "Chat",
-    "chat_with": "Continue chat with %1",
-    "new_chat_with": "Start new chat with %1",
+    "chat_with": "Pokračovat v chatu s %1",
+    "new_chat_with": "Začít nový chat s %1",
     "flag-profile": "Flag Profile",
     "follow": "Sledovat",
     "unfollow": "Nesledovat",
@@ -60,14 +60,14 @@
     "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 váš e-mail. Zvolte si prosím jiné heslo.",
-    "weak_password": "Weak password.",
+    "weak_password": "Slabé heslo.",
     "upload_picture": "Nahrát obrázek",
     "upload_a_picture": "Nahrát obrázek",
     "remove_uploaded_picture": "Odstranit nahraný obrázek",
     "upload_cover_picture": "Náhrát titulní obrázek",
-    "remove_cover_picture_confirm": "Are you sure you want to remove the cover picture?",
-    "crop_picture": "Crop picture",
-    "upload_cropped_picture": "Crop and upload",
+    "remove_cover_picture_confirm": "Jste si jist, že vyjmout obrázek coveru?",
+    "crop_picture": "Oříznout obrázek",
+    "upload_cropped_picture": "Oříznout a nahrát",
     "settings": "Nastavení",
     "show_email": "Zobrazovat můj e-mail v profilu",
     "show_fullname": "Zobrazovat celé jméno",
@@ -78,35 +78,35 @@
     "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.",
+    "send_chat_notifications": "Odeslat e-mail, dorazí-li nová zpráva chatu a já nejsem připojen",
+    "send_post_notifications": "Zaslat e-mail, přibudou-li nové odpovědi k tématu, kde mám přihlášen odběr",
+    "settings-require-reload": "Některá nastavení vyžadují znovu načtení. Pro znovu načtení stránky, klikněte zde.",
     "has_no_follower": "Tohoto uživatele nikdo nesleduje :(",
     "follows_no_one": "Tento uživatel nikoho nesleduje :(",
-    "has_no_posts": "This user hasn't posted anything yet.",
-    "has_no_topics": "This user hasn't posted any topics yet.",
+    "has_no_posts": "Tento uživatel ještě nic nenapsal.",
+    "has_no_topics": "Tento uživatel ještě nenapsal žádné téma.",
     "has_no_watched_topics": "Tento uživatel zatím nesleduje žádná témata.",
     "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_voted_posts": "Tento uživatel nemá žádné hlasovací příspěvky",
     "email_hidden": "E-mail skryt",
     "hidden": "skrytý",
-    "paginate_description": "Paginate topics and posts instead of using infinite scroll",
+    "paginate_description": "Stránkovat témata a příspěvky místo použití nekonečného posunování",
     "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",
     "notifications_and_sounds": "Upozornění a zvuky",
-    "incoming-message-sound": "Incoming message sound",
-    "outgoing-message-sound": "Outgoing message sound",
-    "notification-sound": "Notification sound",
-    "no-sound": "No sound",
+    "incoming-message-sound": "Zvuk příchozí zprávy",
+    "outgoing-message-sound": "Zvuk odchozí zprávy",
+    "notification-sound": "Zvuk oznámení",
+    "no-sound": "Bez zvuku",
     "browsing": "Nastavení prohlížení",
-    "open_links_in_new_tab": "Open outgoing links in new tab",
-    "enable_topic_searching": "Enable In-Topic Searching",
+    "open_links_in_new_tab": "Otevřít odchozí odkaz v nové záložce",
+    "enable_topic_searching": "Povolit vyhledávání v tématu",
     "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",
+    "delay_image_loading": "Zpoždění načtení obrázku",
     "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",
+    "scroll_to_my_post": "Po odeslání odpovědi, zobrazit nový příspěvek",
     "follow_topics_you_reply_to": "Sledovat témata, do kterých přispějete",
     "follow_topics_you_create": "Sledovat témata, která vytvoříte",
     "grouptitle": "Nadpis skupiny",
@@ -122,15 +122,15 @@
     "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",
-    "info.banned-reason-label": "Reason",
-    "info.banned-no-reason": "No reason given.",
-    "info.username-history": "Username History",
-    "info.email-history": "Email History",
-    "info.moderation-note": "Moderation Note",
-    "info.moderation-note.success": "Moderation note saved",
-    "info.moderation-note.add": "Add note"
+    "info.ban-history": "Poslední historie banování",
+    "info.no-ban-history": "Tento uživatel nebyl nikdy zabanován",
+    "info.banned-until": "Zabanován do %1",
+    "info.banned-permanently": "Permanentně zabanován",
+    "info.banned-reason-label": "Důvod",
+    "info.banned-no-reason": "Bez důvodu",
+    "info.username-history": "Historie uživatelského jména",
+    "info.email-history": "E-mailová historie",
+    "info.moderation-note": "Poznámka moderace",
+    "info.moderation-note.success": "Poznámka moderace byla uložena",
+    "info.moderation-note.add": "Přidat poznámku"
 }
\ No newline at end of file

From c86cb12d0f8810264be3eea3bea9cb27cd38bcc5 Mon Sep 17 00:00:00 2001
From: Jan <king-jan1999@hotmail.de>
Date: Wed, 19 Jul 2017 15:17:55 +0200
Subject: [PATCH 42/67] Fix update link in README.md, fixes #5838

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 43f2b7cb29..7a2fc06c55 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ It is important to ensure that your NodeBB and database servers are secured. Bea
 
 ## Upgrading NodeBB
 
-Detailed upgrade instructions are listed in [Upgrading NodeBB](https://docs.nodebb.org/en/latest/upgrading/index.html)
+Detailed upgrade instructions are listed in [Upgrading NodeBB](https://docs.nodebb.org/configuring/upgrade/)
 
 ## License
 

From f40928c46c90efcaec5c778727c9a4330e2032bd Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Wed, 19 Jul 2017 17:37:25 -0400
Subject: [PATCH 43/67] up composer

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 47730889a4..40bfe8a776 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "morgan": "^1.3.2",
     "mousetrap": "^1.5.3",
     "nconf": "~0.8.2",
-    "nodebb-plugin-composer-default": "5.0.2",
+    "nodebb-plugin-composer-default": "5.0.3",
     "nodebb-plugin-dbsearch": "2.0.6",
     "nodebb-plugin-emoji-extended": "1.1.1",
     "nodebb-plugin-emoji-one": "1.2.1",

From 72fb92fa96ee18bf0d66b3b670f5a36bb757edb8 Mon Sep 17 00:00:00 2001
From: "Misty (Bot)" <deploy@nodebb.org>
Date: Thu, 20 Jul 2017 09:23:30 +0000
Subject: [PATCH 44/67] Latest translations and fallbacks

---
 public/language/cs/topic.json | 46 +++++++++++++++++------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json
index 98429c8ad0..91d6e4d1aa 100644
--- a/public/language/cs/topic.json
+++ b/public/language/cs/topic.json
@@ -13,9 +13,9 @@
     "notify_me": "Dostávat upozornění na nové odpovědi",
     "quote": "Citovat",
     "reply": "Odpovědět",
-    "replies_to_this_post": "%1 Replies",
-    "one_reply_to_this_post": "1 Reply",
-    "last_reply_time": "Last reply",
+    "replies_to_this_post": "%1 odpovědí",
+    "one_reply_to_this_post": "1 odpověď",
+    "last_reply_time": "Poslední odpověď",
     "reply-as-topic": "Odpovědět jako Téma",
     "guest-login-reply": "Přihlásit se pro odpověď",
     "edit": "Upravit",
@@ -28,8 +28,8 @@
     "share": "Sdílet",
     "tools": "Nástroje",
     "locked": "Uzamčeno",
-    "pinned": "Pinned",
-    "moved": "Moved",
+    "pinned": "Připnuto",
+    "moved": "Přesunuto",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Flag this post for moderation",
     "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
@@ -37,47 +37,47 @@
     "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.",
-    "markAsUnreadForAll.success": "Topic marked as unread for all.",
+    "markAsUnreadForAll.success": "Téma označeno jako nepřečtené pro všechny.",
     "mark_unread": "Označ za nepřečtené",
     "mark_unread.success": "Téma označeno jako nepřečtené",
     "watch": "Sledovat",
     "unwatch": "Přesta sledovat",
-    "watch.title": "Be notified of new replies in this topic",
+    "watch.title": "Být upozorněn u nových odpovědí v tomto tématu",
     "unwatch.title": "Přestat sledovat toto téma",
     "share_this_post": "Sdílet toto téma",
     "watching": "Sledováno",
     "not-watching": "Nesledováno",
-    "ignoring": "Ignoring",
+    "ignoring": "Ignorování",
     "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": "Mark unread for all",
+    "thread_tools.markAsUnreadForAll": "Označit jako nepřečtené pro všechny",
     "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.select_category": "Select Category",
+    "thread_tools.select_category": "Vybrat kategorii",
     "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?",
-    "topic_move_success": "This topic has been successfully moved to %1",
-    "post_delete_confirm": "Are you sure you want to delete this post?",
-    "post_restore_confirm": "Are you sure you want to restore this post?",
-    "post_purge_confirm": "Are you sure you want to purge this post?",
+    "thread_tools.restore_confirm": "Jste si jist/a, že chcete obnovit toto téma?",
+    "thread_tools.purge": "Vyčistit téma",
+    "thread_tools.purge_confirm": "Jste si jist/a, že chcete vyčistit toto téma?",
+    "topic_move_success": "Toto téma bylo úspěšně přesunuto do %1",
+    "post_delete_confirm": "Jste si jist/a, že chcete odstranit tento příspěvek?",
+    "post_restore_confirm": "Jste si jist/a, že chcete obnovit tento příspěvek?",
+    "post_purge_confirm": "Jste si jist/a, že chcete tento příspěvek vyčistit?",
     "load_categories": "Načítání kategorií",
     "confirm_move": "Přesunout",
     "confirm_fork": "Rozdělit",
-    "bookmark": "Bookmark",
-    "bookmarks": "Bookmarks",
-    "bookmarks.has_no_bookmarks": "You haven't bookmarked any posts yet.",
+    "bookmark": "Záložka",
+    "bookmarks": "Záložky",
+    "bookmarks.has_no_bookmarks": "Ještě jste nezazáložkoval žádný příspěvek.",
     "loading_more_posts": "Načítání více příspěvků",
     "move_topic": "Přesunout téma",
     "move_topics": "Přesunout témata",
@@ -86,9 +86,9 @@
     "fork_topic": "Rozdělit příspěvek",
     "fork_topic_instruction": "Vyber příspěvky, které chceš oddělit",
     "fork_no_pids": "Žádné příspěvky nebyly vybrány!",
-    "fork_pid_count": "%1 post(s) selected",
+    "fork_pid_count": "Vybráno %1 příspěvek/ů",
     "fork_success": "Successfully forked topic! Click here to go to the forked topic.",
-    "delete_posts_instruction": "Click the posts you want to delete/purge",
+    "delete_posts_instruction": "Klikněte na příspěvek, který chcete odstranit/vyčistit",
     "composer.title_placeholder": "Zadejte název tématu…",
     "composer.handle_placeholder": "Jméno",
     "composer.discard": "Zrušit",
@@ -101,7 +101,7 @@
     "composer.thumb_url_placeholder": "http://example.com/thumb.png",
     "composer.thumb_file_label": "Nebo nahrajte soubor",
     "composer.thumb_remove": "Vymazat pole",
-    "composer.drag_and_drop_images": "Drag and Drop Images Here",
+    "composer.drag_and_drop_images": "Přesuňte sem myší obrázek",
     "more_users_and_guests": "%1 more user(s) and %2 guest(s)",
     "more_users": "%1 more user(s)",
     "more_guests": "%1 more guest(s)",

From 568b2b995735fdb4381509bb4b20b0795561fcd0 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Thu, 20 Jul 2017 15:43:11 -0400
Subject: [PATCH 45/67] fixes #5780

---
 loader.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/loader.js b/loader.js
index f897fd79ce..21510018b7 100644
--- a/loader.js
+++ b/loader.js
@@ -223,6 +223,7 @@ fs.open(path.join(__dirname, 'config.json'), 'r', function (err) {
 			require('daemon')({
 				stdout: process.stdout,
 				stderr: process.stderr,
+				cwd: process.cwd(),
 			});
 
 			fs.writeFileSync(pidFilePath, process.pid);

From a1b7666c96b87422cd841eec2a37c3c57aea651f Mon Sep 17 00:00:00 2001
From: "Misty (Bot)" <deploy@nodebb.org>
Date: Fri, 21 Jul 2017 09:24:00 +0000
Subject: [PATCH 46/67] Latest translations and fallbacks

---
 public/language/ar/admin/extend/plugins.json             | 4 ++--
 public/language/ar/admin/general/dashboard.json          | 6 +++---
 public/language/ar/admin/settings/uploads.json           | 6 +++---
 public/language/bg/admin/extend/plugins.json             | 4 ++--
 public/language/bg/admin/general/dashboard.json          | 6 +++---
 public/language/bg/admin/settings/uploads.json           | 6 +++---
 public/language/bn/admin/extend/plugins.json             | 4 ++--
 public/language/bn/admin/general/dashboard.json          | 6 +++---
 public/language/bn/admin/settings/uploads.json           | 6 +++---
 public/language/cs/admin/extend/plugins.json             | 4 ++--
 public/language/cs/admin/general/dashboard.json          | 6 +++---
 public/language/cs/admin/settings/uploads.json           | 6 +++---
 public/language/da/admin/extend/plugins.json             | 4 ++--
 public/language/da/admin/general/dashboard.json          | 6 +++---
 public/language/da/admin/settings/uploads.json           | 6 +++---
 public/language/de/admin/extend/plugins.json             | 4 ++--
 public/language/de/admin/general/dashboard.json          | 6 +++---
 public/language/de/admin/settings/uploads.json           | 6 +++---
 public/language/el/admin/extend/plugins.json             | 4 ++--
 public/language/el/admin/general/dashboard.json          | 6 +++---
 public/language/el/admin/settings/uploads.json           | 6 +++---
 public/language/en-US/admin/extend/plugins.json          | 4 ++--
 public/language/en-US/admin/general/dashboard.json       | 6 +++---
 public/language/en-US/admin/settings/uploads.json        | 6 +++---
 public/language/en-x-pirate/admin/extend/plugins.json    | 4 ++--
 public/language/en-x-pirate/admin/general/dashboard.json | 6 +++---
 public/language/en-x-pirate/admin/settings/uploads.json  | 6 +++---
 public/language/es/admin/extend/plugins.json             | 4 ++--
 public/language/es/admin/general/dashboard.json          | 6 +++---
 public/language/es/admin/settings/uploads.json           | 6 +++---
 public/language/et/admin/extend/plugins.json             | 4 ++--
 public/language/et/admin/general/dashboard.json          | 6 +++---
 public/language/et/admin/settings/uploads.json           | 6 +++---
 public/language/fa-IR/admin/extend/plugins.json          | 4 ++--
 public/language/fa-IR/admin/general/dashboard.json       | 6 +++---
 public/language/fa-IR/admin/settings/uploads.json        | 6 +++---
 public/language/fi/admin/extend/plugins.json             | 4 ++--
 public/language/fi/admin/general/dashboard.json          | 6 +++---
 public/language/fi/admin/settings/uploads.json           | 6 +++---
 public/language/fr/admin/extend/plugins.json             | 4 ++--
 public/language/fr/admin/general/dashboard.json          | 6 +++---
 public/language/fr/admin/settings/uploads.json           | 6 +++---
 public/language/gl/admin/extend/plugins.json             | 4 ++--
 public/language/gl/admin/general/dashboard.json          | 6 +++---
 public/language/gl/admin/settings/uploads.json           | 6 +++---
 public/language/he/admin/extend/plugins.json             | 4 ++--
 public/language/he/admin/general/dashboard.json          | 6 +++---
 public/language/he/admin/settings/uploads.json           | 6 +++---
 public/language/hr/admin/extend/plugins.json             | 4 ++--
 public/language/hr/admin/general/dashboard.json          | 6 +++---
 public/language/hr/admin/settings/uploads.json           | 6 +++---
 public/language/hu/admin/extend/plugins.json             | 4 ++--
 public/language/hu/admin/general/dashboard.json          | 6 +++---
 public/language/hu/admin/settings/uploads.json           | 6 +++---
 public/language/id/admin/extend/plugins.json             | 4 ++--
 public/language/id/admin/general/dashboard.json          | 6 +++---
 public/language/id/admin/settings/uploads.json           | 6 +++---
 public/language/it/admin/extend/plugins.json             | 4 ++--
 public/language/it/admin/general/dashboard.json          | 6 +++---
 public/language/it/admin/settings/uploads.json           | 6 +++---
 public/language/ja/admin/extend/plugins.json             | 4 ++--
 public/language/ja/admin/general/dashboard.json          | 6 +++---
 public/language/ja/admin/settings/uploads.json           | 6 +++---
 public/language/ko/admin/extend/plugins.json             | 4 ++--
 public/language/ko/admin/general/dashboard.json          | 6 +++---
 public/language/ko/admin/settings/uploads.json           | 6 +++---
 public/language/lt/admin/extend/plugins.json             | 4 ++--
 public/language/lt/admin/general/dashboard.json          | 6 +++---
 public/language/lt/admin/settings/uploads.json           | 6 +++---
 public/language/ms/admin/extend/plugins.json             | 4 ++--
 public/language/ms/admin/general/dashboard.json          | 6 +++---
 public/language/ms/admin/settings/uploads.json           | 6 +++---
 public/language/nb/admin/extend/plugins.json             | 4 ++--
 public/language/nb/admin/general/dashboard.json          | 6 +++---
 public/language/nb/admin/settings/uploads.json           | 6 +++---
 public/language/nl/admin/extend/plugins.json             | 4 ++--
 public/language/nl/admin/general/dashboard.json          | 6 +++---
 public/language/nl/admin/settings/uploads.json           | 6 +++---
 public/language/pl/admin/extend/plugins.json             | 4 ++--
 public/language/pl/admin/general/dashboard.json          | 6 +++---
 public/language/pl/admin/settings/uploads.json           | 6 +++---
 public/language/pt-BR/admin/extend/plugins.json          | 4 ++--
 public/language/pt-BR/admin/general/dashboard.json       | 6 +++---
 public/language/pt-BR/admin/settings/uploads.json        | 6 +++---
 public/language/pt-PT/admin/extend/plugins.json          | 4 ++--
 public/language/pt-PT/admin/general/dashboard.json       | 6 +++---
 public/language/pt-PT/admin/settings/uploads.json        | 6 +++---
 public/language/ro/admin/extend/plugins.json             | 4 ++--
 public/language/ro/admin/general/dashboard.json          | 6 +++---
 public/language/ro/admin/settings/uploads.json           | 6 +++---
 public/language/ru/admin/extend/plugins.json             | 4 ++--
 public/language/ru/admin/general/dashboard.json          | 6 +++---
 public/language/ru/admin/settings/uploads.json           | 6 +++---
 public/language/rw/admin/extend/plugins.json             | 4 ++--
 public/language/rw/admin/general/dashboard.json          | 6 +++---
 public/language/rw/admin/settings/uploads.json           | 6 +++---
 public/language/sc/admin/extend/plugins.json             | 4 ++--
 public/language/sc/admin/general/dashboard.json          | 6 +++---
 public/language/sc/admin/settings/uploads.json           | 6 +++---
 public/language/sk/admin/extend/plugins.json             | 4 ++--
 public/language/sk/admin/general/dashboard.json          | 6 +++---
 public/language/sk/admin/settings/uploads.json           | 6 +++---
 public/language/sl/admin/extend/plugins.json             | 4 ++--
 public/language/sl/admin/general/dashboard.json          | 6 +++---
 public/language/sl/admin/settings/uploads.json           | 6 +++---
 public/language/sr/admin/extend/plugins.json             | 4 ++--
 public/language/sr/admin/general/dashboard.json          | 6 +++---
 public/language/sr/admin/settings/uploads.json           | 6 +++---
 public/language/sv/admin/extend/plugins.json             | 4 ++--
 public/language/sv/admin/general/dashboard.json          | 6 +++---
 public/language/sv/admin/settings/uploads.json           | 6 +++---
 public/language/th/admin/extend/plugins.json             | 4 ++--
 public/language/th/admin/general/dashboard.json          | 6 +++---
 public/language/th/admin/settings/uploads.json           | 6 +++---
 public/language/tr/admin/extend/plugins.json             | 4 ++--
 public/language/tr/admin/general/dashboard.json          | 6 +++---
 public/language/tr/admin/settings/uploads.json           | 6 +++---
 public/language/uk/admin/extend/plugins.json             | 4 ++--
 public/language/uk/admin/general/dashboard.json          | 6 +++---
 public/language/uk/admin/settings/uploads.json           | 6 +++---
 public/language/vi/admin/extend/plugins.json             | 4 ++--
 public/language/vi/admin/general/dashboard.json          | 6 +++---
 public/language/vi/admin/settings/uploads.json           | 6 +++---
 public/language/zh-CN/admin/extend/plugins.json          | 4 ++--
 public/language/zh-CN/admin/general/dashboard.json       | 6 +++---
 public/language/zh-CN/admin/settings/uploads.json        | 6 +++---
 public/language/zh-TW/admin/extend/plugins.json          | 4 ++--
 public/language/zh-TW/admin/general/dashboard.json       | 6 +++---
 public/language/zh-TW/admin/settings/uploads.json        | 6 +++---
 129 files changed, 344 insertions(+), 344 deletions(-)

diff --git a/public/language/ar/admin/extend/plugins.json b/public/language/ar/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/ar/admin/extend/plugins.json
+++ b/public/language/ar/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/ar/admin/general/dashboard.json b/public/language/ar/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/ar/admin/general/dashboard.json
+++ b/public/language/ar/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/ar/admin/settings/uploads.json b/public/language/ar/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/ar/admin/settings/uploads.json
+++ b/public/language/ar/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/bg/admin/extend/plugins.json b/public/language/bg/admin/extend/plugins.json
index 0c8824c922..db488264b2 100644
--- a/public/language/bg/admin/extend/plugins.json
+++ b/public/language/bg/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Пренареждане на добавките",
 	"order-active": "Подреждане на включените добавки",
 	"dev-interested": "Искате ли да пишете добавки за NodeBB?",
-	"docs-info": "Документацията за създаване на добавки може да бъде открита в <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">страницата с документация на NodeBB</a>.",
+	"docs-info": "Пълната документация относно създаването на добавки може да бъде намерена в <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">портала за документация на NodeBB</a>.",
 
 	"order.description": "Някои добавки работят най-добре, ако бъдат инсталирани преди или след други добавки.",
 	"order.explanation": "Добавките се зареждат в реда, посочен тук, от горе надолу.",
-	
+
 	"plugin-item.themes": "Теми",
 	"plugin-item.deactivate": "Изключване",
 	"plugin-item.activate": "Включване",
diff --git a/public/language/bg/admin/general/dashboard.json b/public/language/bg/admin/general/dashboard.json
index 23335e4652..5c75d5ab3b 100644
--- a/public/language/bg/admin/general/dashboard.json
+++ b/public/language/bg/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Седмица",
 	"stats.month": "Месец",
 	"stats.all": "От началото",
-	
+
 	"updates": "Обновления",
 	"running-version": "Вие използвате <strong>NodeBB версия <span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Стремете се винаги да използвате най-новата версия на NodeBB, за да се възползвате от последните подобрения на сигурността и поправки на проблеми.",
 	"up-to-date": "<p>Вие използвате <strong>най-новата версия</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>Има нова версия (версия %1). Ако имате възможност, <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">обновете NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>Това е остаряла версия за предварителен преглед на NodeBB. Има нова версия (версия %1). Ако имате възможност, <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">обновете NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>Това е версия за <strong>предварителен преглед</strong> на NodeBB. Възможно е да има неочаквани неизправности. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Форумът работи в режим за разработчици, така че може да бъде уязвим. Моля, свържете се със системния си администратор.</span>",
 
diff --git a/public/language/bg/admin/settings/uploads.json b/public/language/bg/admin/settings/uploads.json
index 3c1d0d7c59..74a463ef28 100644
--- a/public/language/bg/admin/settings/uploads.json
+++ b/public/language/bg/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Намаляване на размера на изображенията до определена ширина (в пиксели)",
 	"max-image-width-help": "(в пиксели; по подразбиране: 760 пиксела. 0 = изключено)",
 	"max-file-size": "Максимален размер на файловете (в КиБ)",
-	"max-file-size-help": "(в кибибайтове; по подразбиране: 2048 КиБ)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Позволяване на потребителите да качват миниатюрни изображения за темите",
 	"topic-thumb-size": "Размер на миниатюрите за темите",
 	"allowed-file-extensions": "Разрешени файлови разширения",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Размер на профилното изображение",
 	"profile-image-dimension-help": "(в пиксели; по подразбиране: 128 пиксела)",
 	"max-profile-image-size": "Максимален файлов размер на профилното изображение",
-	"max-profile-image-size-help": "(в кибибайтове; по подразбиране: 256 КиБ)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Максимален файлов размер на изображението на корицата",
-	"max-cover-image-size-help": "(в кибибайтове; по подразбиране: 2048 КиБ)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Старите версии на профилните изображения и тези на корицата да се пазят на сървъра",
 	"profile-covers": "Корици на профила",
 	"default-covers": "Стандартни изображения за корицата",
diff --git a/public/language/bn/admin/extend/plugins.json b/public/language/bn/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/bn/admin/extend/plugins.json
+++ b/public/language/bn/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/bn/admin/general/dashboard.json b/public/language/bn/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/bn/admin/general/dashboard.json
+++ b/public/language/bn/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/bn/admin/settings/uploads.json b/public/language/bn/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/bn/admin/settings/uploads.json
+++ b/public/language/bn/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/cs/admin/extend/plugins.json b/public/language/cs/admin/extend/plugins.json
index 699fd335fe..1f6ae21683 100644
--- a/public/language/cs/admin/extend/plugins.json
+++ b/public/language/cs/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/cs/admin/general/dashboard.json b/public/language/cs/admin/general/dashboard.json
index eb269bc916..0e918ade44 100644
--- a/public/language/cs/admin/general/dashboard.json
+++ b/public/language/cs/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/cs/admin/settings/uploads.json b/public/language/cs/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/cs/admin/settings/uploads.json
+++ b/public/language/cs/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/da/admin/extend/plugins.json b/public/language/da/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/da/admin/extend/plugins.json
+++ b/public/language/da/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/da/admin/general/dashboard.json b/public/language/da/admin/general/dashboard.json
index 07714e37e8..a17c206c59 100644
--- a/public/language/da/admin/general/dashboard.json
+++ b/public/language/da/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Uge",
 	"stats.month": "Måned",
 	"stats.all": "All Time",
-	
+
 	"updates": "Opdateringer",
 	"running-version": "Du kører <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Altid sikrer dig at din NodeBB er opdateret for de seneste sikkerheds og bug rettelser.",
 	"up-to-date": "<p>Du er <strong>opdateret</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>En ny version (v%1) er blevet udgivet. Overvej <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">at opgradere din NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>Dette er en uddateret pre-release version af NodeBB. En ny version (v%1) er blevet udgivet. Overvej <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">at opdatere din NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>Dette er en <strong>pre-release</strong> udgave af NodeBB. Uforventede bugs kan forekomme.<i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/da/admin/settings/uploads.json b/public/language/da/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/da/admin/settings/uploads.json
+++ b/public/language/da/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/de/admin/extend/plugins.json b/public/language/de/admin/extend/plugins.json
index fd67906de6..9ceec47023 100644
--- a/public/language/de/admin/extend/plugins.json
+++ b/public/language/de/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Plugins neu sortieren",
 	"order-active": "Aktive Plugins sortieren",
 	"dev-interested": "Daran interessiert selbst Plugins für NodeBB zu schreiben?",
-	"docs-info": "Die komplette Dokumentation zur erstellung von Plugins kann im <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Dokumentations Portal</a> gefunden werden.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Bestimmte Plugins funktionieren optimal, wenn diese vor/nach anderen Plugins initialisiert werden.",
 	"order.explanation": "Die Plugins werden in der hier spezifizierten Reihenfolge geladen, von oben nach unten",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deaktivieren",
 	"plugin-item.activate": "Aktivieren",
diff --git a/public/language/de/admin/general/dashboard.json b/public/language/de/admin/general/dashboard.json
index c70a86e3fc..f4e54ec3ec 100644
--- a/public/language/de/admin/general/dashboard.json
+++ b/public/language/de/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Diese Woche",
 	"stats.month": "Diesen Monat",
 	"stats.all": "Alle",
-	
+
 	"updates": "Updates",
 	"running-version": "Es läuft <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Stelle sicher, dass dein NodeBB immer auf dem neuesten Stand für die neuesten Sicherheits-Patches und Bug-fixes ist.",
 	"up-to-date": "<p>NodeBB Version ist <strong>aktuell</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>Version (v%1) wurde veröffentlicht. Ein <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">NodeBB Upgrade</a> wird empfohlen.</p>",
-	"prerelease-upgrade-available": "<p>Das ist eine veraltete pre-release Version von NodeBB. Version (v%1) wurde veröffentlicht. Ein <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">NodeBB Upgrade</a> wird empfohlen.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>Das ist eine <strong>pre-release</strong> Version von NodeBB. Es können ungewollte Fehler auftreten. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Das Forum wurde im Entwicklermodus gestartet. Das Forum könnte potenziellen Gefahren ausgeliefert sein. Bitte kontaktiere den Systemadministrator.</span>",
 
diff --git a/public/language/de/admin/settings/uploads.json b/public/language/de/admin/settings/uploads.json
index c6cc165d88..2abafc014b 100644
--- a/public/language/de/admin/settings/uploads.json
+++ b/public/language/de/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Bilder zu einer bestimmten Breite runterskalieren",
 	"max-image-width-help": "(in Pixeln, standard 760 pixel, auf 0 setzen um zu deaktivieren)",
 	"max-file-size": "Maximale Dateigröße (in KiB)",
-	"max-file-size-help": "(Standard: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Nutzern erlauben Themen Thumbnails hochzuladen",
 	"topic-thumb-size": "Thema Thumbnailgröße",
 	"allowed-file-extensions": "Erlaubte Dateiendungen",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profilbild-Abmessungen",
 	"profile-image-dimension-help": "(in pixeln, standard: 128 pixel)",
 	"max-profile-image-size": "Maximale Profibild-Dateigröße",
-	"max-profile-image-size-help": "(in Kilobytes, standard: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximale Deckbild-Dateigröße",
-	"max-cover-image-size-help": "(in Kilobytes, standard: 2.048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Alte Avatar- und Deckbild-Versionen auf dem Server lassen",
 	"profile-covers": "Profil Deckbilder",
 	"default-covers": "Standard Profil-Deckbilder",
diff --git a/public/language/el/admin/extend/plugins.json b/public/language/el/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/el/admin/extend/plugins.json
+++ b/public/language/el/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/el/admin/general/dashboard.json b/public/language/el/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/el/admin/general/dashboard.json
+++ b/public/language/el/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/el/admin/settings/uploads.json b/public/language/el/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/el/admin/settings/uploads.json
+++ b/public/language/el/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/en-US/admin/extend/plugins.json b/public/language/en-US/admin/extend/plugins.json
index c948ed3795..164fa26434 100644
--- a/public/language/en-US/admin/extend/plugins.json
+++ b/public/language/en-US/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialized before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/en-US/admin/general/dashboard.json b/public/language/en-US/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/en-US/admin/general/dashboard.json
+++ b/public/language/en-US/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/en-US/admin/settings/uploads.json b/public/language/en-US/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/en-US/admin/settings/uploads.json
+++ b/public/language/en-US/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/en-x-pirate/admin/extend/plugins.json b/public/language/en-x-pirate/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/en-x-pirate/admin/extend/plugins.json
+++ b/public/language/en-x-pirate/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/en-x-pirate/admin/general/dashboard.json b/public/language/en-x-pirate/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/en-x-pirate/admin/general/dashboard.json
+++ b/public/language/en-x-pirate/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/en-x-pirate/admin/settings/uploads.json b/public/language/en-x-pirate/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/en-x-pirate/admin/settings/uploads.json
+++ b/public/language/en-x-pirate/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/es/admin/extend/plugins.json b/public/language/es/admin/extend/plugins.json
index c2414d3a25..3925f3c5cc 100644
--- a/public/language/es/admin/extend/plugins.json
+++ b/public/language/es/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-ordenar Plug-ins",
 	"order-active": "Ordenar Plug-ins Activos",
 	"dev-interested": "¿Estas interesado en escribir plug-ins para NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Algunos plug-in funcionan idealmente cuando son inicializados antes o despues de otros.",
 	"order.explanation": "Los plug-in son cargados en el orden especificado, de arriba a abajo.",
-	
+
 	"plugin-item.themes": "Temas",
 	"plugin-item.deactivate": "Desactivar",
 	"plugin-item.activate": "Activar",
diff --git a/public/language/es/admin/general/dashboard.json b/public/language/es/admin/general/dashboard.json
index 28bb5a07eb..8e03c66fdb 100644
--- a/public/language/es/admin/general/dashboard.json
+++ b/public/language/es/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Semana",
 	"stats.month": "Mes",
 	"stats.all": "All Time",
-	
+
 	"updates": "Actualizaciones",
 	"running-version": "Estas ejecutando <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Asegúrate que tu NodeBB este al día en los últimos parches de seguridad y actualizaciones.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>La nueva versión (v%1) ha sido lanzada. Considera <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">actualizar tu NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>Esta es una versión antigua pre-lanzamiento de NodeBB. La nueva versión (v%1) ha sido lanzada. Considera <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">actualizar tu  NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>Esta es una versión de<strong>pre-lanzamiento</strong> de NodeBB. Algunas fallas pueden ocurrir. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum esta siendo ejecutado en modo de desarrollador. El foro puede estar abierto a vulnerabilidades potenciales; por favor contacta tu administrador del sistema.</span>",
 
diff --git a/public/language/es/admin/settings/uploads.json b/public/language/es/admin/settings/uploads.json
index c48d591d9f..783cf5eeef 100644
--- a/public/language/es/admin/settings/uploads.json
+++ b/public/language/es/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/et/admin/extend/plugins.json b/public/language/et/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/et/admin/extend/plugins.json
+++ b/public/language/et/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/et/admin/general/dashboard.json b/public/language/et/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/et/admin/general/dashboard.json
+++ b/public/language/et/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/et/admin/settings/uploads.json b/public/language/et/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/et/admin/settings/uploads.json
+++ b/public/language/et/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/fa-IR/admin/extend/plugins.json b/public/language/fa-IR/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/fa-IR/admin/extend/plugins.json
+++ b/public/language/fa-IR/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/fa-IR/admin/general/dashboard.json b/public/language/fa-IR/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/fa-IR/admin/general/dashboard.json
+++ b/public/language/fa-IR/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/fa-IR/admin/settings/uploads.json b/public/language/fa-IR/admin/settings/uploads.json
index fdf0ff5c1c..f7b860983a 100644
--- a/public/language/fa-IR/admin/settings/uploads.json
+++ b/public/language/fa-IR/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/fi/admin/extend/plugins.json b/public/language/fi/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/fi/admin/extend/plugins.json
+++ b/public/language/fi/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/fi/admin/general/dashboard.json b/public/language/fi/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/fi/admin/general/dashboard.json
+++ b/public/language/fi/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/fi/admin/settings/uploads.json b/public/language/fi/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/fi/admin/settings/uploads.json
+++ b/public/language/fi/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/fr/admin/extend/plugins.json b/public/language/fr/admin/extend/plugins.json
index 0b2a98ec27..f812b2c13e 100644
--- a/public/language/fr/admin/extend/plugins.json
+++ b/public/language/fr/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-ordonner les plugins",
 	"order-active": "Trier les plugins actifs",
 	"dev-interested": "Êtes-vous intéressés par l'écriture de plugins pour NodeBB ?",
-	"docs-info": "La documentation complète sur l'écriture de plugins peut être trouvée sur le<a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">portail de documentation NodeBB</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certains plugins fonctionnent mieux lorsqu'ils sont initialisés avant/après d'autres plugins.",
 	"order.explanation": "Les plugins se chargent dans l'ordre spécifié, ici de haut en bas.",
-	
+
 	"plugin-item.themes": "Thèmes",
 	"plugin-item.deactivate": "Désactiver",
 	"plugin-item.activate": "Activer",
diff --git a/public/language/fr/admin/general/dashboard.json b/public/language/fr/admin/general/dashboard.json
index af8a030b01..dd7fb0ecac 100644
--- a/public/language/fr/admin/general/dashboard.json
+++ b/public/language/fr/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Semaine",
 	"stats.month": "Mois",
 	"stats.all": "Tous les temps",
-	
+
 	"updates": "Mises à jour",
 	"running-version": "<strong>NodeBB v<span id=\"version\">%1</span></strong> est actuellement installé.",
 	"keep-updated": "Assurez-vous que votre version de NodeBB est à jour pour les derniers patchs de sécurité et correctifs de bugs.",
 	"up-to-date": "<p>Votre version <strong>est à jour</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>Une nouvelle version (v%1) a été publiée. Pensez à <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">mettre à jour votre version de NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>Ceci est une ancienne version préliminaire de NodeBB. Une nouvelle version (v%1) a été publiée. Pensez à <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">mettre à jour votre version de NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>Ceci est une version <strong>préliminaire</strong> de NodeBB. Des bugs inattendus peuvent se produire. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Le forum est en mode développement. Il peut être sujet à certaines vulnérabilités, veuillez contacter votre administrateur système.</span>",
 
diff --git a/public/language/fr/admin/settings/uploads.json b/public/language/fr/admin/settings/uploads.json
index a03fbe3a4b..afa63fd613 100644
--- a/public/language/fr/admin/settings/uploads.json
+++ b/public/language/fr/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Redimensionner les images à un largeur spécifique (en pixels)",
 	"max-image-width-help": "(En pixels, par défaut : 760 pixels, définir à 0 si désactivé)",
 	"max-file-size": "Taille maximum d'un fichier (en Ko)",
-	"max-file-size-help": "(En kilooctet, par défaut : 2048 Ko) ",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Autoriser les utilisateurs à télécharger des miniatures de sujet",
 	"topic-thumb-size": "Miniature du sujet",
 	"allowed-file-extensions": "Extensions de fichier autorisés",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Dimensions de l'avatar",
 	"profile-image-dimension-help": "(En pixel, par défaut : 128 pixels)",
 	"max-profile-image-size": "Taille maximum des avatars",
-	"max-profile-image-size-help": "(En kilooctets, par défaut : 256 Ko)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Taille maximum des images de couverture",
-	"max-cover-image-size-help": "(En kilooctets, par défaut : 2,048 Ko)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Garder les anciennes versions d'avatars et d'images de couverture sur le serveur",
 	"profile-covers": "Image de couverture",
 	"default-covers": "Image de couverture par défaut",
diff --git a/public/language/gl/admin/extend/plugins.json b/public/language/gl/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/gl/admin/extend/plugins.json
+++ b/public/language/gl/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/gl/admin/general/dashboard.json b/public/language/gl/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/gl/admin/general/dashboard.json
+++ b/public/language/gl/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/gl/admin/settings/uploads.json b/public/language/gl/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/gl/admin/settings/uploads.json
+++ b/public/language/gl/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/he/admin/extend/plugins.json b/public/language/he/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/he/admin/extend/plugins.json
+++ b/public/language/he/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/he/admin/general/dashboard.json b/public/language/he/admin/general/dashboard.json
index 5c05b1aab7..12c373602f 100644
--- a/public/language/he/admin/general/dashboard.json
+++ b/public/language/he/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "שבוע",
 	"stats.month": "חודש",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/he/admin/settings/uploads.json b/public/language/he/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/he/admin/settings/uploads.json
+++ b/public/language/he/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/hr/admin/extend/plugins.json b/public/language/hr/admin/extend/plugins.json
index 31dc0981d0..3a489d9189 100644
--- a/public/language/hr/admin/extend/plugins.json
+++ b/public/language/hr/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Promjenite redosljed dodataka",
 	"order-active": "Posloži aktivne dodatke",
 	"dev-interested": "Interesira vas pisanje dodataka za NodeBB?",
-	"docs-info": "Punu dokumentaciju u vezi autorstva dodatka mogu biti nađeni na target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Određeni dodatci rade idealno kada su pokrenuti prije/poslije drugih dodataka.",
 	"order.explanation": "Dodatci se učitavaju u slijedu zadanom ovdje,od vrha prema dnu.",
-	
+
 	"plugin-item.themes": "Predlošci",
 	"plugin-item.deactivate": "Deaktiviraj",
 	"plugin-item.activate": "Aktiviraj",
diff --git a/public/language/hr/admin/general/dashboard.json b/public/language/hr/admin/general/dashboard.json
index d29ba8dd1e..72ed344b28 100644
--- a/public/language/hr/admin/general/dashboard.json
+++ b/public/language/hr/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Tjedan",
 	"stats.month": "Mjesec",
 	"stats.all": "Sve vrijeme",
-	
+
 	"updates": "Nadogradnje",
 	"running-version": "Ovo je verzija <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Uvijek se pobrinite da je Vaš NodeBB na najnovijoj verziji za najnovije sigurnosne mjere i popravke grešaka.",
 	"up-to-date": "<p>Vaš NodeBB je <strong>na najnovijoj verziji</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>Izašla je (v%1) nova verzija NodeBB.Razmotrite <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">nadogradnju Vašeg foruma</a>.</p>",
-	"prerelease-upgrade-available": "<p>Ovo je zastarjela verzija NodeBB. Nova verzija (v%1) je izašla.Razmotrite <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">nadogradnju Vašeg NodeBB</a>.</p>\n",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>Ovo je <strong>pre-release</strong> verzija NodeBB. Nenamjerne greške su moguće. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum je u razvojnom stanju. Forum bi mogao biti otvoren za napade; Molimo kontaktirajte vašeg sistemskog administratora</span>",
 
diff --git a/public/language/hr/admin/settings/uploads.json b/public/language/hr/admin/settings/uploads.json
index ced5c66195..60d091847e 100644
--- a/public/language/hr/admin/settings/uploads.json
+++ b/public/language/hr/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Promjeni veličinu slike na zadanu širinu (u pikselima)",
 	"max-image-width-help": "(u pixelima,zadano:760 pixela,upiši 0 za onemogućiti opciju)",
 	"max-file-size": "Maksimalna veličina datoteka (in KiB)",
-	"max-file-size-help": "u kilobajtima,zadano:2048 kiB",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Dozvoli korisnicima da učitaju sliku teme",
 	"topic-thumb-size": "Veličina slike teme",
 	"allowed-file-extensions": "Dozvoljene ekstenzije datoteka",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Dimenzije slike profila",
 	"profile-image-dimension-help": "(u pikselima, zadano: 128 piksela)",
 	"max-profile-image-size": "Maksimalna veličina profilne slike",
-	"max-profile-image-size-help": "(u kilobajtima, početna postavka: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maksimalna veličina slike za naslovnicu",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Zadrži stare verzije avatara i slike profila na serveru",
 	"profile-covers": "Slika profila",
 	"default-covers": "Osnovne slike naslovnica",
diff --git a/public/language/hu/admin/extend/plugins.json b/public/language/hu/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/hu/admin/extend/plugins.json
+++ b/public/language/hu/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/hu/admin/general/dashboard.json b/public/language/hu/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/hu/admin/general/dashboard.json
+++ b/public/language/hu/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/hu/admin/settings/uploads.json b/public/language/hu/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/hu/admin/settings/uploads.json
+++ b/public/language/hu/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/id/admin/extend/plugins.json b/public/language/id/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/id/admin/extend/plugins.json
+++ b/public/language/id/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/id/admin/general/dashboard.json b/public/language/id/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/id/admin/general/dashboard.json
+++ b/public/language/id/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/id/admin/settings/uploads.json b/public/language/id/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/id/admin/settings/uploads.json
+++ b/public/language/id/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/it/admin/extend/plugins.json b/public/language/it/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/it/admin/extend/plugins.json
+++ b/public/language/it/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/it/admin/general/dashboard.json b/public/language/it/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/it/admin/general/dashboard.json
+++ b/public/language/it/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/it/admin/settings/uploads.json b/public/language/it/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/it/admin/settings/uploads.json
+++ b/public/language/it/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/ja/admin/extend/plugins.json b/public/language/ja/admin/extend/plugins.json
index 35159ce1df..572c3b61f3 100644
--- a/public/language/ja/admin/extend/plugins.json
+++ b/public/language/ja/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "プラグインの並び替え",
 	"order-active": "アクティブなプラグインの並び替え",
 	"dev-interested": "NodeBBのプラグインの作成に興味がありますか？",
-	"docs-info": "プラグインの作成に関する完全なドキュメントは<a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBBのドキュメントポータル</a>にあります。",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "特定のプラグインは他のプラグインの前後で初期化された際に理想的な動作をします。",
 	"order.explanation": "プラグインはここに上から下へ指定された順序でロードされます",
-	
+
 	"plugin-item.themes": "テーマ",
 	"plugin-item.deactivate": "非アクティブ化",
 	"plugin-item.activate": "アクティブ化",
diff --git a/public/language/ja/admin/general/dashboard.json b/public/language/ja/admin/general/dashboard.json
index 124d26c394..3ea3d5f3da 100644
--- a/public/language/ja/admin/general/dashboard.json
+++ b/public/language/ja/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "週",
 	"stats.month": "月",
 	"stats.all": "全て",
-	
+
 	"updates": "更新",
 	"running-version": "<strong>NodeBB v<span id=\"version\">%1</span></strong> を実行しています。",
 	"keep-updated": "常に最新のセキュリティパッチとバグ修正のためにNodeBBが最新であることを確認してください。",
 	"up-to-date": "<p>あなたは<strong>最新の状態</strong>です。<i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>新しいバージョン (v%1) がリリースされました。<a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">NodeBBのアップグレード</a>を検討してください。</p>",
-	"prerelease-upgrade-available": "<p>これはNodeBBの旧リリースのバージョンです。新しいバージョン(v%1)がリリースされました。<a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\"> NodeBBのアップグレード</a>を検討してください。</ p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>これはNodeBBの<strong>プレリリース版</strong>です。意図しないバグが発生することがあります。<i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>フォーラムが開発モードで動作しています。フォーラムの動作が脆弱かもしれませんので、管理者に問い合わせてください。</span>",
 
diff --git a/public/language/ja/admin/settings/uploads.json b/public/language/ja/admin/settings/uploads.json
index c352698762..4f30d78a06 100644
--- a/public/language/ja/admin/settings/uploads.json
+++ b/public/language/ja/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "画像を指定した幅(ピクセル単位)にリサイズ",
 	"max-image-width-help": "(ピクセル単位、デフォルト:760px、無効にするには0に設定)",
 	"max-file-size": "最大ファイルサイズ(KB)",
-	"max-file-size-help": "(キロバイト単位、デフォルト：2048 KB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "ユーザーがスレッドのサムネイルをアップロードできるようにする",
 	"topic-thumb-size": "スレッドのサムネイルの大きさ",
 	"allowed-file-extensions": "ファイル拡張子が有効になりました。",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "プロファイル画像の寸法",
 	"profile-image-dimension-help": "(ピクセルで、デフォルト：128px)",
 	"max-profile-image-size": "プロフィール画像の最大ファイルサイズ",
-	"max-profile-image-size-help": "(キロバイト単位、デフォルト：256KB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "カバー画像の最大サイズ",
-	"max-cover-image-size-help": "(キロバイト、デフォルト:2,048KB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "古いバージョンのアバターとプロファイルカバーをサーバーに保管",
 	"profile-covers": "プロフィールのカバー",
 	"default-covers": "デフォルトのカバー画像",
diff --git a/public/language/ko/admin/extend/plugins.json b/public/language/ko/admin/extend/plugins.json
index a669c7e2eb..786801503d 100644
--- a/public/language/ko/admin/extend/plugins.json
+++ b/public/language/ko/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "플러그인 작동 순서 재배열",
 	"order-active": "사용 중인 플러그인 작동 순서 배열",
 	"dev-interested": "NodeBB 플러그인을 만드는 데 관심이 있으십니까?",
-	"docs-info": "플러그인 제작 관련 문서는 <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>에서 찾아보실 수 있습니다.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "특정 플러그인은 다른 플러그인의 초기화 전/후에 가장 이상적으로 작동합니다.",
 	"order.explanation": "플러그인들은 여기에 나열된 순서로 로드됩니다.",
-	
+
 	"plugin-item.themes": "테마",
 	"plugin-item.deactivate": "비활성화",
 	"plugin-item.activate": "활성화",
diff --git a/public/language/ko/admin/general/dashboard.json b/public/language/ko/admin/general/dashboard.json
index b608a99113..61879612aa 100644
--- a/public/language/ko/admin/general/dashboard.json
+++ b/public/language/ko/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "주",
 	"stats.month": "월",
 	"stats.all": "항상",
-	
+
 	"updates": "업데이트",
 	"running-version": "<strong>NodeBB v<span id=\"version\">%1</span></strong> 를 사용 중입니다.",
 	"keep-updated": "사용하시는 NodeBB의 보안 및 오류 업데이트를 항상 최신 버젼으로 유지하십시오.",
 	"up-to-date": "<p><strong>최신 버전입니다</strong><i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>새로운 버전 (v%1) 이 출시 되었습니다. <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">사용하시는 NodeBB</a>의 업데이트를 고려해보세요.</p>",
-	"prerelease-upgrade-available": "<p>옛 버전의 NodeBB를 사용하고 계십니다. 새로운 버전의(v%1) NodeBB가 출시되었으니 <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">업데이트</a> 하시는 것을 추천드립니다.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>이것은 <strong>정식 발표 전 버젼</strong>의 NodeBB 입니다.  예상치 못한 버그가 발생할 수 있습니다.<i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>포럼이 개발자 모드로 실행되고 있습니다. 잠재적 취약점에 노출되어 있을 수 있으니 시스템 관리자에게 문의하십시오.</span>",
 
diff --git a/public/language/ko/admin/settings/uploads.json b/public/language/ko/admin/settings/uploads.json
index 3ec4700711..047eae9345 100644
--- a/public/language/ko/admin/settings/uploads.json
+++ b/public/language/ko/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "이미지를 특정 가로 길이까지 축소 (단위: 픽셀)",
 	"max-image-width-help": "(단위: 픽셀, 기본값: 760 픽셀, 비활성화를 원하시면 0으로 지정하세요)",
 	"max-file-size": "최대 파일 사이즈(KB)",
-	"max-file-size-help": "(단위: KB, 기본값: 2048KB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "사용자들이 게시물 썸네일을 업로드 하는것을 허용",
 	"topic-thumb-size": "게시물 썸네일 사이즈",
 	"allowed-file-extensions": "사용가능한 파일 확장자",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "프로필 사진 규격",
 	"profile-image-dimension-help": "(단위: 픽셀, 기본값: 128 픽셀)",
 	"max-profile-image-size": "프로필 사진 최대 크기",
-	"max-profile-image-size-help": "(단위: KB, 기본값: 256KB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "커버 사진 최대 크기",
-	"max-cover-image-size-help": "(단위: KB, 기본값: 2048KB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "이전 프로필 사진과 커버 사진 서버에 저장",
 	"profile-covers": "프로필 커버 사진",
 	"default-covers": "기본 커버 사진",
diff --git a/public/language/lt/admin/extend/plugins.json b/public/language/lt/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/lt/admin/extend/plugins.json
+++ b/public/language/lt/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/lt/admin/general/dashboard.json b/public/language/lt/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/lt/admin/general/dashboard.json
+++ b/public/language/lt/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/lt/admin/settings/uploads.json b/public/language/lt/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/lt/admin/settings/uploads.json
+++ b/public/language/lt/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/ms/admin/extend/plugins.json b/public/language/ms/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/ms/admin/extend/plugins.json
+++ b/public/language/ms/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/ms/admin/general/dashboard.json b/public/language/ms/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/ms/admin/general/dashboard.json
+++ b/public/language/ms/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/ms/admin/settings/uploads.json b/public/language/ms/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/ms/admin/settings/uploads.json
+++ b/public/language/ms/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/nb/admin/extend/plugins.json b/public/language/nb/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/nb/admin/extend/plugins.json
+++ b/public/language/nb/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/nb/admin/general/dashboard.json b/public/language/nb/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/nb/admin/general/dashboard.json
+++ b/public/language/nb/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/nb/admin/settings/uploads.json b/public/language/nb/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/nb/admin/settings/uploads.json
+++ b/public/language/nb/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/nl/admin/extend/plugins.json b/public/language/nl/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/nl/admin/extend/plugins.json
+++ b/public/language/nl/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/nl/admin/general/dashboard.json b/public/language/nl/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/nl/admin/general/dashboard.json
+++ b/public/language/nl/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/nl/admin/settings/uploads.json b/public/language/nl/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/nl/admin/settings/uploads.json
+++ b/public/language/nl/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/pl/admin/extend/plugins.json b/public/language/pl/admin/extend/plugins.json
index ee9d5675b7..046a9f1ab7 100644
--- a/public/language/pl/admin/extend/plugins.json
+++ b/public/language/pl/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Posortuj Pluginy",
 	"order-active": "Posortuj Aktywne Pluginy",
 	"dev-interested": "Zainteresowany pisanie pluginów do NodeBB??",
-	"docs-info": "Pełna dokumentacje dotycząca pisania pluginów znajduje się tutaj <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Pewne pluginy działają idealnie kiedy są zainicjalizowane przed/po innymi pluginami.",
 	"order.explanation": "Pluginy ładują się tutaj w określonej kolejności, od góry do dołu.",
-	
+
 	"plugin-item.themes": "Style",
 	"plugin-item.deactivate": "Dezaktywować",
 	"plugin-item.activate": "Aktywne",
diff --git a/public/language/pl/admin/general/dashboard.json b/public/language/pl/admin/general/dashboard.json
index 359d6eea49..b30b0ee607 100644
--- a/public/language/pl/admin/general/dashboard.json
+++ b/public/language/pl/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Tydzień",
 	"stats.month": "Miesiąc",
 	"stats.all": "Cały czas",
-	
+
 	"updates": "Aktualizacje",
 	"running-version": "Forum działa dzięki <strong>NodeBB v<span id=\"version\">%1</span></strong>",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>NodeBB <strong>jest aktualny</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>Dostępna jest nowa wersja NodeBB (v%1). Proszę o <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">rozważenie aktualizacji</a></p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/pl/admin/settings/uploads.json b/public/language/pl/admin/settings/uploads.json
index 05edbff41a..55d37318c2 100644
--- a/public/language/pl/admin/settings/uploads.json
+++ b/public/language/pl/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/pt-BR/admin/extend/plugins.json b/public/language/pt-BR/admin/extend/plugins.json
index dec5dc0301..1f566545ca 100644
--- a/public/language/pt-BR/admin/extend/plugins.json
+++ b/public/language/pt-BR/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-ordenar Plugins",
 	"order-active": "Ordenar Plugins Ativos",
 	"dev-interested": "Interessado em escrever plugins para o NodeBB?",
-	"docs-info": "A documentação completa sobre criação de plugins pode ser encontrada no <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">Portal de Documentação do NodeBB</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certos plugins funcionam melhor quando eles são inicializados antes/após outros plugins.",
 	"order.explanation": "Os plugins são carregados na ordem especificada aqui, de cima para baixo",
-	
+
 	"plugin-item.themes": "Temas",
 	"plugin-item.deactivate": "Desativar",
 	"plugin-item.activate": "Ativar",
diff --git a/public/language/pt-BR/admin/general/dashboard.json b/public/language/pt-BR/admin/general/dashboard.json
index 8f28d3d0fb..2fdb2937bb 100644
--- a/public/language/pt-BR/admin/general/dashboard.json
+++ b/public/language/pt-BR/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Semana",
 	"stats.month": "Mês",
 	"stats.all": "Todos os Tempos",
-	
+
 	"updates": "Atualizações",
 	"running-version": "Você está rodando o <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Sempre se certifique de que o seu NodeBB está atualizado para os últimos patches de segurança e bug fixes.",
 	"up-to-date": "<p>Você está <strong>atualizado</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>Uma nova versão (v%1) foi lançada. Leve em consideração <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">atualizar o seu NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>Esta versão um pre-release antigo do NodeBB. Uma nova versão (v%1) foi lançada. Leve em consideração <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">atualizar o seu NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>Esta é uma versão <strong>pre-release</strong> do NodeBB. Bugs inesperados podem ocorrer. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>O fórum está sendo executado em modo de desenvolvedor. O fórum pode estar abrto à potenciais vulnerabilidades; por favor, entre em contato com o seu administrador de sistemas.</span>",
 
diff --git a/public/language/pt-BR/admin/settings/uploads.json b/public/language/pt-BR/admin/settings/uploads.json
index 2a020becb5..45f34b8043 100644
--- a/public/language/pt-BR/admin/settings/uploads.json
+++ b/public/language/pt-BR/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Redimensionar imagens até a largura especificada (em pixels)",
 	"max-image-width-help": "(em pixels, padrão: 760 pixels, defina como 0 para desligar)",
 	"max-file-size": "Tamanho Máximo de Arquivo (em KiB)",
-	"max-file-size-help": "(em kilobytes, padrão: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Permitir usuários de enviar miniaturas de tópico",
 	"topic-thumb-size": "Tamanho da Miniatura de Tópico",
 	"allowed-file-extensions": "Extensões de Arquivo Permitidas",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Dimensão da Imagem de Perfil",
 	"profile-image-dimension-help": "(em pixels, padrão: 128 pixels)",
 	"max-profile-image-size": "Tamanho Máximo do Arquivo de Imagem de Perfil",
-	"max-profile-image-size-help": "(em kilobytes, padrão: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Tamanho Máximo do Arquivo de Imagem de Capa",
-	"max-cover-image-size-help": "(em kilobytes, padrão: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Manter versões antigas de avatares e capas de perfil no servidor",
 	"profile-covers": "Capas de Perfil",
 	"default-covers": "Imagens de Capa Padrão",
diff --git a/public/language/pt-PT/admin/extend/plugins.json b/public/language/pt-PT/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/pt-PT/admin/extend/plugins.json
+++ b/public/language/pt-PT/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/pt-PT/admin/general/dashboard.json b/public/language/pt-PT/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/pt-PT/admin/general/dashboard.json
+++ b/public/language/pt-PT/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/pt-PT/admin/settings/uploads.json b/public/language/pt-PT/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/pt-PT/admin/settings/uploads.json
+++ b/public/language/pt-PT/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/ro/admin/extend/plugins.json b/public/language/ro/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/ro/admin/extend/plugins.json
+++ b/public/language/ro/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/ro/admin/general/dashboard.json b/public/language/ro/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/ro/admin/general/dashboard.json
+++ b/public/language/ro/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/ro/admin/settings/uploads.json b/public/language/ro/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/ro/admin/settings/uploads.json
+++ b/public/language/ro/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/ru/admin/extend/plugins.json b/public/language/ru/admin/extend/plugins.json
index 257c0b051c..8539ab5c6e 100644
--- a/public/language/ru/admin/extend/plugins.json
+++ b/public/language/ru/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Изменить порядок плагинов",
 	"order-active": "Упорядочить активные плагины",
 	"dev-interested": "Заинтересованы в написании плагинов для NodeBB?",
-	"docs-info": "Полную документацию по разработки плагинов можно найти на <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Темы",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/ru/admin/general/dashboard.json b/public/language/ru/admin/general/dashboard.json
index 31eae5031a..042cbe83b9 100644
--- a/public/language/ru/admin/general/dashboard.json
+++ b/public/language/ru/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Неделя",
 	"stats.month": "Месяц",
 	"stats.all": "Всё время",
-	
+
 	"updates": "Обновления",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/ru/admin/settings/uploads.json b/public/language/ru/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/ru/admin/settings/uploads.json
+++ b/public/language/ru/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/rw/admin/extend/plugins.json b/public/language/rw/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/rw/admin/extend/plugins.json
+++ b/public/language/rw/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/rw/admin/general/dashboard.json b/public/language/rw/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/rw/admin/general/dashboard.json
+++ b/public/language/rw/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/rw/admin/settings/uploads.json b/public/language/rw/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/rw/admin/settings/uploads.json
+++ b/public/language/rw/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/sc/admin/extend/plugins.json b/public/language/sc/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/sc/admin/extend/plugins.json
+++ b/public/language/sc/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/sc/admin/general/dashboard.json b/public/language/sc/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/sc/admin/general/dashboard.json
+++ b/public/language/sc/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/sc/admin/settings/uploads.json b/public/language/sc/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/sc/admin/settings/uploads.json
+++ b/public/language/sc/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/sk/admin/extend/plugins.json b/public/language/sk/admin/extend/plugins.json
index a5dae9836a..111ba17c2d 100644
--- a/public/language/sk/admin/extend/plugins.json
+++ b/public/language/sk/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/sk/admin/general/dashboard.json b/public/language/sk/admin/general/dashboard.json
index 6ef0ee9fc2..029eb972a7 100644
--- a/public/language/sk/admin/general/dashboard.json
+++ b/public/language/sk/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Týždeň",
 	"stats.month": "Mesiac",
 	"stats.all": "Celé obdobie",
-	
+
 	"updates": "Aktualizácie",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/sk/admin/settings/uploads.json b/public/language/sk/admin/settings/uploads.json
index 34848f06e5..94b753bd2b 100644
--- a/public/language/sk/admin/settings/uploads.json
+++ b/public/language/sk/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/sl/admin/extend/plugins.json b/public/language/sl/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/sl/admin/extend/plugins.json
+++ b/public/language/sl/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/sl/admin/general/dashboard.json b/public/language/sl/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/sl/admin/general/dashboard.json
+++ b/public/language/sl/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/sl/admin/settings/uploads.json b/public/language/sl/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/sl/admin/settings/uploads.json
+++ b/public/language/sl/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/sr/admin/extend/plugins.json b/public/language/sr/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/sr/admin/extend/plugins.json
+++ b/public/language/sr/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/sr/admin/general/dashboard.json b/public/language/sr/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/sr/admin/general/dashboard.json
+++ b/public/language/sr/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/sr/admin/settings/uploads.json b/public/language/sr/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/sr/admin/settings/uploads.json
+++ b/public/language/sr/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/sv/admin/extend/plugins.json b/public/language/sv/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/sv/admin/extend/plugins.json
+++ b/public/language/sv/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/sv/admin/general/dashboard.json b/public/language/sv/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/sv/admin/general/dashboard.json
+++ b/public/language/sv/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/sv/admin/settings/uploads.json b/public/language/sv/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/sv/admin/settings/uploads.json
+++ b/public/language/sv/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/th/admin/extend/plugins.json b/public/language/th/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/th/admin/extend/plugins.json
+++ b/public/language/th/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/th/admin/general/dashboard.json b/public/language/th/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/th/admin/general/dashboard.json
+++ b/public/language/th/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/th/admin/settings/uploads.json b/public/language/th/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/th/admin/settings/uploads.json
+++ b/public/language/th/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/tr/admin/extend/plugins.json b/public/language/tr/admin/extend/plugins.json
index 4121c482f4..2b322725c2 100644
--- a/public/language/tr/admin/extend/plugins.json
+++ b/public/language/tr/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/tr/admin/general/dashboard.json b/public/language/tr/admin/general/dashboard.json
index e1145a6e63..0ac42fe84b 100644
--- a/public/language/tr/admin/general/dashboard.json
+++ b/public/language/tr/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Hafta",
 	"stats.month": "Ay",
 	"stats.all": "Tüm Zamanlar",
-	
+
 	"updates": "Güncellemeler",
 	"running-version": "<strong>NodeBB v<span id=\"version\">%1</span></strong> çalışıyor.",
 	"keep-updated": "En son güvenlik değişiklikleri ve hata düzeltmeleri için NodeBB güncel olduğundan emin olun.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/tr/admin/settings/uploads.json b/public/language/tr/admin/settings/uploads.json
index b260563c77..3945deb4d3 100644
--- a/public/language/tr/admin/settings/uploads.json
+++ b/public/language/tr/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maksimum Dosya Boyutu (KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "İzin Verilen Dosya Uzantıları",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profil Resmi Boyutu",
 	"profile-image-dimension-help": "(Piksel cinsinden, varsayılan: 128 piksel)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(Kilobayt, varsayılan: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maksimum Kapak Görseli Dosya Boyutu",
-	"max-cover-image-size-help": "(Kilobayt, varsayılan: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profil Kapakları",
 	"default-covers": "Varsayılan Kapak Görseli",
diff --git a/public/language/uk/admin/extend/plugins.json b/public/language/uk/admin/extend/plugins.json
index 8efae9f8e1..28bdcd0256 100644
--- a/public/language/uk/admin/extend/plugins.json
+++ b/public/language/uk/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Впорядкувати плагіни",
 	"order-active": "Впорядкувати активні плагіни",
 	"dev-interested": "Зацікавлені в написанні плагінів для NodeBB?",
-	"docs-info": "Повну документацію з розробки плагінів можна знайти на <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">Порталі NodeBB</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Певні плагіни працють краще будучи ініціалізованими до/після інших плагінів.",
 	"order.explanation": "Плагіни вантажаться у заданому тут порядку, згори до низу",
-	
+
 	"plugin-item.themes": "Теми",
 	"plugin-item.deactivate": "Деактивувати",
 	"plugin-item.activate": "Активувати",
diff --git a/public/language/uk/admin/general/dashboard.json b/public/language/uk/admin/general/dashboard.json
index 9e90a211ea..9d71fb36f0 100644
--- a/public/language/uk/admin/general/dashboard.json
+++ b/public/language/uk/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Тиждень",
 	"stats.month": "Місяць",
 	"stats.all": "Увесь час",
-	
+
 	"updates": "Оновлень",
 	"running-version": "У вас працює <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Регулярно перевіряйте, що ваш NodeBB знаходиться в актуальному стані, щоб мати останні патчі та виправлення.",
 	"up-to-date": "<p>Ваша версія <strong>актуальна</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "Була випущена нова версія (v%1). Подумайте про <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">оновлення свого NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "У вас встановлено застарілу пре-релізну версію NodeBB. Була випущена нова версія (v%1). Подумайте про <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">оновлення свого NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>Це <strong>пре-релізна</strong> версія NodeBB. Можуть виникати неочікувані помилки. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "Форум працює в режимі розробки. Форум потенційно може бути незахищеним, будь-ласка повідомте вашого системного адміністратора.",
 
diff --git a/public/language/uk/admin/settings/uploads.json b/public/language/uk/admin/settings/uploads.json
index a9dfe9c1f6..c7e0995586 100644
--- a/public/language/uk/admin/settings/uploads.json
+++ b/public/language/uk/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Змінювати розмір зображень до заданої ширини (в пікселях)",
 	"max-image-width-help": "(в пікселях, 760 — за замовчуванням, 0 — вимкнути)",
 	"max-file-size": "Максимальний розмір файлу (в КіБ)",
-	"max-file-size-help": "(в кілобайтах, 2048 — за замовчуванням)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Дозволити користувачам завантажувати мініатюри тем",
 	"topic-thumb-size": "Розмір мініатюри теми",
 	"allowed-file-extensions": "Допустимі розширення файлів",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Розміри зображення профілю",
 	"profile-image-dimension-help": "(в пікселях, 128 — за замовчуванням)",
 	"max-profile-image-size": "Максимальний розмір файлу зображення профілю",
-	"max-profile-image-size-help": "(в кілобайтах, 256 — за замовчуванням)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Максимальний розмір файлу зображення обкладинки",
-	"max-cover-image-size-help": "(в кілобайтах, 2048 — за замовчуванням)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Зберігати старі версію зображень аватарки та обкладинки на сервері",
 	"profile-covers": "Обкладинки профілю",
 	"default-covers": "Обкладинка за замовчуванням",
diff --git a/public/language/vi/admin/extend/plugins.json b/public/language/vi/admin/extend/plugins.json
index 1661a987b7..cf80583db4 100644
--- a/public/language/vi/admin/extend/plugins.json
+++ b/public/language/vi/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "Themes",
 	"plugin-item.deactivate": "Deactivate",
 	"plugin-item.activate": "Activate",
diff --git a/public/language/vi/admin/general/dashboard.json b/public/language/vi/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/vi/admin/general/dashboard.json
+++ b/public/language/vi/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/vi/admin/settings/uploads.json b/public/language/vi/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/vi/admin/settings/uploads.json
+++ b/public/language/vi/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",
diff --git a/public/language/zh-CN/admin/extend/plugins.json b/public/language/zh-CN/admin/extend/plugins.json
index 3ca42b1c2e..575c327555 100644
--- a/public/language/zh-CN/admin/extend/plugins.json
+++ b/public/language/zh-CN/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "重新排序插件",
 	"order-active": "排序生效插件",
 	"dev-interested": "有兴趣为NodeBB开发插件？",
-	"docs-info": "浏览编写插件相关的文档：<a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB 文档页面</a>。",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "部分插件需要在其它插件启用之后才能完美运作。",
 	"order.explanation": "插件将按照以下顺序载入，从上至下。",
-	
+
 	"plugin-item.themes": "主题",
 	"plugin-item.deactivate": "停用",
 	"plugin-item.activate": "启用",
diff --git a/public/language/zh-CN/admin/general/dashboard.json b/public/language/zh-CN/admin/general/dashboard.json
index 300e651d89..02759fba11 100644
--- a/public/language/zh-CN/admin/general/dashboard.json
+++ b/public/language/zh-CN/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "周",
 	"stats.month": "月",
 	"stats.all": "总计",
-	
+
 	"updates": "更新",
 	"running-version": "你正在使用 <strong>NodeBB v<span id=\"version\">%1</span> </strong>.",
 	"keep-updated": "请确保您已及时更新 NodeBB 以获得最新的安全补丁与 Bug 修复。",
 	"up-to-date": "<p>正在使用 <strong>最新版本</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>新的版本已经发布 (v%1). 请考虑<a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">更新你的 NodeBB</a>。</p>",
-	"prerelease-upgrade-available": "<p>你正在使用NodeBB过期的测试版。新的版本已经发布 (v%1). 请考虑<a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">更新你的 NodeBB</a>。</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>正在使用<strong>测试版</strong> NodeBB。可能会出现意外的 Bug。<i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>论坛正处于开发模式，这可能使其暴露于潜在的危险之中；请联系您的系统管理员。</span>",
 
diff --git a/public/language/zh-CN/admin/settings/uploads.json b/public/language/zh-CN/admin/settings/uploads.json
index 2a4c42f933..0674ef5d82 100644
--- a/public/language/zh-CN/admin/settings/uploads.json
+++ b/public/language/zh-CN/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "缩小图片到指定宽度(单位像素)",
 	"max-image-width-help": "(像素单位，默认 760 px，设置为0以禁用)",
 	"max-file-size": "最大文件尺寸(单位 KiB)",
-	"max-file-size-help": "(单位 KiB，默认2048KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "允许用户上传主题缩略图",
 	"topic-thumb-size": "主题缩略图大小",
 	"allowed-file-extensions": "允许的文件扩展名",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "个人资料相片尺寸",
 	"profile-image-dimension-help": "(使用 px 作为单位，默认：128px)",
 	"max-profile-image-size": "个人资料相片最大大小",
-	"max-profile-image-size-help": "(单位 KiB ，默认256KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "最大封面图片文件大小",
-	"max-cover-image-size-help": "(单位 KiB ,默认:2048KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "在服务器上保留旧头像和旧的资料封面",
 	"profile-covers": "资料封面",
 	"default-covers": "默认封面图片",
diff --git a/public/language/zh-TW/admin/extend/plugins.json b/public/language/zh-TW/admin/extend/plugins.json
index cb19a6761d..d973f96307 100644
--- a/public/language/zh-TW/admin/extend/plugins.json
+++ b/public/language/zh-TW/admin/extend/plugins.json
@@ -12,11 +12,11 @@
 	"reorder-plugins": "重新排序",
 	"order-active": "排序已啟用的外掛",
 	"dev-interested": "對開發NodeBB的外掛有興趣嗎？",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
-	
+
 	"plugin-item.themes": "佈景主題",
 	"plugin-item.deactivate": "停用",
 	"plugin-item.activate": "啟用",
diff --git a/public/language/zh-TW/admin/general/dashboard.json b/public/language/zh-TW/admin/general/dashboard.json
index 61f4421fb5..9f1c6d8a4e 100644
--- a/public/language/zh-TW/admin/general/dashboard.json
+++ b/public/language/zh-TW/admin/general/dashboard.json
@@ -18,13 +18,13 @@
 	"stats.week": "Week",
 	"stats.month": "Month",
 	"stats.all": "All Time",
-	
+
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
 	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
 	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
 
diff --git a/public/language/zh-TW/admin/settings/uploads.json b/public/language/zh-TW/admin/settings/uploads.json
index 35eaa5a58f..a458870354 100644
--- a/public/language/zh-TW/admin/settings/uploads.json
+++ b/public/language/zh-TW/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kilobytes, default: 2048 KiB)",
+	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
 	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
 	"topic-thumb-size": "Topic Thumb Size",
 	"allowed-file-extensions": "Allowed File Extensions",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kilobytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
 	"profile-covers": "Profile Covers",
 	"default-covers": "Default Cover Images",

From e87f6f900f5094ce451f4d8e1bea20f5aafe4c27 Mon Sep 17 00:00:00 2001
From: "Misty (Bot)" <deploy@nodebb.org>
Date: Sat, 22 Jul 2017 09:23:55 +0000
Subject: [PATCH 47/67] Latest translations and fallbacks

---
 public/language/bg/admin/general/dashboard.json | 4 ++--
 public/language/bg/admin/settings/uploads.json  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/language/bg/admin/general/dashboard.json b/public/language/bg/admin/general/dashboard.json
index 5c75d5ab3b..f1d5630c12 100644
--- a/public/language/bg/admin/general/dashboard.json
+++ b/public/language/bg/admin/general/dashboard.json
@@ -23,8 +23,8 @@
 	"running-version": "Вие използвате <strong>NodeBB версия <span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Стремете се винаги да използвате най-новата версия на NodeBB, за да се възползвате от последните подобрения на сигурността и поправки на проблеми.",
 	"up-to-date": "<p>Вие използвате <strong>най-новата версия</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"upgrade-available": "<p>Има нова версия (версия %1). Ако имате възможност, <a href=\"https://docs.nodebb.org/configuring/upgrade/\">обновете NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>Това е остаряла предварителна версия на NodeBB. Има нова версия (версия %1). Ако имате възможност, <a href=\"https://docs.nodebb.org/configuring/upgrade/\">обновете NodeBB</a>.</p>",
 	"prerelease-warning": "<p>Това е версия за <strong>предварителен преглед</strong> на NodeBB. Възможно е да има неочаквани неизправности. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>Форумът работи в режим за разработчици, така че може да бъде уязвим. Моля, свържете се със системния си администратор.</span>",
 
diff --git a/public/language/bg/admin/settings/uploads.json b/public/language/bg/admin/settings/uploads.json
index 74a463ef28..3c1d0d7c59 100644
--- a/public/language/bg/admin/settings/uploads.json
+++ b/public/language/bg/admin/settings/uploads.json
@@ -5,7 +5,7 @@
 	"max-image-width": "Намаляване на размера на изображенията до определена ширина (в пиксели)",
 	"max-image-width-help": "(в пиксели; по подразбиране: 760 пиксела. 0 = изключено)",
 	"max-file-size": "Максимален размер на файловете (в КиБ)",
-	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
+	"max-file-size-help": "(в кибибайтове; по подразбиране: 2048 КиБ)",
 	"allow-topic-thumbnails": "Позволяване на потребителите да качват миниатюрни изображения за темите",
 	"topic-thumb-size": "Размер на миниатюрите за темите",
 	"allowed-file-extensions": "Разрешени файлови разширения",
@@ -18,9 +18,9 @@
 	"profile-image-dimension": "Размер на профилното изображение",
 	"profile-image-dimension-help": "(в пиксели; по подразбиране: 128 пиксела)",
 	"max-profile-image-size": "Максимален файлов размер на профилното изображение",
-	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
+	"max-profile-image-size-help": "(в кибибайтове; по подразбиране: 256 КиБ)",
 	"max-cover-image-size": "Максимален файлов размер на изображението на корицата",
-	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
+	"max-cover-image-size-help": "(в кибибайтове; по подразбиране: 2048 КиБ)",
 	"keep-all-user-images": "Старите версии на профилните изображения и тези на корицата да се пазят на сървъра",
 	"profile-covers": "Корици на профила",
 	"default-covers": "Стандартни изображения за корицата",

From 9d6922432923e25271b6f0f18be3f59e8c1490be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Sat, 22 Jul 2017 19:05:22 -0400
Subject: [PATCH 48/67] up themes fix altenate_logins to be bool

---
 package.json             | 4 ++--
 src/controllers/index.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 40bfe8a776..d30e5b3bb3 100644
--- a/package.json
+++ b/package.json
@@ -65,9 +65,9 @@
     "nodebb-plugin-spam-be-gone": "0.5.0",
     "nodebb-rewards-essentials": "0.0.9",
     "nodebb-theme-lavender": "4.0.5",
-    "nodebb-theme-persona": "5.0.13",
+    "nodebb-theme-persona": "5.0.14",
     "nodebb-theme-slick": "1.1.0",
-    "nodebb-theme-vanilla": "6.0.10",
+    "nodebb-theme-vanilla": "6.0.11",
     "nodebb-widget-essentials": "3.0.1",
     "nodemailer": "2.6.4",
     "nodemailer-sendmail-transport": "1.0.0",
diff --git a/src/controllers/index.js b/src/controllers/index.js
index 84c20ade81..9136b21534 100644
--- a/src/controllers/index.js
+++ b/src/controllers/index.js
@@ -158,7 +158,7 @@ Controllers.login = function (req, res, next) {
 				return next(err);
 			}
 			data.username = allowLoginWith === 'email' ? user.email : user.username;
-			data.alternate_logins = [];
+			data.alternate_logins = false;
 			res.render('login', data);
 		});
 	} else {

From 292d27716ae2ae5fe71fcc15e9b89b295c7e914f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Sat, 22 Jul 2017 19:21:22 -0400
Subject: [PATCH 49/67] closes #5842

---
 src/views/admin/settings/general.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/admin/settings/general.tpl b/src/views/admin/settings/general.tpl
index 2d9a198ec8..13dffdf71a 100644
--- a/src/views/admin/settings/general.tpl
+++ b/src/views/admin/settings/general.tpl
@@ -43,7 +43,7 @@
 		<div class="form-group">
 			<label for="logoUrl">[[admin/settings/general:logo.image]]</label>
 			<div class="input-group">
-				<input id="logoUrl" type="text" class="form-control" placeholder="[[admin/settings/general:logo.image-placeholder]]" data-field="brand:logo" data-action="upload" data-target="logoUrl" data-route="{config.relative_path}/api/admin/uploadlogo" readonly />
+				<input id="logoUrl" type="text" class="form-control" placeholder="[[admin/settings/general:logo.image-placeholder]]" data-field="brand:logo" />
 				<span class="input-group-btn">
 					<input data-action="upload" data-target="logoUrl" data-route="{config.relative_path}/api/admin/uploadlogo" type="button" class="btn btn-default" value="[[admin/settings/general:logo.upload]]"></input>
 					<button data-action="removeLogo" type="button" class="btn btn-default btn-danger"><i class="fa fa-times"></i></button>
@@ -66,7 +66,7 @@
 		<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 />
+				<input id="og_image" type="text" class="form-control" placeholder="" data-field="og:image" />
 				<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="[[admin/settings/general:logo.upload]]"></input>
 					<button data-action="removeOgImage" type="button" class="btn btn-default btn-danger"><i class="fa fa-times"></i></button>

From 9d0e2e90de6697c5d0c5d968a1bfdc51f8f8add7 Mon Sep 17 00:00:00 2001
From: "Misty (Bot)" <deploy@nodebb.org>
Date: Sun, 23 Jul 2017 09:24:11 +0000
Subject: [PATCH 50/67] Latest translations and fallbacks

---
 public/language/tr/admin/development/info.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/language/tr/admin/development/info.json b/public/language/tr/admin/development/info.json
index cd8aa5fdbf..ecfb09c85a 100644
--- a/public/language/tr/admin/development/info.json
+++ b/public/language/tr/admin/development/info.json
@@ -1,18 +1,18 @@
 {
 	"you-are-on": "Info - You are on <strong>%1:%2</strong>",
 	"nodes-responded": "%1 nodes responded within %2ms!",
-	"host": "host",
+	"host": "sunucu",
 	"pid": "pid",
 	"nodejs": "nodejs",
-	"online": "online",
+	"online": "çevrimiçi",
 	"git": "git",
-	"memory": "memory",
-	"load": "load",
-	"uptime": "uptime",
+	"memory": "hafıza",
+	"load": "yükle",
+	"uptime": "kesintisiz çalışma süresi",
 
-	"registered": "Registered",
-	"sockets": "Sockets",
+	"registered": "Kayıtlı",
+	"sockets": "soketler",
 	"guests": "Ziyaretçiler",
 
-	"info": "Info"
+	"info": "Bilgi"
 }
\ No newline at end of file

From efe13e4038fd2a1214efca60f6393d22bb072f96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Sun, 23 Jul 2017 18:10:18 -0400
Subject: [PATCH 51/67] closes #5827

---
 public/src/admin/manage/users.js    | 2 +-
 public/src/client/account/header.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/src/admin/manage/users.js b/public/src/admin/manage/users.js
index ae0cc9961e..507067337c 100644
--- a/public/src/admin/manage/users.js
+++ b/public/src/admin/manage/users.js
@@ -99,7 +99,7 @@ define('admin/manage/users', ['translator'], function (translator) {
 									data[cur.name] = cur.value;
 									return data;
 								}, {});
-								var until = formData.length ? (Date.now() + (formData.length * 1000 * 60 * 60 * (parseInt(formData.unit, 10) ? 24 : 1))) : 0;
+								var until = formData.length > 0 ? (Date.now() + (formData.length * 1000 * 60 * 60 * (parseInt(formData.unit, 10) ? 24 : 1))) : 0;
 								socket.emit('user.banUsers', { uids: uids, until: until, reason: formData.reason }, done('[[admin/manage/users:alerts.ban-success]]', '.ban', true));
 							},
 						},
diff --git a/public/src/client/account/header.js b/public/src/client/account/header.js
index ce340c2c90..0db3d77b7d 100644
--- a/public/src/client/account/header.js
+++ b/public/src/client/account/header.js
@@ -132,7 +132,8 @@ define('forum/account/header', [
 								data[cur.name] = cur.value;
 								return data;
 							}, {});
-							var until = parseInt(formData.length, 10) ? (Date.now() + (formData.length * 1000 * 60 * 60 * (parseInt(formData.unit, 10) ? 24 : 1))) : 0;
+
+							var until = formData.length > 0 ? (Date.now() + (formData.length * 1000 * 60 * 60 * (parseInt(formData.unit, 10) ? 24 : 1))) : 0;
 
 							socket.emit('user.banUsers', {
 								uids: [ajaxify.data.theirid],

From b2a0ecb3c803992a4b570eb128a88a21d3422716 Mon Sep 17 00:00:00 2001
From: "Misty (Bot)" <deploy@nodebb.org>
Date: Mon, 24 Jul 2017 09:23:35 +0000
Subject: [PATCH 52/67] Latest translations and fallbacks

---
 public/language/sk/admin/extend/plugins.json  |  2 +-
 .../language/sk/admin/manage/categories.json  |  2 +-
 public/language/sk/admin/manage/groups.json   |  2 +-
 .../sk/admin/manage/registration.json         |  2 +-
 public/language/sk/admin/manage/users.json    |  8 +-
 public/language/sk/admin/menu.json            |  2 +-
 public/language/sk/admin/settings/chat.json   |  2 +-
 .../language/sk/admin/settings/cookies.json   |  2 +-
 public/language/sk/admin/settings/email.json  |  2 +-
 .../language/sk/admin/settings/general.json   |  2 +-
 public/language/sk/admin/settings/group.json  |  2 +-
 .../sk/admin/settings/notifications.json      |  2 +-
 .../sk/admin/settings/reputation.json         |  4 +-
 public/language/sk/error.json                 |  2 +-
 public/language/sk/flags.json                 | 84 +++++++++----------
 public/language/sk/global.json                |  4 +-
 public/language/sk/notifications.json         |  6 +-
 public/language/sk/pages.json                 |  6 +-
 public/language/sk/topic.json                 |  2 +-
 public/language/sk/user.json                  |  4 +-
 public/language/sk/users.json                 |  2 +-
 21 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/public/language/sk/admin/extend/plugins.json b/public/language/sk/admin/extend/plugins.json
index 111ba17c2d..5d156ee78e 100644
--- a/public/language/sk/admin/extend/plugins.json
+++ b/public/language/sk/admin/extend/plugins.json
@@ -1,7 +1,7 @@
 {
 	"installed": "Nainštalovaný",
 	"active": "Aktívny",
-	"inactive": "Inactive",
+	"inactive": "Nečinný",
 	"out-of-date": "Out of Date",
 	"none-found": "No plugins found.",
 	"none-active": "No Active Plugins",
diff --git a/public/language/sk/admin/manage/categories.json b/public/language/sk/admin/manage/categories.json
index 9d5330d930..6536bf3580 100644
--- a/public/language/sk/admin/manage/categories.json
+++ b/public/language/sk/admin/manage/categories.json
@@ -1,6 +1,6 @@
 {
 	"settings": "Nastavenia kategórie",
-	"privileges": "Privileges",
+	"privileges": "Oprávnenia",
 
 	"name": "Category Name",
 	"description": "Category Description",
diff --git a/public/language/sk/admin/manage/groups.json b/public/language/sk/admin/manage/groups.json
index cc3de74004..d4bb1a431d 100644
--- a/public/language/sk/admin/manage/groups.json
+++ b/public/language/sk/admin/manage/groups.json
@@ -1,6 +1,6 @@
 {
 	"name": "Názov skupiny",
-	"description": "Group Description",
+	"description": "Popis skupiny",
 	"member-count": "Member Count",
 	"system": "System Group",
 	"edit": "Edit",
diff --git a/public/language/sk/admin/manage/registration.json b/public/language/sk/admin/manage/registration.json
index 04fc0f204e..140b4acd5c 100644
--- a/public/language/sk/admin/manage/registration.json
+++ b/public/language/sk/admin/manage/registration.json
@@ -2,7 +2,7 @@
 	"queue": "Fronta",
 	"description": "There are no users in the registration queue. <br> To enable this feature, go to <a href=\"%1\">Settings &rarr; User &rarr; User Registration</a> and set <strong>Registration Type</strong> to \"Admin Approval\".",
 
-	"list.name": "Name",
+	"list.name": "Meno",
 	"list.email": "Email",
 	"list.ip": "IP",
 	"list.time": "Time",
diff --git a/public/language/sk/admin/manage/users.json b/public/language/sk/admin/manage/users.json
index 24bc916cff..fd4759f507 100644
--- a/public/language/sk/admin/manage/users.json
+++ b/public/language/sk/admin/manage/users.json
@@ -1,6 +1,6 @@
 {
 	"users": "Používatelia",
-	"edit": "Edit",
+	"edit": "Úprava",
 	"make-admin": "Make Admin",
 	"remove-admin": "Remove Admin",
 	"validate-email": "Validate Email",
@@ -10,7 +10,7 @@
 	"temp-ban": "Ban User(s) Temporarily",
 	"unban": "Unban User(s)",
 	"reset-lockout": "Reset Lockout",
-	"reset-flags": "Obnoviť označenia",
+	"reset-flags": "Obnoviť príznaky",
 	"delete": "Delete User(s)",
 	"purge": "Delete User(s) and Content",
 	"download-csv": "Download CSV",
@@ -44,7 +44,7 @@
 	"users.email": "email",
 	"users.postcount": "postcount",
 	"users.reputation": "reputation",
-	"users.flags": "flags",
+	"users.flags": "príznaky",
 	"users.joined": "joined",
 	"users.last-online": "last online",
 	"users.banned": "banned",
@@ -67,7 +67,7 @@
 	"alerts.button-ban-x": "Ban %1 user(s)",
 	"alerts.unban-success": "User(s) unbanned!",
 	"alerts.lockout-reset-success": "Lockout(s) reset!",
-	"alerts.flag-reset-success": "Flags(s) reset!",
+	"alerts.flag-reset-success": "Príznak(y) boli obnovené!",
 	"alerts.no-remove-yourself-admin": "You can't remove yourself as Administrator!",
 	"alerts.make-admin-success": "User(s) are now administrators.",
 	"alerts.confirm-remove-admin": "Do you really want to remove admins?",
diff --git a/public/language/sk/admin/menu.json b/public/language/sk/admin/menu.json
index 25dd937403..77dc7fdcd4 100644
--- a/public/language/sk/admin/menu.json
+++ b/public/language/sk/admin/menu.json
@@ -1,7 +1,7 @@
 {
 	"section-general": "Všeobecné",
 	"general/dashboard": "Prístrojová doska",
-	"general/homepage": "Home Page",
+	"general/homepage": "Domovská stránka",
 	"general/navigation": "Navigation",
 	"general/languages": "Languages",
 	"general/sounds": "Sounds",
diff --git a/public/language/sk/admin/settings/chat.json b/public/language/sk/admin/settings/chat.json
index 163a472265..5e18c78f52 100644
--- a/public/language/sk/admin/settings/chat.json
+++ b/public/language/sk/admin/settings/chat.json
@@ -1,6 +1,6 @@
 {
 	"chat-settings": "Nastavenia konverzácie",
-	"disable": "Disable chat",
+	"disable": "Zakázať konverzáciu",
 	"disable-editing": "Disable chat message editing/deletion",
 	"disable-editing-help": "Administrators and global moderators are exempt from this restriction",
 	"max-length": "Maximum length of chat messages",
diff --git a/public/language/sk/admin/settings/cookies.json b/public/language/sk/admin/settings/cookies.json
index 7a7d5c2187..19b2dc85b3 100644
--- a/public/language/sk/admin/settings/cookies.json
+++ b/public/language/sk/admin/settings/cookies.json
@@ -1,6 +1,6 @@
 {
 	"eu-consent": "Súhlas EÚ",
-	"consent.enabled": "Enabled",
+	"consent.enabled": "Povolené",
 	"consent.message": "Notification message",
 	"consent.acceptance": "Acceptance message",
 	"consent.link-text": "Policy Link Text",
diff --git a/public/language/sk/admin/settings/email.json b/public/language/sk/admin/settings/email.json
index cf3161d806..bae53dac5e 100644
--- a/public/language/sk/admin/settings/email.json
+++ b/public/language/sk/admin/settings/email.json
@@ -1,6 +1,6 @@
 {
 	"email-settings": "Nastavenia e-mailu",
-	"address": "Email Address",
+	"address": "Emailová adresa",
 	"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
diff --git a/public/language/sk/admin/settings/general.json b/public/language/sk/admin/settings/general.json
index e20d726f79..731c73315c 100644
--- a/public/language/sk/admin/settings/general.json
+++ b/public/language/sk/admin/settings/general.json
@@ -1,7 +1,7 @@
 {
 	"site-settings": "Nastavenia lokality",
 	"title": "Site Title",
-	"title.name": "Your Community Name",
+	"title.name": "Vaše komunitné meno",
 	"title.show-in-header": "Show Site Title in Header",
 	"browser-title": "Browser Title",
 	"browser-title-help": "If no browser title is specified, the site title will be used",
diff --git a/public/language/sk/admin/settings/group.json b/public/language/sk/admin/settings/group.json
index be6e3cd529..55d26fc90a 100644
--- a/public/language/sk/admin/settings/group.json
+++ b/public/language/sk/admin/settings/group.json
@@ -1,6 +1,6 @@
 {
 	"general": "Všeobecné",
-	"private-groups": "Private Groups",
+	"private-groups": "Súkromné ​​skupiny",
 	"private-groups.help": "If enabled, joining of groups requires the approval of the group owner <em>(Default: enabled)</em>",
 	"private-groups.warning": "<strong>Beware!</strong> If this option is disabled and you have private groups, they automatically become public.",
 	"allow-creation": "Allow Group Creation",
diff --git a/public/language/sk/admin/settings/notifications.json b/public/language/sk/admin/settings/notifications.json
index c2eb1adbeb..5154979af9 100644
--- a/public/language/sk/admin/settings/notifications.json
+++ b/public/language/sk/admin/settings/notifications.json
@@ -1,5 +1,5 @@
 {
 	"notifications": "Oznámenia",
-	"welcome-notification": "Welcome Notification",
+	"welcome-notification": "Uvítacie upozornenie",
 	"welcome-notification-link": "Welcome Notification Link"
 }
\ No newline at end of file
diff --git a/public/language/sk/admin/settings/reputation.json b/public/language/sk/admin/settings/reputation.json
index 573d2609a1..61086436b7 100644
--- a/public/language/sk/admin/settings/reputation.json
+++ b/public/language/sk/admin/settings/reputation.json
@@ -1,9 +1,9 @@
 {
-	"reputation": "Reputation Settings",
+	"reputation": "Nastavenie reputácie",
 	"disable": "Disable Reputation System",
 	"disable-down-voting": "Disable Down Voting",
 	"votes-are-public": "Všetky hlasy sú verejné",
 	"thresholds": "Activity Thresholds",
 	"min-rep-downvote": "Minimum reputation to downvote posts",
-	"min-rep-flag": "Minimum reputation to flag posts"
+	"min-rep-flag": "Minimálna reputácia pre označenie prízpevku"
 }
\ No newline at end of file
diff --git a/public/language/sk/error.json b/public/language/sk/error.json
index f387d6a128..339a887a64 100644
--- a/public/language/sk/error.json
+++ b/public/language/sk/error.json
@@ -116,7 +116,7 @@
     "downvoting-disabled": "Hlasovanie proti je zablokované",
     "not-enough-reputation-to-downvote": "Nemáte dostatočnú reputáciu k odobratiu hlasu pre tento príspevok",
     "not-enough-reputation-to-flag": "Nemáte dostatočnú reputáciu na označenie tohto príspevku",
-    "already-flagged": "Na tomto príspevku už máte značku",
+    "already-flagged": "Už ste označili tento príspevok",
     "reload-failed": "NodeBB narazil na problém pri načítaní: \"%1\". NodeBB bude pokračovať v službe existujúcej aktívnej klientskej strane, aj keď by ste mali vrátiť to, čo ste spravili tesne pred znovu načítaním.",
     "registration-error": "Chyba registrácie",
     "parse-error": "Niečo sa pokazilo pri analýze odpovede servera",
diff --git a/public/language/sk/flags.json b/public/language/sk/flags.json
index 281bfd6e14..f1a5e7ea39 100644
--- a/public/language/sk/flags.json
+++ b/public/language/sk/flags.json
@@ -1,60 +1,60 @@
 {
 	"state": "Stav",
-	"reporter": "Reporter",
-	"reported-at": "Reported At",
-	"description": "Description",
-	"no-flags": "Hurá! Žiadne označenia neboli nájdené.",
-	"assignee": "Assignee",
-	"update": "Update",
-	"updated": "Updated",
-	"target-purged": "The content this flag referred to has been purged and is no longer available.",
+	"reporter": "Ohlasovateľ",
+	"reported-at": "Nahlásené na",
+	"description": "Popis",
+	"no-flags": "Hurá! Neboli nájdené žiadne príznaky.",
+	"assignee": "Nástupca",
+	"update": "Aktualizácia",
+	"updated": "Aktualizované",
+	"target-purged": "Obsah, na ktorý sa vzťahuje tento príznak, bol odstránený a už nie je k dispozícii.",
 
-	"quick-filters": "Quick Filters",
-	"filter-active": "There are one or more filters active in this list of flags",
-	"filter-reset": "Remove Filters",
-	"filters": "Filter Options",
+	"quick-filters": "Rýchle filtre",
+	"filter-active": "V tomto zozname príznakov je aktívny jeden alebo viac filtrov",
+	"filter-reset": "Odstrániť filtre",
+	"filters": "Možnosti filtrovania",
 	"filter-reporterId": "Reporter UID",
 	"filter-targetUid": "Flagged UID",
-	"filter-type": "Flag Type",
-	"filter-type-all": "All Content",
+	"filter-type": "Typ príznaku",
+	"filter-type-all": "Všetok obsah",
 	"filter-type-post": "Post",
 	"filter-state": "State",
 	"filter-assignee": "Assignee UID",
-	"filter-cid": "Category",
-	"filter-quick-mine": "Assigned to me",
-	"filter-cid-all": "All categories",
-	"apply-filters": "Apply Filters",
+	"filter-cid": "Kategória",
+	"filter-quick-mine": "Priradené mne",
+	"filter-cid-all": "Všetky kategórie",
+	"apply-filters": "Použiť filtre",
 
-	"quick-links": "Quick Links",
+	"quick-links": "Rýchle odkazy",
 	"flagged-user": "Označený používateľ",
-	"view-profile": "View Profile",
-	"start-new-chat": "Start New Chat",
-	"go-to-target": "View Flag Target",
+	"view-profile": "Zobraziť profil",
+	"start-new-chat": "Začať novú konverzáciu",
+	"go-to-target": "Zobraziť ciele príznaku",
 
-	"user-view": "View Profile",
-	"user-edit": "Edit Profile",
+	"user-view": "Zobraziť profil",
+	"user-edit": "Upraviť profil",
 
-	"notes": "Flag Notes",
-	"add-note": "Add Note",
-	"no-notes": "No shared notes.",
+	"notes": "Poznámky príznaku",
+	"add-note": "Pridať poznámku",
+	"no-notes": "Žiadne zdieľané poznámky.",
 
-	"history": "Flag History",
-	"back": "Back to Flags List",
-	"no-history": "No flag history.",
+	"history": "História príznakov",
+	"back": "Späť do zoznamu príznakov",
+	"no-history": "Žiadna história príznakov.",
 
 	"state-all": "All states",
-	"state-open": "New/Open",
-	"state-wip": "Work in Progress",
-	"state-resolved": "Resolved",
-	"state-rejected": "Rejected",
-	"no-assignee": "Not Assigned",
-	"note-added": "Note Added",
+	"state-open": "Nový/Otvoriť",
+	"state-wip": "Práca prebieha",
+	"state-resolved": "Vyriešené",
+	"state-rejected": "Odmietnuté",
+	"no-assignee": "Priradené k %1",
+	"note-added": "Poznámka bola pridaná",
 
-	"modal-title": "Report Inappropriate Content",
-	"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
+	"modal-title": "Nahlásiť nevhodný obsah",
+	"modal-body": "Zadajte dôvod, pre ktorý chcete označiť% 1% 2 na kontrolu. Prípadne použite jedno z tlačidiel rýchleho hlásenia, ak je to vhodné.",
 	"modal-reason-spam": "Spam",
-	"modal-reason-offensive": "Offensive",
-	"modal-reason-custom": "Reason for reporting this content...",
-	"modal-submit": "Submit Report",
-	"modal-submit-success": "Content has been flagged for moderation."
+	"modal-reason-offensive": "Urážlivý",
+	"modal-reason-custom": "Dôvod oznamovania tohto obsahu...",
+	"modal-submit": "Odoslať správu",
+	"modal-submit-success": "Obsah bol označený na moderovanie."
 }
\ No newline at end of file
diff --git a/public/language/sk/global.json b/public/language/sk/global.json
index 9e19412427..4ae1675ca9 100644
--- a/public/language/sk/global.json
+++ b/public/language/sk/global.json
@@ -104,6 +104,6 @@
     "cookies.accept": "Mám to!",
     "cookies.learn_more": "Zistit viac",
     "edited": "Zmenené",
-    "disabled": "Disabled",
-    "select": "Select"
+    "disabled": "Zablokovaný",
+    "select": "Vybrať"
 }
\ No newline at end of file
diff --git a/public/language/sk/notifications.json b/public/language/sk/notifications.json
index 956d44f83c..f9c6f649ff 100644
--- a/public/language/sk/notifications.json
+++ b/public/language/sk/notifications.json
@@ -16,8 +16,8 @@
     "chat": "Konverzácie",
     "follows": "Nasledovatelia",
     "upvote": "Zahlasované",
-    "new-flags": "Nové označenia",
-    "my-flags": "Priradené značky",
+    "new-flags": "Nové príznaky",
+    "my-flags": "Príznaky priradené mne",
     "bans": "Zablokované",
     "new_message_from": "Nova spáva od <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> dal hlas Vášmu príspevku v <strong>%2</strong>.",
@@ -40,7 +40,7 @@
     "user_started_following_you_multiple": "<strong>%1</strong> a %2 ďalší Vás začali sledovať.",
     "new_register": "<strong>%1</strong> odoslal žiadosť o registráciu.",
     "new_register_multiple": "Nachádzajú sa <strong>%1</strong> registrácie čakajúce na preskúmanie.",
-    "flag_assigned_to_you": "<strong>Značka %1</strong> vám bola priradená ",
+    "flag_assigned_to_you": "<strong>Príznak %1</strong> vám bol priradený ",
     "email-confirmed": "E-mail bol potvrdený",
     "email-confirmed-message": "Ďakujeme za potvrdenie Vášho e-mailu. Účet je plne aktivovaný.",
     "email-confirm-error-message": "Vyskytla sa chyba pri overení Vašej e-mailovej adresy. ",
diff --git a/public/language/sk/pages.json b/public/language/sk/pages.json
index c022b4fab2..8573de0733 100644
--- a/public/language/sk/pages.json
+++ b/public/language/sk/pages.json
@@ -13,7 +13,7 @@
     "users/sort-posts": "Užívatelia s najväčším počtom príspevkov",
     "users/sort-reputation": "Užívatelia s najväčšou reputáciou",
     "users/banned": "Zablokovaný užívatelia",
-    "users/most-flags": "Najviac označených užívateľov",
+    "users/most-flags": "Najviac používateľov s označením",
     "users/search": "Hľadanie užívateľov",
     "notifications": "Oznámenia",
     "tags": "Značky",
@@ -27,8 +27,8 @@
     "group": "%1 skupina",
     "chats": "Konverzácie",
     "chat": "Rozprávate sa s %1",
-    "flags": "Značky",
-    "flag-details": "Detaily značky %1",
+    "flags": "Príznaky",
+    "flag-details": "Detaily príznaku %1",
     "account/edit": "Úprava \"%1\"",
     "account/edit/password": "Úprava hesla \"%1\"",
     "account/edit/username": "Úprava užívateľského mena \"%1\"",
diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json
index d8662c3bf3..9eeab330be 100644
--- a/public/language/sk/topic.json
+++ b/public/language/sk/topic.json
@@ -59,7 +59,7 @@
     "thread_tools.unlock": "Odomknúť tému",
     "thread_tools.move": "Presunúť tému",
     "thread_tools.move_all": "Presunúť všetko",
-    "thread_tools.select_category": "Select Category",
+    "thread_tools.select_category": "Vybrať kategóriu",
     "thread_tools.fork": "Rozvetviť tému",
     "thread_tools.delete": "Odstrániť tému",
     "thread_tools.delete-posts": "Odstrániť príspevky",
diff --git a/public/language/sk/user.json b/public/language/sk/user.json
index b072831a64..974c85e63c 100644
--- a/public/language/sk/user.json
+++ b/public/language/sk/user.json
@@ -120,8 +120,8 @@
     "sso.title": "Služby jednotného prihlasovania",
     "sso.associated": "Spojené s",
     "sso.not-associated": "Kliknite tu pre spojenie s",
-    "info.latest-flags": "Posledné označenia",
-    "info.no-flags": "Žiadne označené príspevky neboli nájdené",
+    "info.latest-flags": "Najnovšie príznaky",
+    "info.no-flags": "Neboli nájdené žiadne označené príspevky",
     "info.ban-history": "Nedávna história zablokovania",
     "info.no-ban-history": "Tento člen nebol nikdy zablokovaný",
     "info.banned-until": "Zablokovaný až do %1",
diff --git a/public/language/sk/users.json b/public/language/sk/users.json
index 1786e3baed..ecbf37532d 100644
--- a/public/language/sk/users.json
+++ b/public/language/sk/users.json
@@ -2,7 +2,7 @@
     "latest_users": "Najnovší užívatelia",
     "top_posters": "Najaktívnejší",
     "most_reputation": "Najváženejší",
-    "most_flags": "Najviac označené",
+    "most_flags": "Väčšina príznakov",
     "search": "Vyhľadávať",
     "enter_username": "Zadajte užívateľa k hľadaniu",
     "load_more": "Načítať viac",

From 5835334b1c0e494fe76daa0f996faa1930151aa1 Mon Sep 17 00:00:00 2001
From: "Misty (Bot)" <deploy@nodebb.org>
Date: Tue, 25 Jul 2017 09:23:35 +0000
Subject: [PATCH 53/67] Latest translations and fallbacks

---
 public/language/cs/admin/admin.json           |  8 +-
 public/language/cs/admin/advanced/cache.json  | 18 ++---
 .../language/cs/admin/advanced/database.json  | 54 ++++++-------
 public/language/cs/admin/advanced/errors.json | 24 +++---
 public/language/cs/admin/advanced/events.json |  8 +-
 public/language/cs/admin/advanced/logs.json   | 10 +--
 .../cs/admin/appearance/customise.json        | 16 ++--
 .../language/cs/admin/appearance/skins.json   |  6 +-
 public/language/cs/admin/settings/user.json   | 76 +++++++++----------
 public/language/cs/email.json                 | 18 ++---
 public/language/cs/global.json                | 70 ++++++++---------
 public/language/cs/modules.json               | 20 ++---
 public/language/cs/notifications.json         | 18 ++---
 public/language/cs/topic.json                 | 10 +--
 public/language/cs/user.json                  |  2 +-
 .../language/nl/admin/general/languages.json  |  8 +-
 public/language/nl/global.json                |  4 +-
 public/language/nl/topic.json                 |  2 +-
 18 files changed, 186 insertions(+), 186 deletions(-)

diff --git a/public/language/cs/admin/admin.json b/public/language/cs/admin/admin.json
index 9c01f56006..ff81a8bb82 100644
--- a/public/language/cs/admin/admin.json
+++ b/public/language/cs/admin/admin.json
@@ -1,7 +1,7 @@
 {
-	"alert.confirm-reload": "Are you sure you wish to reload NodeBB?",
-	"alert.confirm-restart": "Are you sure you wish to restart NodeBB?",
+	"alert.confirm-reload": "Jste si jist/a, že si přejete znovu načíst NodeBB?",
+	"alert.confirm-restart": "Jste si jist/a, že si přejete restartovat NodeBB?",
 
-	"acp-title": "%1 | NodeBB Admin Control Panel",
-	"settings-header-contents": "Contents"
+	"acp-title": "Ovládací panel správce NodeBB | %1",
+	"settings-header-contents": "Obsah"
 }
\ No newline at end of file
diff --git a/public/language/cs/admin/advanced/cache.json b/public/language/cs/admin/advanced/cache.json
index 5a954f1232..8014ba1707 100644
--- a/public/language/cs/admin/advanced/cache.json
+++ b/public/language/cs/admin/advanced/cache.json
@@ -1,11 +1,11 @@
 {
-	"post-cache": "Post Cache",
-	"posts-in-cache": "Posts in Cache",
-	"average-post-size": "Average Post Size",
-	"length-to-max": "Length / Max",
-	"percent-full": "%1% Full",
-	"post-cache-size": "Post Cache Size",
-	"items-in-cache": "Items in Cache",
-	"control-panel": "Control Panel",
-	"update-settings": "Update Cache Settings"
+	"post-cache": "Mezipaměť příspěvku",
+	"posts-in-cache": "Příspěvků v mezipaměti",
+	"average-post-size": "Průměrná velikost příspěvku",
+	"length-to-max": "Délka / Maximum",
+	"percent-full": "%1% plný",
+	"post-cache-size": "Velikost mezipaměti příspěvku",
+	"items-in-cache": "Položek v mezipaměti",
+	"control-panel": "Ovládací panel",
+	"update-settings": "Aktualizovat nastavení mezipaměti"
 }
\ No newline at end of file
diff --git a/public/language/cs/admin/advanced/database.json b/public/language/cs/admin/advanced/database.json
index b88ca6fc82..eb1bf4030c 100644
--- a/public/language/cs/admin/advanced/database.json
+++ b/public/language/cs/admin/advanced/database.json
@@ -2,35 +2,35 @@
 	"x-b": "%1 b",
 	"x-mb": "%1 mb",
 	"x-gb": "%1 gb",
-	"uptime-seconds": "Uptime in Seconds",
-	"uptime-days": "Uptime in Days",
+	"uptime-seconds": "Doba provozu v sekundách",
+	"uptime-days": "Doba provozu ve dnech",
 
 	"mongo": "Mongo",
-	"mongo.version": "MongoDB Version",
-	"mongo.storage-engine": "Storage Engine",
-	"mongo.collections": "Collections",
-	"mongo.objects": "Objects",
-	"mongo.avg-object-size": "Avg. Object Size",
-	"mongo.data-size": "Data Size",
-	"mongo.storage-size": "Storage Size",
-	"mongo.index-size": "Index Size",
-	"mongo.file-size": "File Size",
-	"mongo.resident-memory": "Resident Memory",
-	"mongo.virtual-memory": "Virtual Memory",
-	"mongo.mapped-memory": "Mapped Memory",
-	"mongo.raw-info": "MongoDB Raw Info",
+	"mongo.version": "Verze MongoDB",
+	"mongo.storage-engine": "Modul úložiště",
+	"mongo.collections": "Fondy",
+	"mongo.objects": "Objekty",
+	"mongo.avg-object-size": "Průměrná velikost objeku",
+	"mongo.data-size": "Velikost dat",
+	"mongo.storage-size": "Velikost úložiště",
+	"mongo.index-size": "Velikost indexu",
+	"mongo.file-size": "Velikost souboru",
+	"mongo.resident-memory": "Residentní paměť",
+	"mongo.virtual-memory": "Virtuální paměť",
+	"mongo.mapped-memory": "Namapovaná paměť",
+	"mongo.raw-info": "Raw informace MongoDB",
 
 	"redis": "Redis",
-	"redis.version": "Redis Version",
-	"redis.connected-clients": "Connected Clients",
-	"redis.connected-slaves": "Connected Slaves",
-	"redis.blocked-clients": "Blocked Clients",
-	"redis.used-memory": "Used Memory",
-	"redis.memory-frag-ratio": "Memory Fragmentation Ratio",
-	"redis.total-connections-recieved": "Total Connections Received",
-	"redis.total-commands-processed": "Total Commands Processed",
-	"redis.iops": "Instantaneous Ops. Per Second",
-	"redis.keyspace-hits": "Keyspace Hits",
-	"redis.keyspace-misses": "Keyspace Misses",
-	"redis.raw-info": "Redis Raw Info"
+	"redis.version": "Verze Redis",
+	"redis.connected-clients": "Připojených klientů",
+	"redis.connected-slaves": "Druhotná připojení",
+	"redis.blocked-clients": "Blokovaných klientů",
+	"redis.used-memory": "Využitá paměť",
+	"redis.memory-frag-ratio": "Poměr fragmentace paměti",
+	"redis.total-connections-recieved": "Souhrné množství připojení",
+	"redis.total-commands-processed": "Souhrnně zpracováno příkazů",
+	"redis.iops": "Okamžité zpracování za sekundu",
+	"redis.keyspace-hits": "Zpracováno klíčů",
+	"redis.keyspace-misses": "Chyby klíče",
+	"redis.raw-info": "Informace Redis Raw"
 }
\ No newline at end of file
diff --git a/public/language/cs/admin/advanced/errors.json b/public/language/cs/admin/advanced/errors.json
index 546f0f1508..9960fb7803 100644
--- a/public/language/cs/admin/advanced/errors.json
+++ b/public/language/cs/admin/advanced/errors.json
@@ -1,14 +1,14 @@
 {
-	"figure-x": "Figure %1",
-	"error-events-per-day": "<code>%1</code> events per day",
-	"error.404": "404 Not Found",
-	"error.503": "503 Service Unavailable",
-	"manage-error-log": "Manage Error Log",
-	"export-error-log": "Export Error Log (CSV)",
-	"clear-error-log": "Clear Error Log",
-	"route": "Route",
-	"count": "Count",
-	"no-routes-not-found": "Hooray! No 404 errors!",
-	"clear404-confirm": "Are you sure you wish to clear the 404 error logs?",
-	"clear404-success": "\"404 Not Found\" errors cleared"
+	"figure-x": "Vyřešit %1",
+	"error-events-per-day": "<code>%1</code> událostí za den",
+	"error.404": "Chyba 404 - nenalezeno",
+	"error.503": "Chyba 503 - nedostupná služba",
+	"manage-error-log": "Spravovat protokol s chybami",
+	"export-error-log": "Exportovat protokol s chybami (CSV)",
+	"clear-error-log": "Smazat protokol s chybami",
+	"route": "Cesta",
+	"count": "Počet",
+	"no-routes-not-found": "Huráá. Žádná chyba 404.",
+	"clear404-confirm": "Jste si jist/a, že si přejete smazat protokol s chybami 404?",
+	"clear404-success": "Chyby \"404 - nenalezeno\" byly smazány"
 }
\ No newline at end of file
diff --git a/public/language/cs/admin/advanced/events.json b/public/language/cs/admin/advanced/events.json
index 766eb5e951..21519e6cb5 100644
--- a/public/language/cs/admin/advanced/events.json
+++ b/public/language/cs/admin/advanced/events.json
@@ -1,6 +1,6 @@
 {
-	"events": "Events",
-	"no-events": "There are no events",
-	"control-panel": "Events Control Panel",
-	"delete-events": "Delete Events"
+	"events": "Události",
+	"no-events": "Žádné nové události",
+	"control-panel": "Ovládací panel událostí",
+	"delete-events": "Odstranit události"
 }
\ No newline at end of file
diff --git a/public/language/cs/admin/advanced/logs.json b/public/language/cs/admin/advanced/logs.json
index b9de400e1c..9fde829b2b 100644
--- a/public/language/cs/admin/advanced/logs.json
+++ b/public/language/cs/admin/advanced/logs.json
@@ -1,7 +1,7 @@
 {
-	"logs": "Logs",
-	"control-panel": "Logs Control Panel",
-	"reload": "Reload Logs",
-	"clear": "Clear Logs",
-	"clear-success": "Logs Cleared!"
+	"logs": "Protokoly",
+	"control-panel": "Ovládací panel protokolů",
+	"reload": "Znovu načíst protokoly",
+	"clear": "Smazat protokoly",
+	"clear-success": "Protokoly smazány."
 }
\ No newline at end of file
diff --git a/public/language/cs/admin/appearance/customise.json b/public/language/cs/admin/appearance/customise.json
index 5095f7a937..681bd901de 100644
--- a/public/language/cs/admin/appearance/customise.json
+++ b/public/language/cs/admin/appearance/customise.json
@@ -1,12 +1,12 @@
 {
-	"custom-css": "Custom CSS",
-	"custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.",
-	"custom-css.enable": "Enable Custom CSS",
+	"custom-css": "Uživatelský CSS",
+	"custom-css.description": "Zadejte vlastní deklarace CSS, které budou použity na všechny ostatních styly.",
+	"custom-css.enable": "Povolit uživatelské CSS",
 
-	"custom-header": "Custom Header",
-	"custom-header.description": "Enter custom HTML here (ex. JavaScript, Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup.",
-	"custom-header.enable": "Enable Custom Header",
+	"custom-header": "Uživatelská hlavička",
+	"custom-header.description": "Zadejte zde uživatelské HTML (např.: javascript, meta značky, atp.), které bude přiřazeno k <code>&lt;head&gt;</code>  části značek vašeho fóra.",
+	"custom-header.enable": "Povolit uživatelskou hlavičku",
 
-	"custom-css.livereload": "Enable Live Reload",
-	"custom-css.livereload.description": "Enable this to force all sessions on every device under your account to refresh whenever you click save"
+	"custom-css.livereload": "Povolit aktuální znovu načtení",
+	"custom-css.livereload.description": "Povolením si vynutíte, aby všechny relace na každém zařízení pod vaším účtem se kdykoliv obnovili při kliknutí na tlačítko \"Uložit\"."
 }
\ No newline at end of file
diff --git a/public/language/cs/admin/appearance/skins.json b/public/language/cs/admin/appearance/skins.json
index c84298d5a2..aed0b80825 100644
--- a/public/language/cs/admin/appearance/skins.json
+++ b/public/language/cs/admin/appearance/skins.json
@@ -1,9 +1,9 @@
 {
 	"loading": "Načítání motivů…",
 	"homepage": "Domovská stránka",
-	"select-skin": "Vyber motiv",
+	"select-skin": "Vyberte motiv",
 	"current-skin": "Současný motiv",
 	"skin-updated": "Motiv aktualizován",
-	"applied-success": "%1 skin was succesfully applied",
-	"revert-success": "Skin reverted to base colours"
+	"applied-success": "Motiv %1 byl úspěšně použit",
+	"revert-success": "Barvy u motivu navráceny na základní"
 }
\ No newline at end of file
diff --git a/public/language/cs/admin/settings/user.json b/public/language/cs/admin/settings/user.json
index 83d3308671..ae13549aab 100644
--- a/public/language/cs/admin/settings/user.json
+++ b/public/language/cs/admin/settings/user.json
@@ -2,9 +2,9 @@
 	"authentication": "Ověření",
 	"allow-local-login": "Povolit místní přihlášení",
 	"require-email-confirmation": "Vyžadovat potvrzení e-mailem",
-	"email-confirm-interval": "User may not resend a confirmation email until",
+	"email-confirm-interval": "Uživatel nesmí požádat o znovu zaslání potvrzujícího e-mailu do",
 	"email-confirm-email2": "minut uplynulo",
-	"allow-login-with": "Allow login with",
+	"allow-login-with": "Povolit přihlášení pomocí",
 	"allow-login-with.username-email": "Uživatelské jméno nebo e-mail",
 	"allow-login-with.username": "Pouze uživatelské jméno",
 	"allow-login-with.email": "Pouze e-mail",
@@ -13,50 +13,50 @@
 	"disable-email-changes": "Zakázat změnu e-mailu",
 	"disable-password-changes": "Zakázat změnu hesla",
 	"allow-account-deletion": "Povolit smazání účtu",
-	"user-info-private": "Make user info private",
+	"user-info-private": "Informace o uživateli jsou soukromé",
 	"themes": "Témata",
 	"disable-user-skins": "Zabránit uživateli ve výběru vlastního vzhledu",
-	"account-protection": "Account Protection",
-	"login-attempts": "Login attempts per hour",
-	"login-attempts-help": "If login attempts to a user&apos;s account exceeds this threshold, that account will be locked for a pre-configured amount of time",
-	"lockout-duration": "Account Lockout Duration (minutes)",
-	"login-days": "Days to remember user login sessions",
-	"password-expiry-days": "Force password reset after a set number of days",
-	"registration": "User Registration",
-	"registration-type": "Registration Type",
-	"registration-type.normal": "Normal",
-	"registration-type.admin-approval": "Admin Approval",
-	"registration-type.admin-approval-ip": "Admin Approval for IPs",
-	"registration-type.invite-only": "Invite Only",
-	"registration-type.admin-invite-only": "Admin Invite Only",
-	"registration-type.disabled": "No registration",
+	"account-protection": "Ochrana účtu",
+	"login-attempts": "Počet pokusů o přihlášení za hodinu",
+	"login-attempts-help": "Překročí-li pokusy o přihlášení uživatele/ů  tuto hranici, účet bude uzamknut na určený čas",
+	"lockout-duration": "Délka blokování účtu (v minutách)",
+	"login-days": "Počet dní na zapamatování relace přihlášení uživatele",
+	"password-expiry-days": "Vynutit reset hesla po určitém počtu dní",
+	"registration": "Registrace uživatele",
+	"registration-type": "Typ registrace",
+	"registration-type.normal": "Normální",
+	"registration-type.admin-approval": "Povolení správce",
+	"registration-type.admin-approval-ip": "Povolení správce dle IP",
+	"registration-type.invite-only": "Jen na pozvání",
+	"registration-type.admin-invite-only": "Jen na pozvání správce",
+	"registration-type.disabled": "Bez registrace",
 	"registration-type.help": "Normal - Users can register from the /register page.<br/>\nAdmin Approval - User registrations are placed in an <a href=\"%1/admin/manage/registration\">approval queue</a> for administrators.<br/>\nAdmin Approval for IPs - Normal for new users, Admin Approval for IP addresses that already have an account.<br/>\nInvite Only - Users can invite others from the <a href=\"%1/users\" target=\"_blank\">users</a> page.<br/>\nAdmin Invite Only - Only administrators can invite others from <a href=\"%1/users\" target=\"_blank\">users</a> and <a href=\"%1/admin/manage/users\">admin/manage/users</a> pages.<br/>\nNo registration - No user registration.<br/>",
-	"registration.max-invites": "Maximum Invitations per User",
-	"max-invites": "Maximum Invitations per User",
-	"max-invites-help": "0 for no restriction. Admins get infinite invitations<br>Only applicable for \"Invite Only\"",
-	"invite-expiration": "Invite expiration",
-	"invite-expiration-help": "# of days invitations expire in.",
+	"registration.max-invites": "Maximální počet pozvání na uživatele",
+	"max-invites": "Maximální počet pozvání na uživatele",
+	"max-invites-help": "0 pro neomezené. Správci mají neomezeně pozvánek <br>Použitelné jen pro \"Jen pozvané\"",
+	"invite-expiration": "Vypršení pozvánky",
+	"invite-expiration-help": "pozvání vyprší za # dní.",
 	"min-username-length": "Minimální délka uživatelského jména",
 	"max-username-length": "Maximální délka uživatelského jména",
 	"min-password-length": "Minimální délka hesla",
-	"min-password-strength": "Minimum Password Strength",
-	"max-about-me-length": "Maximální délka hesla",
-	"terms-of-use": "Forum Terms of Use <small>(Leave blank to disable)</small>",
-	"user-search": "User Search",
-	"user-search-results-per-page": "Number of results to display",
-	"default-user-settings": "Default User Settings",
-	"show-email": "Show email",
-	"show-fullname": "Show fullname",
-	"restrict-chat": "Only allow chat messages from users I follow",
-	"outgoing-new-tab": "Open outgoing links in new tab",
-	"topic-search": "Enable In-Topic Searching",
-	"digest-freq": "Subscribe to Digest",
+	"min-password-strength": "Minimální síla hesla",
+	"max-about-me-length": "Maximální délka informací \"O mně\"",
+	"terms-of-use": "Podmínky užití fóra <small>(pro zakázání zanechte prázdné)</small>",
+	"user-search": "Hledat uživatele",
+	"user-search-results-per-page": "Počet zobrazených výsledků",
+	"default-user-settings": "Výchozí nastavení uživatele",
+	"show-email": "Zobrazit e-mail",
+	"show-fullname": "Zobrazit celé jméno",
+	"restrict-chat": "Povolit chatové zprávy jen od uživatelů, které sleduji",
+	"outgoing-new-tab": "Otevřít odchozí odkazy v nové záložce",
+	"topic-search": "Povolit hledání v tématu",
+	"digest-freq": "Přihlásit k přehledu",
 	"digest-freq.off": "Vypnuto",
 	"digest-freq.daily": "Denně",
 	"digest-freq.weekly": "Týdně",
 	"digest-freq.monthly": "Měsíčně",
-	"email-chat-notifs": "Send an email if a new chat message arrives and I am not online",
-	"email-post-notif": "Send an email when replies are made to topics I am subscribed to",
-	"follow-created-topics": "Follow topics you create",
-	"follow-replied-topics": "Follow topics that you reply to"
+	"email-chat-notifs": "Nejsem-li online zaslat e-mail, dorazí-li nová zpráva z chatu",
+	"email-post-notif": "Zaslat e-mail, objeví-li se odpovědi v tématu, který sleduji",
+	"follow-created-topics": "Sledovat mnou vytvořená témata",
+	"follow-replied-topics": "Sledovat témata, na které jste odpověděl"
 }
\ No newline at end of file
diff --git a/public/language/cs/email.json b/public/language/cs/email.json
index 544e2ab30f..dae40450bd 100644
--- a/public/language/cs/email.json
+++ b/public/language/cs/email.json
@@ -7,12 +7,12 @@
     "welcome.text1": "Děkujeme vám za registraci na %1!",
     "welcome.text2": "Pro úplnou aktivaci vašeho účtu potřebujeme ověřit vaši e-mailovou adresu.",
     "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ší e-mailové adresy",
-    "invitation.text1": "%1 Vás pozval abyste se připojil k %2",
-    "invitation.ctr": "Klikněte zde pro vytvoření vašeho účtu",
+    "welcome.cta": "Pro potvrzení vaší e-mailové adresy, klikněte zde",
+    "invitation.text1": "%1 vás pozval, abyste se připojil k %2",
+    "invitation.ctr": "Pro vytvoření vašeho účtu, klikněte zde",
     "reset.text1": "Obdrželi jsme požadavek na obnovu vašeho hesla, pravděpodobně z důvodu jeho zapomenutí. Pokud to není tento případ, ignorujte, prosím, tento e-mail.",
     "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.cta": "Chcete-li obnovit vaše heslo, klikněte zde",
     "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.",
@@ -32,9 +32,9 @@
     "notif.post.unsub.info": "Toto upozornění na příspěvek vám bylo odesláno na základě vašeho nastavení odběru.",
     "test.text1": "Tento testovací e-mail slouží k ověření, že je e-mailer správně nastaven pro práci s NodeBB.",
     "unsub.cta": "Chcete-li změnit tyto nastavení, klikněte zde.",
-    "banned.subject": "You have been banned from %1",
-    "banned.text1": "The user %1 has been banned from %2.",
-    "banned.text2": "This ban will last until %1.",
-    "banned.text3": "This is the reason why you have been banned:",
-    "closing": "Díky!"
+    "banned.subject": "Byl jste zabanován od %1",
+    "banned.text1": "Uživatel %1 byl zabanován od %2",
+    "banned.text2": "Ban bude trvat do %1",
+    "banned.text3": "Toto je důvod, proč jste byl zabanován:",
+    "closing": "Díky."
 }
\ No newline at end of file
diff --git a/public/language/cs/global.json b/public/language/cs/global.json
index 143f909755..e6cd65f627 100644
--- a/public/language/cs/global.json
+++ b/public/language/cs/global.json
@@ -7,10 +7,10 @@
     "403.login": "Možná byste měli se <a href='%1/login'>zkusit přihlásit</a>?",
     "404.title": "Stránka nenalezena",
     "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": "Internal Error.",
+    "500.title": "Interní chyba",
     "500.message": "Jejda, vypadá to, že se něco pokazilo.",
-    "400.title": "Bad Request.",
-    "400.message": "It looks like this link is malformed, please double-check and try again. Otherwise, return to the <a href='%1/'>home page</a>.",
+    "400.title": "Špatný požadavek.",
+    "400.message": "Zdá se, že tento odkaz není správny, prosím zkontrolujte ho a zkuste to znovu. Jinak, vraťte se na <a href='%1/'>Domácí stránku</a>.",
     "register": "Registrovat",
     "login": "Přihlásit se",
     "please_log_in": "Přihlašte se, prosím",
@@ -19,33 +19,33 @@
     "welcome_back": "Vítejte zpět",
     "you_have_successfully_logged_in": "Vaše přihlášení proběhlo úspěšně",
     "save_changes": "Uložit změny",
-    "save": "Save",
+    "save": "Uložit",
     "close": "Zrušit",
     "pagination": "Stránkování",
     "pagination.out_of": "%1 z %2",
-    "pagination.enter_index": "Enter index",
+    "pagination.enter_index": "Zadejte index",
     "header.admin": "Administrace",
     "header.categories": "Kategorie",
     "header.recent": "Nejnovější",
     "header.unread": "Nepřečtené",
-    "header.tags": "Tagy",
+    "header.tags": "Značky",
     "header.popular": "Populární",
     "header.users": "Uživatelé",
     "header.groups": "Skupiny",
     "header.chats": "Chaty",
     "header.notifications": "Upozornění",
     "header.search": "Hledat",
-    "header.profile": "Můj profil",
+    "header.profile": "Profil",
     "header.navigation": "Navigace",
     "notifications.loading": "Načítání upozornění",
     "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": "Úspěch",
+    "alert.success": "Úspěšné",
     "alert.error": "Chyba",
-    "alert.banned": "Banned",
-    "alert.banned.message": "You have just been banned, you will now be logged out.",
+    "alert.banned": "Zabanován",
+    "alert.banned.message": "Byl jste zabanován, budete odhlášen.",
     "alert.unfollow": "Již nesledujete %1!",
     "alert.follow": "Nyní sledujete %1!",
     "online": "Online",
@@ -53,29 +53,29 @@
     "topics": "Témata",
     "posts": "Příspěvky",
     "best": "Nejlepší",
-    "upvoters": "Upvoters",
-    "upvoted": "Upvoted",
-    "downvoters": "Downvoters",
-    "downvoted": "Downvoted",
+    "upvoters": "Souhlasník",
+    "upvoted": "Souhlasů",
+    "downvoters": "Nesouhlasník",
+    "downvoted": "Nesouhlasů",
     "views": "Zobrazení",
     "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",
-    "posted_in": "posted in %1",
-    "posted_in_by": "posted in %1 by %2",
-    "posted_in_ago": "posted in %1 %2",
-    "posted_in_ago_by": "posted in %1 %2 by %3",
-    "user_posted_ago": "%1 posted %2",
-    "guest_posted_ago": "Guest posted %1",
-    "last_edited_by": "last edited by %1",
+    "posted_ago_by_guest": "přispěl %1 host",
+    "posted_ago_by": "přispěl %1 od %2",
+    "posted_ago": "přispěl %1",
+    "posted_in": "přispěno v %1",
+    "posted_in_by": "přispěno v %1 od %2",
+    "posted_in_ago": "přispěno v %1 %2",
+    "posted_in_ago_by": "přispěl v %1 %2 od %3",
+    "user_posted_ago": "%1 přispěl %2",
+    "guest_posted_ago": "Host přispěl %1",
+    "last_edited_by": "naposledy upravil %1",
     "norecentposts": "Žádné nedávné příspěvky",
     "norecenttopics": "Žádné nedávné témata",
     "recentposts": "Nedávné příspěvky",
     "recentips": "Naposledy zaznamenané IP adresy",
-    "moderator_tools": "Moderator Tools",
+    "moderator_tools": "Nástroje moderátora",
     "away": "Pryč",
     "dnd": "Nevyrušovat",
     "invisible": "Neviditelný",
@@ -91,19 +91,19 @@
     "unfollow": "Prestat sledovat",
     "delete_all": "Vymazat vše",
     "map": "Mapa",
-    "sessions": "Login Sessions",
+    "sessions": "Relace přihlášení",
     "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",
-    "unsaved-changes": "You have unsaved changes. Are you sure you wish to navigate away?",
-    "reconnecting-message": "Looks like your connection to %1 was lost, please wait while we try to reconnect.",
-    "play": "Play",
-    "cookies.message": "This website uses cookies to ensure you get the best experience on our website.",
-    "cookies.accept": "Got it!",
-    "cookies.learn_more": "Learn More",
-    "edited": "Edited",
-    "disabled": "Disabled",
-    "select": "Select"
+    "unsaved-changes": "Některé změny nebyly uloženy. Jste si jist, že chcete jít jinam?",
+    "reconnecting-message": "Vypadá to, že vaše připojení k %1 bylo ukončeno. Vyčkejte prosím, než obnovíme připojení.",
+    "play": "Přehrát",
+    "cookies.message": "Tato webová stránka používá \"cookies\", aby jste mohl plně zažít její funkčnost.",
+    "cookies.accept": "Rozumím.",
+    "cookies.learn_more": "Zjistit více",
+    "edited": "Upraveno",
+    "disabled": "Nepovoleno",
+    "select": "Vyberte"
 }
\ No newline at end of file
diff --git a/public/language/cs/modules.json b/public/language/cs/modules.json
index 3bc708e825..f369b4740b 100644
--- a/public/language/cs/modules.json
+++ b/public/language/cs/modules.json
@@ -7,7 +7,7 @@
     "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-messages": "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",
@@ -18,9 +18,9 @@
     "chat.seven_days": "7 dní",
     "chat.thirty_days": "30 dní",
     "chat.three_months": "3 měsíce",
-    "chat.delete_message_confirm": "Jste si jisti že chcete odstranit tuto zprávu?",
+    "chat.delete_message_confirm": "Jste si jist/a, že chcete odstranit tuto zprávu?",
     "chat.add-users-to-room": "Přidat uživatele do místnosti",
-    "chat.confirm-chat-with-dnd-user": "This user has set their status to DnD(Do not disturb). Do you still want to chat with them?",
+    "chat.confirm-chat-with-dnd-user": "Tento uživatel nastavil svůj stav na NERUŠIT. Opravdu chcete začít s ním konverzaci.",
     "composer.compose": "Napsat",
     "composer.show_preview": "Ukázat náhled",
     "composer.hide_preview": "Skrýt náhled",
@@ -28,8 +28,8 @@
     "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": "Odesílám %1",
+    "composer.toggle_dropdown": "Rozbalovací nabídka",
+    "composer.uploading": "Nahrávám %1",
     "composer.formatting.bold": "Tučné",
     "composer.formatting.italic": "Kurzíva",
     "composer.formatting.list": "Seznam",
@@ -38,12 +38,12 @@
     "composer.formatting.picture": "Obrázek",
     "composer.upload-picture": "Nahrát obrázek",
     "composer.upload-file": "Nahrát soubor",
-    "composer.zen_mode": "Zen Mode",
-    "composer.select_category": "Select a category",
+    "composer.zen_mode": "Režim Zem",
+    "composer.select_category": "Vyberte kategorii",
     "bootbox.ok": "OK",
     "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"
+    "cover.dragging_title": "Umístění fotografie",
+    "cover.dragging_message": "Přesuňte fotku na požadovanou pozici a klikněte na \"Uložit\"",
+    "cover.saved": "Fotografie a její umístění uloženo"
 }
\ No newline at end of file
diff --git a/public/language/cs/notifications.json b/public/language/cs/notifications.json
index 8cca493c4a..395917d382 100644
--- a/public/language/cs/notifications.json
+++ b/public/language/cs/notifications.json
@@ -10,15 +10,15 @@
     "return_to": "Vrátit na %1",
     "new_notification": "Nové upozornění",
     "you_have_unread_notifications": "Máte nepřečtená upozornění.",
-    "all": "All",
-    "topics": "Topics",
-    "replies": "Replies",
-    "chat": "Chats",
-    "follows": "Follows",
-    "upvote": "Upvotes",
-    "new-flags": "New Flags",
-    "my-flags": "Flags assigned to me",
-    "bans": "Bans",
+    "all": "Vše",
+    "topics": "Témata",
+    "replies": "Odpovědi",
+    "chat": "Chaty",
+    "follows": "Sledování",
+    "upvote": "Souhlasy",
+    "new-flags": "Nové štítky",
+    "my-flags": "Šítky přiřazené mě",
+    "bans": "Bany",
     "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>.",
diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json
index 91d6e4d1aa..b496f980b1 100644
--- a/public/language/cs/topic.json
+++ b/public/language/cs/topic.json
@@ -19,7 +19,7 @@
     "reply-as-topic": "Odpovědět jako Téma",
     "guest-login-reply": "Přihlásit se pro odpověď",
     "edit": "Upravit",
-    "delete": "Smazat",
+    "delete": "Odstranit",
     "purge": "Vypráznit",
     "restore": "Obnovit",
     "move": "Přesunout",
@@ -102,10 +102,10 @@
     "composer.thumb_file_label": "Nebo nahrajte soubor",
     "composer.thumb_remove": "Vymazat pole",
     "composer.drag_and_drop_images": "Přesuňte sem myší obrázek",
-    "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",
+    "more_users_and_guests": "%1 další/ch uživatel/é/ů a %2 host/i/ů",
+    "more_users": "%1 další/ch uživatel/ů",
+    "more_guests": "%1 další/ch host/ů",
+    "users_and_others": "%1 a %2 jiných",
     "sort_by": "Řadit dle",
     "oldest_to_newest": "Od nejstarších po nejnovější",
     "newest_to_oldest": "Od nejnovějších po nejstarší",
diff --git a/public/language/cs/user.json b/public/language/cs/user.json
index bcd94715cf..02c92e06f4 100644
--- a/public/language/cs/user.json
+++ b/public/language/cs/user.json
@@ -114,7 +114,7 @@
     "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.",
+    "homepage_description": "Vyberte stránku, která má být domovskou stránkou fóra nebo vyberte 'Nic' a bude použita výchozí domovská stránka.",
     "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",
diff --git a/public/language/nl/admin/general/languages.json b/public/language/nl/admin/general/languages.json
index bdd57849b3..66f75f9248 100644
--- a/public/language/nl/admin/general/languages.json
+++ b/public/language/nl/admin/general/languages.json
@@ -1,6 +1,6 @@
 {
-	"language-settings": "Language Settings",
-	"description": "The default language determines the language settings for all users who are visiting your forum. <br />Individual users can override the default language on their account settings page.",
-	"default-language": "Default Language",
-	"auto-detect": "Auto Detect Language Setting for Guests"
+	"language-settings": "Taalinstellingen",
+	"description": "De standaard taal bepaald de taalinstellingen voor alle gebruikers die uw forum bezoeken. <br />Individuele gebruikers kunnen deze standaard instellingen overschrijven op hun gebruikersinstellingen pagina.",
+	"default-language": "Standaard taal",
+	"auto-detect": "Detecteer de taalinstellingen voor Gasten automatisch"
 }
\ No newline at end of file
diff --git a/public/language/nl/global.json b/public/language/nl/global.json
index c4e2d0e596..e68f931606 100644
--- a/public/language/nl/global.json
+++ b/public/language/nl/global.json
@@ -104,6 +104,6 @@
     "cookies.accept": "Begrepen",
     "cookies.learn_more": "Meer",
     "edited": "Bewerkt",
-    "disabled": "Disabled",
-    "select": "Select"
+    "disabled": "Uitgeschakeld",
+    "select": "Selecteer"
 }
\ No newline at end of file
diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json
index 06b2e7f58a..4908453fee 100644
--- a/public/language/nl/topic.json
+++ b/public/language/nl/topic.json
@@ -59,7 +59,7 @@
     "thread_tools.unlock": "Onderwerp openen",
     "thread_tools.move": "Onderwerp verplaatsen",
     "thread_tools.move_all": "Verplaats alles",
-    "thread_tools.select_category": "Select Category",
+    "thread_tools.select_category": "Selecteer categorie",
     "thread_tools.fork": "Onderwerp afsplitsen",
     "thread_tools.delete": "Onderwerp verwijderen",
     "thread_tools.delete-posts": "Verwijder berichten",

From 233297367b2a2a032ecc9626f103855e05355b83 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Tue, 25 Jul 2017 10:39:57 -0400
Subject: [PATCH 54/67] strip leading slashes from path if double-slash is
 accidentally used, stripping trailing slash from relative path retrieved from
 config.json

---
 src/middleware/index.js | 9 +++++++++
 src/routes/index.js     | 2 ++
 src/start.js            | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/middleware/index.js b/src/middleware/index.js
index 2b39184b86..8b84fbae1b 100644
--- a/src/middleware/index.js
+++ b/src/middleware/index.js
@@ -34,6 +34,15 @@ require('./maintenance')(middleware);
 require('./user')(middleware);
 require('./headers')(middleware);
 
+middleware.stripLeadingSlashes = function (req, res, next) {
+	var target = req.originalUrl.replace(nconf.get('relative_path'), '');
+	if (target.startsWith('//')) {
+		res.redirect(nconf.get('relative_path') + target.replace(/^\/+/, '/'));
+	} else {
+		next();
+	}
+};
+
 middleware.pageView = function (req, res, next) {
 	analytics.pageView({
 		ip: req.ip,
diff --git a/src/routes/index.js b/src/routes/index.js
index 5023dcc3d3..d05551ccbd 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -113,6 +113,8 @@ module.exports = function (app, middleware, hotswapIds, callback) {
 	pluginRouter.hotswapId = 'plugins';
 	authRouter.hotswapId = 'auth';
 
+	app.use(middleware.stripLeadingSlashes);
+
 	app.all(relativePath + '(/api|/api/*?)', middleware.prepareAPI);
 	app.all(relativePath + '(/api/admin|/api/admin/*?)', middleware.isAdmin);
 	app.all(relativePath + '(/admin|/admin/*?)', ensureLoggedIn.ensureLoggedIn(nconf.get('relative_path') + '/login?local=1'), middleware.applyCSRF, middleware.isAdmin);
diff --git a/src/start.js b/src/start.js
index 2195a0ec29..b9ab133b6d 100644
--- a/src/start.js
+++ b/src/start.js
@@ -93,7 +93,7 @@ function setupConfigs() {
 	}
 	// Parse out the relative_url and other goodies from the configured URL
 	var urlObject = url.parse(nconf.get('url'));
-	var relativePath = urlObject.pathname !== '/' ? urlObject.pathname : '';
+	var relativePath = urlObject.pathname !== '/' ? urlObject.pathname.replace(/\/+$/, '') : '';
 	nconf.set('base_url', urlObject.protocol + '//' + urlObject.host);
 	nconf.set('secure', urlObject.protocol === 'https:');
 	nconf.set('use_port', !!urlObject.port);

From 1247b4b53b5ca208f5080522f159228cac8e190f Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Tue, 25 Jul 2017 11:07:48 -0400
Subject: [PATCH 55/67] linting

---
 test/blacklist.js | 2 +-
 test/flags.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/blacklist.js b/test/blacklist.js
index 5668597b13..d003739d8f 100644
--- a/test/blacklist.js
+++ b/test/blacklist.js
@@ -1,6 +1,6 @@
 'use strict';
 
-/* global require, after, before*/
+/* global require, after, before */
 
 
 var async = require('async');
diff --git a/test/flags.js b/test/flags.js
index 274927e382..cf24e08d6b 100644
--- a/test/flags.js
+++ b/test/flags.js
@@ -1,6 +1,6 @@
 'use strict';
 
-/* globals require, before, after, describe, it*/
+/* globals require, before, after, describe, it */
 
 var assert = require('assert');
 var async = require('async');

From e9639833c5c14fe098685d6c5d2e3582ad375c52 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Tue, 25 Jul 2017 12:11:11 -0400
Subject: [PATCH 56/67] add router.all

---
 src/middleware/index.js |  9 ---------
 src/plugins.js          |  4 ++++
 src/routes/index.js     |  6 ++++--
 test/controllers.js     | 20 ++++++++++++++++++++
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/middleware/index.js b/src/middleware/index.js
index 8b84fbae1b..2b39184b86 100644
--- a/src/middleware/index.js
+++ b/src/middleware/index.js
@@ -34,15 +34,6 @@ require('./maintenance')(middleware);
 require('./user')(middleware);
 require('./headers')(middleware);
 
-middleware.stripLeadingSlashes = function (req, res, next) {
-	var target = req.originalUrl.replace(nconf.get('relative_path'), '');
-	if (target.startsWith('//')) {
-		res.redirect(nconf.get('relative_path') + target.replace(/^\/+/, '/'));
-	} else {
-		next();
-	}
-};
-
 middleware.pageView = function (req, res, next) {
 	analytics.pageView({
 		ip: req.ip,
diff --git a/src/plugins.js b/src/plugins.js
index 7c758c517a..9dbc5d04b9 100644
--- a/src/plugins.js
+++ b/src/plugins.js
@@ -117,6 +117,10 @@ Plugins.reload = function (callback) {
 
 Plugins.reloadRoutes = function (callback) {
 	var router = express.Router();
+	var ensureLoggedIn = require('connect-ensure-login');
+
+	router.all('(/api/admin|/api/admin/*?)', middleware.isAdmin);
+	router.all('(/admin|/admin/*?)', ensureLoggedIn.ensureLoggedIn(nconf.get('relative_path') + '/login?local=1'), middleware.applyCSRF, middleware.isAdmin);
 
 	router.hotswapId = 'plugins';
 	router.render = function () {
diff --git a/src/routes/index.js b/src/routes/index.js
index d05551ccbd..9c933a63ca 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -113,12 +113,14 @@ module.exports = function (app, middleware, hotswapIds, callback) {
 	pluginRouter.hotswapId = 'plugins';
 	authRouter.hotswapId = 'auth';
 
-	app.use(middleware.stripLeadingSlashes);
-
 	app.all(relativePath + '(/api|/api/*?)', middleware.prepareAPI);
+
 	app.all(relativePath + '(/api/admin|/api/admin/*?)', middleware.isAdmin);
 	app.all(relativePath + '(/admin|/admin/*?)', ensureLoggedIn.ensureLoggedIn(nconf.get('relative_path') + '/login?local=1'), middleware.applyCSRF, middleware.isAdmin);
 
+	router.all('(/api/admin|/api/admin/*?)', middleware.isAdmin);
+	router.all('(/admin|/admin/*?)', ensureLoggedIn.ensureLoggedIn(nconf.get('relative_path') + '/login?local=1'), middleware.applyCSRF, middleware.isAdmin);
+
 	adminRoutes(router, middleware, controllers);
 	metaRoutes(router, middleware, controllers);
 	apiRoutes(router, middleware, controllers);
diff --git a/test/controllers.js b/test/controllers.js
index 6a3882ea5e..da95296f24 100644
--- a/test/controllers.js
+++ b/test/controllers.js
@@ -1771,6 +1771,26 @@ describe('Controllers', function () {
 		});
 	});
 
+	describe('admin middlewares', function () {
+		it('should redirect to login', function (done) {
+			request(nconf.get('url') + '//api/admin/advanced/database', { json: true }, function (err, res, body) {
+				assert.ifError(err);
+				assert.equal(res.statusCode, 200);
+				assert(body.indexOf('Login to your account') !== -1);
+				done();
+			});
+		});
+
+		it('should redirect to login', function (done) {
+			request(nconf.get('url') + '//admin/advanced/database', { json: true }, function (err, res, body) {
+				assert.ifError(err);
+				assert.equal(res.statusCode, 200);
+				assert(body.indexOf('Login to your account') !== -1);
+				done();
+			});
+		});
+	});
+
 	after(function (done) {
 		var analytics = require('../src/analytics');
 		analytics.writeData(done);

From 6087f3c8cdb2c50fa0105f0d82e4d6512dd22c3f Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Tue, 25 Jul 2017 12:54:23 -0400
Subject: [PATCH 57/67] test router fix

---
 src/plugins.js      | 6 +++---
 src/routes/index.js | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins.js b/src/plugins.js
index 9dbc5d04b9..57665cbe90 100644
--- a/src/plugins.js
+++ b/src/plugins.js
@@ -117,10 +117,10 @@ Plugins.reload = function (callback) {
 
 Plugins.reloadRoutes = function (callback) {
 	var router = express.Router();
-	var ensureLoggedIn = require('connect-ensure-login');
+	// var ensureLoggedIn = require('connect-ensure-login');
 
-	router.all('(/api/admin|/api/admin/*?)', middleware.isAdmin);
-	router.all('(/admin|/admin/*?)', ensureLoggedIn.ensureLoggedIn(nconf.get('relative_path') + '/login?local=1'), middleware.applyCSRF, middleware.isAdmin);
+	// router.all('(/api/admin|/api/admin/*?)', middleware.isAdmin);
+	// router.all('(/admin|/admin/*?)', ensureLoggedIn.ensureLoggedIn(nconf.get('relative_path') + '/login?local=1'), middleware.applyCSRF, middleware.isAdmin);
 
 	router.hotswapId = 'plugins';
 	router.render = function () {
diff --git a/src/routes/index.js b/src/routes/index.js
index 9c933a63ca..f88ccb0f27 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -118,8 +118,8 @@ module.exports = function (app, middleware, hotswapIds, callback) {
 	app.all(relativePath + '(/api/admin|/api/admin/*?)', middleware.isAdmin);
 	app.all(relativePath + '(/admin|/admin/*?)', ensureLoggedIn.ensureLoggedIn(nconf.get('relative_path') + '/login?local=1'), middleware.applyCSRF, middleware.isAdmin);
 
-	router.all('(/api/admin|/api/admin/*?)', middleware.isAdmin);
-	router.all('(/admin|/admin/*?)', ensureLoggedIn.ensureLoggedIn(nconf.get('relative_path') + '/login?local=1'), middleware.applyCSRF, middleware.isAdmin);
+	// router.all('(/api/admin|/api/admin/*?)', middleware.isAdmin);
+	// router.all('(/admin|/admin/*?)', ensureLoggedIn.ensureLoggedIn(nconf.get('relative_path') + '/login?local=1'), middleware.applyCSRF, middleware.isAdmin);
 
 	adminRoutes(router, middleware, controllers);
 	metaRoutes(router, middleware, controllers);
@@ -138,7 +138,7 @@ module.exports = function (app, middleware, hotswapIds, callback) {
 	groupRoutes(router, middleware, controllers);
 
 	for (x = 0; x < routers.length; x += 1) {
-		app.use(relativePath, routers[x]);
+		app.use(relativePath ? relativePath : '/', routers[x]);
 	}
 
 	if (process.env.NODE_ENV === 'development') {

From c9c27b86c4d4e41a7fd2543a98db187f0cc38b6d Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Tue, 25 Jul 2017 13:50:37 -0400
Subject: [PATCH 58/67] added back logic to strip leading slashes, but after
 the fix to app.all

---
 src/middleware/index.js |  9 +++++++++
 src/routes/index.js     | 12 +++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/middleware/index.js b/src/middleware/index.js
index 2b39184b86..8b84fbae1b 100644
--- a/src/middleware/index.js
+++ b/src/middleware/index.js
@@ -34,6 +34,15 @@ require('./maintenance')(middleware);
 require('./user')(middleware);
 require('./headers')(middleware);
 
+middleware.stripLeadingSlashes = function (req, res, next) {
+	var target = req.originalUrl.replace(nconf.get('relative_path'), '');
+	if (target.startsWith('//')) {
+		res.redirect(nconf.get('relative_path') + target.replace(/^\/+/, '/'));
+	} else {
+		next();
+	}
+};
+
 middleware.pageView = function (req, res, next) {
 	analytics.pageView({
 		ip: req.ip,
diff --git a/src/routes/index.js b/src/routes/index.js
index f88ccb0f27..5139dda53f 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -113,13 +113,11 @@ module.exports = function (app, middleware, hotswapIds, callback) {
 	pluginRouter.hotswapId = 'plugins';
 	authRouter.hotswapId = 'auth';
 
-	app.all(relativePath + '(/api|/api/*?)', middleware.prepareAPI);
+	app.all(relativePath + '(/+api|/+api/*?)', middleware.prepareAPI);
+	app.all(relativePath + '(/+api/admin|/+api/admin/*?)', middleware.isAdmin);
+	app.all(relativePath + '(/+admin|/+admin/*?)', ensureLoggedIn.ensureLoggedIn(nconf.get('relative_path') + '/login?local=1'), middleware.applyCSRF, middleware.isAdmin);
 
-	app.all(relativePath + '(/api/admin|/api/admin/*?)', middleware.isAdmin);
-	app.all(relativePath + '(/admin|/admin/*?)', ensureLoggedIn.ensureLoggedIn(nconf.get('relative_path') + '/login?local=1'), middleware.applyCSRF, middleware.isAdmin);
-
-	// router.all('(/api/admin|/api/admin/*?)', middleware.isAdmin);
-	// router.all('(/admin|/admin/*?)', ensureLoggedIn.ensureLoggedIn(nconf.get('relative_path') + '/login?local=1'), middleware.applyCSRF, middleware.isAdmin);
+	app.use(middleware.stripLeadingSlashes);
 
 	adminRoutes(router, middleware, controllers);
 	metaRoutes(router, middleware, controllers);
@@ -138,7 +136,7 @@ module.exports = function (app, middleware, hotswapIds, callback) {
 	groupRoutes(router, middleware, controllers);
 
 	for (x = 0; x < routers.length; x += 1) {
-		app.use(relativePath ? relativePath : '/', routers[x]);
+		app.use(relativePath || '/', routers[x]);
 	}
 
 	if (process.env.NODE_ENV === 'development') {

From f59f48c6e1f8262ddc66f4ad09ed19461156be9e Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Tue, 25 Jul 2017 14:11:54 -0400
Subject: [PATCH 59/67] use setImmediate

---
 src/middleware/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/middleware/index.js b/src/middleware/index.js
index 8b84fbae1b..720fa50771 100644
--- a/src/middleware/index.js
+++ b/src/middleware/index.js
@@ -39,7 +39,7 @@ middleware.stripLeadingSlashes = function (req, res, next) {
 	if (target.startsWith('//')) {
 		res.redirect(nconf.get('relative_path') + target.replace(/^\/+/, '/'));
 	} else {
-		next();
+		setImmediate(next);
 	}
 };
 

From b3f6c423c6f50595a3f49de312032a716df612f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Tue, 25 Jul 2017 18:23:21 -0400
Subject: [PATCH 60/67] fix test

---
 test/controllers.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/controllers.js b/test/controllers.js
index da95296f24..af8dcd51f1 100644
--- a/test/controllers.js
+++ b/test/controllers.js
@@ -1775,8 +1775,7 @@ describe('Controllers', function () {
 		it('should redirect to login', function (done) {
 			request(nconf.get('url') + '//api/admin/advanced/database', { json: true }, function (err, res, body) {
 				assert.ifError(err);
-				assert.equal(res.statusCode, 200);
-				assert(body.indexOf('Login to your account') !== -1);
+				assert.equal(res.statusCode, 401);
 				done();
 			});
 		});

From 4c126c0870e9161488a0424de0eb38b93673d08b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Tue, 25 Jul 2017 22:15:52 -0400
Subject: [PATCH 61/67] up markdown

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d30e5b3bb3..7befecc2df 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "nodebb-plugin-dbsearch": "2.0.6",
     "nodebb-plugin-emoji-extended": "1.1.1",
     "nodebb-plugin-emoji-one": "1.2.1",
-    "nodebb-plugin-markdown": "8.0.0",
+    "nodebb-plugin-markdown": "8.0.2",
     "nodebb-plugin-mentions": "2.1.5",
     "nodebb-plugin-soundpack-default": "1.0.0",
     "nodebb-plugin-spam-be-gone": "0.5.0",

From ae3d5f8aaa03aaf32d89075b661b7c25cd93bd56 Mon Sep 17 00:00:00 2001
From: "Misty (Bot)" <deploy@nodebb.org>
Date: Wed, 26 Jul 2017 09:23:26 +0000
Subject: [PATCH 62/67] Latest translations and fallbacks

---
 public/language/he/admin/menu.json            | 16 ++++++------
 public/language/th/admin/admin.json           |  2 +-
 .../language/th/admin/advanced/database.json  | 22 ++++++++--------
 public/language/th/admin/advanced/errors.json | 24 ++++++++---------
 public/language/th/admin/advanced/events.json |  8 +++---
 public/language/th/admin/advanced/logs.json   | 10 +++----
 .../th/admin/appearance/customise.json        | 16 ++++++------
 .../language/th/admin/appearance/skins.json   | 14 +++++-----
 .../language/th/admin/appearance/themes.json  | 18 ++++++-------
 .../language/th/admin/development/info.json   | 16 ++++++------
 .../language/th/admin/development/logger.json | 18 ++++++-------
 public/language/th/admin/extend/plugins.json  | 26 +++++++++----------
 12 files changed, 95 insertions(+), 95 deletions(-)

diff --git a/public/language/he/admin/menu.json b/public/language/he/admin/menu.json
index 985c540e8a..b60491a94b 100644
--- a/public/language/he/admin/menu.json
+++ b/public/language/he/admin/menu.json
@@ -1,16 +1,16 @@
 {
 	"section-general": "General",
 	"general/dashboard": "Dashboard",
-	"general/homepage": "Home Page",
-	"general/navigation": "Navigation",
-	"general/languages": "Languages",
+	"general/homepage": "דף הבית",
+	"general/navigation": "ניווט",
+	"general/languages": "שפות",
 	"general/sounds": "Sounds",
 	"general/social": "Social",
 
 	"section-manage": "Manage",
-	"manage/categories": "Categories",
-	"manage/tags": "Tags",
-	"manage/users": "Users",
+	"manage/categories": "קטגוריות",
+	"manage/tags": "תגיות",
+	"manage/users": "משתמשים",
 	"manage/registration": "Registration Queue",
 	"manage/groups": "Groups",
 	"manage/ip-blacklist": "IP Blacklist",
@@ -21,10 +21,10 @@
 	"settings/email": "Email",
 	"settings/user": "User",
 	"settings/group": "Group",
-	"settings/guest": "Guests",
+	"settings/guest": "אורח",
 	"settings/uploads": "Uploads",
 	"settings/post": "Post",
-	"settings/chat": "Chat",
+	"settings/chat": "צ'אט",
 	"settings/pagination": "Pagination",
 	"settings/tags": "Tags",
 	"settings/notifications": "Notifications",
diff --git a/public/language/th/admin/admin.json b/public/language/th/admin/admin.json
index 8a6250c96b..ec64770be6 100644
--- a/public/language/th/admin/admin.json
+++ b/public/language/th/admin/admin.json
@@ -1,5 +1,5 @@
 {
-	"alert.confirm-reload": "คุณต้องการโหลดการทำงาน NodeBB อีกครั้งหรือไม่?",
+	"alert.confirm-reload": "คุณต้องการโหลด NodeBB อีกครั้งหรือไม่?",
 	"alert.confirm-restart": "คุณต้องการเริ่มการทำงาน NodeBB ใหม่หรือไม่?",
 
 	"acp-title": "%1 | แผงควบคุมของผู้ดูแลระบบ",
diff --git a/public/language/th/admin/advanced/database.json b/public/language/th/admin/advanced/database.json
index ee4f15b2b6..7d329f4ad9 100644
--- a/public/language/th/admin/advanced/database.json
+++ b/public/language/th/admin/advanced/database.json
@@ -6,31 +6,31 @@
 	"uptime-days": "ระยะเวลาทำงานต่อเนื่องเป็นวัน",
 
 	"mongo": "Mongo",
-	"mongo.version": "รุ่น MongoDB",
-	"mongo.storage-engine": "เอ็นจินการจัดเก็บ",
+	"mongo.version": "MongoDB เวอร์ชั่น",
+	"mongo.storage-engine": "ระบบการจัดเก็บ",
 	"mongo.collections": "คอลเลคชัน",
 	"mongo.objects": "ออพเจ็กท์",
 	"mongo.avg-object-size": "ขนาดออพเจ็กท์โดยเฉลี่ย",
 	"mongo.data-size": "ขนาดข้อมูล",
-	"mongo.storage-size": "ขนาดพื้นที่ข้อมูล",
+	"mongo.storage-size": "ขนาดพื้นที่จัดเก็บ",
 	"mongo.index-size": "ขนาดดัชนี",
 	"mongo.file-size": "ขนาดไฟล์",
-	"mongo.resident-memory": "Resident Memory",
-	"mongo.virtual-memory": "Virtual Memory",
-	"mongo.mapped-memory": "Mapped Memory",
+	"mongo.resident-memory": "หน่วยความจำถาวร",
+	"mongo.virtual-memory": "หน่วยความจำเสมือน",
+	"mongo.mapped-memory": "เส้นทางหน่วยความจำ",
 	"mongo.raw-info": "ข้อมูลดิบของ MongoDB",
 
 	"redis": "Redis",
-	"redis.version": "รุ่นของ Redis",
-	"redis.connected-clients": "Connected Clients",
-	"redis.connected-slaves": "Connected Slaves",
+	"redis.version": "Redis เวอร์ชั่น",
+	"redis.connected-clients": "ไคลเอ็นท์ที่เชื่อมต่อแล้ว",
+	"redis.connected-slaves": "Slaves ที่เชื่อมต่อแล้ว",
 	"redis.blocked-clients": "ไคลเอ็นท์ที่ถูกบล็อค",
 	"redis.used-memory": "หน่วยความจำที่ถูกใช้",
-	"redis.memory-frag-ratio": "Memory Fragmentation Ratio",
+	"redis.memory-frag-ratio": "อัตราการกระจายตัวของหน่วยความจำ",
 	"redis.total-connections-recieved": "การเชื่อมต่อที่ได้รับทั้งหมด",
 	"redis.total-commands-processed": "คำสั่งที่ประมวลผลแล้วทั้งหมด",
 	"redis.iops": "การทำงานพร้อมกันต่อวินาที",
 	"redis.keyspace-hits": "Keyspace Hits",
 	"redis.keyspace-misses": "Keyspace Misses",
-	"redis.raw-info": "Redis Raw Info"
+	"redis.raw-info": "ข้อมูลดิบของ Redis"
 }
\ No newline at end of file
diff --git a/public/language/th/admin/advanced/errors.json b/public/language/th/admin/advanced/errors.json
index 546f0f1508..354bdc8fda 100644
--- a/public/language/th/admin/advanced/errors.json
+++ b/public/language/th/admin/advanced/errors.json
@@ -1,14 +1,14 @@
 {
-	"figure-x": "Figure %1",
-	"error-events-per-day": "<code>%1</code> events per day",
-	"error.404": "404 Not Found",
-	"error.503": "503 Service Unavailable",
-	"manage-error-log": "Manage Error Log",
-	"export-error-log": "Export Error Log (CSV)",
-	"clear-error-log": "Clear Error Log",
-	"route": "Route",
-	"count": "Count",
-	"no-routes-not-found": "Hooray! No 404 errors!",
-	"clear404-confirm": "Are you sure you wish to clear the 404 error logs?",
-	"clear404-success": "\"404 Not Found\" errors cleared"
+	"figure-x": "การปรับแต่ง %1",
+	"error-events-per-day": "<code>%1</code> อีเวนท์ต่อวัน",
+	"error.404": "404 ไม่พบเพจ",
+	"error.503": "503 เซอร์วิสไม่พร้อมใช้งาน",
+	"manage-error-log": "จัดการผลบันทึกความผิดพลาด",
+	"export-error-log": "นำออกผลบันทึกความผิดพลาด (CSV)",
+	"clear-error-log": "ล้างผลบันทึกความผิดพลาด",
+	"route": "เส้นทาง",
+	"count": "นับจำนวน",
+	"no-routes-not-found": "เอาแล้วซิ! พบความผิดพลาดรหัส 404",
+	"clear404-confirm": "คุณแน่ใจแล้วใช่ไหมว่าต้องการล้างผลบันทึกความผิดพลาดรหัส 404?",
+	"clear404-success": "บันทึกความผิดพลาด \"404 ไม่พบเพจ\" ถูกล้างเรียบร้อยแล้ว"
 }
\ No newline at end of file
diff --git a/public/language/th/admin/advanced/events.json b/public/language/th/admin/advanced/events.json
index 766eb5e951..47e9766ee4 100644
--- a/public/language/th/admin/advanced/events.json
+++ b/public/language/th/admin/advanced/events.json
@@ -1,6 +1,6 @@
 {
-	"events": "Events",
-	"no-events": "There are no events",
-	"control-panel": "Events Control Panel",
-	"delete-events": "Delete Events"
+	"events": "อีเวนท์",
+	"no-events": "ไม่มีอีเวนท์",
+	"control-panel": "แผงควบคุมอีเวนท์",
+	"delete-events": "ลบอีเวนท์"
 }
\ No newline at end of file
diff --git a/public/language/th/admin/advanced/logs.json b/public/language/th/admin/advanced/logs.json
index b9de400e1c..ba7e879560 100644
--- a/public/language/th/admin/advanced/logs.json
+++ b/public/language/th/admin/advanced/logs.json
@@ -1,7 +1,7 @@
 {
-	"logs": "Logs",
-	"control-panel": "Logs Control Panel",
-	"reload": "Reload Logs",
-	"clear": "Clear Logs",
-	"clear-success": "Logs Cleared!"
+	"logs": "บันทึกผลกิจกรรม",
+	"control-panel": "แผงควบคุมบันทึกผลกิจกรรม",
+	"reload": "โหลดบันทึกผลกิจกรรมอีกครั้ง",
+	"clear": "ล้างบันทึกผลกิจกรรม",
+	"clear-success": "ล้างบันทึกผลกิจกรรมแล้ว!"
 }
\ No newline at end of file
diff --git a/public/language/th/admin/appearance/customise.json b/public/language/th/admin/appearance/customise.json
index 5095f7a937..e377c7781a 100644
--- a/public/language/th/admin/appearance/customise.json
+++ b/public/language/th/admin/appearance/customise.json
@@ -1,12 +1,12 @@
 {
-	"custom-css": "Custom CSS",
-	"custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.",
-	"custom-css.enable": "Enable Custom CSS",
+	"custom-css": "ปรับแต่ง CSS",
+	"custom-css.description": "ใส่ CSS ของคุณที่นี่, มันจะถูกนำไปใช้ต่อจากสไตล์อื่นๆ",
+	"custom-css.enable": "เปิดการปรับแต่ง CSS",
 
-	"custom-header": "Custom Header",
-	"custom-header.description": "Enter custom HTML here (ex. JavaScript, Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup.",
-	"custom-header.enable": "Enable Custom Header",
+	"custom-header": "ปรับแต่งส่วนหัว",
+	"custom-header.description": "ใส่การปรับแต่ง HTML ที่นี่ (เช่น JavaScript, Meta Tags หรืออื่นๆ) , มันจะถูกเพิ่มใน <code>&lt;head&gt;</code>ของส่วนฟอรั่มของคุณ",
+	"custom-header.enable": "เปิดการปรับแต่งส่วนหัว",
 
-	"custom-css.livereload": "Enable Live Reload",
-	"custom-css.livereload.description": "Enable this to force all sessions on every device under your account to refresh whenever you click save"
+	"custom-css.livereload": "เปิดการบังคับให้มีผลในทันที",
+	"custom-css.livereload.description": "การเปิดนี้จะบังคับทุกเซสชั่นบนทุกอุปกรณ์ภายใต้บัญชีของคุณให้ถูกรีเฟรชทันทีที่คุณกดบันทึก"
 }
\ No newline at end of file
diff --git a/public/language/th/admin/appearance/skins.json b/public/language/th/admin/appearance/skins.json
index 4db6fbdd8a..7a3c23814a 100644
--- a/public/language/th/admin/appearance/skins.json
+++ b/public/language/th/admin/appearance/skins.json
@@ -1,9 +1,9 @@
 {
-	"loading": "Loading Skins...",
-	"homepage": "Homepage",
-	"select-skin": "Select Skin",
-	"current-skin": "Current Skin",
-	"skin-updated": "Skin Updated",
-	"applied-success": "%1 skin was succesfully applied",
-	"revert-success": "Skin reverted to base colours"
+	"loading": "กำลังโหลดหน้ากาก",
+	"homepage": "หน้าแรก",
+	"select-skin": "เลือกหน้ากาก",
+	"current-skin": "หน้ากากปัจจุบัน",
+	"skin-updated": "หน้ากากถูกอัปเดทแล้ว",
+	"applied-success": "%1 หน้ากากถูกใช้เสร็จสิ้นแล้ว",
+	"revert-success": "หน้ากากถูกทำให้ย้อนกลับไปใช้สีพื้นฐานแล้ว"
 }
\ No newline at end of file
diff --git a/public/language/th/admin/appearance/themes.json b/public/language/th/admin/appearance/themes.json
index 3148a01337..efe9954248 100644
--- a/public/language/th/admin/appearance/themes.json
+++ b/public/language/th/admin/appearance/themes.json
@@ -1,11 +1,11 @@
 {
-    "checking-for-installed": "Checking for installed themes...",
-    "homepage": "Homepage",
-    "select-theme": "Select Theme",
-    "current-theme": "Current Theme",
-    "no-themes": "No installed themes found",
-    "revert-confirm": "Are you sure you wish to restore the default NodeBB theme?",
-    "theme-changed": "Theme Changed",
-    "revert-success": "You have successfully reverted your NodeBB back to it's default theme.",
-    "restart-to-activate": "Please restart your NodeBB to fully activate this theme"
+    "checking-for-installed": "กำลังตรวจสอบธีมที่ถูกติดตั้งแล้ว",
+    "homepage": "หน้าแรก",
+    "select-theme": "เลือกธีม",
+    "current-theme": "ธีมปัจจุบัน",
+    "no-themes": "ไม่พบธีมที่ถูกติดตั้งแล้ว",
+    "revert-confirm": "คุณแน่ใจแล้วใช่ไหมที่ต้องการกลับไปใช้ธีมพื้นฐานของ NodeBB?",
+    "theme-changed": "ธีมถูกเปลี่ยนแล้ว",
+    "revert-success": "คุณได้ทำการเปลี่ยน NodeBB ของคุณให้กลับไปใช้ธีมพื้นฐานของมันแล้ว",
+    "restart-to-activate": "โปรดรีสตาร์ท NodeBB ของคุณเพื่อเปิดการทำงานของธีมนี้"
 }
\ No newline at end of file
diff --git a/public/language/th/admin/development/info.json b/public/language/th/admin/development/info.json
index 0a4ae6fe2c..618c539d9c 100644
--- a/public/language/th/admin/development/info.json
+++ b/public/language/th/admin/development/info.json
@@ -1,18 +1,18 @@
 {
-	"you-are-on": "Info - You are on <strong>%1:%2</strong>",
-	"nodes-responded": "%1 nodes responded within %2ms!",
+	"you-are-on": "ข้อมูล - คุณกำลังอยู่บน <strong>%1:%2</strong>",
+	"nodes-responded": "%1 nodes ตอบสนองแล้วภายใน %2ms!",
 	"host": "host",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "online",
 	"git": "git",
-	"memory": "memory",
-	"load": "load",
-	"uptime": "uptime",
+	"memory": "หน่วยความจำ",
+	"load": "โหลด",
+	"uptime": "ระยะเวลาการทำงาน",
 
-	"registered": "Registered",
+	"registered": "ลงทะเบียนแล้ว",
 	"sockets": "Sockets",
-	"guests": "Guests",
+	"guests": "ผู้เยี่ยมเยียน",
 
-	"info": "Info"
+	"info": "ข้อมูล"
 }
\ No newline at end of file
diff --git a/public/language/th/admin/development/logger.json b/public/language/th/admin/development/logger.json
index 6ab9558149..ed412a1609 100644
--- a/public/language/th/admin/development/logger.json
+++ b/public/language/th/admin/development/logger.json
@@ -1,12 +1,12 @@
 {
-	"logger-settings": "Logger Settings",
-	"description": "By enabling the check boxes, you will receive logs to your terminal. If you specify a path, logs will then be saved to a file instead. HTTP logging is useful for collecting statistics about who, when, and what people access on your forum. In addition to logging HTTP requests, we can also log socket.io events. Socket.io logging, in combination with redis-cli monitor, can be very helpful for learning NodeBB's internals.",
-	"explanation": "Simply check/uncheck the logging settings to enable or disable logging on the fly. No restart needed.",
-	"enable-http": "Enable HTTP logging",
-	"enable-socket": "Enable socket.io event logging",
-	"file-path": "Path to log file",
-	"file-path-placeholder": "/path/to/log/file.log ::: leave blank to log to your terminal",
+	"logger-settings": "การตั้งค่าการบันทึกผลกิจกรรม",
+	"description": "ถ้าคุณเลือกช่องนี้, คุณจะได้รับการแสดงผลกิจกรรมทางจอภาพ แต่ถ้าคุณระบุเส้นทางการจัดเก็บผลการบันทึกกิจกรรมจะถูกบันทึกเป็นไฟล์แทน, ผลการบันทึกกิจกรรมของ HTTP มีประโยชน์เพื่อเก็บสถิติเกี่ยวกับ ใคร, เมื่อไหร่ และที่ไหนในฟอรั่มของคุณที่พวกเขาเข้าถึง เช่นเดียวกันกับที่เราสามารถบันทึกผลกิจกรรมอีเวนท์ของ socket.io โดยการบันทึกผลกิจกรรมของ Socket.io นั้นจะบันทึกร่วมกับการจับตาดู redis-cli ซึ่งสามารถช่วยให้เราศึกษา NodeBB จากภายในได้",
+	"explanation": "ง่ายมากเพียงแค่ เลือกหรือยกเลิก การตั้งค่าการบันทึกผลกิจกรรม เพื่อเปิดและปิดการบันทึกผลกิจกรรมในทันที ไม่จำเป็นต้องรีสตาร์ท",
+	"enable-http": "เปิดการบันทึกผลกิจกรรมของ HTTP",
+	"enable-socket": "เปิดการบันทึกผลกิจกรรมอีเวนท์ของ socket.io",
+	"file-path": "เส้นทางเพื่อบันทึกไฟล์บันทึกผลกิจกรรม",
+	"file-path-placeholder": "/path/to/log/file.log ::: ปล่อยว่างถ้าคุณต้องการให้แสดงผลการบันทึกกิจกรรมทางจอภาพ",
 
-	"control-panel": "Logger Control Panel",
-	"update-settings": "Update Logger Settings"
+	"control-panel": "แผงควบคุมระบบการบันทึกผลกิจกรรม",
+	"update-settings": "บันทึกการตั้งค่าการบันทึกผลกิจกรรม"
 }
\ No newline at end of file
diff --git a/public/language/th/admin/extend/plugins.json b/public/language/th/admin/extend/plugins.json
index cf80583db4..e6281c0535 100644
--- a/public/language/th/admin/extend/plugins.json
+++ b/public/language/th/admin/extend/plugins.json
@@ -1,18 +1,18 @@
 {
-	"installed": "Installed",
-	"active": "Active",
-	"inactive": "Inactive",
-	"out-of-date": "Out of Date",
-	"none-found": "No plugins found.",
-	"none-active": "No Active Plugins",
-	"find-plugins": "Find Plugins",
+	"installed": "ถูกติดตั้งแล้ว",
+	"active": "ทำงาน",
+	"inactive": "ไม่ทำงาน",
+	"out-of-date": "รุ่นเก่า",
+	"none-found": "ไม่พบปลั๊กอิน",
+	"none-active": "ไม่มีปลั๊กอินที่ทำงาน",
+	"find-plugins": "ค้นหาปลั๊กอิน",
 
-	"plugin-search": "Plugin Search",
-	"plugin-search-placeholder": "Search for plugin...",
-	"reorder-plugins": "Re-order Plugins",
-	"order-active": "Order Active Plugins",
-	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">NodeBB Docs Portal</a>.",
+	"plugin-search": "การค้นหาปลั๊กอิน",
+	"plugin-search-placeholder": "ค้นหาปลั๊กอิน...",
+	"reorder-plugins": "เรียงลำดับปลั๊กอินใหม่",
+	"order-active": "ลำดับการทำงานของปลั๊กอิน",
+	"dev-interested": "คุณสนใจที่จะสร้างปลั๊กอินสำหรับ NodeBB หรือไม่?",
+	"docs-info": "เอกสารฉบับเต็มเกี่ยวกับปลั๊กอินสามารถพบได้ที่ <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\">คลังเอกสาร NodeBB </a>",
 
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",

From 541b78c26de9fbd7dbb68a17c7b77cf2d301dc53 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Wed, 26 Jul 2017 13:39:34 -0400
Subject: [PATCH 63/67] fix ipMatch data

---
 src/user/approval.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/user/approval.js b/src/user/approval.js
index d04686a7b0..766cca124b 100644
--- a/src/user/approval.js
+++ b/src/user/approval.js
@@ -178,7 +178,7 @@ module.exports = function (User) {
 
 					async.parallel([
 						function (next) {
-							getIPMatchedUsers(user.ip, next);
+							getIPMatchedUsers(user, next);
 						},
 						function (next) {
 							getSpamData(user, next);
@@ -197,14 +197,18 @@ module.exports = function (User) {
 		], callback);
 	};
 
-	function getIPMatchedUsers(ip, callback) {
+	function getIPMatchedUsers(user, callback) {
 		async.waterfall([
 			function (next) {
-				User.getUidsFromSet('ip:' + ip + ':uid', 0, -1, next);
+				User.getUidsFromSet('ip:' + user.ip + ':uid', 0, -1, next);
 			},
 			function (uids, next) {
 				User.getUsersFields(uids, ['uid', 'username', 'picture'], next);
 			},
+			function (data, next) {
+				user.ipMatch = data;
+				next();
+			}
 		], callback);
 	}
 

From 949595fdf3637266126763303f6c37731ebbb6b8 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Wed, 26 Jul 2017 13:40:17 -0400
Subject: [PATCH 64/67] fix eslint

---
 src/user/approval.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/user/approval.js b/src/user/approval.js
index 766cca124b..64f892cb3d 100644
--- a/src/user/approval.js
+++ b/src/user/approval.js
@@ -208,7 +208,7 @@ module.exports = function (User) {
 			function (data, next) {
 				user.ipMatch = data;
 				next();
-			}
+			},
 		], callback);
 	}
 

From a9dbdc75af9831ba0a2294d2a3644995b6f8bfdd Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Wed, 26 Jul 2017 14:32:53 -0400
Subject: [PATCH 65/67] closes #5825

---
 package.json                                  |  4 +-
 .../language/en-GB/admin/settings/user.json   |  4 +-
 src/controllers/accounts/helpers.js           |  4 +-
 src/controllers/accounts/settings.js          |  3 ++
 src/controllers/user.js                       |  4 +-
 src/posts/user.js                             |  3 ++
 src/topics.js                                 |  7 +++
 src/views/admin/settings/user.tpl             | 12 +++++
 test/user.js                                  | 50 +++++++++++++++++++
 9 files changed, 84 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 7befecc2df..d761108513 100644
--- a/package.json
+++ b/package.json
@@ -65,9 +65,9 @@
     "nodebb-plugin-spam-be-gone": "0.5.0",
     "nodebb-rewards-essentials": "0.0.9",
     "nodebb-theme-lavender": "4.0.5",
-    "nodebb-theme-persona": "5.0.14",
+    "nodebb-theme-persona": "5.0.15",
     "nodebb-theme-slick": "1.1.0",
-    "nodebb-theme-vanilla": "6.0.11",
+    "nodebb-theme-vanilla": "6.0.12",
     "nodebb-widget-essentials": "3.0.1",
     "nodemailer": "2.6.4",
     "nodemailer-sendmail-transport": "1.0.0",
diff --git a/public/language/en-GB/admin/settings/user.json b/public/language/en-GB/admin/settings/user.json
index fa8049c3a9..a8bc2b176e 100644
--- a/public/language/en-GB/admin/settings/user.json
+++ b/public/language/en-GB/admin/settings/user.json
@@ -13,7 +13,9 @@
 	"disable-email-changes": "Disable email changes",
 	"disable-password-changes": "Disable password changes",
 	"allow-account-deletion": "Allow account deletion",
-	"user-info-private": "Make user info private",
+	"user-info-private": "Hide user list and data from guests",
+	"hide-fullname": "Hide fullname from users",
+	"hide-email": "Hide email from users",
 	"themes": "Themes",
 	"disable-user-skins": "Prevent users from choosing a custom skin",
 	"account-protection": "Account Protection",
diff --git a/src/controllers/accounts/helpers.js b/src/controllers/accounts/helpers.js
index 6086bf4cf8..5bd65a33af 100644
--- a/src/controllers/accounts/helpers.js
+++ b/src/controllers/accounts/helpers.js
@@ -85,13 +85,13 @@ helpers.getUserDataByUserSlug = function (userslug, callerUID, callback) {
 
 			userData.emailClass = 'hide';
 
-			if (!(isAdmin || isGlobalModerator || isSelf || (userData.email && userSettings.showemail))) {
+			if (!isAdmin && !isGlobalModerator && !isSelf && (!userSettings.showemail || parseInt(meta.config.hideEmail, 10) === 1)) {
 				userData.email = '';
 			} else if (!userSettings.showemail) {
 				userData.emailClass = '';
 			}
 
-			if (!isAdmin && !isGlobalModerator && !isSelf && !userSettings.showfullname) {
+			if (!isAdmin && !isGlobalModerator && !isSelf && (!userSettings.showfullname || parseInt(meta.config.hideFullname, 10) === 1)) {
 				userData.fullname = '';
 			}
 
diff --git a/src/controllers/accounts/settings.js b/src/controllers/accounts/settings.js
index 0bcdc75c9c..2285f5e2dc 100644
--- a/src/controllers/accounts/settings.js
+++ b/src/controllers/accounts/settings.js
@@ -142,6 +142,9 @@ settingsController.get = function (req, res, callback) {
 
 		userData.allowUserHomePage = parseInt(meta.config.allowUserHomePage, 10) === 1;
 
+		userData.hideFullname = parseInt(meta.config.hideFullname, 10) === 1;
+		userData.hideEmail = parseInt(meta.config.hideEmail, 10) === 1;
+
 		userData.inTopicSearchAvailable = plugins.hasListeners('filter:topic.search');
 
 		userData.title = '[[pages:account/settings]]';
diff --git a/src/controllers/user.js b/src/controllers/user.js
index 0f93f549b3..ea027b9406 100644
--- a/src/controllers/user.js
+++ b/src/controllers/user.js
@@ -91,8 +91,8 @@ userController.getUserDataByUID = function (callerUid, uid, callback) {
 			return callback(err || new Error('[[error:no-user]]'));
 		}
 
-		results.userData.email = results.settings.showemail ? results.userData.email : undefined;
-		results.userData.fullname = results.settings.showfullname ? results.userData.fullname : undefined;
+		results.userData.email = results.settings.showemail && parseInt(meta.config.hideEmail, 10) !== 1 ? results.userData.email : undefined;
+		results.userData.fullname = results.settings.showfullname && parseInt(meta.config.hideFullname, 10) !== 1 ? results.userData.fullname : undefined;
 
 		callback(null, results.userData);
 	});
diff --git a/src/posts/user.js b/src/posts/user.js
index 00fa1c0631..dd050ddd3e 100644
--- a/src/posts/user.js
+++ b/src/posts/user.js
@@ -49,6 +49,9 @@ module.exports = function (Posts) {
 					userData.status = user.getStatus(userData);
 					userData.signature = validator.escape(String(userData.signature || ''));
 					userData.fullname = validator.escape(String(userData.fullname || ''));
+					if (parseInt(meta.config.hideFullname, 10) === 1) {
+						userData.fullname = undefined;
+					}
 				});
 
 				async.map(userData, function (userData, next) {
diff --git a/src/topics.js b/src/topics.js
index 8dd5df0c13..45e0f5bb19 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -7,6 +7,7 @@ var db = require('./database');
 var posts = require('./posts');
 var utils = require('./utils');
 var plugins = require('./plugins');
+var meta = require('./meta');
 var user = require('./user');
 var categories = require('./categories');
 var privileges = require('./privileges');
@@ -135,6 +136,12 @@ Topics.getTopicsByTids = function (tids, uid, callback) {
 			}, next);
 		},
 		function (results, next) {
+			if (parseInt(meta.config.hideFullname, 10) === 1) {
+				results.users.forEach(function (user) {
+					user.fullname = undefined;
+				});
+			}
+
 			var users = _.zipObject(uids, results.users);
 			var categories = _.zipObject(cids, results.categories);
 
diff --git a/src/views/admin/settings/user.tpl b/src/views/admin/settings/user.tpl
index db7f078f29..9d933b54e1 100644
--- a/src/views/admin/settings/user.tpl
+++ b/src/views/admin/settings/user.tpl
@@ -71,6 +71,18 @@
 					<span class="mdl-switch__label"><strong>[[admin/settings/user:user-info-private]]</strong></span>
 				</label>
 			</div>
+			<div class="checkbox">
+				<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
+					<input class="mdl-switch__input" type="checkbox" data-field="hideFullname">
+					<span class="mdl-switch__label"><strong>[[admin/settings/user:hide-fullname]]</strong></span>
+				</label>
+			</div>
+			<div class="checkbox">
+				<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
+					<input class="mdl-switch__input" type="checkbox" data-field="hideEmail">
+					<span class="mdl-switch__label"><strong>[[admin/settings/user:hide-email]]</strong></span>
+				</label>
+			</div>
 		</form>
 	</div>
 </div>
diff --git a/test/user.js b/test/user.js
index a7204b01ca..9b747e27b7 100644
--- a/test/user.js
+++ b/test/user.js
@@ -1532,4 +1532,54 @@ describe('User', function () {
 			});
 		});
 	});
+
+	describe('hideEmail/hideFullname', function () {
+		var uid;
+		after(function (done) {
+			meta.config.hideEmail = 0;
+			meta.config.hideFullname = 0;
+			done();
+		});
+
+		it('should hide email and fullname', function (done) {
+			meta.config.hideEmail = 1;
+			meta.config.hideFullname = 1;
+
+			User.create({
+				username: 'hiddenemail',
+				email: 'should@be.hidden',
+				fullname: 'baris soner usakli',
+			}, function (err, _uid) {
+				uid = _uid;
+				assert.ifError(err);
+				request(nconf.get('url') + '/api/user/hiddenemail', { json: true }, function (err, res, body) {
+					assert.ifError(err);
+					assert.equal(body.fullname, '');
+					assert.equal(body.email, '');
+
+					done();
+				});
+			});
+		});
+
+		it('should hide fullname in topic list and topic', function (done) {
+			Topics.post({
+				uid: uid,
+				title: 'Topic hidden',
+				content: 'lorem ipsum',
+				cid: testCid,
+			}, function (err) {
+				assert.ifError(err);
+				request(nconf.get('url') + '/api/recent', { json: true }, function (err, res, body) {
+					assert.ifError(err);
+					assert(!body.topics[0].user.hasOwnProperty('fullname'));
+					request(nconf.get('url') + '/api/topic/' + body.topics[0].slug, { json: true }, function (err, res, body) {
+						assert.ifError(err);
+						assert(!body.posts[0].user.hasOwnProperty('fullname'));
+						done();
+					});
+				});
+			});
+		});
+	});
 });

From 09770c4c394b408739ee102874393e018009526a Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Wed, 26 Jul 2017 14:50:17 -0400
Subject: [PATCH 66/67] up composer-default

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d761108513..f384e74f7b 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "morgan": "^1.3.2",
     "mousetrap": "^1.5.3",
     "nconf": "~0.8.2",
-    "nodebb-plugin-composer-default": "5.0.3",
+    "nodebb-plugin-composer-default": "5.0.4",
     "nodebb-plugin-dbsearch": "2.0.6",
     "nodebb-plugin-emoji-extended": "1.1.1",
     "nodebb-plugin-emoji-one": "1.2.1",

From f2dba40496d55777ef23fd97f557073349fac139 Mon Sep 17 00:00:00 2001
From: "Misty (Bot)" <deploy@nodebb.org>
Date: Thu, 27 Jul 2017 09:23:37 +0000
Subject: [PATCH 67/67] Latest translations and fallbacks

---
 public/language/zh-CN/admin/general/dashboard.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/language/zh-CN/admin/general/dashboard.json b/public/language/zh-CN/admin/general/dashboard.json
index 02759fba11..faa2fbc602 100644
--- a/public/language/zh-CN/admin/general/dashboard.json
+++ b/public/language/zh-CN/admin/general/dashboard.json
@@ -24,7 +24,7 @@
 	"keep-updated": "请确保您已及时更新 NodeBB 以获得最新的安全补丁与 Bug 修复。",
 	"up-to-date": "<p>正在使用 <strong>最新版本</strong> <i class=\"fa fa-check\"></i></p>",
 	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>你正在使用NodeBB过期的实验版本。新的版本 (v%1) 已经发布。 请考虑<a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">更新你的 NodeBB</a>。</p>",
 	"prerelease-warning": "<p>正在使用<strong>测试版</strong> NodeBB。可能会出现意外的 Bug。<i class=\"fa fa-exclamation-triangle\"></i></p>",
 	"running-in-development": "<span>论坛正处于开发模式，这可能使其暴露于潜在的危险之中；请联系您的系统管理员。</span>",