rename parseUrl to urlParse, closer to core url module, url.parse

Otherwise `<input class="form-control">` can't work

.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/*"
-- "tests/*"
+- "test/*"

.eslintignore

@@ -1,5 +1,4 @@
 node_modules/
-public/src/nodebb.min.js
 *.sublime-project
 *.sublime-workspace
 .project
@@ -10,11 +9,13 @@ logs/
 /public/uploads
 /public/sounds
 /public/vendor
-/public/nodebb.min.js
-/public/acp.min.js
 /public/src/modules/string.js
 .idea/
 .vscode/
 *.ipr
 *.iws
 /coverage
+/build
+.eslintrc
+test/files
+*.min.js

.eslintrc

@@ -0,0 +1,140 @@
+{
+	"extends": "airbnb-base",
+	"parserOptions": {
+		"sourceType": "script"
+	},
+
+	"rules": {
+		// Customized
+		"handle-callback-err": [ "error","^(e$|(e|(.*(_e|E)))rr)" ],
+		"comma-dangle": ["error", {
+			"arrays": "always-multiline",
+			"objects": "always-multiline",
+			"imports": "always-multiline",
+			"exports": "always-multiline",
+			"functions": "never"
+		}],
+		"no-return-await": "off",
+		"no-constant-condition": "off",
+		"no-empty": ["error", { "allowEmptyCatch": true }],
+		"no-underscore-dangle": "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"],
+		"no-eq-null": "off",
+		"camelcase": "off",
+		"no-new": "off",
+		"no-shadow": "off",
+		"no-use-before-define": ["error", "nofunc"],
+		"no-prototype-builtins": "off",
+		"new-cap": "off",
+		"no-plusplus": ["error", { "allowForLoopAfterthoughts": true }],
+		"object-curly-newline": "off",
+		"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",
+		"prefer-spread": "off",
+		"prefer-arrow-callback": "off",
+		"prefer-template": "off",
+		"no-var": "off",
+		"object-shorthand": "off",
+		"vars-on-top": "off",
+		"prefer-destructuring": "off",
+
+		// TODO
+		"import/no-extraneous-dependencies": "off",
+		"import/no-dynamic-require": "off",
+		"import/newline-after-import": "off",
+		"no-bitwise": "off",
+		"global-require": "off",
+		"max-len": "off",
+		"no-param-reassign": "off",
+		"no-restricted-syntax": "off",
+		"no-script-url": "off",
+		"default-case": "off",
+		"linebreak-style": "off",
+
+		// "no-multi-assign": "off",
+		// "one-var": "off",
+		// "no-undef": "off",
+		// "max-nested-callbacks": "off",
+		// "no-mixed-requires": "off",
+		// "brace-style": "off",
+		// "max-statements-per-line": "off",
+		// "no-unused-vars": "off",
+		// "no-mixed-spaces-and-tabs": "off",
+		// "no-useless-concat": "off",
+		// "require-jsdoc": "off",
+		// "eqeqeq": "off",
+		// "no-negated-condition": "off",
+		// "one-var-declaration-per-line": "off",
+		// "no-lonely-if": "off",
+		// "radix": "off",
+		// "no-else-return": "off",
+		// "no-useless-escape": "off",
+		// "block-scoped-var": "off",
+		// "operator-assignment": "off",
+		// "yoda": "off",
+		// "no-loop-func": "off",
+		// "no-void": "off",
+		// "valid-jsdoc": "off",
+		// "no-cond-assign": "off",
+		// "no-redeclare": "off",
+		// "no-unreachable": "off",
+		// "no-nested-ternary": "off",
+		// "operator-linebreak": "off",
+		// "guard-for-in": "off",
+		// "no-unneeded-ternary": "off",
+		// "no-sequences": "off",
+		// "no-extend-native": "off",
+		// "no-shadow-restricted-names": "off",
+		// "no-extra-boolean-cast": "off",
+		// "no-path-concat": "off",
+		// "no-unused-expressions": "off",
+		// "no-return-assign": "off",
+		// "no-restricted-modules": "off",
+		// "object-curly-spacing": "off",
+		// "indent": "off",
+		// "padded-blocks": "off",
+		// "eol-last": "off",
+		// "lines-around-directive": "off",
+		// "strict": "off",
+		// "comma-dangle": "off",
+		// "no-multi-spaces": "off",
+		// "quotes": "off",
+		// "keyword-spacing": "off",
+		// "no-mixed-operators": "off",
+		// "comma-spacing": "off",
+		// "no-trailing-spaces": "off",
+		// "key-spacing": "off",
+		// "no-multiple-empty-lines": "off",
+		// "spaced-comment": "off",
+		// "space-in-parens": "off",
+		// "block-spacing": "off",
+		// "quote-props": "off",
+		// "space-unary-ops": "off",
+		// "no-empty": "off",
+		// "dot-notation": "off",
+		// "func-call-spacing": "off",
+		// "array-bracket-spacing": "off",
+		// "object-property-newline": "off",
+		// "no-continue": "off",
+		// "no-extra-semi": "off",
+		// "no-spaced-func": "off",
+		// "no-useless-return": "off"
+	}
+}

.eslintrc.json

@@ -1,6 +0,0 @@
-{
-	"rules": {
-		"handle-callback-err": [ "error", "^(e$|(e|(.*(_e|E)))rr)" ]
-	}
-}
-

.github/CONTRIBUTING.md

@@ -1,6 +1,10 @@
 # Submitting a Pull Request to NodeBB?
 
-First of all, thank you! Please consider this [style guide](https://docs.nodebb.org/en/latest/contributing/style-guide.html) when submitting your changes. Also, please join our [community](https://community.nodebb.org) to meet other NodeBB developers and designers :) 
+First of all, thank you! Before submission, please run `npm test` to lint and run the automated NodeBB tests. If everything passes, you're good to go. If you have any errors, please fix them and re-run `npm test` to make sure there aren't any others.
+
+## Styleguide and linting
+
+NodeBB mostly conforms to the [AirBnB Javascript style guide](https://github.com/airbnb/javascript#readme). If you're running into a lot of ESlint errors, you may want to install an editor plugin to display them in real time.
 
 ## Contributor License Agreement
 
@@ -11,7 +15,7 @@ If you are writing contributions as part of employment from another company / in
 
 # Having problems installing NodeBB?
 
-Chances are somebody has run into this problem before. After consulting our [documentation](https://docs.nodebb.org/en/latest/installing/os.html), please head over to our [community support forum](https://community.nodebb.org) for advice.
+Chances are somebody has run into this problem before. After consulting our [documentation](https://docs.nodebb.org/installing/os/), please head over to our [community support forum](https://community.nodebb.org) for advice.
 
 # Found a Security Vulnerability?
 
@@ -34,11 +38,9 @@ There is a chance that the issue you are experiencing may have already been fixe
 You can find the NodeBB version number in the Admin Control Panel (ACP), as well as the first line output to the shell when running NodeBB
 
 ``` plaintext
-info: NodeBB v0.5.2-dev Copyright (C) 2013-2014 NodeBB Inc.
-info: This program comes with ABSOLUTELY NO WARRANTY.
-info: This is free software, and you are welcome to redistribute it under certain conditions.
-info: 
-info: Time: Tue Oct 07 2014 20:25:20 GMT-0400 (EDT)
+3/4 12:38:57 [10752] - info: NodeBB v1.4.5 Copyright (C) 2013-2017 NodeBB Inc.
+3/4 12:38:57 [10752] - info: This program comes with ABSOLUTELY NO WARRANTY.
+3/4 12:38:57 [10752] - info: This is free software, and you are welcome to redistribute it under certain conditions.
 ```
 
 If you are running NodeBB via git, it is also helpful to let the maintainers know what commit hash you are on. To find the commit hash, execute the following command:
@@ -51,12 +53,13 @@ $ git rev-parse HEAD
 If you have downloaded the `.zip` or `.tar.gz` packages from GitHub (or elsewhere), please let us know.
 
 ## Provide theme versions if issue is related to the theme/display
+Use `npm ls` to list the versions of the theme you're using. In this example, we're running the Persona theme, which depends on the Vanilla theme.
 
 ``` bash
-$ npm ls nodebb-theme-vanilla nodebb-theme-lavender
-nodebb@0.7.0-dev /home/julian/Projects/nodebb/forum
-├── nodebb-theme-lavender@0.2.13
-└── nodebb-theme-vanilla@0.2.35
+$ npm ls nodebb-theme-vanilla nodebb-theme-persona
+nodebb@1.4.3 /path/to/nodebb
++-- nodebb-theme-persona@4.2.4
+`-- nodebb-theme-vanilla@5.2.0
 ```
 
 ## Attempt to use `git bisect`

.github/ISSUE_TEMPLATE.md

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

.gitignore

@@ -1,3 +1,4 @@
+yarn.lock
 npm-debug.log
 node_modules/
 sftp-config.json
@@ -17,6 +18,7 @@ provision.sh
 .DS_Store
 feeds/recent.rss
 .eslintcache
+.svn
 
 logs/
 
@@ -25,8 +27,9 @@ pidfile
 # templates
 /public/templates
 
-/public/uploads
 /public/sounds
+/public/uploads
+/test/uploads
 
 # compiled files
 /public/stylesheet.css
@@ -35,6 +38,9 @@ pidfile
 /public/nodebb.min.js.map
 /public/acp.min.js
 /public/acp.min.js.map
+/public/installer.css
+/public/installer.min.js
+/public/logo.png
 
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
 *.iml
@@ -53,3 +59,10 @@ tx.exe
 
 ##Coverage output
 coverage
+.nyc_output
+
+*.log
+test/files/normalise.jpg.png
+test/files/normalise-resized.jpg
+package-lock.json
+/package.json

.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
@@ -74,6 +76,7 @@
     "worker" : false, // Web Workers
     "wsh" : false, // Windows Scripting Host
     "yui" : false, // Yahoo User Interface
+    "mocha": true,
 
     // Legacy
     "nomen" : false, // true: Prohibit dangling `_` in variables
@@ -82,5 +85,7 @@
     "white" : false, // true: Check against strict whitespace and indentation rules
 
     // Custom Globals
-    "globals" : {} // additional predefined global variables
+    "globals" : {
+        "Promise": true
+    } // additional predefined global variables
 }

.travis.yml

@@ -1,27 +1,47 @@
 services:
-    - redis-server
+  - mongodb
+  - redis-server
+  - postgresql
 before_install:
-    - "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10"
-    - "echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list"
-    - "sudo apt-get update"
-    - "sudo apt-get install mongodb-org-server"
-    - npm i --production
-    - 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}"
+  - cp install/package.json package.json
+  - 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:
-    - "until nc -z localhost 27017; do echo Waiting for MongoDB; sleep 1; done"
+  - sleep 15 # wait for mongodb to be ready
+  - "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\\\":5432,\\\"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\\\":5432,\\\"username\\\":\\\"postgres\\\",\\\"database\\\":\\\"travis_ci_test\\\"}\"; fi"
+after_success:
+  - "npm run coveralls"
 language: node_js
+sudo: false
+dist: xenial
 env:
-  - CXX=g++-4.8
+  global:
+    - PGUSER=postgres
+    - PGPORT=5432
+    - 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
+      - ubuntu-toolchain-r-test
+      - mongodb-4.0-xenial
     packages:
-    - g++-4.8
+      - g++-4.8
+      - mongodb-org-server
 node_js:
-    - "6"
-    - "5"
-    - "4"
+  - "12"
+  - "10"
 branches:
-    only:
-        - master
+  only:
+    - master
+    - develop

Dockerfile

@@ -1,15 +1,23 @@
-# The base image is the latest 4.x node (LTS) on jessie (debian)
-# -onbuild will install the node dependencies found in the project package.json
-# and copy its content in /usr/src/app, its WORKDIR
-FROM node:4-onbuild
+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 --only=prod && \
+    npm cache clean --force
+    
+COPY . /usr/src/app
 
 ENV NODE_ENV=production \
     daemon=false \
     silent=false
 
-# nodebb setup will ask you for connection information to a redis (default), mongodb then run the forum
-# nodebb upgrade is not included and might be desired
-CMD node app --setup && npm start
-
-# the default port for NodeBB is exposed outside the container
 EXPOSE 4567
+
+CMD ./nodebb start
+

Gruntfile.js

@@ -1,107 +1,246 @@
-"use strict";
-
-var fork = require('child_process').fork,
-	env = process.env,
-	worker,
-	incomplete = [];
+'use strict';
 
 
-module.exports = function(grunt) {
+var async = require('async');
+var fork = require('child_process').fork;
+var env = process.env;
+var worker;
+var updateWorker;
+var initWorker;
+var incomplete = [];
+var running = 0;
+
+env.NODE_ENV = env.NODE_ENV || 'development';
+
+
+var nconf = require('nconf');
+nconf.file({
+	file: 'config.json',
+});
+
+nconf.defaults({
+	base_dir: __dirname,
+	views_dir: './build/public/templates',
+});
+var winston = require('winston');
+winston.configure({
+	transports: [
+		new winston.transports.Console({
+			handleExceptions: true,
+		}),
+	],
+});
+var db = require('./src/database');
+
+module.exports = function (grunt) {
 	var args = [];
+	var initArgs = ['--build'];
 	if (!grunt.option('verbose')) {
 		args.push('--log-level=info');
+		initArgs.push('--log-level=info');
 	}
 
 	function update(action, filepath, target) {
-		var updateArgs = args.slice(),
-			fromFile = '',
-			compiling = '',
-			time = Date.now();
-		
+		var updateArgs = args.slice();
+		var compiling;
+		var time = Date.now();
+
 		if (target === 'lessUpdated_Client') {
-			fromFile = ['js', 'tpl', 'acpLess'];
-			compiling = 'clientLess';
+			compiling = 'clientCSS';
 		} else if (target === 'lessUpdated_Admin') {
-			fromFile = ['js', 'tpl', 'clientLess'];
-			compiling = 'acpLess';
+			compiling = 'acpCSS';
 		} else if (target === 'clientUpdated') {
-			fromFile = ['clientLess', 'acpLess', 'tpl'];
 			compiling = 'js';
 		} else if (target === 'templatesUpdated') {
-			fromFile = ['js', 'clientLess', 'acpLess'];
 			compiling = 'tpl';
+		} else if (target === 'langUpdated') {
+			compiling = 'lang';
 		} else if (target === 'serverUpdated') {
-			fromFile = ['clientLess', 'acpLess', 'js', 'tpl'];
+			// Do nothing, just restart
 		}
 
-		fromFile = fromFile.filter(function(ext) {
-			return incomplete.indexOf(ext) === -1;
-		});
+		if (compiling && !incomplete.includes(compiling)) {
+			incomplete.push(compiling);
+		}
 
-		updateArgs.push('--from-file=' + fromFile.join(','));
-		incomplete.push(compiling);
+		updateArgs.push('--build');
+		updateArgs.push(incomplete.join(','));
 
 		worker.kill();
-		worker = fork('app.js', updateArgs, { env: env });
+		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 = [];
 
-		worker.on('message', function() {
-			if (incomplete.length) {
-				incomplete = [];
-
-				if (grunt.option('verbose')) {
-					grunt.log.writeln('NodeBB restarted in ' + (Date.now() - time) + ' ms');
-				}
+						if (grunt.option('verbose')) {
+							grunt.log.writeln('NodeBB restarted in ' + (Date.now() - time) + ' ms');
+						}
+					}
+				});
 			}
 		});
 	}
 
 	grunt.initConfig({
-		watch: {
-			lessUpdated_Client: {
-				files: [
-					'public/*.less',
-					'node_modules/nodebb-*/*.less', 'node_modules/nodebb-*/**/*.less',
-					'!node_modules/nodebb-*/node_modules/**',
-					'!node_modules/nodebb-*/.git/**'
-				]
-			},
-			lessUpdated_Admin: {
-				files: ['public/**/*.less']
-			},
-			clientUpdated: {
-				files: [
-					'public/src/**/*.js',
-					'node_modules/nodebb-*/*.js', 'node_modules/nodebb-*/**/*.js',
-					'!node_modules/nodebb-*/node_modules/**',
-					'node_modules/templates.js/lib/templates.js',
-					'!node_modules/nodebb-*/.git/**'
-				]
-			},
-			serverUpdated: {
-				files: ['*.js', 'install/*.js', 'src/**/*.js']
-			},
-			templatesUpdated: {
-				files: [
-					'src/views/**/*.tpl',
-					'node_modules/nodebb-*/*.tpl', 'node_modules/nodebb-*/**/*.tpl',
-					'!node_modules/nodebb-*/node_modules/**',
-					'!node_modules/nodebb-*/.git/**'
-				]
-			}
-		}
+		watch: {},
 	});
 
 	grunt.loadNpmTasks('grunt-contrib-watch');
 
-	if (grunt.option('skip')) {
-		grunt.registerTask('default', ['watch:serverUpdated']);
-	} else {
-		grunt.registerTask('default', ['watch']);
-	}
-	
+	grunt.registerTask('default', ['watch']);
+
+	grunt.registerTask('init', function () {
+		var done = this.async();
+		async.waterfall([
+			function (next) {
+				db.init(next);
+			},
+			function (next) {
+				db.getSortedSetRange('plugins:active', 0, -1, next);
+			},
+			function (plugins, next) {
+				addBaseThemes(plugins, next);
+			},
+			function (plugins, next) {
+				if (!plugins.includes('nodebb-plugin-composer-default')) {
+					plugins.push('nodebb-plugin-composer-default');
+				}
+
+				if (process.argv.includes('--core')) {
+					plugins = [];
+				}
+
+				const lessUpdated_Client = plugins.map(p => 'node_modules/' + p + '/**/*.less');
+				const lessUpdated_Admin = plugins.map(p => 'node_modules/' + p + '/**/*.less');
+				const clientUpdated = plugins.map(p => 'node_modules/' + p + '/**/*.js');
+				const templatesUpdated = plugins.map(p => 'node_modules/' + p + '/**/*.tpl');
+				const langUpdated = plugins.map(p => 'node_modules/' + p + '/**/*.json');
+
+				grunt.config(['watch'], {
+					lessUpdated_Client: {
+						files: [
+							'public/less/*.less',
+							'!public/less/admin/**/*.less',
+							...lessUpdated_Client,
+							'!node_modules/nodebb-*/node_modules/**',
+							'!node_modules/nodebb-*/.git/**',
+						],
+						options: {
+							interval: 1000,
+						},
+					},
+					lessUpdated_Admin: {
+						files: [
+							'public/less/admin/**/*.less',
+							...lessUpdated_Admin,
+							'!node_modules/nodebb-*/node_modules/**',
+							'!node_modules/nodebb-*/.git/**',
+						],
+						options: {
+							interval: 1000,
+						},
+					},
+					clientUpdated: {
+						files: [
+							'public/src/**/*.js',
+							...clientUpdated,
+							'!node_modules/nodebb-*/node_modules/**',
+							'node_modules/benchpressjs/build/benchpress.js',
+							'!node_modules/nodebb-*/.git/**',
+						],
+						options: {
+							interval: 1000,
+						},
+					},
+					serverUpdated: {
+						files: ['*.js', 'install/*.js', 'src/**/*.js', '!src/upgrades/**'],
+						options: {
+							interval: 1000,
+						},
+					},
+					templatesUpdated: {
+						files: [
+							'src/views/**/*.tpl',
+							...templatesUpdated,
+							'!node_modules/nodebb-*/node_modules/**',
+							'!node_modules/nodebb-*/.git/**',
+						],
+						options: {
+							interval: 1000,
+						},
+					},
+					langUpdated: {
+						files: [
+							'public/language/en-GB/*.json',
+							'public/language/en-GB/**/*.json',
+							...langUpdated,
+							'!node_modules/nodebb-*/node_modules/**',
+							'!node_modules/nodebb-*/.git/**',
+							'!node_modules/nodebb-*/plugin.json',
+							'!node_modules/nodebb-*/package.json',
+							'!node_modules/nodebb-*/theme.json',
+						],
+						options: {
+							interval: 1000,
+						},
+					},
+				});
+				next();
+			},
+		], done);
+	});
+
+	grunt.task.run('init');
 
 	env.NODE_ENV = 'development';
 
-	worker = fork('app.js', args, { env: env });
+	if (grunt.option('skip')) {
+		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);
-};
+};
+
+function addBaseThemes(plugins, callback) {
+	const themeId = plugins.find(p => p.startsWith('nodebb-theme-'));
+	if (!themeId) {
+		return setImmediate(callback, null, plugins);
+	}
+	function getBaseRecursive(themeId) {
+		try {
+			const baseTheme = require(themeId + '/theme').baseTheme;
+
+			if (baseTheme) {
+				plugins.push(baseTheme);
+				getBaseRecursive(baseTheme);
+			}
+		} catch (err) {
+			console.log(err);
+		}
+	}
+
+	getBaseRecursive(themeId);
+	callback(null, plugins);
+}

README.md

@@ -1,26 +1,26 @@
 # <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)
-[![Dependency Status](https://david-dm.org/nodebb/nodebb.svg)](https://david-dm.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.
 
 Additional functionality is enabled through the use of third-party plugins.
 
-* [Get NodeBB](http://www.nodebb.org/ "NodeBB")
 * [Demo & Meta Discussion](http://community.nodebb.org)
 * [Documentation & Installation Instructions](http://docs.nodebb.org)
 * [Help translate NodeBB](https://www.transifex.com/projects/p/nodebb/)
 * [NodeBB Blog](http://blog.nodebb.org)
-* [Join us on IRC](https://kiwiirc.com/client/irc.freenode.net/nodebb) - #nodebb on Freenode
+* [Premium Hosting for NodeBB](http://www.nodebb.org/ "NodeBB")
 * [Follow us on Twitter](http://www.twitter.com/NodeBB/ "NodeBB Twitter")
 * [Like us on Facebook](http://www.facebook.com/NodeBB/ "NodeBB Facebook")
 
 ## Screenshots
 
+NodeBB's theming engine is highly flexible and does not restrict your design choices. Check out some themed installs in these screenshots below:
+
 [![](http://i.imgur.com/VCoOFyqb.png)](http://i.imgur.com/VCoOFyq.png)
 [![](http://i.imgur.com/FLOUuIqb.png)](http://i.imgur.com/FLOUuIq.png)
 [![](http://i.imgur.com/Ud1LrfIb.png)](http://i.imgur.com/Ud1LrfI.png)
@@ -30,6 +30,8 @@ Additional functionality is enabled through the use of third-party plugins.
 [![](http://i.imgur.com/LmHtPhob.png)](http://i.imgur.com/LmHtPho.png)
 [![](http://i.imgur.com/paiJPJkb.jpg)](http://i.imgur.com/paiJPJk.jpg)
 
+Our minimalist "Persona" theme gets you going right away, no coding experience required.
+
 [![](http://i.imgur.com/HwNEXGu.png)](http://i.imgur.com/HwNEXGu.png)
 [![](http://i.imgur.com/II1byYs.png)](http://i.imgur.com/II1byYs.png)
 
@@ -37,9 +39,8 @@ Additional functionality is enabled through the use of third-party plugins.
 
 ## How can I follow along/contribute?
 
-* Our feature roadmap is hosted on the project wiki's [Version History / Roadmap](https://github.com/NodeBB/NodeBB/wiki/Version-History-%26-Roadmap)
 * 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.
 
@@ -47,13 +48,13 @@ Additional functionality is enabled through the use of third-party plugins.
 
 NodeBB requires the following software to be installed:
 
-* A version of Node.js at least 0.10 or greater
+* A version of Node.js at least 8 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)
 
 ## Installation
 
-[Please refer to platform-specific installation documentation](http://docs.nodebb.org/en/latest/installing/os.html)
+[Please refer to platform-specific installation documentation](https://docs.nodebb.org/installing/os)
 
 ## Securing NodeBB
 
@@ -68,7 +69,7 @@ It is important to ensure that your NodeBB and database servers are secured. Bea
 
 ## Upgrading NodeBB
 
-Detailed upgrade instructions are listed in [Upgrading NodeBB](https://docs.nodebb.org/en/latest/upgrading/index.html)
+Detailed upgrade instructions are listed in [Upgrading NodeBB](https://docs.nodebb.org/configuring/upgrade/)
 
 ## License
 

app.js

@@ -1,7 +1,7 @@
 /*
 	NodeBB - A better forum platform for the modern web
 	https://github.com/NodeBB/NodeBB/
-	Copyright (C) 2013-2016  NodeBB Inc.
+	Copyright (C) 2013-2017  NodeBB Inc.
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -17,44 +17,32 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-"use strict";
-/*global require, global, process*/
+'use strict';
 
-var nconf = require('nconf');
-nconf.argv().env('__');
+require('./require-main');
 
-var url = require('url'),
-	async = require('async'),
-	winston = require('winston'),
-	colors = require('colors'),
-	path = require('path'),
-	pkg = require('./package.json'),
-	file = require('./src/file');
+const nconf = require('nconf');
+nconf.argv().env({
+	separator: '__',
+});
+
+const winston = require('winston');
+const path = require('path');
+
+const file = require('./src/file');
 
 global.env = process.env.NODE_ENV || 'production';
 
-winston.remove(winston.transports.Console);
-winston.add(winston.transports.Console, {
-	colorize: true,
-	timestamp: function() {
-		var date = new Date();
-		return date.getDate() + '/' + (date.getMonth() + 1) + ' ' + date.toTimeString().substr(0,5) + ' [' + global.process.pid + ']';
-	},
-	level: nconf.get('log-level') || (global.env === 'production' ? 'info' : 'verbose')
-});
-
-
 // Alternate configuration file support
-var	configFile = path.join(__dirname, '/config.json');
+const	configFile = path.resolve(__dirname, nconf.any(['config', 'CONFIG']) || 'config.json');
 
-if (nconf.get('config')) {
-	configFile = path.resolve(__dirname, nconf.get('config'));
-}
+const configExists = file.existsSync(configFile) || (nconf.get('url') && nconf.get('secret') && nconf.get('database'));
 
-var configExists = file.existsSync(configFile) || (nconf.get('url') && nconf.get('secret') && nconf.get('database'));
-
-loadConfig();
-versionCheck();
+const prestart = require('./src/prestart');
+prestart.loadConfig(configFile);
+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
@@ -64,302 +52,28 @@ if (!process.send) {
 	winston.info('');
 }
 
-
 if (nconf.get('setup') || nconf.get('install')) {
-	setup();
+	require('./src/cli/setup').setup();
 } else if (!configExists) {
 	require('./install/web').install(nconf.get('port'));
 } else if (nconf.get('upgrade')) {
-	upgrade();
+	require('./src/cli/upgrade').upgrade(true);
 } else if (nconf.get('reset')) {
-	require('./src/reset').reset();
+	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'),
+	});
 } else if (nconf.get('activate')) {
-	activate();
+	require('./src/cli/manage').activate(nconf.get('activate'));
 } else if (nconf.get('plugins')) {
-	listPlugins();
+	require('./src/cli/manage').listPlugins();
+} else if (nconf.get('build')) {
+	require('./src/cli/manage').build(nconf.get('build'));
+} else if (nconf.get('events')) {
+	require('./src/cli/manage').listEvents();
 } else {
-	start();
+	require('./src/start').start();
 }
-
-function loadConfig() {
-	winston.verbose('* using configuration stored in: %s', configFile);
-
-	nconf.file({
-		file: configFile
-	});
-
-	nconf.defaults({
-		base_dir: __dirname,
-		themes_path: path.join(__dirname, 'node_modules'),
-		views_dir: path.join(__dirname, 'public/templates'),
-		version: pkg.version
-	});
-
-	if (!nconf.get('isCluster')) {
-		nconf.set('isPrimary', 'true');
-		nconf.set('isCluster', 'false');
-	}
-
-	// Ensure themes_path is a full filepath
-	nconf.set('themes_path', path.resolve(__dirname, nconf.get('themes_path')));
-	nconf.set('core_templates_path', path.join(__dirname, 'src/views'));
-	nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-persona/templates'));
-
-	if (nconf.get('url')) {
-		nconf.set('url_parsed', url.parse(nconf.get('url')));
-	}
-}
-
-
-function start() {
-	var db = require('./src/database');
-
-	// nconf defaults, if not set in config
-	if (!nconf.get('upload_path')) {
-		nconf.set('upload_path', '/public/uploads');
-	}
-	if (!nconf.get('sessionKey')) {
-		nconf.set('sessionKey', 'express.sid');
-	}
-	// Parse out the relative_url and other goodies from the configured URL
-	var urlObject = url.parse(nconf.get('url'));
-	var relativePath = urlObject.pathname !== '/' ? urlObject.pathname : '';
-	nconf.set('base_url', urlObject.protocol + '//' + urlObject.host);
-	nconf.set('secure', urlObject.protocol === 'https:');
-	nconf.set('use_port', !!urlObject.port);
-	nconf.set('relative_path', relativePath);
-	nconf.set('port', urlObject.port || nconf.get('port') || nconf.get('PORT') || (nconf.get('PORT_ENV_VAR') ? nconf.get(nconf.get('PORT_ENV_VAR')) : false) || 4567);
-	nconf.set('upload_url', nconf.get('upload_path').replace(/^\/public/, ''));
-
-	if (nconf.get('isPrimary') === 'true') {
-		winston.info('Time: %s', (new Date()).toString());
-		winston.info('Initializing NodeBB v%s', nconf.get('version'));
-
-
-		var host = nconf.get(nconf.get('database') + ':host'),
-			storeLocation = host ? 'at ' + host + (host.indexOf('/') === -1 ? ':' + nconf.get(nconf.get('database') + ':port') : '') : '';
-
-		winston.verbose('* using %s store %s', nconf.get('database'), storeLocation);
-		winston.verbose('* using themes stored in: %s', nconf.get('themes_path'));
-	}
-
-	process.on('SIGTERM', shutdown);
-	process.on('SIGINT', shutdown);
-	process.on('SIGHUP', restart);
-	process.on('message', function(message) {
-		if (typeof message !== 'object') {
-			return;
-		}
-		var meta = require('./src/meta');
-		var emitter = require('./src/emitter');
-		switch (message.action) {
-			case 'reload':
-				meta.reload();
-			break;
-			case 'js-propagate':
-				meta.js.target = message.data;
-				emitter.emit('meta:js.compiled');
-				winston.verbose('[cluster] Client-side javascript and mapping propagated to worker %s', process.pid);
-			break;
-			case 'css-propagate':
-				meta.css.cache = message.cache;
-				meta.css.acpCache = message.acpCache;
-				emitter.emit('meta:css.compiled');
-				winston.verbose('[cluster] Stylesheets propagated to worker %s', process.pid);
-			break;
-			case 'templates:compiled':
-				emitter.emit('templates:compiled');
-			break;
-		}
-	});
-
-	process.on('uncaughtException', function(err) {
-		winston.error(err.stack);
-		console.log(err.stack);
-
-		require('./src/meta').js.killMinifier();
-		shutdown(1);
-	});
-
-	async.waterfall([
-		async.apply(db.init),
-		async.apply(db.checkCompatibility),
-		function(next) {
-			require('./src/meta').configs.init(next);
-		},
-		function(next) {
-			if (nconf.get('dep-check') === undefined || nconf.get('dep-check') !== false) {
-				require('./src/meta').dependencies.check(next);
-			} else {
-				winston.warn('[init] Dependency checking skipped!');
-				setImmediate(next);
-			}
-		},
-		function(next) {
-			require('./src/upgrade').check(next);
-		},
-		function(next) {
-			var webserver = require('./src/webserver');
-			require('./src/socket.io').init(webserver.server);
-
-			if (nconf.get('isPrimary') === 'true' && !nconf.get('jobsDisabled')) {
-				require('./src/notifications').init();
-				require('./src/user').startJobs();
-			}
-
-			webserver.listen();
-		}
-	], function(err) {
-		if (err) {
-			switch(err.message) {
-				case 'schema-out-of-date':
-					winston.warn('Your NodeBB schema is out-of-date. Please run the following command to bring your dataset up to spec:');
-					winston.warn('    ./nodebb upgrade');
-					break;
-				case 'dependencies-out-of-date':
-					winston.warn('One or more of NodeBB\'s dependent packages are out-of-date. Please run the following command to update them:');
-					winston.warn('    ./nodebb upgrade');
-					break;
-				case 'dependencies-missing':
-					winston.warn('One or more of NodeBB\'s dependent packages are missing. Please run the following command to update them:');
-					winston.warn('    ./nodebb upgrade');
-					break;
-				default:
-					if (err.stacktrace !== false) {
-						winston.error(err.stack);
-					} else {
-						winston.error(err.message);
-					}
-					break;
-			}
-
-			// Either way, bad stuff happened. Abort start.
-			process.exit();
-		}
-	});
-}
-
-function setup() {
-	winston.info('NodeBB Setup Triggered via Command Line');
-
-	var install = require('./src/install');
-
-	process.stdout.write('\nWelcome to NodeBB!\n');
-	process.stdout.write('\nThis looks like a new installation, so you\'ll have to answer a few questions about your environment before we can proceed.\n');
-	process.stdout.write('Press enter to accept the default setting (shown in brackets).\n');
-
-	install.setup(function (err, data) {
-		var separator = '     ';
-		if (process.stdout.columns > 10) {
-			for(var x=0,cols=process.stdout.columns-10;x<cols;x++) {
-				separator += '=';
-			}
-		}
-		process.stdout.write('\n' + separator + '\n\n');
-
-		if (err) {
-			winston.error('There was a problem completing NodeBB setup: ', err.message);
-		} else {
-			if (data.hasOwnProperty('password')) {
-				process.stdout.write('An administrative user was automatically created for you:\n');
-				process.stdout.write('    Username: ' + data.username + '\n');
-				process.stdout.write('    Password: ' + data.password + '\n');
-				process.stdout.write('\n');
-			}
-			process.stdout.write('NodeBB Setup Completed. Run \'./nodebb start\' to manually start your NodeBB server.\n');
-
-			// If I am a child process, notify the parent of the returned data before exiting (useful for notifying
-			// hosts of auto-generated username/password during headless setups)
-			if (process.send) {
-				process.send(data);
-			}
-		}
-
-		process.exit();
-	});
-}
-
-function upgrade() {
-	require('./src/database').init(function(err) {
-		if (err) {
-			winston.error(err.stack);
-			process.exit();
-		}
-		require('./src/meta').configs.init(function () {
-			require('./src/upgrade').upgrade();
-		});
-	});
-}
-
-function activate() {
-	require('./src/database').init(function(err) {
-		if (err) {
-			winston.error(err.stack);
-			process.exit(1);
-		}
-
-		var plugin = nconf.get('_')[1] ? nconf.get('_')[1] : nconf.get('activate'),
-			db = require('./src/database');
-
-		winston.info('Activating plugin %s', plugin);
-
-		db.sortedSetAdd('plugins:active', 0, plugin, start);
-	});
-}
-
-function listPlugins() {
-	require('./src/database').init(function(err) {
-		if (err) {
-			winston.error(err.stack);
-			process.exit(1);
-		}
-
-		var db = require('./src/database');
-
-		db.getSortedSetRange('plugins:active', 0, -1, function(err, plugins) {
-			if (err) {
-				winston.error(err.stack);
-				process.exit(1);
-			}
-
-			winston.info('Active plugins: \n\t - ' + plugins.join('\n\t - '));
-			process.exit();
-		});
-	});
-}
-
-
-function shutdown(code) {
-	winston.info('[app] Shutdown (SIGTERM/SIGINT) Initialised.');
-	require('./src/database').close();
-	winston.info('[app] Database connection closed.');
-	require('./src/webserver').server.close();
-	winston.info('[app] Web server closed to connections.');
-
-	winston.info('[app] Shutdown complete.');
-	process.exit(code || 0);
-}
-
-function restart() {
-	if (process.send) {
-		winston.info('[app] Restarting...');
-		process.send({
-			action: 'restart'
-		});
-	} else {
-		winston.error('[app] Could not restart server. Shutting down.');
-		shutdown(1);
-	}
-}
-
-function versionCheck() {
-	var version = process.version.slice(1);
-	var range = pkg.engines.node;
-	var semver = require('semver');
-	var compatible = semver.satisfies(version, range);
-
-	if (!compatible) {
-		winston.warn('Your version of Node.js is too outdated for NodeBB. Please update your version of Node.js.');
-		winston.warn('Recommended ' + range.green + ', '.reset + version.yellow + ' provided\n'.reset);
-	}
-}

bcrypt.js

@@ -1,34 +0,0 @@
-
-'use strict';
-
-var bcrypt = require('bcryptjs'),
-	async = require('async');
-
-
-process.on('message', function(msg) {
-	if (msg.type === 'hash') {
-		hashPassword(msg.password, msg.rounds);
-	} else if (msg.type === 'compare') {
-		bcrypt.compare(msg.password, msg.hash, done);
-	}
-});
-
-function hashPassword(password, rounds) {
-	async.waterfall([
-		function(next) {
-			bcrypt.genSalt(parseInt(rounds, 10), next);
-		},
-		function(salt, next) {
-			bcrypt.hash(password, salt, next);
-		}
-	], done);
-}
-
-function done(err, result) {
-	if (err) {
-		process.send({err: err.message});
-		return process.disconnect();
-	}
-	process.send({result: result});
-	process.disconnect();
-}

build/.gitignore

@@ -0,0 +1,4 @@
+*
+*/
+!export
+!.gitignore

build/export/.gitignore

@@ -0,0 +1,3 @@
+.
+!.gitignore
+!README

build/export/README

@@ -0,0 +1,5 @@
+This directory contains archives of user uploads that are prepared on-demand
+when a user wants to retrieve a copy of their uploaded content.
+
+You can delete the files in here at will. They will just be regenerated if
+requested again.

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,39 +1,132 @@
 {
     "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,
+    "privateUploads": 0,
+    "allowedFileExtensions": "png,jpg,bmp",
     "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": 128,
+    "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,
+    "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,
+    "notificationType_upvote": "notification",
+    "notificationType_new-topic": "notification",
+    "notificationType_new-reply": "notification",
+    "notificationType_follow": "notification",
+    "notificationType_new-chat": "notification",
+    "notificationType_group-invite": "notification",
+    "notificationType_mention": "notification",
+    "notificationType_new-register": "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,
+    "allowGuestHandles": 0,
+    "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/footer.json

@@ -2,7 +2,7 @@
 	{
 		"widget": "html",
 		"data" : {
-			"html": "<footer id=\"footer\" class=\"container footer\">\r\n\t<div class=\"copyright\">\r\n\t\tCopyright © 2016 <a target=\"_blank\" href=\"https://nodebb.org\">NodeBB Forums</a> | <a target=\"_blank\" href=\"//github.com/NodeBB/NodeBB/graphs/contributors\">Contributors</a>\r\n\t</div>\r\n</footer>",
+			"html": "<footer id=\"footer\" class=\"container footer\">\r\n\t<div>\r\n\t\tPowered by <a target=\"_blank\" href=\"https://nodebb.org\">NodeBB</a> | <a target=\"_blank\" href=\"//github.com/NodeBB/NodeBB/graphs/contributors\">Contributors</a>\r\n\t</div>\r\n</footer>",
 			"title":"",
 			"container":""
 		}

install/data/navigation.json

@@ -1,85 +1,72 @@
 [
 	{
 		"route": "/categories",
-		"title": "\\[\\[global:header.categories\\]\\]",
+		"title": "[[global:header.categories]]",
 		"enabled": true,
 		"iconClass": "fa-list",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.categories\\]\\]"
+		"text": "[[global:header.categories]]"
 	},
 	{
 		"id": "unread-count",
 		"route": "/unread",
-		"title": "\\[\\[global:header.unread\\]\\]",
+		"title": "[[global:header.unread]]",
 		"enabled": true,
 		"iconClass": "fa-inbox",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.unread\\]\\]",
-		"properties": {
-			"loggedIn": true
-		}
+		"text": "[[global:header.unread]]",
+		"groups": ["registered-users"]
 	},
 	{
 		"route": "/recent",
-		"title": "\\[\\[global:header.recent\\]\\]",
+		"title": "[[global:header.recent]]",
 		"enabled": true,
 		"iconClass": "fa-clock-o",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.recent\\]\\]"
+		"text": "[[global:header.recent]]"
 	},
 	{
 		"route": "/tags",
-		"title": "\\[\\[global:header.tags\\]\\]",
+		"title": "[[global:header.tags]]",
 		"enabled": true,
 		"iconClass": "fa-tags",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.tags\\]\\]"
+		"text": "[[global:header.tags]]"
 	},
 	{
 		"route": "/popular",
-		"title": "\\[\\[global:header.popular\\]\\]",
+		"title": "[[global:header.popular]]",
 		"enabled": true,
 		"iconClass": "fa-fire",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.popular\\]\\]"
+		"text": "[[global:header.popular]]"
 	},
 	{
 		"route": "/users",
-		"title": "\\[\\[global:header.users\\]\\]",
+		"title": "[[global:header.users]]",
 		"enabled": true,
 		"iconClass": "fa-user",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.users\\]\\]"
+		"text": "[[global:header.users]]"
 	},
 	{
 		"route": "/groups",
-		"title": "\\[\\[global:header.groups\\]\\]",
+		"title": "[[global:header.groups]]",
 		"enabled": true,
 		"iconClass": "fa-group",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.groups\\]\\]"
+		"text": "[[global:header.groups]]"
 	},
 	{
 		"route": "/admin",
-		"title": "\\[\\[global:header.admin\\]\\]",
+		"title": "[[global:header.admin]]",
 		"enabled": true,
 		"iconClass": "fa-cogs",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.admin\\]\\]",
+		"text": "[[global:header.admin]]",
+		"groups": ["administrators"],
 		"properties": {
-			"targetBlank": false,
-			"adminOnly": true
-		}
-	},
-	{
-		"route": "/search",
-		"title": "\\[\\[global:header.search\\]\\]",
-		"enabled": true,
-		"iconClass": "fa-search",
-		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.search\\]\\]",
-		"properties": {
-			"searchInstalled": true
+			"targetBlank": false
 		}
 	}
 ]

install/databases.js

@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 
 var async = require('async');
 var prompt = require('prompt');
@@ -6,19 +6,19 @@ var winston = require('winston');
 
 var questions = {
 	redis: require('../src/database/redis').questions,
-	mongo: require('../src/database/mongo').questions
+	mongo: require('../src/database/mongo').questions,
+	postgres: require('../src/database/postgres').questions,
 };
 
-module.exports = function(config, callback) {
+module.exports = function (config, callback) {
 	async.waterfall([
 		function (next) {
-			process.stdout.write('\n');
-			winston.info('Now configuring ' + config.database + ' database:');
+			winston.info('\nNow configuring ' + config.database + ' database:');
 			getDatabaseConfig(config, next);
 		},
 		function (databaseConfig, next) {
 			saveDatabaseConfig(config, databaseConfig, next);
-		}
+		},
 	], callback);
 };
 
@@ -34,11 +34,17 @@ function getDatabaseConfig(config, callback) {
 			prompt.get(questions.redis, callback);
 		}
 	} else if (config.database === 'mongo') {
-		if (config['mongo:host'] && config['mongo:port']) {
+		if ((config['mongo:host'] && config['mongo:port']) || config['mongo:uri']) {
 			callback(null, config);
 		} else {
 			prompt.get(questions.mongo, callback);
 		}
+	} else if (config.database === 'postgres') {
+		if (config['postgres:host'] && config['postgres:port']) {
+			callback(null, config);
+		} else {
+			prompt.get(questions.postgres, callback);
+		}
 	} else {
 		return callback(new Error('unknown database : ' + config.database));
 	}
@@ -55,7 +61,7 @@ function saveDatabaseConfig(config, databaseConfig, callback) {
 			host: databaseConfig['redis:host'],
 			port: databaseConfig['redis:port'],
 			password: databaseConfig['redis:password'],
-			database: databaseConfig['redis:database']
+			database: databaseConfig['redis:database'],
 		};
 
 		if (config.redis.host.slice(0, 1) === '/') {
@@ -67,16 +73,26 @@ function saveDatabaseConfig(config, databaseConfig, callback) {
 			port: databaseConfig['mongo:port'],
 			username: databaseConfig['mongo:username'],
 			password: databaseConfig['mongo:password'],
-			database: databaseConfig['mongo:database']
+			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));
 	}
 
-	var allQuestions = questions.redis.concat(questions.mongo);
-	for (var x=0; x<allQuestions.length; x++) {
+	var 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);
-}
+}

install/package.json

@@ -0,0 +1,173 @@
+{
+    "name": "nodebb",
+    "license": "GPL-3.0",
+    "description": "NodeBB Forum",
+    "version": "1.13.0",
+    "homepage": "http://www.nodebb.org",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/NodeBB/NodeBB/"
+    },
+    "main": "app.js",
+    "scripts": {
+        "start": "node loader.js",
+        "lint": "eslint --cache ./nodebb .",
+        "pretest": "npm run lint",
+        "test": "nyc --reporter=html --reporter=text-summary mocha",
+        "coveralls": "nyc report --reporter=text-lcov | coveralls && rm -r coverage"
+    },
+    "husky": {
+        "hooks": {
+            "pre-commit": "lint-staged",
+            "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
+        }
+    },
+    "lint-staged": {
+        "*.js": [
+            "eslint --fix",
+            "git add"
+        ]
+    },
+    "dependencies": {
+        "ace-builds": "^1.2.9",
+        "archiver": "^3.0.0",
+        "async": "^3.0.1",
+        "autoprefixer": "^9.4.6",
+        "bcryptjs": "2.4.3",
+        "benchpressjs": "^2.0.0",
+        "body-parser": "^1.18.2",
+        "bootstrap": "^3.4.0",
+        "bootswatch": "git://github.com/thomaspark/bootswatch.git#c41a8f066feb8950c6f9c6bcf5a3c37d1085404e",
+        "chart.js": "^2.7.1",
+        "cli-graph": "^3.2.2",
+        "clipboard": "^2.0.1",
+        "colors": "^1.1.2",
+        "commander": "^3.0.0",
+        "compression": "^1.7.1",
+        "connect-ensure-login": "^0.1.1",
+        "connect-flash": "^0.1.1",
+        "connect-mongo": "3.2.0",
+        "connect-multiparty": "^2.1.0",
+        "connect-pg-simple": "^6.0.0",
+        "connect-redis": "4.0.3",
+        "cookie-parser": "^1.4.3",
+        "cron": "^1.3.0",
+        "cropperjs": "^1.2.2",
+        "csurf": "^1.9.0",
+        "daemon": "^1.1.0",
+        "diff": "^4.0.1",
+        "express": "^4.16.2",
+        "express-session": "^1.15.6",
+        "express-useragent": "^1.0.12",
+        "graceful-fs": "^4.1.11",
+        "helmet": "^3.11.0",
+        "html-to-text": "^5.0.0",
+        "ipaddr.js": "^1.5.4",
+        "jquery": "^3.2.1",
+        "jsesc": "2.5.2",
+        "json-2-csv": "^3.0.0",
+        "jsonwebtoken": "^8.4.0",
+        "less": "^3.10.3",
+        "lodash": "^4.17.15",
+        "logrotate-stream": "^0.2.5",
+        "lru-cache": "5.1.1",
+        "material-design-lite": "^1.3.0",
+        "mime": "^2.2.0",
+        "mkdirp": "^0.5.1",
+        "mongodb": "3.4.0",
+        "morgan": "^1.9.1",
+        "mousetrap": "^1.6.1",
+        "mubsub-nbb": "^1.5.1",
+        "nconf": "^0.10.0",
+        "nodebb-plugin-composer-default": "6.3.20",
+        "nodebb-plugin-dbsearch": "4.0.7",
+        "nodebb-plugin-emoji": "^3.0.0",
+        "nodebb-plugin-emoji-android": "2.0.0",
+        "nodebb-plugin-markdown": "8.11.0",
+        "nodebb-plugin-mentions": "2.7.3",
+        "nodebb-plugin-soundpack-default": "1.0.0",
+        "nodebb-plugin-spam-be-gone": "0.6.7",
+        "nodebb-rewards-essentials": "0.1.2",
+        "nodebb-theme-lavender": "5.0.11",
+        "nodebb-theme-persona": "10.1.30",
+        "nodebb-theme-slick": "1.2.28",
+        "nodebb-theme-vanilla": "11.1.12",
+        "nodebb-widget-essentials": "4.0.17",
+        "nodemailer": "^6.0.0",
+        "passport": "^0.4.0",
+        "passport-local": "1.0.0",
+        "pg": "^7.4.0",
+        "pg-cursor": "^2.0.0",
+        "postcss": "7.0.21",
+        "postcss-clean": "1.1.0",
+        "promise-polyfill": "^8.0.0",
+        "prompt": "^1.0.0",
+        "redis": "2.8.0",
+        "request": "2.88.0",
+        "rimraf": "3.0.0",
+        "rss": "^1.2.2",
+        "sanitize-html": "^1.16.3",
+        "semver": "^7.0.0",
+        "serve-favicon": "^2.4.5",
+        "sharp": "0.23.4",
+        "sitemap": "^5.0.0",
+        "socket.io": "2.3.0",
+        "socket.io-adapter-cluster": "^1.0.1",
+        "socket.io-adapter-mongo": "^2.0.4",
+        "socket.io-adapter-postgres": "^1.2.1",
+        "socket.io-client": "2.3.0",
+        "socket.io-redis": "5.2.0",
+        "socketio-wildcard": "2.0.0",
+        "spdx-license-list": "^6.0.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": "12.1.0",
+        "winston": "3.2.1",
+        "xml": "^1.0.1",
+        "xregexp": "^4.1.1",
+        "zxcvbn": "^4.4.2"
+    },
+    "devDependencies": {
+        "@commitlint/cli": "8.2.0",
+        "@commitlint/config-angular": "8.2.0",
+        "coveralls": "3.0.9",
+        "eslint": "6.7.0",
+        "eslint-config-airbnb-base": "14.0.0",
+        "eslint-plugin-import": "2.18.2",
+        "grunt": "1.0.4",
+        "grunt-contrib-watch": "1.1.0",
+        "husky": "3.1.0",
+        "jsdom": "15.2.1",
+        "lint-staged": "9.4.2",
+        "mocha": "6.2.2",
+        "mocha-lcov-reporter": "1.3.0",
+        "nyc": "14.1.1",
+        "smtp-server": "3.5.0"
+    },
+    "bugs": {
+        "url": "https://github.com/NodeBB/NodeBB/issues"
+    },
+    "engines": {
+        "node": ">=8"
+    },
+    "maintainers": [
+        {
+            "name": "Andrew Rodrigues",
+            "email": "andrew@nodebb.org",
+            "url": "https://github.com/psychobunny"
+        },
+        {
+            "name": "Julian Lam",
+            "email": "julian@nodebb.org",
+            "url": "https://github.com/julianlam"
+        },
+        {
+            "name": "Barış Soner Uşaklı",
+            "email": "baris@nodebb.org",
+            "url": "https://github.com/barisusakli"
+        }
+    ]
+}

install/web.js

@@ -1,48 +1,88 @@
-"use strict";
+'use strict';
 
 var winston = require('winston');
 var express = require('express');
 var bodyParser = require('body-parser');
 var fs = require('fs');
 var path = require('path');
+var childProcess = require('child_process');
 var less = require('less');
 var async = require('async');
-var uglify = require('uglify-js');
+var uglify = require('uglify-es');
 var nconf = require('nconf');
+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 + ']';
-	},
-	level: 'verbose'
+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'
+	'public/src/installer/install.js',
+	'node_modules/zxcvbn/dist/zxcvbn.js',
 ];
 
-web.install = function(port) {
+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', require('templates.js').__express);
+	app.engine('tpl', function (filepath, options, callback) {
+		async.waterfall([
+			function (next) {
+				fs.readFile(filepath, 'utf-8', next);
+			},
+			function (buffer, next) {
+				Benchpress.compileParse(buffer.toString(), options, next);
+			},
+		], callback);
+	});
 	app.set('view engine', 'tpl');
 	app.set('views', path.join(__dirname, '../src/views'));
 	app.use(bodyParser.urlencoded({
-		extended: true
+		extended: true,
 	}));
 
-	async.parallel([compileLess, compileJS], function() {
+	async.parallel([compileLess, compileJS, copyCSS, loadDefaults], function (err) {
+		if (err) {
+			winston.error(err);
+		}
 		setupRoutes();
 		launchExpress(port);
 	});
@@ -50,7 +90,7 @@ web.install = function(port) {
 
 
 function launchExpress(port) {
-	server = app.listen(port, function() {
+	server = app.listen(port, function () {
 		winston.info('Web installer listening on http://%s:%s', '0.0.0.0', port);
 	});
 }
@@ -59,46 +99,82 @@ function setupRoutes() {
 	app.get('/', welcome);
 	app.post('/', install);
 	app.post('/launch', launch);
+	app.get('/ping', ping);
+	app.get('/sping', ping);
+}
+
+function ping(req, res) {
+	res.status(200).send(req.path === '/sping' ? 'healthy' : '200');
 }
 
 function welcome(req, res) {
-	var dbs = ['redis', 'mongo'];
-	var databases = dbs.map(function(el) {
+	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;
+		});
+
 		return {
-			name: el,
-			questions: require('../src/database/' + el).questions
+			name: databaseName,
+			questions: questions,
 		};
 	});
 
 	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 ? true : false,
-		success: res.locals.success ? true : false,
+		error: error,
+		success: success,
 		values: req.body,
-		minimumPasswordLength: defaults.minimumPasswordLength
+		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)) {
-			process.env[i.replace(':', '__')] = req.body[i];
+			setupEnvVars[i.replace(':', '__')] = req.body[i];
 		}
 	}
 
+	// Flatten any objects in setupEnvVars
+	const pushToRoot = function (parentKey, key) {
+		setupEnvVars[parentKey + '__' + key] = setupEnvVars[parentKey][key];
+	};
+	for (var j in setupEnvVars) {
+		if (setupEnvVars.hasOwnProperty(j) && typeof setupEnvVars[j] === 'object' && setupEnvVars[j] !== null && !Array.isArray(setupEnvVars[j])) {
+			Object.keys(setupEnvVars[j]).forEach(pushToRoot.bind(null, j));
+			delete setupEnvVars[j];
+		} else if (Array.isArray(setupEnvVars[j])) {
+			setupEnvVars[j] = JSON.stringify(setupEnvVars[j]);
+		}
+	}
+
+	winston.info('Starting setup process');
+	winston.info(setupEnvVars);
+	launchUrl = setupEnvVars.url;
+
 	var child = require('child_process').fork('app', ['--setup'], {
-		env: process.env
+		env: setupEnvVars,
 	});
 
-	child.on('close', function(data) {
-		if (data === 0) {
-			res.locals.success = true;
-		} else {
-			res.locals.error = true;
-		}
+	child.on('close', function (data) {
+		installing = false;
+		success = data === 0;
+		error = data !== 0;
 
 		welcome(req, res);
 	});
@@ -107,56 +183,114 @@ function install(req, res) {
 function launch(req, res) {
 	res.json({});
 	server.close();
+	req.setTimeout(0);
+	var child;
 
-	var child = require('child_process').spawn('node', ['loader.js'], {
-		detached: true,
-		stdio: ['ignore', 'ignore', 'ignore']
+	if (!nconf.get('launchCmd')) {
+		child = childProcess.spawn('node', ['loader.js'], {
+			detached: true,
+			stdio: ['ignore', 'ignore', 'ignore'],
+		});
+
+		console.log('\nStarting NodeBB');
+		console.log('    "./nodebb stop" to stop the NodeBB server');
+		console.log('    "./nodebb log" to view server output');
+		console.log('    "./nodebb restart" to restart NodeBB');
+	} else {
+		// Use launchCmd instead, if specified
+		child = childProcess.exec(nconf.get('launchCmd'), {
+			detached: true,
+			stdio: ['ignore', 'ignore', 'ignore'],
+		});
+	}
+
+	var filesToDelete = [
+		'installer.css',
+		'installer.min.js',
+		'bootstrap.min.css',
+	];
+
+	async.each(filesToDelete, function (filename, next) {
+		fs.unlink(path.join(__dirname, '../public', filename), next);
+	}, function (err) {
+		if (err) {
+			winston.warn('Unable to remove installer files');
+		}
+
+		child.unref();
+		process.exit(0);
 	});
-
-	process.stdout.write('\nStarting NodeBB\n');
-	process.stdout.write('    "./nodebb stop" to stop the NodeBB server\n');
-	process.stdout.write('    "./nodebb log" to view server output\n');
-	process.stdout.write('    "./nodebb restart" to restart NodeBB\n');
-
-	child.unref();
-	process.exit(0);
-
 }
 
 function compileLess(callback) {
-	if ((nconf.get('from-file') || '').indexOf('less') !== -1) {
-		winston.info('LESS compilation skipped');
-		return callback(false);
-	}
-
-	fs.readFile(path.join(__dirname, '../public/less/install.less'), function(err, style) {
+	fs.readFile(path.join(__dirname, '../public/less/install.less'), function (err, style) {
 		if (err) {
 			return winston.error('Unable to read LESS install file: ', err);
 		}
 
-		less.render(style.toString(), function(err, css) {
-			if(err) {
+		less.render(style.toString(), function (err, css) {
+			if (err) {
 				return winston.error('Unable to compile LESS: ', err);
 			}
 
-			fs.writeFile(path.join(__dirname, '../public/stylesheet.css'), css.css, callback);
+			fs.writeFile(path.join(__dirname, '../public/installer.css'), css.css, callback);
 		});
 	});
 }
 
 function compileJS(callback) {
-	if ((nconf.get('from-file') || '').indexOf('js') !== -1) {
-		winston.info('Client-side JS compilation skipped');
-		return callback(false);
-	}
+	var code = '';
+	async.eachSeries(scripts, function (srcPath, next) {
+		fs.readFile(path.join(__dirname, '..', srcPath), function (err, buffer) {
+			if (err) {
+				return next(err);
+			}
 
-	var scriptPath = path.join(__dirname, '..');
-	var result = uglify.minify(scripts.map(function(script) {
-		return path.join(scriptPath, script);
-	}));
-
-
-	fs.writeFile(path.join(__dirname, '../public/nodebb.min.js'), result.code, callback);
+			code += buffer.toString();
+			next();
+		});
+	}, function (err) {
+		if (err) {
+			return callback(err);
+		}
+		try {
+			var minified = uglify.minify(code, {
+				compress: false,
+			});
+			if (!minified.code) {
+				return callback(new Error('[[error:failed-to-minify]]'));
+			}
+			fs.writeFile(path.join(__dirname, '../public/installer.min.js'), minified.code, callback);
+		} catch (e) {
+			callback(e);
+		}
+	});
 }
 
-module.exports = web;
+function copyCSS(next) {
+	async.waterfall([
+		function (next) {
+			fs.readFile(path.join(__dirname, '../node_modules/bootstrap/dist/css/bootstrap.min.css'), 'utf8', next);
+		},
+		function (src, next) {
+			fs.writeFile(path.join(__dirname, '../public/bootstrap.min.css'), src, next);
+		},
+	], next);
+}
+
+function loadDefaults(next) {
+	var setupDefaultsPath = path.join(__dirname, '../setup.json');
+	fs.access(setupDefaultsPath, fs.constants.F_OK | fs.constants.R_OK, function (err) {
+		if (err) {
+			// setup.json not found or inaccessible, proceed with no defaults
+			return setImmediate(next);
+		}
+
+		winston.info('[installer] Found setup.json, populating default values');
+		nconf.file({
+			file: setupDefaultsPath,
+		});
+
+		next();
+	});
+}

loader.js

@@ -1,53 +1,55 @@
 'use strict';
 
-var	nconf = require('nconf'),
-	fs = require('fs'),
-	url = require('url'),
-	path = require('path'),
-	fork = require('child_process').fork,
+var	nconf = require('nconf');
+var fs = require('fs');
+var url = require('url');
+var path = require('path');
+var fork = require('child_process').fork;
+var async = require('async');
+var logrotate = require('logrotate-stream');
+var mkdirp = require('mkdirp');
 
-	async = require('async'),
-	logrotate = require('logrotate-stream'),
-	file = require('./src/file'),
-	pkg = require('./package.json');
+var file = require('./src/file');
+var pkg = require('./package.json');
+
+var pathToConfig = path.resolve(__dirname, process.env.CONFIG || 'config.json');
 
 nconf.argv().env().file({
-	file: path.join(__dirname, '/config.json')
+	file: pathToConfig,
 });
 
-var	pidFilePath = __dirname + '/pidfile',
-	output = logrotate({ file: __dirname + '/logs/output.log', size: '1m', keep: 3, compress: true }),
-	silent = nconf.get('silent') === 'false' ? false : nconf.get('silent') !== false,
-	numProcs,
-	workers = [],
+var	pidFilePath = path.join(__dirname, 'pidfile');
 
-	Loader = {
-		timesStarted: 0,
-		js: {
-			target: {}
-		},
-		css: {
-			cache: undefined,
-			acpCache: undefined
-		},
-		templatesCompiled: false
-	};
+var outputLogFilePath = path.join(__dirname, nconf.get('logFile') || 'logs/output.log');
 
-Loader.init = function(callback) {
+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;
+var workers = [];
+var Loader = {
+	timesStarted: 0,
+};
+var appPath = path.join(__dirname, 'app.js');
+
+Loader.init = function (callback) {
 	if (silent) {
-		console.log = function() {
+		console.log = function () {
 			var args = Array.prototype.slice.call(arguments);
 			output.write(args.join(' ') + '\n');
 		};
 	}
 
 	process.on('SIGHUP', Loader.restart);
-	process.on('SIGUSR2', Loader.reload);
 	process.on('SIGTERM', Loader.stop);
 	callback();
 };
 
-Loader.displayStartupMessages = function(callback) {
+Loader.displayStartupMessages = function (callback) {
 	console.log('');
 	console.log('NodeBB v' + pkg.version + ' Copyright (C) 2013-2014 NodeBB Inc.');
 	console.log('This program comes with ABSOLUTELY NO WARRANTY.');
@@ -57,25 +59,24 @@ Loader.displayStartupMessages = function(callback) {
 	callback();
 };
 
-Loader.addWorkerEvents = function(worker) {
-
-	worker.on('exit', function(code, signal) {
+Loader.addWorkerEvents = function (worker) {
+	worker.on('exit', function (code, signal) {
 		if (code !== 0) {
-			if (Loader.timesStarted < numProcs*3) {
-				Loader.timesStarted++;
+			if (Loader.timesStarted < numProcs * 3) {
+				Loader.timesStarted += 1;
 				if (Loader.crashTimer) {
 					clearTimeout(Loader.crashTimer);
 				}
-				Loader.crashTimer = setTimeout(function() {
+				Loader.crashTimer = setTimeout(function () {
 					Loader.timesStarted = 0;
 				}, 10000);
 			} else {
-				console.log(numProcs*3 + ' restarts in 10 seconds, most likely an error on startup. Halting.');
+				console.log((numProcs * 3) + ' restarts in 10 seconds, most likely an error on startup. Halting.');
 				process.exit();
 			}
 		}
 
-		console.log('[cluster] Child Process (' + worker.pid + ') has exited (code: ' + code + ', signal: ' + signal +')');
+		console.log('[cluster] Child Process (' + worker.pid + ') has exited (code: ' + code + ', signal: ' + signal + ')');
 		if (!(worker.suicide || code === 0)) {
 			console.log('[cluster] Spinning up another process...');
 
@@ -83,76 +84,35 @@ Loader.addWorkerEvents = function(worker) {
 		}
 	});
 
-	worker.on('message', function(message) {
+	worker.on('message', function (message) {
 		if (message && typeof message === 'object' && message.action) {
 			switch (message.action) {
-				case 'ready':
-					if (Loader.js.target['nodebb.min.js'] && Loader.js.target['acp.min.js'] && !worker.isPrimary) {
-						worker.send({
-							action: 'js-propagate',
-							data: Loader.js.target
-						});
+			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);
 					}
-
-					if (Loader.css.cache && !worker.isPrimary) {
-						worker.send({
-							action: 'css-propagate',
-							cache: Loader.css.cache,
-							acpCache: Loader.css.acpCache
-						});
-					}
-
-					if (Loader.templatesCompiled && !worker.isPrimary) {
-						worker.send({
-							action: 'templates:compiled'
-						});
-					}
-
-
-				break;
-				case 'restart':
-					console.log('[cluster] Restarting...');
-					Loader.restart();
-				break;
-				case 'reload':
-					console.log('[cluster] Reloading...');
-					Loader.reload();
-				break;
-				case 'js-propagate':
-					Loader.js.target = message.data;
-
-					Loader.notifyWorkers({
-						action: 'js-propagate',
-						data: message.data
-					}, worker.pid);
-				break;
-				case 'css-propagate':
-					Loader.css.cache = message.cache;
-					Loader.css.acpCache = message.acpCache;
-
-					Loader.notifyWorkers({
-						action: 'css-propagate',
-						cache: message.cache,
-						acpCache: message.acpCache
-					}, worker.pid);
-				break;
-				case 'templates:compiled':
-					Loader.templatesCompiled = true;
-
-					Loader.notifyWorkers({
-						action: 'templates:compiled',
-					}, worker.pid);
+				});
 				break;
 			}
 		}
 	});
 };
 
-Loader.start = function(callback) {
+Loader.start = function (callback) {
 	numProcs = getPorts().length;
 	console.log('Clustering enabled: Spinning up ' + numProcs + ' process(es).\n');
 
-	for (var x=0; x<numProcs; ++x) {
+	for (var x = 0; x < numProcs; x += 1) {
 		forkWorker(x, x === 0);
 	}
 
@@ -163,18 +123,19 @@ Loader.start = function(callback) {
 
 function forkWorker(index, isPrimary) {
 	var ports = getPorts();
+	var args = [];
 
-	if(!ports[index]) {
+	if (!ports[index]) {
 		return console.log('[cluster] invalid port for worker : ' + index + ' ports: ' + ports.length);
 	}
 
 	process.env.isPrimary = isPrimary;
-	process.env.isCluster = ports.length > 1 ? true : false;
+	process.env.isCluster = nconf.get('isCluster') || ports.length > 1;
 	process.env.port = ports[index];
 
-	var worker = fork('app.js', [], {
+	var worker = fork(appPath, args, {
 		silent: silent,
-		env: process.env
+		env: process.env,
 	});
 
 	worker.index = index;
@@ -185,7 +146,7 @@ function forkWorker(index, isPrimary) {
 	Loader.addWorkerEvents(worker);
 
 	if (silent) {
-		var output = logrotate({ file: __dirname + '/logs/output.log', size: '1m', keep: 3, compress: true });
+		var output = logrotate({ file: outputLogFilePath, size: '1m', keep: 3, compress: true });
 		worker.stdout.pipe(output);
 		worker.stderr.pipe(output);
 	}
@@ -198,87 +159,89 @@ function getPorts() {
 		process.exit();
 	}
 	var urlObject = url.parse(_url);
-	var port = nconf.get('port') || nconf.get('PORT') || urlObject.port || 4567;
+	var port = nconf.get('PORT') || nconf.get('port') || urlObject.port || 4567;
 	if (!Array.isArray(port)) {
 		port = [port];
 	}
 	return port;
 }
 
-Loader.restart = function() {
+Loader.restart = function () {
 	killWorkers();
-	nconf.remove('file');
-	nconf.use('file', { file: path.join(__dirname, '/config.json') });
-	Loader.start();
-};
 
-Loader.reload = function() {
-	workers.forEach(function(worker) {
-		worker.send({
-			action: 'reload'
-		});
+	nconf.remove('file');
+	nconf.use('file', { file: pathToConfig });
+
+	fs.readFile(pathToConfig, { encoding: 'utf-8' }, function (err, configFile) {
+		if (err) {
+			console.error('Error reading config');
+			throw err;
+		}
+
+		var conf = JSON.parse(configFile);
+
+		nconf.stores.env.readOnly = false;
+		nconf.set('url', conf.url);
+		nconf.stores.env.readOnly = true;
+
+		if (process.env.url !== conf.url) {
+			process.env.url = conf.url;
+		}
+		Loader.start();
 	});
 };
 
-Loader.stop = function() {
+Loader.stop = function () {
 	killWorkers();
 
 	// Clean up the pidfile
-	fs.unlinkSync(__dirname + '/pidfile');
+	if (nconf.get('daemon') !== 'false' && nconf.get('daemon') !== false) {
+		fs.unlinkSync(pidFilePath);
+	}
 };
 
 function killWorkers() {
-	workers.forEach(function(worker) {
+	workers.forEach(function (worker) {
 		worker.suicide = true;
 		worker.kill();
 	});
 }
 
-Loader.notifyWorkers = function(msg, worker_pid) {
-	worker_pid = parseInt(worker_pid, 10);
-	workers.forEach(function(worker) {
-		if (parseInt(worker.pid, 10) !== worker_pid) {
+fs.open(pathToConfig, 'r', function (err) {
+	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 {
-				worker.send(msg);
+				var	pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
+				process.kill(pid, 0);
+				process.exit();
 			} catch (e) {
-				console.log('[cluster/notifyWorkers] Failed to reach pid ' + worker_pid);
+				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;
+		}
 	});
-};
-
-fs.open(path.join(__dirname, 'config.json'), '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
-			});
-
-			fs.writeFile(__dirname + '/pidfile', process.pid);
-		}
-
-		async.series([
-			Loader.init,
-			Loader.displayStartupMessages,
-			Loader.start
-		], function(err) {
-			if (err) {
-				console.log('[loader] Error during startup: ' + err.message);
-			}
-		});
-	} else {
-		// No config detected, kickstart web installer
-		var child = require('child_process').fork('app');
-	}
 });

minifier.js

@@ -1,81 +0,0 @@
-"use strict";
-
-var uglifyjs = require('uglify-js');
-var async = require('async');
-var fs = require('fs');
-var file = require('./src/file');
-
-var Minifier = {
-	js: {}
-};
-
-/* Javascript */
-Minifier.js.minify = function (scripts, minify, callback) {
-
-	scripts = scripts.filter(function(file) {
-		return file && file.endsWith('.js');
-	});
-
-	async.filter(scripts, function(script, next) {
-		file.exists(script, function(exists) {
-			if (!exists) {
-				console.warn('[minifier] file not found, ' + script);
-			}
-			next(exists);
-		});
-	}, function(scripts) {
-		if (minify) {
-			minifyScripts(scripts, callback);
-		} else {
-			concatenateScripts(scripts, callback);
-		}
-	});
-};
-
-process.on('message', function(payload) {
-	switch(payload.action) {
-	case 'js':
-		Minifier.js.minify(payload.scripts, payload.minify, function(minified/*, sourceMap*/) {
-			process.send({
-				type: 'end',
-				// sourceMap: sourceMap,
-				minified: minified
-			});
-		});
-		break;
-	}
-});
-
-function minifyScripts(scripts, callback) {
-	// The portions of code involving the source map are commented out as they're broken in UglifyJS2
-	// Follow along here: https://github.com/mishoo/UglifyJS2/issues/700
-	try {
-		var minified = uglifyjs.minify(scripts, {
-				// outSourceMap: "nodebb.min.js.map",
-				compress: false
-			});
-
-		callback(minified.code/*, minified.map*/);
-	} catch(err) {
-		process.send({
-			type: 'error',
-			message: err.message
-		});
-	}
-}
-
-function concatenateScripts(scripts, callback) {
-	async.map(scripts, fs.readFile, function(err, scripts) {
-		if (err) {
-			process.send({
-				type: 'error',
-				message: err.message
-			});
-			return;
-		}
-
-		scripts = scripts.join(require('os').EOL + ';');
-
-		callback(scripts);
-	});
-}

nodebb

@@ -1,387 +1,5 @@
 #!/usr/bin/env node
 
-try {
-	var colors = require('colors'),
-		cproc = require('child_process'),
-		argv = require('minimist')(process.argv.slice(2)),
-		fs = require('fs'),
-		path = require('path'),
-		request = require('request'),
-		semver = require('semver'),
-		prompt = require('prompt'),
-		async = require('async');
-} catch (e) {
-	if (e.code === 'MODULE_NOT_FOUND') {
-		process.stdout.write('NodeBB could not be started because it\'s dependencies have not been installed.\n');
-		process.stdout.write('Please ensure that you have executed "npm install --production" prior to running NodeBB.\n\n');
-		process.stdout.write('For more information, please see: https://docs.nodebb.org/en/latest/installing/os.html\n\n');
-		process.stdout.write('Could not start: ' + e.code + '\n');
+'use strict';
 
-		process.exit(1);
-	}
-}
-
-var getRunningPid = function(callback) {
-		fs.readFile(__dirname + '/pidfile', {
-			encoding: 'utf-8'
-		}, function(err, pid) {
-			if (err) {
-				return callback(err);
-			}
-
-			try {
-				process.kill(parseInt(pid, 10), 0);
-				callback(null, parseInt(pid, 10));
-			} catch(e) {
-				callback(e);
-			}
-		});
-	},
-	getCurrentVersion = function(callback) {
-		fs.readFile(path.join(__dirname, 'package.json'), { encoding: 'utf-8' }, function(err, pkg) {
-			try {
-				pkg = JSON.parse(pkg);
-				return callback(null, pkg.version);
-			} catch(err) {
-				return callback(err);
-			}
-		})
-	},
-	fork = function (args) {
-		cproc.fork('app.js', args, {
-			cwd: __dirname,
-			silent: false
-		});
-	},
-	getInstalledPlugins = function(callback) {
-		async.parallel({
-			files: async.apply(fs.readdir, path.join(__dirname, 'node_modules')),
-			deps: async.apply(fs.readFile, path.join(__dirname, 'package.json'), { encoding: 'utf-8' })
-		}, function(err, payload) {
-			var isNbbModule = /^nodebb-(?:plugin|theme|widget|rewards)-[\w\-]+$/,
-				moduleName, isGitRepo;
-
-			payload.files = payload.files.filter(function(file) {
-				return isNbbModule.test(file);
-			});
-
-			try {
-				payload.deps = JSON.parse(payload.deps).dependencies;
-				payload.bundled = [];
-				payload.installed = [];
-			} catch (err) {
-				return callback(err);
-			}
-
-			for (moduleName in payload.deps) {
-				if (isNbbModule.test(moduleName)) {
-					payload.bundled.push(moduleName);
-				}
-			}
-
-			// Whittle down deps to send back only extraneously installed plugins/themes/etc
-			payload.files.forEach(function(moduleName) {
-				try {
-					fs.accessSync(path.join(__dirname, 'node_modules/' + moduleName, '.git'));
-					isGitRepo = true;
-				} catch(e) {
-					isGitRepo = false;
-				}
-
-				if (
-					payload.files.indexOf(moduleName) !== -1	// found in `node_modules/`
-					&& payload.bundled.indexOf(moduleName) === -1	// not found in `package.json`
-					&& !fs.lstatSync(path.join(__dirname, 'node_modules/' + moduleName)).isSymbolicLink()	// is not a symlink
-					&& !isGitRepo	// .git/ does not exist, so it is not a git repository
-				) {
-					payload.installed.push(moduleName);
-				}
-			});
-
-			getModuleVersions(payload.installed, callback);
-		});
-	},
-	getModuleVersions = function(modules, callback) {
-		var versionHash = {};
-
-		async.eachLimit(modules, 50, function(module, next) {
-			fs.readFile(path.join(__dirname, 'node_modules/' + module + '/package.json'), { encoding: 'utf-8' }, function(err, pkg) {
-				try {
-					pkg = JSON.parse(pkg);
-					versionHash[module] = pkg.version;
-					next();
-				} catch (err) {
-					next(err);
-				}
-			});
-		}, function(err) {
-			callback(err, versionHash);
-		});
-	},
-	checkPlugins = function(standalone, callback) {
-		if (standalone) {
-			process.stdout.write('Checking installed plugins and themes for updates... ');
-		}
-
-		async.waterfall([
-			async.apply(async.parallel, {
-				plugins: async.apply(getInstalledPlugins),
-				version: async.apply(getCurrentVersion)
-			}),
-			function(payload, next) {
-				var toCheck = Object.keys(payload.plugins);
-
-				if (!toCheck.length) {
-					process.stdout.write('OK'.green + '\n'.reset);
-					return next(null, []);	// no extraneous plugins installed
-				}
-
-				request({
-					method: 'GET',
-					url: 'https://packages.nodebb.org/api/v1/suggest?version=' + payload.version + '&package[]=' + toCheck.join('&package[]='),
-					json: true
-				}, function(err, res, body) {
-					if (err) {
-						process.stdout.write('error'.red + '\n'.reset);
-						return next(err);
-					}
-					process.stdout.write('OK'.green + '\n'.reset);
-
-					if (!Array.isArray(body) && toCheck.length === 1) {
-						body = [body];
-					}
-
-					var current, suggested,
-						upgradable = body.map(function(suggestObj) {
-							current = payload.plugins[suggestObj.package];
-							suggested = suggestObj.version;
-
-							if (suggestObj.code === 'match-found' && semver.gt(suggested, current)) {
-								return {
-									name: suggestObj.package,
-									current: current,
-									suggested: suggested
-								}
-							} else {
-								return null;
-							}
-						}).filter(Boolean);
-
-					next(null, upgradable);
-				})
-			}
-		], callback);
-	},
-	upgradePlugins = function(callback) {
-		var standalone = false;
-		if (typeof callback !== 'function') {
-			callback = function() {};
-			standalone = true;
-		};
-
-		checkPlugins(standalone, function(err, found) {
-			if (err) {
-				process.stdout.write('\Warning'.yellow + ': An unexpected error occured when attempting to verify plugin upgradability\n'.reset);
-				return callback(err);
-			}
-
-			if (found && found.length) {
-				process.stdout.write('\nA total of ' + new String(found.length).bold + ' package(s) can be upgraded:\n');
-				found.forEach(function(suggestObj) {
-					process.stdout.write('  * '.yellow + suggestObj.name.reset + ' (' + suggestObj.current.yellow + ' -> '.reset + suggestObj.suggested.green + ')\n'.reset);
-				});
-				process.stdout.write('\n');
-			} else {
-				if (standalone) {
-					process.stdout.write('\nAll packages up-to-date!'.green + '\n'.reset);
-				}
-				return callback();
-			}
-
-			prompt.message = '';
-			prompt.delimiter = '';
-
-			prompt.start();
-			prompt.get({
-				name: 'upgrade',
-				description: 'Proceed with upgrade (y|n)?'.reset,
-				type: 'string'
-			}, function(err, result) {
-				if (['y', 'Y', 'yes', 'YES'].indexOf(result.upgrade) !== -1) {
-					process.stdout.write('\nUpgrading packages...');
-					var args = ['npm', 'i'];
-					found.forEach(function(suggestObj) {
-						args.push(suggestObj.name + '@' + suggestObj.suggested);
-					});
-
-					require('child_process').execFile('/usr/bin/env', args, { stdio: 'ignore' }, function(err) {
-						if (!err) {
-							process.stdout.write(' OK\n'.green);
-						}
-
-						callback(err);
-					});
-				} else {
-					process.stdout.write('\nPackage upgrades skipped'.yellow + '. Check for upgrades at any time by running "'.reset + './nodebb upgrade-plugins'.green + '".\n'.reset);
-					callback();
-				}
-			})
-		});
-	};
-
-switch(process.argv[2]) {
-	case 'status':
-		getRunningPid(function(err, pid) {
-			if (!err) {
-				process.stdout.write('\nNodeBB Running '.bold + '(pid '.cyan + pid.toString().cyan + ')\n'.cyan);
-				process.stdout.write('\t"' + './nodebb stop'.yellow + '" to stop the NodeBB server\n');
-				process.stdout.write('\t"' + './nodebb log'.yellow + '" to view server output\n');
-				process.stdout.write('\t"' + './nodebb restart'.yellow + '" to restart NodeBB\n\n');
-			} else {
-				process.stdout.write('\nNodeBB is not running\n'.bold);
-				process.stdout.write('\t"' + './nodebb start'.yellow + '" to launch the NodeBB server\n\n'.reset);
-			}
-		})
-		break;
-
-	case 'start':
-		process.stdout.write('\nStarting NodeBB\n'.bold);
-		process.stdout.write('  "' + './nodebb stop'.yellow + '" to stop the NodeBB server\n');
-		process.stdout.write('  "' + './nodebb log'.yellow + '" to view server output\n');
-		process.stdout.write('  "' + './nodebb restart'.yellow + '" to restart NodeBB\n\n'.reset);
-
-		// Spawn a new NodeBB process
-		cproc.fork(__dirname + '/loader.js', {
-			env: process.env
-		});
-		break;
-
-	case 'stop':
-		getRunningPid(function(err, pid) {
-			if (!err) {
-				process.kill(pid, 'SIGTERM');
-				process.stdout.write('Stopping NodeBB. Goodbye!\n')
-			} else {
-				process.stdout.write('NodeBB is already stopped.\n');
-			}
-		});
-		break;
-
-	case 'restart':
-		getRunningPid(function(err, pid) {
-			if (!err) {
-				process.kill(pid, 'SIGHUP');
-				process.stdout.write('\nRestarting NodeBB\n'.bold);
-			} else {
-				process.stdout.write('NodeBB could not be restarted, as a running instance could not be found.\n');
-			}
-		});
-		break;
-
-	case 'reload':
-		getRunningPid(function(err, pid) {
-			if (!err) {
-				process.kill(pid, 'SIGUSR2');
-			} else {
-				process.stdout.write('NodeBB could not be reloaded, as a running instance could not be found.\n');
-			}
-		});
-		break;
-
-	case 'dev':
-		process.env.NODE_ENV = 'development';
-		cproc.fork(__dirname + '/loader.js', ['--no-daemon', '--no-silent'], {
-			env: process.env
-		});
-		break;
-
-	case 'log':
-		process.stdout.write('\nType '.red + 'Ctrl-C '.bold + 'to exit'.red);
-		process.stdout.write('\n\n'.reset);
-		cproc.spawn('tail', ['-F', './logs/output.log'], {
-			cwd: __dirname,
-			stdio: 'inherit'
-		});
-		break;
-
-	case 'setup':
-		cproc.fork('app.js', ['--setup'], {
-			cwd: __dirname,
-			silent: false
-		});
-		break;
-
-	case 'reset':
-		var args = process.argv.slice(0);
-		args.unshift('--reset');
-		fork(args);
-		break;
-
-	case 'activate':
-		var args = process.argv.slice(0);
-		args.unshift('--activate');
-		fork(args);
-		break;
-
-	case 'plugins':
-		var args = process.argv.slice(0);
-		args.unshift('--plugins');
-		fork(args);
-		break;
-
-	case 'upgrade-plugins':
-		upgradePlugins();
-		break;
-
-	case 'upgrade':
-		async.series([
-			function(next) {
-				process.stdout.write('1. '.bold + 'Bringing base dependencies up to date... '.yellow);
-				require('child_process').execFile('/usr/bin/env', ['npm', 'i', '--production'], { stdio: 'ignore' }, next);
-			},
-			function(next) {
-				process.stdout.write('OK\n'.green);
-				process.stdout.write('2. '.bold + 'Checking installed plugins for updates... '.yellow);
-				upgradePlugins(next);
-			},
-			function(next) {
-				process.stdout.write('3. '.bold + 'Updating NodeBB data store schema...\n'.yellow);
-				var upgradeProc = cproc.fork('app.js', ['--upgrade'], {
-					cwd: __dirname,
-					silent: false
-				});
-
-				upgradeProc.on('close', next)
-			}
-		], function(err) {
-			if (err) {
-				process.stdout.write('\nError'.red + ': ' + err.message + '\n');
-			} else {
-				var message = 'NodeBB Upgrade Complete!';
-				// some consoles will return undefined/zero columns, so just use 2 spaces in upgrade script if we can't get our column count
-				var columns = process.stdout.columns;
-				var spaces = columns ? new Array(Math.floor(columns / 2) - (message.length / 2) + 1).join(' ') : "  ";
-
-				process.stdout.write('OK\n'.green);
-				process.stdout.write('\n' + spaces + message.green.bold + '\n\n'.reset);
-			}
-		});
-		break;
-
-	default:
-		process.stdout.write('\nWelcome to NodeBB\n\n'.bold);
-		process.stdout.write('Usage: ./nodebb {start|stop|reload|restart|log|setup|reset|upgrade|dev}\n\n');
-		process.stdout.write('\t' + 'start'.yellow + '\tStart the NodeBB server\n');
-		process.stdout.write('\t' + 'stop'.yellow + '\tStops the NodeBB server\n');
-		process.stdout.write('\t' + 'reload'.yellow + '\tRestarts NodeBB\n');
-		process.stdout.write('\t' + 'restart'.yellow + '\tRestarts NodeBB\n');
-		process.stdout.write('\t' + 'log'.yellow + '\tOpens the logging interface (useful for debugging)\n');
-		process.stdout.write('\t' + 'setup'.yellow + '\tRuns the NodeBB setup script\n');
-		process.stdout.write('\t' + 'reset'.yellow + '\tDisables all plugins, restores the default theme.\n');
-		process.stdout.write('\t' + 'activate'.yellow + '\tActivate a plugin on start up.\n');
-		process.stdout.write('\t' + 'plugins'.yellow + '\tList all plugins that have been installed.\n');
-		process.stdout.write('\t' + 'upgrade'.yellow + '\tRun NodeBB upgrade scripts, ensure packages are up-to-date\n');
-		process.stdout.write('\t' + 'dev'.yellow + '\tStart NodeBB in interactive development mode\n');
-		process.stdout.write('\n'.reset);
-		break;
-}
+require('./src/cli');

nodebb.bat

@@ -1,122 +1 @@
-@echo off
-
-rem %1 action
-rem %2 subaction
-
-setlocal enabledelayedexpansion
-2>nul call :CASE_%1
-if ERRORLEVEL 1 call :DEFAULT_CASE
-
-exit /B
-
-:CASE_start
-    echo Starting NodeBB
-    echo   "nodebb.bat stop" to stop the NodeBB server
-    echo   "nodebb.bat log" to view server output
-
-    rem Start the loader daemon
-    node loader %*
-
-    goto END_CASE
-
-:CASE_stop
-    call :pidexists
-    if %_result%==0 (
-        echo NodeBB is already stopped.
-    ) else (
-        echo Stopping NodeBB. Goodbye!
-
-        rem Doing this forcefully is probably not the best method
-        taskkill /PID !_pid! /f>nul
-    )
-
-    goto END_CASE
-
-:CASE_restart
-    echo Unsupported
-
-    goto END_CASE
-
-:CASE_reload
-    echo Unsupported
-
-    goto END_CASE
-
-:CASE_status
-    call :pidexists
-    if %_result%==0 (
-        echo NodeBB is not running
-        echo   "nodebb.bat start" to launch the NodeBB server
-    ) else (
-        echo NodeBB Running ^(pid !_pid!^)
-        echo   "nodebb.bat stop" to stop the NodeBB server
-        echo   "nodebb.bat log" to view server output
-        echo   "nodebb.bat restart" to restart NodeBB
-    )
-
-    goto END_CASE
-
-:CASE_log
-    cls
-    type .\logs\output.log
-
-    goto END_CASE
-
-:CASE_upgrade
-    call npm install
-    call npm i nodebb-theme-vanilla nodebb-theme-lavender nodebb-widget-essentials
-    node app --upgrade
-    copy /b package.json +,,>nul
-
-    goto END_CASE
-
-:CASE_setup
-    node app --setup %*
-
-    goto END_CASE
-
-:CASE_reset
-    node app --reset --%2
-
-    goto END_CASE
-
-:CASE_dev
-    echo Launching NodeBB in "development" mode.
-    echo To run the production build of NodeBB, please use "forever".
-    echo More Information: https://docs.nodebb.org/en/latest/running/index.html
-    set NODE_ENV=development
-    node loader --no-daemon %*
-
-    goto END_CASE
-
-:CASE_watch
-    echo Not supported
-
-    goto END_CASE
-
-:DEFAULT_CASE
-    echo Welcome to NodeBB
-    echo Usage: nodebb.bat ^{start^|stop^|reload^|restart^|log^|setup^|reset^|upgrade^|dev^|watch^}
-
-    goto END_CASE
-
-:END_CASE
-    endlocal
-    VER > NUL
-    goto :EOF
-
-:pidexists
-if exist %~dp0pidfile (
-    set /p _pid=<pidfile
-
-    for /f "usebackq" %%Z in (`tasklist /nh /fi "PID eq !_pid!"`) do (
-        if %%Z==INFO: (
-            del pidfile
-            set _result=0
-        ) else (
-            set _result=1
-        )
-    )
-) else (
-    set _result=0
-)
+@echo off && cd %~dp0 && node ./nodebb %*

package.json

@@ -1,126 +0,0 @@
-{
-  "name": "nodebb",
-  "license": "GPL-3.0",
-  "description": "NodeBB Forum",
-  "version": "1.1.3-auto.4",
-  "homepage": "http://www.nodebb.org",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/NodeBB/NodeBB/"
-  },
-  "main": "app.js",
-  "scripts": {
-    "start": "node loader.js",
-    "lint": "eslint --cache .",
-    "pretest": "npm run lint",
-    "test": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- ./tests -t 10000",
-    "test-windows": "./node_modules/.bin/_mocha.cmd ./tests -t 10000"
-  },
-  "dependencies": {
-    "async": "~1.5.0",
-    "autoprefixer": "^6.2.3",
-    "bcryptjs": "~2.3.0",
-    "body-parser": "^1.9.0",
-    "chart.js": "^2.1.0",
-    "colors": "^1.1.0",
-    "compression": "^1.1.0",
-    "connect-ensure-login": "^0.1.1",
-    "connect-flash": "^0.1.1",
-    "connect-mongo": "~1.1.0",
-    "connect-multiparty": "^2.0.0",
-    "connect-redis": "~3.1.0",
-    "cookie-parser": "^1.3.3",
-    "cron": "^1.0.5",
-    "csurf": "^1.6.1",
-    "daemon": "~1.1.0",
-    "express": "^4.14.0",
-    "express-session": "^1.8.2",
-    "express-useragent": "0.2.4",
-    "html-to-text": "2.0.0",
-    "ip": "1.1.2",
-    "jimp": "0.2.21",
-    "jquery": "^3.1.0",
-    "json-2-csv": "^2.0.22",
-    "less": "^2.0.0",
-    "logrotate-stream": "^0.2.3",
-    "lru-cache": "4.0.0",
-    "mime": "^1.3.4",
-    "minimist": "^1.1.1",
-    "mkdirp": "~0.5.0",
-    "mongodb": "~2.1.3",
-    "morgan": "^1.3.2",
-    "mousetrap": "^1.5.3",
-    "nconf": "~0.8.2",
-    "nodebb-plugin-composer-default": "4.2.4",
-    "nodebb-plugin-dbsearch": "1.0.2",
-    "nodebb-plugin-emoji-extended": "1.1.1",
-    "nodebb-plugin-emoji-one": "1.1.5",
-    "nodebb-plugin-markdown": "6.0.2",
-    "nodebb-plugin-mentions": "1.1.3",
-    "nodebb-plugin-soundpack-default": "0.1.6",
-    "nodebb-plugin-spam-be-gone": "0.4.10",
-    "nodebb-rewards-essentials": "0.0.9",
-    "nodebb-theme-lavender": "3.0.14",
-    "nodebb-theme-persona": "4.1.43",
-    "nodebb-theme-vanilla": "5.1.27",
-    "nodebb-widget-essentials": "2.0.10",
-    "nodemailer": "2.0.0",
-    "nodemailer-sendmail-transport": "1.0.0",
-    "nodemailer-smtp-transport": "^2.4.1",
-    "passport": "^0.3.0",
-    "passport-local": "1.0.0",
-    "postcss": "^5.0.13",
-    "promise-polyfill": "^6.0.2",
-    "prompt": "^1.0.0",
-    "redis": "~2.6.2",
-    "request": "^2.44.0",
-    "rimraf": "~2.5.0",
-    "rss": "^1.0.0",
-    "semver": "^5.1.0",
-    "serve-favicon": "^2.1.5",
-    "sitemap": "^1.4.0",
-    "socket.io": "^1.4.8",
-    "socket.io-client": "^1.4.0",
-    "socket.io-redis": "^1.0.0",
-    "socketio-wildcard": "~0.3.0",
-    "string": "^3.0.0",
-    "templates.js": "0.3.4",
-    "toobusy-js": "^0.5.1",
-    "uglify-js": "^2.6.0",
-    "underscore": "^1.8.3",
-    "underscore.deep": "^0.5.1",
-    "validator": "^5.0.0",
-    "winston": "^2.1.0",
-    "xregexp": "~3.1.0"
-  },
-  "devDependencies": {
-    "eslint": "^3.4.0",
-    "grunt": "~0.4.5",
-    "grunt-contrib-watch": "^1.0.0",
-    "istanbul": "^0.4.2",
-    "mocha": "~1.13.0"
-  },
-  "bugs": {
-    "url": "https://github.com/NodeBB/NodeBB/issues"
-  },
-  "engines": {
-    "node": ">=4"
-  },
-  "maintainers": [
-    {
-      "name": "Andrew Rodrigues",
-      "email": "andrew@nodebb.org",
-      "url": "https://github.com/psychobunny"
-    },
-    {
-      "name": "Julian Lam",
-      "email": "julian@nodebb.org",
-      "url": "https://github.com/julianlam"
-    },
-    {
-      "name": "Barış Soner Uşaklı",
-      "email": "baris@nodebb.org",
-      "url": "https://github.com/barisusakli"
-    }
-  ]
-}

public/.eslintrc

@@ -0,0 +1,57 @@
+{
+	"globals": {
+		"app": true,
+		"io": true,
+		"socket": true,
+		"ajaxify": true,
+		"config": true,
+		"RELATIVE_PATH": true,
+		"utils": true,
+		"overrides": true,
+		"componentHandler": true,
+		"bootbox": true,
+		"Visibility": true,
+		"Tinycon": true,
+		"Promise": true
+	},
+	"env": {
+		"jquery": true,
+		"amd": true,
+		"browser": true,
+		"es6": false
+	},
+	"rules": {
+		"no-dupe-class-members": "off",
+		"no-var": "off",
+		"object-shorthand": "off",
+		"prefer-arrow-callback": "off",
+		"prefer-spread": "off",
+		"prefer-reflect": "off",
+		"prefer-template": "off"
+	},
+	"parserOptions": {
+		"ecmaVersion": 5,
+		"ecmaFeatures": {
+			"arrowFunctions": false,
+			"classes": false,
+			"defaultParams": false,
+			"destructuring": false,
+			"experimentalObjectRestSpread": false,
+			"blockBindings": false,
+			"forOf": false,
+			"generators": false,
+			"globalReturn": false,
+			"jsx": false,
+			"modules": false,
+			"objectLiteralComputedProperties": false,
+			"objectLiteralDuplicateProperties": false,
+			"objectLiteralShorthandMethods": false,
+			"objectLiteralShorthandProperties": false,
+			"impliedStrict": false,
+			"restParams": false,
+			"spread": false,
+			"superInFunctions": false,
+			"templateStrings": false
+		}
+	}
+}

public/.jshintrc

@@ -0,0 +1,84 @@
+{
+    "maxerr" : 50, // {int} Maximum error before stopping
+
+    // Enforcing
+    "bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.)
+    "camelcase" : false, // true: Identifiers must be in camelCase
+    "curly" : true, // true: Require {} for every new block or scope
+    "eqeqeq" : true, // true: Require triple equals (===) for comparison
+    "forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty()
+    "immed" : false, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
+    "indent" : 4, // {int} Number of spaces to use for indentation
+    "latedef" : false, // true: Require variables/functions to be defined before being used
+    "newcap" : false, // true: Require capitalization of all constructor functions e.g. `new F()`
+    "noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee`
+    "noempty" : true, // true: Prohibit use of empty blocks
+    "nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment)
+    "plusplus" : false, // true: Prohibit use of `++` & `--`
+    "quotmark" : false, // Quotation mark consistency:
+                                // false : do nothing (default)
+                                // true : ensure whatever is used is consistent
+                                // "single" : require single quotes
+                                // "double" : require double quotes
+    "undef" : true, // true: Require all non-global variables to be declared (prevents global leaks)
+    "unused" : true, // true: Require all defined variables be used
+    "strict" : true, // true: Requires all functions run in ES5 Strict Mode
+    "trailing" : false, // true: Prohibit trailing whitespaces
+    "maxparams" : false, // {int} Max number of formal params allowed per function
+    "maxdepth" : false, // {int} Max depth of nested blocks (within functions)
+    "maxstatements" : false, // {int} Max number statements per function
+    "maxcomplexity" : false, // {int} Max cyclomatic complexity per function
+    "maxlen" : false, // {int} Max number of characters per line
+
+    // Relaxing
+    "asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
+    "boss" : false, // true: Tolerate assignments where comparisons would be expected
+    "debug" : false, // true: Allow debugger statements e.g. browser breakpoints.
+    "eqnull" : false, // true: Tolerate use of `== null`
+    "es5" : false, // true: Allow ES5 syntax (ex: getters and setters)
+    "esnext" : false, // true: Allow ES.next (ES6) syntax (ex: `const`)
+    "moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features)
+                                 // (ex: `for each`, multiple try/catch, function expression…)
+    "evil" : false, // true: Tolerate use of `eval` and `new Function()`
+    "expr" : false, // true: Tolerate `ExpressionStatement` as Programs
+    "funcscope" : false, // true: Tolerate defining variables inside control statements"
+    "globalstrict" : false, // true: Allow global "use strict" (also enables 'strict')
+    "iterator" : false, // true: Tolerate using the `__iterator__` property
+    "lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block
+    "laxbreak" : false, // true: Tolerate possibly unsafe line breakings
+    "laxcomma" : false, // true: Tolerate comma-first style coding
+    "loopfunc" : false, // true: Tolerate functions being defined in loops
+    "multistr" : false, // true: Tolerate multi-line strings
+    "proto" : false, // true: Tolerate using the `__proto__` property
+    "scripturl" : false, // true: Tolerate script-targeted URLs
+    "smarttabs" : false, // true: Tolerate mixed tabs/spaces when used for alignment
+    "shadow" : false, // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
+    "sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation
+    "supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;`
+    "validthis" : false, // true: Tolerate using this in a non-constructor function
+
+	"globals": {
+		"app": true,
+		"io": true,
+		"socket": true,
+		"ajaxify": true,
+		"config": true,
+		"RELATIVE_PATH": true,
+		"utils": true,
+		"overrides": true,
+		"componentHandler": true,
+		"bootbox": true,
+		"templates": true,
+		"Visibility": true,
+		"Tinycon": true,
+		"require": true,
+		"define": true,
+        "ace": true,
+		"Sortable": true,
+		"Slideout": true,
+		"NProgress": true
+	},
+
+	"jquery": true,
+    "browser": true
+}

public/503.html

@@ -1,7 +1,7 @@
 <html>
 <head>
 	<title>Excessive Load Warning</title>
-	<link href='http://fonts.googleapis.com/css?family=Ubuntu:400,500,700' rel='stylesheet' type='text/css'>
+	<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 {

public/js-enabled.css

@@ -1,7 +1,3 @@
 /*
     The following stylesheet is only included on pages that can execute javascript
 */
-
-[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

@@ -0,0 +1,7 @@
+{
+	"alert.confirm-rebuild-and-restart": "هل أنت متأكد إنك تريد إعادة بناء وتشغيل الـ NodeBB؟",
+	"alert.confirm-restart": "هل تريد بالتأكيد إعادة تشغيل NodeBB؟",
+
+	"acp-title": "لوحة تحكم إدارة NodeBB | %1",
+	"settings-header-contents": "محتويات"
+}

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

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

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

@@ -0,0 +1,52 @@
+{
+	"x-b": "%1 b",
+	"x-mb": "%1 mb",
+	"x-gb": "%1 gb",
+	"uptime-seconds": "Uptime in Seconds",
+	"uptime-days": "Uptime in Days",
+
+	"mongo": "Mongo",
+	"mongo.version": "MongoDB Version",
+	"mongo.storage-engine": "Storage Engine",
+	"mongo.collections": "Collections",
+	"mongo.objects": "Objects",
+	"mongo.avg-object-size": "Avg. Object Size",
+	"mongo.data-size": "Data Size",
+	"mongo.storage-size": "Storage Size",
+	"mongo.index-size": "Index Size",
+	"mongo.file-size": "File Size",
+	"mongo.resident-memory": "Resident Memory",
+	"mongo.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",
+	"redis.used-memory": "الذاكرة المستخدمة",
+	"redis.memory-frag-ratio": "Memory Fragmentation Ratio",
+	"redis.total-connections-recieved": "إجمالي الاتصالات المستلمة",
+	"redis.total-commands-processed": "إجمالي الأوامر التي تمت معالجتها",
+	"redis.iops": "Instantaneous Ops. Per Second",
+	"redis.iinput": "Instantaneous Input Per Second",
+	"redis.ioutput": "Instantaneous Output Per Second",
+	"redis.total-input": "Total Input",
+	"redis.total-output": "Total Ouput",
+
+	"redis.keyspace-hits": "Keyspace Hits",
+	"redis.keyspace-misses": "Keyspace Misses",
+	"redis.raw-info": "Redis Raw Info",
+
+	"postgres": "Postgres",
+	"postgres.version": "PostgreSQL Version",
+	"postgres.raw-info": "Postgres Raw Info"
+}

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

@@ -0,0 +1,14 @@
+{
+	"figure-x": "شكل %1",
+	"error-events-per-day": "<code>%1</code> حدث كل يوم ",
+	"error.404": "404 لم يتم العثور",
+	"error.503": "503 الخدمة غير متوفرة",
+	"manage-error-log": "إدارة سجل الأخطاء",
+	"export-error-log": "تصدير سجل الأخطاء (CSV)",
+	"clear-error-log": "محو سجل الأخطاء",
+	"route": "مسار",
+	"count": "عدد",
+	"no-routes-not-found": "لا توجد اخطاء 404!",
+	"clear404-confirm": "هل تريد بالتأكيد محو سجلات الخطأ 404؟",
+	"clear404-success": "أخطاء \"404 لم يتم العثور\" تم محوها بنجاح"
+}

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

@@ -0,0 +1,11 @@
+{
+	"events": "أحداث",
+	"no-events": "لا توجد أحداث",
+	"control-panel": "لوحة تحكم الأحداث",
+	"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/advanced/logs.json

@@ -0,0 +1,7 @@
+{
+	"logs": "السجلات",
+	"control-panel": "لوحة تحكم السجلات",
+	"reload": "إعادة تحميل السجلات",
+	"clear": "محو السجلات",
+	"clear-success": "تم محو السجلات!"
+}

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

@@ -0,0 +1,16 @@
+{
+	"custom-css": "Custom CSS/LESS",
+	"custom-css.description": "Enter your own CSS/LESS declarations here, which will be applied after all other styles.",
+	"custom-css.enable": "Enable Custom CSS/LESS",
+
+	"custom-js": "Javascript مخصصة",
+	"custom-js.description": "أدخل Javascript الخاص بك هنا. سيتم تنفيذها بعد تحميل الصفحة بالكامل.",
+	"custom-js.enable": "تفعيل Javascript المخصصة",
+
+	"custom-header": "ترويسة مخصصة",
+	"custom-header.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup. Script tags are allowed, but are discouraged, as the <a href=\"#custom-js\" data-toggle=\"tab\">Custom Javascript</a> tab is available.",
+	"custom-header.enable": "تفعيل الترويسة المخصصة",
+
+	"custom-css.livereload": "تفعيل إعادة التحميل المباشرة",
+	"custom-css.livereload.description": "فعل هذا الخيار لإجبار جميع الجلسات في الأجهزة التي قمت بتسجيل الدخول فيها  بحسابك على التحديث عند النقر على زر الحفظ"
+}

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

@@ -0,0 +1,9 @@
+{
+	"loading": "جاري تحميل السمات...",
+	"homepage": "الصفحة الرئيسية",
+	"select-skin": "إختيار السمة",
+	"current-skin": "السمة الحالية",
+	"skin-updated": "تم تحديث السمة",
+	"applied-success": "تم تطبيق السمة %1 بنجاح",
+	"revert-success": "تم إستعادة الألوان الاساسية للسمة"
+}

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

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

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

@@ -0,0 +1,19 @@
+{
+	"you-are-on": "Info - You are on <strong>%1:%2</strong>",
+	"nodes-responded": "%1 nodes responded within %2ms!",
+	"host": "host",
+	"pid": "pid",
+	"nodejs": "nodejs",
+	"online": "online",
+	"git": "git",
+	"memory": "memory",
+	"load": "system load",
+	"cpu-usage": "cpu usage",
+	"uptime": "uptime",
+
+	"registered": "Registered",
+	"sockets": "Sockets",
+	"guests": "Guests",
+
+	"info": "Info"
+}

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

@@ -0,0 +1,12 @@
+{
+	"logger-settings": "Logger Settings",
+	"description": "By enabling the check boxes, you will receive logs to your terminal. If you specify a path, logs will then be saved to a file instead. HTTP logging is useful for collecting statistics about who, when, and what people access on your forum. In addition to logging HTTP requests, we can also log socket.io events. Socket.io logging, in combination with redis-cli monitor, can be very helpful for learning NodeBB's internals.",
+	"explanation": "Simply check/uncheck the logging settings to enable or disable logging on the fly. No restart needed.",
+	"enable-http": "Enable HTTP logging",
+	"enable-socket": "Enable socket.io event logging",
+	"file-path": "Path to log file",
+	"file-path-placeholder": "/path/to/log/file.log ::: leave blank to log to your terminal",
+
+	"control-panel": "Logger Control Panel",
+	"update-settings": "Update Logger Settings"
+}

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

@@ -0,0 +1,56 @@
+{
+	"installed": "منصبة",
+	"active": "مفعلة",
+	"inactive": "معطلة",
+	"out-of-date": "غير محدثة",
+	"none-found": "لم يتم العثور على إضافات",
+	"none-active": "لا توجد إضافات مفعلة",
+	"find-plugins": "العثور على الإضافات",
+
+	"plugin-search": "البحث عن الإضافات",
+	"plugin-search-placeholder": "جاري البحث عن الإضافات...",
+	"submit-anonymous-usage": "Submit anonymous plugin usage data.",
+	"reorder-plugins": "إعادة ترتيب الإضافات",
+	"order-active": "ترتيب الإضافات المفعلة",
+	"dev-interested": "هل انته مهتم ببرمجة إضافات لـNodeBB؟",
+	"docs-info": "دليل كامل حول برمجة الإضافات بالإمكان العثور عليه في <a target=\"_blank\" href=\"https://docs.nodebb.org/development/plugins/\"> NodeBB Docs Portal</a>.",
+
+	"order.description": "بعض الإضافات تعمل بشكل مثالي عندما يتم تفعيلها قبل أو بعد الإضافات الأخرى.",
+	"order.explanation": "يتم تحميل الإضافات حسب الترتيب المحدد هنا، من الأعلى إلى الأسفل",
+
+	"plugin-item.themes": "القوالب",
+	"plugin-item.deactivate": "تعطيل",
+	"plugin-item.activate": "تفعيل",
+	"plugin-item.install": "تنصيب",
+	"plugin-item.uninstall": "إلغاء التنصيب",
+	"plugin-item.settings": "الإعدادات",
+	"plugin-item.installed": "المنصبة",
+	"plugin-item.latest": "الأحدث",
+	"plugin-item.upgrade": "ترقية",
+	"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": "الإضافة معطلة",
+	"alert.upgraded": "الإضافة مرقاة",
+	"alert.installed": "الإضافة منصبة",
+	"alert.uninstalled": "تم إلغاء تنصيب الإضافة",
+	"alert.activate-success": "يرجى إعادة تشغيل NodeBB لتنشيط الإضافة بشكل بالكامل",
+	"alert.deactivate-success": "تم تعطيل الإضافة بنجاح",
+	"alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
+	"alert.install-success": "تم تثبيت الإضافة بنجاح، يرجى تفعيلها.",
+	"alert.uninstall-success": "تم تعطيل الإضافة وإلغاء تنصيبها بنجاح.",
+	"alert.suggest-error": "<p>NodeBB could not reach the package manager, proceed with installation of latest version?</p><div class=\"alert alert-danger\"><strong>Server returned (%1)</strong>: %2</div>",
+	"alert.package-manager-unreachable": "<p>NodeBB could not reach the package manager, an upgrade is not suggested at this time.</p>",
+	"alert.incompatible": "<p>Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.</p>",
+	"alert.possibly-incompatible": "<div class=\"alert alert-warning\"><p><strong>No Compatibility Information Found</strong></p><p>This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.</p></div><p>In the event that NodeBB cannot boot properly:</p><pre><code>$ ./nodebb reset plugin=\"%1\"</code></pre><p>Continue installation of latest version of this plugin?</p>",
+	"alert.reorder": "Plugins Re-ordered",
+	"alert.reorder-success": "Please rebuild and restart your NodeBB to fully complete the process.",
+
+	"license.title": "معلومات ترخيص الإضافة",
+	"license.intro": "The plugin <strong>%1</strong> is licensed under the %2. Please read and understand the license terms prior to activating this plugin.",
+	"license.cta": "هل ترغب بالاستمرار في تفعيل هذه الإضافة؟"
+}

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

@@ -0,0 +1,17 @@
+{
+	"rewards": "Rewards",
+	"condition-if-users": "If User's",
+	"condition-is": "Is:",
+	"condition-then": "Then:",
+	"max-claims": "Amount of times reward is claimable",
+	"zero-infinite": "Enter 0 for infinite",
+	"delete": "Delete",
+	"enable": "Enable",
+	"disable": "Disable",
+	"control-panel": "Rewards Control",
+	"new-reward": "New Reward",
+
+	"alert.delete-success": "Successfully deleted reward",
+	"alert.no-inputs-found": "Illegal reward - no inputs found!",
+	"alert.save-success": "Successfully saved rewards"
+}

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

@@ -0,0 +1,30 @@
+{
+	"available": "Available Widgets",
+	"explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.",
+	"none-installed": "No widgets found! Activate the essential widgets plugin in the <a href=\"%1\">plugins</a> control panel.",
+	"clone-from": "Clone widgets from",
+	"containers.available": "Available Containers",
+	"containers.explanation": "Drag and drop on top of any active widget",
+	"containers.none": "None",
+	"container.well": "Well",
+	"container.jumbotron": "Jumbotron",
+	"container.panel": "Panel",
+	"container.panel-header": "Panel Header",
+	"container.panel-body": "Panel Body",
+	"container.alert": "Alert",
+
+	"alert.confirm-delete": "Are you sure you wish to delete this widget?",
+	"alert.updated": "Widgets Updated",
+	"alert.update-success": "Successfully updated widgets",
+	"alert.clone-success": "Successfully cloned widgets",
+
+	"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

@@ -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/general/homepage.json

@@ -0,0 +1,8 @@
+{
+	"home-page": "Home Page",
+	"description": "Choose what page is shown when users navigate to the root URL of your forum.",
+	"home-page-route": "Home Page Route",
+	"custom-route": "Custom Route",
+	"allow-user-home-pages": "Allow User Home Pages",
+	"home-page-title": "Title of the home page (default \"Home\")"
+}

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

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

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

@@ -0,0 +1,23 @@
+{
+	"icon": "Icon:",
+	"change-icon": "change",
+	"route": "Route:",
+	"tooltip": "Tooltip:",
+	"text": "Text:",
+	"text-class": "Text Class: <small>optional</small>",
+	"class": "Class: <small>optional</small>",
+	"id": "ID: <small>optional</small>",
+
+	"properties": "Properties:",
+	"groups": "Groups:",
+	"open-new-window": "Open in a new window",
+
+	"btn.delete": "Delete",
+	"btn.disable": "Disable",
+	"btn.enable": "Enable",
+
+	"available-menu-items": "Available Menu Items",
+	"custom-route": "Custom Route",
+	"core": "core",
+	"plugin": "plugin"
+}

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

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

public/language/ar/admin/general/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/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

@@ -0,0 +1,81 @@
+{
+	"settings": "اعدادات القسم",
+	"privileges": "الصلاحيات",
+
+	"name": "Category Name",
+	"description": "Category Description",
+	"bg-color": "Background Colour",
+	"text-color": "Text Colour",
+	"bg-image-size": "Background Image Size",
+	"custom-class": "Custom Class",
+	"num-recent-replies": "# of Recent Replies",
+	"ext-link": "External Link",
+	"is-section": "Treat this category as a section",
+	"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",
+
+	"select-category": "Select Category",
+	"set-parent-category": "Set Parent Category",
+
+	"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.",
+	"privileges.section-group": "Group",
+	"privileges.group-private": "This group is private",
+	"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",
+	"analytics.pageviews-hourly": "<strong>Figure 1</strong> &ndash; Hourly page views for this category</small>",
+	"analytics.pageviews-daily": "<strong>Figure 2</strong> &ndash; Daily page views for this category</small>",
+	"analytics.topics-daily": "<strong>Figure 3</strong> &ndash; Daily topics created in this category</small>",
+	"analytics.posts-daily": "<strong>Figure 4</strong> &ndash; Daily posts made in this category</small>",
+
+	"alert.created": "Created",
+	"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!",
+	"alert.set-parent-category": "Set Parent Category",
+	"alert.updated": "Updated Categories",
+	"alert.updated-success": "Category IDs %1 successfully updated.",
+	"alert.upload-image": "Upload category image",
+	"alert.find-user": "Find a User",
+	"alert.user-search": "Search for a user here...",
+	"alert.find-group": "Find a Group",
+	"alert.group-search": "Search for a group here...",
+	"collapse-all": "Collapse All",
+	"expand-all": "Expand All",
+	"disable-on-create": "Disable on create"
+}

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 mnually 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

@@ -0,0 +1,41 @@
+{
+	"name": "اسم المجموعة",
+	"badge": "Badge",
+	"properties": "Properties",
+	"description": "Group Description",
+	"member-count": "Member Count",
+	"system": "System",
+	"hidden": "Hidden",
+	"private": "Private",
+	"edit": "Edit",
+	"search-placeholder": "Search",
+	"create": "Create Group",
+	"description-placeholder": "A short description about your group",
+	"create-button": "Create",
+
+	"alerts.create-failure": "<strong>Uh-Oh</strong><p>There was a problem creating your group. Please try again later!</p>",
+	"alerts.confirm-delete": "Are you sure you wish to delete this group?",
+
+	"edit.name": "Name",
+	"edit.description": "Description",
+	"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-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",
+	"edit.add-user-search": "Search Users",
+	"edit.members": "Member List",
+	"control-panel": "Groups Control Panel",
+	"revert": "Revert",
+
+	"edit.no-users-found": "No Users Found",
+	"edit.confirm-remove-user": "Are you sure you want to remove this user?",
+	"edit.save-success": "Changes saved!"
+}

public/language/ar/admin/manage/ip-blacklist.json

@@ -0,0 +1,19 @@
+{
+	"lead": "Configure your IP blacklist here.",
+	"description": "Occasionally, a user account ban is not enough of a deterrant. Other times, restricting access to the forum to a specific IP or a range of IPs is the best way to protect a forum. In these scenarios, you can add troublesome IP addresses or entire CIDR blocks to this blacklist, and they will be prevented from logging in to or registering a new account.",
+	"active-rules": "Active Rules",
+	"validate": "Validate Blacklist",
+	"apply": "Apply Blacklist",
+	"hints": "Syntax Hints",
+	"hint-1": "Define a single IP addresses per line. You can add IP blocks as long as they follow the CIDR format (e.g. <code>192.168.100.0/22</code>).",
+	"hint-2": "You can add in comments by starting lines with the <code>#</code> symbol.",
+
+	"validate.x-valid": "<strong>%1</strong> out of <strong>%2</strong> rule(s) valid.",
+	"validate.x-invalid": "The following <strong>%1</strong> rules are invalid:",
+
+	"alerts.applied-success": "Blacklist Applied",
+
+	"analytics.blacklist-hourly": "<strong>Figure 1</strong> &ndash; Blacklist hits per hour",
+	"analytics.blacklist-daily": "<strong>Figure 2</strong> &ndash; Blacklist hits per day",
+	"ip-banned": "IP banned"
+}

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

@@ -0,0 +1,11 @@
+{
+	"post-queue": "Post Queue",
+	"description": "There are no posts in the post queue. <br> To enable this feature, go to <a href=\"%1\">Settings &rarr; Post &rarr; Post Queue</a> and enable <strong>Post Queue</strong>.",
+	"user": "User",
+	"category": "Category",
+	"title": "Title",
+	"content": "Content",
+	"posted": "Posted",
+	"reply-to": "Reply to \"%1\"",
+	"content-editable": "You can click on individual content to edit before posting."
+}

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

@@ -0,0 +1,35 @@
+{
+	"global": "Global",
+	"global.no-users": "No user-specific global privileges.",
+	"group-privileges": "Group Privileges",
+	"user-privileges": "User 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"
+}

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

@@ -0,0 +1,20 @@
+{
+	"queue": "Queue",
+	"description": "There are no users in the registration queue. <br> To enable this feature, go to <a href=\"%1\">Settings &rarr; User &rarr; User Registration</a> and set <strong>Registration Type</strong> to \"Admin Approval\".",
+
+	"list.name": "Name",
+	"list.email": "Email",
+	"list.ip": "IP",
+	"list.time": "Time",
+	"list.username-spam": "Frequency: %1 Appears: %2 Confidence: %3",
+	"list.email-spam": "Frequency: %1 Appears: %2",
+	"list.ip-spam": "Frequency: %1 Appears: %2",
+
+	"invitations": "Invitations",
+	"invitations.description": "Below is a complete list of invitations sent. Use ctrl-f to search through the list by email or username. <br><br>The username will be displayed to the right of the emails for users who have redeemed their invitations.",
+	"invitations.inviter-username": "Inviter Username",
+	"invitations.invitee-email": "Invitee Email",
+	"invitations.invitee-username": "Invitee Username (if registered)",
+
+	"invitations.confirm-delete": "Are you sure you wish to delete this invitation?"
+} 

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

@@ -0,0 +1,19 @@
+{
+	"none": "Your forum does not have any topics with tags yet.",
+	"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.",
+	"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.",
+	"name": "Tag Name",
+
+	"alerts.editing-multiple": "Editing multiple tags",
+	"alerts.editing-x": "Editing \"%1\" tag",
+	"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

@@ -0,0 +1,109 @@
+{
+	"users": "المستخدمين",
+	"edit": "تحرير",
+	"make-admin": "Make Admin",
+	"remove-admin": "Remove Admin",
+	"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",
+	"download-csv": "Download CSV",
+	"manage-groups": "Manage Groups",
+	"add-group": "Add Group",
+	"invite": "Invite",
+	"new": "New User",
+
+	"pills.latest": "Latest Users",
+	"pills.unvalidated": "Not Validated",
+	"pills.no-posts": "No Posts",
+	"pills.top-posters": "Top Posters",
+	"pills.top-rep": "Most Reputation",
+	"pills.inactive": "Inactive",
+	"pills.flagged": "Most Flagged",
+	"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",
+	"search.username-placeholder": "Enter a username to search",
+	"search.email": "By Email",
+	"search.email-placeholder": "Enter a email to search",
+	"search.ip": "By IP Address",
+	"search.ip-placeholder": "Enter an IP Address to search",
+	"search.not-found": "User not found!",
+
+	"inactive.3-months": "3 months",
+	"inactive.6-months": "6 months",
+	"inactive.12-months": "12 months",
+
+	"users.uid": "uid",
+	"users.username": "username",
+	"users.email": "email",
+	"users.postcount": "postcount",
+	"users.reputation": "reputation",
+	"users.flags": "flags",
+	"users.joined": "joined",
+	"users.last-online": "last online",
+	"users.banned": "banned",
+
+	"create.username": "User Name",
+	"create.email": "Email",
+	"create.email-placeholder": "Email of this user",
+	"create.password": "Password",
+	"create.password-confirm": "Confirm Password",
+
+	"temp-ban.length": "Ban Length",
+	"temp-ban.reason": "Reason <span class=\"text-muted\">(Optional)</span>",
+	"temp-ban.hours": "Hours",
+	"temp-ban.days": "Days",
+	"temp-ban.explanation": "Enter the length of time for the ban. Note that a time of 0 will be a considered a permanent ban.",
+
+	"alerts.confirm-ban": "Do you really want to ban this user <strong>permanently</strong>?",
+	"alerts.confirm-ban-multi": "Do you really want to ban these users <strong>permanently</strong>?",
+	"alerts.ban-success": "User(s) banned!",
+	"alerts.button-ban-x": "Ban %1 user(s)",
+	"alerts.unban-success": "User(s) unbanned!",
+	"alerts.lockout-reset-success": "Lockout(s) reset!",
+	"alerts.flag-reset-success": "Flags(s) reset!",
+	"alerts.no-remove-yourself-admin": "You can't remove yourself as Administrator!",
+	"alerts.make-admin-success": "User is now administrator.",
+	"alerts.confirm-remove-admin": "Do you really want to remove this administrator?",
+	"alerts.remove-admin-success": "User is no longer administrator.",
+	"alerts.make-global-mod-success": "User is now global moderator.",
+	"alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?",
+	"alerts.remove-global-mod-success": "User is no longer global moderator.",
+	"alerts.make-moderator-success": "User is now moderator.",
+	"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.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.create": "Create User",
+	"alerts.button-create": "Create",
+	"alerts.button-cancel": "Cancel",
+	"alerts.error-passwords-different": "Passwords must match!",
+	"alerts.error-x": "<strong>Error</strong><p>%1</p>",
+	"alerts.create-success": "User created!",
+
+	"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."
+}

public/language/ar/admin/menu.json

@@ -0,0 +1,83 @@
+{
+	"section-general": "عام",
+	"general/dashboard": "اللوحة الرئيسية",
+	"general/homepage": "الصفحة الرئيسية",
+	"general/navigation": "التصفح",
+	"general/languages": "اللغات",
+	"general/sounds": "الأصوات",
+	"general/social": "شبكات التواصل",
+
+	"section-manage": "إدارة",
+	"manage/categories": "الأقسام",
+	"manage/privileges": "Privileges",
+	"manage/tags": "الكلمات المفتاحية",
+	"manage/users": "الأعضاء",
+	"manage/admins-mods": "Admins & Mods",
+	"manage/registration": "قائمة انتظار التسجيل",
+	"manage/post-queue": "قائمة انتظار المشاركة",
+	"manage/groups": "المجموعات",
+	"manage/ip-blacklist": "قائمة حظر عناوين IP",
+	"manage/uploads": "Uploads",
+	"manage/digest": "Digests",
+
+	"section-settings": "إعدادات",
+	"settings/general": "عامة",
+	"settings/reputation": "السمعة",
+	"settings/email": "البريد الإلكتروني",
+	"settings/user": "الأعضاء",
+	"settings/group": "المجموعات",
+	"settings/guest": "الزوار",
+	"settings/uploads": "الرفع",
+	"settings/post": "المشاركة",
+	"settings/chat": "الدردشة",
+	"settings/pagination": "ترقيم الصفحات",
+	"settings/tags": "الكلمات المفتاحية",
+	"settings/notifications": "التنبيهات",
+	"settings/cookies": "Cookies",
+	"settings/web-crawler": "Web Crawler",
+	"settings/sockets": "Sockets",
+	"settings/advanced": "Advanced",
+
+	"settings.page-title": "%1 Settings",
+
+	"section-appearance": "Appearance",
+	"appearance/themes": "Themes",
+	"appearance/skins": "Skins",
+	"appearance/customise": "Custom Content (HTML/JS/CSS)",
+
+	"section-extend": "Extend",
+	"extend/plugins": "Plugins",
+	"extend/widgets": "Widgets",
+	"extend/rewards": "Rewards",
+
+	"section-social-auth": "Social Authentication",
+
+	"section-plugins": "Plugins",
+	"extend/plugins.install": "Install Plugins",
+
+	"section-advanced": "Advanced",
+	"advanced/database": "Database",
+	"advanced/events": "Events",
+	"advanced/hooks": "Hooks",
+	"advanced/logs": "Logs",
+	"advanced/errors": "Errors",
+	"advanced/cache": "Cache",
+	"development/logger": "Logger",
+	"development/info": "Info",
+
+	"rebuild-and-restart-forum": "Rebuild & Restart Forum",
+	"restart-forum": "Restart Forum",
+	"logout": "Log out",
+	"view-forum": "View Forum",
+
+	"search.placeholder": "Search for settings",
+	"search.no-results": "No results...",
+	"search.search-forum": "Search the forum for <strong></strong>",
+	"search.keep-typing": "Type more to see results...",
+	"search.start-typing": "Start typing to see results...",
+
+	"connection-lost": "Connection to %1 has been lost, attempting to reconnect...",
+
+	"alerts.version": "Running <strong>NodeBB v%1</strong>",
+	"alerts.upgrade": "Upgrade to v%1"
+}

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

@@ -0,0 +1,28 @@
+{
+	"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.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.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)"
+}

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

@@ -0,0 +1,11 @@
+{
+	"chat-settings": "Chat Settings",
+	"disable": "Disable chat",
+	"disable-editing": "Disable chat message editing/deletion",
+	"disable-editing-help": "Administrators and global moderators are exempt from this restriction",
+	"max-length": "Maximum length of chat messages",
+	"max-room-size": "Maximum number of users in chat rooms",
+	"delay": "Time between chat messages in milliseconds",
+	"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

@@ -0,0 +1,12 @@
+{
+	"eu-consent": "EU Consent",
+	"consent.enabled": "تفعيل",
+	"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",
+	"blank-default": "Leave blank for default"
+}

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

@@ -0,0 +1,40 @@
+{
+	"email-settings": "Email Settings",
+	"address": "Email Address",
+	"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
+	"from": "From Name",
+	"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",
+	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
+	"smtp-transport.service": "Select a service",
+	"smtp-transport.service-custom": "Custom Service",
+	"smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.",
+	"smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to <a href=\"https://www.google.com/settings/security/lesssecureapps\">configure your GMail account to allow less secure apps</a>.",
+	"smtp-transport.gmail-warning2": "For more information about this workaround, <a href=\"https://nodemailer.com/usage/using-gmail/\">please consult this NodeMailer article on the issue.</a> An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. <a href=\"../extend/plugins\">Browse available plugins here</a>.",
+	"smtp-transport.host": "SMTP Host",
+	"smtp-transport.port": "SMTP Port",
+	"smtp-transport.security": "Connection security",
+	"smtp-transport.security-encrypted": "Encrypted",
+	"smtp-transport.security-starttls": "StartTLS",
+	"smtp-transport.security-none": "None",
+	"smtp-transport.username": "Username",
+	"smtp-transport.username-help": "<b>For the Gmail service,</b> enter the full email address here, especially if you are using a Google Apps managed domain.",
+	"smtp-transport.password": "Password",
+
+	"template": "Edit Email Template",
+	"template.select": "Select Email Template",
+	"template.revert": "Revert to Original",
+	"testing": "Email Testing",
+	"testing.select": "Select Email Template",
+	"testing.send": "Send Test Email",
+	"testing.send-help": "The test email will be sent to the currently logged in user's email address.",
+	"subscriptions": "Email 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

@@ -0,0 +1,35 @@
+{
+	"site-settings": "Site Settings",
+	"title": "Site Title",
+	"title.url": "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.show-in-header": "Show Site Title in Header",
+	"browser-title": "Browser Title",
+	"browser-title-help": "If no browser title is specified, the site title will be used",
+	"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",
+	"keywords-placeholder": "Keywords describing your community, comma-separated",
+	"logo": "Site Logo",
+	"logo.image": "Image",
+	"logo.image-placeholder": "Path to a logo to display on forum header",
+	"logo.upload": "Upload",
+	"logo.url": "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",
+	"log.alt-text-placeholder": "Alternative text for accessibility",
+	"favicon": "Favicon",
+	"favicon.upload": "Upload",
+	"touch-icon": "Homescreen/Touch Icon",
+	"touch-icon.upload": "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"
+}

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

@@ -0,0 +1,12 @@
+{
+	"general": "General",
+	"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-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

@@ -0,0 +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\""
+}

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

@@ -0,0 +1,7 @@
+{
+	"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"
+}

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

@@ -0,0 +1,10 @@
+{
+	"pagination": "Pagination Settings",
+	"enable": "Paginate topics and posts instead of using infinite scroll.",
+	"topics": "Topic Pagination",
+	"posts-per-page": "Posts per Page",
+	"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"
+}

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

@@ -0,0 +1,59 @@
+{
+	"sorting": "Post Sorting",
+	"sorting.post-default": "Default Post Sorting",
+	"sorting.oldest-to-newest": "Oldest to Newest",
+	"sorting.newest-to-oldest": "Newest to Oldest",
+	"sorting.most-votes": "Most Votes",
+	"sorting.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": "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-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",
+	"restrictions.max-post-length": "Maximum Post Length",
+	"restrictions.days-until-stale": "Days until topic is considered stale",
+	"restrictions.stale-help": "If a topic is considered \"stale\", then a warning will be shown to users who attempt to reply to that topic.",
+	"timestamp": "Timestamp",
+	"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",
+	"teaser.first": "First",
+	"unread": "Unread Settings",
+	"unread.cutoff": "Unread cutoff days",
+	"unread.min-track-last": "Minimum posts in topic before tracking last read",
+	"recent": "Recent Settings",
+	"recent.categoryFilter.disable": "Disable filtering of topics in ignored categories on the /recent page",
+	"signature": "Signature Settings",
+	"signature.disable": "Disable signatures",
+	"signature.no-links": "Disable links in signatures",
+	"signature.no-images": "Disable images in signatures",
+	"signature.max-length": "Maximum Signature Length",
+	"composer": "Composer Settings",
+	"composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.",
+	"composer.show-help": "Show \"Help\" tab",
+	"composer.enable-plugin-help": "Allow plugins to add content to the help tab",
+	"composer.custom-help": "Custom Help Text",
+	"ip-tracking": "IP Tracking",
+	"ip-tracking.each-post": "Track IP Address for each post",
+	"enable-post-history": "Enable Post History"
+}

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

@@ -0,0 +1,14 @@
+{
+	"reputation": "Reputation Settings",
+	"disable": "Disable Reputation System",
+	"disable-down-voting": "Disable Down Voting",
+	"votes-are-public": "All Votes Are Public",
+	"thresholds": "Activity Thresholds",
+	"min-rep-downvote": "Minimum reputation to downvote posts",
+	"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-profile-picture": "Minimum reputation to add \"Profile Picture\" to user profile",
+	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile"
+}

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

@@ -0,0 +1,6 @@
+{
+    "reconnection": "Reconnection Settings",
+    "max-attempts": "Max Reconnection Attempts",
+    "default-placeholder": "Default: %1",
+    "delay": "Reconnection Delay"
+}

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

@@ -0,0 +1,10 @@
+{
+    "tag": "Tag Settings",
+    "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.",
+    "related-topics": "Related Topics",
+    "max-related-topics": "Maximum related topics to display (if supported by theme)"
+}

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

@@ -0,0 +1,39 @@
+{
+	"posts": "المشاركات",
+	"allow-files": "السماح للأعضاء بتحميل الملفات الإعتيادية",
+	"private": "جعل الملفات التي تم رفعها خاصة",
+	"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": "إمتدادات الملفات المسموح بها",
+	"allowed-file-extensions-help": "أدخل قائمة بامتدادات الملفات مفصولة بفواصل (مثال: <code>pdf,xls,doc</code>). القائمة الفارغة تعني أن كل الامتدادات مسموح بها.",
+	"profile-avatars": "الصورة الرمزية للملف الشخصي",
+	"allow-profile-image-uploads": "السماح للأعضاء برفع الصور الرمزية",
+	"convert-profile-image-png": "تحويل إمتداد الصور الرمزية المرفوعه الى PNG",
+	"default-avatar": "الصورة الرمزية الافتراضية",
+	"upload": "رفع",
+	"profile-image-dimension": "أبعاد الصورة الرمزية",
+	"profile-image-dimension-help": "(بالبكسل، الافتراضي: 128 بكسل)",
+	"max-profile-image-size": "الحد الأقصى لحجم الصورة الرمزية",
+	"max-profile-image-size-help": "(بالكيبيبايت، الافتراضي: 256)",
+	"max-cover-image-size": "الحد الأقصى لحجم صورة الغلاف",
+	"max-cover-image-size-help": "(بالكيبيبايت، الافتراضي: 2,048)",
+	"keep-all-user-images": "الاحتفاظ بالنسخ القديمة من الصور الرمزية وصور الغلاف في السيرفر",
+	"profile-covers": "غلاف الملف الشخصي",
+	"default-covers": "صورة الغلاف الافتراضية",
+	"default-covers-help": "اضف صور الغلاف الافتراضية متبوعة بفواصل لاستخدامها في الحسابات التي لا تحتوي على صور غلاف مرفوعة"
+}

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

@@ -0,0 +1,79 @@
+{
+	"authentication": "المصادقة",
+	"require-email-confirmation": "يطلب تأكيد البريد الإلكتروني",
+	"email-confirm-interval": "لا يمكن للمستخدم إعادة إرسال رسالة تأكيد البريد الالكتروني حتى مرور",
+	"email-confirm-email2": "دقائق",
+	"allow-login-with": "السماح بتسجيل الدخول باستخدام",
+	"allow-login-with.username-email": "اسم المستخدم أو البريد الالكتروني",
+	"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://eugdpr.org/the-regulation/gdpr-faqs/\">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": "السماح بحذف الحساب",
+	"hide-fullname": "إخفاء الإسم الكامل عن المستخدمين",
+	"hide-email": "إخفاء البريد الإلكتروني عن المستخدمين",
+	"themes": "القوالب",
+	"disable-user-skins": "منع المستخدمين من اختيار سمة مخصص",
+	"account-protection": "حماية الحساب",
+	"admin-relogin-duration": "المدة حتى طلب إعادة تسجيل الدخول للإدارة (دقائق)",
+	"admin-relogin-duration-help": "بعد مرور وقت معين، يتوجب إعادة تسجيل الدخول للوصول إلى قسم الإدارة، قم بتعيين القيمة الى 0 لتعطيل الخيار",
+	"login-attempts": "عدد محاولات تسجيل الدخول في الساعة",
+	"login-attempts-help": "إذا تجاوزت محاولات تسجيل الدخول لمستخدم معين العدد المحدد، فسوف يتم تأمين الحساب ومنعه من الدخول لمدة من الوقت",
+	"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": "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> هذا الخيار يعمل فقط عند تحديد خيار \"بالدعوات فقط\"",
+	"invite-expiration": "مدة صلاحية الدعوة",
+	"invite-expiration-help": "عدد الأيام حتى انتهاء صلاحية الدعوة.",
+	"min-username-length": "الحد الأدنى لطول اسم المستخدم",
+	"max-username-length": "الحد الأقصى لطول اسم المستخدم",
+	"min-password-length": "الحد الأدنى لطول كلمة المرور",
+	"min-password-strength": "الحد الأدنى لقوة كلمة المرور",
+	"max-about-me-length": "الحد الأعلى من الأحرف في حقل \"عني\"",
+	"terms-of-use": "شروط استخدام المنتدى <small>(تترك فارغة لتعطيلها)</small>",
+	"user-search": "بحث الأعضاء",
+	"user-search-results-per-page": "عدد النتائج المراد عرضها",
+	"default-user-settings": "إعدادات الأعضاء الافتراضية",
+	"show-email": "عرض البريد الإلكتروني",
+	"show-fullname": "عرض الاسم الكامل",
+	"restrict-chat": "السماح فقط برسائل الدردشة من المستخدمين الذين أتبعهم",
+	"outgoing-new-tab": "Open outgoing links in new tab",
+	"topic-search": "Enable In-Topic Searching",
+	"digest-freq": "Subscribe to Digest",
+	"digest-freq.off": "Off",
+	"digest-freq.daily": "Daily",
+	"digest-freq.weekly": "Weekly",
+	"digest-freq.monthly": "Monthly",
+	"email-chat-notifs": "Send an email if a new chat message arrives and I am not online",
+	"email-post-notif": "Send an email when replies are made to topics I am subscribed to",
+	"follow-created-topics": "Follow topics you create",
+	"follow-replied-topics": "Follow topics that you reply to",
+	"default-notification-settings": "Default notification settings",
+	"categoryWatchState": "Default category watch state",
+	"categoryWatchState.watching": "Watching",
+	"categoryWatchState.notwatching": "Not Watching",
+	"categoryWatchState.ignoring": "Ignoring"
+}

public/language/ar/admin/settings/web-crawler.json

@@ -0,0 +1,10 @@
+{
+	"crawlability-settings": "Crawlability Settings",
+	"robots-txt": "Custom Robots.txt <small>Leave blank for default</small>",
+	"sitemap-feed-settings": "Sitemap & Feed Settings",
+	"disable-rss-feeds": "Disable RSS Feeds",
+	"disable-sitemap-xml": "Disable Sitemap.xml",
+	"sitemap-topics": "Number of Topics to display in the Sitemap",
+	"clear-sitemap-cache": "Clear Sitemap Cache",
+	"view-sitemap": "View Sitemap"
+}

public/language/ar/category.json

@@ -1,20 +1,22 @@
 {
-    "category": "فئة",
-    "subcategories": "فئة فرعية",
+    "category": "قسم",
+    "subcategories": "قسم فرعي",
     "new_topic_button": "موضوع جديد",
-    "guest-login-post": "سجل بالدخول للرد",
-    "no_topics": "<strong>لا توجد مواضيع في هذه الفئة</strong>لم لا تحاول إنشاء موضوع؟<br />",
+    "guest-login-post": "سجل الدخول للمشاركة",
+    "no_topics": "<strong>لا توجد مواضيع في هذه القسم</strong>لم لا تحاول إنشاء موضوع؟<br />",
     "browsing": "تصفح",
     "no_replies": "لم يرد أحد",
     "no_new_posts": "لا توجد مشاركات جديدة.",
-    "share_this_category": "انشر هذه الفئة",
     "watch": "تابع",
     "ignore": "تجاهل",
     "watching": "متابع",
+    "not-watching": "لست متابع",
     "ignoring": "متجاهل",
-    "watching.description": "أظهر المواضيع في غير مقروء",
-    "ignoring.description": "لا تظهر المواضيع في غير مقروء",
-    "watch.message": "أنت اﻷن تتابع تحديثات هذه الفئة",
-    "ignore.message": "أنت اﻷن تتجاهل تحديثات هذه الفئة",
-    "watched-categories": "الفئات المتابعة"
+    "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,36 +1,52 @@
 {
-    "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.ctr": "إضغط هنا لإنشاء حسابك",
+    "invitation.text2": "Your invitation will expire in %1 days.",
+    "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.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.",
+    "banned.text3": "This is the reason why you have been banned:",
     "closing": "شكرًا لك!"
 }

public/language/ar/error.json

@@ -1,34 +1,46 @@
 {
     "invalid-data": "بيانات غير صحيحة",
+    "invalid-json": "Invalid JSON",
     "not-logged-in": "لم تقم بتسجيل الدخول",
     "account-locked": "تم حظر حسابك مؤقتًا.",
     "search-requires-login": "البحث في المنتدى يتطلب حساب - الرجاء تسجيل الدخول أو التسجيل",
+    "goback": "Press back to return to the previous page",
     "invalid-cid": "قائمة غير موجودة",
     "invalid-tid": "موضوع غير متواجد",
     "invalid-pid": "رد غير موجود",
     "invalid-uid": "مستخدم غير موجود",
     "invalid-username": "اسم المستخدم غير مقبول",
     "invalid-email": "البريد الاكتروني غير مقبول",
-    "invalid-title": "عنوان غير صحيح",
+    "invalid-fullname": "Invalid Fullname",
+    "invalid-location": "Invalid Location",
+    "invalid-birthday": "Invalid Birthday",
+    "invalid-title": "Invalid title",
     "invalid-user-data": "بيانات المستخدم غير صحيحة",
     "invalid-password": "كلمة السر غير مقبولة",
+    "invalid-login-credentials": "Invalid login credentials",
     "invalid-username-or-password": "المرجود تحديد اسم مستخدم و كلمة مرور",
     "invalid-search-term": "كلمة البحث غير صحيحة",
+    "invalid-url": "Invalid URL",
+    "local-login-disabled": "Local login system has been disabled for non-privileged accounts.",
     "csrf-invalid": "لم تتمكن من تسجيل الدخول. هنالك أحتمال ان جلستك انتهت. رجاءًا حاول مرة اخرى.",
     "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)",
     "user-too-new": "عذرا, يجب أن تنتظر 1% ثواني قبل قيامك بأول مشاركة",
     "blacklisted-ip": "نأسف، لقد تم حظرك من استخدام وتصفح المنتدى. إذا كنت تعتقد أن هذا خطأ رجاءًا اتصل بالإدارة. ",
     "ban-expiry-missing": "رجاءًا ضع تاريخ نهاية الحظر. ",
@@ -41,27 +53,28 @@
     "no-privileges": "لاتملك الصلاحيات اللازمة للقيام بهذه العملية",
     "category-disabled": "قائمة معطلة",
     "topic-locked": "الموضوع مقفول",
-    "post-edit-duration-expired": "مسموح لك بتعديل مشاركتك بعد %1  ثانية من نشرها.",
-    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
-    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
-    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
-    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
-    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
-    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
-    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
-    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
-    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
-    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
-    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
-    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
-    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
-    "cant-delete-topic-has-reply": "You can't delete your topic after it has a reply",
-    "cant-delete-topic-has-replies": "You can't delete your topic after it has %1 replies",
-    "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
-    "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
-    "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
-    "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 character(s).",
-    "too-many-posts": "You can only post once every %1 second(s) - please wait before posting again",
+    "post-edit-duration-expired": "يسمح لك بتعديل مشاركتك حتى %1 ثانية من نشرها",
+    "post-edit-duration-expired-minutes": "يسمح لك بتعديل مشاركتك حتى %1 دقيقة من نشرها",
+    "post-edit-duration-expired-minutes-seconds": "يسمح لك بتعديل مشاركتك حتى  %1 دقيقة و %2  ثوان من نشرها",
+    "post-edit-duration-expired-hours": "يسمح لك بتعديل مشاركتك حتى %1 ساعة من نشرها",
+    "post-edit-duration-expired-hours-minutes": "يسمح لك بتعديل مشاركتك حتى  %1 ساعة و %2  دقيقة من نشرها",
+    "post-edit-duration-expired-days": "يسمح لك بتعديل مشاركتك حتى %1 يوم من نشرها",
+    "post-edit-duration-expired-days-hours": "يسمح لك بتعديل مشاركتك حتى  %1 يوم و %2  ساعة من نشرها",
+    "post-delete-duration-expired": "يسمح لك بحذف مشاركتك حتى %1 ثانية من نشرها",
+    "post-delete-duration-expired-minutes": "يسمح لك بحذف مشاركتك حتى %1 دقيقة من نشرها",
+    "post-delete-duration-expired-minutes-seconds": "يسمح لك بحذف مشاركتك حتى  %1 دقيقة و %2  ثوان من نشرها",
+    "post-delete-duration-expired-hours": "يسمح لك بحذف مشاركتك حتى %1 ساعة من نشرها",
+    "post-delete-duration-expired-hours-minutes": "يسمح لك بحذف مشاركتك حتى  %1 ساعة و %2  دقيقة من نشرها",
+    "post-delete-duration-expired-days": "يسمح لك بحذف مشاركتك حتى %1 يوم من نشرها",
+    "post-delete-duration-expired-days-hours": "يسمح لك بحذف مشاركتك حتى  %1 يوم و %2  ساعة من نشرها",
+    "cant-delete-topic-has-reply": "لا يمكنك حذف مشاركة تم الرد عليها",
+    "cant-delete-topic-has-replies": "لا يمكنك حذف مشاركة حصدت %1 ردود",
+    "content-too-short": "يرجى ادخال موضوع أطول. على المواضيع أن تحتوي على %1 حرف على الأقل.",
+    "content-too-long": "يرجى ادخال موضوع أقصر. على المواضيع أن لا تتخطى %1 حرف.",
+    "title-too-short": "يرجى إدخال عنوان أطول. على العناوين أن تحتوي على %1 حرف على الأقل.",
+    "title-too-long": "يرجى ادخال عنوان أقصر. على العناوين أن لا تتخطى %1 حرف.",
+    "category-not-selected": "Category not selected.",
+    "too-many-posts": "يسمح لك بالنشر مرة كل %1 ثانية - يرجى الإنتظار قبل النشر مجدداً",
     "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
     "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",
     "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 character(s)",
@@ -70,14 +83,17 @@
     "still-uploading": "الرجاء الانتظار حتى يكتمل الرفع.",
     "file-too-big": "الحد الأقصى لرفع الملفات %1 كيلو بت. رجاءًا ارفع ملف أصغر",
     "guest-upload-disabled": "خاصية رفع الملفات غير مفعلة للزوار.",
-    "already-favourited": "سبق وفضلت هذه المشاركة.",
-    "already-unfavourited": "لقد ازلت هذه المشاركةمن المفضلة من قبل ألا تذكر؟",
+    "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": "لايمكن حظر مدبر نظام آخر.",
     "cant-remove-last-admin": "رجاءًا ، أضف مدير أخر قبل حذف صلاحيات الإدارة من حسابك.",
     "cant-delete-admin": "رجاءًا أزل صلاحيات الإدارة قبل حذف الحساب. ",
+    "invalid-image": "Invalid image",
     "invalid-image-type": "نوع الصورة غير مدعوم. الأنواع المدعومة هي :  %1",
     "invalid-image-extension": "امتداد الصورة غير مدعوم.",
-    "invalid-file-type": "Invalid file type. Allowed types are: %1",
+    "invalid-file-type": "صيغة الملف غير مدعومة. الأنواع المدعومة هي: %1",
+    "invalid-image-dimensions": "Image dimensions are too big",
     "group-name-too-short": "اسم المجموعة قصير",
     "group-name-too-long": "اسم المجموعة طويل.",
     "group-already-exists": "المجموعة موجودة مسبقا",
@@ -85,13 +101,15 @@
     "group-already-member": "أنت عضو في هذه المجموعة.",
     "group-not-member": "أنت لست عضو في هذه المجموعة.",
     "group-needs-owner": "هذه المجموعة تتطلب مالك واحد على اﻷقل",
-    "group-already-invited": "المستخدم مدعُو بالفعل.",
-    "group-already-requested": "Your membership request has already been submitted",
+    "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": "سبق وتم حذف هذا الموضوع",
     "topic-already-restored": "سبق وتم إلغاء حذف هذا الرد",
-    "cant-purge-main-post": "You can't purge the main post, please delete the topic instead",
+    "cant-purge-main-post": "لا يمكنك محو المشاركة الأساسية، يرجى حذف الموضوع بدلاً عن ذلك",
     "topic-thumbnails-are-disabled": "الصور المصغرة غير مفعلة.",
     "invalid-file": "ملف غير مقبول",
     "uploads-are-disabled": "رفع الملفات غير مفعل",
@@ -102,28 +120,47 @@
     "chat-disabled": "نظام المحادثة معطل.",
     "too-many-messages": "لقد أرسلت الكثير من الرسائل، الرجاء اﻹنتظار قليلاً",
     "invalid-chat-message": "الرسالة غير صالحة.",
-    "chat-message-too-long": "الرسالة طويلة.",
+    "chat-message-too-long": "Chat messages can not be longer than %1 characters.",
     "cant-edit-chat-message": "غير مصرح لك بتعديل الرسالة.",
     "cant-remove-last-user": "لأيمكنك إزالت اخر مستخدم.",
     "cant-delete-chat-message": "غير مصرح لك بحذف الرسالة.",
+    "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.",
     "already-voting-for-this-post": "لقد شاركت بالتصويت ، ألا تذكر؟",
     "reputation-system-disabled": "نظام السمعة معطل",
     "downvoting-disabled": "التصويتات السلبية معطلة",
     "not-enough-reputation-to-downvote": "ليس لديك سمعة تكفي لإضافة صوت سلبي لهذا الموضوع",
     "not-enough-reputation-to-flag": "ليس لديك سمعة تكفي للإشعار بموضوع مخل",
+    "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",
+    "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",
     "already-flagged": "لقد بلغت عن هذه المشاركة من قبل.",
+    "self-vote": "You cannot vote on your own post",
     "reload-failed": "المنتدى واجه مشكلة أثناء إعادة التحميل: \"%1\".  سيواصل المنتدى خدمة العملاء السابقين لكن يجب عليك إلغاء أي تغيير قمت به قبل إعادة التحميل.",
     "registration-error": "حدث خطأ أثناء التسجيل",
     "parse-error": "حدث خطأ ما أثناء تحليل استجابة الخادم",
     "wrong-login-type-email": "الرجاء استعمال بريدك اﻹلكتروني للدخول",
     "wrong-login-type-username": "الرجاء استعمال اسم المستخدم الخاص بك للدخول",
-    "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
-    "no-session-found": "No login session found!",
+    "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first",
+    "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.",
+    "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": "It looks like your login session is no longer active, or no longer matches with the server. Please refresh this page."
+    "invalid-session-text": "يبدو أن فترة التسجيل لم تعد قائمة او هي غير مطابقة مع الخادم. يرجى إعادة تحميل هذه الصفحة.",
+    "no-topics-selected": "No topics selected!",
+    "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

@@ -0,0 +1,66 @@
+{
+	"state": "State",
+	"reporter": "Reporter",
+	"reported-at": "Reported At",
+	"description": "Description",
+	"no-flags": "Hooray! No flags found.",
+	"assignee": "Assignee",
+	"update": "Update",
+	"updated": "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-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-assignee": "Assignee UID",
+	"filter-cid": "Category",
+	"filter-quick-mine": "Assigned to me",
+	"filter-cid-all": "All categories",
+	"apply-filters": "Apply Filters",
+
+	"quick-links": "Quick Links",
+	"flagged-user": "Flagged User",
+	"view-profile": "View Profile",
+	"start-new-chat": "Start New Chat",
+	"go-to-target": "View Flag Target",
+
+	"user-view": "View Profile",
+	"user-edit": "Edit Profile",
+
+	"notes": "Flag Notes",
+	"add-note": "Add Note",
+	"no-notes": "No shared notes.",
+
+	"history": "Flag History",
+	"back": "Back to Flags List",
+	"no-history": "No flag history.",
+
+	"state-all": "All states",
+	"state-open": "New/Open",
+	"state-wip": "Work in Progress",
+	"state-resolved": "Resolved",
+	"state-rejected": "Rejected",
+	"no-assignee": "Not Assigned",
+	"note-added": "Note Added",
+
+	"modal-title": "Report Inappropriate Content",
+	"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
+	"modal-reason-spam": "Spam",
+	"modal-reason-offensive": "Offensive",
+	"modal-reason-other": "Other (specify below)",
+	"modal-reason-custom": "Reason for reporting this content...",
+	"modal-submit": "Submit Report",
+	"modal-submit-success": "Content has been flagged for moderation.",
+	"modal-submit-confirm": "Confirm Submission",
+	"modal-submit-confirm-text": "You have a custom reason specified already. Are you sure you wish to submit via quick-report?",
+	"modal-submit-confirm-text-help": "Submitting a quick report will overwrite any custom reasons defined."
+}

public/language/ar/global.json

@@ -4,7 +4,7 @@
     "buttons.close": "أغلق",
     "403.title": "غير مسموح بالدخول",
     "403.message": "يبدو أنك قد تعثرت على صفحة لا تمتلك الصلاحية للدخول إليها",
-    "403.login": "حاول أن  <a href='%1/login'>تسجل دخولك</a>.",
+    "403.login": "ربما يجب عليك  <a href='%1/login'>تسجل دخولك</a>.",
     "404.title": "لم يتم العثور",
     "404.message": "الصفحة غير موجودة. العودة لـ <a href='%1/'>الرئيسية</a>",
     "500.title": "خطأ داخلي",
@@ -13,18 +13,19 @@
     "400.message": "الرابط غير صحيح. رجاءًا تأكد من الرابط أو ارجع لـ <a href='%1/'>الرئيسية</a>",
     "register": "تسجيل",
     "login": "دخول",
-    "please_log_in": "المرجو تسجيل الدخول",
+    "please_log_in": "الرجاء تسجيل الدخول",
     "logout": "تسجيل الخروج",
     "posting_restriction_info": "إضافة مشاركات جديد حكر على الأعضاء المسجلين، انقر هنا لتسجيل الدخول.",
     "welcome_back": "مرحبًا بعودتك",
     "you_have_successfully_logged_in": "تم سجيل الدخول بنجاح",
     "save_changes": "حفظ التغييرات",
+    "save": "حفظ",
     "close": "أغلق",
     "pagination": "الصفحات",
     "pagination.out_of": "%1 من %2",
     "pagination.enter_index": "أدخل الرقم التسلسلي",
-    "header.admin": "مدبر نظام",
-    "header.categories": "الفئات",
+    "header.admin": "مدير النظام",
+    "header.categories": "الأقسام",
     "header.recent": "حديث",
     "header.unread": "غير مقروء",
     "header.tags": "وسم",
@@ -36,9 +37,9 @@
     "header.search": "بحث",
     "header.profile": "ملف",
     "header.navigation": "الاستكشاف",
-    "notifications.loading": "تحميل التبليغات",
+    "notifications.loading": "تحميل التنبيهات",
     "chats.loading": "تحميل الدردشات",
-    "motd.welcome": "مرحبا بكم  NodeBB، منصة مناقشة المستقبل",
+    "motd.welcome": "مرحبا بكم في NodeBB، منصة المناقشة المستقبلية.",
     "previouspage": "الصفحة السابقة",
     "nextpage": "الصفحة التالية",
     "alert.success": "نجاح",
@@ -47,17 +48,19 @@
     "alert.banned.message": "لقد تم حظر حسابك. سيتم تسجيل الخروج.",
     "alert.unfollow": "أنت لا تتابع %1 بعد الآن!",
     "alert.follow": "أنت الآن تتابع %1!",
-    "online": "المتواجدون حاليًّا",
     "users": "الأعضاء",
     "topics": "المواضيع",
     "posts": "المشاركات",
     "best": "الأفضل",
+    "votes": "Votes",
     "upvoters": "الموافقين",
     "upvoted": "مصوت بالموجب",
     "downvoters": "مصوتين بالسالب",
     "downvoted": "مصوت بالسالب",
     "views": "المشاهدات",
     "reputation": "السمعة",
+    "lastpost": "Last post",
+    "firstpost": "First post",
     "read_more": "اقرأ المزيد",
     "more": "المزيد",
     "posted_ago_by_guest": "كتب %1 بواسطة زائر",
@@ -74,6 +77,8 @@
     "norecenttopics": "لاوجود لمواضيع جديدة",
     "recentposts": "آخر المشاركات",
     "recentips": "آخر عناوين ال IP التي سجلت الدخول",
+    "moderator_tools": "أدوات المشرف",
+    "online": "المتواجدون حاليًّا",
     "away": "غير متواجد",
     "dnd": "عدم الإزعاج",
     "invisible": "مخفي",
@@ -82,8 +87,9 @@
     "language": "اللغة",
     "guest": "زائر",
     "guests": "الزوار",
+    "former_user": "A Former User",
     "updated.title": "تم تحديث المنتدى",
-    "updated.message": "لقد تم تحديث المنتدى إلى آخر نسخة للتو. المرجو إعادة تحميل الصفحة.",
+    "updated.message": "لقد تم تحديث المنتدى إلى آخر نسخة للتو. إضغط هنا لإعادة تحميل الصفحة.",
     "privacy": "الخصوصية",
     "follow": "متابعة",
     "unfollow": "إلغاء المتابعة",
@@ -94,7 +100,16 @@
     "enter_page_number": "ادخل رقم الصفحة",
     "upload_file": "ارفع ملف",
     "upload": "ارفع",
+    "uploads": "Uploads",
     "allowed-file-types": "صيغ الملفات المدعومة هي 1%",
-    "unsaved-changes": "لديك تغييرات لم تحفظ. هل أنت متأكد من تغيير الصفحة؟",
-    "reconnecting-message": "يبدو أن اتصالك لـ %1 قد فقد. رجاءًا أنتظر ثم حاول الإتصال مرة اخرى."
+    "unsaved-changes": "لديك تغييرات لم تحفظ. هل أنت متأكد من رغبتك بمغادرة الصفحة؟",
+    "reconnecting-message": "يبدو أن اتصالك لـ %1 قد فقد. رجاءًا أنتظر ثم حاول الإتصال مرة اخرى.",
+    "play": "تشغيل",
+    "cookies.message": "هذا الموقع يستخدم ملفات تعريف الارتباط لضمان حصولك على أفضل تجربة على موقعنا.",
+    "cookies.accept": "فهمت الأمر!",
+    "cookies.learn_more": "أعرف المزيد",
+    "edited": "حُرِر",
+    "disabled": "معطل",
+    "select": "تحديد",
+    "user-search-prompt": "Type something here to find users..."
 }

public/language/ar/groups.json

@@ -25,8 +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": "عدد اﻷعضاء",
@@ -34,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": "في حالة تفعيل الخيار، الانضمام إلى المجموعة يستلزم قبول مالكها",
@@ -45,10 +49,15 @@
     "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"
+    "upload-group-cover": "Upload group cover",
+    "bulk-invite-instructions": "Enter a list of comma separated usernames to invite to this group",
+    "bulk-invite": "Bulk Invite",
+    "remove_group_cover_confirm": "Are you sure you want to remove the cover picture?"
 }

public/language/ar/login.json

@@ -5,8 +5,8 @@
     "remember_me": "تذكرني؟",
     "forgot_password": "نسيت كلمة المرور؟",
     "alternative_logins": "تسجيلات الدخول البديلة",
-    "failed_login_attempt": "Login Unsuccessful",
+    "failed_login_attempt": "تسجيل الدخول غير ناجح",
     "login_successful": "قمت بتسجيل الدخول بنجاح!",
     "dont_have_account": "لا تملك حساب؟",
-    "logged-out-due-to-inactivity": "You have been logged out of the Admin Control Panel due to inactivity"
+    "logged-out-due-to-inactivity": "لقد تم تسجيل خروجك من لوحة تحكم بسبب عدم نشاطك"
 }

public/language/ar/modules.json

@@ -1,5 +1,5 @@
 {
-    "chat.chatting_with": "الدردشة مع <span id=\"chat-with-name\"></span>",
+    "chat.chatting_with": "Chat with",
     "chat.placeholder": "أكتب رسالة دردشة هنا، اضغط ENTER للإرسال",
     "chat.send": "أرسل",
     "chat.no_active": "لا يوجد لديك دردشات نشطة.",
@@ -12,14 +12,31 @@
     "chat.recent-chats": "آخر الدردشات",
     "chat.contacts": "الأصدقاء",
     "chat.message-history": "تاريخ الرسائل",
+    "chat.options": "Chat options",
     "chat.pop-out": "افتح الدردشة في نافذة خاصة",
+    "chat.minimize": "Minimize",
     "chat.maximize": "تكبير",
     "chat.seven_days": "7 أيام",
     "chat.thirty_days": "30 يومًا",
     "chat.three_months": "3 أشهر",
     "chat.delete_message_confirm": "هل أنت متأكد من أنك تريد حذف هذه الرسالة؟",
-    "chat.roomname": "Chat Room %1",
-    "chat.add-users-to-room": "Add users to room",
+    "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 (<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",
+    "chat.rename-help": "The room name set here will be viewable by all participants in the room.",
+    "chat.leave": "Leave Chat",
+    "chat.leave-prompt": "Are you sure you wish to leave this chat?",
+    "chat.leave-help": "Leaving this chat will remove you from future correspondence in this chat. If you are re-added in the future, you will not see any chat history from prior to your re-joining.",
+    "chat.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": "إخفاء المعاينة",
@@ -33,11 +50,13 @@
     "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",
     "bootbox.ok": "OK",
     "bootbox.cancel": "إلغاء",
     "bootbox.confirm": "تأكيد",

public/language/ar/notifications.json

@@ -5,11 +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": "لديك تنبيه جديد",
     "you_have_unread_notifications": "لديك تنبيهات غير مقروءة.",
+    "all": "الكل",
+    "topics": "مواضيع",
+    "replies": "ردود",
+    "chat": "محادثات",
+    "follows": "متابعون",
+    "upvote": "الموافقين",
+    "new-flags": "New Flags",
+    "my-flags": "Flags assigned to me",
+    "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>.",
@@ -19,6 +28,9 @@
     "user_flagged_post_in": "<strong>%1</strong> أشعَرَ بمشاركة مخلة في <strong>%2</strong>",
     "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
     "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
+    "user_flagged_user": "<strong>%1</strong> flagged a user profile (%2)",
+    "user_flagged_user_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a user profile (%3)",
+    "user_flagged_user_multiple": "<strong>%1</strong> and %2 others flagged a user profile (%3)",
     "user_posted_to": "<strong>%1</strong> أضاف ردا إلى: <strong>%2</strong>",
     "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>",
@@ -28,8 +40,25 @@
     "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": "تم تخصيص العلامة 1%  لك",
+    "post_awaiting_review": "Post awaiting review",
     "email-confirmed": "تم التحقق من عنوان البريد الإلكتروني",
     "email-confirmed-message": "شكرًا على إثبات صحة عنوان بريدك الإلكتروني. صار حسابك مفعلًا بالكامل.",
     "email-confirm-error-message": "حدث خطأ أثناء التحقق من عنوان بريدك الإلكتروني. ربما رمز التفعيل خاطئ أو انتهت صلاحيته.",
-    "email-confirm-sent": "تم إرسال بريد التفعيل."
+    "email-confirm-sent": "تم إرسال بريد التفعيل.",
+    "none": "None",
+    "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_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",
+    "notificationType_new-user-flag": "When a user is flagged"
 }

public/language/ar/pages.json

@@ -1,46 +1,62 @@
 {
     "home": "الصفحة الرئيسية",
     "unread": "المواضيع الغير مقروءة",
-    "popular-day": "Popular topics today",
-    "popular-week": "Popular topics this week",
-    "popular-month": "Popular topics this month",
-    "popular-alltime": "All time popular topics",
+    "popular-day": "المواضيع الشائعة اليوم",
+    "popular-week": "المواضيع الشائعة هذا الأسبوع",
+    "popular-month": "المواضيع الشائعة هذا الشهر",
+    "popular-alltime": "المواضيع الشائعة منذ القدم",
     "recent": "المواضيع الحديثة",
-    "flagged-posts": "Flagged Posts",
+    "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",
+    "post-queue": "Post Queue",
     "users/online": "اﻷعضاء المتصلون",
     "users/latest": "أحدث اﻷعضاء",
-    "users/sort-posts": "Users with the most posts",
-    "users/sort-reputation": "Users with the most reputation",
-    "users/banned": "Banned Users",
+    "users/sort-posts": "الأعضاء الأكثر نشاطاً",
+    "users/sort-reputation": "الأعضاء الأفضل سمعة",
+    "users/banned": "الأعضاء المحظورون",
     "users/most-flags": "Most flagged users",
-    "users/search": "User Search",
+    "users/search": "بحث عن مستخدم",
     "notifications": "التنبيهات",
     "tags": "الكلمات الدلالية",
-    "tag": "Topics tagged under \"%1\"",
+    "tag": "Topics tagged under "%1"",
     "register": "تسجيل حساب",
-    "login": "Login to your account",
+    "registration-complete": "Registration complete",
+    "login": "سجل الدخول الى حسابك",
     "reset": "إعادة تعيين كلمة مرور حسابك",
     "categories": "الفئات",
     "groups": "المجموعات",
-    "group": "%1 group",
-    "chats": "Chats",
+    "group": "%1 مجموعة",
+    "chats": "محادثات",
     "chat": "Chatting with %1",
+    "flags": "Flags",
+    "flag-details": "Flag %1 Details",
     "account/edit": "Editing \"%1\"",
     "account/edit/password": "Editing password of \"%1\"",
     "account/edit/username": "Editing username of \"%1\"",
     "account/edit/email": "Editing email of \"%1\"",
-    "account/info": "Account Info",
+    "account/info": "معلومات الحساب",
     "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/favourites": "%1's Bookmarked Posts",
-    "account/settings": "User Settings",
+    "account/watched_categories": "%1's Watched Categories",
+    "account/bookmarks": "%1's Bookmarked Posts",
+    "account/settings": "خيارات المستخدم",
     "account/watched": "Topics watched by %1",
+    "account/ignored": "Topics ignored by %1",
     "account/upvoted": "Posts upvoted by %1",
     "account/downvoted": "Posts downvoted by %1",
     "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/recent.json

@@ -6,7 +6,7 @@
     "year": "سنة",
     "alltime": "دائمًا",
     "no_recent_topics": "لايوجد مواضيع جديدة",
-    "no_popular_topics": "There are no popular topics.",
+    "no_popular_topics": "لا يوجد مواضيع شائعة",
     "there-is-a-new-topic": "يوجد موضوع جديد",
     "there-is-a-new-topic-and-a-new-post": "يوجد موضوع جديد و رد جديد",
     "there-is-a-new-topic-and-new-posts": "يوجد موضوع جديد و %1 ردود جديدة ",

public/language/ar/register.json

@@ -2,8 +2,8 @@
     "register": "تسجيل",
     "cancel_registration": "إلغاء التسجيل",
     "help.email": "افتراضيا، سيتم إخفاء بريدك الإلكتروني من العامة.",
-    "help.username_restrictions": "اسم مستخدم فريدة من نوعها بين1% و2% حرفا. يمكن للآخرين ذكرك @ <'span id='your-username> اسم المستخدم </span>.",
-    "help.minimum_password_length": "كلمة المرور يجب أن تكون على الأقل بها 1% أحرف",
+    "help.username_restrictions": "اسم مستخدم فريدة من نوعها بين 1% و 2% حرفا. بإمكان الآخرين مناداتك بـ @<span id='yourUsername'>اسم المستخدم</span>.",
+    "help.minimum_password_length": "كلمة المرور يجب أن تتكون على الأقل من 1% أحرف/حروف",
     "email_address": "عنوان البريد الإلكتروني",
     "email_address_placeholder": "ادخل عنوان البريد الإلكتروني",
     "username": "اسم المستخدم",
@@ -16,8 +16,11 @@
     "alternative_registration": "طريقة تسجيل بديلة",
     "terms_of_use": "شروط الاستخدام",
     "agree_to_terms_of_use": "أوافق على شروط الاستخدام",
-    "terms_of_use_error": "You must agree to the Terms of Use",
-    "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator.",
-    "interstitial.intro": "We require some additional information before we can create your account.",
-    "interstitial.errors-found": "We could not complete your registration:"
+    "terms_of_use_error": "يجب عليك الموافقة على شروط الاستخدام",
+    "registration-added-to-queue": "تمت إضافتك في قائمة الإنتضار. ستتلقى رسالة إلكترونية عند الموافقة على تسجيلك من قبل الإدارة.",
+    "interstitial.intro": "نحتاج إلى بعض المعلومات الإضافية قبل أن نتمكن من إنشاء حسابك.",
+    "interstitial.errors-found": "تعذر علينا إتمام عملية التسجيل:",
+    "gdpr_agree_data": "I consent to the collection and processing of my personal information on this website.",
+    "gdpr_agree_email": "I consent to receive digest and notification emails from this website.",
+    "gdpr_consent_denied": "You must give consent to this site to collect/process your information, and to send you emails."
 }

public/language/ar/reset_password.json

@@ -9,7 +9,7 @@
     "repeat_password": "تأكيد كلمة المرور",
     "enter_email": "يرجى إدخال <strong>عنوان البريد الإلكتروني</strong> الخاص بك وسوف نرسل لك رسالة بالبريد الالكتروني مع تعليمات حول كيفية إستعادة حسابك.",
     "enter_email_address": "ادخل عنوان البريد الإلكتروني",
-    "password_reset_sent": "إعادة تعيين كلمة السر أرسلت",
+    "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

@@ -5,13 +5,19 @@
     "in": "في",
     "titles": "العناوين",
     "titles-posts": "العناوين والمشاركات",
+    "match-words": "Match words",
+    "all": "All",
+    "any": "Any",
     "posted-by": "مشاركة من طرف",
     "in-categories": "في الفئات",
     "search-child-categories": "بحث في الفئات الفرعية",
+    "has-tags": "Has tags",
     "reply-count": "عدد المشاركات",
     "at-least": "على اﻷقل",
     "at-most": "على اﻷكثر",
+    "relevance": "Relevance",
     "post-time": "تاريخ المشاركة",
+    "votes": "Votes",
     "newer-than": "أحدث من",
     "older-than": "أقدم من",
     "any-date": "أي وقت",
@@ -25,6 +31,7 @@
     "sort-by": "عرض حسب",
     "last-reply-time": "تاريخ آخر رد",
     "topic-title": "عنوان الموضوع",
+    "topic-votes": "Topic votes",
     "number-of-replies": "عدد الردود",
     "number-of-views": "عدد المشاهدات",
     "topic-start-date": "تاريخ بدأ الموضوع",
@@ -36,5 +43,6 @@
     "clear-preferences": "ازالة التفضيلات",
     "search-preferences-saved": "تم حفظ تفضيلات البحث",
     "search-preferences-cleared": "تم ازالة تفضيلات البحث",
-    "show-results-as": "عرض النتائج كـ"
+    "show-results-as": "عرض النتائج كـ",
+    "see-more-results": "See more results (%1)"
 }