chore: incrementing version number - v1.14.0-1

Co-authored-by: Renovate Bot <bot@renovateapp.com>

.eslintrc

@@ -24,7 +24,7 @@
 		"consistent-return": "off",
 		"func-names": "off",
 		"no-tabs": "off",
-		"indent": ["error", "tab"],
+		"indent": ["error", "tab", { "SwitchCase": 1 }],
 		"no-eq-null": "off",
 		"camelcase": "off",
 		"no-new": "off",

.gitignore

@@ -67,3 +67,4 @@ test/files/normalise.jpg.png
 test/files/normalise-resized.jpg
 package-lock.json
 /package.json
+*.mongodb

CHANGELOG.md

@@ -1,3 +1,236 @@
+#### 1.13.3 (2020-05-08)
+
+##### Chores
+
+*  incrementing version number - v1.13.3 (ee583e80)
+*  bump persona (d2bd746c)
+*  incrementing version number - v1.13.2 (beafd613)
+* **deps:**
+  *  update dependency coveralls to v3.1.0 (5ed4a108)
+  *  pin dependency @apidevtools/swagger-parser to 9.0.1 (51eccef5)
+  *  update dependency husky to v4.2.5 (30a25983)
+  *  update dependency husky to v4.2.4 (0a650118)
+  *  update dependency lint-staged to v10.1.3 (a9e68639)
+  *  update dependency nyc to v15.0.1 (#8231) (a3789e28)
+  *  update dependency lint-staged to v10.1.2 (#8235) (e1919c90)
+  *  update dependency lint-staged to v10.1.1 (944a6f58)
+  *  update dependency lint-staged to v10.1.0 (30bd233b)
+  *  update dependency eslint-config-airbnb-base to v14.1.0 (811c3aee)
+  *  update dependency jsdom to v16.2.2 (c5a7242d)
+  *  update dependency eslint-plugin-import to v2.20.2 (b92c1600)
+  *  update dependency lint-staged to v10.0.10 (0ad4b556)
+  *  update dependency coveralls to v3.0.11 (14458087)
+  *  update dependency smtp-server to v3.6.0 (22681945)
+  *  update dependency mocha to v7.1.1 (#8215) (c5356541)
+  *  update dependency grunt to v1.1.0 (#8214) (b0864e7c)
+  *  update dependency husky to v4.2.3 (#8162) (776fe9d2)
+  *  update dependency lint-staged to v10.0.8 (#8180) (13d8f6f1)
+  *  update dependency eslint-plugin-import to v2.20.1 (#8081) (4cdb3131)
+  *  update dependency jsdom to v16.2.1 (#8165) (fbd95a50)
+  *  update dependency husky to v4.2.2 (#8160) (f4ed35c9)
+  *  update dependency jsdom to v16 (#8114) (1037de02)
+
+##### Documentation Changes
+
+*  updated changelog (146388aa)
+
+##### New Features
+
+*  allow activating additional plugins for testing via config.json (a969c5ce)
+*  move plugin tests to separate file (3a23ddab)
+*  remove node14 for now (a72e4429)
+*  reduce infinite scroll area (3fcbd691)
+*  manifest.json improvements from #8126 (#8264) (6e5ebb61)
+*  show error if json is invalid (15345627)
+*  moved component specs into separate files (cd506557)
+*  added UserObject, UserObjectFull, Breadcrumb, Pagination component (64d79fe5)
+*  added some summary and descriptions (ae3e90d6)
+*  add some descriptions (442c018e)
+*  common schema (eade13f9)
+*  openapi component (1af5507a)
+*  add page query param to docs (9987813f)
+*  tag route doc (bbddaadf)
+*  local redoc view on development mode only (1136a369)
+*  added auto-generated, slimmed-down openapi 3.0 file for read api (7b155dab)
+*  add parent cids to body class (23571224)
+*  add 2 hooks for modifying privileges (d080c7b0)
+*  add user ip to admin/dev/info (5e91a67e)
+*  change option name (cba5b23e)
+*  add no-build to ./nodebb setup (476f6717)
+*  add awaitable socket.emit (4083a6e3)
+*  settings sorted list (#8170) (3c9689a5)
+*  guard against accidental ommision (79737c53)
+* **openapi:**
+  *  merging openapi-test branch into master (8387178b)
+  *  move all commonprops out for commonprops component (65c78de6)
+  *  added template to commonprops (2425f453)
+
+##### Bug Fixes
+
+*  #8302, send string to writeFileSync (d09bd2cf)
+*  winston showing json object (7d081843)
+*  sortable topics even if only 1 pinned topic (6765de3d)
+*  #8298, use class name added by jQueryUI instead (dd2bc189)
+*  topic search shortcut for macs (f2c725c6)
+*  #8297, uids.length is different than topics.length (0431d75f)
+*  #8297 guest handles shown in category.tpl (fcb81cb8)
+*  only add to set if numRecentReplies>0 (16a98eaf)
+*  #8293, don't show error if there are no self messages (be305410)
+*  failing tests @julianlam (ecd622fd)
+*  #3321, run plugin tests for installed plugins (a6bb9f43)
+*  remove deprecated mocha.opts (3d0db963)
+*  spec (84383d39)
+*  #8290, if there are no filters go to ?reset=1 (9839346e)
+*  #8283, update gdpr link again (2d076344)
+*  add missing await (4f1128fd)
+*  #8287, dont readd user after deletion (9d153fd3)
+*  missing await (4d6b2ec3)
+*  #8286, rescind notif when its resolved/rejected (0391856d)
+*  #8284, parse ToS on register (0ca84bd9)
+*  #8283, point to official site (17d664e0)
+*  jquery xhtml violations (275e837b)
+* #8274 Don't escape HTML in manage users (#8275) (4855f1de)
+*  crash in topic controller (0c7c70ed)
+*  crash when res.locals.linkTags is undefined (7cab2b0f)
+*  #8272 user link in digest email (e80b8101)
+*  tag of /api/unread/total (9ffdab02)
+*  response hook logic (5a1c6ee7)
+*  remove upload picture test (avatars) (6edf02d4)
+*  remove tests related to group covers, as route is gone (442fe65f)
+*  #8269, return array of topics from hook (4eafe0f0)
+*  remove dead picture upload code #8260 (ef52461f)
+*  path.resolve to logs file (5bcaf715)
+*  only trigger infinitescroll on scroll end (ba6d3fd3)
+*  wrong data returned in available.groups (c7ea84a2)
+*  no focus on find user modal (1b425ef1)
+*  accidental fp precision on flag and acp dash graphs (bcbf98aa)
+*  #8232, unresolvable session mismatch on register cancel (f2f6fbf1)
+*  pin jquery to 3.4.1, #8252 (e440d617)
+*  #8249, don't send move notifications for deleted posts/topics (d77036db)
+*  missing descriptions for common properties (7b31fb34)
+*  some definitions in read API spec (03739b6f)
+*  tagged all routes in read api spec (455d42bc)
+*  override ACAO header for read API spec file (240d9091)
+*  throw error if topic does not exist (59cf0e80)
+*  hookname (e93578b8)
+*  #8230, add hook getUserDataByUserSlug (0d1b5a7f)
+*  ignore case for group details route (15d6975e)
+*  lint (740e598a)
+*  lint (8e23dec8)
+*  #8221, fix parent selection (08031730)
+*  invite properly (071506eb)
+*  admins not seeing invite button (8f4b99a4)
+*  #8217, add missing lang key (0b5fac75)
+*  #8206 first message in chat has false `newSet` (93acd139)
+*  #8203, fix user invites refreshing page (2f9c7c62)
+*  #8202, filter non-existing users in search by uid (f07f4f8e)
+*  notification bodyShort truncated if there is a comma in topic title (266061c3)
+*  hsts max-age missing translation (b67af70d)
+*  call next (80f1bcad)
+*  try travis fix again (05bee629)
+*  try fixing psql on travis (bc9e92a1)
+*  dont let regular users see other users watched categories (cf6eadb9)
+*  also fix updating bookmark if sorting is newest_to_oldest (6e5de39b)
+*  #8188, fix bookmark if sorting is newest_to_oldest (32ada7c4)
+*  duplicate ID + label (ac241fb8)
+*  #8184 global mods unable to revoke other user sessions (f0db240a)
+*  return null if field does not exist (e72a29b3)
+*  #8179, limit length of location/website/fullname, check grouptitle (14e78667)
+*  tag key (32636755)
+*  #8175 (bc93b567)
+*  #8168 re-allowing slashes in homePageRoute (667608a0)
+*  tweak to session validation in addHeaders (eddbd868)
+*  only call clearCookie for logged in users (630f5d5b)
+*  #6422, update deleted/restored messages (06703408)
+*  #8163, prevent account deletion (4d0636f8)
+*  register (5a0c7c14)
+*  #8157, update recent tid when post is moved (e7495440)
+*  tests (b73aa84d)
+*  move start/stop every iteration (dd3893b1)
+*  #8154, move start/stop every iteration (300c04ce)
+*  #8154, respect stop (690bb69d)
+*  #8156 dont allow loading members from hidden groups (f23bc347)
+*  #8155, don't validate name on update if groupName didn't change (03a02e5d)
+*  return correct number of suggested topics (236e1e68)
+*  #8151, don't crash if taskbar doesn't have element (2e794801)
+*  logic for determining dailyStats hour vars (398f0120)
+*  fix daily analytics being one day off (9ecdb92f)
+*  remove debug line (0b9ad416)
+*  no decimal places for category analytics (14655f87)
+*  #8142, broken site if no server-side session (#8148) (d6e3f3f0)
+*  #8144 pluginHooks in maintenance mode middleware (0885ec68)
+* **deps:**
+  *  #8298 bump persona (158d9231)
+  *  update dependency nodebb-plugin-composer-default to v6.3.25 (89d17647)
+  *  update dependency jquery to v3.5.1 [security] (#8281) (a69f0b29)
+  *  update dependency nodebb-rewards-essentials to v0.1.3 (#8289) (919034a7)
+  *  update dependency mongodb to v3.5.7 (#8279) (25d509c4)
+  *  actually, swagger-parser is a dev dependency (d09c6ae0)
+  *  missing @apidevtools/swagger-parser (f1720735)
+  *  update dependency nodebb-theme-persona to v10.1.37 (#8258) (b0c30ceb)
+  *  update dependency archiver to v4 (28777f67)
+  *  update dependency mongodb to v3.5.6 (#8256) (49236067)
+  *  bump dependencies (#8239) (e68156e1)
+  *  update dependency jsesc to v3.0.1 (#8243) (92b55ef5)
+  *  update dependency jsesc to v3 (bb70cebb)
+  *  update dependency pg to v8 (#8227) (ac98775f)
+  *  update dependency validator to v13 (f497ee62)
+  *  update dependency sharp to v0.25.2 (#8220) (dd660c87)
+  *  bump markdown (ee6cb412)
+  *  update dependency mongodb to v3.5.5 (#8205) (5535c50c)
+  *  update dependency sitemap to v6 (#8198) (2052f14c)
+  *  update dependency nodebb-plugin-composer-default to v6.3.23 (6d98d5a1)
+  *  update dependency sharp to v0.25.1 (#8199) (21e91c91)
+  *  update dependency nodebb-plugin-composer-default to v6.3.22 (#8193) (e01f05e3)
+  *  update dependency nodebb-theme-slick to v1.2.29 (#8177) (9daa21ff)
+  *  update dependency nodebb-theme-vanilla to v11.1.16 (#8178) (7d6a983b)
+  *  update dependency nodebb-theme-persona to v10.1.35 (#8176) (3acc24b0)
+  *  update dependency sharp to v0.24.1 (#8164) (7cc63f7d)
+  *  update dependency mongodb to v3.5.3 (#8161) (4b907137)
+  *  update dependency nodebb-widget-essentials to v4.1.0 (#8159) (a5f3c2a2)
+  *  update dependency request to v2.88.2 (#8158) (7fde180a)
+  *  update dependency redis to v3 (#8152) (ef964b11)
+  *  update dependency rimraf to v3.0.2 (#8153) (d8efc6b6)
+* **openapi:**
+  *  v14 test fix (23a0b8c5)
+  *  remove account and group upload routes (d342a28c)
+  *  more fleshing out (058a15db)
+  *  fleshed out admin routes (bae88e08)
+  *  added some descriptions (ab4bd7e1)
+  *  added PostsObject component (2395d2be)
+  *  finished moving all category objects out (23dd2727)
+  *  changed some descriptions (c939f8c6)
+  *  added CategoryObject component (55d0a9ff)
+  *  removed repeated breadcrumb blocks in favour of $ref (646fac1e)
+  *  remove all repeated pagination blocks in favour of (ac579f9d)
+  *  removed warning for category mods route (1cf62095)
+  *  normalising the file for programmatic updates (3a5c6e07)
+
+##### Other Changes
+
+*  #8298 (2e57d8ac)
+* post.updatePostVoteCount (b25b51bd)
+* //github.com/NodeBB/NodeBB (5e140454)
+* categories.updateRecentTid (6c59683b)
+* categories.updateRecentTid (51933c1f)
+* router.page, dep. filter variant (0053e779)
+* flags as well (5ebcdb18)
+*  crash when res.locals.linkTags is undefined" (fe03effe)
+* //github.com/NodeBB/NodeBB (87a6ff0d)
+*  cnpm and pnpm (#8222) (e6a1741c)
+* //github.com/NodeBB/NodeBB (7ae76477)
+*  openapi component" (683e5851)
+*  override ACAO header for read API spec file" (c82a2637)
+* password.change (00e299e9)
+* topic.tools.load (5aa76cdf)
+*  #8154, move start/stop every iteration" (4abe5eb7)
+
+##### Refactors
+
+*  match core field name pinned (478ed6c1)
+*  getUsersCSV to use batch lib (1efb238a)
+*  reorganized socket.io admin modules (e1c6c3b2)
+
 #### 1.13.2 (2020-02-05)
 
 ##### Chores

Gruntfile.js

@@ -1,95 +1,31 @@
 'use strict';
 
-
-var async = require('async');
-var fork = require('child_process').fork;
-var env = process.env;
+const path = require('path');
+const nconf = require('nconf');
+nconf.argv().env({
+	separator: '__',
+});
+const winston = require('winston');
+const fork = require('child_process').fork;
+const env = process.env;
 var worker;
-var updateWorker;
-var initWorker;
-var incomplete = [];
-var running = 0;
 
 env.NODE_ENV = env.NODE_ENV || 'development';
 
+const configFile = path.resolve(__dirname, nconf.any(['config', 'CONFIG']) || 'config.json');
+const prestart = require('./src/prestart');
+prestart.loadConfig(configFile);
 
-var nconf = require('nconf');
-nconf.file({
-	file: 'config.json',
-});
-
-nconf.defaults({
-	base_dir: __dirname,
-	views_dir: './build/public/templates',
-});
-var winston = require('winston');
-winston.configure({
-	transports: [
-		new winston.transports.Console({
-			handleExceptions: true,
-		}),
-	],
-});
 var db = require('./src/database');
 
 module.exports = function (grunt) {
 	var args = [];
-	var initArgs = ['--build'];
+
 	if (!grunt.option('verbose')) {
 		args.push('--log-level=info');
-		initArgs.push('--log-level=info');
-	}
-
-	function update(action, filepath, target) {
-		var updateArgs = args.slice();
-		var compiling;
-		var time = Date.now();
-
-		if (target === 'lessUpdated_Client') {
-			compiling = 'clientCSS';
-		} else if (target === 'lessUpdated_Admin') {
-			compiling = 'acpCSS';
-		} else if (target === 'clientUpdated') {
-			compiling = 'js';
-		} else if (target === 'templatesUpdated') {
-			compiling = 'tpl';
-		} else if (target === 'langUpdated') {
-			compiling = 'lang';
-		} else if (target === 'serverUpdated') {
-			// Do nothing, just restart
-		}
-
-		if (compiling && !incomplete.includes(compiling)) {
-			incomplete.push(compiling);
-		}
-
-		updateArgs.push('--build');
-		updateArgs.push(incomplete.join(','));
-
-		worker.kill();
-		if (updateWorker) {
-			updateWorker.kill('SIGKILL');
-		}
-		updateWorker = fork('app.js', updateArgs, { env: env });
-		running += 1;
-		updateWorker.on('exit', function () {
-			running -= 1;
-			if (running === 0) {
-				worker = fork('app.js', args, {
-					env: env,
-				});
-				worker.on('message', function () {
-					if (incomplete.length) {
-						incomplete = [];
-
-						if (grunt.option('verbose')) {
-							grunt.log.writeln('NodeBB restarted in ' + (Date.now() - time) + ' ms');
-						}
-					}
-				});
-			}
-		});
+		nconf.set('log-level', 'info');
 	}
+	prestart.setupWinston();
 
 	grunt.initConfig({
 		watch: {},
@@ -99,148 +35,166 @@ module.exports = function (grunt) {
 
 	grunt.registerTask('default', ['watch']);
 
-	grunt.registerTask('init', function () {
+	grunt.registerTask('init', async function () {
 		var done = this.async();
-		async.waterfall([
-			function (next) {
-				db.init(next);
-			},
-			function (next) {
-				db.getSortedSetRange('plugins:active', 0, -1, next);
-			},
-			function (plugins, next) {
-				addBaseThemes(plugins, next);
-			},
-			function (plugins, next) {
-				if (!plugins.includes('nodebb-plugin-composer-default')) {
-					plugins.push('nodebb-plugin-composer-default');
-				}
+		let plugins = [];
+		if (!process.argv.includes('--core')) {
+			await db.init();
+			plugins = await db.getSortedSetRange('plugins:active', 0, -1);
+			addBaseThemes(plugins);
+			if (!plugins.includes('nodebb-plugin-composer-default')) {
+				plugins.push('nodebb-plugin-composer-default');
+			}
+		}
 
-				if (process.argv.includes('--core')) {
-					plugins = [];
-				}
+		const styleUpdated_Client = plugins.map(p => 'node_modules/' + p + '/*.less')
+			.concat(plugins.map(p => 'node_modules/' + p + '/*.css'))
+			.concat(plugins.map(p => 'node_modules/' + p + '/+(public|static|less)/**/*.less'))
+			.concat(plugins.map(p => 'node_modules/' + p + '/+(public|static)/**/*.css'));
 
-				const lessUpdated_Client = plugins.map(p => 'node_modules/' + p + '/**/*.less');
-				const lessUpdated_Admin = plugins.map(p => 'node_modules/' + p + '/**/*.less');
-				const clientUpdated = plugins.map(p => 'node_modules/' + p + '/**/*.js');
-				const templatesUpdated = plugins.map(p => 'node_modules/' + p + '/**/*.tpl');
-				const langUpdated = plugins.map(p => 'node_modules/' + p + '/**/*.json');
+		const styleUpdated_Admin = plugins.map(p => 'node_modules/' + p + '/*.less')
+			.concat(plugins.map(p => 'node_modules/' + p + '/*.css'))
+			.concat(plugins.map(p => 'node_modules/' + p + '/+(public|static|less)/**/*.less'))
+			.concat(plugins.map(p => 'node_modules/' + p + '/+(public|static)/**/*.css'));
 
-				grunt.config(['watch'], {
-					lessUpdated_Client: {
-						files: [
-							'public/less/*.less',
-							'!public/less/admin/**/*.less',
-							...lessUpdated_Client,
-							'!node_modules/nodebb-*/node_modules/**',
-							'!node_modules/nodebb-*/.git/**',
-						],
-						options: {
-							interval: 1000,
-						},
-					},
-					lessUpdated_Admin: {
-						files: [
-							'public/less/admin/**/*.less',
-							...lessUpdated_Admin,
-							'!node_modules/nodebb-*/node_modules/**',
-							'!node_modules/nodebb-*/.git/**',
-						],
-						options: {
-							interval: 1000,
-						},
-					},
-					clientUpdated: {
-						files: [
-							'public/src/**/*.js',
-							...clientUpdated,
-							'!node_modules/nodebb-*/node_modules/**',
-							'node_modules/benchpressjs/build/benchpress.js',
-							'!node_modules/nodebb-*/.git/**',
-						],
-						options: {
-							interval: 1000,
-						},
-					},
-					serverUpdated: {
-						files: ['*.js', 'install/*.js', 'src/**/*.js', '!src/upgrades/**'],
-						options: {
-							interval: 1000,
-						},
-					},
-					templatesUpdated: {
-						files: [
-							'src/views/**/*.tpl',
-							...templatesUpdated,
-							'!node_modules/nodebb-*/node_modules/**',
-							'!node_modules/nodebb-*/.git/**',
-						],
-						options: {
-							interval: 1000,
-						},
-					},
-					langUpdated: {
-						files: [
-							'public/language/en-GB/*.json',
-							'public/language/en-GB/**/*.json',
-							...langUpdated,
-							'!node_modules/nodebb-*/node_modules/**',
-							'!node_modules/nodebb-*/.git/**',
-							'!node_modules/nodebb-*/plugin.json',
-							'!node_modules/nodebb-*/package.json',
-							'!node_modules/nodebb-*/theme.json',
-						],
-						options: {
-							interval: 1000,
-						},
-					},
-				});
-				next();
+		const clientUpdated = plugins.map(p => 'node_modules/' + p + '/+(public|static)/**/*.js');
+		const serverUpdated = plugins.map(p => 'node_modules/' + p + '/*.js')
+			.concat(plugins.map(p => 'node_modules/' + p + '/+(lib|src)/**/*.js'));
+
+		const templatesUpdated = plugins.map(p => 'node_modules/' + p + '/+(public|static|templates)/**/*.tpl');
+		const langUpdated = plugins.map(p => 'node_modules/' + p + '/+(public|static|languages)/**/*.json');
+
+		grunt.config(['watch'], {
+			styleUpdated_Client: {
+				files: [
+					'public/less/**/*.less',
+					...styleUpdated_Client,
+				],
+				options: {
+					interval: 1000,
+				},
 			},
-		], done);
+			styleUpdated_Admin: {
+				files: [
+					'public/less/**/*.less',
+					...styleUpdated_Admin,
+				],
+				options: {
+					interval: 1000,
+				},
+			},
+			clientUpdated: {
+				files: [
+					'public/src/**/*.js',
+					...clientUpdated,
+					'node_modules/benchpressjs/build/benchpress.js',
+				],
+				options: {
+					interval: 1000,
+				},
+			},
+			serverUpdated: {
+				files: [
+					'app.js',
+					'install/*.js',
+					'src/**/*.js',
+					'public/src/modules/translator.js',
+					'public/src/modules/helpers.js',
+					'public/src/utils.js',
+					serverUpdated,
+					'!src/upgrades/**',
+				],
+				options: {
+					interval: 1000,
+				},
+			},
+			templatesUpdated: {
+				files: [
+					'src/views/**/*.tpl',
+					...templatesUpdated,
+				],
+				options: {
+					interval: 1000,
+				},
+			},
+			langUpdated: {
+				files: [
+					'public/language/en-GB/*.json',
+					'public/language/en-GB/**/*.json',
+					...langUpdated,
+				],
+				options: {
+					interval: 1000,
+				},
+			},
+		});
+		const build = require('./src/meta/build');
+		if (!grunt.option('skip')) {
+			await build.build(true);
+		}
+		run();
+		done();
 	});
 
-	grunt.task.run('init');
-
-	env.NODE_ENV = 'development';
-
-	if (grunt.option('skip')) {
+	function run() {
+		if (worker) {
+			worker.kill();
+		}
 		worker = fork('app.js', args, {
 			env: env,
 		});
-	} else {
-		initWorker = fork('app.js', initArgs, {
-			env: env,
-		});
-
-		initWorker.on('exit', function () {
-			worker = fork('app.js', args, {
-				env: env,
-			});
-		});
 	}
 
-	grunt.event.on('watch', update);
+	grunt.task.run('init');
+
+	grunt.event.removeAllListeners('watch');
+	grunt.event.on('watch', function update(action, filepath, target) {
+		var compiling;
+		if (target === 'styleUpdated_Client') {
+			compiling = 'clientCSS';
+		} else if (target === 'styleUpdated_Admin') {
+			compiling = 'acpCSS';
+		} else if (target === 'clientUpdated') {
+			compiling = 'js';
+		} else if (target === 'templatesUpdated') {
+			compiling = 'tpl';
+		} else if (target === 'langUpdated') {
+			compiling = 'lang';
+		} else if (target === 'serverUpdated') {
+			// empty require cache
+			const paths = ['./src/meta/build.js', './src/meta/index.js'];
+			paths.forEach(p => delete require.cache[require.resolve(p)]);
+			return run();
+		}
+
+		require('./src/meta/build').build([compiling], function (err) {
+			if (err) {
+				winston.error(err.stack);
+			}
+			if (worker) {
+				worker.send({ compiling: compiling });
+			}
+		});
+	});
 };
 
-function addBaseThemes(plugins, callback) {
-	const themeId = plugins.find(p => p.startsWith('nodebb-theme-'));
+function addBaseThemes(plugins) {
+	let themeId = plugins.find(p => p.includes('nodebb-theme-'));
 	if (!themeId) {
-		return setImmediate(callback, null, plugins);
+		return plugins;
 	}
-	function getBaseRecursive(themeId) {
+	let baseTheme;
+	do {
 		try {
-			const baseTheme = require(themeId + '/theme').baseTheme;
-
-			if (baseTheme) {
-				plugins.push(baseTheme);
-				getBaseRecursive(baseTheme);
-			}
+			baseTheme = require(themeId + '/theme').baseTheme;
 		} catch (err) {
 			console.log(err);
 		}
-	}
 
-	getBaseRecursive(themeId);
-	callback(null, plugins);
+		if (baseTheme) {
+			plugins.push(baseTheme);
+			themeId = baseTheme;
+		}
+	} while (baseTheme);
+	return plugins;
 }

app.js

@@ -31,6 +31,7 @@ const path = require('path');
 
 const file = require('./src/file');
 
+process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 global.env = process.env.NODE_ENV || 'production';
 
 // Alternate configuration file support

install/data/defaults.json

@@ -32,9 +32,8 @@
     "registrationType": "normal",
     "registrationApprovalType": "normal",
     "allowAccountDelete": 1,
-    "allowFileUploads": 0,
     "privateUploads": 0,
-    "allowedFileExtensions": "png,jpg,bmp",
+    "allowedFileExtensions": "png,jpg,bmp,txt",
     "allowUserHomePage": 1,
     "allowMultipleBadges": 0,
     "maximumFileSize": 2048,
@@ -81,9 +80,11 @@
     "notificationType_upvote": "notification",
     "notificationType_new-topic": "notification",
     "notificationType_new-reply": "notification",
+    "notificationType_post-edit": "notification",
     "notificationType_follow": "notification",
     "notificationType_new-chat": "notification",
     "notificationType_group-invite": "notification",
+    "notificationType_group-request-membership": "notification",
     "notificationType_mention": "notification",
     "notificationType_new-register": "notification",
     "notificationType_post-queue": "notification",

install/package.json

@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "1.13.3",
+    "version": "1.14.0-1",
     "homepage": "http://www.nodebb.org",
     "repository": {
         "type": "git",
@@ -65,7 +65,7 @@
         "ipaddr.js": "^1.9.1",
         "jquery": "3.5.1",
         "jsesc": "3.0.1",
-        "json-2-csv": "^3.6.2",
+        "json2csv": "5.0.1",
         "jsonwebtoken": "^8.5.1",
         "less": "^3.11.1",
         "lodash": "^4.17.15",
@@ -74,31 +74,31 @@
         "material-design-lite": "^1.3.0",
         "mime": "^2.4.4",
         "mkdirp": "^1.0.4",
-        "mongodb": "3.5.7",
+        "mongodb": "3.5.8",
         "morgan": "^1.10.0",
         "mousetrap": "^1.6.5",
         "@nodebb/mubsub": "^1.6.0",
         "nconf": "^0.10.0",
-        "nodebb-plugin-composer-default": "6.3.25",
+        "nodebb-plugin-composer-default": "6.3.34",
         "nodebb-plugin-dbsearch": "4.0.7",
         "nodebb-plugin-emoji": "^3.3.0",
         "nodebb-plugin-emoji-android": "2.0.0",
         "nodebb-plugin-markdown": "8.11.2",
         "nodebb-plugin-mentions": "2.7.4",
         "nodebb-plugin-soundpack-default": "1.0.0",
-        "nodebb-plugin-spam-be-gone": "0.6.7",
+        "nodebb-plugin-spam-be-gone": "0.7.1",
         "nodebb-rewards-essentials": "0.1.3",
         "nodebb-theme-lavender": "5.0.11",
-        "nodebb-theme-persona": "10.1.39",
+        "nodebb-theme-persona": "10.1.44",
         "nodebb-theme-slick": "1.2.29",
-        "nodebb-theme-vanilla": "11.1.16",
+        "nodebb-theme-vanilla": "11.1.19",
         "nodebb-widget-essentials": "4.1.0",
         "nodemailer": "^6.4.6",
         "passport": "^0.4.1",
         "passport-local": "1.0.0",
         "pg": "^8.0.2",
         "pg-cursor": "^2.1.9",
-        "postcss": "7.0.27",
+        "postcss": "7.0.30",
         "postcss-clean": "1.1.0",
         "promise-polyfill": "^8.1.3",
         "prompt": "^1.0.0",
@@ -110,7 +110,7 @@
         "sanitize-html": "^1.23.0",
         "semver": "^7.2.1",
         "serve-favicon": "^2.5.0",
-        "sharp": "0.25.2",
+        "sharp": "0.25.3",
         "sitemap": "^6.1.0",
         "socket.io": "2.3.0",
         "socket.io-adapter-cluster": "^1.0.1",
@@ -136,15 +136,15 @@
         "@commitlint/cli": "8.3.5",
         "@commitlint/config-angular": "8.3.4",
         "coveralls": "3.1.0",
-        "eslint": "6.8.0",
+        "eslint": "7.1.0",
         "eslint-config-airbnb-base": "14.1.0",
         "eslint-plugin-import": "2.20.2",
         "grunt": "1.1.0",
         "grunt-contrib-watch": "1.1.0",
         "husky": "4.2.5",
         "jsdom": "16.2.2",
-        "lint-staged": "10.2.0",
-        "mocha": "7.1.2",
+        "lint-staged": "10.2.8",
+        "mocha": "7.2.0",
         "mocha-lcov-reporter": "1.3.0",
         "nyc": "15.0.1",
         "smtp-server": "3.6.0"

loader.js

@@ -87,22 +87,22 @@ Loader.addWorkerEvents = function (worker) {
 	worker.on('message', function (message) {
 		if (message && typeof message === 'object' && message.action) {
 			switch (message.action) {
-			case 'restart':
-				console.log('[cluster] Restarting...');
-				Loader.restart();
-				break;
-			case 'pubsub':
-				workers.forEach(function (w) {
-					w.send(message);
-				});
-				break;
-			case 'socket.io':
-				workers.forEach(function (w) {
-					if (w !== worker) {
+				case 'restart':
+					console.log('[cluster] Restarting...');
+					Loader.restart();
+					break;
+				case 'pubsub':
+					workers.forEach(function (w) {
 						w.send(message);
-					}
-				});
-				break;
+					});
+					break;
+				case 'socket.io':
+					workers.forEach(function (w) {
+						if (w !== worker) {
+							w.send(message);
+						}
+					});
+					break;
 			}
 		}
 	});

public/503.html

@@ -1,13 +1,13 @@
 <html>
 <head>
 	<title>Excessive Load Warning</title>
-	<link href='https://fonts.googleapis.com/css?family=Ubuntu:400,500,700' rel='stylesheet' type='text/css'>
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<style type="text/css">
 	body {
 		background: #00A9EA;
 		color: white;
-		font-family: 'Ubuntu', sans-serif;
+		/* see public/less/admin/vars.less for documentation on system font family */
+		font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
 		text-align: center;
 		-webkit-transform-style: preserve-3d;
 		-moz-transform-style: preserve-3d;

public/language/ar/admin/manage/digest.json

@@ -9,7 +9,7 @@
 	"default": "System default",
 	"default-help": "<em>System default</em> means the user has not explicitly overridden the global forum setting for digests, which is currently: &quot;<strong>%1</strong>&quot;",
 	"resend": "Resend Digest",
-	"resend-all-confirm": "Are you sure you wish to mnually execute this digest run?",
+	"resend-all-confirm": "Are you sure you wish to manually execute this digest run?",
 	"resent-single": "Manual digest resend completed",
 	"resent-day": "Daily digest resent",
 	"resent-week": "Weekly digest resent",
@@ -18,4 +18,4 @@
 	"manual-run": "Manual digest run:",
 
 	"no-delivery-data": "No delivery data found"
-}
+}

public/language/ar/admin/manage/tags.json

@@ -3,13 +3,13 @@
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",
 
 	"alerts.editing": "Editing tag(s)",

public/language/ar/admin/menu.json

@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "عام",
-	"general/dashboard": "اللوحة الرئيسية",
-	"general/homepage": "الصفحة الرئيسية",
-	"general/navigation": "التصفح",
-	"general/languages": "اللغات",
-	"general/sounds": "الأصوات",
-	"general/social": "شبكات التواصل",
 
 	"section-manage": "إدارة",
 	"manage/categories": "الأقسام",
@@ -22,17 +17,22 @@
 
 	"section-settings": "إعدادات",
 	"settings/general": "عامة",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "السمعة",
 	"settings/email": "البريد الإلكتروني",
-	"settings/user": "الأعضاء",
-	"settings/group": "المجموعات",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "الزوار",
 	"settings/uploads": "الرفع",
-	"settings/post": "المشاركة",
-	"settings/chat": "الدردشة",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "ترقيم الصفحات",
 	"settings/tags": "الكلمات المفتاحية",
 	"settings/notifications": "التنبيهات",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",

public/language/ar/admin/settings/advanced.json

@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }

public/language/ar/admin/settings/tags.json

@@ -1,5 +1,6 @@
 {
     "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
     "min-per-topic": "Minimum Tags per Topic",
     "max-per-topic": "Maximum Tags per Topic",
     "min-length": "Minimum Tag Length",

public/language/ar/flags.json

@@ -27,7 +27,7 @@
 	"filter-cid-all": "All categories",
 	"apply-filters": "Apply Filters",
 
-	"quick-links": "Quick Links",
+	"quick-actions": "Quick Actions",
 	"flagged-user": "Flagged User",
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
@@ -40,7 +40,7 @@
 	"add-note": "Add Note",
 	"no-notes": "No shared notes.",
 
-	"history": "Flag History",
+	"history": "Account & Flag History",
 	"back": "Back to Flags List",
 	"no-history": "No flag history.",
 

public/language/ar/global.json

@@ -53,6 +53,7 @@
     "posts": "المشاركات",
     "best": "الأفضل",
     "votes": "Votes",
+    "voters": "Voters",
     "upvoters": "الموافقين",
     "upvoted": "مصوت بالموجب",
     "downvoters": "مصوتين بالسالب",

public/language/ar/notifications.json

@@ -35,6 +35,7 @@
     "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
     "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> أنشأ موضوعًا جديدًا: <strong>%2</strong>",
+    "user_edited_post": "<strong>%1</strong> has edited a post in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> صار يتابعك.",
     "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
     "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
@@ -53,6 +54,7 @@
     "notificationType_upvote": "عندما يوافقك احدهم على منشورك",
     "notificationType_new-topic": "When someone you follow posts a topic",
     "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_post-edit": "When a post is edited in a topic you are watching",
     "notificationType_follow": "When someone starts following you",
     "notificationType_new-chat": "When you receive a chat message",
     "notificationType_group-invite": "When you receive a group invite",

public/language/ar/user.json

@@ -144,6 +144,7 @@
     "info.ban-history": "سجل الحظر الأحدث",
     "info.no-ban-history": "هذا المستخدم لم يتم حظره مطلقا",
     "info.banned-until": "محظور حتى %1",
+    "info.banned-expiry": "Expiry",
     "info.banned-permanently": "محظور بشكل دائم",
     "info.banned-reason-label": "سبب",
     "info.banned-no-reason": "لم يتم إعطاء سبب.",
@@ -170,7 +171,7 @@
     "consent.right_to_erasure_description": "At any time, you are able to revoke your consent to data collection and/or processing by deleting your account. Your individual profile can be deleted, although your posted content will remain. If you wish to delete both your account <strong>and</strong> your content, please contact the administrative team for this website.",
     "consent.right_to_data_portability": "You have the Right to Data Portability",
     "consent.right_to_data_portability_description": "You may request from us a machine-readable export of any collected data about you and your account. You can do so by clicking the appropriate button below.",
-    "consent.export_profile": "Export Profile (.csv)",
+    "consent.export_profile": "Export Profile (.json)",
     "consent.export_uploads": "Export Uploaded Content (.zip)",
     "consent.export_posts": "Export Posts (.csv)"
 }

public/language/bg/admin/manage/digest.json

@@ -18,4 +18,4 @@
 	"manual-run": "Ръчно разпращане на резюмето:",
 
 	"no-delivery-data": "Няма данни за доставката"
-}
+}

public/language/bg/admin/manage/tags.json

@@ -3,13 +3,13 @@
 	"bg-color": "Цвят на фона",
 	"text-color": "Цвят на текста",
 	"create-modify": "Създаване и редактиране на етикети",
-	"description": "Изберете етикетите чрез щракване и/или влачене. Използвайте „Shift“, за да изберете няколко етикета.",
+	"description": "Изберете етикетите чрез щракване или влачене. Използвайте <code>CTRL</code>, за да изберете няколко етикета.",
 	"create": "Създаване на етикет",
 	"modify": "Редактиране на етикети",
 	"rename": "Преименуване на етикети",
 	"delete": "Изтриване на избраните етикети",
 	"search": "Търсене на етикети…",
-	"settings": "Натиснете <a href=\"%1\">тук</a>, за да отворите страницата с настройки на етикета.",
+	"settings": "Настройки за етикетите",
 	"name": "Име на етикета",
 
 	"alerts.editing": "Редактиране на етикет(и)",

public/language/bg/admin/menu.json

@@ -1,11 +1,6 @@
 {
+	"dashboard": "Табло",
 	"section-general": "Общи",
-	"general/dashboard": "Табло",
-	"general/homepage": "Начало",
-	"general/navigation": "Навигация",
-	"general/languages": "Езици",
-	"general/sounds": "Звуци",
-	"general/social": "Обществени",
 
 	"section-manage": "Управление",
 	"manage/categories": "Категории",
@@ -22,17 +17,22 @@
 
 	"section-settings": "Настройки",
 	"settings/general": "Общи",
+	"settings/homepage": "Начална страница",
+	"settings/navigation": "Навигация",
 	"settings/reputation": "Репутация",
 	"settings/email": "Е-поща",
-	"settings/user": "Потребител",
-	"settings/group": "Група",
+	"settings/user": "Потребители",
+	"settings/group": "Групи",
 	"settings/guest": "Гости",
 	"settings/uploads": "Качвания",
-	"settings/post": "Публикация",
-	"settings/chat": "Разговор",
+	"settings/languages": "Езици",
+	"settings/post": "Публикации",
+	"settings/chat": "Разговори",
 	"settings/pagination": "Странициране",
 	"settings/tags": "Етикети",
 	"settings/notifications": "Известия",
+	"settings/sounds": "Звуци",
+	"settings/social": "Обществени",
 	"settings/cookies": "Бисквитки",
 	"settings/web-crawler": "Обхождач на уеб страници",
 	"settings/sockets": "Сокети",

public/language/bg/admin/settings/advanced.json

@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Граница на забавяне в цикъла на събитията (в милисекунди)",
 	"traffic.event-lag-help": "Намаляването на тази стойност ще намали времето за изчакване при зареждане на страници, но също така ще предизвика по-често показване на съобщението „прекомерно натоварване“ на повече потребители. (Нужно е рестартиране.)",
 	"traffic.lag-check-interval": "Интервал на проверка (в милисекунди)",
-	"traffic.lag-check-interval-help": "Намаляването на тази стойност ще направи NodeBB по-чувствителен към скоковете в натовареността, но може и да направи проверката твърде чувствителна. (Нужно е рестартиране.)"
+	"traffic.lag-check-interval-help": "Намаляването на тази стойност ще направи NodeBB по-чувствителен към скоковете в натовареността, но може и да направи проверката твърде чувствителна. (Нужно е рестартиране.)",
+
+	"sockets.settings": "Настройки за WebSocket",
+	"sockets.max-attempts": "Максимален брой опити за повторно свързване",
+	"sockets.default-placeholder": "По подразбиране: %1",
+	"sockets.delay": "Забавяне при повторно свързване"
 }

public/language/bg/admin/settings/tags.json

@@ -1,5 +1,6 @@
 {
     "tag": "Настройки за етикетите",
+    "link-to-manage": "Управление на етикетите",
     "min-per-topic": "Минимален брой етикети за тема",
     "max-per-topic": "Максимален брой етикети за тема",
     "min-length": "Минимална дължина на етикетите",

public/language/bg/flags.json

@@ -27,7 +27,7 @@
 	"filter-cid-all": "Всички категории",
 	"apply-filters": "Прилагане на филтрите",
 
-	"quick-links": "Бързи връзки",
+	"quick-actions": "Бързи действия",
 	"flagged-user": "Докладван потребител",
 	"view-profile": "Преглед на профила",
 	"start-new-chat": "Започване на нов разговор",
@@ -40,7 +40,7 @@
 	"add-note": "Добавяне на бележка",
 	"no-notes": "Няма споделени бележки.",
 
-	"history": "История на доклада",
+	"history": "Акаунт и история на докладванията",
 	"back": "Обратно към списъка с доклади",
 	"no-history": "Няма история на доклада.",
 

public/language/bg/global.json

@@ -53,6 +53,7 @@
     "posts": "Публ.",
     "best": "Най-добри",
     "votes": "Гласове",
+    "voters": "Гласували",
     "upvoters": "Гласували положително",
     "upvoted": "С положителни гласове",
     "downvoters": "Гласували отрицателно",

public/language/bg/notifications.json

@@ -35,6 +35,7 @@
     "user_posted_to_dual": "<strong>%1</strong> и <strong>%2</strong> публикуваха отговори на: <strong>%3</strong>",
     "user_posted_to_multiple": "<strong>%1</strong> и %2 други публикуваха отговори на: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> публикува нова тема: <strong>%2</strong>",
+    "user_edited_post": "<strong>%1</strong> редактира публикация в <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> започна да Ви следва.",
     "user_started_following_you_dual": "<strong>%1</strong> и <strong>%2</strong> започнаха да Ви следват.",
     "user_started_following_you_multiple": "<strong>%1</strong> и %2 започнаха да Ви следват.",
@@ -53,6 +54,7 @@
     "notificationType_upvote": "Когато някой гласува положително за Ваша публикация",
     "notificationType_new-topic": "Когато някой, когото следвате, публикува тема",
     "notificationType_new-reply": "Когато бъде публикуван нов отговор в тема, която следвате",
+    "notificationType_post-edit": "Когато бъде редактирана публикация в тема, която следите",
     "notificationType_follow": "Когато някой започне да Ви следва",
     "notificationType_new-chat": "Когато получите съобщение в разговор",
     "notificationType_group-invite": "Когато получите покана за група",

public/language/bg/user.json

@@ -144,6 +144,7 @@
     "info.ban-history": "Скорошна история на блокиранията",
     "info.no-ban-history": "Този потребител никога не е бил блокиран",
     "info.banned-until": "Блокиран до %1",
+    "info.banned-expiry": "Давност",
     "info.banned-permanently": "Блокиран за постоянно",
     "info.banned-reason-label": "Причина",
     "info.banned-no-reason": "Няма посочена причина.",
@@ -170,7 +171,7 @@
     "consent.right_to_erasure_description": "Във всеки един момент можете да оттеглите съгласието си за събиране и/или обработка на данни, като изтриете акаунта си. Вашият профил може да бъде изтрит, но публикуваното от Вас съдържание ще остане. Ако искате да изтриете както акаунта, така <strong>и</strong> съдържанието, публикувано от Вас, моля, свържете се с администрационния екип на уеб сайта.",
     "consent.right_to_data_portability": "Имате право на пренос на данни",
     "consent.right_to_data_portability_description": "Можете да изискате от нас всички събрани за Вас и акаунта Ви данни в машинен формат. Можете да направите това като натиснете съответния бутон по-долу.",
-    "consent.export_profile": "Изнасяне на профила (.csv)",
+    "consent.export_profile": "Изнасяне на профила (.json)",
     "consent.export_uploads": "Изнасяне на каченото съдържание (.zip)",
     "consent.export_posts": "Изнасяне на публикациите (.csv)"
 }

public/language/bn/admin/manage/digest.json

@@ -9,7 +9,7 @@
 	"default": "System default",
 	"default-help": "<em>System default</em> means the user has not explicitly overridden the global forum setting for digests, which is currently: &quot;<strong>%1</strong>&quot;",
 	"resend": "Resend Digest",
-	"resend-all-confirm": "Are you sure you wish to mnually execute this digest run?",
+	"resend-all-confirm": "Are you sure you wish to manually execute this digest run?",
 	"resent-single": "Manual digest resend completed",
 	"resent-day": "Daily digest resent",
 	"resent-week": "Weekly digest resent",
@@ -18,4 +18,4 @@
 	"manual-run": "Manual digest run:",
 
 	"no-delivery-data": "No delivery data found"
-}
+}

public/language/bn/admin/manage/tags.json

@@ -3,13 +3,13 @@
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",
 
 	"alerts.editing": "Editing tag(s)",

public/language/bn/admin/menu.json

@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "General",
-	"general/dashboard": "Dashboard",
-	"general/homepage": "Home Page",
-	"general/navigation": "Navigation",
-	"general/languages": "Languages",
-	"general/sounds": "Sounds",
-	"general/social": "Social",
 
 	"section-manage": "Manage",
 	"manage/categories": "Categories",
@@ -22,17 +17,22 @@
 
 	"section-settings": "Settings",
 	"settings/general": "General",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputation",
 	"settings/email": "Email",
-	"settings/user": "User",
-	"settings/group": "Group",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Guests",
 	"settings/uploads": "Uploads",
-	"settings/post": "Post",
-	"settings/chat": "Chat",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Pagination",
 	"settings/tags": "Tags",
 	"settings/notifications": "Notifications",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",

public/language/bn/admin/settings/advanced.json

@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }

public/language/bn/admin/settings/tags.json

@@ -1,5 +1,6 @@
 {
     "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
     "min-per-topic": "Minimum Tags per Topic",
     "max-per-topic": "Maximum Tags per Topic",
     "min-length": "Minimum Tag Length",

public/language/bn/flags.json

@@ -27,7 +27,7 @@
 	"filter-cid-all": "All categories",
 	"apply-filters": "Apply Filters",
 
-	"quick-links": "Quick Links",
+	"quick-actions": "Quick Actions",
 	"flagged-user": "Flagged User",
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
@@ -40,7 +40,7 @@
 	"add-note": "Add Note",
 	"no-notes": "No shared notes.",
 
-	"history": "Flag History",
+	"history": "Account & Flag History",
 	"back": "Back to Flags List",
 	"no-history": "No flag history.",
 

public/language/bn/global.json

@@ -53,6 +53,7 @@
     "posts": "পোস্টগুলি",
     "best": "Best",
     "votes": "Votes",
+    "voters": "Voters",
     "upvoters": "Upvoters",
     "upvoted": "Upvoted",
     "downvoters": "Downvoters",

public/language/bn/notifications.json

@@ -35,6 +35,7 @@
     "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
     "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
+    "user_edited_post": "<strong>%1</strong> has edited a post in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> আপনাকে অনুসরন করা শুরু করেছেন।",
     "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
     "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
@@ -53,6 +54,7 @@
     "notificationType_upvote": "When someone upvotes your post",
     "notificationType_new-topic": "When someone you follow posts a topic",
     "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_post-edit": "When a post is edited in a topic you are watching",
     "notificationType_follow": "When someone starts following you",
     "notificationType_new-chat": "When you receive a chat message",
     "notificationType_group-invite": "When you receive a group invite",

public/language/bn/user.json

@@ -144,6 +144,7 @@
     "info.ban-history": "Recent Ban History",
     "info.no-ban-history": "This user has never been banned",
     "info.banned-until": "Banned until %1",
+    "info.banned-expiry": "Expiry",
     "info.banned-permanently": "Banned permanently",
     "info.banned-reason-label": "Reason",
     "info.banned-no-reason": "No reason given.",
@@ -170,7 +171,7 @@
     "consent.right_to_erasure_description": "At any time, you are able to revoke your consent to data collection and/or processing by deleting your account. Your individual profile can be deleted, although your posted content will remain. If you wish to delete both your account <strong>and</strong> your content, please contact the administrative team for this website.",
     "consent.right_to_data_portability": "You have the Right to Data Portability",
     "consent.right_to_data_portability_description": "You may request from us a machine-readable export of any collected data about you and your account. You can do so by clicking the appropriate button below.",
-    "consent.export_profile": "Export Profile (.csv)",
+    "consent.export_profile": "Export Profile (.json)",
     "consent.export_uploads": "Export Uploaded Content (.zip)",
     "consent.export_posts": "Export Posts (.csv)"
 }

public/language/cs/admin/manage/digest.json

@@ -9,7 +9,7 @@
 	"default": "Výchozí systémové",
 	"default-help": "Výchozí systémové znamená, že uživatel nemůže přenastavit celkové nastavení pravidel na fóru pro odesílání přehledů, které je momentálně<strong>%1</strong>",
 	"resend": "Znovu odeslat přehled",
-	"resend-all-confirm": "Jste si jist/a, že chcete ručně spustit odeslání přehledu",
+	"resend-all-confirm": "Are you sure you wish to manually execute this digest run?",
 	"resent-single": "Manuální znovu poslání přehledu bylo dokončeno",
 	"resent-day": "Znovu odeslat denní přehled",
 	"resent-week": "Znovu odeslat týdenní přehled",
@@ -18,4 +18,4 @@
 	"manual-run": "Spustit manuálně přehled:",
 
 	"no-delivery-data": "Žádná data odeslání nebyla nalezena"
-}
+}

public/language/cs/admin/manage/tags.json

@@ -3,13 +3,13 @@
 	"bg-color": "Barva pozadí",
 	"text-color": "Barva textu",
 	"create-modify": "Vytvořit a upravit značky",
-	"description": "Vyberte značky pomocí kliknutí a/nebo přetažením, pro vícenásobný výběr, použijte klávesu Shift.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Vytvořit značku",
 	"modify": "Upravit značky",
 	"rename": "Přejmenovat značky",
 	"delete": "Odstranit vybrané značky",
 	"search": "Hledat značky...",
-	"settings": "Pro přejití na stránku s nastavením značek, klikněte <a href=\"%1\">zde</a>.",
+	"settings": "Tags Settings",
 	"name": "Název značky",
 
 	"alerts.editing": "Editing tag(s)",

public/language/cs/admin/menu.json

@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "Všeobecné",
-	"general/dashboard": "Nástěnka",
-	"general/homepage": "Domovská stránka",
-	"general/navigation": "Navigace",
-	"general/languages": "Jazyky",
-	"general/sounds": "Zvuky",
-	"general/social": "Sociální",
 
 	"section-manage": "Spravovat",
 	"manage/categories": "Kategorie",
@@ -22,17 +17,22 @@
 
 	"section-settings": "Nastavení",
 	"settings/general": "Všeobecné",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputace",
 	"settings/email": "E-mail",
-	"settings/user": "Uživatel",
-	"settings/group": "Skupina",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Hosté",
 	"settings/uploads": "Nahrané",
-	"settings/post": "Příspěvěk",
-	"settings/chat": "Konverzace",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Stránkování",
 	"settings/tags": "Značky",
 	"settings/notifications": "Oznámení",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Webový prohledávač",
 	"settings/sockets": "Sockety",

public/language/cs/admin/settings/advanced.json

@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Hranice prodlevy smyčky události (v milisekundách)",
 	"traffic.event-lag-help": "Snížení této hodnoty sníží čas pro načtení stránky, ale taky zobrazí více uživatelům zprávu o „přetížení stránek”. (je vyžadován restart)",
 	"traffic.lag-check-interval": "Kontrola intervalů (v milisekundách)",
-	"traffic.lag-check-interval-help": "Snížení této hodnoty způsobí, že NodeBB bude citlivější na zatížení načítání stránek a na kontrolu tohoto zatížení. (je vyžadován restart)"
+	"traffic.lag-check-interval-help": "Snížení této hodnoty způsobí, že NodeBB bude citlivější na zatížení načítání stránek a na kontrolu tohoto zatížení. (je vyžadován restart)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }

public/language/cs/admin/settings/tags.json

@@ -1,5 +1,6 @@
 {
     "tag": "Nastavení značky",
+    "link-to-manage": "Manage Tags",
     "min-per-topic": "Minimální počet značek/téma",
     "max-per-topic": "maximální počet značek/téma",
     "min-length": "Minimální délka značky",

public/language/cs/flags.json

@@ -27,7 +27,7 @@
 	"filter-cid-all": "Všechny kategorie",
 	"apply-filters": "Použít filtry",
 
-	"quick-links": "Rychlé odkazy",
+	"quick-actions": "Quick Actions",
 	"flagged-user": "Označený uživatel",
 	"view-profile": "Zobrazit profil",
 	"start-new-chat": "Začít novou konverzaci",
@@ -40,7 +40,7 @@
 	"add-note": "Přidat poznámku",
 	"no-notes": "Žádné sdílené poznámky.",
 
-	"history": "Historie označení",
+	"history": "Account & Flag History",
 	"back": "Zpět k seznamu označení",
 	"no-history": "Žádná historie označení.",
 

public/language/cs/global.json

@@ -53,6 +53,7 @@
     "posts": "Příspěvky",
     "best": "Nejlepší",
     "votes": "Počet hlasů",
+    "voters": "Voters",
     "upvoters": "Souhlasník",
     "upvoted": "Souhlasů",
     "downvoters": "Nesouhlasník",

public/language/cs/notifications.json

@@ -35,6 +35,7 @@
     "user_posted_to_dual": "<strong>%1</strong> a <strong>%2</strong> odpověděli na: <strong>%3</strong>",
     "user_posted_to_multiple": "<strong>%1</strong> a %2 další/ch odpověděli na <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> založil nové téma: <strong>%2</strong>",
+    "user_edited_post": "<strong>%1</strong> has edited a post in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> vás začal sledovat.",
     "user_started_following_you_dual": "<strong>%1</strong> a <strong>%2</strong> vás začali sledovat.",
     "user_started_following_you_multiple": "<strong>%1</strong> a %2 další/ch vás začali sledovat.",
@@ -53,6 +54,7 @@
     "notificationType_upvote": "Vyjádří-li někdo souhlas s vaším příspěvkem",
     "notificationType_new-topic": "Začne-li někdo sledovat příspěvky a téma",
     "notificationType_new-reply": "Bude-li přidán nový příspěvek v tématu, které sledujete",
+    "notificationType_post-edit": "When a post is edited in a topic you are watching",
     "notificationType_follow": "Začne-li vás někdo sledovat",
     "notificationType_new-chat": "Obdržíte-li novou konverzační zprávu",
     "notificationType_group-invite": "Obdržíte-li pozvání ke skupině",

public/language/cs/user.json

@@ -144,6 +144,7 @@
     "info.ban-history": "Poslední historie blokovaných",
     "info.no-ban-history": "Tento uživatel nebyl nikdy zablokován",
     "info.banned-until": "Zablokován do %1",
+    "info.banned-expiry": "Expiry",
     "info.banned-permanently": "Trvale zablokován",
     "info.banned-reason-label": "Důvod",
     "info.banned-no-reason": "Bez důvodu",
@@ -170,7 +171,7 @@
     "consent.right_to_erasure_description": "Kdykoliv můžete změnit svůj souhlas se shromažďováním dat a/nebo zpracování odstraněním vašeho účtu. Váš profil bude odstraněn, ačkoliv vaše příspěvky budou zachovány. Pokud si přejete odstranění <strong>jak účtu tak i obsahu</strong>, prosím kontaktujte správce této stránky.",
     "consent.right_to_data_portability": "Máte právo na přenositelnost dat",
     "consent.right_to_data_portability_description": "Můžete od nás požadovat strojně čitelné data, která byla sesbírána o Vás a vašem účtu. Učiníte tak kliknutím na tlačítka zobrazená níže.",
-    "consent.export_profile": "Exportovat profil (*.csv)",
+    "consent.export_profile": "Export Profile (.json)",
     "consent.export_uploads": "Exportovat nahraný obsah (*.zip)",
     "consent.export_posts": "Exportovat příspěvky (*.csv)"
 }

public/language/da/admin/manage/digest.json

@@ -9,7 +9,7 @@
 	"default": "System default",
 	"default-help": "<em>System default</em> means the user has not explicitly overridden the global forum setting for digests, which is currently: &quot;<strong>%1</strong>&quot;",
 	"resend": "Resend Digest",
-	"resend-all-confirm": "Are you sure you wish to mnually execute this digest run?",
+	"resend-all-confirm": "Are you sure you wish to manually execute this digest run?",
 	"resent-single": "Manual digest resend completed",
 	"resent-day": "Daily digest resent",
 	"resent-week": "Weekly digest resent",
@@ -18,4 +18,4 @@
 	"manual-run": "Manual digest run:",
 
 	"no-delivery-data": "No delivery data found"
-}
+}

public/language/da/admin/manage/tags.json

@@ -3,13 +3,13 @@
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",
 
 	"alerts.editing": "Editing tag(s)",

public/language/da/admin/menu.json

@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "General",
-	"general/dashboard": "Dashboard",
-	"general/homepage": "Home Page",
-	"general/navigation": "Navigation",
-	"general/languages": "Languages",
-	"general/sounds": "Sounds",
-	"general/social": "Social",
 
 	"section-manage": "Manage",
 	"manage/categories": "Categories",
@@ -22,17 +17,22 @@
 
 	"section-settings": "Settings",
 	"settings/general": "General",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputation",
 	"settings/email": "Email",
-	"settings/user": "User",
-	"settings/group": "Group",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Guests",
 	"settings/uploads": "Uploads",
-	"settings/post": "Post",
-	"settings/chat": "Chat",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Pagination",
 	"settings/tags": "Tags",
 	"settings/notifications": "Notifications",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",

public/language/da/admin/settings/advanced.json

@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }

public/language/da/admin/settings/tags.json

@@ -1,5 +1,6 @@
 {
     "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
     "min-per-topic": "Minimum Tags per Topic",
     "max-per-topic": "Maximum Tags per Topic",
     "min-length": "Minimum Tag Length",

public/language/da/flags.json

@@ -27,7 +27,7 @@
 	"filter-cid-all": "All categories",
 	"apply-filters": "Apply Filters",
 
-	"quick-links": "Quick Links",
+	"quick-actions": "Quick Actions",
 	"flagged-user": "Flagged User",
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
@@ -40,7 +40,7 @@
 	"add-note": "Add Note",
 	"no-notes": "No shared notes.",
 
-	"history": "Flag History",
+	"history": "Account & Flag History",
 	"back": "Back to Flags List",
 	"no-history": "No flag history.",
 

public/language/da/global.json

@@ -53,6 +53,7 @@
     "posts": "Indlæg",
     "best": "Bedste",
     "votes": "Votes",
+    "voters": "Voters",
     "upvoters": "Upvoters",
     "upvoted": "Syntes godt om",
     "downvoters": "Downvoters",

public/language/da/notifications.json

@@ -35,6 +35,7 @@
     "user_posted_to_dual": "<strong>%1</strong> og <strong>%2</strong> har skrevet svar til: <strong>%3</strong>",
     "user_posted_to_multiple": "<strong>%1</strong> og %2 andre har skrevet svar til: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> har oprettet en ny tråd: <strong>%2</strong>",
+    "user_edited_post": "<strong>%1</strong> has edited a post in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> har valgt at følge dig.",
     "user_started_following_you_dual": "<strong>%1</strong> og <strong>%2</strong> har valgt at følge dig.",
     "user_started_following_you_multiple": "<strong>%1</strong> og %2 har valgt at følge dig.",
@@ -53,6 +54,7 @@
     "notificationType_upvote": "When someone upvotes your post",
     "notificationType_new-topic": "When someone you follow posts a topic",
     "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_post-edit": "When a post is edited in a topic you are watching",
     "notificationType_follow": "When someone starts following you",
     "notificationType_new-chat": "When you receive a chat message",
     "notificationType_group-invite": "When you receive a group invite",

public/language/da/user.json

@@ -144,6 +144,7 @@
     "info.ban-history": "Recent Ban History",
     "info.no-ban-history": "This user has never been banned",
     "info.banned-until": "Banned until %1",
+    "info.banned-expiry": "Expiry",
     "info.banned-permanently": "Banned permanently",
     "info.banned-reason-label": "Reason",
     "info.banned-no-reason": "No reason given.",
@@ -170,7 +171,7 @@
     "consent.right_to_erasure_description": "At any time, you are able to revoke your consent to data collection and/or processing by deleting your account. Your individual profile can be deleted, although your posted content will remain. If you wish to delete both your account <strong>and</strong> your content, please contact the administrative team for this website.",
     "consent.right_to_data_portability": "You have the Right to Data Portability",
     "consent.right_to_data_portability_description": "You may request from us a machine-readable export of any collected data about you and your account. You can do so by clicking the appropriate button below.",
-    "consent.export_profile": "Export Profile (.csv)",
+    "consent.export_profile": "Export Profile (.json)",
     "consent.export_uploads": "Export Uploaded Content (.zip)",
     "consent.export_posts": "Export Posts (.csv)"
 }

public/language/de/admin/advanced/events.json

@@ -2,10 +2,10 @@
 	"events": "Ereignisse",
 	"no-events": "Es gibt keine Ereignisse",
 	"control-panel": "Ereignis-Steuerung",
-	"filters": "Filters",
-	"filters-apply": "Apply Filters",
-	"filter-type": "Event Type",
-	"filter-start": "Start Date",
-	"filter-end": "End Date",
-	"filter-perPage": "Per Page"
+	"filters": "Filter",
+	"filters-apply": "Filter anwenden",
+	"filter-type": "Ereignistyp",
+	"filter-start": "Start-Datum",
+	"filter-end": "End-Datum",
+	"filter-perPage": "Pro Seite"
 }

public/language/de/admin/manage/digest.json

@@ -9,7 +9,7 @@
 	"default": "System default",
 	"default-help": "<em>System default</em> means the user has not explicitly overridden the global forum setting for digests, which is currently: &quot;<strong>%1</strong>&quot;",
 	"resend": "Resend Digest",
-	"resend-all-confirm": "Are you sure you wish to mnually execute this digest run?",
+	"resend-all-confirm": "Are you sure you wish to manually execute this digest run?",
 	"resent-single": "Manual digest resend completed",
 	"resent-day": "Daily digest resent",
 	"resent-week": "Weekly digest resent",
@@ -18,4 +18,4 @@
 	"manual-run": "Manual digest run:",
 
 	"no-delivery-data": "No delivery data found"
-}
+}

public/language/de/admin/manage/tags.json

@@ -3,13 +3,13 @@
 	"bg-color": "Hintergrundfarbe",
 	"text-color": "Textfarbe",
 	"create-modify": "Tags erstellen & bearbeiten",
-	"description": "Tags auswählen indem Du klickst und/oder ziehst, drücke die SHIFT-Taste, um mehrere auszuwählen",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Tag erstellen",
 	"modify": "Tag bearbeiten",
 	"rename": "Tags umbenennen",
 	"delete": "Ausgewählte Tags entfernen",
 	"search": "Nach Tags suchen",
-	"settings": "Klicke <a href=\"%1\">hier</a>, um die Tag-Einstellungsseite zu öffnen.",
+	"settings": "Tags Settings",
 	"name": "Tagname",
 
 	"alerts.editing": "Editing tag(s)",

public/language/de/admin/menu.json

@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "Allgemein",
-	"general/dashboard": "Übersicht",
-	"general/homepage": "Startseite",
-	"general/navigation": "Navigation",
-	"general/languages": "Sprachen",
-	"general/sounds": "Töne",
-	"general/social": "Soziale Medien",
 
 	"section-manage": "Verwalten",
 	"manage/categories": "Kategorien",
@@ -22,17 +17,22 @@
 
 	"section-settings": "Einstellungen",
 	"settings/general": "Allgemein",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputation",
 	"settings/email": "E-Mail",
-	"settings/user": "Benutzer",
-	"settings/group": "Gruppe",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Gäste",
 	"settings/uploads": "Uploads",
-	"settings/post": "Beiträge",
-	"settings/chat": "Chat",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Seitennummerierung",
 	"settings/tags": "Tags",
 	"settings/notifications": "Benachrichtigungen",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",

public/language/de/admin/settings/advanced.json

@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Eventschleifenverzögerungsschwelle (in Millisekunden)",
 	"traffic.event-lag-help": "Das Heruntersetzen dieses Werts reduziert die Ladezeiten, aber wird auch dafür sorgen, dass die \"Übermäßige Belastung\" nachricht öfter angezeigt wird. (Neustart erforderlich)",
 	"traffic.lag-check-interval": "Prüfungsintervall (in Millisekunden)",
-	"traffic.lag-check-interval-help": "Das Heruntersetzen dieses Werts sorgt dafür, dass NodeBB empfindlicher auf Auslastungs-Spikes reagiert, aber könnte auch dafür sorgen, dass der Test zu empfindlich werden könnte. (Neustart erforderlich)"
+	"traffic.lag-check-interval-help": "Das Heruntersetzen dieses Werts sorgt dafür, dass NodeBB empfindlicher auf Auslastungs-Spikes reagiert, aber könnte auch dafür sorgen, dass der Test zu empfindlich werden könnte. (Neustart erforderlich)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }

public/language/de/admin/settings/tags.json

@@ -1,5 +1,6 @@
 {
     "tag": "Tag-Einstellungen",
+    "link-to-manage": "Manage Tags",
     "min-per-topic": "Minimale Tags pro Thema",
     "max-per-topic": "Maximale Tags pro Thema",
     "min-length": "Minimale Tag Länge",

public/language/de/flags.json

@@ -27,7 +27,7 @@
 	"filter-cid-all": "Alle Kategorien",
 	"apply-filters": "Filter anwenden",
 
-	"quick-links": "Schnellnavigation",
+	"quick-actions": "Quick Actions",
 	"flagged-user": "Gemeldeter Benutzer",
 	"view-profile": "Profil ansehen",
 	"start-new-chat": "Neuen Chat beginnen",
@@ -40,7 +40,7 @@
 	"add-note": "Notiz hinzufügen",
 	"no-notes": "Keine geteilten Notizen",
 
-	"history": "Meldungsverlauf",
+	"history": "Account & Flag History",
 	"back": "Zurück zur Meldungsliste",
 	"no-history": "Kein Meldungsverlauf",
 

public/language/de/global.json

@@ -53,6 +53,7 @@
     "posts": "Beiträge",
     "best": "Bestbewertet",
     "votes": "Stimmen",
+    "voters": "Voters",
     "upvoters": "Upvoter",
     "upvoted": "Positiv bewertet",
     "downvoters": "Downvoter",

public/language/de/notifications.json

@@ -35,6 +35,7 @@
     "user_posted_to_dual": "<strong>%1</strong> und <strong>%2</strong> haben auf <strong>%3</strong> geantwortet.",
     "user_posted_to_multiple": "<strong>%1</strong> und %2 andere Nutzer haben auf <strong>%3</strong> geantwortet.",
     "user_posted_topic": "<strong>%1</strong> hat ein neues Thema erstellt: <strong>%2</strong>",
+    "user_edited_post": "<strong>%1</strong> has edited a post in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> folgt dir jetzt.",
     "user_started_following_you_dual": "<strong>%1</strong> und <strong>%2</strong> folgen dir jetzt.",
     "user_started_following_you_multiple": "<strong>%1</strong> und %2 andere Nutzer folgen dir jetzt.",
@@ -53,6 +54,7 @@
     "notificationType_upvote": "Wenn jemand deinen beitrag positiv bewertet",
     "notificationType_new-topic": "Wenn jemand dem du folgst einen Beitrag erstellt",
     "notificationType_new-reply": "Wenn es eine neue Antwort auf ein Thema das du beobachtest gibt",
+    "notificationType_post-edit": "When a post is edited in a topic you are watching",
     "notificationType_follow": "Wenn dir jemand neues folgt",
     "notificationType_new-chat": "Wenn du eine Chat Nachricht erhältst",
     "notificationType_group-invite": "Wenn du eine Gruppeneinladung erhältst",

public/language/de/user.json

@@ -144,6 +144,7 @@
     "info.ban-history": "Sperrungsverlauf",
     "info.no-ban-history": "Dieser Benutzer wurde noch nie gesperrt",
     "info.banned-until": "Gesperrt bis zum %1",
+    "info.banned-expiry": "Expiry",
     "info.banned-permanently": "Permanent gesperrt",
     "info.banned-reason-label": "Grund",
     "info.banned-no-reason": "Kein Grund angegeben.",
@@ -170,7 +171,7 @@
     "consent.right_to_erasure_description": "Du kannst deine Zustimmung zur Datensammlung und/oder Verarbeitung von Daten jederzeit widerrufen, indem du dein Konto löschst. Dein Individuelles Profil kann gelöscht werden, jedoch blieben deine Beiträge und sonstigen Inhalte. Wenn du sowohl dein Konto <strong>sowie auch</strong> deine Inhalten löschen willst, kontaktiere bitte die Administratoren dieser Seite.",
     "consent.right_to_data_portability": "Du hast das Recht auf Datenportabilität",
     "consent.right_to_data_portability_description": "Du kannst von uns eine Maschinen-Lesbare Datei von jeglichen gesammelten Daten von dir und deinem Konto anfordern, indem du unten auf den entsprechenden Knopf drückst. ",
-    "consent.export_profile": "Profil exportieren (.csv)",
+    "consent.export_profile": "Export Profile (.json)",
     "consent.export_uploads": "Hochgeladene Dateien exportieren (.zip)",
     "consent.export_posts": "Beiträge exportieren (.csv)"
 }

public/language/el/admin/manage/digest.json

@@ -9,7 +9,7 @@
 	"default": "System default",
 	"default-help": "<em>System default</em> means the user has not explicitly overridden the global forum setting for digests, which is currently: &quot;<strong>%1</strong>&quot;",
 	"resend": "Resend Digest",
-	"resend-all-confirm": "Are you sure you wish to mnually execute this digest run?",
+	"resend-all-confirm": "Are you sure you wish to manually execute this digest run?",
 	"resent-single": "Manual digest resend completed",
 	"resent-day": "Daily digest resent",
 	"resent-week": "Weekly digest resent",
@@ -18,4 +18,4 @@
 	"manual-run": "Manual digest run:",
 
 	"no-delivery-data": "No delivery data found"
-}
+}

public/language/el/admin/manage/tags.json

@@ -3,13 +3,13 @@
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",
 
 	"alerts.editing": "Editing tag(s)",

public/language/el/admin/menu.json

@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "General",
-	"general/dashboard": "Dashboard",
-	"general/homepage": "Home Page",
-	"general/navigation": "Navigation",
-	"general/languages": "Languages",
-	"general/sounds": "Sounds",
-	"general/social": "Social",
 
 	"section-manage": "Manage",
 	"manage/categories": "Categories",
@@ -22,17 +17,22 @@
 
 	"section-settings": "Settings",
 	"settings/general": "General",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputation",
 	"settings/email": "Email",
-	"settings/user": "User",
-	"settings/group": "Group",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Guests",
 	"settings/uploads": "Uploads",
-	"settings/post": "Post",
-	"settings/chat": "Chat",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Pagination",
 	"settings/tags": "Tags",
 	"settings/notifications": "Notifications",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",

public/language/el/admin/settings/advanced.json

@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }

public/language/el/admin/settings/tags.json

@@ -1,5 +1,6 @@
 {
     "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
     "min-per-topic": "Minimum Tags per Topic",
     "max-per-topic": "Maximum Tags per Topic",
     "min-length": "Minimum Tag Length",

public/language/el/flags.json

@@ -27,7 +27,7 @@
 	"filter-cid-all": "All categories",
 	"apply-filters": "Apply Filters",
 
-	"quick-links": "Quick Links",
+	"quick-actions": "Quick Actions",
 	"flagged-user": "Flagged User",
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
@@ -40,7 +40,7 @@
 	"add-note": "Add Note",
 	"no-notes": "No shared notes.",
 
-	"history": "Flag History",
+	"history": "Account & Flag History",
 	"back": "Back to Flags List",
 	"no-history": "No flag history.",
 

public/language/el/global.json

@@ -53,6 +53,7 @@
     "posts": "Δημοσιεύσεις",
     "best": "Best",
     "votes": "Votes",
+    "voters": "Voters",
     "upvoters": "Upvoters",
     "upvoted": "Upvoted",
     "downvoters": "Downvoters",

public/language/el/notifications.json

@@ -35,6 +35,7 @@
     "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
     "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
+    "user_edited_post": "<strong>%1</strong> has edited a post in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> started following you.",
     "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
     "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
@@ -53,6 +54,7 @@
     "notificationType_upvote": "When someone upvotes your post",
     "notificationType_new-topic": "When someone you follow posts a topic",
     "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_post-edit": "When a post is edited in a topic you are watching",
     "notificationType_follow": "When someone starts following you",
     "notificationType_new-chat": "When you receive a chat message",
     "notificationType_group-invite": "When you receive a group invite",

public/language/el/user.json

@@ -144,6 +144,7 @@
     "info.ban-history": "Recent Ban History",
     "info.no-ban-history": "This user has never been banned",
     "info.banned-until": "Banned until %1",
+    "info.banned-expiry": "Expiry",
     "info.banned-permanently": "Banned permanently",
     "info.banned-reason-label": "Reason",
     "info.banned-no-reason": "No reason given.",
@@ -170,7 +171,7 @@
     "consent.right_to_erasure_description": "At any time, you are able to revoke your consent to data collection and/or processing by deleting your account. Your individual profile can be deleted, although your posted content will remain. If you wish to delete both your account <strong>and</strong> your content, please contact the administrative team for this website.",
     "consent.right_to_data_portability": "You have the Right to Data Portability",
     "consent.right_to_data_portability_description": "You may request from us a machine-readable export of any collected data about you and your account. You can do so by clicking the appropriate button below.",
-    "consent.export_profile": "Export Profile (.csv)",
+    "consent.export_profile": "Export Profile (.json)",
     "consent.export_uploads": "Export Uploaded Content (.zip)",
     "consent.export_posts": "Export Posts (.csv)"
 }

public/language/en-GB/admin/manage/digest.json

@@ -9,7 +9,7 @@
 	"default": "System default",
 	"default-help": "<em>System default</em> means the user has not explicitly overridden the global forum setting for digests, which is currently: &quot;<strong>%1</strong>&quot;",
 	"resend": "Resend Digest",
-	"resend-all-confirm": "Are you sure you wish to mnually execute this digest run?",
+	"resend-all-confirm": "Are you sure you wish to manually execute this digest run?",
 	"resent-single": "Manual digest resend completed",
 	"resent-day": "Daily digest resent",
 	"resent-week": "Weekly digest resent",
@@ -18,4 +18,4 @@
 	"manual-run": "Manual digest run:",
 
 	"no-delivery-data": "No delivery data found"
-}
+}

public/language/en-GB/admin/manage/tags.json

@@ -3,13 +3,13 @@
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",
 
 	"alerts.editing": "Editing tag(s)",

public/language/en-GB/admin/menu.json

@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "General",
-	"general/dashboard": "Dashboard",
-	"general/homepage": "Home Page",
-	"general/navigation": "Navigation",
-	"general/languages": "Languages",
-	"general/sounds": "Sounds",
-	"general/social": "Social",
 
 	"section-manage": "Manage",
 	"manage/categories": "Categories",
@@ -22,17 +17,22 @@
 
 	"section-settings": "Settings",
 	"settings/general": "General",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputation",
 	"settings/email": "Email",
-	"settings/user": "User",
-	"settings/group": "Group",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Guests",
 	"settings/uploads": "Uploads",
-	"settings/post": "Post",
-	"settings/chat": "Chat",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Pagination",
 	"settings/tags": "Tags",
 	"settings/notifications": "Notifications",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",

public/language/en-GB/admin/settings/advanced.json

@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }

public/language/en-GB/admin/settings/tags.json

@@ -1,5 +1,6 @@
 {
     "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
     "min-per-topic": "Minimum Tags per Topic",
     "max-per-topic": "Maximum Tags per Topic",
     "min-length": "Minimum Tag Length",

public/language/en-GB/flags.json

@@ -27,11 +27,14 @@
 	"filter-cid-all": "All categories",
 	"apply-filters": "Apply Filters",
 
-	"quick-links": "Quick Links",
+	"quick-actions": "Quick Actions",
 	"flagged-user": "Flagged User",
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"delete-post": "Delete Post",
+	"purge-post": "Purge Post",
+	"restore-post": "Restore Post",
 
 	"user-view": "View Profile",
 	"user-edit": "Edit Profile",
@@ -40,7 +43,7 @@
 	"add-note": "Add Note",
 	"no-notes": "No shared notes.",
 
-	"history": "Flag History",
+	"history": "Account & Flag History",
 	"back": "Back to Flags List",
 	"no-history": "No flag history.",
 

public/language/en-GB/global.json

@@ -66,6 +66,7 @@
 	"posts": "Posts",
 	"best": "Best",
 	"votes": "Votes",
+	"voters": "Voters",
 	"upvoters": "Upvoters",
 	"upvoted": "Upvoted",
 	"downvoters": "Downvoters",

public/language/en-GB/notifications.json

@@ -39,6 +39,7 @@
 	"user_posted_to_dual" : "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
 	"user_posted_to_multiple" : "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
 	"user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
+	"user_edited_post" : "<strong>%1</strong> has edited a post in <strong>%2</strong>",
 	"user_started_following_you": "<strong>%1</strong> started following you.",
 	"user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
 	"user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
@@ -59,6 +60,7 @@
 	"notificationType_upvote": "When someone upvotes your post",
 	"notificationType_new-topic": "When someone you follow posts a topic",
 	"notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+	"notificationType_post-edit": "When a post is edited in a topic you are watching",
 	"notificationType_follow": "When someone starts following you",
 	"notificationType_new-chat": "When you receive a chat message",
 	"notificationType_group-invite": "When you receive a group invite",

public/language/en-GB/user.json

@@ -161,6 +161,7 @@
 	"info.ban-history": "Recent Ban History",
 	"info.no-ban-history": "This user has never been banned",
 	"info.banned-until": "Banned until %1",
+	"info.banned-expiry": "Expiry",
 	"info.banned-permanently": "Banned permanently",
 	"info.banned-reason-label": "Reason",
 	"info.banned-no-reason": "No reason given.",
@@ -191,7 +192,7 @@
 	"consent.right_to_data_portability": "You have the Right to Data Portability",
 	"consent.right_to_data_portability_description": "You may request from us a machine-readable export of any collected data about you and your account. You can do so by clicking the appropriate button below.",
 
-	"consent.export_profile": "Export Profile (.csv)",
+	"consent.export_profile": "Export Profile (.json)",
 	"consent.export_uploads": "Export Uploaded Content (.zip)",
 	"consent.export_posts": "Export Posts (.csv)"
 }

public/language/en-US/admin/manage/digest.json

@@ -9,7 +9,7 @@
 	"default": "System default",
 	"default-help": "<em>System default</em> means the user has not explicitly overridden the global forum setting for digests, which is currently: &quot;<strong>%1</strong>&quot;",
 	"resend": "Resend Digest",
-	"resend-all-confirm": "Are you sure you wish to mnually execute this digest run?",
+	"resend-all-confirm": "Are you sure you wish to manually execute this digest run?",
 	"resent-single": "Manual digest resend completed",
 	"resent-day": "Daily digest resent",
 	"resent-week": "Weekly digest resent",
@@ -18,4 +18,4 @@
 	"manual-run": "Manual digest run:",
 
 	"no-delivery-data": "No delivery data found"
-}
+}

public/language/en-US/admin/manage/tags.json

@@ -3,13 +3,13 @@
 	"bg-color": "Background Color",
 	"text-color": "Text Color",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",
 
 	"alerts.editing": "Editing tag(s)",

public/language/en-US/admin/menu.json

@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "General",
-	"general/dashboard": "Dashboard",
-	"general/homepage": "Home Page",
-	"general/navigation": "Navigation",
-	"general/languages": "Languages",
-	"general/sounds": "Sounds",
-	"general/social": "Social",
 
 	"section-manage": "Manage",
 	"manage/categories": "Categories",
@@ -22,17 +17,22 @@
 
 	"section-settings": "Settings",
 	"settings/general": "General",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputation",
 	"settings/email": "Email",
-	"settings/user": "User",
-	"settings/group": "Group",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Guests",
 	"settings/uploads": "Uploads",
-	"settings/post": "Post",
-	"settings/chat": "Chat",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Pagination",
 	"settings/tags": "Tags",
 	"settings/notifications": "Notifications",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",

public/language/en-US/admin/settings/advanced.json

@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }

public/language/en-US/admin/settings/tags.json

@@ -1,5 +1,6 @@
 {
     "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
     "min-per-topic": "Minimum Tags per Topic",
     "max-per-topic": "Maximum Tags per Topic",
     "min-length": "Minimum Tag Length",

public/language/en-US/flags.json

@@ -27,7 +27,7 @@
 	"filter-cid-all": "All categories",
 	"apply-filters": "Apply Filters",
 
-	"quick-links": "Quick Links",
+	"quick-actions": "Quick Actions",
 	"flagged-user": "Flagged User",
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
@@ -40,7 +40,7 @@
 	"add-note": "Add Note",
 	"no-notes": "No shared notes.",
 
-	"history": "Flag History",
+	"history": "Account & Flag History",
 	"back": "Back to Flags List",
 	"no-history": "No flag history.",
 

public/language/en-US/global.json

@@ -53,6 +53,7 @@
     "posts": "Posts",
     "best": "Best",
     "votes": "Votes",
+    "voters": "Voters",
     "upvoters": "Upvoters",
     "upvoted": "Upvoted",
     "downvoters": "Downvoters",

public/language/en-US/notifications.json

@@ -35,6 +35,7 @@
     "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
     "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
+    "user_edited_post": "<strong>%1</strong> has edited a post in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> started following you.",
     "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
     "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
@@ -53,6 +54,7 @@
     "notificationType_upvote": "When someone upvotes your post",
     "notificationType_new-topic": "When someone you follow posts a topic",
     "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_post-edit": "When a post is edited in a topic you are watching",
     "notificationType_follow": "When someone starts following you",
     "notificationType_new-chat": "When you receive a chat message",
     "notificationType_group-invite": "When you receive a group invite",

public/language/en-US/user.json

@@ -144,6 +144,7 @@
     "info.ban-history": "Recent Ban History",
     "info.no-ban-history": "This user has never been banned",
     "info.banned-until": "Banned until %1",
+    "info.banned-expiry": "Expiry",
     "info.banned-permanently": "Banned permanently",
     "info.banned-reason-label": "Reason",
     "info.banned-no-reason": "No reason given.",
@@ -170,7 +171,7 @@
     "consent.right_to_erasure_description": "At any time, you are able to revoke your consent to data collection and/or processing by deleting your account. Your individual profile can be deleted, although your posted content will remain. If you wish to delete both your account <strong>and</strong> your content, please contact the administrative team for this website.",
     "consent.right_to_data_portability": "You have the Right to Data Portability",
     "consent.right_to_data_portability_description": "You may request from us a machine-readable export of any collected data about you and your account. You can do so by clicking the appropriate button below.",
-    "consent.export_profile": "Export Profile (.csv)",
+    "consent.export_profile": "Export Profile (.json)",
     "consent.export_uploads": "Export Uploaded Content (.zip)",
     "consent.export_posts": "Export Posts (.csv)"
 }

public/language/en-x-pirate/admin/manage/digest.json

@@ -9,7 +9,7 @@
 	"default": "System default",
 	"default-help": "<em>System default</em> means the user has not explicitly overridden the global forum setting for digests, which is currently: &quot;<strong>%1</strong>&quot;",
 	"resend": "Resend Digest",
-	"resend-all-confirm": "Are you sure you wish to mnually execute this digest run?",
+	"resend-all-confirm": "Are you sure you wish to manually execute this digest run?",
 	"resent-single": "Manual digest resend completed",
 	"resent-day": "Daily digest resent",
 	"resent-week": "Weekly digest resent",
@@ -18,4 +18,4 @@
 	"manual-run": "Manual digest run:",
 
 	"no-delivery-data": "No delivery data found"
-}
+}

public/language/en-x-pirate/admin/manage/tags.json

@@ -3,13 +3,13 @@
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",
 
 	"alerts.editing": "Editing tag(s)",

public/language/en-x-pirate/admin/menu.json

@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "General",
-	"general/dashboard": "Dashboard",
-	"general/homepage": "Home Page",
-	"general/navigation": "Navigation",
-	"general/languages": "Languages",
-	"general/sounds": "Sounds",
-	"general/social": "Social",
 
 	"section-manage": "Manage",
 	"manage/categories": "Categories",
@@ -22,17 +17,22 @@
 
 	"section-settings": "Settings",
 	"settings/general": "General",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputation",
 	"settings/email": "Email",
-	"settings/user": "User",
-	"settings/group": "Group",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Guests",
 	"settings/uploads": "Uploads",
-	"settings/post": "Post",
-	"settings/chat": "Chat",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Pagination",
 	"settings/tags": "Tags",
 	"settings/notifications": "Notifications",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",