chore: incrementing version number - v3.3.0

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

.github/ISSUE_TEMPLATE.md

@@ -1,32 +0,0 @@
-<!-- 
-	== Github Issues are for bug reports and feature requests only ==
-	== Please visit https://community.nodebb.org for other support ==
-	== Found a security exploit? Please email us at security@nodebb.org instead for immediate attention ==
-	==   → DO NOT SUBMIT VULNERABILITIES TO THE PUBLIC BUG TRACKER ==
--->
-
-<!-- ++ Please include the following information when submitting a bug report ++ -->
-
-- **NodeBB version:** 
-- **NodeBB git hash:** 
-- **NodeJS version:**
-<!-- (to find your git hash, execute `git rev-parse HEAD` from the main NodeBB directory) -->
-- **Installed NodeBB Plugins:** 
-<!-- (to find installed plugins run ./nodebb plugins) -->
-- **Database type:** mongo, redis, or postgres
-- **Database version:** 
-<!-- `mongod --version`, `redis-server --version`, or `postgres --version` -->
-- **Exact steps to cause this issue:**
-<!--
-	1. First I did this...
-	2. Then, I clicked on this item...
-
-	A quick note: MP4 and MOV formatted video files are now allowed to be uploaded to GH.
-	Please upload if reproduction steps are hard to describe or reproduce reliably.
--->
-- **What you expected:**
-<!-- e.g. I expected *abc* to *xyz* -->
-- **What happened instead:**
-<!-- e.g. Instead, I got *zyx* and NodeBB set fire to my house -->
-
-<!-- Thank you! -->

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,81 @@
+name: Bug Report
+description: File a bug report
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Github Issues are for bug reports and feature requests only
+        Please visit https://community.nodebb.org for other support
+        Found a security exploit? Please email us at security@nodebb.org instead for immediate attention
+        ### → DO NOT SUBMIT VULNERABILITIES TO THE PUBLIC BUG TRACKER ←
+  - type: input
+    attributes:
+      label: NodeBB version
+      placeholder: e.g. v2.2.0
+  - type: input
+    attributes:
+      label: NodeBB git hash
+      description: to find your git hash, execute `git rev-parse HEAD` from the main NodeBB directory
+      placeholder: e.g. 783250ee6f8c51cdc243ce3b8d9f1a080517247e
+  - type: input
+    attributes:
+      label: NodeJS version
+      placeholder: e.g. v16.15.1
+  - type: textarea
+    attributes:
+      label: Installed NodeBB plugins
+      description: to find installed plugins run `./nodebb plugins`
+      placeholder: |
+        e.g.
+        * nodebb-plugin-2factor@5.0.1 (installed, disabled)
+        * nodebb-plugin-composer-default@8.0.0 (installed, enabled)
+        * nodebb-plugin-dbsearch@5.1.5 (installed, disabled)
+        * nodebb-plugin-emoji@4.0.4 (installed, enabled)
+        * nodebb-plugin-emoji-android@3.0.0 (installed, enabled)
+        * nodebb-plugin-markdown@10.0.0 (installed, enabled)
+        * nodebb-plugin-mentions@3.0.11 (installed, enabled)
+        * nodebb-plugin-spam-be-gone@1.0.0 (installed, disabled)
+        * nodebb-rewards-essentials@0.2.1 (installed, enabled)
+        * nodebb-theme-lavender@6.0.0 (installed, disabled)
+        * nodebb-theme-persona@12.0.11 (installed, enabled)
+        * nodebb-theme-slick@2.0.2 (installed, disabled)
+        * nodebb-theme-vanilla@12.1.18 (installed, disabled)
+        * nodebb-widget-essentials@6.0.0 (installed, enabled)
+  - type: dropdown
+    attributes:
+      label: Database type
+      multiple: true
+      options:
+        - MongoDB
+        - Redis
+        - PostgreSQL
+  - type: input
+    attributes:
+      label: Database version
+      description: "`mongod --version`, `redis-server --version`, or `postgres --version`"
+      placeholder: e.g. v5.0.9
+  - type: textarea
+    attributes:
+      label: Exact steps to cause this issue
+      placeholder: |
+        1. First I did this...
+        2. Then, I clicked on this item...
+
+        A quick note: MP4 and MOV formatted video files are now allowed to be uploaded to GH.
+        Please upload if reproduction steps are hard to describe or reproduce reliably.
+  - type: textarea
+    attributes:
+      label: What you expected
+      placeholder: e.g. I expected *abc* to *xyz*
+  - type: textarea
+    attributes:
+      label: What happened instead
+      placeholder: e.g. Instead, I got *zyx* and NodeBB set fire to my house
+  - type: textarea
+    attributes:
+      label: Anything else?
+      description: Any additional context about the issue you're encountering
+  - type: markdown
+    attributes:
+      value: "**Thank you!**"

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Community Forum
+    url: https://community.nodebb.org
+    about: Github Issues are for bug reports and feature requests only, please use community forum for other support

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,24 @@
+name: Feature Request
+description: Suggest a new feature
+labels: ["enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Github Issues are for bug reports and feature requests only
+        Please visit https://community.nodebb.org for other support
+        Found a security exploit? Please email us at security@nodebb.org instead for immediate attention
+        ### → DO NOT SUBMIT VULNERABILITIES TO THE PUBLIC BUG TRACKER ←
+  - type: textarea
+    attributes:
+      label: Description
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Community forum reference
+      description: If this feature was already discussed on the Community Forum link it here
+      placeholder: https://community.nodebb.org/topic/0/example-feature-request
+  - type: markdown
+    attributes:
+      value: "**Thank you!**"

.github/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: npm
-    directory: "/install"
-    schedule:
-      interval: daily

.github/workflows/docker.yml

@@ -11,41 +11,51 @@ on:
   workflow_dispatch:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
+permissions:
+  contents: read
+  packages: write
+
 jobs:
   release:
     runs-on: ubuntu-latest
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
-          images: nodebb/docker
+          images: ghcr.io/${{ github.repository }}
           tags: |
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
-            type=raw,value=latest
+            type=semver,pattern={{major}}.x
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=ref,event=branch,enable=${{ github.event.repository.default_branch != github.ref }}
 
       - name: Build and push Docker images
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           context: .
           file: ./Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/test.yaml

@@ -5,35 +5,43 @@ on:
     branches:
       - master
       - develop
+      - bootstrap5
   pull_request:
     branches:
       - master
       - develop
+      - bootstrap5
 
 defaults:
   run:
     shell: bash
 
+permissions:
+  contents: read
+
 jobs:
   test:
+    permissions:
+      checks: write  # for coverallsapp/github-action to create new checks
+      contents: read  # for actions/checkout to fetch code
     name: Lint and test
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        node: [12, 14, 16]
+        node: [16, 18]
         database: [mongo-dev, mongo, redis, postgres]
         include:
           # only run coverage once
           - os: ubuntu-latest
-            node: 14
+            node: 16
             coverage: true
           # test under development once
           - database: mongo-dev
             test_env: development
           # only run eslint once
           - os: ubuntu-latest
-            node: 14
+            node: 16
             database: mongo-dev
             lint: true
     runs-on: ${{ matrix.os }}
@@ -42,7 +50,7 @@ jobs:
 
     services:
       postgres:
-        image: 'postgres:10-alpine'
+        image: 'postgres:15-alpine'
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
@@ -57,7 +65,7 @@ jobs:
           - 5432:5432
 
       redis:
-        image: 'redis:2.8.9'
+        image: 'redis:7.0.12'
         # Set health checks to wait until redis has started
         options: >-
           --health-cmd "redis-cli ping"
@@ -69,7 +77,7 @@ jobs:
           - 6379:6379
 
       mongo:
-        image: 'mongo:3.6'
+        image: 'mongo:6.0'
         ports:
           # Maps port 27017 on service container to the host
           - 27017:27017
@@ -80,7 +88,7 @@ jobs:
       - run: cp install/package.json package.json
 
       - name: Install Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
 
@@ -186,7 +194,7 @@ jobs:
         run: npm run coverage
 
       - name: Test coverage
-        uses: coverallsapp/github-action@1.1.3
+        uses: coverallsapp/github-action@v2.2.1
         if: matrix.coverage
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -194,11 +202,13 @@ jobs:
           parallel: true
 
   finish:
+    permissions:
+      checks: write  # for coverallsapp/github-action to create new checks
     needs: test
     runs-on: ubuntu-latest
     steps:
       - name: Coveralls Finished
-        uses: coverallsapp/github-action@1.1.3
+        uses: coverallsapp/github-action@v2.2.1
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           parallel-finished: true

Dockerfile

@@ -1,3 +1,19 @@
+FROM --platform=$BUILDPLATFORM node:lts as npm
+
+RUN mkdir -p /usr/src/build && \
+    chown -R node:node /usr/src/build
+WORKDIR /usr/src/build
+
+ARG NODE_ENV
+ENV NODE_ENV $NODE_ENV
+
+COPY --chown=node:node install/package.json /usr/src/build/package.json
+
+USER node
+
+RUN npm install --omit=dev
+
+
 FROM node:lts
 
 RUN mkdir -p /usr/src/app && \
@@ -7,11 +23,11 @@ WORKDIR /usr/src/app
 ARG NODE_ENV
 ENV NODE_ENV $NODE_ENV
 
-COPY --chown=node:node install/package.json /usr/src/app/package.json
+COPY --chown=node:node --from=npm /usr/src/build /usr/src/app
 
 USER node
 
-RUN npm install --only=prod && \
+RUN npm rebuild && \
     npm cache clean --force
 
 COPY --chown=node:node . /usr/src/app

Gruntfile.js

@@ -20,6 +20,7 @@ const prestart = require('./src/prestart');
 prestart.loadConfig(configFile);
 
 const db = require('./src/database');
+const plugins = require('./src/plugins');
 
 module.exports = function (grunt) {
 	const args = [];
@@ -40,53 +41,39 @@ module.exports = function (grunt) {
 
 	grunt.registerTask('init', async function () {
 		const done = this.async();
-		let plugins = [];
+		let pluginList = [];
 		if (!process.argv.includes('--core')) {
 			await db.init();
-			plugins = await db.getSortedSetRange('plugins:active', 0, -1);
-			addBaseThemes(plugins);
-			if (!plugins.includes('nodebb-plugin-composer-default')) {
-				plugins.push('nodebb-plugin-composer-default');
+			pluginList = await plugins.getActive();
+			addBaseThemes(pluginList);
+			if (!pluginList.includes('nodebb-plugin-composer-default')) {
+				pluginList.push('nodebb-plugin-composer-default');
 			}
-			if (!plugins.includes('nodebb-theme-persona')) {
-				plugins.push('nodebb-theme-persona');
+			if (!pluginList.includes('nodebb-theme-harmony')) {
+				pluginList.push('nodebb-theme-harmony');
 			}
 		}
 
-		const styleUpdated_Client = plugins.map(p => `node_modules/${p}/*.less`)
-			.concat(plugins.map(p => `node_modules/${p}/*.css`))
-			.concat(plugins.map(p => `node_modules/${p}/+(public|static|less)/**/*.less`))
-			.concat(plugins.map(p => `node_modules/${p}/+(public|static)/**/*.css`));
+		const 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|scss)/**/*.scss`))
+			.concat(pluginList.map(p => `node_modules/${p}/+(public|static)/**/*.css`));
 
-		const styleUpdated_Admin = plugins.map(p => `node_modules/${p}/*.less`)
-			.concat(plugins.map(p => `node_modules/${p}/*.css`))
-			.concat(plugins.map(p => `node_modules/${p}/+(public|static|less)/**/*.less`))
-			.concat(plugins.map(p => `node_modules/${p}/+(public|static)/**/*.css`));
-
-		const clientUpdated = plugins.map(p => `node_modules/${p}/+(public|static)/**/*.js`);
-		const serverUpdated = plugins.map(p => `node_modules/${p}/*.js`)
-			.concat(plugins.map(p => `node_modules/${p}/+(lib|src)/**/*.js`));
-
-		const templatesUpdated = plugins.map(p => `node_modules/${p}/+(public|static|templates)/**/*.tpl`);
-		const langUpdated = plugins.map(p => `node_modules/${p}/+(public|static|languages)/**/*.json`);
+		const clientUpdated = pluginList.map(p => `node_modules/${p}/+(public|static)/**/*.js`);
+		const serverUpdated = pluginList.map(p => `node_modules/${p}/*.js`)
+			.concat(pluginList.map(p => `node_modules/${p}/+(lib|src)/**/*.js`));
 
+		const templatesUpdated = pluginList.map(p => `node_modules/${p}/+(public|static|templates)/**/*.tpl`);
+		const langUpdated = pluginList.map(p => `node_modules/${p}/+(public|static|languages)/**/*.json`);
+		const interval = 100;
 		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,
+					interval: interval,
 				},
 			},
 			clientUpdated: {
@@ -97,7 +84,7 @@ module.exports = function (grunt) {
 					'node_modules/benchpressjs/build/benchpress.js',
 				],
 				options: {
-					interval: 1000,
+					interval: interval,
 				},
 			},
 			serverUpdated: {
@@ -105,14 +92,14 @@ module.exports = function (grunt) {
 					'app.js',
 					'install/*.js',
 					'src/**/*.js',
-					'public/src/modules/translator.js',
-					'public/src/modules/helpers.js',
-					'public/src/utils.js',
+					'public/src/modules/translator.common.js',
+					'public/src/modules/helpers.common.js',
+					'public/src/utils.common.js',
 					serverUpdated,
 					'!src/upgrades/**',
 				],
 				options: {
-					interval: 1000,
+					interval: interval,
 				},
 			},
 			templatesUpdated: {
@@ -121,7 +108,7 @@ module.exports = function (grunt) {
 					...templatesUpdated,
 				],
 				options: {
-					interval: 1000,
+					interval: interval,
 				},
 			},
 			langUpdated: {
@@ -131,13 +118,13 @@ module.exports = function (grunt) {
 					...langUpdated,
 				],
 				options: {
-					interval: 1000,
+					interval: interval,
 				},
 			},
 		});
 		const build = require('./src/meta/build');
 		if (!grunt.option('skip')) {
-			await build.build(true);
+			await build.build(true, { watch: true });
 		}
 		run();
 		done();
@@ -166,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'];
@@ -183,7 +168,7 @@ module.exports = function (grunt) {
 			return run();
 		}
 
-		require('./src/meta/build').build([compiling], (err) => {
+		require('./src/meta/build').build(compiling, { webpack: false }, (err) => {
 			if (err) {
 				winston.error(err.stack);
 			}
@@ -194,10 +179,10 @@ module.exports = function (grunt) {
 	});
 };
 
-function addBaseThemes(plugins) {
-	let themeId = plugins.find(p => p.includes('nodebb-theme-'));
+function addBaseThemes(pluginList) {
+	let themeId = pluginList.find(p => p.includes('nodebb-theme-'));
 	if (!themeId) {
-		return plugins;
+		return pluginList;
 	}
 	let baseTheme;
 	do {
@@ -208,9 +193,9 @@ function addBaseThemes(plugins) {
 		}
 
 		if (baseTheme) {
-			plugins.push(baseTheme);
+			pluginList.push(baseTheme);
 			themeId = baseTheme;
 		}
 	} while (baseTheme);
-	return plugins;
+	return pluginList;
 }

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.
 
@@ -23,25 +24,22 @@ NodeBB's theming engine is highly flexible and does not restrict your design cho
 [![](http://i.imgur.com/LmHtPhob.png)](http://i.imgur.com/LmHtPho.png)
 [![](http://i.imgur.com/paiJPJkb.jpg)](http://i.imgur.com/paiJPJk.jpg)
 
-Our minimalist "Persona" theme gets you going right away, no coding experience required.
-
-[![](http://i.imgur.com/HwNEXGu.png)](http://i.imgur.com/HwNEXGu.png)
-[![](http://i.imgur.com/II1byYs.png)](http://i.imgur.com/II1byYs.png)
-
+Our minimalist "Harmony" theme gets you going right away, no coding experience required.
 
+![Rendering of a NodeBB install on desktop and mobile devices](https://user-images.githubusercontent.com/923011/228570420-2a4db745-b20d-474a-a571-1b59259508ef.png)
 
 ## How can I follow along/contribute?
 
 * If you are a developer, feel free to check out the source and submit pull requests. We also have a wide array of [plugins](http://community.nodebb.org/category/7/nodebb-plugins) which would be a great starting point for learning the codebase.
-* If you are a designer, [NodeBB needs themes](http://community.nodebb.org/category/10/nodebb-themes)! NodeBB's theming system allows extension of the base templates as well as styling via LESS or CSS. NodeBB's base theme utilizes [Bootstrap 3](http://getbootstrap.com/) but themes can choose to use a different framework altogether.
-* If you know languages other than English you can help us translate NodeBB. We use [Transifex](https://www.transifex.com/projects/p/nodebb/) for internationalization.
+* If you are a designer, [NodeBB needs themes](http://community.nodebb.org/category/10/nodebb-themes)! NodeBB's theming system allows extension of the base templates as well as styling via SCSS or CSS. NodeBB's base theme utilizes [Bootstrap 5](http://getbootstrap.com/) as a frontend toolkit.
+* If you know languages other than English you can help us translate NodeBB. We use [Transifex](https://explore.transifex.com/nodebb/nodebb/) for internationalization.
 * Please don't forget to **like**, **follow**, and **star our repo**! Join our growing [community](http://community.nodebb.org) to keep up to date with the latest NodeBB development.
 
 ## Requirements
 
 NodeBB requires the following software to be installed:
 
-* A version of Node.js at least 12 or greater ([installation/upgrade instructions](https://github.com/nodesource/distributions))
+* A version of Node.js at least 16 or greater ([installation/upgrade instructions](https://github.com/nodesource/distributions))
 * MongoDB, version 3.6 or greater **or** Redis, version 2.8.9 or greater
 * If you are using [clustering](https://docs.nodebb.org/configuring/scaling/) you need Redis installed and configured.
 * nginx, version 1.3.13 or greater (**only if** intending to use nginx to proxy requests to a NodeBB)
@@ -75,10 +73,10 @@ Interested in a sublicense agreement for use of NodeBB in a non-free/restrictive
 
 * [Demo](https://try.nodebb.org)
 * [Developer Community](http://community.nodebb.org)
-* [Documentation & Installation Instructions](http://docs.nodebb.org)
-* [Help translate NodeBB](https://www.transifex.com/projects/p/nodebb/)
-* [NodeBB Blog](http://blog.nodebb.org)
-* [Premium Hosting for NodeBB](http://www.nodebb.org/ "NodeBB")
+* [Documentation & Installation Instructions](https://docs.nodebb.org)
+* [Help translate NodeBB](https://explore.transifex.com/nodebb/nodebb/)
+* [NodeBB Blog](https://nodebb.org/blog)
+* [Premium Hosting for NodeBB](https://www.nodebb.org/ "NodeBB")
 * Unofficial IRC community – channel `#nodebb` on Libera.chat
 * [Follow us on Twitter](http://www.twitter.com/NodeBB/ "NodeBB Twitter")
 * [Like us on Facebook](http://www.facebook.com/NodeBB/ "NodeBB Facebook")

app.js

@@ -71,7 +71,7 @@ if (nconf.get('setup') || nconf.get('install')) {
 	});
 } else if (nconf.get('activate')) {
 	require('./src/cli/manage').activate(nconf.get('activate'));
-} else if (nconf.get('plugins')) {
+} else if (nconf.get('plugins') && typeof nconf.get('plugins') !== 'object') {
 	require('./src/cli/manage').listPlugins();
 } else if (nconf.get('build')) {
 	require('./src/cli/manage').build(nconf.get('build'));

install/data/defaults.json

@@ -4,6 +4,7 @@
     "defaultLang": "en-GB",
     "loginDays": 14,
     "loginSeconds": 0,
+    "sessionDuration": 0,
     "loginAttempts": 5,
     "lockoutDuration": 60,
     "adminReloginDuration": 60,
@@ -15,7 +16,7 @@
     "postDeleteDuration": 0,
     "enablePostHistory": 1,
     "topicBacklinks": 1,
-    "postCacheSize": 10485760,
+    "postCacheSize": 20971520,
     "disableChat": 0,
     "chatEditDuration": 0,
     "chatDeleteDuration": 0,
@@ -25,6 +26,7 @@
     "postQueue": 0,
     "postQueueReputationThreshold": 0,
     "groupsExemptFromPostQueue": ["administrators", "Global Moderators"],
+    "groupsExemptFromMaintenanceMode": ["administrators", "Global Moderators"],
     "minimumPostLength": 8,
     "maximumPostLength": 32767,
     "systemTags": "",
@@ -45,6 +47,7 @@
     "allowMultipleBadges": 0,
     "maximumFileSize": 2048,
     "stripEXIFData": 1,
+    "orphanExpiryDays": 0,
     "resizeImageWidthThreshold": 2000,
     "resizeImageWidth": 760,
     "rejectImageWidth": 5000,
@@ -61,6 +64,7 @@
     "maximumAboutMeLength": 1000,
     "maximumUsersInChatRoom": 0,
     "maximumChatMessageLength": 1000,
+    "maximumChatRoomNameLength": 50,
     "maximumProfileImageSize": 256,
     "maximumCoverImageSize": 2048,
     "profileImageDimension": 200,
@@ -77,10 +81,12 @@
     "reputation:disabled": 0,
     "downvote:disabled": 0,
     "disableSignatures": 0,
+    "signatures:hideDuplicates": 0,
     "upvotesPerDay": 20,
     "upvotesPerUserPerDay": 6,
     "downvotesPerDay": 10,
     "downvotesPerUserPerDay": 3,
+    "min:rep:chat": 0,
     "min:rep:downvote": 0,
     "min:rep:upvote": 0,
     "min:rep:flag": 0,
@@ -91,6 +97,8 @@
     "min:rep:signature": 0,
     "flags:limitPerTarget": 0,
     "flags:autoFlagOnDownvoteThreshold": 0,
+    "flags:actionOnResolve": "rescind",
+    "flags:actionOnReject": "rescind",
     "notificationType_upvote": "notification",
     "notificationType_new-topic": "notification",
     "notificationType_new-reply": "notification",
@@ -141,6 +149,7 @@
     "maximumRelatedTopics": 0,
     "disableEmailSubscriptions": 0,
     "emailConfirmInterval": 10,
+    "emailConfirmExpiry": 24,
     "removeEmailNotificationImages": 0,
     "sendValidationEmail": 1,
     "includeUnverifiedEmails": 0,
@@ -152,6 +161,7 @@
     "digestHour": 17,
     "passwordExpiryDays": 0,
     "cross-origin-embedder-policy": 0,
+    "cross-origin-opener-policy": "same-origin",
     "cross-origin-resource-policy": "same-origin",
     "hsts-maxage": 31536000,
     "hsts-subdomains": 0,
@@ -173,5 +183,6 @@
     "composer:showHelpTab": 1,
     "composer:allowPluginHelp": 1,
     "maxReconnectionAttempts": 5,
-    "reconnectionDelay": 1500
+    "reconnectionDelay": 1500,
+    "disableCustomUserSkins": 0
 }

install/data/footer.json

@@ -2,7 +2,7 @@
 	{
 		"widget": "html",
 		"data" : {
-			"html": "<footer id=\"footer\" class=\"container footer\">\r\n\t<div>\r\n\t\tPowered by <a target=\"_blank\" href=\"https://nodebb.org\">NodeBB</a> | <a target=\"_blank\" href=\"//github.com/NodeBB/NodeBB/graphs/contributors\">Contributors</a>\r\n\t</div>\r\n</footer>",
+			"html": "<footer id=\"footer\" class=\"container footer d-flex flex-column align-items-center gap-1 mb-2\">\n\t<span>Powered by <a class=\"link-secondary text-decoration-underline\" target=\"_blank\" href=\"https://nodebb.org\">NodeBB</a></span>\n\t<span><a class=\"link-secondary\" target=\"_blank\" href=\"//github.com/NodeBB/NodeBB/graphs/contributors\"><i class=\"fa fa-users\"></i> <span class=\"text-decoration-underline\">Contributors<span></a></span>\n</footer>",
 			"title":"",
 			"container":""
 		}

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/data/welcome.md

@@ -1,9 +1,9 @@
-# Welcome to your brand new NodeBB forum!
+### Welcome to your brand new NodeBB forum!
 
 This is what a topic and post looks like. As an administrator, you can edit the post\'s title and content.
 To customise your forum, go to the [Administrator Control Panel](../../admin). You can modify all aspects of your forum there, including installation of third-party plugins.
 
-## Additional Resources
+#### Additional Resources
 
 * [NodeBB Documentation](https://docs.nodebb.org)
 * [Community Support Forum](https://community.nodebb.org)

install/package.json

@@ -2,8 +2,8 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "1.19.5",
-    "homepage": "http://www.nodebb.org",
+    "version": "3.3.0",
+    "homepage": "https://www.nodebb.org",
     "repository": {
         "type": "git",
         "url": "https://github.com/NodeBB/NodeBB/"
@@ -29,137 +29,152 @@
     },
     "dependencies": {
         "@adactive/bootstrap-tagsinput": "0.8.2",
-        "ace-builds": "1.4.14",
-        "archiver": "5.3.0",
-        "async": "3.2.3",
-        "autoprefixer": "10.4.4",
+        "@fontsource/inter": "5.0.8",
+        "@fontsource/poppins": "5.0.8",
+        "@fortawesome/fontawesome-free": "6.4.2",
+        "@isaacs/ttlcache": "1.4.1",
+        "@popperjs/core": "2.11.8",
+        "ace-builds": "1.24.1",
+        "archiver": "5.3.1",
+        "async": "3.2.4",
+        "autoprefixer": "10.4.15",
         "bcryptjs": "2.4.3",
-        "benchpressjs": "2.4.3",
-        "body-parser": "1.19.2",
-        "bootbox": "5.5.2",
-        "bootstrap": "3.4.1",
+        "benchpressjs": "2.5.1",
+        "body-parser": "1.20.2",
+        "bootbox": "6.0.0",
+        "bootstrap": "5.3.1",
+        "bootswatch": "5.3.1",
         "chalk": "4.1.2",
         "chart.js": "2.9.4",
         "cli-graph": "3.2.2",
-        "clipboard": "2.0.10",
+        "clipboard": "2.0.11",
         "colors": "1.4.0",
-        "commander": "7.2.0",
-        "compare-versions": "4.1.3",
+        "commander": "11.0.0",
+        "compare-versions": "6.1.0",
         "compression": "1.7.4",
         "connect-flash": "0.1.1",
-        "connect-mongo": "4.6.0",
+        "connect-mongo": "5.0.0",
         "connect-multiparty": "2.2.0",
-        "connect-pg-simple": "7.0.0",
-        "connect-redis": "6.1.3",
+        "connect-pg-simple": "9.0.0",
+        "connect-redis": "7.1.0",
         "cookie-parser": "1.4.6",
-        "cron": "1.8.2",
-        "cropperjs": "1.5.12",
-        "csurf": "1.11.0",
+        "cron": "2.4.1",
+        "cropperjs": "1.5.13",
+        "csrf-sync": "4.0.1",
         "daemon": "1.1.0",
-        "diff": "5.0.0",
-        "express": "4.17.3",
-        "express-session": "1.17.2",
+        "diff": "5.1.0",
+        "esbuild": "0.19.2",
+        "express": "4.18.2",
+        "express-session": "1.17.3",
         "express-useragent": "1.0.15",
-        "graceful-fs": "4.2.9",
-        "helmet": "5.0.2",
-        "html-to-text": "8.1.0",
-        "ipaddr.js": "2.0.1",
-        "jquery": "3.6.0",
+        "file-loader": "6.2.0",
+        "fs-extra": "11.1.1",
+        "graceful-fs": "4.2.11",
+        "helmet": "7.0.0",
+        "html-to-text": "9.0.5",
+        "imagesloaded": "5.0.0",
+        "ipaddr.js": "2.1.0",
+        "jquery": "3.7.0",
         "jquery-deserialize": "2.0.0",
         "jquery-form": "4.3.0",
         "jquery-serializeobject": "1.0.0",
-        "jquery-ui": "1.13.1",
+        "jquery-ui": "1.13.2",
         "jsesc": "3.0.2",
         "json2csv": "5.0.7",
-        "jsonwebtoken": "8.5.1",
-        "less": "4.1.2",
+        "jsonwebtoken": "9.0.1",
         "lodash": "4.17.21",
-        "logrotate-stream": "0.2.8",
-        "lru-cache": "6.0.0",
-        "material-design-lite": "1.3.0",
+        "logrotate-stream": "0.2.9",
+        "lru-cache": "10.0.1",
         "mime": "3.0.0",
-        "mkdirp": "1.0.4",
-        "mongodb": "4.4.1",
+        "mkdirp": "3.0.1",
+        "mongodb": "5.7.0",
         "morgan": "1.10.0",
         "mousetrap": "1.6.5",
         "multiparty": "4.2.3",
-        "@nodebb/bootswatch": "3.4.2",
-        "nconf": "0.11.3",
-        "nodebb-plugin-2factor": "3.0.5",
-        "nodebb-plugin-composer-default": "7.0.20",
-        "nodebb-plugin-dbsearch": "5.1.3",
-        "nodebb-plugin-emoji": "3.5.17",
-        "nodebb-plugin-emoji-android": "2.0.5",
-        "nodebb-plugin-markdown": "9.0.10",
-        "nodebb-plugin-mentions": "3.0.7",
-        "nodebb-plugin-spam-be-gone": "0.8.1",
-        "nodebb-rewards-essentials": "0.2.1",
-        "nodebb-theme-lavender": "5.3.2",
-        "nodebb-theme-persona": "11.4.3",
-        "nodebb-theme-slick": "1.4.23",
-        "nodebb-theme-vanilla": "12.1.17",
-        "nodebb-widget-essentials": "5.0.9",
-        "nodemailer": "6.7.3",
+        "nconf": "0.12.0",
+        "nodebb-plugin-2factor": "7.2.1",
+        "nodebb-plugin-composer-default": "10.2.11",
+        "nodebb-plugin-dbsearch": "6.2.0",
+        "nodebb-plugin-emoji": "5.1.5",
+        "nodebb-plugin-emoji-android": "4.0.0",
+        "nodebb-plugin-markdown": "12.1.7",
+        "nodebb-plugin-mentions": "4.3.4",
+        "nodebb-plugin-ntfy": "1.4.0",
+        "nodebb-plugin-spam-be-gone": "2.1.1",
+        "nodebb-rewards-essentials": "0.2.3",
+        "nodebb-theme-harmony": "1.1.35",
+        "nodebb-theme-lavender": "7.1.3",
+        "nodebb-theme-peace": "2.1.10",
+        "nodebb-theme-persona": "13.2.17",
+        "nodebb-widget-essentials": "7.0.13",
+        "nodemailer": "6.9.4",
         "nprogress": "0.2.0",
-        "passport": "0.5.2",
+        "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.12",
+        "pg": "8.11.2",
+        "pg-cursor": "2.10.2",
+        "postcss": "8.4.28",
         "postcss-clean": "1.2.0",
-        "prompt": "1.2.2",
-        "ioredis": "4.28.5",
+        "progress-webpack-plugin": "1.0.16",
+        "prompt": "1.3.0",
+        "ioredis": "5.3.2",
         "request": "2.88.2",
         "request-promise-native": "1.0.9",
-        "requirejs": "2.3.6",
-        "rimraf": "3.0.2",
+        "rimraf": "5.0.1",
         "rss": "1.2.2",
-        "sanitize-html": "2.7.0",
-        "semver": "7.3.5",
+        "rtlcss": "4.1.0",
+        "sanitize-html": "2.11.0",
+        "sass": "1.65.1",
+        "semver": "7.5.4",
         "serve-favicon": "2.5.0",
-        "sharp": "0.30.3",
+        "sharp": "0.32.5",
         "sitemap": "7.1.1",
-        "slideout": "1.0.1",
-        "socket.io": "4.4.1",
-        "socket.io-adapter-cluster": "1.0.1",
-        "socket.io-client": "4.4.1",
-        "@socket.io/redis-adapter": "7.1.0",
+        "socket.io": "4.7.2",
+        "socket.io-client": "4.7.2",
+        "@socket.io/redis-adapter": "8.2.1",
         "sortablejs": "1.15.0",
-        "spdx-license-list": "6.4.0",
-        "spider-detector": "2.0.0",
+        "spdx-license-list": "6.6.0",
+        "spider-detector": "2.0.1",
+        "terser-webpack-plugin": "5.3.9",
         "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",
-        "visibilityjs": "2.0.2",
-        "winston": "3.6.0",
+        "validator": "13.11.0",
+        "webpack": "5.88.2",
+        "webpack-merge": "5.9.0",
+        "winston": "3.10.0",
         "xml": "1.0.1",
-        "xregexp": "5.1.0",
-        "yargs": "17.4.0",
+        "xregexp": "5.1.1",
+        "yargs": "17.7.2",
         "zxcvbn": "4.4.2"
     },
     "devDependencies": {
-        "@apidevtools/swagger-parser": "10.0.3",
-        "@commitlint/cli": "16.2.3",
-        "@commitlint/config-angular": "16.2.3",
+        "@apidevtools/swagger-parser": "10.1.0",
+        "@commitlint/cli": "17.7.1",
+        "@commitlint/config-angular": "17.7.0",
         "coveralls": "3.1.1",
-        "eslint": "8.11.0",
-        "eslint-config-nodebb": "0.1.1",
-        "eslint-plugin-import": "2.25.4",
-        "grunt": "1.4.1",
+        "eslint": "8.47.0",
+        "eslint-config-nodebb": "0.2.1",
+        "eslint-plugin-import": "2.27.5",
+        "grunt": "1.6.1",
         "grunt-contrib-watch": "1.1.0",
-        "husky": "7.0.4",
-        "jsdom": "19.0.0",
-        "lint-staged": "12.3.7",
-        "mocha": "9.2.2",
+        "husky": "8.0.3",
+        "jsdom": "22.1.0",
+        "lint-staged": "14.0.0",
+        "mocha": "10.2.0",
         "mocha-lcov-reporter": "1.3.0",
         "mockdate": "3.0.5",
         "nyc": "15.1.0",
-        "smtp-server": "3.10.0"
+        "smtp-server": "3.13.0"
+    },
+    "optionalDependencies": {
+        "sass-embedded": "1.64.2"
+    },
+    "resolutions": {
+        "*/jquery": "3.7.0"
     },
     "bugs": {
         "url": "https://github.com/NodeBB/NodeBB/issues"
@@ -168,11 +183,6 @@
         "node": ">=12"
     },
     "maintainers": [
-        {
-            "name": "Andrew Rodrigues",
-            "email": "andrew@nodebb.org",
-            "url": "https://github.com/psychobunny"
-        },
         {
             "name": "Julian Lam",
             "email": "julian@nodebb.org",

install/web.js

@@ -6,14 +6,14 @@ const bodyParser = require('body-parser');
 const fs = require('fs');
 const path = require('path');
 const childProcess = require('child_process');
-const less = require('less');
 
-const uglify = require('uglify-es');
+const webpack = require('webpack');
 const nconf = require('nconf');
 
 const Benchpress = require('benchpressjs');
-const mkdirp = require('mkdirp');
+const { mkdirp } = require('mkdirp');
 const { paths } = require('../src/constants');
+const sass = require('../src/utils').getSass();
 
 const app = express();
 let server;
@@ -46,20 +46,13 @@ winston.configure({
 });
 
 const web = module.exports;
-
-const scripts = [
-	'node_modules/jquery/dist/jquery.js',
-	'node_modules/xregexp/xregexp-all.js',
-	'public/src/modules/slugify.js',
-	'public/src/utils.js',
-	'public/src/installer/install.js',
-	'node_modules/zxcvbn/dist/zxcvbn.js',
-];
-
 let installing = false;
 let success = false;
 let error = false;
 let launchUrl;
+let timeStart = 0;
+const totalTime = 1000 * 60 * 3;
+
 
 const viewsDir = path.join(paths.baseDir, 'build/public/templates');
 
@@ -68,6 +61,8 @@ web.install = async function (port) {
 	winston.info(`Launching web installer on port ${port}`);
 
 	app.use(express.static('public', {}));
+	app.use('/assets', express.static(path.join(__dirname, '../build/public'), {}));
+
 	app.engine('tpl', (filepath, options, callback) => {
 		filepath = filepath.replace(/\.tpl$/, '.js');
 
@@ -81,8 +76,8 @@ web.install = async function (port) {
 	try {
 		await Promise.all([
 			compileTemplate(),
-			compileLess(),
-			compileJS(),
+			compileSass(),
+			runWebpack(),
 			copyCSS(),
 			loadDefaults(),
 		]);
@@ -93,6 +88,13 @@ web.install = async function (port) {
 	}
 };
 
+async function runWebpack() {
+	const util = require('util');
+	const webpackCfg = require('../webpack.installer');
+	const compiler = webpack(webpackCfg);
+	const webpackRun = util.promisify(compiler.run).bind(compiler);
+	await webpackRun();
+}
 
 function launchExpress(port) {
 	server = app.listen(port, () => {
@@ -103,11 +105,32 @@ function launchExpress(port) {
 function setupRoutes() {
 	app.get('/', welcome);
 	app.post('/', install);
-	app.post('/launch', launch);
+	app.get('/testdb', testDatabase);
 	app.get('/ping', ping);
 	app.get('/sping', ping);
 }
 
+async function testDatabase(req, res) {
+	let db;
+	try {
+		const keys = Object.keys(req.query);
+		const dbName = keys[0].split(':')[0];
+		db = require(`../src/database/${dbName}`);
+
+		const opts = {};
+		keys.forEach((key) => {
+			opts[key.replace(`${dbName}:`, '')] = req.query[key];
+		});
+
+		await db.init(opts);
+		const global = await db.getObject('global');
+		await db.close();
+		res.json({ success: 1, dbfull: !!global });
+	} catch (err) {
+		res.json({ error: err.stack });
+	}
+}
+
 function ping(req, res) {
 	res.status(200).send(req.path === '/sping' ? 'healthy' : '200');
 }
@@ -124,7 +147,6 @@ function welcome(req, res) {
 	});
 
 	const defaults = require('./data/defaults.json');
-
 	res.render('install/index', {
 		url: nconf.get('url') || (`${req.protocol}://${req.get('host')}`),
 		launchUrl: launchUrl,
@@ -137,6 +159,7 @@ function welcome(req, res) {
 		minimumPasswordLength: defaults.minimumPasswordLength,
 		minimumPasswordStrength: defaults.minimumPasswordStrength,
 		installing: installing,
+		percentInstalled: installing ? ((Date.now() - timeStart) / totalTime * 100).toFixed(2) : 0,
 	});
 }
 
@@ -144,6 +167,7 @@ function install(req, res) {
 	if (installing) {
 		return welcome(req, res);
 	}
+	timeStart = Date.now();
 	req.setTimeout(0);
 	installing = true;
 
@@ -171,21 +195,22 @@ function install(req, res) {
 	const child = require('child_process').fork('app', ['--setup'], {
 		env: setupEnvVars,
 	});
-
+	child.on('error', (err) => {
+		error = true;
+		success = false;
+		winston.error(err.stack);
+	});
 	child.on('close', (data) => {
-		installing = false;
 		success = data === 0;
 		error = data !== 0;
-
-		welcome(req, res);
+		launch();
 	});
+	welcome(req, res);
 }
 
-async function launch(req, res) {
+async function launch() {
 	try {
-		res.json({});
 		server.close();
-		req.setTimeout(0);
 		let child;
 
 		if (!nconf.get('launchCmd')) {
@@ -207,15 +232,20 @@ async function launch(req, res) {
 		}
 
 		const filesToDelete = [
-			'installer.css',
-			'installer.min.js',
-			'bootstrap.min.css',
+			path.join(__dirname, '../public', 'installer.css'),
+			path.join(__dirname, '../public', 'bootstrap.min.css'),
+			path.join(__dirname, '../build/public', 'installer.min.js'),
 		];
-		await Promise.all(
-			filesToDelete.map(
-				filename => fs.promises.unlink(path.join(__dirname, '../public', filename))
-			)
-		);
+		try {
+			await Promise.all(
+				filesToDelete.map(
+					filename => fs.promises.unlink(filename)
+				)
+			);
+		} catch (err) {
+			console.log(err.stack);
+		}
+
 		child.unref();
 		process.exit(0);
 	} catch (err) {
@@ -243,40 +273,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 compileJS() {
-	let code = '';
-
-	for (const srcPath of scripts) {
-		// eslint-disable-next-line no-await-in-loop
-		const buffer = await fs.promises.readFile(path.join(__dirname, '..', srcPath));
-		code += buffer.toString();
-	}
-	const minified = uglify.minify(code, {
-		compress: false,
-	});
-	if (!minified.code) {
-		throw new Error('[[error:failed-to-minify]]');
-	}
-	await fs.promises.writeFile(path.join(__dirname, '../public/installer.min.js'), minified.code);
-}
-
 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() {

loader.js

@@ -6,7 +6,7 @@ const url = require('url');
 const path = require('path');
 const { fork } = require('child_process');
 const logrotate = require('logrotate-stream');
-const mkdirp = require('mkdirp');
+const { mkdirp } = require('mkdirp');
 
 const file = require('./src/file');
 const pkg = require('./package.json');
@@ -30,9 +30,7 @@ const output = logrotate({ file: outputLogFilePath, size: '1m', keep: 3, compres
 const silent = nconf.get('silent') === 'false' ? false : nconf.get('silent') !== false;
 let numProcs;
 const workers = [];
-const Loader = {
-	timesStarted: 0,
-};
+const Loader = {};
 const appPath = path.join(__dirname, 'app.js');
 
 Loader.init = function () {
@@ -57,21 +55,6 @@ Loader.displayStartupMessages = function () {
 
 Loader.addWorkerEvents = function (worker) {
 	worker.on('exit', (code, signal) => {
-		if (code !== 0) {
-			if (Loader.timesStarted < numProcs * 3) {
-				Loader.timesStarted += 1;
-				if (Loader.crashTimer) {
-					clearTimeout(Loader.crashTimer);
-				}
-				Loader.crashTimer = setTimeout(() => {
-					Loader.timesStarted = 0;
-				}, 10000);
-			} else {
-				console.log(`${numProcs * 3} restarts in 10 seconds, most likely an error on startup. Halting.`);
-				process.exit();
-			}
-		}
-
 		console.log(`[cluster] Child Process (${worker.pid}) has exited (code: ${code}, signal: ${signal})`);
 		if (!(worker.suicide || code === 0)) {
 			console.log('[cluster] Spinning up another process...');

public/503.html

@@ -6,7 +6,6 @@
 	body {
 		background: #00A9EA;
 		color: white;
-		/* see public/less/admin/vars.less for documentation on system font family */
 		font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
 		text-align: center;
 		-webkit-transform-style: preserve-3d;

public/language/README.md

@@ -3,7 +3,7 @@
 The files here are read-only and overwritten daily (if there are changes) by the
 helper bot [Misty](https://github.com/nodebb-misty).
 
-Our localisation efforts are handled via [our Transifex Project](https://www.transifex.com/nodebb/nodebb/),
+Our localisation efforts are handled via [our Transifex Project](https://explore.transifex.com/nodebb/nodebb/),
 and any pull requests made to this directory will be automatically closed because
 localisations can go out-of-sync when edited directly.
 

public/language/ar/_DO_NOT_EDIT_FILES_HERE.md

@@ -0,0 +1,3 @@
+# The files here are not meant to be edited directly
+
+Please see the → [Internalization README](../README.md).

public/language/ar/admin/admin.json

@@ -6,6 +6,13 @@
 	"settings-header-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)"
+	"changes-not-saved": "لم يتم حفظ التغييرات",
+	"changes-not-saved-message": "حدثت مشكلة أثناء حفظ التغييرات في NodeBB. (%1)",
+	"save-changes": "Save changes",
+	"min": "Min:",
+	"max": "Max:",
+	"view": "View",
+	"edit": "Edit",
+	"add": "Add",
+	"select-icon": "Select Icon"
 }

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

@@ -1,5 +1,9 @@
 {
+	"cache": "Cache",
 	"post-cache": "التخزين المؤقت للمشاركات",
+	"group-cache": "التخزين المؤقت للمجموعات",
+	"local-cache": "تخزين مؤقت محلي",
+	"object-cache": "تخزين مؤقت للأشياء",
 	"percent-full": "1% كاملة",
 	"post-cache-size": "حجم التخزين المؤقت للمشاركات",
 	"items-in-cache": "العناصر في التخزين المؤقت"

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

@@ -1,52 +1,52 @@
 {
-	"x-b": "%1 b",
-	"x-mb": "%1 mb",
-	"x-gb": "%1 gb",
-	"uptime-seconds": "Uptime in Seconds",
-	"uptime-days": "Uptime in Days",
+	"x-b": "٪1 بايت",
+	"x-mb": "٪1 ميقا بايت",
+	"x-gb": "٪1 قيقا بايت",
+	"uptime-seconds": "مدة التشغيل بالثواني",
+	"uptime-days": "مدة التشغيل بالأيام",
 
-	"mongo": "Mongo",
-	"mongo.version": "MongoDB Version",
-	"mongo.storage-engine": "Storage Engine",
-	"mongo.collections": "Collections",
-	"mongo.objects": "Objects",
-	"mongo.avg-object-size": "Avg. Object Size",
-	"mongo.data-size": "Data Size",
-	"mongo.storage-size": "Storage Size",
-	"mongo.index-size": "Index Size",
-	"mongo.file-size": "File Size",
-	"mongo.resident-memory": "Resident Memory",
+	"mongo": "MongoDB",
+	"mongo.version": "اصدار MongoDB",
+	"mongo.storage-engine": "محرك التخزين",
+	"mongo.collections": "التجميعات",
+	"mongo.objects": "العناصر",
+	"mongo.avg-object-size": "معدل حجم العناصر",
+	"mongo.data-size": "حجم البيانات",
+	"mongo.storage-size": "حجم التخرين",
+	"mongo.index-size": "حجم الفهرس",
+	"mongo.file-size": "حجم الملف",
+	"mongo.resident-memory": "الذاكرة الساكنة",
 	"mongo.virtual-memory": "الذاكرة الإفتراضية",
-	"mongo.mapped-memory": "Mapped Memory",
-	"mongo.bytes-in": "Bytes In",
-	"mongo.bytes-out": "Bytes Out",
-	"mongo.num-requests": "Number of Requests",
-	"mongo.raw-info": "MongoDB Raw Info",
-	"mongo.unauthorized": "NodeBB was unable to query the MongoDB database for relevant statistics. Please ensure that the user in use by NodeBB contains the "clusterMonitor" role for the "admin" database.",
+	"mongo.mapped-memory": "الذاكرة المعينة",
+	"mongo.bytes-in": "البايتات الواردة",
+	"mongo.bytes-out": "البايتات الصادرة",
+	"mongo.num-requests": "عدد الطلبات",
+	"mongo.raw-info": "معلومات MongoDB الأولية",
+	"mongo.unauthorized": "لم يستطع NodeBB من الاستعلام عن احصاءات قواعد البيانات ل MongoDB. الرجاء التأكد من أن المستخدم في NodeBB يحتوي على دور "clusterMonitor" ال "admin" لقواعد البيانات.",
 
 	"redis": "Redis",
-	"redis.version": "Redis Version",
-	"redis.keys": "Keys",
-	"redis.expires": "Expires",
-	"redis.avg-ttl": "Average TTL",
-	"redis.connected-clients": "Connected Clients",
-	"redis.connected-slaves": "Connected Slaves",
-	"redis.blocked-clients": "Blocked Clients",
+	"redis.version": "إصدار Redis",
+	"redis.keys": "المفاتيح",
+	"redis.expires": "ينتهي ",
+	"redis.avg-ttl": "متوسط وقت الانعاش",
+	"redis.connected-clients": "العميل المتصل",
+	"redis.connected-slaves": "البدلاء المتصلين",
+	"redis.blocked-clients": "العملاء المحظورون",
 	"redis.used-memory": "الذاكرة المستخدمة",
-	"redis.memory-frag-ratio": "Memory Fragmentation Ratio",
+	"redis.memory-frag-ratio": "نسبة تجزئة الذاكرة",
 	"redis.total-connections-recieved": "إجمالي الاتصالات المستلمة",
 	"redis.total-commands-processed": "إجمالي الأوامر التي تمت معالجتها",
-	"redis.iops": "Instantaneous Ops. Per Second",
-	"redis.iinput": "Instantaneous Input Per Second",
-	"redis.ioutput": "Instantaneous Output Per Second",
-	"redis.total-input": "Total Input",
-	"redis.total-output": "Total Ouput",
+	"redis.iops": "العمليات اللحظية في الثانية",
+	"redis.iinput": "الإدخال الفوري في الثانية",
+	"redis.ioutput": "المخرجات الفورية في الثانية",
+	"redis.total-input": "مجموع المدخلات",
+	"redis.total-output": "مجموع المخرجات",
 
-	"redis.keyspace-hits": "Keyspace Hits",
-	"redis.keyspace-misses": "Keyspace Misses",
-	"redis.raw-info": "Redis Raw Info",
+	"redis.keyspace-hits": "المفاتيح المضغوطة",
+	"redis.keyspace-misses": "المفاتيح المخفقة",
+	"redis.raw-info": "معلومات Redis الأولية",
 
 	"postgres": "Postgres",
-	"postgres.version": "PostgreSQL Version",
-	"postgres.raw-info": "Postgres Raw Info"
+	"postgres.version": "إصدار PostgreSQL",
+	"postgres.raw-info": "معلومات Postgres الأولية"
 }

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

@@ -1,4 +1,5 @@
 {
+	"errors": "Errors",
 	"figure-x": "شكل %1",
 	"error-events-per-day": "<code>%1</code> حدث كل يوم ",
 	"error.404": "404 لم يتم العثور",

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

@@ -3,7 +3,7 @@
 	"no-events": "لا توجد أحداث",
 	"control-panel": "لوحة تحكم الأحداث",
 	"delete-events": "حذف الاحداث",
-	"confirm-delete-all-events": "Are you sure you want to delete all logged events?",
+	"confirm-delete-all-events": "هل أنت متاكد أنك تريد حذف كل سجل اﻻحداث؟",
 	"filters": "تصفية",
 	"filters-apply": "تطبيق التصفية",
 	"filter-type": "نوع الحدث",

public/language/ar/admin/appearance/customise.json

@@ -1,16 +1,20 @@
 {
-	"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",
+	"customise": "Customise",
+	"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": "Javascript مخصصة",
 	"custom-js.description": "أدخل Javascript الخاص بك هنا. سيتم تنفيذها بعد تحميل الصفحة بالكامل.",
 	"custom-js.enable": "تفعيل Javascript المخصصة",
 
 	"custom-header": "ترويسة مخصصة",
-	"custom-header.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup. Script tags are allowed, but are discouraged, as the <a href=\"#custom-js\" data-toggle=\"tab\">Custom Javascript</a> tab is available.",
+	"custom-header.description": "أدخل وسوم HTML المخصصة هنا (مثل: Meta Tags, وغيرها)، والتي سيتم تضمينها لجزئية <code>&lt;head&gt;</code> من ترميز المنتدى. يُسمح بعلامات البرمجة النصية، ولكن لا يُنصح بها ، نظرًا لأن علامة التبويب <a href=\"#custom-js\" data-toggle=\"tab\"> Custom Javascript </a> متاحة.",
 	"custom-header.enable": "تفعيل الترويسة المخصصة",
 
 	"custom-css.livereload": "تفعيل إعادة التحميل المباشرة",
-	"custom-css.livereload.description": "فعل هذا الخيار لإجبار جميع الجلسات في الأجهزة التي قمت بتسجيل الدخول فيها  بحسابك على التحديث عند النقر على زر الحفظ"
+	"custom-css.livereload.description": "فعل هذا الخيار لإجبار جميع الجلسات في الأجهزة التي قمت بتسجيل الدخول فيها  بحسابك على التحديث عند النقر على زر الحفظ",
+	"bsvariables": "_variables.scss",
+	"bsvariables.description": "Override bootstrap variables here. You can also use a tool like <a href=\"https://bootstrap.build/app\">bootstrap.build</a> and paste the output here.<br/>Changes require a rebuild & restart.",
+	"bsvariables.enable": "Enable _variables.scss"
 }

public/language/ar/admin/appearance/skins.json

@@ -1,7 +1,16 @@
 {
+	"skins": "Skins",
+	"bootswatch-skins": "Bootswatch Skins",
+	"custom-skins": "Custom Skins",
+	"add-skin": "Add Skin",
+	"save-custom-skins": "Save Custom Skins",
+	"save-custom-skins-success": "Custom skins saved successfully",
+	"custom-skin-name": "Custom Skin Name",
+	"custom-skin-variables": "Custom Skin Variables",
 	"loading": "جاري تحميل السمات...",
 	"homepage": "الصفحة الرئيسية",
 	"select-skin": "إختيار السمة",
+	"revert-skin": "Revert Skin",
 	"current-skin": "السمة الحالية",
 	"skin-updated": "تم تحديث السمة",
 	"applied-success": "تم تطبيق السمة %1 بنجاح",

public/language/ar/admin/appearance/themes.json

@@ -1,11 +1,13 @@
 {
+    "themes": "Themes",
     "checking-for-installed": "جاري التحقق من القوالب المثبتة...",
     "homepage": "الصفحة الرئيسية",
     "select-theme": "إختيار القالب",
+    "revert-theme": "Revert Theme",
     "current-theme": "القالب المستخدم حالياً",
     "no-themes": "لم يتم العثور على قوالب مثبتة",
     "revert-confirm": "هل أنت متأكد من أنك ترغب في استعادة قااب NodeBB الافتراضي؟",
     "theme-changed": "تم تغيير القالب",
     "revert-success": "لقد قمت بنجاح بإستعادة القالب الأساسي لـNodeBB",
-    "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
+    "restart-to-activate": "يرجى إعادة بناء وإعادة تشغيل NodeBB لتنشيط هذا الثيم."
 }

public/language/ar/admin/dashboard.json

@@ -1,9 +1,9 @@
 {
-	"forum-traffic": "Forum Traffic",
+	"forum-traffic": "حركة المنتدى",
 	"page-views": "مشاهدات الصفحات",
 	"unique-visitors": "زائرين فريدين",
-	"logins": "Logins",
-	"new-users": "New Users",
+	"logins": "عمليات تسجيل الدخول",
+	"new-users": "مستخدم جديد",
 	"posts": "مشاركات",
 	"topics": "مواضيع",
 	"page-views-seven": "آخر 7 ايام",
@@ -15,24 +15,24 @@
 	"page-views-custom-help": "أدخل نطاقا زمنيا لمرات مشاهدة الصفحات التي ترغب في عرضها. إذا لم يظهر منتقي التاريخ، فإن التنسيق المقبول هو <code>YYYY-MM-DD</code>",
 	"page-views-custom-error": "الرجاء إدخال نطاق تاريخ صالح بالتنسيق <code>YYYY-MM-DD</code>",
 
-	"stats.yesterday": "Yesterday",
-	"stats.today": "Today",
-	"stats.last-week": "Last Week",
-	"stats.this-week": "This Week",
-	"stats.last-month": "Last Month",
-	"stats.this-month": "This Month",
+	"stats.yesterday": "الأمس",
+	"stats.today": "اليوم",
+	"stats.last-week": "الاسبوع الماضي",
+	"stats.this-week": "هذا الاسبوع",
+	"stats.last-month": "الشهر الماضي",
+	"stats.this-month": "هذا الشهر",
 	"stats.all": "كل الوقت",
 
 	"updates": "تحديثات",
 	"running-version": "المنتدى يعمل حاليا على <strong>NodeBB الإصدار<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "تأكد دائما من أن NodeBB يعمل على احدث إصدار للحصول على أحدث التصحيحات الأمنية وإصلاحات الأخطاء.",
-	"up-to-date": "<p>المنتدى <strong>يعمل على أحدث إصدار</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">upgrading your NodeBB</a>.</p>",
-	"prerelease-warning": "<p>هذه نسخة <strong>ماقبل الإصدار</strong> من NodeBB. قد تحدث أخطاء غير مقصودة. <i class=\"fa fa-exclamation-triangle\"></i></p>",
-	"fallback-emailer-not-found": "Fallback emailer not found!",
-	"running-in-development": "المنتدى قيد التشغيل في وضع \"المطورين\". وقد تكون هناك ثغرات أمنية مفتوحة؛ من فضلك تواصل مع مسؤول نظامك.",
-	"latest-lookup-failed": "<p>Failed to look up latest available version of NodeBB</p>",
+	"up-to-date": "You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i>",
+	"upgrade-available": "A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">upgrading your NodeBB</a>.",
+	"prerelease-upgrade-available": "This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">upgrading your NodeBB</a>.",
+	"prerelease-warning": "This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i>",
+	"fallback-emailer-not-found": "مرسل البريد الإلكتروني الاحتياطي غير موجود!",
+	"running-in-development": "Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator",
+	"latest-lookup-failed": "Failed to look up latest available version of NodeBB",
 
 	"notices": "إشعارات",
 	"restart-not-required": "إعادة التشغيل غير مطلوب",
@@ -42,22 +42,23 @@
 	"search-plugin-tooltip": "نصب إضافة البحث من صفحة الإضافات البرمجية لتنشيط وظيفة البحث",
 
 	"control-panel": "التحكم بالنظام",
-	"rebuild-and-restart": "Rebuild &amp; Restart",
-	"restart": "Restart",
-	"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
-	"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
+	"rebuild-and-restart": "أعد البناء &amp; وأعد التشغيل",
+	"restart": "أعد التشغيل",
+	"restart-warning": "ستؤدي إعادة بناء أو إعادة تشغيل NodeBB إلى إنقطاع الاتصال بالمنتدى لبضع ثوان.",
+	"restart-disabled": "تم تعطيل إعادة بناء NodeBB وإعادة تشغيله حيث لا يبدو أنك تقوم بتشغيله عبر البرنامج الخفي المناسب.",
 	"maintenance-mode": "وضع الصيانة",
 	"maintenance-mode-title": "انقر هنا لإعداد وضع الصيانة لـNodeBB",
+	"dark-mode": "Dark Mode",
 	"realtime-chart-updates": "التحديث الفوري للرسم البياني",
 
 	"active-users": "المستخدمين النشطين",
 	"active-users.users": "الأعضاء",
 	"active-users.guests": "الزوار",
 	"active-users.total": "المجموع",
-	"active-users.connections": "Connections",
+	"active-users.connections": "روابط الاتصال",
 
-	"guest-registered-users": "Guest vs Registered Users",
-	"guest": "Guest",
+	"guest-registered-users": "الزائر مقابل المستخدمين المسجلين",
+	"guest": "الزائر",
 	"registered": "مسجل",
 
 	"user-presence": "تواجد المستخدمين",
@@ -68,23 +69,30 @@
 	"unread": "غير مقروء",
 
 	"high-presence-topics": "مواضيع ذات حضور قوي",
-	"popular-searches": "Popular Searches",
+	"popular-searches": "عمليات البحث الشائعة",
 
 	"graphs.page-views": "مشاهدات الصفحة",
-	"graphs.page-views-registered": "Page Views Registered",
-	"graphs.page-views-guest": "Page Views Guest",
-	"graphs.page-views-bot": "Page Views Bot",
+	"graphs.page-views-registered": "زيارات الصفحات المسجلة",
+	"graphs.page-views-guest": "زيارات الصفحات للزوار",
+	"graphs.page-views-bot": "زيارات الصفحات الآلية",
 	"graphs.unique-visitors": "زوار فريدين",
 	"graphs.registered-users": "مستخدمين مسجلين",
-	"graphs.guest-users": "Guest Users",
-	"last-restarted-by": "Last restarted by",
-	"no-users-browsing": "No users browsing",
+	"graphs.guest-users": "المستخدمين الزوار",
+	"last-restarted-by": "آخر إعادة تشغيل بواسطة",
+	"no-users-browsing": "لا يوجد مستخدمين يتصفحون",
 
-	"back-to-dashboard": "Back to Dashboard",
-	"details.no-users": "No users have joined within the selected timeframe",
-	"details.no-topics": "No topics have been posted within the selected timeframe",
-	"details.no-searches": "No searches have been made yet",
-	"details.no-logins": "No logins have been recorded within the selected timeframe",
-	"details.logins-static": "NodeBB only saves session data for %1 days, and so this table below will only show the most recently active sessions",
-	"details.logins-login-time": "Login Time"
+	"back-to-dashboard": "العودة للوحة التحكم",
+	"details.no-users": "لم ينضم أي مستخدم خلال الإطار الزمني المحدد",
+	"details.no-topics": "لم يتم نشر أي مواضيع خلال الإطار الزمني المحدد",
+	"details.no-searches": "لم يتم إجراء أي بحث خلال الإطار الزمني المحدد",
+	"details.no-logins": "لم يوثق أي تسجيل دخول خلال الإطار الزمني المحدد",
+	"details.logins-static": "يقوم NodeBB بحفظ بيانات الجلسة لمدة ٪1 يوم/أيام فقط، ولذا فإن هذا الجدول أدناه سيعرض فقط أحدث الجلسات النشطة",
+	"details.logins-login-time": "وقت تسجيل الدخول",
+	"start": "بدء",
+	"end": "إنهاء",
+	"filter": "تصفية",
+	"view-as-json": "View as JSON",
+	"expand-analytics": "Expand analytics",
+	"clear-search-history": "Clear Search History",
+	"clear-search-history-confirm": "Are you sure you want to clear entire search history?"
 }

public/language/ar/admin/development/info.json

@@ -1,8 +1,8 @@
 {
-	"you-are-on": "You are on <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</strong>",
-	"nodes-responded": "%1 nodes responded within %2ms!",
-	"host": "host",
+	"you-are-on": "أنت في <strong> %1:%2 </strong>",
+	"ip": "رقم الآي بي <strong> %1 </strong>",
+	"nodes-responded": "عدد %1 نقطة/نقاط استجابوا خلال %2 جزء من الثانية.",
+	"host": "المضيف",
 	"primary": "primary / run jobs",
 	"pid": "pid",
 	"nodejs": "nodejs",

public/language/ar/admin/development/logger.json

@@ -1,12 +1,13 @@
 {
-	"logger-settings": "Logger Settings",
-	"description": "By enabling the check boxes, you will receive logs to your terminal. If you specify a path, logs will then be saved to a file instead. HTTP logging is useful for collecting statistics about who, when, and what people access on your forum. In addition to logging HTTP requests, we can also log socket.io events. Socket.io logging, in combination with redis-cli monitor, can be very helpful for learning NodeBB's internals.",
-	"explanation": "Simply check/uncheck the logging settings to enable or disable logging on the fly. No restart needed.",
-	"enable-http": "Enable HTTP logging",
-	"enable-socket": "Enable socket.io event logging",
-	"file-path": "Path to log file",
-	"file-path-placeholder": "/path/to/log/file.log ::: leave blank to log to your terminal",
+	"logger": "Logger",
+	"logger-settings": "إعدادات المسجِّل",
+	"description": "من خلال تمكين مربعات الاختيار ، ستتلقى سجلات إلى جهازك الطرفي. إذا حددت مسارًا ، فسيتم بعد ذلك حفظ السجلات في ملف بدلاً من ذلك. يعد تسجيل HTTP مفيدًا لجمع الإحصائيات حول من ومتى وماذا يصل الأشخاص في المنتدى. بالإضافة إلى تسجيل طلبات HTTP ، يمكننا أيضًا تسجيل أحداث socket.io. يمكن أن يكون تسجيل Socket.io ، جنبًا إلى جنب مع شاشة redis-cli ، مفيدًا جدًا في تعلم العناصر الداخلية لـ NodeBB.",
+	"explanation": "ما عليك سوى تحديدأو/ إلغاء تحديد إعدادات التسجيل لتمكين أو تعطيل التسجيل أثناء التنقل. لا حاجة لإعادة التشغيل.",
+	"enable-http": "تمكين سجلات HTTP",
+	"enable-socket": "تفعيل تسجيل أحداث socket.io",
+	"file-path": "مسار ملف السجل",
+	"file-path-placeholder": "/path/to/log/file.log ::: اتركه فارغا لاظهار السجلات لنافذة الطرفية",
 
-	"control-panel": "Logger Control Panel",
-	"update-settings": "Update Logger Settings"
+	"control-panel": "لوحة تحكم المسجل",
+	"update-settings": "تحديث إعدادات المسجل"
 }

public/language/ar/admin/extend/plugins.json

@@ -1,4 +1,5 @@
 {
+	"plugins": "Plugins",
 	"trending": "Trending",
 	"installed": "منصبة",
 	"active": "مفعلة",

public/language/ar/admin/extend/rewards.json

@@ -1,15 +1,17 @@
 {
-	"rewards": "Rewards",
-	"condition-if-users": "If User's",
-	"condition-is": "Is:",
-	"condition-then": "Then:",
-	"max-claims": "Amount of times reward is claimable",
-	"zero-infinite": "Enter 0 for infinite",
-	"delete": "Delete",
-	"enable": "Enable",
-	"disable": "Disable",
+	"rewards": "المكافآت",
+	"add-reward": "Add reward",
+	"condition-if-users": "إذا كان للمستخدم",
+	"condition-is": "يكون: ",
+	"condition-then": "عندئذ:",
+	"max-claims": "عدد المرات التي يمكن فيها المطالبة بالمكافأة",
+	"zero-infinite": "أدخل 0 للقيمة اللانهائية",
+	"select-reward": "Select reward",
+	"delete": "احذف",
+	"enable": "مكّن",
+	"disable": "عطّل",
 
-	"alert.delete-success": "Successfully deleted reward",
-	"alert.no-inputs-found": "Illegal reward - no inputs found!",
-	"alert.save-success": "Successfully saved rewards"
+	"alert.delete-success": "المكافآت المحذوفة بنجاح",
+	"alert.no-inputs-found": "مكافأة غير قانونية - لم يتم العثور على مدخلات!",
+	"alert.save-success": "المكافآت المحفوظة بنجاح"
 }

public/language/ar/admin/extend/widgets.json

@@ -1,4 +1,5 @@
 {
+	"widgets": "Widgets",
 	"available": "Available Widgets",
 	"explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.",
 	"none-installed": "No widgets found! Activate the widget essentials plugin in the <a href=\"%1\">plugins</a> control panel.",
@@ -8,9 +9,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?",
@@ -26,5 +27,7 @@
 	"container.placeholder": "Drag and drop a container or enter HTML here.",
 	"show-to-groups": "Show to groups",
 	"hide-from-groups": "Hide from groups",
+	"start-date": "Start date",
+	"end-date": "End date",
 	"hide-on-mobile": "Hide on mobile"
 }

public/language/ar/admin/manage/admins-mods.json

@@ -1,8 +1,11 @@
 {
+    "manage-admins-and-mods": "Manage Admins & Mods",
     "administrators": "Administrators",
     "global-moderators": "Global Moderators",
+    "moderators": "Moderators",
     "no-global-moderators": "No Global Moderators",
-    "moderators-of-category": "%1 Moderators",
+    "no-sub-categories": "No subcategories",
+    "view-children": "View children (%1)",
     "no-moderators": "No Moderators",
     "add-administrator": "Add Administrator",
     "add-global-moderator": "Add Global Moderator",

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

@@ -1,7 +1,11 @@
 {
+	"manage-categories": "Manage Categories",
+	"add-category": "Add category",
+	"jump-to": "Jump to...",
 	"settings": "اعدادات القسم",
+	"edit-category": "Edit Category",
 	"privileges": "الصلاحيات",
-
+	"back-to-categories": "Back to categories",
 	"name": "Category Name",
 	"description": "Category Description",
 	"bg-color": "Background Colour",
@@ -15,8 +19,10 @@
 	"post-queue": "Post queue",
 	"tag-whitelist": "Tag Whitelist",
 	"upload-image": "Upload Image",
+	"upload": "Upload",
 	"delete-image": "Remove",
 	"category-image": "Category Image",
+	"image-and-icon": "Image & Icon",
 	"parent-category": "Parent Category",
 	"optional-parent-category": "(Optional) Parent Category",
 	"top-level": "Top Level",
@@ -31,6 +37,7 @@
 	"disable": "Disable",
 	"edit": "Edit",
 	"analytics": "Analytics",
+
 	"view-category": "View category",
 	"set-order": "Set order",
 	"set-order-help": "Setting the order of the category will move this category to that order and update the order of other categories as necessary. Minimum order is 1 which puts the category at the top.",

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

@@ -1,4 +1,10 @@
 {
+	"manage-groups": "Manage Groups",
+	"add-group": "Add group",
+	"edit-group": "Edit Group",
+	"back-to-groups": "Back to groups",
+	"view-group": "View group",
+	"icon-and-title": "Icon & Title",
 	"name": "اسم المجموعة",
 	"badge": "Badge",
 	"properties": "Properties",
@@ -10,7 +16,7 @@
 	"edit": "Edit",
 	"delete": "Delete",
 	"privileges": "Privileges",
-	"download-csv": "CSV",
+	"members-csv": "Members (CSV)",
 	"search-placeholder": "Search",
 	"create": "Create Group",
 	"description-placeholder": "A short description about your group",
@@ -39,6 +45,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/ar/admin/manage/privileges.json

@@ -1,4 +1,6 @@
 {
+	"manage-privileges": "Manage Privileges",
+	"discard-changes": "Discard changes",
 	"global": "Global",
 	"admin": "Admin",
 	"group-privileges": "Group Privileges",
@@ -49,7 +51,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/ar/admin/manage/registration.json

@@ -1,20 +1,20 @@
 {
-	"queue": "Queue",
+	"queue": "الطابور",
 	"description": "There are no users in the registration queue. <br> To enable this feature, go to <a href=\"%1\">Settings &rarr; User &rarr; User Registration</a> and set <strong>Registration Type</strong> to \"Admin Approval\".",
 
-	"list.name": "Name",
-	"list.email": "Email",
+	"list.name": "اﻹسم",
+	"list.email": "البريد الإلكتروني",
 	"list.ip": "IP",
-	"list.time": "Time",
+	"list.time": "التوقيت",
 	"list.username-spam": "Frequency: %1 Appears: %2 Confidence: %3",
 	"list.email-spam": "Frequency: %1 Appears: %2",
 	"list.ip-spam": "Frequency: %1 Appears: %2",
 
-	"invitations": "Invitations",
+	"invitations": "الدعوات",
 	"invitations.description": "Below is a complete list of invitations sent. Use ctrl-f to search through the list by email or username. <br><br>The username will be displayed to the right of the emails for users who have redeemed their invitations.",
-	"invitations.inviter-username": "Inviter Username",
-	"invitations.invitee-email": "Invitee Email",
-	"invitations.invitee-username": "Invitee Username (if registered)",
+	"invitations.inviter-username": "أسم المستخدم الداعي",
+	"invitations.invitee-email": "البريد اﻻلكتروني للمدعو",
+	"invitations.invitee-username": "اسم المستخم للمدعو (اذا كان مسجل)",
 
-	"invitations.confirm-delete": "Are you sure you wish to delete this invitation?"
+	"invitations.confirm-delete": "هل أنت متأكد من أنك تريد حذف هذه الدعوة؟"
 } 

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

@@ -1,9 +1,11 @@
 {
+	"manage-tags": "Manage Tags",
 	"none": "Your forum does not have any topics with tags yet.",
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
+	"add-tag": "Add tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",

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

@@ -1,4 +1,5 @@
 {
+    "manage-uploads": "Manage Uploads",
     "upload-file": "Upload File",
     "filename": "Filename",
     "usage": "Post Usage",

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

@@ -1,4 +1,5 @@
 {
+	"manage-users": "Manage Users",
 	"users": "المستخدمين",
 	"edit": "Actions",
 	"make-admin": "Make Admin",
@@ -17,6 +18,7 @@
 	"purge": "Delete <strong>User(s)</strong> and <strong>Content</strong>",
 	"download-csv": "Download CSV",
 	"manage-groups": "Manage Groups",
+	"set-reputation": "Set Reputation",
 	"add-group": "Add Group",
 	"create": "Create User",
 	"invite": "Invite by Email",
@@ -49,6 +51,10 @@
 	"users.username": "username",
 	"users.email": "email",
 	"users.no-email": "(no email)",
+	"users.validated": "Validated",
+	"users.not-validated": "Not Validated",
+	"users.validation-pending": "Validation Pending",
+	"users.validation-expired": "Validation Expired",
 	"users.ip": "IP",
 	"users.postcount": "postcount",
 	"users.reputation": "reputation",
@@ -91,6 +97,7 @@
 	"alerts.validate-email-success": "Emails validated",
 	"alerts.validate-force-password-reset-success": "User(s) passwords have been reset and their existing sessions have been revoked.",
 	"alerts.password-reset-confirm": "Do you want to send password reset email(s) to these user(s)?",
+	"alerts.password-reset-email-sent": "Password reset email sent.",
 	"alerts.confirm-delete": "<strong>Warning!</strong><p>Do you really want to delete <strong>user(s)</strong>?</p><p>This action is not reversible! Only the user account will be deleted, their posts and topics will remain.</p>",
 	"alerts.delete-success": "User(s) Deleted!",
 	"alerts.confirm-delete-content": "<strong>Warning!</strong><p>Do you really want to delete these user(s) <strong>content</strong>?</p><p>This action is not reversible! The users' accounts will remain, but their posts and topics will be deleted.</p>",

public/language/ar/admin/menu.json

@@ -14,6 +14,7 @@
 	"manage/users": "الأعضاء",
 	"manage/admins-mods": "Admins & Mods",
 	"manage/registration": "قائمة انتظار التسجيل",
+	"manage/flagged-content": "Flagged Content",
 	"manage/post-queue": "قائمة انتظار المشاركة",
 	"manage/groups": "المجموعات",
 	"manage/ip-blacklist": "قائمة حظر عناوين IP",
@@ -72,11 +73,13 @@
 	"development/info": "Info",
 
 	"rebuild-and-restart-forum": "Rebuild & Restart Forum",
+	"rebuild-and-restart": "Rebuild & Restart",
 	"restart-forum": "Restart Forum",
+	"restart": "Restart",
 	"logout": "Log out",
 	"view-forum": "View Forum",
 
-	"search.placeholder": "Press "/" to search for settings",
+	"search.placeholder": "Search settings",
 	"search.no-results": "No results...",
 	"search.search-forum": "Search the forum for <strong></strong>",
 	"search.keep-typing": "Type more to see results...",

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",
@@ -17,7 +18,10 @@
 	"headers.acah": "Access-Control-Allow-Headers",
 	"headers.coep": "Cross-Origin-Embedder-Policy",
 	"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/api.json

@@ -3,14 +3,27 @@
 	"settings": "Settings",
 	"lead-text": "From this page you can configure access to the Write API in NodeBB.",
 	"intro": "By default, the Write API authenticates users based on their session cookie, but NodeBB also supports Bearer authentication via tokens generated via this page.",
+	"warning": "<strong>Be advised</strong> — treat tokens like passwords. If they are leaked, your account should be considered compromised.",
 	"docs": "Click here to access the full API specification",
 
 	"require-https": "Require API usage via HTTPS only",
 	"require-https-caveat": "<strong>Note</strong>: Some installations involving load balancers may proxy their requests to NodeBB using HTTP, in which case this option should remain disabled.",
 
 	"uid": "User ID",
+	"token": "Token",
 	"uid-help-text": "Specify a User ID to associate with this token. If the user ID is <code>0</code>, it will be considered a <em>master</em> token, which can assume the identity of other users based on the <code>_uid</code> parameter",
 	"description": "Description",
+	"last-seen": "Last seen",
+	"created": "Created",
+	"create-token": "Create Token",
+	"update-token": "Update Token",
+	"master-token": "Master token",
+	"last-seen-never": "This key has never been used.",
 	"no-description": "No description specified.",
-	"token-on-save": "Token will be generated once form is saved"
+	"actions": "Actions",
+	"edit": "Edit",
+	"roll": "Roll",
+
+	"delete-confirm": "Are you sure you wish to delete this token? It will not be recoverable.",
+	"roll-confirm": "Are you sure you wish to regenerate this token? The old token will be immediately revoked and will not be recoverable."
 }

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

@@ -4,6 +4,7 @@
 	"disable-editing": "Disable chat message editing/deletion",
 	"disable-editing-help": "Administrators and global moderators are exempt from this restriction",
 	"max-length": "Maximum length of chat messages",
+	"max-chat-room-name-length": "Maximum length of chat room names",
 	"max-room-size": "Maximum number of users in chat rooms",
 	"delay": "Time between chat messages in milliseconds",
 	"notification-delay": "Notification delay for chat messages. (0 for no delay)",

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

@@ -5,14 +5,18 @@
 	"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.",
 	"smtp-transport.service": "Select a service",
 	"smtp-transport.service-custom": "Custom Service",
-	"smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.",
-	"smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to <a href=\"https://www.google.com/settings/security/lesssecureapps\">configure your GMail account to allow less secure apps</a>.",
-	"smtp-transport.gmail-warning2": "For more information about this workaround, <a href=\"https://nodemailer.com/usage/using-gmail/\">please consult this NodeMailer article on the issue.</a> An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. <a href=\"../extend/plugins\">Browse available plugins here</a>.",
+	"smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select &quot;Custom Service&quot; and enter the details below.",
+	"smtp-transport.gmail-warning1": "If you are using GMail as your email provider, you will have to generate an &quot;App Password&quot; in order for NodeBB to authenticate successfully. You can generate one at the <a href=\"https://myaccount.google.com/apppasswords\">App Passwords <i class=\"fa fa-external-link\"></i></a> page.",
+	"smtp-transport.gmail-warning2": "For more information about this workaround, <a href=\"https://nodemailer.com/usage/using-gmail/\">please consult this NodeMailer article <i class=\"fa fa-external-link\"></i></a> on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. <a href=\"../extend/plugins\">Browse available plugins here</a>.",
+	"smtp-transport.auto-enable-toast": "It looks like you&apos;re configuring an SMTP transport. We enabled the \"SMTP Transport\" option for you.",
 	"smtp-transport.host": "SMTP Host",
 	"smtp-transport.port": "SMTP Port",
 	"smtp-transport.security": "Connection security",
@@ -38,7 +42,7 @@
 	"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>",
 	"notifications.remove-images": "Remove images from email notifications",
 	"require-email-address": "Require new users to specify an email address",
-	"require-email-address-warning": "By default, users can opt-out of entering an email address by leaving the field blank. Enabling this option means they have to enter an email address in order to proceed with registration. <strong>It does not ensure user will enter a real email address, nor even an address they own.</strong>",
+	"require-email-address-warning": "By default, users can opt-out of entering an email address by leaving the field blank. Enabling this option means new users will have to enter <strong>and confirm</strong> an email address in order to proceed with registration and subsequent access to the forum. <strong>It does not ensure user will enter a real email address, nor even an address they own.</strong>",
 	"send-validation-email": "Send validation emails when an email is added or changed",
 	"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
 	"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). <strong>Enable this setting at your own risk</strong> &ndash; sending emails to unverified addresses may be a violation of regional anti-spam laws.",

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

@@ -1,11 +1,13 @@
 {
+	"general-settings": "General Settings",
+	"on-this-page": "On this page:",
 	"site-settings": "اعدادات الموقع",
 	"title": "عنوان الموقع",
 	"title.short": "عنوان قصير",
 	"title.short-placeholder": "ان لم تقم بكتابة عنوان مختصر, سيتم استخدام عنوان الموقع الكلي",
 	"title.url": "Title Link URL",
 	"title.url-placeholder": "The URL of the site title",
-	"title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index. <br> Note: This is not the external URL used in emails, etc. That is set by the <code>url</code> property in config.json",
+	"title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index. Note: This is not the external URL used in emails, etc. That is set by the <code>url</code> property in config.json",
 	"title.name": "اسم المنتدي",
 	"title.show-in-header": "Show Site Title in Header",
 	"browser-title": "عنوان المتصفح",
@@ -16,7 +18,7 @@
 	"description": "وصف الموقع",
 	"keywords": "الكلمات الدليله للموقع",
 	"keywords-placeholder": "Keywords describing your community, comma-separated",
-	"logo": "شعار الموقع",
+	"logo-and-icons": "Site Logo & Icons",
 	"logo.image": "صورة",
 	"logo.image-placeholder": "Path to a logo to display on forum header",
 	"logo.upload": "رفع",

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

@@ -1,5 +1,6 @@
 {
 	"settings": "Settings",
+	"guest-settings": "Guest Settings",
 	"handles.enabled": "Allow guest handles",
 	"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
 	"topic-views.enabled": "Allow guests to increase topic view counts",

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

@@ -1,4 +1,5 @@
 {
+	"navigation": "Navigation",
 	"icon": "Icon:",
 	"change-icon": "change",
 	"route": "Route:",
@@ -12,7 +13,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/ar/admin/settings/post.json

@@ -1,4 +1,5 @@
 {
+	"general": "General",
 	"sorting": "Post Sorting",
 	"sorting.post-default": "Default Post Sorting",
 	"sorting.oldest-to-newest": "Oldest to Newest",
@@ -23,10 +24,8 @@
 	"restrictions.seconds-edit-after": "Number of seconds a post remains editable (set to 0 to disable)",
 	"restrictions.seconds-delete-after": "Number of seconds a post remains deletable (set to 0 to disable)",
 	"restrictions.replies-no-delete": "Number of replies after users are disallowed to delete their own topics (set to 0 to disable)",
-	"restrictions.min-title-length": "Minimum Title Length",
-	"restrictions.max-title-length": "Maximum Title Length",
-	"restrictions.min-post-length": "Minimum Post Length",
-	"restrictions.max-post-length": "Maximum Post Length",
+	"restrictions.title-length": "Title Length",
+	"restrictions.post-length": "Post Length",
 	"restrictions.days-until-stale": "Days until topic is considered stale",
 	"restrictions.stale-help": "If a topic is considered \"stale\", then a warning will be shown to users who attempt to reply to that topic.",
 	"timestamp": "Timestamp",
@@ -41,16 +40,16 @@
 	"teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies",
 	"teaser.first": "First",
 	"showPostPreviewsOnHover": "Show a preview of posts when mouse overed",
-	"unread": "Unread Settings",
+	"unread-and-recent": "Unread & Recent Settings",
 	"unread.cutoff": "Unread cutoff days",
 	"unread.min-track-last": "Minimum posts in topic before tracking last read",
-	"recent": "Recent Settings",
 	"recent.max-topics": "Maximum topics on /recent",
 	"recent.categoryFilter.disable": "Disable filtering of topics in ignored categories on the /recent page",
 	"signature": "Signature Settings",
 	"signature.disable": "Disable signatures",
 	"signature.no-links": "Disable links in signatures",
 	"signature.no-images": "Disable images in signatures",
+	"signature.hide-duplicates": "Hide duplicate signatures in topics",
 	"signature.max-length": "Maximum Signature Length",
 	"composer": "Composer Settings",
 	"composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.",

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

@@ -10,6 +10,7 @@
 	"min-rep-downvote": "Minimum reputation to downvote posts",
 	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
 	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
+	"min-rep-chat": "Minimum reputation to send chat messages",
 	"min-rep-flag": "Minimum reputation to flag posts",
 	"min-rep-website": "Minimum reputation to add \"Website\" to user profile",
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",
@@ -22,5 +23,9 @@
 	"flags.limit-per-target-placeholder": "Default: 0",
 	"flags.limit-per-target-help": "When a post or user is flagged multiple times, each additional flag is considered a "report" and added to the original flag. Set this option to a number other than zero to limit the number of reports an item can receive.",
   	"flags.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (Set to 0 to disable, default: 0)",
-	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned"
+	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned",
+	"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 sent to moderators/administrators"
 }

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

@@ -1,5 +1,4 @@
 {
 	"post-sharing": "Post Sharing",
-	"info-plugins-additional": "Plugins can add additional networks for sharing posts.",
-	"save-success": "Successfully saved Post Sharing Networks!"
+	"info-plugins-additional": "Plugins can add additional networks for sharing posts."
 }

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

@@ -3,6 +3,7 @@
     "link-to-manage": "Manage Tags",
     "system-tags": "System Tags",
     "system-tags-help": "Only privileged users will be able to use these tags.",
+    "tags-per-topic": "Tags per topic",
     "min-per-topic": "Minimum Tags per Topic",
     "max-per-topic": "Maximum Tags per Topic",
     "min-length": "Minimum Tag Length",

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

@@ -1,8 +1,11 @@
 {
 	"posts": "المشاركات",
+	"orphans": "Orphaned Files",
 	"private": "جعل الملفات التي تم رفعها خاصة",
 	"strip-exif-data": "Strip EXIF Data",
 	"preserve-orphaned-uploads": "Keep uploaded files on disk after a post is purged",
+	"orphanExpiryDays": "Days to keep orphaned files",
+	"orphanExpiryDays-help": "After this many days, orphaned uploads will be deleted from the file system.<br />Set 0 or leave blank to disable.",
 	"private-extensions": "File extensions to make private",
 	"private-uploads-extensions-help": "Enter comma-separated list of file extensions to make private here (e.g. <code>pdf,xls,doc</code>). An empty list means all files are private.",
 	"resize-image-width-threshold": "Resize images if they are wider than specified width",

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": "اسم المستخدم فقط",
@@ -29,6 +29,8 @@
 	"session-time-days": "Days",
 	"session-time-seconds": "Seconds",
 	"session-time-help": "These values are used to govern how long a user stays logged in when they check &quot;Remember Me&quot; on login. Note that only one of these values will be used. If there is no <i>seconds</i> value we fall back to <i>days</i>. If there is no <i>days</i> value we default to <i>14 days</i>.",
+	"session-duration": "Session length if \"Remember Me\" is not checked (seconds)",
+	"session-duration-help": "By default — or if set to <code>0</code> — a user will stay logged in for the duration of the session (e.g. however long the browser window/tab remains open). Set this value to explicitly invalidate the session after the specified number of seconds.",
 	"online-cutoff": "Minutes after user is considered inactive",
 	"online-cutoff-help": "If user performs no actions for this duration, they are considered inactive and they do not receive realtime updates.",
 	"registration": "تسجيل المستخدم",
@@ -57,7 +59,7 @@
 	"max-about-me-length": "الحد الأعلى من الأحرف في حقل \"عني\"",
 	"terms-of-use": "شروط استخدام المنتدى <small>(تترك فارغة لتعطيلها)</small>",
 	"user-search": "بحث الأعضاء",
-	"user-search-results-per-page": "عدد النتائج المراد عرضها",
+	"user-search-results-per-page": "Number of users to display in search results",
 	"default-user-settings": "إعدادات الأعضاء الافتراضية",
 	"show-email": "عرض البريد الإلكتروني",
 	"show-fullname": "عرض الاسم الكامل",

public/language/ar/email.json

@@ -22,6 +22,8 @@
     "reset.notify.subject": "تم تغيير كلمة المرور بنجاح",
     "reset.notify.text1": "نحيطك علما أن كلمة مرورك قد تم تغييرها في %1",
     "reset.notify.text2": "إن لم يكن لديك علم بهذا، المرجو إشعار مدبر النظام بأسرع مايمكن.",
+    "digest.unread-rooms": "Unread rooms",
+    "digest.room-name-unreadcount": "%1 (%2 unread)",
     "digest.latest_topics": "آخر المستجدات من %1",
     "digest.top-topics": "Top topics from %1",
     "digest.popular-topics": "Popular topics from %1",

public/language/ar/error.json

@@ -42,6 +42,7 @@
     "user-doesnt-have-email": "User \"%1\" does not have an email set.",
     "email-confirm-failed": "لم نستطع تفعيل بريدك الإلكتروني، المرجو المحاولة لاحقًا.",
     "confirm-email-already-sent": "لقد تم ارسال بريد التأكيد، الرجاء اﻹنتظار 1% دقائق لإعادة اﻹرسال",
+    "confirm-email-expired": "Confirmation email expired",
     "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
     "digest-not-enabled": "This user does not have digests enabled, or the system default is not configured to send digests",
     "username-too-short": "اسم المستخدم قصير.",
@@ -54,6 +55,7 @@
     "user-banned-reason-until": "Sorry, this account has been banned until %1 (Reason: %2)",
     "user-too-new": "عذرا, يجب أن تنتظر 1% ثواني قبل قيامك بأول مشاركة",
     "blacklisted-ip": "نأسف، لقد تم حظرك من استخدام وتصفح المنتدى. إذا كنت تعتقد أن هذا خطأ رجاءًا اتصل بالإدارة. ",
+    "cant-blacklist-self-ip": "You can't blacklist your own IP",
     "ban-expiry-missing": "رجاءًا ضع تاريخ نهاية الحظر. ",
     "no-category": "قائمة غير موجودة",
     "no-topic": "موضوع غير موجود",
@@ -61,6 +63,8 @@
     "no-group": "مجموعة غير موجودة",
     "no-user": "اسم مستخدم غير موجود",
     "no-teaser": "مقتطف غير موجود",
+    "no-flag": "Flag does not exist",
+    "no-chat-room": "Chat room does not exist",
     "no-privileges": "لاتملك الصلاحيات اللازمة للقيام بهذه العملية",
     "category-disabled": "قائمة معطلة",
     "topic-locked": "الموضوع مقفول",
@@ -87,8 +91,10 @@
     "category-not-selected": "Category not selected.",
     "too-many-posts": "يسمح لك بالنشر مرة كل %1 ثانية - يرجى الإنتظار قبل النشر مجدداً",
     "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
+    "already-posting": "You are already posting",
     "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",
     "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 character(s)",
+    "tag-not-allowed": "Tag not allowed",
     "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
     "too-many-tags": "Too many tags. Topics can't have more than %1 tag(s)",
     "cant-use-system-tag": "You can not use this system tag.",
@@ -98,6 +104,7 @@
     "guest-upload-disabled": "خاصية رفع الملفات غير مفعلة للزوار.",
     "cors-error": "Unable to upload image due to misconfigured CORS",
     "upload-ratelimit-reached": "You have uploaded too many files at one time. Please try again later.",
+    "upload-error-fallback": "Unable to upload image — %1",
     "scheduling-to-past": "Please select a date in the future.",
     "invalid-schedule-date": "Please enter a valid date and time.",
     "cant-pin-scheduled": "Scheduled topics cannot be (un)pinned.",
@@ -131,6 +138,8 @@
     "group-already-requested": "سبق وتم تسجيل طلب العضوية",
     "group-join-disabled": "You are not able to join this group at this time",
     "group-leave-disabled": "You are not able to leave this group at this time",
+    "group-user-not-pending": "User does not have a pending request to join this group.",
+    "gorup-user-not-invited": "User has not been invited to join this group.",
     "post-already-deleted": "سبق وتم حذف هذا الرد",
     "post-already-restored": "سبق وتم إلغاء حذف هذا الرد",
     "topic-already-deleted": "سبق وتم حذف هذا الموضوع",
@@ -154,9 +163,13 @@
     "chat-deleted-already": "This chat message has already been deleted.",
     "chat-restored-already": "This chat message has already been restored.",
     "chat-room-does-not-exist": "Chat room does not exist.",
+    "cant-add-users-to-chat-room": "Can't add users to chat room.",
+    "cant-remove-users-from-chat-room": "Can't remove users from chat room.",
+    "chat-room-name-too-long": "Chat room name too long. Names can't be longer than %1 characters.",
     "already-voting-for-this-post": "لقد شاركت بالتصويت ، ألا تذكر؟",
     "reputation-system-disabled": "نظام السمعة معطل",
     "downvoting-disabled": "التصويتات السلبية معطلة",
+    "not-enough-reputation-to-chat": "You need %1 reputation to chat",
     "not-enough-reputation-to-upvote": "You need %1 reputation to upvote",
     "not-enough-reputation-to-downvote": "You need %1 reputation to downvote",
     "not-enough-reputation-to-flag": "You need %1 reputation to flag this post",
@@ -187,6 +200,7 @@
     "not-in-room": "المستخدم غير موجود في الغرفة.",
     "cant-kick-self": "لا يمكنك طرد نفسك من المجموعة.",
     "no-users-selected": "لا يوجد مستخدم محدد.",
+    "no-groups-selected": "No group(s) selected",
     "invalid-home-page-route": "Invalid home page route",
     "invalid-session": "Invalid Session",
     "invalid-session-text": "It looks like your login session is no longer active. Please refresh this page.",
@@ -203,6 +217,8 @@
     "no-connection": "There seems to be a problem with your internet connection",
     "socket-reconnect-failed": "Unable to reach the server at this time. Click here to try again, or try again later",
     "plugin-not-whitelisted": "Unable to install plugin – only plugins whitelisted by the NodeBB Package Manager can be installed via the ACP",
+    "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",
     "topic-event-unrecognized": "Topic event '%1' unrecognized",
     "cant-set-child-as-parent": "Can't set child as parent category",
     "cant-set-self-as-parent": "Can't set self as parent category",
@@ -215,5 +231,6 @@
     "api.429": "You have made too many requests, please try again later",
     "api.500": "An unexpected error was encountered while attempting to service your request.",
     "api.501": "The route you are trying to call is not implemented yet, please try again tomorrow",
-    "api.503": "The route you are trying to call is not currently available due to a server configuration"
+    "api.503": "The route you are trying to call is not currently available due to a server configuration",
+    "api.reauth-required": "The resource you are trying to access requires (re-)authentication."
 }

public/language/ar/flags.json

@@ -3,25 +3,27 @@
 	"reports": "Reports",
 	"first-reported": "First Reported",
 	"no-flags": "Hooray! No flags found.",
+	"x-flags-found": "%1 flag(s) found.",
 	"assignee": "المحال إليه",
 	"update": "تحديث",
 	"updated": "تم التحديث",
 	"resolved": "Resolved",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
+	"target-aboutme-empty": "This user has no "About Me" set.",
 
 	"graph-label": "Daily Flags",
 	"quick-filters": "Quick Filters",
 	"filter-active": "There are one or more filters active in this list of flags",
 	"filter-reset": "ازالة الفلاتر",
 	"filters": "خيارات الفلتر",
-	"filter-reporterId": "Reporter UID",
-	"filter-targetUid": "Flagged UID",
+	"filter-reporterId": "Reporter",
+	"filter-targetUid": "Reportee",
 	"filter-type": "عنوان العلامة",
 	"filter-type-all": "كل المحتوي",
 	"filter-type-post": "مشاركة",
 	"filter-type-user": "مستخدم",
 	"filter-state": "الحالة",
-	"filter-assignee": "Assignee UID",
+	"filter-assignee": "Assignee",
 	"filter-cid": "Category",
 	"filter-quick-mine": "Assigned to me",
 	"filter-cid-all": "All categories",
@@ -38,16 +40,20 @@
 	"delete-post": "حذف المشاركة",
 	"purge-post": "Purge Post",
 	"restore-post": "استرجاع المشاركة",
+	"delete": "Delete Flag",
 
 	"user-view": "مشاهدة الملف الشخصي",
 	"user-edit": "تعديل الملف الشخصي",
 
 	"notes": "Flag Notes",
 	"add-note": "اضافة ملاحظة",
+	"edit-note": "Edit Note",
 	"no-notes": "No shared notes.",
 	"delete-note-confirm": "Are you sure you want to delete this flag note?",
+	"delete-flag-confirm": "Are you sure you want to delete this flag?",
 	"note-added": "Note Added",
 	"note-deleted": "Note Deleted",
+	"flag-deleted": "Flag Deleted",
 
 	"history": "Account & Flag History",
 	"no-history": "No flag history.",

public/language/ar/global.json

@@ -4,13 +4,13 @@
     "buttons.close": "أغلق",
     "403.title": "غير مسموح بالدخول",
     "403.message": "يبدو أنك قد تعثرت على صفحة لا تمتلك الصلاحية للدخول إليها",
-    "403.login": "ربما يجب عليك  <a href='%1/login'>تسجل دخولك</a>.",
+    "403.login": "Perhaps you should <a class=\"alert-link\" href='%1/login'>try logging in</a>?",
     "404.title": "لم يتم العثور",
-    "404.message": "الصفحة غير موجودة. العودة لـ <a href='%1/'>الرئيسية</a>",
+    "404.message": "You seem to have stumbled upon a page that does not exist.<br/><div class=\"text-sm text-muted\">Return to the <a href='%1/'>home page</a>.</div>",
     "500.title": "خطأ داخلي",
     "500.message": "عفوا! يبدو وكأنه شيء ذهب على نحو خاطئ!",
     "400.title": "طلب سيئ",
-    "400.message": "الرابط غير صحيح. رجاءًا تأكد من الرابط أو ارجع لـ <a href='%1/'>الرئيسية</a>",
+    "400.message": "It looks like this link is malformed, please double-check and try again.<br/><div class=\"text-sm text-muted\">Return to the <a href='%1/'>home page</a>.</div>",
     "register": "تسجيل",
     "login": "دخول",
     "please_log_in": "الرجاء تسجيل الدخول",
@@ -20,6 +20,8 @@
     "you_have_successfully_logged_in": "تم سجيل الدخول بنجاح",
     "save_changes": "حفظ التغييرات",
     "save": "حفظ",
+    "create": "Create",
+    "cancel": "Cancel",
     "close": "أغلق",
     "pagination": "الصفحات",
     "pagination.out_of": "%1 من %2",
@@ -37,14 +39,20 @@
     "header.notifications": "التنبيهات",
     "header.search": "بحث",
     "header.profile": "ملف",
+    "header.account": "Account",
     "header.navigation": "الاستكشاف",
+    "header.manage": "Manage",
+    "header.drafts": "Drafts",
     "notifications.loading": "تحميل التنبيهات",
     "chats.loading": "تحميل الدردشات",
+    "drafts.loading": "Loading Drafts",
     "motd.welcome": "مرحبا بكم في NodeBB، منصة المناقشة المستقبلية.",
     "previouspage": "الصفحة السابقة",
     "nextpage": "الصفحة التالية",
     "alert.success": "نجاح",
     "alert.error": "خطأ",
+    "alert.warning": "Warning",
+    "alert.info": "Info",
     "alert.banned": "محظور",
     "alert.banned.message": "You have just been banned, your access is now restricted.",
     "alert.unbanned": "Unbanned",
@@ -54,7 +62,9 @@
     "users": "الأعضاء",
     "topics": "المواضيع",
     "posts": "المشاركات",
-    "x-posts": "%1 posts",
+    "x-posts": "<span class=\"formatted-number\">%1</span> posts",
+    "x-topics": "<span class=\"formatted-number\">%1</span> topics",
+    "x-reputation": "<span class=\"formatted-number\">%1</span> reputation",
     "best": "الأفضل",
     "controversial": "Controversial",
     "votes": "Votes",
@@ -69,6 +79,7 @@
     "reputation": "السمعة",
     "lastpost": "Last post",
     "firstpost": "First post",
+    "about": "About",
     "read_more": "اقرأ المزيد",
     "more": "المزيد",
     "none": "None",
@@ -82,11 +93,13 @@
     "user_posted_ago": "%1 كتب %2",
     "guest_posted_ago": "كتب زائر %1",
     "last_edited_by": "اخر تحرير بواسطة 1%",
+    "edited-timestamp": "Edited %1",
     "norecentposts": "لاوجود لمشاركات جديدة",
     "norecenttopics": "لاوجود لمواضيع جديدة",
     "recentposts": "آخر المشاركات",
     "recentips": "آخر عناوين ال IP التي سجلت الدخول",
     "moderator_tools": "أدوات المشرف",
+    "status": "Status",
     "online": "المتواجدون حاليًّا",
     "away": "غير متواجد",
     "dnd": "عدم الإزعاج",
@@ -122,5 +135,9 @@
     "edited": "حُرِر",
     "disabled": "معطل",
     "select": "تحديد",
-    "user-search-prompt": "Type something here to find users..."
+    "copied": "Copied",
+    "user-search-prompt": "Type something here to find users...",
+    "hidden": "Hidden",
+    "sort": "Sort",
+    "actions": "Actions"
 }

public/language/ar/groups.json

@@ -1,5 +1,7 @@
 {
+    "all-groups": "All groups",
     "groups": "المجموعات",
+    "members": "Members",
     "view_group": "معاينة المجموعة",
     "owner": "مالك المجموعة",
     "new_group": "أنشئ مجموعة جديدة",

public/language/ar/modules.json

@@ -1,13 +1,18 @@
 {
     "chat.chatting_with": "Chat with",
     "chat.placeholder": "Type chat message here, drag & drop images, press enter to send",
-    "chat.scroll-up-alert": "You are looking at older messages, click here to go to most recent message.",
+    "chat.placeholder.mobile": "Type chat message here",
+    "chat.scroll-up-alert": "Go to most recent message",
+    "chat.usernames-and-x-others": "%1 & %2 others",
+    "chat.chat-with-usernames": "Chat with %1",
+    "chat.chat-with-usernames-and-x-others": "Chat with %1 & %2 others",
     "chat.send": "أرسل",
     "chat.no_active": "لا يوجد لديك دردشات نشطة.",
     "chat.user_typing": "%1 يكتب رسالة...",
     "chat.user_has_messaged_you": "%1 أرسل لك رسالة.",
-    "chat.see_all": "عرض كل المحادثات",
-    "chat.mark_all_read": "Mark all chats read",
+    "chat.replying-to": "Replying to %1",
+    "chat.see_all": "All chats",
+    "chat.mark_all_read": "Mark all read",
     "chat.no-messages": "المرجو اختيار مرسل إليه لمعاينة تاريخ الدردشات",
     "chat.no-users-in-room": "No users in this room",
     "chat.recent-chats": "آخر الدردشات",
@@ -23,25 +28,47 @@
     "chat.three_months": "3 أشهر",
     "chat.delete_message_confirm": "هل أنت متأكد من أنك تريد حذف هذه الرسالة؟",
     "chat.retrieving-users": "Retrieving users...",
+    "chat.view-users-list": "View users list",
+    "chat.public-rooms": "Public Rooms (%1)",
+    "chat.private-rooms": "Private Rooms (%1)",
+    "chat.create-room": "Create Chat Room",
+    "chat.private.option": "Private (Only visible to users added to room)",
+    "chat.public.option": "Public (Visible to every user in selected groups)",
+    "chat.public.groups-help": "To create a chat room that is visible to all users select registered-users from the group list.",
     "chat.manage-room": "Manage Chat Room",
+    "chat.add-user": "Add User",
+    "chat.notification-settings": "Notification Settings",
+    "chat.default-notification-setting": "Default Notification Setting",
+    "chat.notification-setting-room-default": "Room Default",
+    "chat.notification-setting-none": "No notifications",
+    "chat.notification-setting-at-mention-only": "@mention only",
+    "chat.notification-setting-all-messages": "All messages",
+    "chat.select-groups": "Select Groups",
     "chat.add-user-help": "Search for users here. When selected, the user will be added to the chat. The new user will not be able to see chat messages written before they were added to the conversation. Only room owners (<i class=\"fa fa-star text-warning\"></i>) may remove users from chat rooms.",
     "chat.confirm-chat-with-dnd-user": "This user has set their status to DnD(Do not disturb). Do you still want to chat with them?",
+    "chat.room-name-optional": "Room Name (Optional)",
     "chat.rename-room": "Rename Room",
     "chat.rename-placeholder": "Enter your room name here",
     "chat.rename-help": "The room name set here will be viewable by all participants in the room.",
-    "chat.leave": "Leave Chat",
+    "chat.leave": "Leave",
+    "chat.leave-room": "Leave Room",
     "chat.leave-prompt": "Are you sure you wish to leave this chat?",
     "chat.leave-help": "Leaving this chat will remove you from future correspondence in this chat. If you are re-added in the future, you will not see any chat history from prior to your re-joining.",
+    "chat.delete": "Delete",
+    "chat.delete-room": "Delete Room",
+    "chat.delete-prompt": "Are you sure you wish to delete this chat room?",
     "chat.in-room": "In this room",
     "chat.kick": "Kick",
     "chat.show-ip": "Show IP",
     "chat.owner": "Room Owner",
-    "chat.system.user-join": "%1 has joined the room",
-    "chat.system.user-leave": "%1 has left the room",
-    "chat.system.room-rename": "%2 has renamed this room: %1",
+    "chat.grant-rescind-ownership": "Grant/Rescind Ownership",
+    "chat.system.user-join": "%1 has joined the room <span class=\"timeago\" title=\"%2\"></span>",
+    "chat.system.user-leave": "%1 has left the room <span class=\"timeago\" title=\"%2\"></span>",
+    "chat.system.room-rename": "%2 has renamed this room to \"%1\" <span class=\"timeago\" title=\"%3\"></span>",
     "composer.compose": "اكتب",
     "composer.show_preview": "عرض المعاينة",
     "composer.hide_preview": "إخفاء المعاينة",
+    "composer.help": "Help",
     "composer.user_said_in": "%1 كتب في  %2",
     "composer.user_said": "%1 كتب:",
     "composer.discard": "هل أنت متأكد أنك تريد التخلي عن التغييرات؟",
@@ -64,7 +91,11 @@
     "composer.schedule-date": "Date",
     "composer.schedule-time": "Time",
     "composer.cancel-scheduling": "Cancel Scheduling",
+    "composer.change-schedule-date": "Change Date",
     "composer.set-schedule-date": "Set Date",
+    "composer.discard-all-drafts": "Discard all drafts",
+    "composer.no-drafts": "You have no drafts",
+    "composer.discard-draft-confirm": "Do you want to discard this draft?",
     "bootbox.ok": "OK",
     "bootbox.cancel": "إلغاء",
     "bootbox.confirm": "تأكيد",

public/language/ar/notifications.json

@@ -1,8 +1,8 @@
 {
     "title": "التنبيهات",
     "no_notifs": "ليس لديك أية تنبيهات جديدة",
-    "see_all": "عرض كل التنبيهات",
-    "mark_all_read": "اجعل كل التنبيهات مقروءة",
+    "see_all": "All notifications",
+    "mark_all_read": "Mark all read",
     "back_to_home": "عودة إلى %1",
     "outgoing_link": "رابط خارجي",
     "outgoing_link_message": "أنت تغادر اﻻن %1",

public/language/ar/pages.json

@@ -14,6 +14,7 @@
     "flagged-content": "Flagged Content",
     "ip-blacklist": "IP Blacklist",
     "post-queue": "Post Queue",
+    "registration-queue": "Registration Queue",
     "users/online": "اﻷعضاء المتصلون",
     "users/latest": "أحدث اﻷعضاء",
     "users/sort-posts": "الأعضاء الأكثر نشاطاً",
@@ -49,6 +50,7 @@
     "account/watched_categories": "%1's Watched Categories",
     "account/bookmarks": "%1's Bookmarked Posts",
     "account/settings": "خيارات المستخدم",
+    "account/settings-of": "Changing settings of %1",
     "account/watched": "Topics watched by %1",
     "account/ignored": "Topics ignored by %1",
     "account/upvoted": "Posts upvoted by %1",
@@ -59,7 +61,7 @@
     "account/uploads": "Uploads by %1",
     "account/sessions": "Login Sessions",
     "confirm": "تم التحقق من عنوان البريد الإلكتروني",
-    "maintenance.text": "جاري صيانة %1. المرجو العودة لاحقًا.",
+    "maintenance.text": "%1 is currently undergoing maintenance.<br/>Please come back another time.",
     "maintenance.messageIntro": "بالإضافة إلى ذلك، قام مدبر النظام بترك هذه الرسالة:",
     "throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
 }

public/language/ar/post-queue.json

@@ -1,8 +1,12 @@
 
 {
 	"post-queue": "Post Queue",
-	"description": "There are no posts in the post queue. <br> To enable this feature, go to <a href=\"%1\">Settings &rarr; Post &rarr; Post Queue</a> and enable <strong>Post Queue</strong>.",
+	"no-queued-posts": "There are no posts in the post queue.",
+	"no-single-post": "The topic or post you are looking for is no longer in the queue. It has likely been approved or deleted already.",
+	"enabling-help": "To enable this feature, go to <a href=\"%1\">Settings &rarr; Post &rarr; Post Queue</a> and enable <strong>Post Queue</strong>.",
+	"back-to-list": "Back to Post Queue",
 	"user": "User",
+	"when": "When",
 	"category": "Category",
 	"title": "Title",
 	"content": "Content",
@@ -17,5 +21,20 @@
 	"reject": "Reject",
 	"remove": "Remove",
 	"notify": "Notify",
-	"notify-user": "Notify User"
+	"notify-user": "Notify User",
+	"confirm-reject": "Do you want to reject this post?",
+	"confirm-remove": "Do you want to remove this post?",
+	"bulk-actions": "Bulk Actions",
+	"accept-all": "Accept All",
+	"accept-selected": "Accept Selected",
+	"reject-all": "Reject All",
+	"reject-all-confirm": "Do you want to reject all posts?",
+	"reject-selected": "Reject Selected",
+	"reject-selected-confirm": "Do you want to reject %1 selected posts?",
+	"remove-all": "Remove all",
+	"remove-all-confirm": "Do you want to remove all posts?",
+	"remove-selected": "Remove Selected",
+	"remove-selected-confirm": "Do you want to remove %1 selected posts?",
+	"bulk-accept-success": "%1 posts accepted",
+	"bulk-reject-success": "%1 posts rejected"
 }

public/language/ar/recent.json

@@ -7,13 +7,5 @@
     "alltime": "دائمًا",
     "no_recent_topics": "لايوجد مواضيع جديدة",
     "no_popular_topics": "لا يوجد مواضيع شائعة",
-    "there-is-a-new-topic": "يوجد موضوع جديد",
-    "there-is-a-new-topic-and-a-new-post": "يوجد موضوع جديد و رد جديد",
-    "there-is-a-new-topic-and-new-posts": "يوجد موضوع جديد و %1 ردود جديدة ",
-    "there-are-new-topics": "يوجد %1 مواضيع جديدة",
-    "there-are-new-topics-and-a-new-post": "يوجد %1 مواضيع جديدة و رد جديد",
-    "there-are-new-topics-and-new-posts": "يوجد %1 مواضيع جديدة و %2 مشاركات جديدة",
-    "there-is-a-new-post": "يوجد مشاركة جديدة",
-    "there-are-new-posts": "يوجد %1 مشاركات جديدة",
-    "click-here-to-reload": "إضغط هنا لإعادة التحميل"
+    "load-new-posts": "Load new posts"
 }

public/language/ar/register.json

@@ -1,5 +1,6 @@
 {
     "register": "تسجيل",
+    "already-have-account": "Already have an account?",
     "cancel_registration": "إلغاء التسجيل",
     "help.email": "افتراضيا، سيتم إخفاء بريدك الإلكتروني من العامة.",
     "help.username_restrictions": "اسم مستخدم فريدة من نوعها بين 1% و 2% حرفا. بإمكان الآخرين مناداتك بـ @<span id='yourUsername'>اسم المستخدم</span>.",

public/language/ar/search.json

@@ -1,21 +1,41 @@
 {
+    "type-to-search": "Type to search",
     "results_matching": "%1 نتيجة (نتائج) موافقة لـ \"%2\", (%3 ثواني)",
     "no-matches": "لم يتم العثور على نتائج.",
     "advanced-search": "بحث متقدم",
     "in": "في",
-    "titles": "العناوين",
-    "titles-posts": "العناوين والمشاركات",
+    "in-titles": "In titles",
+    "in-titles-posts": "In titles and posts",
+    "in-posts": "In posts",
+    "in-categories": "In categories",
+    "in-users": "In users",
+    "in-tags": "In tags",
+    "categories": "Categories",
+    "all-categories": "All categories",
+    "categories-x": "Categories: %1",
+    "categories-watched-categories": "Categories: Watched categories",
+    "type-a-category": "Type a category",
+    "tags": "Tags",
+    "tags-x": "Tags: %1",
+    "type-a-tag": "Type a tag",
     "match-words": "Match words",
+    "match-all-words": "Match all words",
+    "match-any-word": "Match any word",
     "all": "All",
     "any": "Any",
     "posted-by": "مشاركة من طرف",
-    "in-categories": "في الفئات",
+    "posted-by-usernames": "Posted by: %1",
+    "type-a-username": "Type a username",
     "search-child-categories": "بحث في الفئات الفرعية",
     "has-tags": "Has tags",
     "reply-count": "عدد المشاركات",
+    "replies": "Replies",
+    "replies-atleast-count": "Replies: At least %1",
+    "replies-atmost-count": "Replies: At most %1",
     "at-least": "على اﻷقل",
     "at-most": "على اﻷكثر",
     "relevance": "Relevance",
+    "time": "Time",
     "post-time": "تاريخ المشاركة",
     "votes": "Votes",
     "newer-than": "أحدث من",
@@ -28,7 +48,22 @@
     "three-months": "ثلاثة أشهر",
     "six-months": "ستة أشهر",
     "one-year": "عام",
+    "time-newer-than-86400": "Time: Newer than yesterday",
+    "time-older-than-86400": "Time: Older than yesterday",
+    "time-newer-than-604800": "Time: Newer than one week",
+    "time-older-than-604800": "Time: Older than one week",
+    "time-newer-than-1209600": "Time: Newer than two weeks",
+    "time-older-than-1209600": "Time: Older than two weeks",
+    "time-newer-than-2592000": "Time: Newer than one month",
+    "time-older-than-2592000": "Time: Older than one month",
+    "time-newer-than-7776000": "Time: Newer than three months",
+    "time-older-than-7776000": "Time: Older than three months",
+    "time-newer-than-15552000": "Time: Newer than six months",
+    "time-older-than-15552000": "Time: Older than six months",
+    "time-newer-than-31104000": "Time: Newer than one year",
+    "time-older-than-31104000": "Time: Older than one year",
     "sort-by": "عرض حسب",
+    "sort": "Sort",
     "last-reply-time": "تاريخ آخر رد",
     "topic-title": "عنوان الموضوع",
     "topic-votes": "Topic votes",
@@ -39,11 +74,36 @@
     "category": "فئة",
     "descending": "في ترتيب تنازلي",
     "ascending": "في ترتيب تصاعدي",
+    "sort-by-relevance-desc": "Sort by: Relevance in descending order",
+    "sort-by-relevance-asc": "Sort by: Relevance in ascending order",
+    "sort-by-timestamp-desc": "Sort by: Post time in descending order",
+    "sort-by-timestamp-asc": "Sort by: Post time in ascending order",
+    "sort-by-votes-desc": "Sort by: Votes in descending order",
+    "sort-by-votes-asc": "Sort by: Votes in ascending order",
+    "sort-by-topic.lastposttime-desc": "Sort by: Last reply time in descending order",
+    "sort-by-topic.lastposttime-asc": "Sort by: Last reply time in ascending order",
+    "sort-by-topic.title-desc": "Sort by: Topic title in descending order",
+    "sort-by-topic.title-asc": "Sort by: Topic title in ascending order",
+    "sort-by-topic.postcount-desc": "Sort by: Number of replies in descending order",
+    "sort-by-topic.postcount-asc": "Sort by: Number of replies in ascending order",
+    "sort-by-topic.viewcount-desc": "Sort by: Number of views in descending order",
+    "sort-by-topic.viewcount-asc": "Sort by: Number of views in ascending order",
+    "sort-by-topic.votes-desc": "Sort by: Topic votes in descending order",
+    "sort-by-topic.votes-asc": "Sort by: Topic votes in ascending order",
+    "sort-by-topic.timestamp-desc": "Sort by: Topic start date in descending order",
+    "sort-by-topic.timestamp-asc": "Sort by: Topic start date in ascending order",
+    "sort-by-user.username-desc": "Sort by: Username in descending order",
+    "sort-by-user.username-asc": "Sort by: Username in ascending order",
+    "sort-by-category.name-desc": "Sort by: Category in descending order",
+    "sort-by-category.name-asc": "Sort by: Category in ascending order",
+    "save": "Save",
     "save-preferences": "حفظ التفضيلات",
     "clear-preferences": "ازالة التفضيلات",
     "search-preferences-saved": "تم حفظ تفضيلات البحث",
     "search-preferences-cleared": "تم ازالة تفضيلات البحث",
     "show-results-as": "عرض النتائج كـ",
+    "show-results-as-topics": "Show results as topics",
+    "show-results-as-posts": "Show results as posts",
     "see-more-results": "See more results (%1)",
     "search-in-category": "Search in \"%1\""
 }

public/language/ar/social.json

@@ -0,0 +1,10 @@
+{
+	"sign-in-with-twitter": "تسجيل الدخول باستخدام تويتر",
+	"sign-up-with-twitter": "التسجيل باستخدام تويتر",
+	"sign-in-with-github": "تسجيل الدخول باستخدام جيت هب",
+	"sign-up-with-github": "التسجيل باستخدام جيت هب",
+	"sign-in-with-google": "تسجيل الدخول باستخدام قوقل",
+	"sign-up-with-google": "التسجيل باستخدام قوقل",
+	"log-in-with-facebook": "تسجيل الدخول باستخدام فيسبوك",
+	"continue-with-facebook": "التسجيل باستخدام فيسبوك"
+}

public/language/ar/tags.json

@@ -1,8 +1,11 @@
 {
+    "all-tags": "All tags",
     "no_tag_topics": "لا يوجد مواضيع بهذه الكلمة الدلالية.",
+    "no-tags-found": "No tags found",
     "tags": "الكلمات الدلالية",
     "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "أدخل الكلمات الدلالية...",
     "no_tags": "لا يوجد كلمات دلالية بعد.",
-    "select_tags": "Select Tags"
+    "select_tags": "Select Tags",
+    "tag-whitelist": "Tag Whitelist"
 }

public/language/ar/themes/harmony.json

@@ -0,0 +1,16 @@
+{
+	"theme-name": "Harmony Theme",
+	"skins": "Skins",
+	"collapse": "Collapse",
+	"expand": "Expand",
+	"login-register-to-search": "Login or register to search.",
+	"settings.title": "Theme settings",
+	"settings.enableQuickReply": "Enable quick reply",
+	"settings.centerHeaderElements": "Center header elements",
+	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
+	"settings.stickyToolbar": "Sticky toolbar",
+	"settings.stickyToolbar.help": "The toolbar on topic and category pages will stick to the top of the page",
+	"settings.autohideBottombar": "Auto hide bottom bar",
+	"settings.autohideBottombar.help": "The bottom bar on mobile view will be hidden when the page is scrolled down",
+	"settings.chatModals": "Enable chat modals"
+}

public/language/ar/themes/persona.json

@@ -0,0 +1,10 @@
+{
+    "settings.title": "Theme settings",
+    "settings.intro": "You can customise your theme settings here. Settings are stored on a per-device basis, so you are able to have different settings on different devices (phone, tablet, desktop, etc.)",
+    "settings.mobile-menu-side": "Switch which side each mobile menu is on",
+    "settings.autoHidingNavbar": "Automatically hide the navbar on scroll",
+    "settings.autoHidingNavbar-xs": "Very small screens (e.g. phones in portrait mode)",
+    "settings.autoHidingNavbar-sm": "Smaller screens (e.g. phones, some tablets)",
+    "settings.autoHidingNavbar-md": "Medium sized screens (e.g. tablets in landscape mode)",
+    "settings.autoHidingNavbar-lg": "Larger screens (e.g. desktop computers)"
+}

public/language/ar/topic.json

@@ -1,6 +1,6 @@
 {
     "topic": "موضوع",
-    "title": "Title",
+    "title": "العنوان",
     "no_topics_found": "لا توجد مواضيع !",
     "no_posts_found": "لا  توجد مشاركات!",
     "post_is_deleted": "هذه المشاركة محذوفة!",
@@ -12,12 +12,12 @@
     "notify_me": "تلق تنبيهات بالردود الجديدة في هذا الموضوع",
     "quote": "اقتبس",
     "reply": "رد",
-    "replies_to_this_post": "%1 Replies",
-    "one_reply_to_this_post": "1 Reply",
-    "last_reply_time": "Last reply",
+    "replies_to_this_post": "%1 الردود",
+    "one_reply_to_this_post": "1 رد",
+    "last_reply_time": "آخر رد",
     "reply-as-topic": "رد بموضوع",
     "guest-login-reply": "يجب عليك تسجيل الدخول للرد",
-    "login-to-view": "🔒 Log in to view",
+    "login-to-view": "سجل الدخول للمشاهدة",
     "edit": "تعديل",
     "delete": "حذف",
     "delete-event": "Delete Event",
@@ -32,23 +32,38 @@
     "tools": "أدوات",
     "locked": "مقفل",
     "pinned": "مثبت",
-    "pinned-with-expiry": "Pinned until %1",
+    "pinned-with-expiry": "مثبت حتى %1",
     "scheduled": "Scheduled",
     "moved": "منقول",
     "moved-from": "Moved from %1",
+    "copy-code": "Copy Code",
     "copy-ip": "Copy IP",
     "ban-ip": "Ban IP",
     "view-history": "Edit History",
-    "locked-by": "Locked by",
-    "unlocked-by": "Unlocked by",
-    "pinned-by": "Pinned by",
-    "unpinned-by": "Unpinned by",
-    "deleted-by": "Deleted by",
-    "restored-by": "Restored by",
-    "moved-from-by": "Moved from %1 by",
-    "queued-by": "Post queued for approval →",
-    "backlink": "Referenced by",
-    "forked-by": "Forked by",
+    "wrote-ago": "wrote <a href=\"%1\" class=\"timeago text-muted\" title=\"%2\"></a>",
+    "wrote-on": "wrote on <a href=\"%1\" class=\"timeago text-muted\" title=\"%2\"></a>",
+    "replied-to-user-ago": "replied to <a component=\"post/parent\" data-topid=\"%1\" href=\"%2\">%3</a> <a href=\"%4\" class=\"timeago text-muted\" title=\"%5\"></a>",
+    "replied-to-user-on": "replied to <a component=\"post/parent\" data-topid=\"%1\" href=\"%2\">%3</a> on <a href=\"%4\" class=\"timeago text-muted\" title=\"%5\"></a>",
+    "user-locked-topic-ago": "%1 locked this topic %2",
+    "user-locked-topic-on": "%1 locked this topic on %2",
+    "user-unlocked-topic-ago": "%1 unlocked this topic %2",
+    "user-unlocked-topic-on": "%1 unlocked this topic on %2",
+    "user-pinned-topic-ago": "%1 pinned this topic %2",
+    "user-pinned-topic-on": "%1 pinned this topic on %2",
+    "user-unpinned-topic-ago": "%1 unpinned this topic %2",
+    "user-unpinned-topic-on": "%1 unpinned this topic on %2",
+    "user-deleted-topic-ago": "%1 deleted this topic %2",
+    "user-deleted-topic-on": "%1 deleted this topic on %2",
+    "user-restored-topic-ago": "%1 restored this topic %2",
+    "user-restored-topic-on": "%1 restored this topic on %2",
+    "user-moved-topic-from-ago": "%1 moved this topic from %2 %3",
+    "user-moved-topic-from-on": "%1 moved this topic from %2 on %3",
+    "user-queued-post-ago": "%1 <a href=\"%2\">queued</a> post for approval %3",
+    "user-queued-post-on": "%1 <a href=\"%2\">queued</a> post for approval on %3",
+    "user-referenced-topic-ago": "%1 <a href=\"%2\">referenced</a> this topic %3",
+    "user-referenced-topic-on": "%1 <a href=\"%2\">referenced</a> this topic on %3",
+    "user-forked-topic-ago": "%1 <a href=\"%2\">forked</a> this topic %3",
+    "user-forked-topic-on": "%1 <a href=\"%2\">forked</a> this topic on %3",
     "bookmark_instructions": "اضغط هنا للعودة لأخر مشاركة مقروءة في الموضوع",
     "flag-post": "Flag this post",
     "flag-user": "Flag this user",
@@ -87,6 +102,7 @@
     "thread_tools.change_owner": "Change Owner",
     "thread_tools.select_category": "Select Category",
     "thread_tools.fork": "إنشاء فرع الموضوع",
+    "thread_tools.tag": "Tag Topic",
     "thread_tools.delete": "حذف الموضوع",
     "thread_tools.delete-posts": "مشاركات محذوفة",
     "thread_tools.delete_confirm": "هل أنت متأكد أنك تريد حذف هذا الموضوع؟",
@@ -95,7 +111,7 @@
     "thread_tools.purge": "تطهير الموضوع",
     "thread_tools.purge_confirm": "هل أنت متأكد أنك تريد تطهير هذا الموضوع؟",
     "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.",
     "topic_move_all_success": "All topics will be moved to \"%1\" shortly. Click here to undo.",
@@ -113,6 +129,7 @@
     "bookmark": "Bookmark",
     "bookmarks": "Bookmarks",
     "bookmarks.has_no_bookmarks": "You haven't bookmarked any posts yet.",
+    "copy-permalink": "Copy Permalink",
     "loading_more_posts": "تحميل المزيد من المشاركات",
     "move_topic": "نقل الموضوع",
     "move_topics": "نقل المواضيع",
@@ -120,7 +137,7 @@
     "post_moved": "تم نقل المشاركة",
     "fork_topic": "فرع الموضوع",
     "enter-new-topic-title": "Enter new topic title",
-    "fork_topic_instruction": "إضغط على المشاركات التي تريد تفريعها",
+    "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!",
     "x-posts-selected": "%1 post(s) selected",
@@ -135,16 +152,19 @@
     "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": "أدخل عنوان موضوعك هنا...",
     "composer.handle_placeholder": "Enter your name/handle here",
+    "composer.hide": "Hide",
     "composer.discard": "نبذ التغييرات",
     "composer.submit": "حفظ",
     "composer.additional-options": "Additional Options",
+    "composer.post-later": "Post Later",
     "composer.schedule": "Schedule",
     "composer.replying_to": "الرد على %1",
     "composer.new_topic": "موضوع جديد",
-    "composer.editing": "Editing",
+    "composer.editing-in": "Editing post in %1",
     "composer.uploading": "جاري الرفع",
     "composer.thumb_url_label": "ألصق رابط الصورة المصغرة للموضوع",
     "composer.thumb_title": "إضافة صورة مصغرة للموضوع",
@@ -183,5 +203,7 @@
     "last-post": "Last post",
     "go-to-my-next-post": "Go to my next post",
     "no-more-next-post": "You don't have more posts in this topic",
-    "post-quick-reply": "Post quick reply"
+    "post-quick-reply": "Quick reply",
+    "navigator.index": "Post %1 of %2",
+    "navigator.unread": "%1 unread"
 }

public/language/ar/user.json

@@ -1,5 +1,6 @@
 {
     "banned": "محظور",
+    "muted": "كتم ",
     "offline": "غير متصل",
     "deleted": "محذوف",
     "username": "إسم المستخدم",
@@ -8,7 +9,7 @@
     "email": "البريد الإلكتروني",
     "confirm_email": "تأكيد عنوان البريد الإلكتروني",
     "account_info": "معلومات الحساب",
-    "admin_actions_label": "Administrative Actions",
+    "admin_actions_label": "الإجراءات الإدارية",
     "ban_account": "حظر الحساب",
     "ban_account_confirm": "هل تريد حقاً حظر هاذا العضو؟",
     "unban_account": "إزالة حظر الحساب",
@@ -23,7 +24,7 @@
     "delete_account_content_confirm": "Are you sure you want to delete this account's content (posts/topics/uploads)? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
     "delete_all_confirm": "Are you sure you want to delete this account and all of its content (posts/topics/uploads)? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
     "account-deleted": "تم حذف الحساب",
-    "account-content-deleted": "Account content deleted",
+    "account-content-deleted": "تم حذف محتوى حساب",
     "fullname": "الاسم الكامل",
     "website": "الموقع الإلكتروني",
     "location": "الموقع",
@@ -33,25 +34,26 @@
     "profile": "الملف الشخصي",
     "profile_views": "عدد المشاهدات",
     "reputation": "السمعة",
-    "bookmarks": "Bookmarks",
-    "watched_categories": "Watched categories",
-    "change_all": "Change All",
+    "bookmarks": "المفضلات",
+    "watched_categories": "الأقسام المُتابعة",
+    "change_all": "غير الكل",
     "watched": "متابع",
     "ignored": "تم تجاهله",
-    "default-category-watch-state": "Default category watch state",
+    "default-category-watch-state": "حالة مشاهدة اﻻقسام الافتراضية",
     "followers": "المتابعون",
     "following": "يتابع",
-    "blocks": "Blocks",
-    "block_toggle": "Toggle Block",
-    "block_user": "Block User",
-    "unblock_user": "Unblock User",
+    "blocks": "الكتل",
+    "blocked-users": "Blocked users",
+    "block_toggle": "تبديل الكتلة",
+    "block_user": "أحظر المستخدم",
+    "unblock_user": "ألغ حظر المستخدم",
     "aboutme": "معلومة عنك او السيرة الذاتية",
     "signature": "توقيع",
     "birthday": "عيد ميلاد",
     "chat": "محادثة",
     "chat_with": "متابعة الدردشة مع %1",
     "new_chat_with": "بدء دردشة جديدة مع %1",
-    "flag-profile": "Flag Profile",
+    "flag-profile": "ضع علامة على الملف الشخصي",
     "follow": "تابع",
     "unfollow": "إلغاء المتابعة",
     "more": "المزيد",
@@ -67,6 +69,7 @@
     "upload_new_picture": "رفع صورة جديدة",
     "upload_new_picture_from_url": "رفع صورة جديدة من رابط",
     "current_password": "كلمة السر الحالية",
+    "new_password": "New Password",
     "change_password": "تغيير كلمة السر",
     "change_password_error": "كلمة سر غير صحيحة",
     "change_password_error_wrong_current": "كلمة السر الحالية ليست صحيحة",
@@ -86,7 +89,7 @@
     "remove_cover_picture_confirm": "هل تريد بالتأكيد إزالة صورة الغلاف؟",
     "crop_picture": "إقتصاص الصورة",
     "upload_cropped_picture": "إقتصاص ورفع",
-    "avatar-background-colour": "Avatar background colour",
+    "avatar-background-colour": "لون الخلفية للصورة الرمزية",
     "settings": "خيارات",
     "show_email": "أظهر بريدي الإلكتروني",
     "show_fullname": "أظهر اسمي الكامل",
@@ -107,16 +110,18 @@
     "has_no_ignored_topics": "هذا المستخدم لم يقم بتجاهل اية مواضيع حتى الآن.",
     "has_no_upvoted_posts": "هذا المستخدم لم يقم بالتصويت للأعلى لأي مشاركة حتى الآن.",
     "has_no_downvoted_posts": "هذا المستخدم لم يقم بالتصويت للأسفل لأي مشاركة حتى الآن.",
-    "has_no_controversial_posts": "This user does not have any downvoted posts yet.",
-    "has_no_blocks": "You have blocked no users.",
+    "has_no_controversial_posts": "هذا المستخدم ﻻيمتلك تصويت للأسفل لأي مشاركة حتى الآن.",
+    "has_no_blocks": "أنت لم تحظر اي مستخدم",
     "email_hidden": "البريد الإلكتروني مخفي",
     "hidden": "مخفي",
     "paginate_description": "عرض المواضيع والردود موزعة على صفحات عوضاً عن التمرير اللانهائي.",
     "topics_per_page": "المواضيع في كل صفحة",
     "posts_per_page": "الردود في كل صفحة",
+    "category-topic-sort": "Category topic sort",
+    "topic-post-sort": "Topic post sort",
     "max_items_per_page": "أقصى %1",
-    "acp_language": "Admin Page Language",
-    "notifications": "Notifications",
+    "acp_language": "لغة صفحة اﻻدارة",
+    "notifications": "التنبيهات",
     "upvote-notif-freq": "معدل تكرار تنبيهات التصويت للأعلى",
     "upvote-notif-freq.all": "كل التصويتات للأعلى",
     "upvote-notif-freq.first": "First Per Post",
@@ -136,6 +141,8 @@
     "group-order-help": "Select a group and use the arrows to order titles",
     "no-group-title": "لا يوجد عنوان للمجموعة",
     "select-skin": "إختر سمة",
+    "default": "Default (%1)",
+    "no-skin": "No Skin",
     "select-homepage": "إختر الصفحة الرئيسية",
     "homepage": "الصفحة الرئيسية",
     "homepage_description": "حدد صفحة لاستخدامها كصفحة رئيسية للمنتدى أو \"لا شيء\" لاستخدام الصفحة الرئيسية الافتراضية.",
@@ -156,6 +163,10 @@
     "info.banned-permanently": "محظور بشكل دائم",
     "info.banned-reason-label": "سبب",
     "info.banned-no-reason": "لم يتم إعطاء سبب.",
+    "info.mute-history": "Recent Mute History",
+    "info.no-mute-history": "This user has never been muted",
+    "info.muted-until": "Muted until %1",
+    "info.muted-expiry": "Expiry",
     "info.muted-no-reason": "No reason given.",
     "info.username-history": "سجل اسم المستخدم",
     "info.email-history": "سجل البريد الإلكتروني",
@@ -163,6 +174,8 @@
     "info.moderation-note.success": "تم حفظ ملاحظة الإشراف",
     "info.moderation-note.add": "إضافة ملاحظة",
     "sessions.description": "This page allows you to view any active sessions on this forum and revoke them if necessary. You can revoke your own session by logging out of your account.",
+    "revoke-session": "Revoke Session",
+    "browser-version-on-platform": "%1 %2 on %3",
     "consent.title": "Your Rights &amp; Consent",
     "consent.lead": "This community forum collects and processes your personal information.",
     "consent.intro": "We use this information strictly to personalise your experience in this community, as well as to associate the posts you make to your user account. During the registration step you were asked to provide a username and email address, you can also optionally provide additional information to complete your user profile on this website.<br /><br />We retain this information for the life of your user account, and you are able to withdraw consent at any time by deleting your account. At any time you may request a copy of your contribution to this website, via your Rights &amp; Consent page.<br /><br />If you have any questions or concerns, we encourage you to reach out to this forum's administrative team.",
@@ -189,5 +202,7 @@
     "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.",
     "emailUpdate.optional": "<strong>This field is optional</strong>. You are not obligated to provide your email address, but without a validated email you will not be able to recover your account or login with your email.",
     "emailUpdate.required": "<strong>This field is required</strong>.",
-    "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page."
+    "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page.",
+    "emailUpdate.password-challenge": "Please enter your password in order to verify account ownership.",
+    "emailUpdate.pending": "Your email address has not yet been confirmed, but an email has been sent out requesting confirmation. If you wish to invalidate that request and send a new confirmation request, please fill in the form below."
 }

public/language/ar/users.json

@@ -1,18 +1,19 @@
 {
+    "all-users": "All Users",
     "latest_users": "أحدث الأعضاء",
     "top_posters": "اﻷكثر مشاركة",
     "most_reputation": "أعلى سمعة",
-    "most_flags": "Most Flags",
+    "most_flags": "معظم الأعلام",
     "search": "بحث",
     "enter_username": "أدخل اسم مستخدم للبحث",
-    "search-user-for-chat": "ابحث عن مستخدم لبدء محادثة ",
+    "search-user-for-chat": "Search for a user to start chat",
     "load_more": "حمل المزيد",
     "users-found-search-took": "تم إيجاد %1 مستخدمـ(ين)! استغرق البحث %2 ثانية.",
-    "filter-by": "Filter By",
+    "filter-by": "تصفية بحسب",
     "online-only": "المتصلون فقط",
     "invite": "دعوة",
-    "prompt-email": "Emails:",
-    "groups-to-join": "Groups to be joined when invite is accepted:",
+    "prompt-email": "البريد الإلكتروني:",
+    "groups-to-join": "المجموعات التي سيتم الانضمام إليها عند قبول الدعوة:",
     "invitation-email-sent": "تم إرسال دعوة بالبريد الإلكتروني إلى %1",
     "user_list": "قائمة اﻷعضاء",
     "recent_topics": "أحدث المواضيع",

public/language/bg/_DO_NOT_EDIT_FILES_HERE.md

@@ -0,0 +1,3 @@
+# The files here are not meant to be edited directly
+
+Please see the → [Internalization README](../README.md).

public/language/bg/admin/admin.json

@@ -7,5 +7,12 @@
 	"changes-saved": "Промените са запазени",
 	"changes-saved-message": "Промените Ви в настройките на NodeBB  бяха запазени.",
 	"changes-not-saved": "Промените не са запазени",
-	"changes-not-saved-message": "Възникна проблем при запазването на промените Ви по NodeBB. (%1)"
+	"changes-not-saved-message": "Възникна проблем при запазването на промените Ви по NodeBB. (%1)",
+	"save-changes": "Запазване на промените",
+	"min": "Мин.:",
+	"max": "Макс.:",
+	"view": "Преглед",
+	"edit": "Редактиране",
+	"add": "Добавяне",
+	"select-icon": "Изберете иконка"
 }

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

@@ -1,5 +1,9 @@
 {
+	"cache": "Кеш",
 	"post-cache": "Кеш за публикации",
+	"group-cache": "Кеш за групи",
+	"local-cache": "Локален кеш",
+	"object-cache": "Кеш за обекти",
 	"percent-full": "Запълненост: %1%",
 	"post-cache-size": "Размер на кеша за публикации",
 	"items-in-cache": "Елементи в кеша"

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

@@ -5,7 +5,7 @@
 	"uptime-seconds": "Активно време в секунди",
 	"uptime-days": "Активно време в дни",
 
-	"mongo": "Mongo",
+	"mongo": "MongoDB",
 	"mongo.version": "Версия на MongoDB",
 	"mongo.storage-engine": "Система за съхранение",
 	"mongo.collections": "Колекции",

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

@@ -1,4 +1,5 @@
 {
+	"errors": "Грешки",
 	"figure-x": "Фигура %1",
 	"error-events-per-day": "<code>%1</code> събития на ден",
 	"error.404": "Страницата не е намерена (Грешка 404)",

public/language/bg/admin/appearance/customise.json

@@ -1,7 +1,8 @@
 {
-	"custom-css": "Персонализиран CSS/LESS",
-	"custom-css.description": "Въведете своите собствени декларации на CSS/LESS, те ще бъдат приложени след всички останали стилове.",
-	"custom-css.enable": "Включване на персонализиран CSS/LESS",
+	"customise": "Персонализиране",
+	"custom-css": "Персонализиран CSS/SASS",
+	"custom-css.description": "Въведете своите собствени декларации на CSS/SASS. Те ще бъдат приложени след всички останали стилове.",
+	"custom-css.enable": "Включване на персонализиран CSS/SASS",
 
 	"custom-js": "Персонализиран код на Javascript",
 	"custom-js.description": "Въведете свой собствен код на javascript тук. Той ще бъде изпълнен след като страницата се зареди напълно.",
@@ -12,5 +13,8 @@
 	"custom-header.enable": "Включване на персонализирана заглавна част",
 
 	"custom-css.livereload": "Включване на моменталното презареждане",
-	"custom-css.livereload.description": "Ако включите това, всички сесии на всяко устройство, където използвате акаунта си, ще се презареждат, когато натискате „Запазване“."
+	"custom-css.livereload.description": "Ако включите това, всички сесии на всяко устройство, където използвате акаунта си, ще се презареждат, когато натискате „Запазване“.",
+	"bsvariables": "_variables.scss",
+	"bsvariables.description": "Тук може да промените променливите на bootstrap. Можете също да използвате и инструмент като <a href=\"https://bootstrap.build/app\">bootstrap.build</a> и да копирате резултата от него тук.<br/>Промените изискват повторно изграждане и рестартиране.",
+	"bsvariables.enable": "Включване на _variables.scss"
 }

public/language/bg/admin/appearance/skins.json

@@ -1,7 +1,16 @@
 {
+	"skins": "Облици",
+	"bootswatch-skins": "Облици от Bootswatch",
+	"custom-skins": "Персонализирани облици",
+	"add-skin": "Добавяне на облик",
+	"save-custom-skins": "Запазване на персонализираните облици",
+	"save-custom-skins-success": "Персонализираните облици са запазени успешно",
+	"custom-skin-name": "Име на персонализирания облик",
+	"custom-skin-variables": "Променливи на персонализирания облик",
 	"loading": "Зареждане на облиците…",
 	"homepage": "Начална страница",
 	"select-skin": "Изберете облик",
+	"revert-skin": "Отмяна на облика",
 	"current-skin": "Текущ облик",
 	"skin-updated": "Обликът е променен",
 	"applied-success": "Обликът „%1“ беше успешно приложен",

public/language/bg/admin/appearance/themes.json

@@ -1,7 +1,9 @@
 {
+    "themes": "Теми",
     "checking-for-installed": "Проверяване за инсталирани теми…",
     "homepage": "Начална страница",
     "select-theme": "Изберете тема",
+    "revert-theme": "Отмяна на темата",
     "current-theme": "Текуща тема",
     "no-themes": "Няма намерени инсталирани теми",
     "revert-confirm": "Наистина ли искате да възстановите стандартната тема на NodeBB?",

public/language/bg/admin/dashboard.json

@@ -26,13 +26,13 @@
 	"updates": "Обновления",
 	"running-version": "Вие използвате <strong>NodeBB версия <span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Стремете се винаги да използвате най-новата версия на NodeBB, за да се възползвате от последните подобрения на сигурността и поправки на проблеми.",
-	"up-to-date": "<p>Вие използвате <strong>най-новата версия</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>Има нова версия (версия %1). Ако имате възможност, <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">обновете NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>Това е остаряла предварителна версия на NodeBB. Има нова версия (версия %1). Ако имате възможност, <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">обновете NodeBB</a>.</p>",
-	"prerelease-warning": "<p>Това е версия за <strong>предварителен преглед</strong> на NodeBB. Възможно е да има неочаквани неизправности. <i class=\"fa fa-exclamation-triangle\"></i></p>",
+	"up-to-date": "Вие използвате <strong>най-новата версия</strong> <i class=\"fa fa-check\"></i>",
+	"upgrade-available": "Има нова версия (%1). Ако имате възможност, <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">обновете NodeBB</a>.",
+	"prerelease-upgrade-available": "Това е остаряла предварителна версия на NodeBB. Има нова версия (%1). Ако имате възможност, <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">обновете NodeBB</a>.",
+	"prerelease-warning": "Това е <strong>предварителна версия</strong> на NodeBB. Възможно е да има неочаквани неизправности. <i class=\"fa fa-exclamation-triangle\"></i>",
 	"fallback-emailer-not-found": "Не е намерен резервен изпращач на е-поща",
-	"running-in-development": "<span>Форумът работи в режим за разработчици, така че може да бъде уязвим. Моля, свържете се със системния си администратор.</span>",
-	"latest-lookup-failed": "<p>Не може да бъде извършена проверка за последната налична версия на NodeBB</p>",
+	"running-in-development": "Форумът работи в режим за разработчици, така че може да бъде уязвим. Моля, свържете се със системния си администратор.",
+	"latest-lookup-failed": "Не може да бъде извършена проверка за последната налична версия на NodeBB",
 
 	"notices": "Забележки",
 	"restart-not-required": "Не се изисква рестартиране",
@@ -48,6 +48,7 @@
 	"restart-disabled": "Възможностите за повторно изграждане и рестартиране на NodeBB са изключени, тъй като изглежда, че NodeBB не се изпълнява чрез подходящия демон.",
 	"maintenance-mode": "Режим на профилактика",
 	"maintenance-mode-title": "Щракнете тук, за да зададете режим на профилактика на NodeBB",
+	"dark-mode": "Тъмен режим",
 	"realtime-chart-updates": "Актуализации на таблиците в реално време",
 
 	"active-users": "Дейни потребители",
@@ -83,8 +84,15 @@
 	"back-to-dashboard": "Назад към таблото",
 	"details.no-users": "В избрания период не са се регистрирали нови потребители",
 	"details.no-topics": "В избрания период не са публикувани нови теми",
-	"details.no-searches": "Все още не са правени търсения",
+	"details.no-searches": "В избрания период не са правени търсения",
 	"details.no-logins": "В избрания период не са отчетени вписвания",
 	"details.logins-static": "NodeBB запазва данни за сесията в продължение на %1 дни, така че в следната таблица могат да се видят само последните активни сесии",
-	"details.logins-login-time": "Време на вписване"
+	"details.logins-login-time": "Време на вписване",
+	"start": "Начало",
+	"end": "Край",
+	"filter": "Филтриране",
+	"view-as-json": "Преглед като JSON",
+	"expand-analytics": "Разгъване на данните за анализ",
+	"clear-search-history": "Изчистване на историята на търсенията",
+	"clear-search-history-confirm": "Наистина ли искате да изчистите историята на търсенията?"
 }

public/language/bg/admin/development/logger.json

@@ -1,4 +1,5 @@
 {
+	"logger": "Журнал",
 	"logger-settings": "Настройки на журнала",
 	"description": "Ако поставите отметки тук, Вие ще виждате журнала в терминала си. Ако посочите пътечка, то вместо това журналите ще бъдат записвани във файл. Журналът чрез HTTP е удобен за получаване на статистика за това кога, кои и какви хора посещават форума Ви. В допълнение към следенето на заявките чрез HTTP, можем също да следим и събитията на socket.io. Журналът на Socket.io, в комбинация с redis-cli, може да Ви бъде много полезно, ако искате да разучите как работи NodeBB.",
 	"explanation": "За да включите или изключите журналите в реално време, просто поставете или премахнете отметките в настройките на журнала. Няма нужда от рестартиране.",

public/language/bg/admin/extend/plugins.json

@@ -1,4 +1,5 @@
 {
+	"plugins": "Добавки",
 	"trending": "Популярни",
 	"installed": "Инсталирани",
 	"active": "Включени",

public/language/bg/admin/extend/rewards.json

@@ -1,10 +1,12 @@
 {
 	"rewards": "Награди",
+	"add-reward": "Добавяне на награда",
 	"condition-if-users": "Ако потребителският(ата/ото)",
 	"condition-is": "Е:",
 	"condition-then": "Тогава:",
 	"max-claims": "Колко пъти може да бъде получавана наградата",
 	"zero-infinite": "0 = безкраен брой пъти",
+	"select-reward": "Изберете награда",
 	"delete": "Изтриване",
 	"enable": "Включване",
 	"disable": "Изключване",

public/language/bg/admin/extend/widgets.json

@@ -1,4 +1,5 @@
 {
+	"widgets": "Джаджи",
 	"available": "Налични джаджи",
 	"explanation": "Изберете джаджа от падащото меню, а след това я завлачете и пуснете в областта за джаджи в някой от шаблоните вляво.",
 	"none-installed": "Няма намерени джаджи! Включете добавката с основните джаджи в контролния панел за <a href=\"%1\">добавките</a>.",
@@ -8,9 +9,9 @@
 	"containers.none": "Няма",
 	"container.well": "Кладенец",
 	"container.jumbotron": "Джъмботрон",
-	"container.panel": "Панел",
-	"container.panel-header": "Заглавна част на панел",
-	"container.panel-body": "Основна част на панел",
+	"container.card": "Карта",
+	"container.card-header": "Заглавна част на карта",
+	"container.card-body": "Основна част на карта",
 	"container.alert": "Предупреждение",
 
 	"alert.confirm-delete": "Наистина ли искате да изтриете джаджата?",
@@ -26,5 +27,7 @@
 	"container.placeholder": "Завлачете и пуснете контейнер или въведете HTML тук.",
 	"show-to-groups": "Показване на групите",
 	"hide-from-groups": "Скриване от групите",
+	"start-date": "Начална дата",
+	"end-date": "Крайна дата",
 	"hide-on-mobile": "Скриване на мобилни устройства"
 }

public/language/bg/admin/manage/admins-mods.json

@@ -1,8 +1,11 @@
 {
+    "manage-admins-and-mods": "Управление на администраторите и модераторите",
     "administrators": "Администратори",
     "global-moderators": "Глобални модератори",
+    "moderators": "Модератори",
     "no-global-moderators": "Няма глобални модератори",
-    "moderators-of-category": "%1 модератори",
+    "no-sub-categories": "Няма подкатегории",
+    "view-children": "Преглед на подкатегориите (%1)",
     "no-moderators": "Няма модератори",
     "add-administrator": "Добавяне на администратор",
     "add-global-moderator": "Добавяне на глобален модератор",

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

@@ -1,7 +1,11 @@
 {
+	"manage-categories": "Управление на категориите",
+	"add-category": "Добавяне на категория",
+	"jump-to": "Прехвърляне към…",
 	"settings": "Настройки на категорията",
+	"edit-category": "Редактиране на категорията",
 	"privileges": "Правомощия",
-
+	"back-to-categories": "Назад към категориите",
 	"name": "Име на категорията",
 	"description": "Описание на категорията",
 	"bg-color": "Цвят на фона",
@@ -15,8 +19,10 @@
 	"post-queue": "Опашка за публикации",
 	"tag-whitelist": "Списък от разрешени етикети",
 	"upload-image": "Качване на изображение",
+	"upload": "Качване",
 	"delete-image": "Премахване",
 	"category-image": "Изображение на категорията",
+	"image-and-icon": "Изображение и иконка",
 	"parent-category": "Базова категория",
 	"optional-parent-category": "(Незадължително) Базова категория",
 	"top-level": "Най-горно ниво",
@@ -31,6 +37,7 @@
 	"disable": "Изключване",
 	"edit": "Редактиране",
 	"analytics": "Анализи",
+
 	"view-category": "Преглед на категорията",
 	"set-order": "Запазване на реда",
 	"set-order-help": "Задаването на позиция за категорията ще я премести на желаното място и ще промени местата на другите категории, ако е необходимо. Най-малкият възможен номер е 1, което ще постави категорията най-отгоре.",

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

@@ -1,4 +1,10 @@
 {
+	"manage-groups": "Управление на групите",
+	"add-group": "Добавяне на група",
+	"edit-group": "Редактиране на групата",
+	"back-to-groups": "Назад към групите",
+	"view-group": "Преглед на групата",
+	"icon-and-title": "Иконка и заглавие",
 	"name": "Име на групата",
 	"badge": "Емблема",
 	"properties": "Свойства",
@@ -10,7 +16,7 @@
 	"edit": "Редактиране",
 	"delete": "Изтриване",
 	"privileges": "Правомощия",
-	"download-csv": "CSV",
+	"members-csv": "Членове (CSV)",
 	"search-placeholder": "Търсене",
 	"create": "Създаване на група",
 	"description-placeholder": "Кратко описание на групата",
@@ -39,6 +45,5 @@
 	"revert": "Отмяна",
 
 	"edit.no-users-found": "Няма намерени потребители",
-	"edit.confirm-remove-user": "Наистина ли искате да премахнете този потребител?",
-	"edit.save-success": "Промените са запазени!"
+	"edit.confirm-remove-user": "Наистина ли искате да премахнете този потребител?"
 }

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

@@ -1,4 +1,6 @@
 {
+	"manage-privileges": "Управление на правомощията",
+	"discard-changes": "Отхвърляне на промените",
 	"global": "Глобални",
 	"admin": "Администратор",
 	"group-privileges": "Правомощия за групите",
@@ -49,7 +51,6 @@
 	"alert.confirm-moderate": "<strong>Наистина ли искате да дадете правомощието за модериране на тази потребителска група?</strong> Тази група е публична и всеки може свободно да се присъедини към нея.",
 	"alert.confirm-admins-mods": "<strong>Наистина ли искате да дадете правото „Администратори и модератори“ на този потребител/група?</strong> Потребителите с това право могат да променят правомощията на други групи, <em>включително да им дават правото на супер администратори</em>",
 	"alert.confirm-save": "Моля, потвърдете желанието си да запазите тези правомощия",
-	"alert.saved": "Промените по правомощията са запазени и приложени",
 	"alert.confirm-discard": "Наистина ли искате да отхвърлите промените по правомощията?",
 	"alert.discarded": "Промените по правомощията са отхвърлени",
 	"alert.confirm-copyToAll": "Наистина ли искате да приложите този набор от <strong>%1</strong> към <strong>всички категории</strong>?",

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

@@ -1,9 +1,11 @@
 {
+	"manage-tags": "Управление на етикетите",
 	"none": "Форумът все още няма теми с етикети.",
 	"bg-color": "Цвят на фона",
 	"text-color": "Цвят на текста",
 	"description": "Изберете етикетите чрез щракване или влачене. Използвайте <code>CTRL</code>, за да изберете няколко етикета.",
 	"create": "Създаване на етикет",
+	"add-tag": "Добавяне на етикет",
 	"modify": "Редактиране на етикети",
 	"rename": "Преименуване на етикети",
 	"delete": "Изтриване на избраните етикети",

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

@@ -1,4 +1,5 @@
 {
+    "manage-uploads": "Управление на качванията",
     "upload-file": "Качване на файл",
     "filename": "Име на файла",
     "usage": "Използване в публикации",

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

@@ -1,4 +1,5 @@
 {
+	"manage-users": "Управление на потребителите",
 	"users": "Потребители",
 	"edit": "Действия",
 	"make-admin": "Даване на администраторски права",
@@ -17,6 +18,7 @@
 	"purge": "Изтриване на <strong>потребителя/ите</strong> и <strong>съдържанието</strong>",
 	"download-csv": "Сваляне във формат „CSV“",
 	"manage-groups": "Управление на групите",
+	"set-reputation": "Задаване на репутация",
 	"add-group": "Добавяне на група",
 	"create": "Създаване на потребител",
 	"invite": "Поканване по е-поща",
@@ -49,6 +51,10 @@
 	"users.username": "потребителско име",
 	"users.email": "е-поща",
 	"users.no-email": "(няма е-поща)",
+	"users.validated": "Потвърдена",
+	"users.not-validated": "Непотвърдена",
+	"users.validation-pending": "Очаква потвърждение",
+	"users.validation-expired": "Изтекла давност на потвърждението",
 	"users.ip": "IP адрес",
 	"users.postcount": "брой публикации",
 	"users.reputation": "репутация",
@@ -91,6 +97,7 @@
 	"alerts.validate-email-success": "Е-пощите са проверени",
 	"alerts.validate-force-password-reset-success": "Паролата на потребителя (или паролите на потребителите) беше подновена и сесията му беше прекратена.",
 	"alerts.password-reset-confirm": "Искате ли да изпратите е-писмо/а за възстановяване на паролата на този/тези потребител(и)?",
+	"alerts.password-reset-email-sent": "Е-писмото за възстановяване на паролата е изпратено.",
 	"alerts.confirm-delete": "<strong>ВНИМАНИЕ!</strong><p>Наистина ли искате да изтриете <strong>потребителя/ите</strong>?</p> <p>Това действие е необратимо! Ще бъде изтрит само профилът на потребителя/ите, неговите/техните публикациите и теми ще останат.</p>",
 	"alerts.delete-success": "Потребителят/ите е/са изтрит(и)!",
 	"alerts.confirm-delete-content": "<strong>ВНИМАНИЕ!</strong><p>Наистина ли искате да изтриете <strong>съдържанието</strong> на този потребител или тези потребители?</p> <p>Това действие е необратимо! Профилите на потребителите ще останат, но всички техни публикации и теми ще бъдат изтрити.</p>",

public/language/bg/admin/menu.json

@@ -14,6 +14,7 @@
 	"manage/users": "Потребители",
 	"manage/admins-mods": "Администратори и модератори",
 	"manage/registration": "Регистрационна опашка",
+	"manage/flagged-content": "Докладвано съдържание",
 	"manage/post-queue": "Опашка за публикации",
 	"manage/groups": "Групи",
 	"manage/ip-blacklist": "Черен списък за IP адреси",
@@ -68,15 +69,17 @@
 	"advanced/logs": "Журнали",
 	"advanced/errors": "Грешки",
 	"advanced/cache": "Кеш",
-	"development/logger": "Система на журнала",
+	"development/logger": "Журнал",
 	"development/info": "Информация",
 
 	"rebuild-and-restart-forum": "Повторно изграждане и рестартиране на форума",
+	"rebuild-and-restart": "Повторно изграждане и рестартиране",
 	"restart-forum": "Рестартиране на форума",
+	"restart": "Рестартиране",
 	"logout": "Изход",
 	"view-forum": "Преглед на форума",
 
-	"search.placeholder": "Натиснете „/“ за търсене на настройки",
+	"search.placeholder": "Търсене на настройки",
 	"search.no-results": "Няма резултати…",
 	"search.search-forum": "Търсене във форума за <strong></strong>",
 	"search.keep-typing": "Продължете да пишете, за да видите още резултати…",

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“",
@@ -17,7 +18,10 @@
 	"headers.acah": "Access-Control-Allow-Headers",
 	"headers.coep": "Cross-Origin-Embedder-Policy",
 	"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": "Позволява задаването на стойност в заглавката „permissions-policy“ (политика за разрешенията), като например „geolocation=*, camera=()“. Вижте  <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">тук</a> за повече информация.",
 	"hsts": "Стриктна транспортна сигурност",
 	"hsts.enabled": "Включване на HSTS (препоръчително)",
 	"hsts.maxAge": "Максимална възраст на HSTS",