chore: bump version for alpha 2

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.eslintignore

@@ -18,12 +18,3 @@ logs/
 .eslintrc
 test/files
 *.min.js
-
-/public/src/app.js
-/public/src/client.js
-/public/src/admin/admin.js
-/public/src/modules/translator.common.js
-/public/src/modules/pictureCropper.js
-/public/src/modules/ace-editor.js
-/public/src/client/account/header.js
-/public/src/client/test.js

.github/workflows/test.yaml

@@ -5,10 +5,12 @@ on:
     branches:
       - master
       - develop
+      - bootstrap5
   pull_request:
     branches:
       - master
       - develop
+      - bootstrap5
 
 defaults:
   run:
@@ -48,7 +50,7 @@ jobs:
 
     services:
       postgres:
-        image: 'postgres:10-alpine'
+        image: 'postgres:14-alpine'
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres

CHANGELOG.md

@@ -1,10 +1,36 @@
-#### v2.5.4 (2022-10-11)
+#### v2.6.0 (2022-11-23)
 
 ##### Chores
 
-*  🤔 (7240e8ce)
+* **i18n:**
+  *  fallback strings for new resources: nodebb.admin-settings-advanced (1d7dbf14)
+  *  fallback strings for new resources: nodebb.admin-settings-advanced (05b6758e)
+  *  fallback strings for new resources: nodebb.admin-settings-user, nodebb.admin-settings-email (9ad3b214)
+* **deps:**
+  *  update commitlint monorepo to v17.3.0 (#11058) (f4784205)
+  *  update dependency eslint to v8.28.0 (#11059) (d480f26b)
+  *  update dependency jsdom to v20.0.3 (#11054) (5750ded1)
+  *  update dependency jquery to v3.6.1 (#11048) (6611d44c)
+  *  update dependency eslint-config-nodebb to v0.2.1 (#11043) (07c81d5d)
+  *  update commitlint monorepo to v17.2.0 (#11026) (26be289e)
+  *  update dependency husky to v8.0.2 (#11018) (4b3978be)
+  *  update dependency eslint to v8.27.0 (#11004) (4fcef7c5)
+  *  update dependency jsdom to v20.0.2 (#11014) (a6e4fee1)
+  *  update dependency mocha to v10.1.0 (#10980) (ffa117ab)
+  *  update dependency eslint to v8.25.0 (3719233a)
+  *  update dependency jsdom to v20.0.1 (#10934) (241b7c4f)
+  *  update dependency eslint to v8.24.0 (#10922) (8bcbff33)
+  *  update commitlint monorepo (#10888) (3f30056a)
+  *  update postgres docker tag to v14 (#10829) (5aa55d29)
+  *  update dependency eslint to v8.23.1 (#10885) (0c6fb6e3)
+*  remove derpy extra changelog bits (445f09f0)
+*  incrementing version number - v2.5.8 (dec0e7de)
+*  update changelog for v2.5.8 (c9cd8975)
+*  incrementing version number - v2.5.7 (5836bf4a)
+*  incrementing version number - v2.5.6 (c7bd7dbf)
+*  incrementing version number - v2.5.5 (3509ed94)
+*  incrementing version number - v2.5.4 (e83260ca)
 *  incrementing version number - v2.5.3 (7e922936)
-*  update changelog for v2.5.3 (fdf240f6)
 *  incrementing version number - v2.5.2 (babcd17e)
 *  incrementing version number - v2.5.1 (ce3aa950)
 *  incrementing version number - v2.5.0 (01d276cb)
@@ -17,6 +43,198 @@
 *  incrementing version number - v2.3.1 (d2425942)
 *  incrementing version number - v2.3.0 (046ea120)
 
+##### New Features
+
+*  add permissions-policy header (864fe0f9)
+*  allow groups to be exempt from maintenance mode (3c85b944)
+*  add search data to filter:search.inContent (be92be4e)
+*  add relevant topic events to post objects (a584dae6)
+*  client-side hooks for navigator scroll action (135fe55b)
+*  j and k hotkeys in topic to navigate through it quickly (aeb94c32)
+*  a couple utility methods in navigator module to get and set count and index (9f9a835f)
+*  paginate recentposts.rss and (ebd7c05c)
+*  add quiet to action:settings.set (665f36b7)
+
+##### Bug Fixes
+
+*  https://github.com/NodeBB-Community/nodebb-plugin-custom-pages/issues/68 (110311b2)
+*  https://github.com/NodeBB-Community/nodebb-plugin-custom-pages/issues/68 (fc49665f)
+*  #11052, add missing await (bb82eb71)
+*  pin jquery version for all packages that include it as a subdependency (a87f64b4)
+*  #10877, define a resolution for jquery subdependency of timeago (5aaebdd3)
+*  #11044, allow banned users to post (abcfb631)
+*  check schedule privilege, closes #11032 (61090615)
+*  mixing of old and new bch syntax (1e484643)
+*  category ordering add test (61d32bde)
+*  use `--omit=dev` flag for npm instead of `--production` (53d47a58)
+*  update nav thumb on setIndex call (thx @barisusakli) (664bc5f5)
+*  do not call `navigator.update()` when `scrollToElement` is explicitly passed a new index value (b7287c1e)
+*  race condition where `navigator.update` was called when it should not be (fa643eb8)
+*  be tidier and explicitly clean up ctrl-f hotkey on topic page (5b9de0e5)
+*  listen to -d flag on cli upgrade (fe249fa5)
+*  automatically remove `lang` parameter if it matches the forum default (881c7c4d)
+* **deps:**
+  *  update socket.io packages to v4.5.4 (#11061) (709ca59d)
+  *  update dependency esbuild to v0.15.15 (#11056) (d449710e)
+  *  update dependency nodebb-theme-persona to v12.1.12 (#11057) (18eb35a1)
+  *  update dependency cropperjs to v1.5.13 (#11055) (13f3a048)
+  *  update dependency nodebb-plugin-markdown to v10.1.1 (#11047) (62a60cbf)
+  *  update dependency mongodb to v4.12.0 (#11049) (59b4d95f)
+  *  update dependency connect-pg-simple to v8 (#11033) (ca162c04)
+  *  update dependency ace-builds to v1.13.1 (#11045) (e0b9240d)
+  *  update dependency esbuild to v0.15.14 (a5355d78)
+  *  update dependency nodebb-theme-persona to v12.1.11 (2af7fd5f)
+  *  update dependency postcss to v8.4.19 (#11028) (b94bb1bf)
+  *  update dependency ace-builds to v1.13.0 (#11031) (313d0c32)
+  *  update dependency webpack to v5.75.0 (#11027) (40c9cc05)
+  *  update dependency yargs to v17.6.2 (#11025) (8d3907b5)
+  *  update dependency lru-cache to v7.14.1 (#11023) (1ea2a32b)
+  *  update dependency sharp to v0.31.2 (#11024) (51919f7a)
+  *  update dependency esbuild to v0.15.13 (#11021) (c4a1905b)
+  *  update dependency ioredis to v5.2.4 (#11022) (e144debb)
+  *  update dependency ace-builds to v1.12.5 (#11019) (de507f72)
+  *  update dependency mongodb to v4.11.0 (#10994) (9ca2482a)
+  *  update dependency autoprefixer to v10.4.13 (#11020) (35d67ad3)
+  *  update dependency nodebb-plugin-composer-default to v9.2.4 (#10998) (5a5771e1)
+  *  update dependency sanitize-html to v2.7.3 (#11008) (73a60854)
+  *  update dependency nodebb-plugin-composer-default to v9.2.3 (#10997) (ee4fde13)
+  *  update dependency esbuild to v0.15.12 (#10996) (29fddd65)
+  *  update dependency nodebb-plugin-composer-default to v9.2.2 (1fc2f1e8)
+  *  update dependency nodebb-theme-persona to v12.1.9 (6471b698)
+  *  bump composer-default (7b9e0847)
+  *  update dependency ace-builds to v1.12.3 (1e930f9d)
+  *  update dependency nodebb-theme-persona to v12.1.8 (#10982) (9900e5f4)
+  *  update dependency ace-builds to v1.12.2 (4260f0c2)
+  *  update dependency ace-builds to v1.12.1 (6485bc25)
+  *  update dependency ace-builds to v1.12.0 (#10978) (00ce8fd8)
+  *  update socket.io packages to v4.5.3 (#10977) (fb41fbe7)
+  *  update dependency nodebb-plugin-emoji to v4.0.6 (dcca3397)
+  *  update dependency esbuild to v0.15.11 (ff69c3e1)
+  *  update dependency @isaacs/ttlcache to v1.2.1 (647bbd57)
+  *  update dependency nodebb-plugin-mentions to v3.0.12 (60d0145b)
+  *  update dependency postcss to v8.4.18 (3c2a636c)
+  *  update dependency nodebb-plugin-spam-be-gone to v1.0.2 (#10958) (b68faa09)
+  *  update dependency body-parser to v1.20.1 (#10941) (0f63947b)
+  *  update dependency express to v4.18.2 (#10948) (ff53064c)
+  *  update dependency semver to v7.3.8 (#10937) (1b89b661)
+  *  update dependency nodebb-theme-persona to v12.1.7 (1873b527)
+  *  update dependency commander to v9.4.1 (#10928) (855a2bad)
+  *  update dependency postcss to v8.4.17 (#10929) (d84ee308)
+  *  update dependency nodemailer to v6.8.0 (#10925) (222ab6ae)
+  *  update dependency yargs to v17.6.0 (#10931) (7c3c3d02)
+  *  update dependency nodebb-plugin-spam-be-gone to v1.0.1 (#10912) (28d1844e)
+  *  update dependency ace-builds to v1.11.2 (#10923) (87c84fe8)
+  *  update dependency sharp to v0.31.1 (#10926) (8e23e410)
+  *  update dependency ace-builds to v1.11.1 (#10920) (ce77605a)
+  *  update dependency ace-builds to v1.11.0 (#10909) (d900fd17)
+  *  update dependency autoprefixer to v10.4.12 (#10911) (54294871)
+  *  update dependency compare-versions to v5 (#10890) (f971385b)
+  *  bump persona #10907 (846eda0a)
+  *  bump persona, #10907 (27c80d39)
+  *  update dependency mongodb to v4.10.0 (#10908) (bbe7f779)
+  *  update dependency nodebb-theme-persona to v12.1.3 (#10903) (0debc51b)
+  *  update dependency nodebb-plugin-2factor to v5.1.1 (02fe6875)
+  *  update dependency nodebb-theme-persona to v12.1.2 (425bf87b)
+  *  update dependency sanitize-html to v2.7.2 (#10893) (bfeb0368)
+  *  update dependency autoprefixer to v10.4.11 (#10892) (0758655a)
+  *  update dependency sharp to v0.31.0 (#10887) (2836be5c)
+  *  update socket.io packages to v4.5.2 (#10884) (22f3d0bb)
+  *  update dependency nodebb-plugin-2factor to v5.1.0 (#10886) (335990be)
+  *  update dependency autoprefixer to v10.4.10 (#10883) (0c2a88de)
+  *  update dependency winston to v3.8.2 (#10882) (d911a1bf)
+  *  update dependency pg to v8.8.0 (#10863) (01129a39)
+  *  update dependency nodebb-plugin-emoji to v4.0.5 (#10881) (34d243e4)
+  *  update dependency ioredis to v5.2.3 (#10861) (5e375e4a)
+  *  update dependency pg-cursor to v2.7.4 (#10862) (86b63fab)
+  *  update dependency mongodb to v4.9.1 (#10880) (5583ab95)
+  *  update dependency autoprefixer to v10.4.9 (#10879) (cc6798bb)
+  *  update dependency postcss to v8.4.16 (#10824) (8c680db5)
+  *  update dependency jquery to v3.6.1 (#10868) (6687f49b)
+  *  update dependency ace-builds to v1.10.1 (#10840) (c0c3ee01)
+  *  bump composer-default to v9.2.0 (29ddeaa1)
+
+##### Refactors
+
+*  don't prevent startup if staticDir is undefined (b34e859c)
+*  added new ajaxify method .cleanup, called before ajaxify.start. (3700174c)
+
+#### v2.5.8 (2022-11-09)
+
+##### Chores
+
+*  really fix indents this time (c2024f34)
+*  fix indents (d50512e7)
+*  add bootstrap5 to test runner for now (be5d6d29)
+*  incrementing version number - v2.5.7 (5836bf4a)
+*  update changelog for v2.5.7 (17e948ab)
+
+##### New Features
+
+*  new search hooks (b5d38bc6)
+*  add search data to filter:search.inContent (e3f21562)
+
+##### Bug Fixes
+
+*  pass csrf_token into calls to /register/abort, #11017 (2f9d8c35)
+*  check for csrf token on /register/abort, + theme changes for v2.x branches of themes (55a197a7)
+*  upgrade script to work from 0.x to 2.x (a31ba824)
+*  #10519, image height in emails (673261ff)
+*  fallback language strings for #10987 (b9c8c02f)
+*  #10993, apply autoLocale middleware to guests only (6f673f80)
+*  check cid as well as template (9227b82e)
+*  revert breaking change, add back SocketUser.emailConfirm (9ee30fe7)
+*  in appropriately named language key `email-confirm-email2` (09f3ac65)
+*  correctly pass dev flag to package installer (7672194c)
+*  use `--omit=dev` flag for npm instead of `--production` (09cfd0bd)
+
+##### Refactors
+
+*  use utils.debounce (d264c6ac)
+
+##### Tests
+
+*  fix tests again (06d15391)
+*  fix test (c833d3cd)
+
+#### v2.5.7 (2022-10-14)
+
+##### Chores
+
+*  incrementing version number - v2.5.6 (c7bd7dbf)
+*  update changelog for v2.5.6 (e92238d0)
+
+##### Performance Improvements
+
+*  speed up build (dd4e9cce)
+
+#### v2.5.6 (2022-10-13)
+
+##### Chores
+
+*  incrementing version number - v2.5.5 (3509ed94)
+*  update changelog for v2.5.5 (e7d0040d)
+
+##### Bug Fixes
+
+*  use admin:groups priv for groups (#10960) (b879b6a0)
+*  https://github.com/NodeBB/NodeBB/issues/10525 (e35b0a86)
+
+#### v2.5.5 (2022-10-11)
+
+##### Chores
+
+*  up plugins (b91ef6dd)
+*  incrementing version number - v2.5.4 (e83260ca)
+*  update changelog for v2.5.4 (aabf073c)
+
+#### v2.5.4 (2022-10-11)
+
+##### Chores
+
+*  🤔 (7240e8ce)
+*  incrementing version number - v2.5.3 (7e922936)
+*  update changelog for v2.5.3 (fdf240f6)
+
 ##### Continuous Integration
 
 *  add minimum GitHub token permissions for workflows Signed-off-by: Ashish Kurmi <akurmi@stepsecurity.io> (fe0020fb)

Gruntfile.js

@@ -54,14 +54,9 @@ module.exports = function (grunt) {
 			}
 		}
 
-		const styleUpdated_Client = pluginList.map(p => `node_modules/${p}/*.less`)
+		const styleUpdated_Client = pluginList.map(p => `node_modules/${p}/*.scss`)
 			.concat(pluginList.map(p => `node_modules/${p}/*.css`))
-			.concat(pluginList.map(p => `node_modules/${p}/+(public|static|less)/**/*.less`))
-			.concat(pluginList.map(p => `node_modules/${p}/+(public|static)/**/*.css`));
-
-		const styleUpdated_Admin = pluginList.map(p => `node_modules/${p}/*.less`)
-			.concat(pluginList.map(p => `node_modules/${p}/*.css`))
-			.concat(pluginList.map(p => `node_modules/${p}/+(public|static|less)/**/*.less`))
+			.concat(pluginList.map(p => `node_modules/${p}/+(public|static|scss)/**/*.scss`))
 			.concat(pluginList.map(p => `node_modules/${p}/+(public|static)/**/*.css`));
 
 		const clientUpdated = pluginList.map(p => `node_modules/${p}/+(public|static)/**/*.js`);
@@ -72,24 +67,15 @@ module.exports = function (grunt) {
 		const langUpdated = pluginList.map(p => `node_modules/${p}/+(public|static|languages)/**/*.json`);
 
 		grunt.config(['watch'], {
-			styleUpdated_Client: {
+			styleUpdated: {
 				files: [
-					'public/less/**/*.less',
+					'public/scss/**/*.scss',
 					...styleUpdated_Client,
 				],
 				options: {
 					interval: 1000,
 				},
 			},
-			styleUpdated_Admin: {
-				files: [
-					'public/less/**/*.less',
-					...styleUpdated_Admin,
-				],
-				options: {
-					interval: 1000,
-				},
-			},
 			clientUpdated: {
 				files: [
 					'public/src/**/*.js',
@@ -138,10 +124,9 @@ module.exports = function (grunt) {
 		});
 		const build = require('./src/meta/build');
 		if (!grunt.option('skip')) {
-			await build.build(true, { webpack: false });
+			await build.build(true, { watch: true });
 		}
 		run();
-		await build.webpack({ watch: true });
 		done();
 	});
 
@@ -168,16 +153,14 @@ module.exports = function (grunt) {
 	grunt.event.removeAllListeners('watch');
 	grunt.event.on('watch', (action, filepath, target) => {
 		let compiling;
-		if (target === 'styleUpdated_Client') {
-			compiling = 'clientCSS';
-		} else if (target === 'styleUpdated_Admin') {
-			compiling = 'acpCSS';
+		if (target === 'styleUpdated') {
+			compiling = ['clientCSS', 'acpCSS'];
 		} else if (target === 'clientUpdated') {
-			compiling = 'js';
+			compiling = ['js'];
 		} else if (target === 'templatesUpdated') {
-			compiling = 'tpl';
+			compiling = ['tpl'];
 		} else if (target === 'langUpdated') {
-			compiling = 'lang';
+			compiling = ['lang'];
 		} else if (target === 'serverUpdated') {
 			// empty require cache
 			const paths = ['./src/meta/build.js', './src/meta/index.js'];
@@ -185,7 +168,7 @@ module.exports = function (grunt) {
 			return run();
 		}
 
-		require('./src/meta/build').build([compiling], { webpack: false }, (err) => {
+		require('./src/meta/build').build(compiling, { webpack: false }, (err) => {
 			if (err) {
 				winston.error(err.stack);
 			}

README.md

@@ -3,6 +3,7 @@
 [![Workflow](https://github.com/NodeBB/NodeBB/actions/workflows/test.yaml/badge.svg)](https://github.com/NodeBB/NodeBB/actions/workflows/test.yaml)
 [![Coverage Status](https://coveralls.io/repos/github/NodeBB/NodeBB/badge.svg?branch=master)](https://coveralls.io/github/NodeBB/NodeBB?branch=master)
 [![Code Climate](https://codeclimate.com/github/NodeBB/NodeBB/badges/gpa.svg)](https://codeclimate.com/github/NodeBB/NodeBB)
+[![](https://dcbadge.vercel.app/api/server/p6YKPXu7er?style=flat)](https://discord.gg/p6YKPXu7er)
 
 [**NodeBB Forum Software**](https://nodebb.org) is powered by Node.js and supports either Redis, MongoDB, or a PostgreSQL database. It utilizes web sockets for instant interactions and real-time notifications. NodeBB takes the best of the modern web: real-time streaming discussions, mobile responsiveness, and rich RESTful read/write APIs, while staying true to the original bulletin board/forum format → categorical hierarchies, local user accounts, and asynchronous messaging.
 

install/data/defaults.json

@@ -25,6 +25,7 @@
     "postQueue": 0,
     "postQueueReputationThreshold": 0,
     "groupsExemptFromPostQueue": ["administrators", "Global Moderators"],
+    "groupsExemptFromMaintenanceMode": ["administrators", "Global Moderators"],
     "minimumPostLength": 8,
     "maximumPostLength": 32767,
     "systemTags": "",
@@ -146,6 +147,7 @@
     "maximumRelatedTopics": 0,
     "disableEmailSubscriptions": 0,
     "emailConfirmInterval": 10,
+    "emailConfirmExpiry": 24,
     "removeEmailNotificationImages": 0,
     "sendValidationEmail": 1,
     "includeUnverifiedEmails": 0,

install/data/navigation.json

@@ -4,7 +4,7 @@
 		"title": "[[global:header.categories]]",
 		"enabled": true,
 		"iconClass": "fa-list",
-		"textClass": "visible-xs-inline",
+		"textClass": "d-lg-none",
 		"text": "[[global:header.categories]]"
 	},
 	{
@@ -13,7 +13,7 @@
 		"title": "[[global:header.unread]]",
 		"enabled": true,
 		"iconClass": "fa-inbox",
-		"textClass": "visible-xs-inline",
+		"textClass": "d-lg-none",
 		"text": "[[global:header.unread]]",
 		"groups": ["registered-users"]
 	},
@@ -22,7 +22,7 @@
 		"title": "[[global:header.recent]]",
 		"enabled": true,
 		"iconClass": "fa-clock-o",
-		"textClass": "visible-xs-inline",
+		"textClass": "d-lg-none",
 		"text": "[[global:header.recent]]"
 	},
 	{
@@ -30,7 +30,7 @@
 		"title": "[[global:header.tags]]",
 		"enabled": true,
 		"iconClass": "fa-tags",
-		"textClass": "visible-xs-inline",
+		"textClass": "d-lg-none",
 		"text": "[[global:header.tags]]"
 	},
 	{
@@ -38,7 +38,7 @@
 		"title": "[[global:header.popular]]",
 		"enabled": true,
 		"iconClass": "fa-fire",
-		"textClass": "visible-xs-inline",
+		"textClass": "d-lg-none",
 		"text": "[[global:header.popular]]"
 	},
 	{
@@ -46,7 +46,7 @@
 		"title": "[[global:header.users]]",
 		"enabled": true,
 		"iconClass": "fa-user",
-		"textClass": "visible-xs-inline",
+		"textClass": "d-lg-none",
 		"text": "[[global:header.users]]"
 	},
 	{
@@ -54,7 +54,7 @@
 		"title": "[[global:header.groups]]",
 		"enabled": true,
 		"iconClass": "fa-group",
-		"textClass": "visible-xs-inline",
+		"textClass": "d-lg-none",
 		"text": "[[global:header.groups]]"
 	},
 	{
@@ -62,7 +62,7 @@
 		"title": "[[global:header.admin]]",
 		"enabled": true,
 		"iconClass": "fa-cogs",
-		"textClass": "visible-xs-inline",
+		"textClass": "d-lg-none",
 		"text": "[[global:header.admin]]",
 		"groups": ["administrators"]
 	}

install/package.json

@@ -2,8 +2,8 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "2.5.5",
-    "homepage": "http://www.nodebb.org",
+    "version": "3.0.0-alpha.2",
+    "homepage": "https://www.nodebb.org",
     "repository": {
         "type": "git",
         "url": "https://github.com/NodeBB/NodeBB/"
@@ -29,36 +29,39 @@
     },
     "dependencies": {
         "@adactive/bootstrap-tagsinput": "0.8.2",
-        "@isaacs/ttlcache": "1.2.0",
-        "ace-builds": "1.9.5",
+        "@isaacs/ttlcache": "1.2.1",
+        "@popperjs/core": "2.11.6",
+        "ace-builds": "1.13.1",
         "archiver": "5.3.1",
         "async": "3.2.4",
-        "autoprefixer": "10.4.8",
+        "autoprefixer": "10.4.13",
         "bcryptjs": "2.4.3",
         "benchpressjs": "2.4.3",
-        "body-parser": "1.20.0",
-        "bootbox": "5.5.3",
-        "bootstrap": "3.4.1",
+        "body-parser": "1.20.1",
+        "bootbox": "https://github.com/makeusabrew/bootbox.git#v6-wip",
+        "bootstrap": "5.2.2",
+        "bootswatch": "5.2.2",
         "chalk": "4.1.2",
         "chart.js": "2.9.4",
         "cli-graph": "3.2.2",
         "clipboard": "2.0.11",
         "colors": "1.4.0",
-        "commander": "9.4.0",
-        "compare-versions": "4.1.4",
+        "commander": "9.4.1",
+        "compare-versions": "5.0.1",
         "compression": "1.7.4",
         "connect-flash": "0.1.1",
         "connect-mongo": "4.6.0",
         "connect-multiparty": "2.2.0",
-        "connect-pg-simple": "7.0.0",
+        "connect-pg-simple": "8.0.0",
         "connect-redis": "6.1.3",
         "cookie-parser": "1.4.6",
         "cron": "2.1.0",
-        "cropperjs": "1.5.12",
+        "cropperjs": "1.5.13",
         "csurf": "1.11.0",
         "daemon": "1.1.0",
         "diff": "5.1.0",
-        "express": "4.18.1",
+        "esbuild": "0.15.15",
+        "express": "4.18.2",
         "express-session": "1.17.3",
         "express-useragent": "1.0.15",
         "file-loader": "6.2.0",
@@ -67,7 +70,7 @@
         "helmet": "5.1.1",
         "html-to-text": "8.2.1",
         "ipaddr.js": "2.0.1",
-        "jquery": "3.6.0",
+        "jquery": "3.6.1",
         "jquery-deserialize": "2.0.0",
         "jquery-form": "4.3.0",
         "jquery-serializeobject": "1.0.0",
@@ -78,91 +81,98 @@
         "less": "4.1.3",
         "lodash": "4.17.21",
         "logrotate-stream": "0.2.8",
-        "lru-cache": "7.14.0",
+        "lru-cache": "7.14.1",
         "material-design-lite": "1.3.0",
         "mime": "3.0.0",
         "mkdirp": "1.0.4",
-        "mongodb": "4.9.0",
+        "mongodb": "4.12.1",
         "morgan": "1.10.0",
         "mousetrap": "1.6.5",
         "multiparty": "4.2.3",
-        "@nodebb/bootswatch": "3.4.2",
         "nconf": "0.12.0",
-        "nodebb-plugin-2factor": "5.0.2",
-        "nodebb-plugin-composer-default": "9.1.1",
-        "nodebb-plugin-dbsearch": "5.1.5",
-        "nodebb-plugin-emoji": "4.0.6",
-        "nodebb-plugin-emoji-android": "3.0.0",
-        "nodebb-plugin-markdown": "10.1.0",
-        "nodebb-plugin-mentions": "3.0.12",
-        "nodebb-plugin-spam-be-gone": "1.0.2",
+        "nodebb-plugin-2factor": "6.0.3",
+        "nodebb-plugin-composer-default": "10.0.16",
+        "nodebb-plugin-dbsearch": "6.0.0",
+        "nodebb-plugin-emoji": "5.0.3",
+        "nodebb-plugin-emoji-android": "4.0.0",
+        "nodebb-plugin-markdown": "11.0.2",
+        "nodebb-plugin-mentions": "4.0.2",
+        "nodebb-plugin-spam-be-gone": "2.0.4",
         "nodebb-rewards-essentials": "0.2.1",
-        "nodebb-theme-lavender": "6.0.0",
-        "nodebb-theme-persona": "12.1.1",
-        "nodebb-theme-slick": "2.0.2",
-        "nodebb-theme-vanilla": "12.1.18",
-        "nodebb-widget-essentials": "6.0.0",
-        "nodemailer": "6.7.8",
+        "nodebb-theme-lavender": "7.0.2",
+        "nodebb-theme-peace": "2.0.8",
+        "nodebb-theme-persona": "13.0.28",
+        "nodebb-widget-essentials": "7.0.2",
+        "nodemailer": "6.8.0",
         "nprogress": "0.2.0",
         "passport": "0.6.0",
         "passport-http-bearer": "1.0.1",
         "passport-local": "1.0.0",
-        "pg": "8.7.3",
-        "pg-cursor": "2.7.3",
-        "postcss": "8.4.14",
+        "pg": "8.8.0",
+        "pg-cursor": "2.7.4",
+        "postcss": "8.4.19",
         "postcss-clean": "1.2.0",
+        "progress-webpack-plugin": "1.0.16",
         "prompt": "1.3.0",
-        "ioredis": "5.2.2",
+        "ioredis": "5.2.4",
         "request": "2.88.2",
         "request-promise-native": "1.0.9",
         "rimraf": "3.0.2",
         "rss": "1.2.2",
-        "sanitize-html": "2.7.1",
-        "semver": "7.3.7",
+        "rtlcss": "4.0.0",
+        "sanitize-html": "2.7.3",
+        "sass": "1.54.9",
+        "semver": "7.3.8",
         "serve-favicon": "2.5.0",
-        "sharp": "0.30.7",
+        "sharp": "0.31.2",
         "sitemap": "7.1.1",
         "slideout": "1.0.1",
-        "socket.io": "4.5.1",
-        "socket.io-client": "4.5.1",
+        "socket.io": "4.5.4",
+        "socket.io-client": "4.5.4",
         "@socket.io/redis-adapter": "7.2.0",
         "sortablejs": "1.15.0",
         "spdx-license-list": "6.6.0",
         "spider-detector": "2.0.0",
+        "terser-webpack-plugin": "5.3.6",
         "textcomplete": "0.18.2",
         "textcomplete.contenteditable": "0.1.1",
         "timeago": "1.6.7",
         "tinycon": "0.6.8",
         "toobusy-js": "0.5.1",
-        "uglify-es": "3.3.9",
         "validator": "13.7.0",
-        "webpack": "5.74.0",
+        "webpack": "5.75.0",
         "webpack-merge": "5.8.0",
-        "winston": "3.8.1",
+        "winston": "3.8.2",
         "xml": "1.0.1",
         "xregexp": "5.1.1",
-        "yargs": "17.5.1",
+        "yargs": "17.6.2",
         "zxcvbn": "4.4.2"
     },
     "devDependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@commitlint/cli": "17.0.3",
-        "@commitlint/config-angular": "17.0.3",
+        "@commitlint/cli": "17.3.0",
+        "@commitlint/config-angular": "17.3.0",
         "coveralls": "3.1.1",
-        "eslint": "8.22.0",
-        "eslint-config-nodebb": "0.1.1",
+        "eslint": "8.28.0",
+        "eslint-config-nodebb": "0.2.1",
         "eslint-plugin-import": "2.26.0",
         "grunt": "1.5.3",
         "grunt-contrib-watch": "1.1.0",
-        "husky": "8.0.1",
-        "jsdom": "20.0.0",
+        "husky": "8.0.2",
+        "jsdom": "20.0.3",
         "lint-staged": "13.0.3",
-        "mocha": "10.0.0",
+        "mocha": "10.1.0",
         "mocha-lcov-reporter": "1.3.0",
         "mockdate": "3.0.5",
         "nyc": "15.1.0",
         "smtp-server": "3.11.0"
     },
+    "optionalDependencies": {
+        "sass-embedded": "1.55.0"
+    },
+    "resolutions": {
+        "*/jquery": "3.6.1"
+    },
     "bugs": {
         "url": "https://github.com/NodeBB/NodeBB/issues"
     },
@@ -170,11 +180,6 @@
         "node": ">=12"
     },
     "maintainers": [
-        {
-            "name": "Andrew Rodrigues",
-            "email": "andrew@nodebb.org",
-            "url": "https://github.com/psychobunny"
-        },
         {
             "name": "Julian Lam",
             "email": "julian@nodebb.org",
@@ -186,4 +191,4 @@
             "url": "https://github.com/barisusakli"
         }
     ]
-}
+}

install/web.js

@@ -6,7 +6,6 @@ const bodyParser = require('body-parser');
 const fs = require('fs');
 const path = require('path');
 const childProcess = require('child_process');
-const less = require('less');
 
 const webpack = require('webpack');
 const nconf = require('nconf');
@@ -14,6 +13,7 @@ const nconf = require('nconf');
 const Benchpress = require('benchpressjs');
 const mkdirp = require('mkdirp');
 const { paths } = require('../src/constants');
+const sass = require('../src/utils').getSass();
 
 const app = express();
 let server;
@@ -73,7 +73,7 @@ web.install = async function (port) {
 	try {
 		await Promise.all([
 			compileTemplate(),
-			compileLess(),
+			compileSass(),
 			runWebpack(),
 			copyCSS(),
 			loadDefaults(),
@@ -247,23 +247,28 @@ async function compileTemplate() {
 	]);
 }
 
-async function compileLess() {
+async function compileSass() {
 	try {
-		const installSrc = path.join(__dirname, '../public/less/install.less');
+		const installSrc = path.join(__dirname, '../public/scss/install.scss');
 		const style = await fs.promises.readFile(installSrc);
-		const css = await less.render(String(style), { filename: path.resolve(installSrc) });
-		await fs.promises.writeFile(path.join(__dirname, '../public/installer.css'), css.css);
+		const scssOutput = sass.compileString(String(style), {
+			loadPaths: [
+				path.join(__dirname, '../public/scss'),
+			],
+		});
+
+		await fs.promises.writeFile(path.join(__dirname, '../public/installer.css'), scssOutput.css.toString());
 	} catch (err) {
-		winston.error(`Unable to compile LESS: \n${err.stack}`);
+		winston.error(`Unable to compile SASS: \n${err.stack}`);
 		throw err;
 	}
 }
 
 async function copyCSS() {
-	const src = await fs.promises.readFile(
-		path.join(__dirname, '../node_modules/bootstrap/dist/css/bootstrap.min.css'), 'utf8'
+	await fs.promises.copyFile(
+		path.join(__dirname, '../node_modules/bootstrap/dist/css/bootstrap.min.css'),
+		path.join(__dirname, '../public/bootstrap.min.css'),
 	);
-	await fs.promises.writeFile(path.join(__dirname, '../public/bootstrap.min.css'), src);
 }
 
 async function loadDefaults() {

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.",
 	"maintenance-mode.status": "Maintenance Mode Status Code",
 	"maintenance-mode.message": "Maintenance Message",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode",
 	"headers": "Headers",
 	"headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame",
 	"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "When enabled (default), will set the header to <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "Enabled HSTS (recommended)",
 	"hsts.maxAge": "HSTS Max Age",

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "المصادقة",
 	"email-confirm-interval": "لا يمكن للمستخدم إعادة إرسال رسالة تأكيد البريد الالكتروني حتى مرور",
-	"email-confirm-email2": "دقائق",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "السماح بتسجيل الدخول باستخدام",
 	"allow-login-with.username-email": "اسم المستخدم أو البريد الالكتروني",
 	"allow-login-with.username": "اسم المستخدم فقط",

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "Когато форумът е в режим на профилактика, всички заявки ще бъдат пренасочвани към статична страница за изчакване, с изключение на администраторите, които ще могат да използват уеб сайта нормално.",
 	"maintenance-mode.status": "Код на състоянието за режима на профилактика",
 	"maintenance-mode.message": "Съобщение за профилактиката",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Изберете групи, които да бъдат изключени от режима на профилактика",
 	"headers": "Заглавни части",
 	"headers.allow-from": "Задайте „ALLOW-FROM“, за да поставите NodeBB в „iFrame“",
 	"headers.csp-frame-ancestors": "Задайте заглавката „Content-Security-Policy frame-ancestors“ за да поставите NodeBB „iFrame“",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "Когато е включено (по подразбиране), стойността на заглавката ще бъде <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Стриктна транспортна сигурност",
 	"hsts.enabled": "Включване на HSTS (препоръчително)",
 	"hsts.maxAge": "Максимална възраст на HSTS",

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

@@ -5,6 +5,9 @@
 	"from": "Име за полето „От“",
 	"from-help": "Името на изпращача, което да бъде показано в е-писмото.",
 
+	"confirmation-settings": "Потвърждение",
+	"confirmation.expiry": "Продължителност на давността на връзката за потвърждаване, в часове",
+
 	"smtp-transport": "Транспорт чрез SMTP",
 	"smtp-transport.enabled": "Включване на транспорта чрез SMTP",
 	"smtp-transport-help": "Можете да изберете от списък от познати услуги, или да въведете такава ръчно.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Удостоверяване",
 	"email-confirm-interval": "Потребителят не може да изпраща повторно е-писмото за потвърждение, преди да са минали",
-	"email-confirm-email2": "минути",
+	"email-confirm-interval2": "минути са изминали",
 	"allow-login-with": "Позволяване на вписването чрез",
 	"allow-login-with.username-email": "Потребителско име или е-поща",
 	"allow-login-with.username": "Само потребителско име",

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.",
 	"maintenance-mode.status": "Maintenance Mode Status Code",
 	"maintenance-mode.message": "Maintenance Message",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode",
 	"headers": "Headers",
 	"headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame",
 	"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "When enabled (default), will set the header to <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "Enabled HSTS (recommended)",
 	"hsts.maxAge": "HSTS Max Age",

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "Je-li fórum v režimu údržby, všechny požadavky budou přesměrovány na statickou stránku. Správci jsou vyloučeni z tohoto přesměrování a budou mít normálně zobrazené stránky.",
 	"maintenance-mode.status": "Stavový kód režimu údržby",
 	"maintenance-mode.message": "Zpráva údržby",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode",
 	"headers": "Hlavičky",
 	"headers.allow-from": "Nastavte ALLOW-FROM pro umístění NodeBB do iFrame",
 	"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "When enabled (default), will set the header to <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Přísné zabezpečení přenosu",
 	"hsts.enabled": "Povolit HSTS (doporučeno)",
 	"hsts.maxAge": "HSTS Max Age",

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

@@ -5,6 +5,9 @@
 	"from": "Jméno – od",
 	"from-help": "Zobrazené jméno v e-mailu v – Od",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "Přenos SMTP",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "Ze seznamu můžete vybrat známé služby nebo zadat vlastní.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Ověření",
 	"email-confirm-interval": "Uživatel nesmí požádat o znovu zaslání potvrzujícího e-mailu do",
-	"email-confirm-email2": "minut uplynulo",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Povolit přihlášení pomocí",
 	"allow-login-with.username-email": "Uživatelské jméno nebo e-mail",
 	"allow-login-with.username": "Pouze uživatelské jméno",

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.",
 	"maintenance-mode.status": "Maintenance Mode Status Code",
 	"maintenance-mode.message": "Maintenance Message",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode",
 	"headers": "Headers",
 	"headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame",
 	"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "When enabled (default), will set the header to <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "Enabled HSTS (recommended)",
 	"hsts.maxAge": "HSTS Max Age",

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

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

@@ -1,8 +1,8 @@
 {
 	"post-cache": "Post-Cache",
-	"group-cache": "Group Cache",
-	"local-cache": "Local Cache",
-	"object-cache": "Object Cache",
+	"group-cache": "Gruppen-Cache",
+	"local-cache": "Lokaler Cache",
+	"object-cache": "Objekt-Cache",
 	"percent-full": "%1% Voll",
 	"post-cache-size": "Post-Cache-Größe",
 	"items-in-cache": "Elemente im Cache"

public/language/de/admin/menu.json

@@ -76,7 +76,7 @@
 	"logout": "Abmelden",
 	"view-forum": "Forum anzeigen",
 
-	"search.placeholder": "Search settings",
+	"search.placeholder": "Nach Einstellungen suchen",
 	"search.no-results": "Keine Ergebnisse...",
 	"search.search-forum": "Suche im Forum nach <strong></strong>",
 	"search.keep-typing": "Gib mehr ein, um die Ergebnisse zu sehen...",

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "Wenn sich das Forum im Wartungsmodus befindet, werden alle Anfragen auf eine statische Warteseite umgeleitet. Administratoren sind von dieser Umleitung ausgenommen und können normal auf die Site zugreifen.",
 	"maintenance-mode.status": "Statuscode für Wartungsmodus",
 	"maintenance-mode.message": "Wartungsnachricht",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode",
 	"headers": "Headers",
 	"headers.allow-from": "ALLOW-FROM setzen um NodeBB in einem iFrame zu platzieren",
 	"headers.csp-frame-ancestors": "Content-Security-Policy frame-ancestors header setzen, um NodeBB in einem iFrame zu platzieren",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "Wenn aktiviert (Standard), wird der Header auf <code>require-corp</code> gesetzt",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "HSTS Aktivieren (empfohlen)",
 	"hsts.maxAge": "HSTS Maximales Alter",

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

@@ -5,6 +5,9 @@
 	"from": "Name des Absenders",
 	"from-help": "Der Name des Absenders, welcher in der E-Mail angezeigt werden soll.",
 
+	"confirmation-settings": "Konfirmation",
+	"confirmation.expiry": "Stunden, um den E-Mail-Bestätigungslink gültig zu halten",
+
 	"smtp-transport": "SMTP Konfiguration",
 	"smtp-transport.enabled": "SMTP-Transport aktivieren",
 	"smtp-transport-help": "Du kannst aus einer Liste bekannter Email-Provider auswählen, oder einen benutzerdefinierten eingeben.",

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

@@ -51,7 +51,7 @@
 	"signature.disable": "Signaturen deaktivieren",
 	"signature.no-links": "Links in signaturen deaktivieren",
 	"signature.no-images": "Bilder in Signaturen deaktivieren",
-	"signature.hide-duplicates": "Hide duplicate signatures in topics",
+	"signature.hide-duplicates": "Doppelte Signaturen in Themen ausblenden",
 	"signature.max-length": "Maximale Signaturlänge",
 	"composer": "Editor Einstellungen",
 	"composer-help": "Die folgenden Einstellungen bestimmen die funktionalität und/oder das Aussehen des Beitragseditors, der Nutzern angezeigt wird, webb sie neue Themen erstellen, oder bereits existierenden Antworten.",

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

@@ -24,8 +24,8 @@
 	"flags.limit-per-target-help": "Wenn ein Beitrag oder ein Benutzer mehrfach markiert wird, wird jede zusätzliche Markierung als "Nachricht" betrachtet und zur ursprünglichen Markierung hinzugezählt. Setzen Sie diese Option auf eine andere Zahl als Null, um die Anzahl der Nachricht, die ein Artikel erhalten kann, zu begrenzen.",
   	"flags.auto-flag-on-downvote-threshold": "Anzahl der Downvotes für Posts mit automatischer Markierung (zum Deaktivieren auf 0 setzen, Standard: 0)",
 	"flags.auto-resolve-on-ban": "Automatisches Beenden aller Tickets eines Benutzers, wenn dieser gesperrt wird",
-	"flags.action-on-resolve": "Do the following when a flag is resolved",
-	"flags.action-on-reject": "Do the following when a flag is rejected",
-	"flags.action.nothing": "Do nothing",
-	"flags.action.rescind": "Rescind the notification send to moderators/administrators"
+	"flags.action-on-resolve": "Führe Folgendes aus, wenn eine Flagge aufgelöst wird",
+	"flags.action-on-reject": "Gehe folgendermaßen vor, wenn eine Flagge abgelehnt wird",
+	"flags.action.nothing": "Nichts tun",
+	"flags.action.rescind": "Aufhebung der Benachrichtigung an Moderatoren/Administratoren"
 }

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentifizierung",
 	"email-confirm-interval": "Der Benutzer kann für ",
-	"email-confirm-email2": "  Minuten keine Bestätigungsmail erneut senden.",
+	"email-confirm-interval2": "Minuten sind verstrichen",
 	"allow-login-with": "Erlaube Login mit",
 	"allow-login-with.username-email": "Benutzername oder E-Mail",
 	"allow-login-with.username": "Nur Benutzername",

public/language/de/error.json

@@ -205,8 +205,8 @@
     "no-connection": "Es scheint als gäbe es ein Problem mit deiner Internetverbindung",
     "socket-reconnect-failed": "Der Server kann zurzeit nicht erreicht werden. Klicken Sie hier, um es erneut zu versuchen, oder versuchen Sie es später erneut",
     "plugin-not-whitelisted": "Plugin kann nicht installiert werden – nur Plugins, die vom NodeBB Package Manager in die Whitelist aufgenommen wurden, können über den ACP installiert werden",
-    "plugins-set-in-configuration": "You are not allowed to change plugin state as they are defined at runtime (config.json, environmental variables or terminal arguments), please modify the configuration instead.",
-    "theme-not-set-in-configuration": "When defining active plugins in configuration, changing themes requires adding the new theme to the list of active plugins before updating it in the ACP",
+    "plugins-set-in-configuration": "Du darfst den Status der Plugins nicht ändern, da sie zur Laufzeit definiert werden (config.json, Umgebungsvariablen oder Terminalargumente). Bitte ändere stattdessen die Konfiguration.",
+    "theme-not-set-in-configuration": "Wenn in der Konfiguration aktive Plugins definiert werden, muss bei einem Themenwechsel das neue Thema zur Liste der aktiven Plugins hinzugefügt werden, bevor es im ACP aktualisiert wird.",
     "topic-event-unrecognized": "Themenereignis „%1“ nicht erkannt",
     "cant-set-child-as-parent": "Untergeordnete Kategorie kann nicht als übergeordnete Kategorie festgelegt werden",
     "cant-set-self-as-parent": "Die aktuelle Kategorie kann nicht als übergeordnete Kategorie festgelegt werden",

public/language/de/global.json

@@ -18,7 +18,7 @@
     "posting_restriction_info": "Nur registrierte Mitglieder dürfen Beiträge verfassen. Hier klicken zum Anmelden.",
     "welcome_back": "Willkommen zurück",
     "you_have_successfully_logged_in": "Du hast dich erfolgreich angemeldet",
-    "save_changes": "Speichere Änderungen",
+    "save_changes": "Änderungen speichern",
     "save": "Speichern",
     "close": "Schließen",
     "pagination": "Seitennummerierung",

public/language/de/modules.json

@@ -1,5 +1,5 @@
 {
-    "chat.chatting_with": "Chat mit",
+    "chat.chatting_with": "Chatte mit",
     "chat.placeholder": "Gebe hier eine Chatnachricht ein, ziehe Bilder per Drag & Drop und drücke die Eingabetaste, um sie zu senden",
     "chat.scroll-up-alert": "Diese Nachrichten sind möglicherweise veraltet, klicke hier um neuere Nachrichten anzuzeigen.",
     "chat.send": "Senden",

public/language/de/user.json

@@ -195,5 +195,5 @@
     "emailUpdate.optional": "<strong>Dieses Feld ist optional</strong>. Du bist nicht verpflichtet, deine E-Mail-Adresse anzugeben, doch ohne eine validierte E-Mail-Adresse kannst du dein Konto nicht wiederherstellen oder dich mit deiner E-Mail-Adresse anmelden.",
     "emailUpdate.required": "<strong>Dieses Feld ist erforderlich</strong>.",
     "emailUpdate.change-instructions": "An die eingegebene E-Mail-Adresse wird eine Bestätigungs-E-Mail mit einem eindeutigen Link gesendet. Durch den Zugriff auf diesen Link wird dein Eigentum an der E-Mail-Adresse bestätigt und diese wird in deinem Konto aktiv. Du kannst deine E-Mail-Adresse jederzeit auf deiner Kontoseite aktualisieren.",
-    "emailUpdate.password-challenge": "Please enter your password in order to verify account ownership."
+    "emailUpdate.password-challenge": "Bitte gib dein Passwort ein, um dein Konto zu verifizieren."
 }

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.",
 	"maintenance-mode.status": "Maintenance Mode Status Code",
 	"maintenance-mode.message": "Maintenance Message",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode",
 	"headers": "Headers",
 	"headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame",
 	"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "When enabled (default), will set the header to <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "Enabled HSTS (recommended)",
 	"hsts.maxAge": "HSTS Max Age",

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

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

@@ -4,8 +4,6 @@
 
 	"acp-title": "%1 | NodeBB Admin Control Panel",
 	"settings-header-contents": "Contents",
-	"changes-saved": "Changes Saved",
-	"changes-saved-message": "Your changes to the NodeBB configuration have been saved.",
 	"changes-not-saved": "Changes Not Saved",
 	"changes-not-saved-message": "NodeBB encountered a problem saving your changes. (%1)"
 }

public/language/en-GB/admin/appearance/customise.json

@@ -1,7 +1,7 @@
 {
-	"custom-css": "Custom CSS/LESS",
-	"custom-css.description": "Enter your own CSS/LESS declarations here, which will be applied after all other styles.",
-	"custom-css.enable": "Enable Custom CSS/LESS",
+	"custom-css": "Custom CSS/SASS",
+	"custom-css.description": "Enter your own CSS/SASS declarations here, which will be applied after all other styles.",
+	"custom-css.enable": "Enable Custom CSS/SASS",
 
 	"custom-js": "Custom Javascript",
 	"custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.",

public/language/en-GB/admin/extend/widgets.json

@@ -8,9 +8,9 @@
 	"containers.none": "None",
 	"container.well": "Well",
 	"container.jumbotron": "Jumbotron",
-	"container.panel": "Panel",
-	"container.panel-header": "Panel Header",
-	"container.panel-body": "Panel Body",
+	"container.card": "Card",
+	"container.card-header": "Card Header",
+	"container.card-body": "Card Body",
 	"container.alert": "Alert",
 
 	"alert.confirm-delete": "Are you sure you wish to delete this widget?",

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

@@ -39,6 +39,5 @@
 	"revert": "Revert",
 
 	"edit.no-users-found": "No Users Found",
-	"edit.confirm-remove-user": "Are you sure you want to remove this user?",
-	"edit.save-success": "Changes saved!"
+	"edit.confirm-remove-user": "Are you sure you want to remove this user?"
 }

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

@@ -49,7 +49,6 @@
 	"alert.confirm-moderate": "<strong>Are you sure you wish to grant the moderation privilege to this user group?</strong> This group is public, and any users can join at will.",
 	"alert.confirm-admins-mods": "<strong>Are you sure you wish to grant the &quot;Admins &amp; Mods&quot; privilege to this user/group?</strong> Users with this privilege are able to promote and demote other users into privileged positions, <em>including super administrator</em>",
 	"alert.confirm-save": "Please confirm your intention to save these privileges",
-	"alert.saved": "Privilege changes saved and applied",
 	"alert.confirm-discard": "Are you sure you wish to discard your privilege changes?",
 	"alert.discarded": "Privilege changes discarded",
 	"alert.confirm-copyToAll": "Are you sure you wish to apply this set of <strong>%1</strong> to <strong>all categories</strong>?",

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.",
 	"maintenance-mode.status": "Maintenance Mode Status Code",
 	"maintenance-mode.message": "Maintenance Message",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode",
 	"headers": "Headers",
 	"headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame",
 	"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "When enabled (default), will set the header to <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "Enabled HSTS (recommended)",
 	"hsts.maxAge": "HSTS Max Age",

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -12,7 +12,7 @@
 	"groups": "Groups:",
 	"open-new-window": "Open in a new window",
 	"dropdown": "Dropdown",
-	"dropdown-placeholder": "Place your dropdown menu items below, ie: <br/>&lt;li&gt;&lt;a href&#x3D;&quot;https://myforum.com&quot;&gt;Link 1&lt;/a&gt;&lt;/li&gt;",
+	"dropdown-placeholder": "Place your dropdown menu items below, ie: <br/>&lt;li&gt;&lt;a class=&quot;dropdown-item&quot; href&#x3D;&quot;https://myforum.com&quot;&gt;Link 1&lt;/a&gt;&lt;/li&gt;",
 
 	"btn.delete": "Delete",
 	"btn.disable": "Disable",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

public/language/en-GB/global.json

@@ -43,7 +43,9 @@
 	"header.notifications": "Notifications",
 	"header.search": "Search",
 	"header.profile": "Profile",
+	"header.account": "Account",
 	"header.navigation": "Navigation",
+	"header.manage": "Manage",
 
 	"notifications.loading": "Loading Notifications",
 	"chats.loading": "Loading Chats",
@@ -108,6 +110,7 @@
 
 	"moderator_tools": "Moderator Tools",
 
+	"status": "Status",
 	"online": "Online",
 	"away": "Away",
 	"dnd": "Do not disturb",

public/language/en-GB/topic.json

@@ -107,7 +107,7 @@
 	"thread_tools.purge": "Purge Topic",
 	"thread_tools.purge_confirm" : "Are you sure you want to purge this topic?",
 	"thread_tools.merge_topics": "Merge Topics",
-	"thread_tools.merge": "Merge",
+	"thread_tools.merge": "Merge Topic",
 
 	"topic_move_success": "This topic will be moved to \"%1\" shortly. Click here to undo.",
 	"topic_move_multiple_success": "These topics will be moved to \"%1\" shortly. Click here to undo.",
@@ -140,7 +140,7 @@
 	"post_moved": "Post moved!",
 	"fork_topic": "Fork Topic",
 	"enter-new-topic-title": "Enter new topic title",
-	"fork_topic_instruction": "Click the posts you want to fork",
+	"fork_topic_instruction": "Click the posts you want to fork, enter a title for the new topic and click fork topic",
 	"fork_no_pids": "No posts selected!",
 	"no-posts-selected": "No posts selected!",
 	"x-posts-selected": "%1 post(s) selected",
@@ -155,6 +155,7 @@
 	"merge-new-title-for-topic": "New title for topic",
 	"topic-id": "Topic ID",
 	"move_posts_instruction": "Click the posts you want to move then enter a topic ID or go to the target topic",
+	"move_topic_instruction": "Select the target category and then click move",
 	"change_owner_instruction": "Click the posts you want to assign to another user",
 
 	"composer.title_placeholder": "Enter your topic title here...",

public/language/en-GB/user.json

@@ -71,6 +71,7 @@
 	"upload_new_picture": "Upload New Picture",
 	"upload_new_picture_from_url": "Upload New Picture From URL",
 	"current_password": "Current Password",
+	"new_password": "New Password",
 	"change_password": "Change Password",
 	"change_password_error": "Invalid Password!",
 	"change_password_error_wrong_current": "Your current password is not correct!",

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.",
 	"maintenance-mode.status": "Maintenance Mode Status Code",
 	"maintenance-mode.message": "Maintenance Message",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode",
 	"headers": "Headers",
 	"headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame",
 	"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "When enabled (default), will set the header to <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "Enabled HSTS (recommended)",
 	"hsts.maxAge": "HSTS Max Age",

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

public/language/en-x-pirate/admin/settings/advanced.json

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.",
 	"maintenance-mode.status": "Maintenance Mode Status Code",
 	"maintenance-mode.message": "Maintenance Message",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode",
 	"headers": "Headers",
 	"headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame",
 	"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "When enabled (default), will set the header to <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "Enabled HSTS (recommended)",
 	"hsts.maxAge": "HSTS Max Age",

public/language/en-x-pirate/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/en-x-pirate/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "Cuando este foro están en Modo de Mantenimiento, todas las peticiones serán redirigidas a una página estática de mantenimiento. Los administradores están exentos de esta redirección, y pueden acceder al sitio normalmente.",
 	"maintenance-mode.status": "Maintenance Mode Status Code",
 	"maintenance-mode.message": "Mensaje de Mantenimiento",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode",
 	"headers": "Cabeceras",
 	"headers.allow-from": "Establecer ALLOW-FROM para poner NodeBB en un iFrame",
 	"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "When enabled (default), will set the header to <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Seguridad estricta del transporte",
 	"hsts.enabled": "Enabled HSTS (recommended)",
 	"hsts.maxAge": "HSTS Max Age",

public/language/es/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/es/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Autenticación",
 	"email-confirm-interval": "El usuario no puede re-enviar una confirmación por email hasta",
-	"email-confirm-email2": "minutos han pasado",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Permitir login con",
 	"allow-login-with.username-email": "Nombre de usuario o Email",
 	"allow-login-with.username": "Solo Nombre de Usuario",

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.",
 	"maintenance-mode.status": "Maintenance Mode Status Code",
 	"maintenance-mode.message": "Maintenance Message",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode",
 	"headers": "Headers",
 	"headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame",
 	"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "When enabled (default), will set the header to <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "Enabled HSTS (recommended)",
 	"hsts.maxAge": "HSTS Max Age",

public/language/et/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/et/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

public/language/fa-IR/admin/settings/advanced.json

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.",
 	"maintenance-mode.status": "Maintenance Mode Status Code",
 	"maintenance-mode.message": "Maintenance Message",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode",
 	"headers": "Headers",
 	"headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame",
 	"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "When enabled (default), will set the header to <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "Enabled HSTS (recommended)",
 	"hsts.maxAge": "HSTS Max Age",

public/language/fa-IR/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/fa-IR/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.",
 	"maintenance-mode.status": "Maintenance Mode Status Code",
 	"maintenance-mode.message": "Maintenance Message",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode",
 	"headers": "Headers",
 	"headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame",
 	"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "When enabled (default), will set the header to <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "Enabled HSTS (recommended)",
 	"hsts.maxAge": "HSTS Max Age",

public/language/fi/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/fi/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "Quand le forum est en mode maintenance, toutes les requêtes sont redirigées vers une page de garde statique. Les administrateurs sont exemptés de cette redirection et peuvent accéder normalement au site. ",
 	"maintenance-mode.status": "Mode maintenance",
 	"maintenance-mode.message": "Message de maintenance",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Sélectionner les groupes qui doivent être exemptés du mode maintenance",
 	"headers": "En-têtes",
 	"headers.allow-from": "Définissez ALLOW-FROM pour afficher NodeBB dans un iFrame",
 	"headers.csp-frame-ancestors": "Définir la politique de sécurité pour pouvoir intégrer des iframes",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "Lorsqu'il est activé (par défaut), définira l'en-tête sur <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "Activer HSTS  (recommandé)",
 	"hsts.maxAge": "HSTS Age Max",

public/language/fr/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "Nom de l’expéditeur",
 	"from-help": "Le nom de l’expéditeur à afficher dans l'e-mail",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Heures de validité du lien de confirmation par e-mail",
+
 	"smtp-transport": "Protocole SMTP",
 	"smtp-transport.enabled": "Activer l'envoi via SMTP",
 	"smtp-transport-help": "Vous pouvez sélectionner depuis une liste de services ou entrer un service personnalisé.",

public/language/fr/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentification",
 	"email-confirm-interval": "Les utilisateurs ne peuvent pas demander un e-mail de vérification avant",
-	"email-confirm-email2": "minutes se sont écoulées",
+	"email-confirm-interval2": "minutes se sont écoulées",
 	"allow-login-with": "Autoriser l'identification avec",
 	"allow-login-with.username-email": "Nom d'utilisateur ou e-mail",
 	"allow-login-with.username": "Nom d'utilisateur uniquement",

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.",
 	"maintenance-mode.status": "Maintenance Mode Status Code",
 	"maintenance-mode.message": "Maintenance Message",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode",
 	"headers": "Headers",
 	"headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame",
 	"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "When enabled (default), will set the header to <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "Enabled HSTS (recommended)",
 	"hsts.maxAge": "HSTS Max Age",

public/language/gl/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/gl/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

public/language/he/admin/manage/users.json

@@ -63,7 +63,7 @@
 	"create.password": "סיסמה",
 	"create.password-confirm": "אשר סיסמה",
 
-	"temp-ban.length": "Length",
+	"temp-ban.length": "זמן הרחקה",
 	"temp-ban.reason": "סיבה <span class=\"text-muted\">(אופציונאלי)</span>",
 	"temp-ban.hours": "שעות",
 	"temp-ban.days": "ימים",

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "כאשר הפורום נמצא במצב תחזוקה, כל הבקשות יופנו לדף אחזקה סטטי. מנהלים לא יגיעו להפניה זו, והם יוכלו לגשת לאתר כרגיל.",
 	"maintenance-mode.status": "קוד מצב תחזוקה",
 	"maintenance-mode.message": "הודעת תחזוקה",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode",
 	"headers": "כותרות",
 	"headers.allow-from": "הגדר ALLOW-FROM למקם NodeBB ב- iFrame",
 	"headers.csp-frame-ancestors": "הגדר את מדיניות האבטחה (Content-Security-Policy) עבור ההטמעה (frame-ancestors) של NodeBB בתוך Iframe",
@@ -19,17 +20,19 @@
 	"headers.coep-help": "When enabled (default), will set the header to <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Strict Transport Security",
-	"hsts.enabled": "Enabled HSTS (recommended)",
-	"hsts.maxAge": "HSTS Max Age",
-	"hsts.subdomains": "Include subdomains in HSTS header",
+	"hsts.enabled": "הפעל HSTS (מומלץ)",
+	"hsts.maxAge": "גיל כותרת HSTS",
+	"hsts.subdomains": "כלול תת-דומיינים בכותרת HSTS",
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "ניהול תעבורה",
-	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
-	"traffic.enable": "Enable Traffic Management",
+	"traffic.help": "NodeBB משתמש במודול שדוחה אוטומטית בקשות במצבים עם תעבורה גבוהה. אתה יכול לכוונן את ההגדרות האלה כאן, למרות שברירות המחדל הן נקודת התחלה טובה.",
+	"traffic.enable": "הפעל ניהול תעבורה",
 	"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.event-lag-help": "הורדת ערך זה מקטינה את זמני ההמתנה לטעינת הדפים, אך גם תציג את ההודעה \"עומס מופרז\" ליותר משתמשים. (אתחול נדרש)",
 	"traffic.lag-check-interval": "מרווח זמן בין בדיקות (במילישניות)",
 	"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)",
 
@@ -38,10 +41,10 @@
 	"sockets.default-placeholder": "ברירת מחדל: %1",
 	"sockets.delay": "זמן השעייה בן נסיונות חיבור מחדש",
 
-	"analytics.settings": "Analytics Settings",
-	"analytics.max-cache": "Analytics Cache Max Value",
+	"analytics.settings": "הגדרות אנליטיקס",
+	"analytics.max-cache": "גודל מקסימלי של מטמון Analytics",
 	"analytics.max-cache-help": "On high-traffic installs, the cache could be exhausted continuously if there are more concurrent active users than the Max Cache value. (Restart required)",
 	"compression.settings": "הגדרות דחיסה",
 	"compression.enable": "אפשר דחיסה",
-	"compression.help": "This setting enables gzip compression. For a high-traffic website in production, the best way to put compression in place is to implement it at a reverse proxy level. You can enable it here for testing purposes."
+	"compression.help": "הגדרה זו מפעילה דחיסת gzip. עבור אתר אינטרנט מרובה תנועה בייצור, הדרך הטובה ביותר להפעיל דחיסה היא ליישם אותו ברמת פרוקסי הפוך. אתה יכול להפעיל אותו כאן למטרות בדיקה."
 }

public/language/he/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "מאת",
 	"from-help": "השם 'מאת' יוצג בדוא\"ל.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/he/admin/settings/post.json

@@ -45,13 +45,13 @@
 	"unread.cutoff": "ימי ניתוק שלא נקראו",
 	"unread.min-track-last": "פוסטים מינימליים בנושא לפני מעקב אחר קריאה אחרונה",
 	"recent": "הגדרות פוסטים אחרונים",
-	"recent.max-topics": "מקסימום נושאים ב פוסטים אחרונים",
+	"recent.max-topics": "מקסימום נושאים בעמוד פוסטים אחרונים",
 	"recent.categoryFilter.disable": "הפיכת סינון נושאים ללא זמין בקטגוריות שהתעלמו מהן בדף פוסטים אחרונים",
 	"signature": "הגדרות חתימה",
 	"signature.disable": "השבת חתימות",
 	"signature.no-links": "השבת קישורים בחתימות",
 	"signature.no-images": "השבת תמונות בחתימות",
-	"signature.hide-duplicates": "Hide duplicate signatures in topics",
+	"signature.hide-duplicates": "הצג חתימות פעם אחת בלבד בכל נושא",
 	"signature.max-length": "אורך חתימה מרבי",
 	"composer": "הגדרות יצירת פוסט",
 	"composer-help": "ההגדרות הבאות חלות על הפונקציונליות ו/או המראה של יוצר הפוסט המוצג\n\t\t\t\tלמשתמשים בעת יצירת נושאים חדשים, או מענה לנושאים קיימים.",

public/language/he/admin/settings/reputation.json

@@ -24,8 +24,8 @@
 	"flags.limit-per-target-help": "כשפוסט או משתמש מסומן כמה פעמים, כל דיווח נוסף נחשב ל "דיווח" ונוסף לדיווח הראשון. הגדר את האופציה הזאת לכל מספר שהוא לא 0 כדי להגביל את כמות הדיווחים שפוסט או משתמש יכול לקבל.",
   	"flags.auto-flag-on-downvote-threshold": "מספר הצבעות למטה כדי ליצור דיווח אטומטי (הגדר ל-0 כדי להשבית; ברירת מחדל: 0)",
 	"flags.auto-resolve-on-ban": "פתור אוטומטי כל כרטיסי משתמש כאשר הוא מוחרם",
-	"flags.action-on-resolve": "Do the following when a flag is resolved",
-	"flags.action-on-reject": "Do the following when a flag is rejected",
+	"flags.action-on-resolve": "בצע את הפעולות הבאות כאשר דיווח נפתר",
+	"flags.action-on-reject": "בצע את הפעולות הבאות כאשר דיווח נדחה",
 	"flags.action.nothing": "Do nothing",
 	"flags.action.rescind": "Rescind the notification send to moderators/administrators"
 }

public/language/he/admin/settings/uploads.json

@@ -5,7 +5,7 @@
 	"strip-exif-data": "הפשט נתוני EXIF",
 	"preserve-orphaned-uploads": "שמור את הקבצים שהועלו בדיסק גם לאחר מחיקת הפוסט",
 	"orphanExpiryDays": "מספר ימים לשמירת קבצים יתומים",
-	"orphanExpiryDays-help": "After this many days, orphaned uploads will be deleted from the file system.<br />Set 0 or leave blank to disable.",
+	"orphanExpiryDays-help": "לאחר מספר ימים אלה, העלאות מיותמות יימחקו ממערכת הקבצים. <br />הגדר ל-0 או השאר ריק כדי להשבית.",
 	"private-extensions": "סיומות קובצים להפוך לפרטיים",
 	"private-uploads-extensions-help": "הכנס כאן רשימה של פורמטי הקבצים, מופרדים בפסיק, כדי להפוך אותם לפרטיים  (לדוגמא <code>pdf,xls,doc</code>). שורה ריקה פירושו שכל הקבצים פרטיים.",
 	"resize-image-width-threshold": "שנה גודל תמונות אם הם רחבים יותר מהרוחב המוגדר",

public/language/he/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "אימות",
 	"email-confirm-interval": "המשתמש לא יוכל לשלוח הודעת אישור מייל עד שיחלוף",
-	"email-confirm-email2": "דקות",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "אפשר התחברות עם",
 	"allow-login-with.username-email": "שם משתמש או סיסמא",
 	"allow-login-with.username": "שם משתמש בלבד",
@@ -29,7 +29,7 @@
 	"session-time-days": "ימים",
 	"session-time-seconds": "שניות",
 	"session-time-help": "ערכים אלו משמשים כדי להגדיר כמה זמן משתמשים יישארו מחוברים כאשר הם סימנו &quot;זכור אותי&quot; בהתחברות. שים לב שייעשה שימוש רק באחד מהערכים האלו. אם אין ערך <i>שניות</i> נשתמש בערך <i>ימים</i>. אם אין ערך <i>ימים</i> הערך יחזור לברירת מחדל <i>14 יום</i>.",
-	"online-cutoff": "דקות אחרי שהמשתמש נחשב לא פעיל",
+	"online-cutoff": "אחרי כמה דקות דקות המשתמש ייחשב ללא פעיל",
 	"online-cutoff-help": "אם משתמש אינו מבצע פעולות במשך זמן זה, הוא נחשב כלא פעיל ואינו מקבל עדכונים בזמן אמת.",
 	"registration": "רישום משתמש",
 	"registration-type": "סוג הרשמה",
@@ -40,8 +40,8 @@
 	"registration-type.invite-only": "הזמנה בלבד",
 	"registration-type.admin-invite-only": "הזמנת מנהל בלבד",
 	"registration-type.disabled": "בטל הרשמה",
-	"registration-type.help": "רגיל - משתמשים יכולים להירשם על ידי שימוש בדף /register.<br/>\nהזמנה בלבד - משתמשים אחרים יכולים להזמין משתמשים מדף <a href=\"%1/users\" target=\"_blank\">המשתמש.<br/>\nהזמנת מנהל בלבד - רק מנהלים יכולים להזמין משתמשים אחרים מדף <a href=\"%1/users\" target=\"_blank\">המשתמש</a> ודף <a href=\"%1/admin/manage/users\">ההנהלת משתמשים</a>.<br/>\nבטל הרשמה - לא ניתן להירשם.<br/>ד",
-	"registration-approval-type.help": "רגיל - משתמשים נרשמים באופן מיידי.<br/>\nאישור מנהל - משתמשים אשר נרשמו מוכנים לתוך <a href=\"%1/admin/manage/registration\">רשימת אישור</a> למנהלים.<br/>\nאישור מנהל לכתובות IP - רגיל למשתמשים חדשים, אישור מנהל לכתובות IP אשר כבר מקושר אליהם חשבון.<br/>",
+	"registration-type.help": "רגיל - משתמשים יכולים להירשם על ידי שימוש בדף ההרשמה (/register).<br/>\nהזמנה בלבד - משתמשים אחרים יכולים להזמין משתמשים מדף <a href=\"%1/users\" target=\"_blank\">המשתמשים.<br/>\nהזמנת מנהל בלבד - רק מנהלים יכולים להזמין משתמשים אחרים מדף <a href=\"%1/users\" target=\"_blank\">המשתמשים</a> ודף ניהול משתמשים</a>.<br/>\nבטל הרשמה - לא ניתן להירשם.<br/>ד",
+	"registration-approval-type.help": "רגיל - משתמשים נרשמים באופן מיידי.<br/>\nאישור מנהל - משתמשים אשר נרשמו מוכנסים לתוך <a href=\"%1/admin/manage/registration\">רשימת אישור</a> למנהלים.<br/>\nאישור מנהל לכתובות IP - רגיל למשתמשים חדשים, אישור מנהל לכתובות IP אשר כבר מקושר אליהם חשבון.<br/>",
 	"registration-queue-auto-approve-time": "זמן אישור אוטומטי",
 	"registration-queue-auto-approve-time-help": "שעות לפני שהמשתמש מאושר באופן אוטומטי. רשום 0 על-מנת להשבית.",
 	"registration-queue-show-average-time": "הצג למשתמשים זמן ממוצע שנדרש על-מנת לאשר משתמש חדש",

public/language/he/global.json

@@ -23,7 +23,7 @@
     "close": "סגור",
     "pagination": "הגדרות עמוד",
     "pagination.out_of": "%1 מתוך %2",
-    "pagination.enter_index": "Go to post index",
+    "pagination.enter_index": "עבור למיקום פוסט",
     "header.admin": "ניהול",
     "header.categories": "קטגוריות",
     "header.recent": "פוסטים אחרונים",

public/language/he/modules.json

@@ -3,7 +3,7 @@
     "chat.placeholder": "כתבו תוכן הודעת הצ'אט כאן, ניתן לגרור ולשחרר כאן תמונות, הקישו אנטר לשליחה.",
     "chat.scroll-up-alert": "הנכם צופים כעת בהודעות ישנות. לחצו כאן למעבר להודעה האחרונה.",
     "chat.send": "שליחה",
-    "chat.no_active": "אין לכם צ'אטים פעילים",
+    "chat.no_active": "אין לכם צ'אטים פעילים.",
     "chat.user_typing": "%1 מקליד...",
     "chat.user_has_messaged_you": "ל%1 יש הודעה עבורכם.",
     "chat.see_all": "צפו בכל הצ'אטים",

public/language/he/register.json

@@ -1,5 +1,5 @@
 {
-    "register": "הרשם",
+    "register": "הרשמה",
     "cancel_registration": "בטל רישום",
     "help.email": "כברירת מחדל, כתובת האימייל שלך לא גלויה למשתמשים אחרים",
     "help.username_restrictions": "שם משתמש ייחודי בין %1 ל %2 תווים. משתמשים אחרים יכולים לציין את שמך באמצעות @<span id='yourUsername'>שם המשתמש שלך</span>.",

public/language/he/topic.json

@@ -113,7 +113,7 @@
     "bookmark": "הוספה למועדפים",
     "bookmarks": "מועדפים",
     "bookmarks.has_no_bookmarks": "לא צירפתם פוסט למועדפים עדיין",
-    "copy-permalink": "העתקת קישור ישיר",
+    "copy-permalink": "העתקת קישור פוסט",
     "loading_more_posts": "טוען פוסטים נוספים",
     "move_topic": "העברת נושא",
     "move_topics": "העברת נושאים",

public/language/he/unread.json

@@ -6,7 +6,7 @@
     "selected": "נבחר",
     "all": "הכל",
     "all_categories": "כל הקטגוריות",
-    "topics_marked_as_read.success": "נושאים שמסומנים כנקרא!",
+    "topics_marked_as_read.success": "הנושאים שבחרת סומנו כנקרא!",
     "all-topics": "כל הנושאים",
     "new-topics": "נושאים חדשים",
     "watched-topics": "נושאים שאתה עוקב אחריהם",

public/language/he/user.json

@@ -76,7 +76,7 @@
     "change_password_success": "הסיסמה שלך עודכנה!",
     "confirm_password": "אימות סיסמה",
     "password": "סיסמה",
-    "username_taken_workaround": "שם המשתמש שבחרת כבר תפוס, ולכן שינינו אותו מעט. שם המשתמש שלך כעת הוא <strong>%1</strong>",
+    "username_taken_workaround": "שם המשתמש שבחרת כבר תפוס, ולכן שינינו אותו מעט. שם המשתמש שלך כעת הוא: <strong>%1</strong>",
     "password_same_as_username": "הסיסמה שלך זהה לשם המשתמש, בחר סיסמה שונה.",
     "password_same_as_email": "הסיסמה שלך זהה לכתובת המייל שלך, בחר סיסמה שונה.",
     "weak_password": "סיסמה חלשה.",
@@ -84,7 +84,7 @@
     "upload_a_picture": "העלה תמונה",
     "remove_uploaded_picture": "מחק את התמונה שהועלתה",
     "upload_cover_picture": "העלה תמונת נושא",
-    "remove_cover_picture_confirm": "האם אתה בטוח שאתה רוצה למחוק תמונת נושא?",
+    "remove_cover_picture_confirm": "האם אתה בטוח שאתה רוצה למחוק את תמונת נושא?",
     "crop_picture": "חתוך תמונה",
     "upload_cropped_picture": "חתוך והעלה",
     "avatar-background-colour": "צבע רקע של תמונת נושא",
@@ -92,27 +92,27 @@
     "show_email": "הצג את כתובת האימייל שלי",
     "show_fullname": "הצג את שמי המלא",
     "restrict_chats": "אשר הודעות צ'אט ממשתמשים שאני עוקב אחריהם בלבד",
-    "digest_label": "הרשם לקבלת תקציר",
-    "digest_description": "הירשם לקבלת עדכונים בדואר אלקטרוני מפורום זה (הודעות ונושאים חדשים) בהתאם ללוח זמנים מוגדר מראש",
+    "digest_label": "הרשמה לקבלת תקציר",
+    "digest_description": "הרשמה לקבלת עדכונים בדואר אלקטרוני מפורום זה (הודעות ונושאים חדשים) בהתאם ללוח זמנים מוגדר מראש",
     "digest_off": "כבוי",
     "digest_daily": "יומי",
     "digest_weekly": "שבועי",
     "digest_biweekly": "דו שבועי",
     "digest_monthly": "חודשי",
     "has_no_follower": "למשתמש זה אין עוקבים :(",
-    "follows_no_one": "משתמש זה אינו עוקב אחרי אחרים :(",
-    "has_no_posts": "המשתמש טרם יצר פוסטים כלשהם.",
-    "has_no_best_posts": "למשתמש זה אין עדיין פוסטים נבחרים.",
+    "follows_no_one": "משתמש זה אינו עוקב אחרי אחרים",
+    "has_no_posts": "משתמש זה טרם יצר פוסטים כלשהם.",
+    "has_no_best_posts": "למשתמש זה אין עדיין פוסטים עם הצבעה בעד.",
     "has_no_topics": "המשתמש טרם יצר נושאים כלשהם.",
     "has_no_watched_topics": "המשתמש טרם צפה בנושאים כלשהם.",
     "has_no_ignored_topics": "המשתמש הזה טרם התעלם מנושאים.",
     "has_no_upvoted_posts": "המשתמש טרם הצביע בעד פוסטים כלשהם.",
     "has_no_downvoted_posts": "המשתמש טרם הצביע נגד פוסטים כלשהם.",
     "has_no_controversial_posts": "למשתמש זה אין עדיין פוסטים עם הצבעה למטה.",
-    "has_no_blocks": "לא חסמת אף משתמש.",
+    "has_no_blocks": "לא חסמתם אף משתמש.",
     "email_hidden": "כתובת אימייל מוסתרת",
     "hidden": "מוסתר",
-    "paginate_description": "הצג נושאים ופוסטים בעמודים במקום כרשימת גלילה אין-סופית",
+    "paginate_description": "הצגת נושאים ופוסטים בעמודים במקום כרשימת גלילה אין-סופית",
     "topics_per_page": "כמות נושאים בעמוד",
     "posts_per_page": "כמות פוסטים בעמוד",
     "max_items_per_page": "מקסימום %1",
@@ -160,7 +160,7 @@
     "info.mute-history": "הסטוריית השתקות",
     "info.no-mute-history": "משתמש זה מעולם לא הושתק",
     "info.muted-until": "מושתק עד %1",
-    "info.muted-expiry": "Expiry",
+    "info.muted-expiry": "תפוגה",
     "info.muted-no-reason": "לא סופקה סיבה.",
     "info.username-history": "היסטוריית שם משתמש",
     "info.email-history": "היסטוריית אימייל",
@@ -182,10 +182,10 @@
     "consent.right_to_rectification": "זכותך לתקן טעויות",
     "consent.right_to_rectification_description": "יש לך זכות לשנות או לעדכן נתונים שנאספו. ניתן לעדכן את הפרופיל שלך וכן לערוך כל תוכן שפורסם. במידת הצורך, אנא צור קשר עם צוות ניהול האתר.",
     "consent.right_to_erasure": "זכותך למחוק את חשבונך",
-    "consent.right_to_erasure_description": "בכל עת תוכל לבטל את הסכמתך לאיסוף נתונים ו / או עיבודם על ידי מחיקת חשבונך. מחיקת הפרופיל שלך לא תגרום למחיקת התוכנים שפרסמת. על מנת למחוק את חשבונך <strong> ואת </strong> התוכן המקושר לו צור קשר עם צוות הניהול של האתר.",
+    "consent.right_to_erasure_description": "בכל עת תוכל לבטל את הסכמתך לאיסוף נתונים ו/או עיבודם על ידי מחיקת חשבונך. מחיקת הפרופיל שלך לא תגרום למחיקת התוכנים שפרסמת. על מנת למחוק את חשבונך <strong> ואת </strong> התוכן המקושר לו צור קשר עם צוות הניהול של האתר.",
     "consent.right_to_data_portability": "זכותך לניוד הנתונים",
     "consent.right_to_data_portability_description": "באפרותך לבקש ייצוא של כל הנתונים שנאספו מחשבונך אודותיך. תוכל לעשות זאת על ידי לחיצה על הלחצן המתאים מטה.",
-    "consent.export_profile": "יצוא פרופיל (.json)",
+    "consent.export_profile": "יצוא פרופיל (json.)",
     "consent.export-profile-success": "ייצוא הפרופיל מתבצע כעת. תקבל התראה כאשר הייצוא יסתיים.",
     "consent.export_uploads": "יצוא תוכן שהועלה (ZIP.)",
     "consent.export-uploads-success": "ייצוא ההעלאות מתבצע כעת. תקבל התראה כאשר הייצוא יסתיים.",
@@ -195,5 +195,5 @@
     "emailUpdate.optional": "שדה זה הוא אופציונלי. אינך מחויב לספק את כתובת הדוא\"ל שלך, אך ללא דוא\"ל מאומת לא תוכל לשחזר את חשבונך או להתחבר באמצעות הדוא\"ל שלך.",
     "emailUpdate.required": "זהו שדה חובה",
     "emailUpdate.change-instructions": "מייל אימות יישלח לכתובת דוא\"ל שהכנסת עם קישור ייחודי. לחיצה על הקישור יאמת את בעלותך על הדוא\"ל ותקבל גישה לחשבונך. בכל זמן, תוכל לעדכן את כתובת הדוא\"ל שלך בדף החשבון שלך.",
-    "emailUpdate.password-challenge": "Please enter your password in order to verify account ownership."
+    "emailUpdate.password-challenge": "אנא הזן את הסיסמה שלך כדי לאמת את הבעלות על החשבון."
 }

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "Kada je forum u stanju održavanja,svi zahtjevi će biti preusmjereni statičnoj stranici.Administratori su izuzeti od ovog preusmjerenja i mogu normalno koristiti stranicu.",
 	"maintenance-mode.status": "Maintenance Mode Status Code",
 	"maintenance-mode.message": "Poruka održavanja",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode",
 	"headers": "Zaglavlje",
 	"headers.allow-from": "Izaberi ALLOW-FROM da bi ste postavili NodeBB u iFrame.",
 	"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "When enabled (default), will set the header to <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "Enabled HSTS (recommended)",
 	"hsts.maxAge": "HSTS Max Age",

public/language/hr/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "Od imena",
 	"from-help": "Ime prikazano u dolaznom emailu.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/hr/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Autentifikacija",
 	"email-confirm-interval": "Korisnik ne može ponovno poslati potvrdni email do ",
-	"email-confirm-email2": "prošlo je minuta",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Dozvoli prijavu sa",
 	"allow-login-with.username-email": "Korisničko ime ili Email",
 	"allow-login-with.username": "Korisničko ime",

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "Amikor a fórum karbantartási módban van, minden kérés átirányításra kerül egy statikus feltartóztató oldalra. Az adminisztrátorok kivételnek számítanak ez alól, és szokásos módon hozzáférhetnek az oldalhoz.",
 	"maintenance-mode.status": "Karbantartási mód HTTP státuszkódja",
 	"maintenance-mode.message": "A karbantartás üzenete",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode",
 	"headers": "Fejlécek",
 	"headers.allow-from": "ALLOW-FROM beállítása, hogy a NodeBB egy iFrame-be kerüljön",
 	"headers.csp-frame-ancestors": "Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "When enabled (default), will set the header to <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Szigorú HTTP biztonság (HSTS)",
 	"hsts.enabled": "Szigorú HTTP biztonság (HSTS) bekapcsolása (ajánlott)",
 	"hsts.maxAge": "HSTS maximális kora",

public/language/hu/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "Feladó neve",
 	"from-help": "Az emailben megjelenített feladói név.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP beállítások",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "Válogathatsz a jól ismert szolgáltatások listájából vagy megadhatsz sajátot.",

public/language/hu/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Hitelesítés",
 	"email-confirm-interval": "A felhasználó nem küldetheti újra az emailt ameddig nem telt el",
-	"email-confirm-email2": "perc",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Bejelentkezés engedélyezése ezzel:",
 	"allow-login-with.username-email": "Felhasználónév vagy email cím",
 	"allow-login-with.username": "Csak felhasználónév",

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.",
 	"maintenance-mode.status": "Maintenance Mode Status Code",
 	"maintenance-mode.message": "Maintenance Message",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode",
 	"headers": "Headers",
 	"headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame",
 	"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "When enabled (default), will set the header to <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "Enabled HSTS (recommended)",
 	"hsts.maxAge": "HSTS Max Age",

public/language/id/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/id/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "Quando il forum è in modalità manutenzione, tutte le richieste saranno reindirizzate ad una pagina di attesa statica. Gli amministratori sono esenti da questo reindirizzamento e sono in grado di accedere al sito normalmente.",
 	"maintenance-mode.status": "Codice stato modalità manutenzione",
 	"maintenance-mode.message": "Messaggio di manutenzione",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Seleziona i gruppi che dovrebbero essere esenti dalla modalità di manutenzione",
 	"headers": "Intestazioni",
 	"headers.allow-from": "Imposta ALLOW-FROM per posizionare NodeBBB in un iFrame",
 	"headers.csp-frame-ancestors": "Imposta l'intestazione Content-Security-Policy frame-ancestors su Place NodeBB in un iFrame",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "Se abilitato (impostazione predefinita), imposterà l'intestazione su <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Rigorosa sicurezza trasporto",
 	"hsts.enabled": "Abilita HSTS (consigliato)",
 	"hsts.maxAge": "Età massima HSTS",

public/language/it/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "Da Nome",
 	"from-help": "Il nome da visualizzare nell'email.",
 
+	"confirmation-settings": "Conferma",
+	"confirmation.expiry": "Ore per mantenere valido il link di conferma dell'email",
+
 	"smtp-transport": "Trasporto SMTP",
 	"smtp-transport.enabled": "Abilita trasporto SMTP",
 	"smtp-transport-help": "Puoi selezionare da un elenco di servizi noti o inserirne uno personalizzato.",

public/language/it/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Autenticazione",
 	"email-confirm-interval": "L'utente non può mandare una nuova email di conferma fino a",
-	"email-confirm-email2": "minuti trascorsi",
+	"email-confirm-interval2": "sono trascorsi minuti",
 	"allow-login-with": "Consenti l'accesso con",
 	"allow-login-with.username-email": "Username o Email",
 	"allow-login-with.username": "Solo Username",

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "フォーラムがメンテナンスモードの場合、すべてのリクエストは静的な一時ページにリダイレクトされます。管理者はこのリダイレクトから免除され、通常のサイトにアクセスできます。",
 	"maintenance-mode.status": "Maintenance Mode Status Code",
 	"maintenance-mode.message": "メンテナンスメッセージ",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode",
 	"headers": "ヘッダー",
 	"headers.allow-from": "NodeBBをインラインフレーム内に配置するようALLOW-FROMを設定する",
 	"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "When enabled (default), will set the header to <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "Enabled HSTS (recommended)",
 	"hsts.maxAge": "HSTS Max Age",