chore: incrementing version number - v1.14.3-beta.12

This reverts commit 0bbb813e4b.

.codeclimate.yml

@@ -1,8 +1,22 @@
 # Save as .codeclimate.yml (note leading .) in project root directory
+version: "2"
 languages:
-  Ruby: true
+  Ruby: false
   JavaScript: true
-  PHP: true
+  PHP: false
+checks:
+  file-lines:
+    config:
+      threshold: 500
+  method-lines:
+    config:
+      threshold: 50
+  method-complexity:
+    config:
+      threshold: 10
+  similar-code:
+    config:
+      threshold: 65
 exclude_paths:
 - "public/vendor/*"
 - "test/*"

.eslintignore

@@ -18,3 +18,4 @@ logs/
 /build
 .eslintrc
 test/files
+*.min.js

.eslintrc

@@ -14,16 +14,17 @@
 			"exports": "always-multiline",
 			"functions": "never"
 		}],
+		"no-return-await": "off",
+		"no-constant-condition": "off",
 		"no-empty": ["error", { "allowEmptyCatch": true }],
 		"no-underscore-dangle": "off",
-		"newline-per-chained-call": "off",
 		"no-console": "off",
 		"no-mixed-operators": ["error", { "allowSamePrecedence": true }],
 		"strict": ["error", "global"],
 		"consistent-return": "off",
 		"func-names": "off",
 		"no-tabs": "off",
-		"indent": ["error", "tab"],
+		"indent": ["error", "tab", { "SwitchCase": 1 }],
 		"no-eq-null": "off",
 		"camelcase": "off",
 		"no-new": "off",
@@ -36,6 +37,13 @@
 		"no-restricted-globals": "off",
 		"function-paren-newline": "off",
 		"import/no-unresolved": "error",
+		"quotes": ["error", "single", {
+			"avoidEscape": true,
+			"allowTemplateLiterals": true
+		}],
+		"no-else-return": [ "error", { "allowElseIf": true } ],
+		"operator-linebreak": [ "error", "after" ],
+		"arrow-parens": ["error", "as-needed", { "requireForBlockBody": true }],
 
 		// ES6
 		"prefer-rest-params": "off",
@@ -113,7 +121,7 @@
 		// "comma-spacing": "off",
 		// "no-trailing-spaces": "off",
 		// "key-spacing": "off",
-		// "no-multiple-empty-lines": "off",
+		"no-multiple-empty-lines": "off"
 		// "spaced-comment": "off",
 		// "space-in-parens": "off",
 		// "block-spacing": "off",

.github/ISSUE_TEMPLATE.md

@@ -10,9 +10,11 @@
 - **NodeBB version:** 
 - **NodeBB git hash:** 
 <!-- (to find your git hash, execute `git rev-parse HEAD` from the main NodeBB directory) -->
-- **Database type:** mongo or redis
+- **Installed NodeBB Plugins:** 
+<!-- (to find installed plugins run ./nodebb plugins) -->
+- **Database type:** mongo, redis, or postgres
 - **Database version:** 
-<!-- `mongod --version` or `redis-server --version` -->
+<!-- `mongod --version`, `redis-server --version`, or `postgres --version` -->
 - **Exact steps to cause this issue:**
 <!--
 	1. First I did this...

.gitignore

@@ -1,3 +1,4 @@
+dist/
 yarn.lock
 npm-debug.log
 node_modules/
@@ -66,3 +67,5 @@ test/files/normalise.jpg.png
 test/files/normalise-resized.jpg
 package-lock.json
 /package.json
+*.mongodb
+link-plugins.sh

.jshintrc

@@ -4,6 +4,8 @@
 
     "maxerr" : 50, // {int} Maximum error before stopping
 
+    "esversion": 6,
+
     // Enforcing
     "bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.)
     "camelcase" : false, // true: Identifiers must be in camelCase

.mocharc.yml

@@ -0,0 +1,4 @@
+reporter: dot
+timeout: 25000
+exit: true
+bail: true

.travis.yml

@@ -1,36 +1,47 @@
 services:
   - mongodb
   - redis-server
+  - postgresql
 before_install:
   - cp install/package.json package.json
-cache:
-  directories:
-    - node_modules
+  - sudo apt-get update
+  - sudo apt-get --yes remove postgresql\*
+  - sudo apt-get install -y postgresql-12 postgresql-client-12
+  - sudo cp /etc/postgresql/{9.6,12}/main/pg_hba.conf
+  - sudo service postgresql restart 12
 before_script:
   - sleep 15 # wait for mongodb to be ready
-  - sh -c "if [ '$DB' = 'mongodb' ]; then node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567\\\",\\\"secret\\\":\\\"abcdef\\\",\\\"database\\\":\\\"mongo\\\",\\\"mongo:host\\\":\\\"127.0.0.1\\\",\\\"mongo:port\\\":27017,\\\"mongo:username\\\":\\\"\\\",\\\"mongo:password\\\":\\\"\\\",\\\"mongo:database\\\":0,\\\"redis:host\\\":\\\"127.0.0.1\\\",\\\"redis:port\\\":6379,\\\"redis:password\\\":\\\"\\\",\\\"redis:database\\\":0,\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"abcdef\\\",\\\"admin:password:confirm\\\":\\\"abcdef\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":27017,\\\"database\\\":0}\"; fi"
-  - sh -c "if [ '$DB' = 'redis' ]; then node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567\\\",\\\"secret\\\":\\\"abcdef\\\",\\\"database\\\":\\\"redis\\\",\\\"mongo:host\\\":\\\"127.0.0.1\\\",\\\"mongo:port\\\":27017,\\\"mongo:username\\\":\\\"\\\",\\\"mongo:password\\\":\\\"\\\",\\\"mongo:database\\\":0,\\\"redis:host\\\":\\\"127.0.0.1\\\",\\\"redis:port\\\":6379,\\\"redis:password\\\":\\\"\\\",\\\"redis:database\\\":0,\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"abcdef\\\",\\\"admin:password:confirm\\\":\\\"abcdef\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":6379,\\\"database\\\":0}\"; fi"
+  - "mongo mydb_test --eval 'db.createUser({user:\"travis\", pwd: \"test\", roles: []});'"
+  - sh -c "if [ '$DB' = 'mongodb' ]; then node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567\\\",\\\"secret\\\":\\\"abcdef\\\",\\\"database\\\":\\\"mongo\\\",\\\"mongo:host\\\":\\\"127.0.0.1\\\",\\\"mongo:port\\\":27017,\\\"mongo:username\\\":\\\"\\\",\\\"mongo:password\\\":\\\"\\\",\\\"mongo:database\\\":0,\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"hAN3Eg8W\\\",\\\"admin:password:confirm\\\":\\\"hAN3Eg8W\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":27017,\\\"database\\\":\\\"travis_ci_test\\\"}\"; fi"
+  - sh -c "if [ '$DB' = 'redis' ]; then node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567/forum\\\",\\\"secret\\\":\\\"abcdef\\\",\\\"database\\\":\\\"redis\\\",\\\"redis:host\\\":\\\"127.0.0.1\\\",\\\"redis:port\\\":6379,\\\"redis:password\\\":\\\"\\\",\\\"redis:database\\\":0,\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"hAN3Eg8W\\\",\\\"admin:password:confirm\\\":\\\"hAN3Eg8W\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":6379,\\\"database\\\":1}\"; fi"
+  - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database nodebb;' -U postgres; psql -c 'create database travis_ci_test;' -U postgres; node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567\\\",\\\"secret\\\":\\\"abcdef\\\",\\\"database\\\":\\\"postgres\\\",\\\"postgres:host\\\":\\\"127.0.0.1\\\",\\\"postgres:port\\\":5433,\\\"postgres:password\\\":\\\"\\\",\\\"postgres:database\\\":\\\"nodebb\\\",\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"hAN3Eg8W\\\",\\\"admin:password:confirm\\\":\\\"hAN3Eg8W\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":5433,\\\"username\\\":\\\"postgres\\\",\\\"database\\\":\\\"travis_ci_test\\\"}\"; fi"
 after_success:
   - "npm run coveralls"
 language: node_js
 sudo: false
-dist: trusty
+dist: xenial
 env:
-  - CXX=g++-4.8 DB=mongodb
-  - CXX=g++-4.8 DB=redis
+  global:
+    - PGUSER=postgres
+    - PGPORT=5433
+    - CXX=g++-4.8
+  jobs:
+    - "DB=mongodb TEST_ENV=production"
+    - "DB=mongodb TEST_ENV=development"
+    - "DB=redis TEST_ENV=production"
+    - "DB=postgres TEST_ENV=production"
 addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
-      - mongodb-3.4-trusty
+      - mongodb-4.0-xenial
     packages:
       - g++-4.8
       - mongodb-org-server
 node_js:
-  - "9"
-  - "8"
-  - "7"
-  - "6"
+  - "14"
+  - "12"
+  - "10"
 branches:
   only:
     - master

Dockerfile

@@ -1,20 +1,22 @@
-# The base image is the latest 8.x node (LTS)
-FROM node:8.9.0
+FROM node:lts
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 
 ARG NODE_ENV
 ENV NODE_ENV $NODE_ENV
+
 COPY install/package.json /usr/src/app/package.json
-RUN npm install && npm cache clean --force
+
+RUN npm install --only=prod && \
+    npm cache clean --force
+    
 COPY . /usr/src/app
 
 ENV NODE_ENV=production \
     daemon=false \
     silent=false
 
-CMD ./nodebb start
+EXPOSE 4567
 
-# the default port for NodeBB is exposed outside the container
-EXPOSE 4567
+CMD node ./nodebb build ;  node ./nodebb start

Gruntfile.js

@@ -1,94 +1,86 @@
 'use strict';
 
-var fork = require('child_process').fork;
-var env = process.env;
+const path = require('path');
+const nconf = require('nconf');
+nconf.argv().env({
+	separator: '__',
+});
+const winston = require('winston');
+const fork = require('child_process').fork;
+const env = process.env;
 var worker;
-var updateWorker;
-var initWorker;
-var incomplete = [];
-var running = 0;
 
 env.NODE_ENV = env.NODE_ENV || 'development';
 
+const configFile = path.resolve(__dirname, nconf.any(['config', 'CONFIG']) || 'config.json');
+const prestart = require('./src/prestart');
+prestart.loadConfig(configFile);
+
+var db = require('./src/database');
+
 module.exports = function (grunt) {
 	var args = [];
-	var initArgs = ['--build'];
+
 	if (!grunt.option('verbose')) {
 		args.push('--log-level=info');
-		initArgs.push('--log-level=info');
-	}
-
-	function update(action, filepath, target) {
-		var updateArgs = args.slice();
-		var compiling;
-		var time = Date.now();
-
-		if (target === 'lessUpdated_Client') {
-			compiling = 'clientCSS';
-		} else if (target === 'lessUpdated_Admin') {
-			compiling = 'acpCSS';
-		} else if (target === 'clientUpdated') {
-			compiling = 'js';
-		} else if (target === 'templatesUpdated') {
-			compiling = 'tpl';
-		} else if (target === 'langUpdated') {
-			compiling = 'lang';
-		} else if (target === 'serverUpdated') {
-			// Do nothing, just restart
-		}
-
-		if (compiling && incomplete.indexOf(compiling) === -1) {
-			incomplete.push(compiling);
-		}
-
-		updateArgs.push('--build');
-		updateArgs.push(incomplete.join(','));
-
-		worker.kill();
-		if (updateWorker) {
-			updateWorker.kill('SIGKILL');
-		}
-		updateWorker = fork('app.js', updateArgs, { env: env });
-		running += 1;
-		updateWorker.on('exit', function () {
-			running -= 1;
-			if (running === 0) {
-				worker = fork('app.js', args, {
-					env: env,
-				});
-				worker.on('message', function () {
-					if (incomplete.length) {
-						incomplete = [];
-
-						if (grunt.option('verbose')) {
-							grunt.log.writeln('NodeBB restarted in ' + (Date.now() - time) + ' ms');
-						}
-					}
-				});
-			}
-		});
+		nconf.set('log-level', 'info');
 	}
+	prestart.setupWinston();
 
 	grunt.initConfig({
-		watch: {
-			lessUpdated_Client: {
+		watch: {},
+	});
+
+	grunt.loadNpmTasks('grunt-contrib-watch');
+
+	grunt.registerTask('default', ['watch']);
+
+	grunt.registerTask('init', async function () {
+		var done = this.async();
+		let plugins = [];
+		if (!process.argv.includes('--core')) {
+			await db.init();
+			plugins = await db.getSortedSetRange('plugins:active', 0, -1);
+			addBaseThemes(plugins);
+			if (!plugins.includes('nodebb-plugin-composer-default')) {
+				plugins.push('nodebb-plugin-composer-default');
+			}
+			if (!plugins.includes('nodebb-theme-persona')) {
+				plugins.push('nodebb-theme-persona');
+			}
+		}
+
+		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_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');
+
+		grunt.config(['watch'], {
+			styleUpdated_Client: {
 				files: [
-					'public/less/*.less',
-					'!public/less/admin/**/*.less',
-					'node_modules/nodebb-*/**/*.less',
-					'!node_modules/nodebb-*/node_modules/**',
-					'!node_modules/nodebb-*/.git/**',
+					'public/less/**/*.less',
+					...styleUpdated_Client,
 				],
 				options: {
 					interval: 1000,
 				},
 			},
-			lessUpdated_Admin: {
+			styleUpdated_Admin: {
 				files: [
-					'public/less/admin/**/*.less',
-					'node_modules/nodebb-*/**/*.less',
-					'!node_modules/nodebb-*/node_modules/**',
-					'!node_modules/nodebb-*/.git/**',
+					'public/less/**/*.less',
+					...styleUpdated_Admin,
 				],
 				options: {
 					interval: 1000,
@@ -97,17 +89,24 @@ module.exports = function (grunt) {
 			clientUpdated: {
 				files: [
 					'public/src/**/*.js',
-					'node_modules/nodebb-*/**/*.js',
-					'!node_modules/nodebb-*/node_modules/**',
+					...clientUpdated,
 					'node_modules/benchpressjs/build/benchpress.js',
-					'!node_modules/nodebb-*/.git/**',
 				],
 				options: {
 					interval: 1000,
 				},
 			},
 			serverUpdated: {
-				files: ['*.js', 'install/*.js', 'src/**/*.js'],
+				files: [
+					'app.js',
+					'install/*.js',
+					'src/**/*.js',
+					'public/src/modules/translator.js',
+					'public/src/modules/helpers.js',
+					'public/src/utils.js',
+					serverUpdated,
+					'!src/upgrades/**',
+				],
 				options: {
 					interval: 1000,
 				},
@@ -115,9 +114,7 @@ module.exports = function (grunt) {
 			templatesUpdated: {
 				files: [
 					'src/views/**/*.tpl',
-					'node_modules/nodebb-*/**/*.tpl',
-					'!node_modules/nodebb-*/node_modules/**',
-					'!node_modules/nodebb-*/.git/**',
+					...templatesUpdated,
 				],
 				options: {
 					interval: 1000,
@@ -127,40 +124,80 @@ module.exports = function (grunt) {
 				files: [
 					'public/language/en-GB/*.json',
 					'public/language/en-GB/**/*.json',
-					'node_modules/nodebb-*/**/*.json',
-					'!node_modules/nodebb-*/node_modules/**',
-					'!node_modules/nodebb-*/.git/**',
-					'!node_modules/nodebb-*/plugin.json',
-					'!node_modules/nodebb-*/package.json',
-					'!node_modules/nodebb-*/theme.json',
+					...langUpdated,
 				],
 				options: {
 					interval: 1000,
 				},
 			},
-		},
+		});
+		const build = require('./src/meta/build');
+		if (!grunt.option('skip')) {
+			await build.build(true);
+		}
+		run();
+		done();
 	});
 
-	grunt.loadNpmTasks('grunt-contrib-watch');
-
-	grunt.registerTask('default', ['watch']);
-	env.NODE_ENV = 'development';
-
-	if (grunt.option('skip')) {
+	function run() {
+		if (worker) {
+			worker.kill();
+		}
 		worker = fork('app.js', args, {
 			env: env,
 		});
-	} else {
-		initWorker = fork('app.js', initArgs, {
-			env: env,
-		});
-
-		initWorker.on('exit', function () {
-			worker = fork('app.js', args, {
-				env: env,
-			});
-		});
 	}
 
-	grunt.event.on('watch', update);
+	grunt.task.run('init');
+
+	grunt.event.removeAllListeners('watch');
+	grunt.event.on('watch', function update(action, filepath, target) {
+		var compiling;
+		if (target === 'styleUpdated_Client') {
+			compiling = 'clientCSS';
+		} else if (target === 'styleUpdated_Admin') {
+			compiling = 'acpCSS';
+		} else if (target === 'clientUpdated') {
+			compiling = 'js';
+		} else if (target === 'templatesUpdated') {
+			compiling = 'tpl';
+		} else if (target === 'langUpdated') {
+			compiling = 'lang';
+		} else if (target === 'serverUpdated') {
+			// empty require cache
+			const paths = ['./src/meta/build.js', './src/meta/index.js'];
+			paths.forEach(p => delete require.cache[require.resolve(p)]);
+			return run();
+		}
+
+		require('./src/meta/build').build([compiling], function (err) {
+			if (err) {
+				winston.error(err.stack);
+			}
+			if (worker) {
+				worker.send({ compiling: compiling });
+			}
+		});
+	});
 };
+
+function addBaseThemes(plugins) {
+	let themeId = plugins.find(p => p.includes('nodebb-theme-'));
+	if (!themeId) {
+		return plugins;
+	}
+	let baseTheme;
+	do {
+		try {
+			baseTheme = require(themeId + '/theme').baseTheme;
+		} catch (err) {
+			console.log(err);
+		}
+
+		if (baseTheme) {
+			plugins.push(baseTheme);
+			themeId = baseTheme;
+		}
+	} while (baseTheme);
+	return plugins;
+}

README.md

@@ -1,11 +1,9 @@
 # <img alt="NodeBB" src="http://i.imgur.com/mYxPPtB.png" />
 
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/NodeBB/NodeBB?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Build Status](https://travis-ci.org/NodeBB/NodeBB.svg?branch=master)](https://travis-ci.org/NodeBB/NodeBB)
 [![Coverage Status](https://coveralls.io/repos/github/NodeBB/NodeBB/badge.svg?branch=master)](https://coveralls.io/github/NodeBB/NodeBB?branch=master)
 [![Dependency Status](https://david-dm.org/nodebb/nodebb.svg?path=install)](https://david-dm.org/nodebb/nodebb?path=install)
 [![Code Climate](https://codeclimate.com/github/NodeBB/NodeBB/badges/gpa.svg)](https://codeclimate.com/github/NodeBB/NodeBB)
-[![Documentation Status](https://readthedocs.org/projects/nodebb/badge/?version=latest)](https://readthedocs.org/projects/nodebb/?badge=latest)
 
 [**NodeBB Forum Software**](https://nodebb.org) is powered by Node.js and built on either a Redis or MongoDB database. It utilizes web sockets for instant interactions and real-time notifications. NodeBB has many modern features out of the box such as social network integration and streaming discussions, while still making sure to be compatible with older browsers.
 
@@ -42,7 +40,7 @@ Our minimalist "Persona" theme gets you going right away, no coding experience r
 ## 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 extention 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 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.
 * 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.
 
@@ -50,7 +48,7 @@ Our minimalist "Persona" theme gets you going right away, no coding experience r
 
 NodeBB requires the following software to be installed:
 
-* A version of Node.js at least 6 or greater ([installation/upgrade instructions](https://github.com/nodesource/distributions))
+* A version of Node.js at least 10 or greater ([installation/upgrade instructions](https://github.com/nodesource/distributions))
 * Redis, version 2.8.9 or greater **or** MongoDB, version 2.6 or greater
 * nginx, version 1.3.13 or greater (**only if** intending to use nginx to proxy requests to a NodeBB)
 

app.js

@@ -19,34 +19,31 @@
 
 'use strict';
 
-if (require.main !== module) {
-	require.main.require = function (path) {
-		return require(path);
-	};
-}
+require('./require-main');
 
-var nconf = require('nconf');
+const nconf = require('nconf');
 nconf.argv().env({
 	separator: '__',
 });
 
-var async = require('async');
-var winston = require('winston');
-var path = require('path');
+const winston = require('winston');
+const path = require('path');
 
-var file = require('./src/file');
+const file = require('./src/file');
 
+process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 global.env = process.env.NODE_ENV || 'production';
 
 // Alternate configuration file support
-var	configFile = path.resolve(__dirname, nconf.any(['config', 'CONFIG']) || 'config.json');
+const configFile = path.resolve(__dirname, nconf.any(['config', 'CONFIG']) || 'config.json');
 
-var configExists = file.existsSync(configFile) || (nconf.get('url') && nconf.get('secret') && nconf.get('database'));
+const configExists = file.existsSync(configFile) || (nconf.get('url') && nconf.get('secret') && nconf.get('database'));
 
-var prestart = require('./src/prestart');
+const prestart = require('./src/prestart');
 prestart.loadConfig(configFile);
-prestart.versionCheck();
 prestart.setupWinston();
+prestart.versionCheck();
+winston.verbose('* using configuration stored in: %s', configFile);
 
 if (!process.send) {
 	// If run using `node app`, log GNU copyright info along with server info
@@ -63,33 +60,21 @@ if (nconf.get('setup') || nconf.get('install')) {
 } else if (nconf.get('upgrade')) {
 	require('./src/cli/upgrade').upgrade(true);
 } else if (nconf.get('reset')) {
-	var options = {
+	require('./src/cli/reset').reset({
 		theme: nconf.get('t'),
 		plugin: nconf.get('p'),
 		widgets: nconf.get('w'),
 		settings: nconf.get('s'),
 		all: nconf.get('a'),
-	};
-
-	async.series([
-		async.apply(require('./src/cli/reset').reset, options),
-		require('./src/meta/build').buildAll,
-	], function (err) {
-		if (err) {
-			throw err;
-		}
-
-		process.exit(0);
 	});
 } else if (nconf.get('activate')) {
 	require('./src/cli/manage').activate(nconf.get('activate'));
 } else if (nconf.get('plugins')) {
 	require('./src/cli/manage').listPlugins();
 } else if (nconf.get('build')) {
-	require('./src/meta/build').build(nconf.get('build'));
+	require('./src/cli/manage').build(nconf.get('build'));
 } else if (nconf.get('events')) {
 	require('./src/cli/manage').listEvents();
 } else {
 	require('./src/start').start();
 }
-

commitlint.config.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = { extends: ['@commitlint/config-angular'] };

docker-compose.yml

@@ -0,0 +1,24 @@
+version: '3.5'
+
+services:
+  node:
+    build: .
+    restart: unless-stopped
+    depends_on:
+      - db
+    expose:
+      - 4567 # use a reverse proxy like Traefik
+
+  db:
+    image: mongo:bionic
+    restart: unless-stopped
+    expose:
+      - 27017
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: root
+    volumes:
+      - mongo:/data/db
+
+volumes:
+  mongo:

install/data/defaults.json

@@ -1,54 +1,138 @@
 {
     "title": "NodeBB",
     "showSiteTitle": 1,
+    "defaultLang": "en-GB",
+    "loginDays": 14,
+    "loginSeconds": 0,
+    "loginAttempts": 5,
+    "lockoutDuration": 60,
+    "adminReloginDuration": 60,
     "postDelay": 10,
     "initialPostDelay": 10,
     "newbiePostDelay": 120,
+    "postEditDuration": 0,
+    "newbiePostEditDuration": 3600,
+    "postDeleteDuration": 0,
+    "enablePostHistory": 1,
+    "postCacheSize": 10485760,
+    "disableChat": 0,
+    "chatEditDuration": 0,
+    "chatDeleteDuration": 0,
+    "chatMessageDelay": 200,
     "newbiePostDelayThreshold": 3,
+    "postQueueReputationThreshold": 0,
+    "groupsExemptFromPostQueue": ["administrators", "Global Moderators"],
     "minimumPostLength": 8,
     "maximumPostLength": 32767,
     "minimumTagsPerTopic": 0,
     "maximumTagsPerTopic": 5,
     "minimumTagLength": 3,
     "maximumTagLength": 15,
-    "allowGuestSearching": 0,
     "allowTopicsThumbnail": 0,
     "registrationType": "normal",
-    "allowLocalLogin": 1,
+    "registrationApprovalType": "normal",
     "allowAccountDelete": 1,
-    "allowFileUploads": 0,
-    "allowedFileExtensions": "png,jpg,bmp",
+    "privateUploads": 0,
+    "allowedFileExtensions": "png,jpg,bmp,txt",
     "allowUserHomePage": 1,
+    "allowMultipleBadges": 0,
     "maximumFileSize": 2048,
+    "stripEXIFData": 1,
+    "resizeImageWidthThreshold": 2000,
+    "resizeImageWidth": 760,
+    "rejectImageWidth": 5000,
+    "rejectImageHeight": 5000,
+    "resizeImageQuality": 80,
+    "topicThumbSize": 120,
     "minimumTitleLength": 3,
     "maximumTitleLength": 255,
     "minimumUsernameLength": 2,
     "maximumUsernameLength": 16,
     "minimumPasswordLength": 6,
+    "minimumPasswordStrength": 1,
     "maximumSignatureLength": 255,
     "maximumAboutMeLength": 1000,
+    "maximumUsersInChatRoom": 0,
     "maximumChatMessageLength": 1000,
     "maximumProfileImageSize": 256,
     "maximumCoverImageSize": 2048,
     "profileImageDimension": 200,
+    "profile:convertProfileImageToPNG": 0,
+    "profile:keepAllUserImages": 0,
     "requireEmailConfirmation": 0,
+    "gdpr_enabled": 1,
     "allowProfileImageUploads": 1,
     "teaserPost": "last-reply",
     "allowPrivateGroups": 1,
     "unreadCutoff": 2,
     "bookmarkThreshold": 5,
-    "topicsPerList": 20,
     "autoDetectLang": 1,
+    "reputation:disabled": 0,
+    "downvote:disabled": 0,
+    "disableSignatures": 0,
+    "downvotesPerDay": 10,
+    "downvotesPerUserPerDay": 3,
+    "min:rep:downvote": 0,
     "min:rep:flag": 0,
+    "min:rep:profile-picture": 0,
+    "min:rep:cover-picture": 0,
+    "min:rep:website": 0,
+    "min:rep:aboutme": 0,
+    "min:rep:signature": 0,
+    "flags:limitPerTarget": 0,
     "notificationType_upvote": "notification",
     "notificationType_new-topic": "notification",
     "notificationType_new-reply": "notification",
+    "notificationType_post-edit": "notification",
     "notificationType_follow": "notification",
     "notificationType_new-chat": "notification",
     "notificationType_group-invite": "notification",
+    "notificationType_group-request-membership": "notification",
     "notificationType_mention": "notification",
     "notificationType_new-register": "notification",
-	"notificationType_post-queue": "notification",
-	"notificationType_new-post-flag": "notification",
-	"notificationType_new-user-flag": "notification"
-}
+    "notificationType_post-queue": "notification",
+    "notificationType_new-post-flag": "notification",
+    "notificationType_new-user-flag": "notification",
+    "topicStaleDays": 60,
+    "maxTopicsPerPage": 20,
+    "maxPostsPerPage": 20,
+    "topicsPerPage": 20,
+    "postsPerPage": 20,
+    "userSearchResultsPerPage": 50,
+    "maximumGroupNameLength": 255,
+    "maximumGroupTitleLength": 40,
+    "preventTopicDeleteAfterReplies": 0,
+    "feeds:disableSitemap": 0,
+    "sitemapTopics": 500,
+    "maintenanceMode": 0,
+    "maintenanceModeStatus": 503,
+    "votesArePublic": 0,
+    "maximumInvites": 0,
+    "username:disableEdit": 0,
+    "email:disableEdit": 0,
+    "email:sendmail:rateLimit": 2,
+    "email:sendmail:rateDelta": 1000,
+    "hideFullname": 0,
+    "hideEmail": 0,
+    "allowGuestHandles": 0,
+    "recentMaxTopics": 200,
+    "disableRecentCategoryFilter": 0,
+    "maximumRelatedTopics": 0,
+    "disableEmailSubscriptions": 0,
+    "emailConfirmInterval": 10,
+    "inviteExpiration": 7,
+    "digestHour": 17,
+    "passwordExpiryDays": 0,
+    "hsts-maxage": 31536000,
+    "hsts-subdomains": 0,
+    "hsts-preload": 0,
+    "hsts-enabled": 0,
+    "eventLoopCheckEnabled": 1,
+    "eventLoopLagThreshold": 100,
+    "eventLoopInterval": 500,
+    "onlineCutoff": 30,
+    "timeagoCutoff": 30,
+    "necroThreshold": 7,
+    "categoryWatchState": "watching",
+    "submitPluginUsage": 1
+}

install/data/navigation.json

@@ -15,9 +15,7 @@
 		"iconClass": "fa-inbox",
 		"textClass": "visible-xs-inline",
 		"text": "[[global:header.unread]]",
-		"properties": {
-			"loggedIn": true
-		}
+		"groups": ["registered-users"]
 	},
 	{
 		"route": "/recent",
@@ -66,9 +64,9 @@
 		"iconClass": "fa-cogs",
 		"textClass": "visible-xs-inline",
 		"text": "[[global:header.admin]]",
+		"groups": ["administrators"],
 		"properties": {
-			"targetBlank": false,
-			"adminOnly": true
+			"targetBlank": false
 		}
 	}
 ]

install/databases.js

@@ -1,51 +1,51 @@
 'use strict';
 
-var async = require('async');
-var prompt = require('prompt');
-var winston = require('winston');
+const prompt = require('prompt');
+const winston = require('winston');
 
-var questions = {
+const util = require('util');
+
+const promptGet = util.promisify((schema, callback) => prompt.get(schema, callback));
+
+const questions = {
 	redis: require('../src/database/redis').questions,
 	mongo: require('../src/database/mongo').questions,
+	postgres: require('../src/database/postgres').questions,
 };
 
-module.exports = function (config, callback) {
-	async.waterfall([
-		function (next) {
-			winston.info('\nNow configuring ' + config.database + ' database:');
-			getDatabaseConfig(config, next);
-		},
-		function (databaseConfig, next) {
-			saveDatabaseConfig(config, databaseConfig, next);
-		},
-	], callback);
+module.exports = async function (config) {
+	winston.info('\nNow configuring ' + config.database + ' database:');
+	const databaseConfig = await getDatabaseConfig(config);
+	return saveDatabaseConfig(config, databaseConfig);
 };
 
-function getDatabaseConfig(config, callback) {
+async function getDatabaseConfig(config) {
 	if (!config) {
-		return callback(new Error('aborted'));
+		throw new Error('invalid config, aborted');
 	}
 
 	if (config.database === 'redis') {
 		if (config['redis:host'] && config['redis:port']) {
-			callback(null, config);
-		} else {
-			prompt.get(questions.redis, callback);
+			return config;
 		}
+		return await promptGet(questions.redis);
 	} else if (config.database === 'mongo') {
 		if ((config['mongo:host'] && config['mongo:port']) || config['mongo:uri']) {
-			callback(null, config);
-		} else {
-			prompt.get(questions.mongo, callback);
+			return config;
 		}
-	} else {
-		return callback(new Error('unknown database : ' + config.database));
+		return await promptGet(questions.mongo);
+	} else if (config.database === 'postgres') {
+		if (config['postgres:host'] && config['postgres:port']) {
+			return config;
+		}
+		return await promptGet(questions.postgres);
 	}
+	throw new Error('unknown database : ' + config.database);
 }
 
-function saveDatabaseConfig(config, databaseConfig, callback) {
+function saveDatabaseConfig(config, databaseConfig) {
 	if (!databaseConfig) {
-		return callback(new Error('aborted'));
+		throw new Error('invalid config, aborted');
 	}
 
 	// Translate redis properties into redis object
@@ -69,14 +69,23 @@ function saveDatabaseConfig(config, databaseConfig, callback) {
 			database: databaseConfig['mongo:database'],
 			uri: databaseConfig['mongo:uri'],
 		};
+	} else if (config.database === 'postgres') {
+		config.postgres = {
+			host: databaseConfig['postgres:host'],
+			port: databaseConfig['postgres:port'],
+			username: databaseConfig['postgres:username'],
+			password: databaseConfig['postgres:password'],
+			database: databaseConfig['postgres:database'],
+			ssl: databaseConfig['postgres:ssl'],
+		};
 	} else {
-		return callback(new Error('unknown database : ' + config.database));
+		throw new Error('unknown database : ' + config.database);
 	}
 
-	var allQuestions = questions.redis.concat(questions.mongo);
+	const allQuestions = questions.redis.concat(questions.mongo).concat(questions.postgres);
 	for (var x = 0; x < allQuestions.length; x += 1) {
 		delete config[allQuestions[x].name];
 	}
 
-	callback(null, config);
+	return config;
 }

install/package.json

@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "1.9.0",
+    "version": "1.14.3-beta.12",
     "homepage": "http://www.nodebb.org",
     "repository": {
         "type": "git",
@@ -11,121 +11,149 @@
     "main": "app.js",
     "scripts": {
         "start": "node loader.js",
-        "lint": "eslint --cache ./nodebb .",
+        "lint": "npx eslint --cache ./nodebb .",
         "pretest": "npm run lint",
-        "test": "nyc --reporter=html --reporter=text-summary mocha",
+        "test": "npx nyc --reporter=html --reporter=text-summary npx mocha",
         "coveralls": "nyc report --reporter=text-lcov | coveralls && rm -r coverage"
     },
+    "husky": {
+        "hooks": {
+            "pre-commit": "npx lint-staged",
+            "commit-msg": "npx commitlint -E HUSKY_GIT_PARAMS"
+        }
+    },
+    "lint-staged": {
+        "*.js": [
+            "eslint --fix",
+            "git add"
+        ]
+    },
     "dependencies": {
-        "ace-builds": "^1.2.9",
-        "archiver": "^2.1.1",
-        "async": "2.6.0",
-        "autoprefixer": "7.2.4",
+        "ace-builds": "^1.4.9",
+        "archiver": "^5.0.0",
+        "async": "^3.2.0",
+        "autoprefixer": "^9.7.6",
         "bcryptjs": "2.4.3",
-        "benchpressjs": "^1.2.1",
-        "body-parser": "^1.18.2",
-        "bootstrap": "^3.3.7",
-        "chart.js": "^2.7.1",
-        "clipboard": "1.7.1",
-        "colors": "^1.1.2",
-        "compression": "^1.7.1",
-        "commander": "^2.12.2",
+        "benchpressjs": "^2.0.2",
+        "body-parser": "^1.19.0",
+        "bootstrap": "^3.4.1",
+        "bootswatch": "thomaspark/bootswatch#v3.4.1+1",
+        "chart.js": "^2.9.3",
+        "cli-graph": "^3.2.2",
+        "clipboard": "^2.0.6",
+        "colors": "^1.4.0",
+        "commander": "^6.0.0",
+        "compression": "^1.7.4",
         "connect-ensure-login": "^0.1.1",
         "connect-flash": "^0.1.1",
-        "connect-mongo": "2.0.1",
-        "connect-multiparty": "^2.1.0",
-        "connect-redis": "3.3.3",
-        "cookie-parser": "^1.4.3",
-        "cron": "^1.3.0",
-        "cropperjs": "^1.2.2",
-        "csurf": "^1.9.0",
+        "connect-mongo": "3.2.0",
+        "connect-multiparty": "^2.2.0",
+        "connect-pg-simple": "^6.1.0",
+        "connect-redis": "5.0.0",
+        "cookie-parser": "^1.4.5",
+        "cron": "^1.8.2",
+        "cropperjs": "^1.5.6",
+        "csurf": "^1.11.0",
         "daemon": "^1.1.0",
-        "diff": "^3.4.0",
-        "express": "^4.16.2",
-        "express-session": "^1.15.6",
-        "express-useragent": "1.0.8",
-        "graceful-fs": "^4.1.11",
-        "helmet": "^3.11.0",
-        "html-to-text": "3.3.0",
-        "ipaddr.js": "^1.5.4",
-        "jimp": "0.2.28",
-        "jquery": "^3.2.1",
-        "jsesc": "2.5.1",
-        "json-2-csv": "^2.1.2",
-        "less": "^2.7.3",
-        "lodash": "^4.17.4",
-        "logrotate-stream": "^0.2.5",
-        "lru-cache": "4.1.1",
+        "diff": "^4.0.2",
+        "express": "^4.17.1",
+        "express-session": "^1.17.0",
+        "express-useragent": "^1.0.13",
+        "graceful-fs": "^4.2.3",
+        "helmet": "^4.0.0",
+        "html-to-text": "^5.1.1",
+        "ipaddr.js": "^1.9.1",
+        "jquery": "3.5.1",
+        "jsesc": "3.0.1",
+        "json2csv": "5.0.1",
+        "jsonwebtoken": "^8.5.1",
+        "less": "^3.11.1",
+        "lodash": "^4.17.15",
+        "logrotate-stream": "^0.2.6",
+        "lru-cache": "6.0.0",
         "material-design-lite": "^1.3.0",
-        "mime": "^2.2.0",
-        "mkdirp": "^0.5.1",
-        "mongodb": "2.2.33",
-        "morgan": "^1.9.0",
-        "mousetrap": "^1.6.1",
-        "mubsub": "^1.4.0",
-        "nconf": "^0.9.1",
-        "nodebb-plugin-composer-default": "6.0.22",
-        "nodebb-plugin-dbsearch": "2.0.16",
-        "nodebb-plugin-emoji": "^2.2.2",
+        "mime": "^2.4.4",
+        "mkdirp": "^1.0.4",
+        "mongodb": "3.6.0",
+        "morgan": "^1.10.0",
+        "mousetrap": "^1.6.5",
+        "@nodebb/mubsub": "^1.6.0",
+        "@nodebb/socket.io-adapter-mongo": "3.0.1",
+        "nconf": "^0.10.0",
+        "nodebb-plugin-composer-default": "6.3.53",
+        "nodebb-plugin-dbsearch": "4.1.2",
+        "nodebb-plugin-emoji": "^3.3.0",
         "nodebb-plugin-emoji-android": "2.0.0",
-        "nodebb-plugin-markdown": "8.4.2",
-        "nodebb-plugin-mentions": "2.2.6",
+        "nodebb-plugin-markdown": "8.11.2",
+        "nodebb-plugin-mentions": "2.9.3",
         "nodebb-plugin-soundpack-default": "1.0.0",
-        "nodebb-plugin-spam-be-gone": "0.5.3",
-        "nodebb-rewards-essentials": "0.0.11",
-        "nodebb-theme-lavender": "5.0.4",
-        "nodebb-theme-persona": "9.0.4",
-        "nodebb-theme-slick": "1.2.1",
-        "nodebb-theme-vanilla": "10.0.4",
-        "nodebb-widget-essentials": "4.0.2",
-        "nodemailer": "4.4.1",
-        "passport": "^0.4.0",
+        "nodebb-plugin-spam-be-gone": "0.7.2",
+        "nodebb-rewards-essentials": "0.1.3",
+        "nodebb-theme-lavender": "5.0.11",
+        "nodebb-theme-persona": "10.2.5",
+        "nodebb-theme-slick": "1.2.29",
+        "nodebb-theme-vanilla": "11.2.2",
+        "nodebb-widget-essentials": "4.1.1",
+        "nodemailer": "^6.4.6",
+        "passport": "^0.4.1",
         "passport-local": "1.0.0",
-        "postcss": "6.0.15",
+        "pg": "^8.0.2",
+        "pg-cursor": "^2.1.9",
+        "postcss": "7.0.32",
         "postcss-clean": "1.1.0",
-        "promise-polyfill": "^7.0.0",
+        "promise-polyfill": "^8.1.3",
         "prompt": "^1.0.0",
-        "redis": "2.8.0",
-        "request": "2.83.0",
-        "rimraf": "2.6.2",
+        "redis": "3.0.2",
+        "request": "2.88.2",
+        "request-promise-native": "^1.0.8",
+        "rimraf": "3.0.2",
         "rss": "^1.2.2",
-        "sanitize-html": "^1.16.3",
-        "semver": "^5.4.1",
-        "serve-favicon": "^2.4.5",
-        "sitemap": "^1.13.0",
-        "socket.io": "2.0.4",
-        "socket.io-adapter-mongo": "^2.0.1",
-        "socket.io-client": "2.0.4",
-        "socket.io-redis": "5.2.0",
+        "sanitize-html": "^1.23.0",
+        "semver": "^7.2.1",
+        "serve-favicon": "^2.5.0",
+        "sharp": "0.25.4",
+        "sitemap": "^6.1.0",
+        "socket.io": "2.3.0",
+        "socket.io-adapter-cluster": "^1.0.1",
+        "socket.io-adapter-postgres": "^1.2.1",
+        "socket.io-client": "2.3.0",
+        "socket.io-redis": "5.3.0",
         "socketio-wildcard": "2.0.0",
-        "spdx-license-list": "^3.0.1",
-        "spider-detector": "1.0.18",
+        "spdx-license-list": "^6.1.0",
+        "spider-detector": "2.0.0",
+        "textcomplete": "^0.17.1",
+        "textcomplete.contenteditable": "^0.1.1",
         "toobusy-js": "^0.5.1",
         "uglify-es": "^3.3.9",
-        "validator": "9.2.0",
-        "winston": "^2.4.0",
+        "validator": "13.1.1",
+        "winston": "3.3.3",
         "xml": "^1.0.1",
-        "xregexp": "3.2.0",
+        "xregexp": "^4.3.0",
         "zxcvbn": "^4.4.2"
     },
     "devDependencies": {
-        "coveralls": "^3.0.0",
-        "eslint": "^4.14.0",
-        "eslint-config-airbnb-base": "^12.1.0",
-        "eslint-plugin-import": "^2.8.0",
-        "grunt": "^1.0.1",
-        "grunt-contrib-watch": "^1.0.0",
-        "jsdom": "^11.5.1",
-        "mocha": "^4.1.0",
-        "mocha-lcov-reporter": "^1.3.0",
-        "nyc": "^11.4.1",
-        "smtp-server": "^3.4.1"
+        "@apidevtools/swagger-parser": "10.0.1",
+        "@commitlint/cli": "9.1.1",
+        "@commitlint/config-angular": "9.1.1",
+        "coveralls": "3.1.0",
+        "eslint": "7.6.0",
+        "eslint-config-airbnb-base": "14.1.0",
+        "eslint-plugin-import": "2.22.0",
+        "grunt": "1.2.1",
+        "grunt-contrib-watch": "1.1.0",
+        "husky": "4.2.5",
+        "jsdom": "16.3.0",
+        "lint-staged": "10.2.11",
+        "mocha": "8.1.1",
+        "mocha-lcov-reporter": "1.3.0",
+        "nyc": "15.1.0",
+        "smtp-server": "3.7.0"
     },
     "bugs": {
         "url": "https://github.com/NodeBB/NodeBB/issues"
     },
     "engines": {
-        "node": ">=6"
+        "node": ">=10"
     },
     "maintainers": [
         {

install/web.js

@@ -15,28 +15,52 @@ var Benchpress = require('benchpressjs');
 var app = express();
 var server;
 
-winston.add(winston.transports.File, {
-	filename: 'logs/webinstall.log',
-	colorize: true,
-	timestamp: function () {
-		var date = new Date();
-		return date.getDate() + '/' + (date.getMonth() + 1) + ' ' + date.toTimeString().substr(0, 5) + ' [' + global.process.pid + ']';
-	},
+var formats = [
+	winston.format.colorize(),
+];
+
+const timestampFormat = winston.format((info) => {
+	var dateString = new Date().toISOString() + ' [' + global.process.pid + ']';
+	info.level = dateString + ' - ' + info.level;
+	return info;
+});
+formats.push(timestampFormat());
+formats.push(winston.format.splat());
+formats.push(winston.format.simple());
+
+winston.configure({
 	level: 'verbose',
+	format: winston.format.combine.apply(null, formats),
+	transports: [
+		new winston.transports.Console({
+			handleExceptions: true,
+		}),
+		new winston.transports.File({
+			filename: 'logs/webinstall.log',
+			handleExceptions: true,
+		}),
+	],
 });
 
-var web = {};
+var web = module.exports;
+
 var scripts = [
 	'node_modules/jquery/dist/jquery.js',
 	'public/vendor/xregexp/xregexp.js',
 	'public/vendor/xregexp/unicode/unicode-base.js',
 	'public/src/utils.js',
 	'public/src/installer/install.js',
+	'node_modules/zxcvbn/dist/zxcvbn.js',
 ];
 
+var installing = false;
+var success = false;
+var error = false;
+var launchUrl;
+
 web.install = function (port) {
 	port = port || 4567;
-	winston.info('Launching web installer on port', port);
+	winston.info('Launching web installer on port ' + port);
 
 	app.use(express.static('public', {}));
 	app.engine('tpl', function (filepath, options, callback) {
@@ -57,7 +81,7 @@ web.install = function (port) {
 
 	async.parallel([compileLess, compileJS, copyCSS, loadDefaults], function (err) {
 		if (err) {
-			winston.error(err);
+			winston.error(err.stack);
 		}
 		setupRoutes();
 		launchExpress(port);
@@ -84,7 +108,7 @@ function ping(req, res) {
 }
 
 function welcome(req, res) {
-	var dbs = ['redis', 'mongo'];
+	var dbs = ['redis', 'mongo', 'postgres'];
 	var databases = dbs.map(function (databaseName) {
 		var questions = require('../src/database/' + databaseName).questions.filter(function (question) {
 			return question && !question.hideOnWebInstall;
@@ -99,17 +123,26 @@ function welcome(req, res) {
 	var defaults = require('./data/defaults');
 
 	res.render('install/index', {
+		url: nconf.get('url') || (req.protocol + '://' + req.get('host')),
+		launchUrl: launchUrl,
+		skipGeneralSetup: !!nconf.get('url'),
 		databases: databases,
 		skipDatabaseSetup: !!nconf.get('database'),
-		error: !!res.locals.error,
-		success: !!res.locals.success,
+		error: error,
+		success: success,
 		values: req.body,
 		minimumPasswordLength: defaults.minimumPasswordLength,
+		minimumPasswordStrength: defaults.minimumPasswordStrength,
+		installing: installing,
 	});
 }
 
 function install(req, res) {
+	if (installing) {
+		return welcome(req, res);
+	}
 	req.setTimeout(0);
+	installing = true;
 	var setupEnvVars = nconf.get();
 	for (var i in req.body) {
 		if (req.body.hasOwnProperty(i) && !process.env.hasOwnProperty(i)) {
@@ -132,17 +165,16 @@ function install(req, res) {
 
 	winston.info('Starting setup process');
 	winston.info(setupEnvVars);
+	launchUrl = setupEnvVars.url;
 
 	var child = require('child_process').fork('app', ['--setup'], {
 		env: setupEnvVars,
 	});
 
 	child.on('close', function (data) {
-		if (data === 0) {
-			res.locals.success = true;
-		} else {
-			res.locals.error = true;
-		}
+		installing = false;
+		success = data === 0;
+		error = data !== 0;
 
 		welcome(req, res);
 	});
@@ -151,7 +183,7 @@ function install(req, res) {
 function launch(req, res) {
 	res.json({});
 	server.close();
-
+	req.setTimeout(0);
 	var child;
 
 	if (!nconf.get('launchCmd')) {
@@ -191,14 +223,17 @@ function launch(req, res) {
 }
 
 function compileLess(callback) {
-	fs.readFile(path.join(__dirname, '../public/less/install.less'), function (err, style) {
+	var installSrc = path.join(__dirname, '../public/less/install.less');
+	fs.readFile(installSrc, function (err, style) {
 		if (err) {
-			return winston.error('Unable to read LESS install file: ', err);
+			return winston.error('Unable to read LESS install file: ', err.stack);
 		}
 
-		less.render(style.toString(), function (err, css) {
+		less.render(style.toString(), {
+			filename: path.resolve(installSrc),
+		}, function (err, css) {
 			if (err) {
-				return winston.error('Unable to compile LESS: ', err);
+				return winston.error('Unable to compile LESS: ', err.stack);
 			}
 
 			fs.writeFile(path.join(__dirname, '../public/installer.css'), css.css, callback);
@@ -262,5 +297,3 @@ function loadDefaults(next) {
 		next();
 	});
 }
-
-module.exports = web;

loader.js

@@ -7,6 +7,7 @@ var path = require('path');
 var fork = require('child_process').fork;
 var async = require('async');
 var logrotate = require('logrotate-stream');
+var mkdirp = require('mkdirp');
 
 var file = require('./src/file');
 var pkg = require('./package.json');
@@ -18,7 +19,14 @@ nconf.argv().env().file({
 });
 
 var	pidFilePath = path.join(__dirname, 'pidfile');
-var outputLogFilePath = path.join(__dirname, 'logs/output.log');
+
+var outputLogFilePath = path.join(__dirname, nconf.get('logFile') || 'logs/output.log');
+
+var logDir = path.dirname(outputLogFilePath);
+if (!fs.existsSync(logDir)) {
+	mkdirp.sync(path.dirname(outputLogFilePath));
+}
+
 var output = logrotate({ file: outputLogFilePath, size: '1m', keep: 3, compress: true });
 var silent = nconf.get('silent') === 'false' ? false : nconf.get('silent') !== false;
 var numProcs;
@@ -37,7 +45,6 @@ Loader.init = function (callback) {
 	}
 
 	process.on('SIGHUP', Loader.restart);
-	process.on('SIGUSR2', Loader.reload);
 	process.on('SIGTERM', Loader.stop);
 	callback();
 };
@@ -80,14 +87,22 @@ Loader.addWorkerEvents = function (worker) {
 	worker.on('message', function (message) {
 		if (message && typeof message === 'object' && message.action) {
 			switch (message.action) {
-			case 'restart':
-				console.log('[cluster] Restarting...');
-				Loader.restart();
-				break;
-			case 'reload':
-				console.log('[cluster] Reloading...');
-				Loader.reload();
-				break;
+				case 'restart':
+					console.log('[cluster] Restarting...');
+					Loader.restart();
+					break;
+				case 'pubsub':
+					workers.forEach(function (w) {
+						w.send(message);
+					});
+					break;
+				case 'socket.io':
+					workers.forEach(function (w) {
+						if (w !== worker) {
+							w.send(message);
+						}
+					});
+					break;
 			}
 		}
 	});
@@ -115,7 +130,7 @@ function forkWorker(index, isPrimary) {
 	}
 
 	process.env.isPrimary = isPrimary;
-	process.env.isCluster = ports.length > 1;
+	process.env.isCluster = nconf.get('isCluster') || ports.length > 1;
 	process.env.port = ports[index];
 
 	var worker = fork(appPath, args, {
@@ -176,14 +191,6 @@ Loader.restart = function () {
 	});
 };
 
-Loader.reload = function () {
-	workers.forEach(function (worker) {
-		worker.send({
-			action: 'reload',
-		});
-	});
-};
-
 Loader.stop = function () {
 	killWorkers();
 
@@ -200,53 +207,41 @@ function killWorkers() {
 	});
 }
 
-Loader.notifyWorkers = function (msg, worker_pid) {
-	worker_pid = parseInt(worker_pid, 10);
-	workers.forEach(function (worker) {
-		if (parseInt(worker.pid, 10) !== worker_pid) {
-			try {
-				worker.send(msg);
-			} catch (e) {
-				console.log('[cluster/notifyWorkers] Failed to reach pid ' + worker_pid);
-			}
-		}
-	});
-};
-
 fs.open(pathToConfig, 'r', function (err) {
-	if (!err) {
-		if (nconf.get('daemon') !== 'false' && nconf.get('daemon') !== false) {
-			if (file.existsSync(pidFilePath)) {
-				try {
-					var	pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
-					process.kill(pid, 0);
-					process.exit();
-				} catch (e) {
-					fs.unlinkSync(pidFilePath);
-				}
-			}
-
-			require('daemon')({
-				stdout: process.stdout,
-				stderr: process.stderr,
-				cwd: process.cwd(),
-			});
-
-			fs.writeFileSync(pidFilePath, process.pid);
-		}
-
-		async.series([
-			Loader.init,
-			Loader.displayStartupMessages,
-			Loader.start,
-		], function (err) {
-			if (err) {
-				console.error('[loader] Error during startup');
-				throw err;
-			}
-		});
-	} else {
+	if (err) {
 		// No config detected, kickstart web installer
 		fork('app');
+		return;
 	}
+
+	if (nconf.get('daemon') !== 'false' && nconf.get('daemon') !== false) {
+		if (file.existsSync(pidFilePath)) {
+			try {
+				var	pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
+				process.kill(pid, 0);
+				process.exit();
+			} catch (e) {
+				fs.unlinkSync(pidFilePath);
+			}
+		}
+
+		require('daemon')({
+			stdout: process.stdout,
+			stderr: process.stderr,
+			cwd: process.cwd(),
+		});
+
+		fs.writeFileSync(pidFilePath, String(process.pid));
+	}
+
+	async.series([
+		Loader.init,
+		Loader.displayStartupMessages,
+		Loader.start,
+	], function (err) {
+		if (err) {
+			console.error('[loader] Error during startup');
+			throw err;
+		}
+	});
 });

nodebb.bat

@@ -1 +1 @@
-@echo off && cd %~dp0 && node ./src/cli %*
+@echo off && cd %~dp0 && node ./nodebb %*

public/.eslintrc

@@ -21,11 +21,13 @@
 		"es6": false
 	},
 	"rules": {
+		"block-scoped-var": "off",
 		"no-dupe-class-members": "off",
 		"no-var": "off",
 		"object-shorthand": "off",
 		"prefer-arrow-callback": "off",
 		"prefer-spread": "off",
+		"prefer-object-spread": "off",
 		"prefer-reflect": "off",
 		"prefer-template": "off"
 	},

public/503.html

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

public/js-enabled.css

@@ -1,7 +0,0 @@
-/*
-    The following stylesheet is only included on pages that can execute javascript
-*/
-
-.page-topic [component="post/content"] img:not(.not-responsive):not([data-state]) {
-	display: none !important;
-}

public/language/README.md

@@ -0,0 +1,14 @@
+# Important note about localising NodeBB
+
+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/),
+and any pull requests made to this directory will be automatically closed because
+localisations can go out-of-sync when edited directly.
+
+If there are non-localised strings and you cannot find them in Transifex, please
+[open a new issue on our bug tracker](https://github.com/NodeBB/NodeBB/issues/new)
+so we can take a look.
+
+Thank you for helping localise NodeBB!

public/language/TODO

@@ -1,3 +0,0 @@
-NPM INSTALL
-For now, language packs will be stored here. Eventually, will be moved to server side to allow for npm install-ability.
-When that happens, server code will generate compressed JSON language files in this folder.

public/language/ar/admin/admin.json

@@ -1,5 +1,5 @@
 {
-	"alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?",
+	"alert.confirm-rebuild-and-restart": "هل أنت متأكد إنك تريد إعادة بناء وتشغيل الـ NodeBB؟",
 	"alert.confirm-restart": "هل تريد بالتأكيد إعادة تشغيل NodeBB؟",
 
 	"acp-title": "لوحة تحكم إدارة NodeBB | %1",

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

@@ -3,7 +3,7 @@
 	"posts-in-cache": "المشاركات المخزنة مؤقتاً",
 	"average-post-size": "متوسط ​​حجم المشاركة",
 	"length-to-max": "الطول / أقصى حد",
-	"percent-full": "%1% Full",
+	"percent-full": "1% كاملة",
 	"post-cache-size": "حجم التخزين المؤقت للمشاركات",
 	"items-in-cache": "العناصر في التخزين المؤقت",
 	"control-panel": "لوحة التحكم",

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

@@ -18,10 +18,17 @@
 	"mongo.resident-memory": "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.",
 
 	"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",
@@ -30,7 +37,16 @@
 	"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.keyspace-hits": "Keyspace Hits",
 	"redis.keyspace-misses": "Keyspace Misses",
-	"redis.raw-info": "Redis Raw Info"
-}
+	"redis.raw-info": "Redis Raw Info",
+
+	"postgres": "Postgres",
+	"postgres.version": "PostgreSQL Version",
+	"postgres.raw-info": "Postgres Raw Info"
+}

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

@@ -2,5 +2,11 @@
 	"events": "أحداث",
 	"no-events": "لا توجد أحداث",
 	"control-panel": "لوحة تحكم الأحداث",
-	"delete-events": "حذف الأحداث"
+	"delete-events": "Delete Events",
+	"filters": "Filters",
+	"filters-apply": "Apply Filters",
+	"filter-type": "Event Type",
+	"filter-start": "Start Date",
+	"filter-end": "End Date",
+	"filter-perPage": "Per Page"
 }

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

@@ -8,7 +8,7 @@
 	"custom-js.enable": "تفعيل Javascript المخصصة",
 
 	"custom-header": "ترويسة مخصصة",
-	"custom-header.description": "أدخل HTML الخاصة بك هنا (مثل العلامات الوصفية، وما إلى ذلك)، والتي سيتم إلحاقها الى<code>&lt;head&gt;</code> في تصميم المنتدى. يسمح باستخدام علامات النص البرمجي، ولكن سيتم تعطيلها؛ لتوفر تبويبة\n<a href=\"#custom-header\" data-toggle=\"tab\">Javascript المخصصة</a>",
+	"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.enable": "تفعيل الترويسة المخصصة",
 
 	"custom-css.livereload": "تفعيل إعادة التحميل المباشرة",

public/language/ar/admin/dashboard.json

@@ -0,0 +1,79 @@
+{
+	"forum-traffic": "Forum Traffic",
+	"page-views": "مشاهدات الصفحات",
+	"unique-visitors": "زائرين فريدين",
+	"new-users": "New Users",
+	"posts": "مشاركات",
+	"topics": "مواضيع",
+	"page-views-seven": "آخر 7 ايام",
+	"page-views-thirty": "آخر 30 يوماً",
+	"page-views-last-day": "آخر 24 ساعة",
+	"page-views-custom": "مدة زمنية مخصصة",
+	"page-views-custom-start": "بداية المدة",
+	"page-views-custom-end": "نهاية المده",
+	"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.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>",
+	"running-in-development": "المنتدى قيد التشغيل في وضع \"المطورين\". وقد تكون هناك ثغرات أمنية مفتوحة؛ من فضلك تواصل مع مسؤول نظامك.",
+	"latest-lookup-failed": "<p>Failed to look up latest available version of NodeBB</p>",
+
+	"notices": "إشعارات",
+	"restart-not-required": "إعادة التشغيل غير مطلوب",
+	"restart-required": "إعادة التشغيل مطلوبة",
+	"search-plugin-installed": "إضافة البحث منصبة",
+	"search-plugin-not-installed": "إضافة البحث غير منصبة",
+	"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.",
+	"maintenance-mode": "وضع الصيانة",
+	"maintenance-mode-title": "انقر هنا لإعداد وضع الصيانة لـNodeBB",
+	"realtime-chart-updates": "التحديث الفوري للرسم البياني",
+
+	"active-users": "المستخدمين النشطين",
+	"active-users.users": "الأعضاء",
+	"active-users.guests": "الزوار",
+	"active-users.total": "المجموع",
+	"active-users.connections": "Connections",
+
+	"anonymous-registered-users": "المجهولين مقابل المستخدمين المسجلين",
+	"anonymous": "مجهول",
+	"registered": "مسجل",
+
+	"user-presence": "تواجد المستخدمين",
+	"on-categories": "في قائمة الأقسام",
+	"reading-posts": "قراءة المشاركات",
+	"browsing-topics": "تصفح المواضيع",
+	"recent": "الأخيرة",
+	"unread": "غير مقروء",
+
+	"high-presence-topics": "مواضيع ذات حضور قوي",
+
+	"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.unique-visitors": "زوار فريدين",
+	"graphs.registered-users": "مستخدمين مسجلين",
+	"graphs.anonymous-users": "مستخدمين مجهولين",
+	"last-restarted-by": "Last restarted by",
+	"no-users-browsing": "No users browsing"
+}

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

@@ -1,13 +1,16 @@
 {
-	"you-are-on": "Info - You are on <strong>%1:%2</strong>",
+	"you-are-on": "You are on <strong>%1:%2</strong>",
+	"ip": "IP <strong>%1</strong>",
 	"nodes-responded": "%1 nodes responded within %2ms!",
 	"host": "host",
+	"primary": "primary / run jobs",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "online",
 	"git": "git",
 	"memory": "memory",
-	"load": "load",
+	"load": "system load",
+	"cpu-usage": "cpu usage",
 	"uptime": "uptime",
 
 	"registered": "Registered",

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

@@ -9,6 +9,7 @@
 
 	"plugin-search": "البحث عن الإضافات",
 	"plugin-search-placeholder": "جاري البحث عن الإضافات...",
+	"submit-anonymous-usage": "Submit anonymous plugin usage data.",
 	"reorder-plugins": "إعادة ترتيب الإضافات",
 	"order-active": "ترتيب الإضافات المفعلة",
 	"dev-interested": "هل انته مهتم ببرمجة إضافات لـNodeBB؟",
@@ -29,6 +30,8 @@
 	"plugin-item.more-info": "لمزيد من المعلومات:",
 	"plugin-item.unknown": "غير معروف",
 	"plugin-item.unknown-explanation": "تعذر تحديد حالة هذه الإضافة، ربما بسبب خطأ في الإعدادات.",
+	"plugin-item.compatible": "This plugin works on NodeBB %1",
+	"plugin-item.not-compatible": "This plugin has no compatibility data, make sure it works before installing on your production environment.",
 
 	"alert.enabled": "الإضافة مفعلة",
 	"alert.disabled": "الإضافة معطلة",

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

@@ -18,5 +18,13 @@
 	"alert.update-success": "Successfully updated widgets",
 	"alert.clone-success": "Successfully cloned widgets",
 
-	"error.select-clone": "Please select a page to clone from"
+	"error.select-clone": "Please select a page to clone from",
+
+	"title": "Title",
+	"title.placeholder": "Title (only shown on some containers)",
+	"container": "Container",
+	"container.placeholder": "Drag and drop a container or enter HTML here.",
+	"show-to-groups": "Show to groups",
+	"hide-from-groups": "Hide from groups",
+	"hide-on-mobile": "Hide on mobile"
 }

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

@@ -2,7 +2,7 @@
 	"forum-traffic": "Forum Traffic",
 	"page-views": "مشاهدات الصفحات",
 	"unique-visitors": "زائرين فريدين",
-	"users": "أعضاء",
+	"new-users": "New Users",
 	"posts": "مشاركات",
 	"topics": "مواضيع",
 	"page-views-seven": "آخر 7 ايام",
@@ -14,9 +14,12 @@
 	"page-views-custom-help": "أدخل نطاقا زمنيا لمرات مشاهدة الصفحات التي ترغب في عرضها. إذا لم يظهر منتقي التاريخ، فإن التنسيق المقبول هو <code>YYYY-MM-DD</code>",
 	"page-views-custom-error": "الرجاء إدخال نطاق تاريخ صالح بالتنسيق <code>YYYY-MM-DD</code>",
 
-	"stats.day": "يوم",
-	"stats.week": "إسبوع",
-	"stats.month": "شهر",
+	"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.all": "كل الوقت",
 
 	"updates": "تحديثات",
@@ -65,7 +68,12 @@
 	"high-presence-topics": "مواضيع ذات حضور قوي",
 
 	"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.unique-visitors": "زوار فريدين",
 	"graphs.registered-users": "مستخدمين مسجلين",
-	"graphs.anonymous-users": "مستخدمين مجهولين"
+	"graphs.anonymous-users": "مستخدمين مجهولين",
+	"last-restarted-by": "Last restarted by",
+	"no-users-browsing": "No users browsing"
 }

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

@@ -5,13 +5,11 @@
 	"tooltip": "Tooltip:",
 	"text": "Text:",
 	"text-class": "Text Class: <small>optional</small>",
+	"class": "Class: <small>optional</small>",
 	"id": "ID: <small>optional</small>",
 
 	"properties": "Properties:",
-	"only-admins": "Only display to Admins",
-	"only-global-mods-and-admins": "Only display to Global Moderators and Admins",
-	"only-logged-in": "Only display to logged in users",
-	"only-guest": "Only display to guests",
+	"groups": "Groups:",
 	"open-new-window": "Open in a new window",
 
 	"btn.delete": "Delete",

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

@@ -0,0 +1,10 @@
+{
+    "administrators": "Administrators",
+    "global-moderators": "Global Moderators",
+    "no-global-moderators": "No Global Moderators",
+    "moderators-of-category": "%1 Moderators",
+    "no-moderators": "No Moderators",
+    "add-administrator": "Add Administrator",
+    "add-global-moderator": "Add Global Moderator",
+    "add-moderator": "Add Moderator"
+}

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

@@ -11,28 +11,35 @@
 	"num-recent-replies": "# of Recent Replies",
 	"ext-link": "External Link",
 	"is-section": "Treat this category as a section",
+	"tag-whitelist": "Tag Whitelist",
 	"upload-image": "Upload Image",
 	"delete-image": "Remove",
 	"category-image": "Category Image",
 	"parent-category": "Parent Category",
 	"optional-parent-category": "(Optional) Parent Category",
 	"parent-category-none": "(None)",
+	"copy-parent": "Copy Parent",
 	"copy-settings": "Copy Settings From",
 	"optional-clone-settings": "(Optional) Clone Settings From Category",
+	"clone-children": "Clone Children Categories And Settings",
 	"purge": "Purge Category",
 
 	"enable": "Enable",
 	"disable": "Disable",
 	"edit": "Edit",
+	"analytics": "Analytics",
+	"view-category": "View category",
 
 	"select-category": "Select Category",
 	"set-parent-category": "Set Parent Category",
 
-	"privileges.description": "You can configure the access control privileges for this category in this section. Privileges can be granted on a per-user or a per-group basis. You can add a new user to this table by searching for them in the form below.",
+	"privileges.description": "You can configure the access control privileges for portions of the site in this section. Privileges can be granted on a per-user or a per-group basis. Select the domain of effect from the dropdown below.",
+	"privileges.category-selector": "Configuring privileges for ",
 	"privileges.warning": "<strong>Note</strong>: Privilege settings take effect immediately. It is not necessary to save the category after adjusting these settings.",
 	"privileges.section-viewing": "Viewing Privileges",
 	"privileges.section-posting": "Posting Privileges",
 	"privileges.section-moderation": "Moderation Privileges",
+	"privileges.section-other": "Other",
 	"privileges.section-user": "User",
 	"privileges.search-user": "Add User",
 	"privileges.no-users": "No user-specific privileges in this category.",
@@ -41,7 +48,12 @@
 	"privileges.search-group": "Add Group",
 	"privileges.copy-to-children": "Copy to Children",
 	"privileges.copy-from-category": "Copy from Category",
+	"privileges.copy-privileges-to-all-categories": "Copy to All Categories",
+	"privileges.copy-group-privileges-to-children": "Copy this group's privileges to the children of this category.",
+	"privileges.copy-group-privileges-to-all-categories": "Copy this group's privileges to all categories.",
+	"privileges.copy-group-privileges-from": "Copy this group's privileges from another category.",
 	"privileges.inherit": "If the <code>registered-users</code> group is granted a specific privilege, all other groups receive an <strong>implicit privilege</strong>, even if they are not explicitly defined/checked. This implicit privilege is shown to you because all users are part of the <code>registered-users</code> user group, and so, privileges for additional groups need not be explicitly granted.",
+	"privileges.copy-success": "Privileges copied!",
 
 	"analytics.back": "Back to Categories List",
 	"analytics.title": "Analytics for \"%1\" category",
@@ -54,7 +66,6 @@
 	"alert.create-success": "Category successfully created!",
 	"alert.none-active": "You have no active categories.",
 	"alert.create": "Create a Category",
-	"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-purge": "<p class=\"lead\">Do you really want to purge this category \"%1\"?</p><h5><strong class=\"text-danger\">Warning!</strong> All topics and posts in this category will be purged!</h5> <p class=\"help-block\">Purging a category will remove all topics and posts, and delete the category from the database. If you want to remove a category <em>temporarily</em>, you'll want to \"disable\" the category instead.</p>",
 	"alert.purge-success": "Category purged!",
 	"alert.copy-success": "Settings Copied!",
@@ -66,6 +77,9 @@
 	"alert.user-search": "Search for a user here...",
 	"alert.find-group": "Find a Group",
 	"alert.group-search": "Search for a group here...",
+	"alert.not-enough-whitelisted-tags": "Whitelisted tags are less than minimum tags, you need to create more whitelisted tags!",
 	"collapse-all": "Collapse All",
-	"expand-all": "Expand All"
+	"expand-all": "Expand All",
+	"disable-on-create": "Disable on create",
+	"no-matches": "No matches"
 }

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

@@ -0,0 +1,21 @@
+{
+	"lead": "A listing of digest delivery stats and times is displayed below.",
+	"disclaimer": "Please be advised that email delivery is not guaranteed, due to the nature of email technology. Many variables factor into whether an email sent to the recipient server is ultimately delivered into the user's inbox, including server reputation, blacklisted IP addresses, and whether DKIM/SPF/DMARC is configured.",
+	"disclaimer-continued": "A successful delivery means the message was sent successfully by NodeBB and acknowledged by the recipient server. It does not mean the email landed in the inbox. For best results, we recommend using a third-party email delivery service such as <a href=\"https://sendgrid.com/why-sendgrid/\">SendGrid</a>.",
+
+	"user": "User",
+	"subscription": "Subscription Type",
+	"last-delivery": "Last successful delivery",
+	"default": "System default",
+	"default-help": "<em>System default</em> means the user has not explicitly overridden the global forum setting for digests, which is currently: &quot;<strong>%1</strong>&quot;",
+	"resend": "Resend Digest",
+	"resend-all-confirm": "Are you sure you wish to manually execute this digest run?",
+	"resent-single": "Manual digest resend completed",
+	"resent-day": "Daily digest resent",
+	"resent-week": "Weekly digest resent",
+	"resent-month": "Monthly digest resent",
+	"null": "<em>Never</em>",
+	"manual-run": "Manual digest run:",
+
+	"no-delivery-data": "No delivery data found"
+}

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

@@ -1,9 +1,16 @@
 {
 	"name": "اسم المجموعة",
+	"badge": "Badge",
+	"properties": "Properties",
 	"description": "Group Description",
 	"member-count": "Member Count",
-	"system": "System Group",
+	"system": "System",
+	"hidden": "Hidden",
+	"private": "Private",
 	"edit": "Edit",
+	"delete": "Delete",
+	"privileges": "Privileges",
+	"download-csv": "CSV",
 	"search-placeholder": "Search",
 	"create": "Create Group",
 	"description-placeholder": "A short description about your group",
@@ -17,10 +24,12 @@
 	"edit.user-title": "Title of Members",
 	"edit.icon": "Group Icon",
 	"edit.label-color": "Group Label Color",
+	"edit.text-color": "Group Text Color",
 	"edit.show-badge": "Show Badge",
 	"edit.private-details": "If enabled, joining of groups requires approval from a group owner.",
 	"edit.private-override": "Warning: Private groups is disabled at system level, which overrides this option.",
-	"edit.disable-requests": "Disable join requests",
+	"edit.disable-join": "Disable join requests",
+	"edit.disable-leave": "Disallow users from leaving the group",
 	"edit.hidden": "Hidden",
 	"edit.hidden-details": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
 	"edit.add-user": "Add User to Group",

public/language/ar/admin/manage/post-queue.json

@@ -1,6 +1,6 @@
 {
 	"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; Posting Restrictions</a> and enable <strong>Post Queue</strong>.",
+	"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>.",
 	"user": "User",
 	"category": "Category",
 	"title": "Title",

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

@@ -0,0 +1,52 @@
+{
+	"global": "Global",
+	"admin": "Admin",
+	"group-privileges": "Group Privileges",
+	"user-privileges": "User Privileges",
+	"edit-privileges": "Edit Privileges",
+	"chat": "Chat",
+	"upload-images": "Upload Images",
+	"upload-files": "Upload Files",
+	"signature": "Signature",
+	"ban": "Ban",
+	"search-content": "Search Content",
+	"search-users": "Search Users",
+	"search-tags": "Search Tags",
+	"view-users": "View Users",
+	"view-tags": "View Tags",
+	"view-groups": "View Groups",
+	"allow-local-login": "Local Login",
+	"allow-group-creation": "Group Create",
+	"view-users-info": "View Users Info",
+	"find-category": "Find Category",
+	"access-category": "Access Category",
+	"access-topics": "Access Topics",
+	"create-topics": "Create Topics",
+	"reply-to-topics": "Reply to Topics",
+	"tag-topics": "Tag Topics",
+	"edit-posts": "Edit Posts",
+	"view-edit-history": "View Edit History",
+	"delete-posts": "Delete Posts",
+	"view_deleted": "View Deleted Posts",
+	"upvote-posts": "Upvote Posts",
+	"downvote-posts": "Downvote Posts",
+	"delete-topics": "Delete Topics",
+	"purge": "Purge",
+	"moderate": "Moderate",
+	"admin-dashboard": "Dashboard",
+	"admin-categories": "Categories",
+	"admin-privileges": "Privileges",
+	"admin-users": "Users",
+	"admin-settings": "Settings",
+
+	"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-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 privilege set to <strong>all categories</strong>?",
+	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's privilege set to <strong>all categories</strong>?",
+	"alert.confirm-copyToChildren": "Are you sure you wish to apply this privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.no-undo": "<em>This action cannot be undone.</em>"
+}

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

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

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

@@ -0,0 +1,9 @@
+{
+    "upload-file": "Upload File",
+    "filename": "Filename",
+    "usage": "Post Usage",
+    "orphaned": "Orphaned",
+    "size/filecount": "Size / Filecount",
+    "confirm-delete": "Do you really want to delete this file?",
+    "filecount": "%1 files"
+}

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

@@ -6,14 +6,18 @@
 	"validate-email": "Validate Email",
 	"send-validation-email": "Send Validation Email",
 	"password-reset-email": "Send Password Reset Email",
+	"force-password-reset": "Force Password Reset & Log User Out",
 	"ban": "Ban User(s)",
 	"temp-ban": "Ban User(s) Temporarily",
 	"unban": "Unban User(s)",
 	"reset-lockout": "Reset Lockout",
 	"reset-flags": "Reset Flags",
-	"delete": "Delete User(s)",
-	"purge": "Delete User(s) and Content",
+	"delete": "Delete <strong>User(s)</strong>",
+	"delete-content": "Delete User(s) <strong>Content</strong>",
+	"purge": "Delete <strong>User(s)</strong> and <strong>Content</strong>",
 	"download-csv": "Download CSV",
+	"manage-groups": "Manage Groups",
+	"add-group": "Add Group",
 	"invite": "Invite",
 	"new": "New User",
 
@@ -27,6 +31,11 @@
 	"pills.banned": "Banned",
 	"pills.search": "User Search",
 
+	"50-per-page": "50 per page",
+	"100-per-page": "100 per page",
+	"250-per-page": "250 per page",
+	"500-per-page": "500 per page",
+
 	"search.uid": "By User ID",
 	"search.uid-placeholder": "Enter a user ID to search",
 	"search.username": "By User Name",
@@ -81,11 +90,15 @@
 	"alerts.confirm-remove-moderator": "Do you really want to remove this moderator?",
 	"alerts.remove-moderator-success": "User is no longer moderator.",
 	"alerts.confirm-validate-email": "Do you want to validate email(s) of these user(s)?",
+	"alerts.confirm-force-password-reset": "Are you sure you want to force the password reset and log out these user(s)?",
 	"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.confirm-delete": "<b>Warning!</b><br/>Do you really want to delete user(s)?<br/> This action is not reversable! Only the user account will be deleted, their posts and topics will remain.",
+	"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-purge": "<b>Warning!</b><br/>Do you really want to delete user(s) and their content?<br/> This action is not reversable! All user data and content will be erased!",
+	"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>",
+	"alerts.delete-content-success": "User(s) Content Deleted!",
+	"alerts.confirm-purge": "<strong>Warning!</strong><p>Do you really want to delete <strong>user(s) and their content</strong>?</p><p>This action is not reversible! All user data and content will be erased!</p>",
 	"alerts.create": "Create User",
 	"alerts.button-create": "Create",
 	"alerts.button-cancel": "Cancel",
@@ -93,7 +106,7 @@
 	"alerts.error-x": "<strong>Error</strong><p>%1</p>",
 	"alerts.create-success": "User created!",
 
-	"alerts.prompt-email": "Email: ",
+	"alerts.prompt-email": "Emails: ",
 	"alerts.email-sent-to": "An invitation email has been sent to %1",
-	"alerts.x-users-found": "%1 user(s) found! Search took %2 ms."
+	"alerts.x-users-found": "%1 user(s) found, (%2 seconds)"
 }

public/language/ar/admin/menu.json

@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "عام",
-	"general/dashboard": "اللوحة الرئيسية",
-	"general/homepage": "الصفحة الرئيسية",
-	"general/navigation": "التصفح",
-	"general/languages": "اللغات",
-	"general/sounds": "الأصوات",
-	"general/social": "شبكات التواصل",
 
 	"section-manage": "إدارة",
 	"manage/categories": "الأقسام",
@@ -18,20 +13,26 @@
 	"manage/groups": "المجموعات",
 	"manage/ip-blacklist": "قائمة حظر عناوين IP",
 	"manage/uploads": "Uploads",
+	"manage/digest": "Digests",
 
 	"section-settings": "إعدادات",
 	"settings/general": "عامة",
-	"settings/reputation": "السمعة",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
+	"settings/reputation": "Reputation & Flags",
 	"settings/email": "البريد الإلكتروني",
-	"settings/user": "الأعضاء",
-	"settings/group": "المجموعات",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "الزوار",
 	"settings/uploads": "الرفع",
-	"settings/post": "المشاركة",
-	"settings/chat": "الدردشة",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "ترقيم الصفحات",
 	"settings/tags": "الكلمات المفتاحية",
 	"settings/notifications": "التنبيهات",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",
@@ -57,6 +58,7 @@
 	"section-advanced": "Advanced",
 	"advanced/database": "Database",
 	"advanced/events": "Events",
+	"advanced/hooks": "Hooks",
 	"advanced/logs": "Logs",
 	"advanced/errors": "Errors",
 	"advanced/cache": "Cache",

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

@@ -1,20 +1,34 @@
 {
 	"maintenance-mode": "Maintenance Mode",
 	"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",
 	"headers": "Headers",
 	"headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame",
 	"headers.powered-by": "Customise the \"Powered By\" header sent by NodeBB",
 	"headers.acao": "Access-Control-Allow-Origin",
+	"headers.acao-regex": "Access-Control-Allow-Origin Regular Expression",
 	"headers.acao-help": "To deny access to all sites, leave empty",
+	"headers.acao-regex-help": "Enter regular expressions here to match dynamic origins. To deny access to all sites, leave empty",
 	"headers.acac": "Access-Control-Allow-Credentials",
 	"headers.acam": "Access-Control-Allow-Methods",
 	"headers.acah": "Access-Control-Allow-Headers",
+	"hsts": "Strict Transport Security",
+	"hsts.enabled": "Enabled HSTS (recommended)",
+	"hsts.maxAge": "HSTS Max Age",
+	"hsts.subdomains": "Include subdomains in HSTS header",
+	"hsts.preload": "Allow preloading of HSTS header",
+	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Traffic Management",
-	"traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Enable Traffic Management",
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }

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

@@ -6,6 +6,6 @@
 	"max-length": "Maximum length of chat messages",
 	"max-room-size": "Maximum number of users in chat rooms",
 	"delay": "Time between chat messages in milliseconds",
-	"restrictions.seconds-edit-after": "Number of seconds before users are allowed to edit chat messages after posting. (0 disabled)",
-	"restrictions.seconds-delete-after": "Number of seconds before users are allowed to delete chat messages after posting. (0 disabled)"
+	"restrictions.seconds-edit-after": "Number of seconds a chat message will remain editable. (0 disabled)",
+	"restrictions.seconds-delete-after": "Number of seconds a chat message will remain deletable. (0 disabled)"
 }

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

@@ -4,6 +4,7 @@
 	"consent.message": "Notification message",
 	"consent.acceptance": "Acceptance message",
 	"consent.link-text": "Policy Link Text",
+	"consent.link-url": "Policy Link URL",
 	"consent.blank-localised-default": "Leave blank to use NodeBB localised defaults",
 	"settings": "Settings",
 	"cookie-domain": "Session cookie domain",

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

@@ -4,6 +4,9 @@
 	"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
+	"sendmail-rate-limit": "Send <em>X</em> emails...",
+	"sendmail-rate-delta": "... every <em>X</em> milliseconds",
+	"sendmail-rate-help": "Instructs the NodeBB mailer to limit the number of messages sent at once in order to not overwhelm email receiving services. These options do not apply if SMTP Transport is enabled (below).",
 
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Use an external email server to send emails",
@@ -30,8 +33,8 @@
 	"testing.select": "Select Email Template",
 	"testing.send": "Send Test Email",
 	"testing.send-help": "The test email will be sent to the currently logged in user's email address.",
-	"subscriptions": "Email Subscriptions",
-	"subscriptions.disable": "Disable subscriber notification emails",
+	"subscriptions": "Email Digests",
+	"subscriptions.disable": "Disable email digests",
 	"subscriptions.hour": "Digest Hour",
 	"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>"
 }

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

@@ -1,35 +1,41 @@
 {
-	"site-settings": "Site Settings",
-	"title": "Site Title",
-	"title.url": "URL",
+	"site-settings": "اعدادات الموقع",
+	"title": "عنوان الموقع",
+	"title.short": "عنوان قصير",
+	"title.short-placeholder": "ان لم تقم بكتابة عنوان مختصر, سيتم استخدام عنوان الموقع الكلي",
+	"title.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.",
-	"title.name": "Your Community Name",
+	"title.name": "اسم المنتدي",
 	"title.show-in-header": "Show Site Title in Header",
-	"browser-title": "Browser Title",
+	"browser-title": "عنوان المتصفح",
 	"browser-title-help": "If no browser title is specified, the site title will be used",
 	"title-layout": "Title Layout",
 	"title-layout-help": "Define how the browser title will be structured ie. {pageTitle} | {browserTitle}",
 	"description.placeholder": "A short description about your community",
-	"description": "Site Description",
-	"keywords": "Site Keywords",
+	"description": "وصف الموقع",
+	"keywords": "الكلمات الدليله للموقع",
 	"keywords-placeholder": "Keywords describing your community, comma-separated",
-	"logo": "Site Logo",
-	"logo.image": "Image",
+	"logo": "شعار الموقع",
+	"logo.image": "صورة",
 	"logo.image-placeholder": "Path to a logo to display on forum header",
-	"logo.upload": "Upload",
-	"logo.url": "URL",
+	"logo.upload": "رفع",
+	"logo.url": "الرابط",
 	"logo.url-placeholder": "The URL of the site logo",
 	"logo.url-help": "When the logo is clicked, send users to this address. If left blank, user will be sent to the forum index.",
-	"logo.alt-text": "Alt Text",
+	"logo.alt-text": "نص بديل",
 	"log.alt-text-placeholder": "Alternative text for accessibility",
-	"favicon": "Favicon",
-	"favicon.upload": "Upload",
+	"favicon": "صورة المفضله",
+	"favicon.upload": "رفع",
 	"touch-icon": "Homescreen/Touch Icon",
-	"touch-icon.upload": "Upload",
+	"touch-icon.upload": "رفع",
 	"touch-icon.help": "Recommended size and format: 192x192, PNG format only. If no touch icon is specified, NodeBB will fall back to using the favicon.",
 	"outgoing-links": "Outgoing Links",
 	"outgoing-links.warning-page": "Use Outgoing Links Warning Page",
-	"search-default-sort-by": "Search default sort by",
-	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page"
-}
+	"search-default-sort-by": "الترتيب الافتراضي للبحث",
+	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page",
+	"site-colors": "Site Color Metadata",
+	"theme-color": "لون الثيم",
+	"background-color": "لون الخلفية",
+	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
+}

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

@@ -3,10 +3,10 @@
 	"private-groups": "Private Groups",
 	"private-groups.help": "If enabled, joining of groups requires the approval of the group owner <em>(Default: enabled)</em>",
 	"private-groups.warning": "<strong>Beware!</strong> If this option is disabled and you have private groups, they automatically become public.",
-	"allow-creation": "Allow Group Creation",
-	"allow-creation-help": "If enabled, users can create groups <em>(Default: disabled)</em>",
+	"allow-multiple-badges": "Allow Multiple Badges",
 	"allow-multiple-badges-help": "This flag can be used to allow users to select multiple group badges, requires theme support.",
 	"max-name-length": "Maximum Group Name Length",
+	"max-title-length": "Maximum Group Title Length",
 	"cover-image": "Group Cover Image",
 	"default-cover": "Default Cover Images",
 	"default-cover-help": "Add comma-separated default cover images for groups that don't have an uploaded cover image"

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

@@ -1,8 +1,5 @@
 {
 	"handles": "Guest Handles",
 	"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\"",
-	"privileges": "Guest Privileges",
-	"privileges.can-search": "Allow guests to search without logging in",
-	"privileges.can-search-users": "Allow guests to search users without logging in"
+	"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\""
 }

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

@@ -0,0 +1,6 @@
+{
+	"language-settings": "اعدادات اللغة",
+	"description": "تُحدد اللغة الافتراضية إعدادات اللغة لجميع المستخدمين الذين يزورون المنتدى. <br />يمكن للأعضاء تجاوز اللغة الافتراضية من خلال صفحة إعدادات الحساب الخاصة بهم.",
+	"default-language": "اللغة الافتراضية",
+	"auto-detect": "الكشف عن إعدادات اللغة للزوار بشكل آلي"
+}

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

@@ -5,13 +5,11 @@
 	"tooltip": "Tooltip:",
 	"text": "Text:",
 	"text-class": "Text Class: <small>optional</small>",
+	"class": "Class: <small>optional</small>",
 	"id": "ID: <small>optional</small>",
 
 	"properties": "Properties:",
-	"only-admins": "Only display to Admins",
-	"only-global-mods-and-admins": "Only display to Global Moderators and Admins",
-	"only-logged-in": "Only display to logged in users",
-	"only-guest": "Only display to guests",
+	"groups": "Groups:",
 	"open-new-window": "Open in a new window",
 
 	"btn.delete": "Delete",

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

@@ -2,6 +2,5 @@
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
 	"welcome-notification-link": "Welcome Notification Link",
-	"welcome-notification-uid": "Welcome Notification User (UID)",
-	"notification-alert-timeout": "Notification Alert Timeout"
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }

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

@@ -6,6 +6,5 @@
 	"max-posts-per-page": "Maximum posts per page",
 	"categories": "Category Pagination",
 	"topics-per-page": "Topics per Page",
-	"max-topics-per-page": "Maximum topics per page",
-	"initial-num-load": "Initial Number of Topics to Load on Unread, Recent, and Popular"
+	"max-topics-per-page": "Maximum topics per page"
 }

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

@@ -7,19 +7,22 @@
 	"sorting.most-posts": "Most Posts",
 	"sorting.topic-default": "Default Topic Sorting",
 	"length": "Post Length",
+	"post-queue": "Post Queue",
 	"restrictions": "Posting Restrictions",
 	"restrictions-new": "New User Restrictions",
 	"restrictions.post-queue": "Enable post queue",
+	"restrictions.post-queue-rep-threshold": "Reputation required to bypass post queue",
+	"restrictions.groups-exempt-from-post-queue": "Select groups that should be exempt from the post queue",
 	"restrictions-new.post-queue": "Enable new user restrictions",
-	"restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.",
-	"restrictions-new.post-queue-help": "Enabling new user restrictions will set restrictions on posts created by new users.",
-	"restrictions.seconds-between": "Seconds between posts",
+	"restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval",
+	"restrictions-new.post-queue-help": "Enabling new user restrictions will set restrictions on posts created by new users",
+	"restrictions.seconds-between": "Number of seconds between posts",
 	"restrictions.seconds-between-new": "Seconds between posts for new users",
 	"restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted",
-	"restrictions.seconds-defore-new": "Seconds before new user can post",
-	"restrictions.seconds-edit-after": "Number of seconds before users are allowed to edit posts after posting. (0 disabled)",
-	"restrictions.seconds-delete-after": "Number of seconds before users are allowed to delete posts after posting. (0 disabled)",
-	"restrictions.replies-no-delete": "Number of replies after users are disallowed to delete their own topics. (0 disabled)",
+	"restrictions.seconds-before-new": "Seconds before a new user can make their first post",
+	"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",
@@ -29,6 +32,8 @@
 	"timestamp": "Timestamp",
 	"timestamp.cut-off": "Date cut-off (in days)",
 	"timestamp.cut-off-help": "Dates &amp; times will be shown in a relative manner (e.g. \"3 hours ago\" / \"5 days ago\"), and localised into various\n\t\t\t\t\tlanguages. After a certain point, this text can be switched to display the localised date itself\n\t\t\t\t\t(e.g. 5 Nov 2016 15:30).<br /><em>(Default: <code>30</code>, or one month). Set to 0 to always display dates, leave blank to always display relative times.</em>",
+	"timestamp.necro-threshold": "Necro Threshold (in days)",
+	"timestamp.necro-threshold-help": "A message will be shown between posts if the time between them is longer than the necro threshold. (Default: <code>7</code>, or one week). Set to 0 to disable.</em>",
 	"teaser": "Teaser Post",
 	"teaser.last-post": "Last &ndash; Show the latest post, including the original post, if no replies",
 	"teaser.last-reply": "Last &ndash; Show the latest reply, or a \"No replies\" placeholder if no replies",
@@ -37,6 +42,7 @@
 	"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",

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

@@ -5,8 +5,16 @@
 	"votes-are-public": "All Votes Are Public",
 	"thresholds": "Activity Thresholds",
 	"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-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",
-	"min-rep-signature": "Minimum reputation to add \"Signature\" to user profile"
+	"min-rep-signature": "Minimum reputation to add \"Signature\" to user profile",
+	"min-rep-profile-picture": "Minimum reputation to add \"Profile Picture\" to user profile",
+	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile",
+
+	"flags": "Flag Settings",
+	"flags.limit-per-target": "Maximum number of times something can be flagged",
+	"flags.limit-per-target-placeholder": "Default: 0"
 }

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

@@ -0,0 +1,9 @@
+{
+	"notifications": "التنبيهات",
+	"chat-messages": "Chat Messages",
+	"play-sound": "Play",
+	"incoming-message": "Incoming Message",
+	"outgoing-message": "Outgoing Message",
+	"upload-new-sound": "Upload New Sound",
+	"saved": "Settings Saved"
+}

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

@@ -1,12 +1,10 @@
 {
     "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
     "min-per-topic": "Minimum Tags per Topic",
     "max-per-topic": "Maximum Tags per Topic",
     "min-length": "Minimum Tag Length",
     "max-length": "Maximum Tag Length",
-    "goto-manage": "Click here to visit the tag management page.",
-    "privacy": "Privacy",
-    "list-private": "Make the tags list private",
     "related-topics": "Related Topics",
     "max-related-topics": "Maximum related topics to display (if supported by theme)"
 }

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

@@ -2,12 +2,21 @@
 	"posts": "المشاركات",
 	"allow-files": "السماح للأعضاء بتحميل الملفات الإعتيادية",
 	"private": "جعل الملفات التي تم رفعها خاصة",
-	"max-image-width": "تغيير حجم الصور إلى عرض محدد (بالبكسل)",
-	"max-image-width-help": "(بالبكسل، الافتراضي: 760 بكسل، ضع إلى 0 لتعطيل الخاصية)",
+	"strip-exif-data": "Strip EXIF Data",
+	"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",
+	"resize-image-width-threshold-help": "(in pixels, default: 1520 pixels, set to 0 to disable)",
+	"resize-image-width": "Resize images down to specified width",
+	"resize-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
 	"resize-image-quality": "Quality to use when resizing images",
 	"resize-image-quality-help": "Use a lower quality setting to reduce the file size of resized images.",
 	"max-file-size": "الحد الأقصى لحجم الملف (بالكيبيبايت)",
 	"max-file-size-help": "(بالكيبيبايت، الافتراضي: 2048)",
+	"reject-image-width": "Maximum Image Width (in pixels)",
+	"reject-image-width-help": "Images wider than this value will be rejected.",
+	"reject-image-height": "Maximum Image Height (in pixels)",
+	"reject-image-height-help": "Images taller than this value will be rejected.",
 	"allow-topic-thumbnails": "السماح للاعضاء برفع الصور المصغرة للموضوع",
 	"topic-thumb-size": "حجم الصورة المصغرة للموضوع",
 	"allowed-file-extensions": "إمتدادات الملفات المسموح بها",

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

@@ -1,6 +1,5 @@
 {
 	"authentication": "المصادقة",
-	"allow-local-login": "السماح بتسجيل الدخول المحلي",
 	"require-email-confirmation": "يطلب تأكيد البريد الإلكتروني",
 	"email-confirm-interval": "لا يمكن للمستخدم إعادة إرسال رسالة تأكيد البريد الالكتروني حتى مرور",
 	"email-confirm-email2": "دقائق",
@@ -9,11 +8,12 @@
 	"allow-login-with.username": "اسم المستخدم فقط",
 	"allow-login-with.email": "البريد الالكتروني فقط",
 	"account-settings": "إعدادت الحساب",
+	"gdpr_enabled": "Enable GDPR consent collection",
+	"gdpr_enabled_help": "When enabled, all new registrants will be required to explicitly give consent for data collection and usage under the <a href=\"https://ec.europa.eu/info/priorities/justice-and-fundamental-rights/data-protection/2018-reform-eu-data-protection-rules/eu-data-protection-rules_en\">General Data Protection Regulation (GDPR)</a>. <strong>Note</strong>: Enabling GDPR does not force pre-existing users to provide consent. To do so, you will need to install the GDPR plugin.",
 	"disable-username-changes": "عدم السماح بتغيير اسم المستخدم",
 	"disable-email-changes": "عدم السماح بتغيير البريد الالكتروني",
 	"disable-password-changes": "عدم السماح بتغيير كلمة المرور",
 	"allow-account-deletion": "السماح بحذف الحساب",
-	"user-info-private": "إخفاء قائمة المستخدم والبيانات عن الزوار",
 	"hide-fullname": "إخفاء الإسم الكامل عن المستخدمين",
 	"hide-email": "إخفاء البريد الإلكتروني عن المستخدمين",
 	"themes": "القوالب",
@@ -26,15 +26,23 @@
 	"lockout-duration": "مدة تأمين الحساب (دقائق)",
 	"login-days": "عدد الأيام لتذكر جلسات تسجيل دخول المستخدم",
 	"password-expiry-days": "فرض عملية تغيير كلمة المرور بعد مرور عدد محدد من الأيام",
+	"session-time": "Session Time",
+	"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>.",
+	"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": "تسجيل المستخدم",
 	"registration-type": "نوع التسجيل",
+	"registration-approval-type": "Registration Approval Type",
 	"registration-type.normal": "عادي",
 	"registration-type.admin-approval": "بموافقة الإدارة",
 	"registration-type.admin-approval-ip": "بموافقة الإدارة لعناوين IP",
 	"registration-type.invite-only": "بالدعوات فقط",
 	"registration-type.admin-invite-only": "بالدعوات من قبل الإدارة فقط",
 	"registration-type.disabled": "لا يوجد تسجيل",
-	"registration-type.help": "عادي - بإمكان المستخدمين التسجيل من خلال صفحة /التسجيل.<br/>\nبموافقة الإدارة - يتم وضع قائمة تسجيلات المستخدمين في <a href=\"%1/admin/manage/registration\">قائمة إنتظار موافقة</a> الإدارة.<br/>\nبموافقة الإدارة لعناوين IP - عادي بالنسبة للمستخدمين الجدد، ويتطلب موافقة الإدارة للتسجيل من عناوين IP تم التسجيل بإستخدامها مسبقاً.<br/>\nبالدعوات فقط - بإمكان المستخدمين إرسال دعوات من خلال صفحة <a href=\"%1/users\" target=\"_blank\">الأعضاء</a>.<br/>\nبالدعوات من قبل الإدارة فقط - فقط المراء بإمكانهم إرسال الدعوات من خلال صفحة <a href=\"%1/users\" target=\"_blank\">الأعضاء</a> و صفحات <a href=\"%1/admin/manage/users\">الإدارة/المشرفين/الأعضاء</a>.<br/>\nلا يوجد تسجيل - إغلاق خيار التسجيل بالكامل.<br/>",
+	"registration-type.help": "Normal - Users can register from the /register page.<br/>\nInvite Only - Users can invite others from the <a href=\"%1/users\" target=\"_blank\">users</a> page.<br/>\nAdmin Invite Only - Only administrators can invite others from <a href=\"%1/users\" target=\"_blank\">users</a> and <a href=\"%1/admin/manage/users\">admin/manage/users</a> pages.<br/>\nNo registration - No user registration.<br/>",
+	"registration-approval-type.help": "Normal - Users are registered immediately.<br/>\nAdmin Approval - User registrations are placed in an <a href=\"%1/admin/manage/registration\">approval queue</a> for administrators.<br/>\nAdmin Approval for IPs - Normal for new users, Admin Approval for IP addresses that already have an account.<br/>",
 	"registration.max-invites": "الحد الأقصى للدعوات لكل عضو",
 	"max-invites": "الحد الأقصى للدعوات لكل عضو",
 	"max-invites-help": "0  لعدم تحديد قيود، الإدارة تحصل على دعوات لامحدودة <br> هذا الخيار يعمل فقط عند تحديد خيار \"بالدعوات فقط\"",
@@ -63,5 +71,9 @@
 	"email-post-notif": "Send an email when replies are made to topics I am subscribed to",
 	"follow-created-topics": "Follow topics you create",
 	"follow-replied-topics": "Follow topics that you reply to",
-	"default-notification-settings": "Default notification settings"
-}
+	"default-notification-settings": "Default notification settings",
+	"categoryWatchState": "Default category watch state",
+	"categoryWatchState.watching": "Watching",
+	"categoryWatchState.notwatching": "Not Watching",
+	"categoryWatchState.ignoring": "Ignoring"
+}

public/language/ar/category.json

@@ -7,14 +7,16 @@
     "browsing": "تصفح",
     "no_replies": "لم يرد أحد",
     "no_new_posts": "لا توجد مشاركات جديدة.",
-    "share_this_category": "شارك هذا القسم",
     "watch": "تابع",
     "ignore": "تجاهل",
     "watching": "متابع",
+    "not-watching": "لست متابع",
     "ignoring": "متجاهل",
-    "watching.description": "أظهر المواضيع في غير مقروء",
-    "ignoring.description": "لا تظهر المواضيع في غير مقروء",
-    "watch.message": "أنت الآن تتابع التحديثات من هذا القسم وجميع الأقسام الفرعية",
-    "ignore.message": "أنت الآن تتجاهل التحديثات من هذا القسم وجميع الأقسام الفرعية",
+    "watching.description": "أظهر المواضيع في الغير مقروء و الحديث",
+    "not-watching.description": "Do not show topics in unread, show in recent",
+    "ignoring.description": "Do not show topics in unread and recent",
+    "watching.message": "You are now watching updates from this category and all subcategories",
+    "notwatching.message": "You are not watching updates from this category and all subcategories",
+    "ignoring.message": "You are now ignoring updates from this category and all subcategories",
     "watched-categories": "الأقسام المُتابعة"
 }

public/language/ar/email.json

@@ -1,39 +1,49 @@
 {
-    "password-reset-requested": "تم طلب إعادة تعيين كلمة المرور - %1!",
+    "test-email.subject": "Test Email",
+    "password-reset-requested": "Password Reset Requested!",
     "welcome-to": "مرحبًا بك في %1",
     "invite": "دعوة من %1",
     "greeting_no_name": "مرحبًا",
     "greeting_with_name": "مرحبًا بك يا %1",
+    "email.verify-your-email.subject": "Please verify your email",
+    "email.verify.text1": "Your email address has changed!",
     "welcome.text1": "شكرًا على تسجيلك في %1!",
     "welcome.text2": "لتفعيل حسابك، نحتاج إلى التأكد من صحة عنوان البريد الإلكتروني الذي سجلت به.",
     "welcome.text3": "تم قبول نتسجيلك ، يمكنك الدخول باتسخدام اسم المستخدم و كلمة المرور.",
     "welcome.cta": "انقر هنا لتفعيل عنوان بريدك الإلكتروني",
     "invitation.text1": "%1 قام بدعوتك للانضمام لـ %2",
     "invitation.text2": "Your invitation will expire in %1 days.",
-    "invitation.ctr": "إضغط هنا لإنشاء حسابك",
+    "invitation.cta": "Click here to create your account.",
     "reset.text1": "لقد توصلنا بطلب إعادة تعيين كلمة المرور الخاصة بك، ربما لكونك قد نسيتها, إن لم يكن الأمر كذلك، المرجو تجاهل هذه الرسالة.",
     "reset.text2": "لمواصلة طلب إعاة تعيين كلمة المرور، الرجاء تتبع هذا الرابط.",
     "reset.cta": "انقر هنا لإعادة تعيين كلمة السر الخاصة بك.",
     "reset.notify.subject": "تم تغيير كلمة المرور بنجاح",
     "reset.notify.text1": "نحيطك علما أن كلمة مرورك قد تم تغييرها في %1",
     "reset.notify.text2": "إن لم يكن لديك علم بهذا، المرجو إشعار مدبر النظام بأسرع مايمكن.",
-    "digest.notifications": "لديك تنبيهات غير مقروءة من طرف %1:",
     "digest.latest_topics": "آخر المستجدات من %1",
     "digest.cta": "انقر هنا لمشاهدة %1",
     "digest.unsub.info": "تم إرسال هذا الإشعار بآخر المستجدات وفقا لخيارات تسجيلكم.",
-    "digest.no_topics": "ليس هناك مواضيع نشيطة في %1 الماضي",
     "digest.day": "يوم",
     "digest.week": "أسبوع",
     "digest.month": "شهر",
     "digest.subject": "إستهلاك ل",
+    "digest.title.day": "Your Daily Digest",
+    "digest.title.week": "Your Weekly Digest",
+    "digest.title.month": "Your Monthly Digest",
     "notif.chat.subject": "هناك محادثة جديدة من %1",
     "notif.chat.cta": "انقر هنا لمتابعة المحادثة",
     "notif.chat.unsub.info": "تم إرسال هذا الإشعار بوجودة محادثة جديدة وفقا لخيارات تسجيلك.",
-    "notif.post.cta": "انقر هنا لقراءة الموضوع بأكمله",
     "notif.post.unsub.info": "تم إشعارك بهذه المشاركة بناءً على الخيارات التي سبق وأن حددتها.",
-    "notif.cta": "Click here to go to forum",
+    "notif.post.unsub.one-click": "Alternatively, unsubscribe from future emails like this, by clicking",
+    "notif.cta": "To the forum",
+    "notif.cta-new-reply": "View Post",
+    "notif.cta-new-chat": "View Chat",
+    "notif.test.short": "Testing Notifications",
+    "notif.test.long": "This is a test of the notifications email. Send help!",
     "test.text1": "هذه رسالة تجريبية للتأكد من صحة إعدادت الرسائل الإلكترونية في منتدى NodeBB خاصتك.",
     "unsub.cta": "انقر هنا لتغيير تلك الإعدادات",
+    "unsubscribe": "unsubscribe",
+    "unsub.success": "You will no longer receive emails from the <strong>%1</strong> mailing list",
     "banned.subject": "You have been banned from %1",
     "banned.text1": "The user %1 has been banned from %2.",
     "banned.text2": "This ban will last until %1.",

public/language/ar/error.json

@@ -11,6 +11,9 @@
     "invalid-uid": "مستخدم غير موجود",
     "invalid-username": "اسم المستخدم غير مقبول",
     "invalid-email": "البريد الاكتروني غير مقبول",
+    "invalid-fullname": "Invalid Fullname",
+    "invalid-location": "Invalid Location",
+    "invalid-birthday": "Invalid Birthday",
     "invalid-title": "Invalid title",
     "invalid-user-data": "بيانات المستخدم غير صحيحة",
     "invalid-password": "كلمة السر غير مقبولة",
@@ -23,16 +26,18 @@
     "invalid-pagination-value": "رقم الصفحة غير صحيح ، يجب أن يكون بين %1 و %2 .",
     "username-taken": "اسم المستخدم مأخوذ",
     "email-taken": "البريد الالكتروني مأخوذ",
-    "email-not-confirmed": "عنوان بريدك الإلكتروني غير مفعل بعد. انقر هنا لتفعيله من فضلك.",
+    "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.",
     "email-not-confirmed-chat": "لا يمكنك الدردشة حتى تقوم بتأكيد بريدك الإلكتروني، الرجاء إضغط هنا لتأكيد بريدك اﻹلكتروني.",
-    "email-not-confirmed-email-sent": "بريدك الإلكتروني غير مفعل. رجاءًا تفحص صندوق البريد عن رسالة التفعيل.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.",
     "no-email-to-confirm": "هذا المنتدى يستلزم تفعيل بريدك الإلكتروني، انقر هنا من فضلك لإدخاله.",
     "email-confirm-failed": "لم نستطع تفعيل بريدك الإلكتروني، المرجو المحاولة لاحقًا.",
     "confirm-email-already-sent": "لقد تم ارسال بريد التأكيد، الرجاء اﻹنتظار 1% دقائق لإعادة اﻹرسال",
     "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
+    "digest-not-enabled": "This user does not have digests enabled, or the system default is not configured to send digests",
     "username-too-short": "اسم المستخدم قصير.",
     "username-too-long": "اسم المستخدم طويل",
     "password-too-long": "كلمة السر طويلة ",
+    "reset-rate-limited": "Too many password reset requests (rate limited)",
     "user-banned": "المستخدم محظور",
     "user-banned-reason": "Sorry, this account has been banned (Reason: %1)",
     "user-banned-reason-until": "Sorry, this account has been banned until %1 (Reason: %2)",
@@ -78,6 +83,7 @@
     "still-uploading": "الرجاء الانتظار حتى يكتمل الرفع.",
     "file-too-big": "الحد الأقصى لرفع الملفات %1 كيلو بت. رجاءًا ارفع ملف أصغر",
     "guest-upload-disabled": "خاصية رفع الملفات غير مفعلة للزوار.",
+    "cors-error": "Unable to upload image due to misconfigured CORS",
     "already-bookmarked": "You have already bookmarked this post",
     "already-unbookmarked": "You have already unbookmarked this post",
     "cant-ban-other-admins": "لايمكن حظر مدبر نظام آخر.",
@@ -87,6 +93,7 @@
     "invalid-image-type": "نوع الصورة غير مدعوم. الأنواع المدعومة هي :  %1",
     "invalid-image-extension": "امتداد الصورة غير مدعوم.",
     "invalid-file-type": "صيغة الملف غير مدعومة. الأنواع المدعومة هي: %1",
+    "invalid-image-dimensions": "Image dimensions are too big",
     "group-name-too-short": "اسم المجموعة قصير",
     "group-name-too-long": "اسم المجموعة طويل.",
     "group-already-exists": "المجموعة موجودة مسبقا",
@@ -96,6 +103,8 @@
     "group-needs-owner": "هذه المجموعة تتطلب مالك واحد على اﻷقل",
     "group-already-invited": "المستخدم سبق وأن تمت دعوته",
     "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",
     "post-already-deleted": "سبق وتم حذف هذا الرد",
     "post-already-restored": "سبق وتم إلغاء حذف هذا الرد",
     "topic-already-deleted": "سبق وتم حذف هذا الموضوع",
@@ -118,7 +127,7 @@
     "chat-edit-duration-expired": "You are only allowed to edit chat messages for %1 second(s) after posting",
     "chat-delete-duration-expired": "You are only allowed to delete chat messages for %1 second(s) after posting",
     "chat-deleted-already": "This chat message has already been deleted.",
-    "chat-restored'already": "This chat message has already been restored.",
+    "chat-restored-already": "This chat message has already been restored.",
     "already-voting-for-this-post": "لقد شاركت بالتصويت ، ألا تذكر؟",
     "reputation-system-disabled": "نظام السمعة معطل",
     "downvoting-disabled": "التصويتات السلبية معطلة",
@@ -127,8 +136,15 @@
     "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website",
     "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me",
     "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature",
-    "already-flagged": "لقد بلغت عن هذه المشاركة من قبل.",
+    "not-enough-reputation-min-rep-profile-picture": "You do not have enough reputation to add a profile picture",
+    "not-enough-reputation-min-rep-cover-picture": "You do not have enough reputation to add a cover picture",
+    "post-already-flagged": "You have already flagged this post",
+    "user-already-flagged": "You have already flagged this user",
+    "post-flagged-too-many-times": "This post has been flagged by others already",
+    "user-flagged-too-many-times": "This user has been flagged by others already",
     "self-vote": "You cannot vote on your own post",
+    "too-many-downvotes-today": "You can only downvote %1 times a day",
+    "too-many-downvotes-today-user": "You can only downvote a user %1 times a day",
     "reload-failed": "المنتدى واجه مشكلة أثناء إعادة التحميل: \"%1\".  سيواصل المنتدى خدمة العملاء السابقين لكن يجب عليك إلغاء أي تغيير قمت به قبل إعادة التحميل.",
     "registration-error": "حدث خطأ أثناء التسجيل",
     "parse-error": "حدث خطأ ما أثناء تحليل استجابة الخادم",
@@ -139,12 +155,17 @@
     "invite-maximum-met": "لقد قمت بدعوة الحد الأقصى من الأشخاص (%1 من %2)",
     "no-session-found": "لم دخول مسجل!",
     "not-in-room": "المستخدم غير موجود في الغرفة.",
-    "no-users-in-room": "لا يوجد مستخدمين في الغرفة.",
     "cant-kick-self": "لا يمكنك طرد نفسك من المجموعة.",
     "no-users-selected": "لا يوجد مستخدم محدد.",
     "invalid-home-page-route": "Invalid home page route",
     "invalid-session": "Session Mismatch",
     "invalid-session-text": "يبدو أن فترة التسجيل لم تعد قائمة او هي غير مطابقة مع الخادم. يرجى إعادة تحميل هذه الصفحة.",
     "no-topics-selected": "No topics selected!",
-    "cant-move-to-same-topic": "Can't move post to same topic!"
+    "cant-move-to-same-topic": "Can't move post to same topic!",
+    "cannot-block-self": "You cannot block yourself!",
+    "cannot-block-privileged": "You cannot block administrators or global moderators",
+    "cannot-block-guest": "Guest are not able to block other users",
+    "already-blocked": "This user is already blocked",
+    "already-unblocked": "This user is already unblocked",
+    "no-connection": "There seems to be a problem with your internet connection"
 }

public/language/ar/flags.json

@@ -1,55 +1,61 @@
 {
-	"state": "State",
-	"reporter": "Reporter",
-	"reported-at": "Reported At",
-	"description": "Description",
+	"state": "الحالة",
+	"reports": "Reports",
+	"first-reported": "First Reported",
 	"no-flags": "Hooray! No flags found.",
-	"assignee": "Assignee",
-	"update": "Update",
-	"updated": "Updated",
+	"assignee": "المحال إليه",
+	"update": "تحديث",
+	"updated": "تم التحديث",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
 
+	"graph-label": "Daily Flags",
 	"quick-filters": "Quick Filters",
 	"filter-active": "There are one or more filters active in this list of flags",
-	"filter-reset": "Remove Filters",
-	"filters": "Filter Options",
+	"filter-reset": "ازالة الفلاتر",
+	"filters": "خيارات الفلتر",
 	"filter-reporterId": "Reporter UID",
 	"filter-targetUid": "Flagged UID",
-	"filter-type": "Flag Type",
-	"filter-type-all": "All Content",
-	"filter-type-post": "Post",
-	"filter-type-user": "User",
-	"filter-state": "State",
+	"filter-type": "عنوان العلامة",
+	"filter-type-all": "كل المحتوي",
+	"filter-type-post": "مشاركة",
+	"filter-type-user": "مستخدم",
+	"filter-state": "الحالة",
 	"filter-assignee": "Assignee UID",
 	"filter-cid": "Category",
 	"filter-quick-mine": "Assigned to me",
 	"filter-cid-all": "All categories",
 	"apply-filters": "Apply Filters",
+	"more-filters": "More Filters",
 
-	"quick-links": "Quick Links",
+	"quick-actions": "اجراءات سريعه",
 	"flagged-user": "Flagged User",
-	"view-profile": "View Profile",
-	"start-new-chat": "Start New Chat",
+	"view-profile": "مشاهدة الملف الشخصي",
+	"start-new-chat": "بدء محادثه جديده",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
+	"delete-post": "حذف المشاركة",
+	"purge-post": "Purge Post",
+	"restore-post": "استرجاع المشاركة",
 
-	"user-view": "View Profile",
-	"user-edit": "Edit Profile",
+	"user-view": "مشاهدة الملف الشخصي",
+	"user-edit": "تعديل الملف الشخصي",
 
 	"notes": "Flag Notes",
-	"add-note": "Add Note",
+	"add-note": "اضافة ملاحظة",
 	"no-notes": "No shared notes.",
+	"delete-note-confirm": "Are you sure you want to delete this flag note?",
+	"note-added": "Note Added",
+	"note-deleted": "Note Deleted",
 
-	"history": "Flag History",
-	"back": "Back to Flags List",
+	"history": "Account & Flag History",
 	"no-history": "No flag history.",
 
 	"state-all": "All states",
 	"state-open": "New/Open",
 	"state-wip": "Work in Progress",
-	"state-resolved": "Resolved",
-	"state-rejected": "Rejected",
+	"state-resolved": "تم حلها",
+	"state-rejected": "تم رفضها",
 	"no-assignee": "Not Assigned",
-	"note-added": "Note Added",
 
 	"modal-title": "Report Inappropriate Content",
 	"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",

public/language/ar/global.json

@@ -30,6 +30,7 @@
     "header.unread": "غير مقروء",
     "header.tags": "وسم",
     "header.popular": "الأكثر شهرة",
+    "header.top": "Top",
     "header.users": "المستخدمين",
     "header.groups": "المجموعات",
     "header.chats": "المحادثات",
@@ -48,18 +49,20 @@
     "alert.banned.message": "لقد تم حظر حسابك. سيتم تسجيل الخروج.",
     "alert.unfollow": "أنت لا تتابع %1 بعد الآن!",
     "alert.follow": "أنت الآن تتابع %1!",
-    "online": "المتواجدون حاليًّا",
     "users": "الأعضاء",
     "topics": "المواضيع",
     "posts": "المشاركات",
     "best": "الأفضل",
     "votes": "Votes",
+    "voters": "Voters",
     "upvoters": "الموافقين",
     "upvoted": "مصوت بالموجب",
     "downvoters": "مصوتين بالسالب",
     "downvoted": "مصوت بالسالب",
     "views": "المشاهدات",
     "reputation": "السمعة",
+    "lastpost": "Last post",
+    "firstpost": "First post",
     "read_more": "اقرأ المزيد",
     "more": "المزيد",
     "posted_ago_by_guest": "كتب %1 بواسطة زائر",
@@ -77,6 +80,7 @@
     "recentposts": "آخر المشاركات",
     "recentips": "آخر عناوين ال IP التي سجلت الدخول",
     "moderator_tools": "أدوات المشرف",
+    "online": "المتواجدون حاليًّا",
     "away": "غير متواجد",
     "dnd": "عدم الإزعاج",
     "invisible": "مخفي",
@@ -85,6 +89,7 @@
     "language": "اللغة",
     "guest": "زائر",
     "guests": "الزوار",
+    "former_user": "A Former User",
     "updated.title": "تم تحديث المنتدى",
     "updated.message": "لقد تم تحديث المنتدى إلى آخر نسخة للتو. إضغط هنا لإعادة تحميل الصفحة.",
     "privacy": "الخصوصية",

public/language/ar/groups.json

@@ -25,9 +25,11 @@
     "details.latest_posts": "آخر المشاركات",
     "details.private": "خاص",
     "details.disableJoinRequests": "Disable join requests",
+    "details.disableLeave": "Disallow users from leaving the group",
     "details.grant": "منح/سحب المِلكية",
     "details.kick": "طرد",
     "details.kick_confirm": "Are you sure you want to remove this member from the group?",
+    "details.add-member": "Add Member",
     "details.owner_options": "إدارة المجموعة",
     "details.group_name": "اسم المجموعة",
     "details.member_count": "عدد اﻷعضاء",
@@ -35,7 +37,8 @@
     "details.description": "الوصف",
     "details.badge_preview": "معاينة الوسام",
     "details.change_icon": "تغيير الأيقونة",
-    "details.change_colour": "تغيير اللون",
+    "details.change_label_colour": "Change Label Colour",
+    "details.change_text_colour": "Change Text Colour",
     "details.badge_text": "نص الوسام",
     "details.userTitleEnabled": "إظهار الوسام",
     "details.private_help": "في حالة تفعيل الخيار، الانضمام إلى المجموعة يستلزم قبول مالكها",
@@ -46,9 +49,11 @@
     "event.updated": "تم تحديث بيانات المجموعة",
     "event.deleted": "تم حذف المجموعة %1",
     "membership.accept-invitation": "اقبل الدعوة",
+    "membership.accept.notification_title": "You are now a member of <strong>%1</strong>",
     "membership.invitation-pending": "الدعوة بانتظار القبول",
     "membership.join-group": "انظم للمجموعة",
     "membership.leave-group": "غادر المجموعة",
+    "membership.leave.notification_title": "<strong>%1</strong> has left group <strong>%2</strong>",
     "membership.reject": "رفض",
     "new-group.group_name": "اسم المجموعة",
     "upload-group-cover": "Upload group cover",

public/language/ar/modules.json

@@ -1,6 +1,7 @@
 {
     "chat.chatting_with": "Chat with",
     "chat.placeholder": "أكتب رسالة دردشة هنا، اضغط ENTER للإرسال",
+    "chat.scroll-up-alert": "You are looking at older messages, click here to go to most recent message.",
     "chat.send": "أرسل",
     "chat.no_active": "لا يوجد لديك دردشات نشطة.",
     "chat.user_typing": "%1 يكتب رسالة...",
@@ -12,6 +13,7 @@
     "chat.recent-chats": "آخر الدردشات",
     "chat.contacts": "الأصدقاء",
     "chat.message-history": "تاريخ الرسائل",
+    "chat.message-deleted": "Message Deleted",
     "chat.options": "Chat options",
     "chat.pop-out": "افتح الدردشة في نافذة خاصة",
     "chat.minimize": "Minimize",
@@ -22,7 +24,7 @@
     "chat.delete_message_confirm": "هل أنت متأكد من أنك تريد حذف هذه الرسالة؟",
     "chat.retrieving-users": "Retrieving users...",
     "chat.manage-room": "Manage Chat Room",
-    "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 may remove users from chat rooms.",
+    "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.rename-room": "Rename Room",
     "chat.rename-placeholder": "Enter your room name here",
@@ -32,6 +34,11 @@
     "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.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",
     "composer.compose": "اكتب",
     "composer.show_preview": "عرض المعاينة",
     "composer.hide_preview": "إخفاء المعاينة",
@@ -45,12 +52,14 @@
     "composer.formatting.italic": "Italic",
     "composer.formatting.list": "List",
     "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.code": "Code",
     "composer.formatting.link": "Link",
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
     "composer.zen_mode": "Zen Mode",
     "composer.select_category": "Select a category",
+    "composer.textarea.placeholder": "Enter your post content here, drag and drop images",
     "bootbox.ok": "OK",
     "bootbox.cancel": "إلغاء",
     "bootbox.confirm": "تأكيد",

public/language/ar/notifications.json

@@ -5,21 +5,20 @@
     "mark_all_read": "اجعل كل التنبيهات مقروءة",
     "back_to_home": "عودة إلى %1",
     "outgoing_link": "رابط خارجي",
-    "outgoing_link_message": "You are now leaving %1",
+    "outgoing_link_message": "أنت تغادر اﻻن %1",
     "continue_to": "استمر إلى %1",
     "return_to": "عودة إى %1",
-    "new_notification": "تنبيه جديد",
-    "new_notification_from": "You have a new Notification from %1",
+    "new_notification": "لديك تنبيه جديد",
     "you_have_unread_notifications": "لديك تنبيهات غير مقروءة.",
-    "all": "All",
-    "topics": "Topics",
-    "replies": "Replies",
-    "chat": "Chats",
-    "follows": "Follows",
-    "upvote": "Upvotes",
+    "all": "الكل",
+    "topics": "مواضيع",
+    "replies": "ردود",
+    "chat": "محادثات",
+    "follows": "متابعون",
+    "upvote": "الموافقين",
     "new-flags": "New Flags",
     "my-flags": "Flags assigned to me",
-    "bans": "Bans",
+    "bans": "الحظر",
     "new_message_from": "رسالة جديدة من <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> أضاف صوتًا إيجابيا إلى مشاركتك في <strong>%2</strong>.",
     "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
@@ -36,27 +35,33 @@
     "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
     "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> أنشأ موضوعًا جديدًا: <strong>%2</strong>",
+    "user_edited_post": "<strong>%1</strong> has edited a post in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> صار يتابعك.",
     "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
     "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> sent a registration request.",
     "new_register_multiple": "There are <strong>%1</strong> registration requests awaiting review.",
-    "flag_assigned_to_you": "<strong>Flag %1</strong> has been assigned to you",
+    "flag_assigned_to_you": "تم تخصيص العلامة 1%  لك",
     "post_awaiting_review": "Post awaiting review",
+    "profile-exported": "<strong>%1</strong> profile exported, click to download",
+    "posts-exported": "<strong>%1</strong> posts exported, click to download",
+    "uploads-exported": "<strong>%1</strong> uploads exported, click to download",
     "email-confirmed": "تم التحقق من عنوان البريد الإلكتروني",
     "email-confirmed-message": "شكرًا على إثبات صحة عنوان بريدك الإلكتروني. صار حسابك مفعلًا بالكامل.",
     "email-confirm-error-message": "حدث خطأ أثناء التحقق من عنوان بريدك الإلكتروني. ربما رمز التفعيل خاطئ أو انتهت صلاحيته.",
     "email-confirm-sent": "تم إرسال بريد التفعيل.",
     "none": "None",
-    "notification_only": "Notification Only",
-    "email_only": "Email Only",
-    "notification_and_email": "Notification & Email",
-    "notificationType_upvote": "When someone upvotes your post",
+    "notification_only": "التنبيهات فقط",
+    "email_only": "البريد الالكتروني فقط",
+    "notification_and_email": "التنبيهات والبريد اﻻلكتروني",
+    "notificationType_upvote": "عندما يوافقك احدهم على منشورك",
     "notificationType_new-topic": "When someone you follow posts a topic",
     "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_post-edit": "When a post is edited in a topic you are watching",
     "notificationType_follow": "When someone starts following you",
     "notificationType_new-chat": "When you receive a chat message",
     "notificationType_group-invite": "When you receive a group invite",
+    "notificationType_group-request-membership": "When someone requests to join a group you own",
     "notificationType_new-register": "When someone gets added to registration queue",
     "notificationType_post-queue": "When a new post is queued",
     "notificationType_new-post-flag": "When a post is flagged",

public/language/ar/pages.json

@@ -6,7 +6,10 @@
     "popular-month": "المواضيع الشائعة هذا الشهر",
     "popular-alltime": "المواضيع الشائعة منذ القدم",
     "recent": "المواضيع الحديثة",
-    "top": "Top Voted Topics",
+    "top-day": "Top voted topics today",
+    "top-week": "Top voted topics this week",
+    "top-month": "Top voted topics this month",
+    "top-alltime": "Top Voted Topics",
     "moderator-tools": "Moderator Tools",
     "flagged-content": "Flagged Content",
     "ip-blacklist": "IP Blacklist",
@@ -40,8 +43,10 @@
     "account/following": "People %1 follows",
     "account/followers": "People who follow %1",
     "account/posts": "Posts made by %1",
+    "account/latest-posts": "Latest posts made by %1",
     "account/topics": "Topics created by %1",
     "account/groups": "%1's Groups",
+    "account/watched_categories": "%1's Watched Categories",
     "account/bookmarks": "%1's Bookmarked Posts",
     "account/settings": "خيارات المستخدم",
     "account/watched": "Topics watched by %1",
@@ -51,6 +56,7 @@
     "account/best": "Best posts made by %1",
     "account/blocks": "Blocked users for %1",
     "account/uploads": "Uploads by %1",
+    "account/sessions": "Login Sessions",
     "confirm": "تم التحقق من عنوان البريد الإلكتروني",
     "maintenance.text": "جاري صيانة %1. المرجو العودة لاحقًا.",
     "maintenance.messageIntro": "بالإضافة إلى ذلك، قام مدبر النظام بترك هذه الرسالة:",

public/language/ar/reset_password.json

@@ -9,7 +9,7 @@
     "repeat_password": "تأكيد كلمة المرور",
     "enter_email": "يرجى إدخال <strong>عنوان البريد الإلكتروني</strong> الخاص بك وسوف نرسل لك رسالة بالبريد الالكتروني مع تعليمات حول كيفية إستعادة حسابك.",
     "enter_email_address": "ادخل عنوان البريد الإلكتروني",
-    "password_reset_sent": "A password reset email has been sent to the specified address. Please note that only one email will be sent per minute.",
+    "password_reset_sent": "If the specified address corresponds to an existing user account, a password reset email was sent. Please note that only one email will be sent per minute.",
     "invalid_email": "بريد إلكتروني غير صالح أو غير موجود",
     "password_too_short": "كلمة المرور التي أدخلتها قصيرة، الرجاء اختر  كلمة مرور مختلفة",
     "passwords_do_not_match": "كلمتا السر التي أدخلتهما غير متطابقتان",

public/language/ar/search.json

@@ -17,6 +17,7 @@
     "at-most": "على اﻷكثر",
     "relevance": "Relevance",
     "post-time": "تاريخ المشاركة",
+    "votes": "Votes",
     "newer-than": "أحدث من",
     "older-than": "أقدم من",
     "any-date": "أي وقت",
@@ -30,6 +31,7 @@
     "sort-by": "عرض حسب",
     "last-reply-time": "تاريخ آخر رد",
     "topic-title": "عنوان الموضوع",
+    "topic-votes": "Topic votes",
     "number-of-replies": "عدد الردود",
     "number-of-views": "عدد المشاهدات",
     "topic-start-date": "تاريخ بدأ الموضوع",
@@ -41,5 +43,6 @@
     "clear-preferences": "ازالة التفضيلات",
     "search-preferences-saved": "تم حفظ تفضيلات البحث",
     "search-preferences-cleared": "تم ازالة تفضيلات البحث",
-    "show-results-as": "عرض النتائج كـ"
+    "show-results-as": "عرض النتائج كـ",
+    "see-more-results": "See more results (%1)"
 }

public/language/ar/tags.json

@@ -3,5 +3,6 @@
     "tags": "الكلمات الدلالية",
     "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "أدخل الكلمات الدلالية...",
-    "no_tags": "لا يوجد كلمات دلالية بعد."
+    "no_tags": "لا يوجد كلمات دلالية بعد.",
+    "select_tags": "Select Tags"
 }

public/language/ar/topic.json

@@ -18,11 +18,13 @@
     "last_reply_time": "Last reply",
     "reply-as-topic": "رد بموضوع",
     "guest-login-reply": "يجب عليك تسجيل الدخول للرد",
+    "login-to-view": "🔒 Log in to view",
     "edit": "تعديل",
     "delete": "حذف",
     "purge": "تطهير",
     "restore": "استعادة",
     "move": "نقل",
+    "change-owner": "Change Owner",
     "fork": "فرع",
     "link": "رابط",
     "share": "نشر",
@@ -34,8 +36,11 @@
     "ban-ip": "Ban IP",
     "view-history": "Edit History",
     "bookmark_instructions": "اضغط هنا للعودة لأخر مشاركة مقروءة في الموضوع",
-    "flag_title": "إشعار بمشاركة مخلة.",
-    "merged_message": "This topic has been merged into <a href=\"/topic/%1\">%2</a>",
+    "flag-post": "Flag this post",
+    "flag-user": "Flag this user",
+    "already-flagged": "Already Flagged",
+    "view-flag-report": "View Flag Report",
+    "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "هذه المشاركة محذوفة. فقط من لهم صلاحية الإشراف على ا لمشاركات يمكنهم معاينتها.",
     "following_topic.message": "ستستلم تنبيها عند كل مشاركة جديدة في هذا الموضوع.",
     "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
@@ -64,6 +69,7 @@
     "thread_tools.move": "نقل الموضوع",
     "thread_tools.move-posts": "Move Posts",
     "thread_tools.move_all": "نقل الكل",
+    "thread_tools.change_owner": "Change Owner",
     "thread_tools.select_category": "Select Category",
     "thread_tools.fork": "إنشاء فرع الموضوع",
     "thread_tools.delete": "حذف الموضوع",
@@ -96,10 +102,15 @@
     "fork_pid_count": "1% مشاركة محددة",
     "fork_success": "تم إنشاء فرع للموضوع بنجاح! إضغط هنا لمعاينة الفرع.",
     "delete_posts_instruction": "Click the posts you want to delete/purge",
-    "merge_topics_instruction": "Click the topics you want to merge",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
     "move_posts_instruction": "Click the posts you want to move",
+    "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "أدخل عنوان موضوعك هنا...",
-    "composer.handle_placeholder": "اﻹسم",
+    "composer.handle_placeholder": "Enter your name/handle here",
     "composer.discard": "نبذ التغييرات",
     "composer.submit": "حفظ",
     "composer.replying_to": "الرد على %1",
@@ -129,5 +140,10 @@
     "diffs.description": "This post has <strong>%1</strong> revisions. Click one of the revisions below to see the post content at that point in time.",
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
-    "diffs.original-revision": "original revision"
+    "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
+    "timeago_later": "%1 later",
+    "timeago_earlier": "%1 earlier"
 }

public/language/ar/user.json

@@ -8,13 +8,20 @@
     "email": "البريد الإلكتروني",
     "confirm_email": "تأكيد عنوان البريد الإلكتروني",
     "account_info": "معلومات الحساب",
+    "admin_actions_label": "Administrative Actions",
     "ban_account": "حظر الحساب",
     "ban_account_confirm": "هل تريد حقاً حظر هاذا العضو؟",
     "unban_account": "إزالة حظر الحساب",
     "delete_account": "حذف الحساب",
-    "delete_account_confirm": "Are you sure you want to delete your account? <br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your password to confirm that you wish to destroy this account.",
-    "delete_this_account_confirm": "هل انت متأكد من رغبتك بحذف هذا الحساب؟ <br /> <strong>هذا الإجراء لا رجعة فيه ولن تتمكن من استرداد أي بيانات</strong><br /><br />",
+    "delete_account_as_admin": "Delete <strong>Account</strong>",
+    "delete_content": "Delete Account <strong>Content</strong>",
+    "delete_all": "Delete <strong>Account</strong> and <strong>Content</strong>",
+    "delete_account_confirm": "Are you sure you want to anonymize your posts and delete your account?<br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your password to confirm that you wish to destroy this account.",
+    "delete_this_account_confirm": "Are you sure you want to delete this account while leaving its contents behind?<br /><strong>This action is irreversible, posts will be anonymized, and you will not be able to restore post associations with the deleted account</strong><br /><br />",
+    "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",
     "fullname": "الاسم الكامل",
     "website": "الموقع الإلكتروني",
     "location": "الموقع",
@@ -25,12 +32,17 @@
     "profile_views": "عدد المشاهدات",
     "reputation": "السمعة",
     "bookmarks": "Bookmarks",
+    "watched_categories": "Watched categories",
+    "change_all": "Change All",
     "watched": "متابع",
     "ignored": "تم تجاهله",
+    "default-category-watch-state": "Default category watch state",
     "followers": "المتابعون",
     "following": "يتابع",
     "blocks": "Blocks",
     "block_toggle": "Toggle Block",
+    "block_user": "Block User",
+    "unblock_user": "Unblock User",
     "aboutme": "معلومة عنك او السيرة الذاتية",
     "signature": "توقيع",
     "birthday": "عيد ميلاد",
@@ -45,6 +57,7 @@
     "change_picture": "تغيير الصورة",
     "change_username": "تغيير اسم المستخدم",
     "change_email": "تغيير البريد اﻹلكتروني",
+    "email_same_as_password": "Please enter your current password to continue &ndash; you've entered your new email again",
     "edit": "تعديل",
     "edit-profile": "تعديل الملف الشخصي",
     "default_picture": "أيقونة افتراضية",
@@ -81,7 +94,6 @@
     "digest_daily": "يوميا",
     "digest_weekly": "أسبوعيًّا",
     "digest_monthly": "شهريًّا",
-    "settings-require-reload": "تغيير بعض اﻹعدادات يتطلب تحديث الصفحة. إضغط هنا لتحديث الصفحة",
     "has_no_follower": "هذا المستخدم ليس لديه أية متابعين :(",
     "follows_no_one": "هذا المستخدم لا يتابع أحد :(",
     "has_no_posts": "هذا المستخدم لم يشارك حتى الآن.",
@@ -107,19 +119,20 @@
     "no-sound": "بدون صوت",
     "upvote-notif-freq": "معدل تكرار تنبيهات التصويت للأعلى",
     "upvote-notif-freq.all": "كل التصويتات للأعلى",
+    "upvote-notif-freq.first": "First Per Post",
     "upvote-notif-freq.everyTen": "كل عشر تصويتات للأعلى",
+    "upvote-notif-freq.threshold": "On 1, 5, 10, 25, 50, 100, 150, 200...",
     "upvote-notif-freq.logarithmic": "On 10, 100, 1000...",
     "upvote-notif-freq.disabled": "معطل",
     "browsing": "خيارات التصفح",
     "open_links_in_new_tab": "فتح الروابط الخارجية في نافدة جديدة",
     "enable_topic_searching": "تفعيل خاصية البحث داخل المواضيع",
     "topic_search_help": "إذا قمت بتفعيل ميزة البحث في-الموضوع،  سيتم تجاوز الخيار الافتراضي للمتصفح مما يؤدي للبحث بكامل الموضوع بدلا عن البحث في الجزء الظاهر في الشاشة.",
-    "delay_image_loading": "تأخير عرض الصور",
-    "image_load_delay_help": "إذا تم تمكينه، فلن يتم تحميل الصور في المواضيع حتى يتم تمريرها في الشاشة",
     "scroll_to_my_post": "بعد اضافة رد على المشاركة, قم بإظهار المشاركة",
     "follow_topics_you_reply_to": "متابعة المواضيع التي تقوم بالرد عليها",
     "follow_topics_you_create": "متابعة المواضيع التي تقوم بإنشائها",
     "grouptitle": "عنوان المجموعة",
+    "group-order-help": "Select a group and use the arrows to order titles",
     "no-group-title": "لا يوجد عنوان للمجموعة",
     "select-skin": "إختر سمة",
     "select-homepage": "إختر الصفحة الرئيسية",
@@ -138,6 +151,7 @@
     "info.ban-history": "سجل الحظر الأحدث",
     "info.no-ban-history": "هذا المستخدم لم يتم حظره مطلقا",
     "info.banned-until": "محظور حتى %1",
+    "info.banned-expiry": "Expiry",
     "info.banned-permanently": "محظور بشكل دائم",
     "info.banned-reason-label": "سبب",
     "info.banned-no-reason": "لم يتم إعطاء سبب.",
@@ -146,12 +160,13 @@
     "info.moderation-note": "ملاحظة الإشراف",
     "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.",
     "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.",
     "consent.email_intro": "Occasionally, we may send emails to your registered email address in order to provide updates and/or to notify you of new activity that is pertinent to you. You can customise the frequency of the community digest (including disabling it outright), as well as select which types of notifications to receive via email, via your user settings page.",
-    "consent.digest_frequency": "By default, this community delivers email digests every %1.",
-    "consent.digest_off": "Currently, this community does not send out email digests",
+    "consent.digest_frequency": "Unless explicitly changed in your user settings, this community delivers email digests every %1.",
+    "consent.digest_off": "Unless explicitly changed in your user settings, this community does not send out email digests",
     "consent.received": "You have provided consent for this website to collect and process your information. No additional action is required.",
     "consent.not_received": "You have not provided consent for data collection and processing. At any time this website&apos;s administration may elect to delete your account in order to become compliant with the General Data Protection Regulation.",
     "consent.give": "Give consent",
@@ -163,7 +178,10 @@
     "consent.right_to_erasure_description": "At any time, you are able to revoke your consent to data collection and/or processing by deleting your account. Your individual profile can be deleted, although your posted content will remain. If you wish to delete both your account <strong>and</strong> your content, please contact the administrative team for this website.",
     "consent.right_to_data_portability": "You have the Right to Data Portability",
     "consent.right_to_data_portability_description": "You may request from us a machine-readable export of any collected data about you and your account. You can do so by clicking the appropriate button below.",
-    "consent.export_profile": "Export Profile (.csv)",
+    "consent.export_profile": "Export Profile (.json)",
+    "consent.export-profile-success": "Exporting profile, you will get a notification when it is complete.",
     "consent.export_uploads": "Export Uploaded Content (.zip)",
-    "consent.export_posts": "Export Posts (.csv)"
+    "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.",
+    "consent.export_posts": "Export Posts (.csv)",
+    "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete."
 }

public/language/ar/users.json

@@ -10,6 +10,7 @@
     "filter-by": "Filter By",
     "online-only": "المتصلون فقط",
     "invite": "دعوة",
+    "prompt-email": "Emails:",
     "invitation-email-sent": "تم إرسال دعوة بالبريد الإلكتروني إلى %1",
     "user_list": "قائمة اﻷعضاء",
     "recent_topics": "أحدث المواضيع",

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

@@ -18,10 +18,17 @@
 	"mongo.resident-memory": "Текущо активна памет",
 	"mongo.virtual-memory": "Виртуална памет",
 	"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",
+	"redis.keys": "Ключове",
+	"redis.expires": "Изтичания",
+	"redis.avg-ttl": "Средно време на живот (TTL)",
 	"redis.connected-clients": "Свързани клиенти",
 	"redis.connected-slaves": "Свързани второстепенни сървъри",
 	"redis.blocked-clients": "Блокирани клиенти",
@@ -30,7 +37,16 @@
 	"redis.total-connections-recieved": "Общо получени свързвания",
 	"redis.total-commands-processed": "Общо обработени команди",
 	"redis.iops": "Едновременни операции в секунда",
+	"redis.iinput": "Едновременен вход в секунда",
+	"redis.ioutput": "Едновременен изход в секунда",
+	"redis.total-input": "Общ вход",
+	"redis.total-output": "Общ изход",
+
 	"redis.keyspace-hits": "Успешни търсения на ключове",
 	"redis.keyspace-misses": "Неуспешни търсения на ключове",
-	"redis.raw-info": "Сурови данни от Redis"
-}
+	"redis.raw-info": "Сурови данни от Redis",
+
+	"postgres": "Postgres",
+	"postgres.version": "Версия на PostgreSQL",
+	"postgres.raw-info": "Сурови данни от Postgres"
+}

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

@@ -2,5 +2,11 @@
 	"events": "Събития",
 	"no-events": "Няма събития",
 	"control-panel": "Контролен панел за събитията",
-	"delete-events": "Изтриване на събитията"
+	"delete-events": "Изтриване на събитията",
+	"filters": "Филтри",
+	"filters-apply": "Прилагане на филтрите",
+	"filter-type": "Вид събитие",
+	"filter-start": "Начална дата",
+	"filter-end": "Крайна дата",
+	"filter-perPage": "На страница"
 }

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

@@ -8,7 +8,7 @@
 	"custom-js.enable": "Включване на персонализирания код на Javascript",
 
 	"custom-header": "Персонализирана заглавна част",
-	"custom-header.description": "Въведете своя персонализиран код HTML тук (напр. елементи „meta“ и т.н.), те ще бъдат добавени към секцията <code>&lt;head&gt;</code> в кода на Вашия форум. Ползването на елементи „script“ е позволено, но непрепоръчително, тъй като за това можете да ползвате раздела <a href=\"#custom-header\" data-toggle=\"tab\">Персонализиран код на Javascript</a>.",
+	"custom-header.description": "Въведете своя персонализиран код HTML тук (напр. елементи „meta“ и т.н.), те ще бъдат добавени към секцията <code>&lt;head&gt;</code> в кода на Вашия форум. Ползването на елементи „script“ е позволено, но непрепоръчително, тъй като за това можете да ползвате раздела <a href=\"#custom-js\" data-toggle=\"tab\">Персонализиран код на Javascript</a>.",
 	"custom-header.enable": "Включване на персонализирана заглавна част",
 
 	"custom-css.livereload": "Включване на моменталното презареждане",

public/language/bg/admin/dashboard.json

@@ -0,0 +1,79 @@
+{
+	"forum-traffic": "Трафик на форума",
+	"page-views": "Преглеждания на страниците",
+	"unique-visitors": "Уникални посетители",
+	"new-users": "Нови потребители",
+	"posts": "Публикации",
+	"topics": "Теми",
+	"page-views-seven": "Последните 7 дни",
+	"page-views-thirty": "Последните 30 дни",
+	"page-views-last-day": "Последните 24 часа",
+	"page-views-custom": "Интервал по избор",
+	"page-views-custom-start": "Начална дата",
+	"page-views-custom-end": "Крайна дата",
+	"page-views-custom-help": "Въведете интервал от дати, за които искате да видите преглежданията на страниците. Ако не се появи календар за избор, можете да въведете датите във формат: <code>ГГГГ-ММ-ДД</code>",
+	"page-views-custom-error": "Моля, въведете правилен интервал от дати във формата: <code>ГГГГ-ММ-ДД</code>",
+
+	"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>Има нова версия (версия %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>",
+	"running-in-development": "<span>Форумът работи в режим за разработчици, така че може да бъде уязвим. Моля, свържете се със системния си администратор.</span>",
+	"latest-lookup-failed": "<p>Не може да бъде извършена проверка за последната налична версия на NodeBB</p>",
+
+	"notices": "Забележки",
+	"restart-not-required": "Не се изисква рестартиране",
+	"restart-required": "Изисква се рестартиране",
+	"search-plugin-installed": "Добавката за търсене е инсталирана",
+	"search-plugin-not-installed": "Добавката за търсене не е инсталирана",
+	"search-plugin-tooltip": "Инсталирайте добавка за търсене от страницата с добавките, за да включите функционалността за търсене",
+
+	"control-panel": "Системен контрол",
+	"rebuild-and-restart": "Повторно изграждане и рестартиране",
+	"restart": "Рестартиране",
+	"restart-warning": "Повторното изграждане и рестартирането на NodeBB ще прекъснат всички връзки за няколко секунди.",
+	"restart-disabled": "Възможностите за повторно изграждане и рестартиране на NodeBB са изключени, тъй като изглежда, че NodeBB не се изпълнява чрез подходящия демон.",
+	"maintenance-mode": "Режим на профилактика",
+	"maintenance-mode-title": "Щракнете тук, за да зададете режим на профилактика на NodeBB",
+	"realtime-chart-updates": "Актуализации на таблиците в реално време",
+
+	"active-users": "Дейни потребители",
+	"active-users.users": "Потребители",
+	"active-users.guests": "Гости",
+	"active-users.total": "Общо",
+	"active-users.connections": "Връзки",
+
+	"anonymous-registered-users": "Анонимни към регистрирани потребители",
+	"anonymous": "Анонимни",
+	"registered": "Регистрирани",
+
+	"user-presence": "Присъствие на потребителите ",
+	"on-categories": "В списъка с категории",
+	"reading-posts": "Четящи публикации",
+	"browsing-topics": "Разглеждащи теми",
+	"recent": "Скорошни",
+	"unread": "Непрочетени",
+
+	"high-presence-topics": "Теми с най-голяма присъственост",
+
+	"graphs.page-views": "Преглеждания на страниците",
+	"graphs.page-views-registered": "Преглеждания на страниците от регистрирани потребители",
+	"graphs.page-views-guest": "Преглеждания на страниците от гости",
+	"graphs.page-views-bot": "Преглеждания на страниците от ботове",
+	"graphs.unique-visitors": "Уникални посетители",
+	"graphs.registered-users": "Регистрирани потребители",
+	"graphs.anonymous-users": "Анонимни потребители",
+	"last-restarted-by": "Последно рестартиране от",
+	"no-users-browsing": "Няма разглеждащи потребители"
+}

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

@@ -1,13 +1,16 @@
 {
-	"you-are-on": "Информация — Вие сте на <strong>%1:%2</strong>",
+	"you-are-on": "Вие сте на <strong>%1:%2</strong>",
+	"ip": "IP <strong>%1</strong>",
 	"nodes-responded": "%1 възела отговориха в рамките на %2мсек!",
 	"host": "сървър",
+	"primary": "основен / изпълнение на задачите",
 	"pid": "ид. на процеса",
 	"nodejs": "nodejs",
 	"online": "на линия",
 	"git": "git",
 	"memory": "памет",
-	"load": "натоварване",
+	"load": "натоварване на системата",
+	"cpu-usage": "използване на процесора",
 	"uptime": "активно време",
 
 	"registered": "Регистрирани",

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

@@ -9,6 +9,7 @@
 
 	"plugin-search": "Търсене на добавки",
 	"plugin-search-placeholder": "Търсене на добавка…",
+	"submit-anonymous-usage": "Изпращане на анонимни данни за употребата на добавката",
 	"reorder-plugins": "Пренареждане на добавките",
 	"order-active": "Подреждане на включените добавки",
 	"dev-interested": "Искате ли да пишете добавки за NodeBB?",
@@ -29,6 +30,8 @@
 	"plugin-item.more-info": "За повече информация",
 	"plugin-item.unknown": "Неизвестно",
 	"plugin-item.unknown-explanation": "Състоянието на тази добавка не може да бъде определено, може би поради грешка в конфигурацията.",
+	"plugin-item.compatible": "Тази добавка работи с NodeBB %1",
+	"plugin-item.not-compatible": "Тази добавка няма информация за съвместимост. Уверете се, че работи, преди да я инсталирате на истинския си сървър.",
 
 	"alert.enabled": "Добавката е включена",
 	"alert.disabled": "Добавката е изключена",

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

@@ -18,5 +18,13 @@
 	"alert.update-success": "Джаджите са обновени успешно",
 	"alert.clone-success": "Джаджите са клонирани успешно",
 
-	"error.select-clone": "Изберете страница, от която да клонирате"
+	"error.select-clone": "Изберете страница, от която да клонирате",
+
+	"title": "Заглавие",
+	"title.placeholder": "Заглавие (показва се само в някои контейнери)",
+	"container": "Контейнер",
+	"container.placeholder": "Завлачете и пуснете контейнер или въведете HTML тук.",
+	"show-to-groups": "Показване на групите",
+	"hide-from-groups": "Скриване от групите",
+	"hide-on-mobile": "Скриване на мобилни устройства"
 }