chore: rc.2

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

.codeclimate.yml

@@ -10,7 +10,7 @@ checks:
       threshold: 500
   method-lines:
     config:
-      threshold: 50
+      threshold: 75
   method-complexity:
     config:
       threshold: 10

.eslintrc

@@ -1,115 +1,3 @@
 {
-	"extends": "airbnb-base",
-	"parserOptions": {
-		"sourceType": "script"
-	},
-
-	"rules": {
-		// === Configure rules for our style ===
-		// imports must be resolvable
-		"import/no-unresolved": "error",
-		// use single quotes,
-		// unless a different style allows avoiding escapes
-		"quotes": ["error", "single", {
-			"avoidEscape": true,
-			"allowTemplateLiterals": true
-		}],
-		// allow else-if return
-		"no-else-return": [ "error", { "allowElseIf": true } ],
-		// expressions split over multiple lines
-		// should break after the operator
-		"operator-linebreak": [ "error", "after" ],
-		// require arrow parens only when needed
-		// and whenever the body is a block
-		"arrow-parens": ["error", "as-needed", { "requireForBlockBody": true }],
-		// what variables are errors in callbacks
-		"handle-callback-err": [ "error","^(e$|(e|(.*(_e|E)))rr)" ],
-		// allow dangling commas in functions
-		// require them everywhere else
-		"comma-dangle": ["error", {
-			"arrays": "always-multiline",
-			"objects": "always-multiline",
-			"imports": "always-multiline",
-			"exports": "always-multiline",
-			"functions": "only-multiline"
-		}],
-		// we actually encourage `return await`
-		"no-return-await": "off",
-		// allow `while (true)`
-		"no-constant-condition": ["error", { "checkLoops": false }],
-		// allow ignoring an error with `catch`
-		"no-empty": ["error", { "allowEmptyCatch": true }],
-		// allow `3 + 5 - 1`, but not `3 * 5 - 1`
-		"no-mixed-operators": ["error", { "allowSamePrecedence": true }],
-		// require `'use strict';`
-		"strict": ["error", "global"],
-		// we actually use tabs for indentation
-		"indent": ["error", "tab", { "SwitchCase": 1 }],
-		"no-tabs": "off",
-		// we want `== null` to also handle undefined
-		"no-eq-null": "off",
-		// allow `for (..; i++)`
-		"no-plusplus": ["error", { "allowForLoopAfterthoughts": true }],
-		// allow using functions defined later
-		"no-use-before-define": ["error", "nofunc"],
-		// require consistent newlines before and after braces
-		// if contents are multiline
-		"object-curly-newline": ["error", { "consistent": true, "multiline": true }],
-		// require consistent linebreaks inline function parenthesis (arguments or params)
-		"function-paren-newline": ["error", "consistent"],
-		// only require const if all parts of destructuring can be const
-		"prefer-const": ["error", { "destructuring": "all" }],
-		// don't require destructuring for arrays or assignment
-		"prefer-destructuring": ["error", {
-			"VariableDeclarator": { "array": false, "object": true },
-			"AssignmentExpression": { "array": false, "object": false }
-		}],
-		// identical to airbnb rule, except for allowing for..of, because we want to use it
-		"no-restricted-syntax": [
-			"error",
-			{
-				"selector": "ForInStatement",
-				"message": "for..in loops iterate over the entire prototype chain, which is virtually never what you want. Use Object.{keys,values,entries}, and iterate over the resulting array."
-			},
-			{
-				"selector": "LabeledStatement",
-				"message": "Labels are a form of GOTO; using them makes code confusing and hard to maintain and understand."
-			},
-			{
-				"selector": "WithStatement",
-				"message": "`with` is disallowed in strict mode because it makes code impossible to predict and optimize."
-			}
-		],
-		// allow lines of up to 120 characters
-		"max-len": ["error", { "code": 120, "tabWidth": 2, "ignoreUrls": true, "ignoreStrings": true, "ignoreTemplateLiterals": true, "ignoreRegExpLiterals": true }],
-
-		// === Disable rules ===
-		// more liberal naming
-		"camelcase": "off",
-		"no-underscore-dangle": "off",
-		// don't require anonymous function names
-		"func-names": "off",
-		// allow console
-		"no-console": "off",
-		// allow new for side effects
-		// allow new with non-capitalized
-		"no-new": "off",
-		"new-cap": "off",
-		// allow shadowing variables (usually callbacks)
-		"no-shadow": "off",
-		// allow multiple empty lines in a row
-		"no-multiple-empty-lines": "off",
-		// allow not using object shorthand
-		"object-shorthand": "off",
-
-		// TODO
-		"consistent-return": "off",
-		"no-restricted-globals": "off",
-		"no-prototype-builtins": "off",
-		"import/no-extraneous-dependencies": "off",
-		"import/no-dynamic-require": "off",
-		"global-require": "off",
-		"no-param-reassign": "off",
-		"default-case": "off"
-	}
+	"extends": "nodebb"
 }

.github/ISSUE_TEMPLATE.md

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

.github/ISSUE_TEMPLATE/bug-report.yml

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

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/feature-request.yml

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

.github/SECURITY.md

@@ -2,8 +2,8 @@
 
 NodeBB's security policy is based around a private bug bounty program. Users are invited to explore NodeBB for vulnerabilities, and report them to the NodeBB team so that they can be patched.
 
-If you have found a security vulnerability, **do not post it onto our GitHub tracker**. Some security vulnerabilities are quite severe and discretion is recommended. Email the NodeBB Security Team at security@nodebb.org, instead.
+If you have found a security vulnerability, **do not post it onto our GitHub tracker**. Some security vulnerabilities are quite severe and discretion is recommended. Email the NodeBB Security Team at security@nodebb.org, instead, even if you are not sure whether something qualifies.
 
 # Bug Bounty Program
 
-Security vulnerability reports may be eligible for a bounty based on severity and confirmation from NodeBB team members. For full details regarding our bug bounty program, including the bounty amounts, please consult the following page: https://blog.nodebb.org/bounty
+Security vulnerability reports may be eligible for a bounty based on severity and confirmation from NodeBB team members. For full details regarding our bug bounty program, including the bounty amounts, please consult the [dedicated page for our Bug Bounty Program](https://nodebb.org/bounty).

.github/workflows/docker.yml

@@ -0,0 +1,56 @@
+name: Run Docker
+
+# Controls when the workflow will run
+on:
+  push:
+    branches:
+      - 'master'
+      - 'v*.x'
+    tags:
+      - 'v*'
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ghcr.io/${{ github.repository }}
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=raw,value=latest
+
+      - name: Build and push Docker images
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}

.github/workflows/test.yaml

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

.gitignore

@@ -68,4 +68,5 @@ test/files/normalise-resized.jpg
 package-lock.json
 /package.json
 *.mongodb
-link-plugins.sh
+link-plugins.sh
+test.sh

.jsbeautifyrc

@@ -1,17 +0,0 @@
-{
-    "indent_size": 4,
-    "indent_char": " ",
-    "indent_level": 0,
-    "indent_with_tabs": true,
-    "preserve_newlines": true,
-    "max_preserve_newlines": 10,
-    "jslint_happy": true,
-    "brace_style": "collapse",
-    "keep_array_indentation": false,
-    "keep_function_indentation": false,
-    "space_before_conditional": true,
-    "break_chained_methods": false,
-    "eval_code": false,
-    "unescape_strings": false,
-    "wrap_line_length": 0
-}

.jshintrc

@@ -1,91 +0,0 @@
-{
-    // JSHint Default Configuration File (as on JSHint website)
-    // See http://jshint.com/docs/ for more details
-
-    "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
-    "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
-
-    // Environments
-    "browser" : true, // Web Browser (window, document, etc)
-    "couch" : false, // CouchDB
-    "devel" : true, // Development/debugging (alert, confirm, etc)
-    "dojo" : false, // Dojo Toolkit
-    "jquery" : true, // jQuery
-    "mootools" : false, // MooTools
-    "node" : true, // Node.js
-    "nonstandard" : false, // Widely adopted globals (escape, unescape, etc)
-    "prototypejs" : false, // Prototype and Scriptaculous
-    "rhino" : false, // Rhino
-    "worker" : false, // Web Workers
-    "wsh" : false, // Windows Scripting Host
-    "yui" : false, // Yahoo User Interface
-    "mocha": true,
-
-    // Legacy
-    "nomen" : false, // true: Prohibit dangling `_` in variables
-    "onevar" : false, // true: Allow only one `var` statement per function
-    "passfail" : false, // true: Stop on first error
-    "white" : false, // true: Check against strict whitespace and indentation rules
-
-    // Custom Globals
-    "globals" : {
-        "Promise": true
-    } // additional predefined global variables
-}

Dockerfile

@@ -1,17 +1,20 @@
 FROM node:lts
 
-RUN mkdir -p /usr/src/app
+RUN mkdir -p /usr/src/app && \
+    chown -R node:node /usr/src/app
 WORKDIR /usr/src/app
 
 ARG NODE_ENV
 ENV NODE_ENV $NODE_ENV
 
-COPY install/package.json /usr/src/app/package.json
+COPY --chown=node:node install/package.json /usr/src/app/package.json
+
+USER node
 
 RUN npm install --only=prod && \
     npm cache clean --force
-    
-COPY . /usr/src/app
+
+COPY --chown=node:node . /usr/src/app
 
 ENV NODE_ENV=production \
     daemon=false \
@@ -19,4 +22,4 @@ ENV NODE_ENV=production \
 
 EXPOSE 4567
 
-CMD node ./nodebb build ;  node ./nodebb start
+CMD test -n "${SETUP}" && ./nodebb setup || node ./nodebb build; node ./nodebb start

Gruntfile.js

@@ -20,6 +20,7 @@ const prestart = require('./src/prestart');
 prestart.loadConfig(configFile);
 
 const db = require('./src/database');
+const plugins = require('./src/plugins');
 
 module.exports = function (grunt) {
 	const args = [];
@@ -40,55 +41,41 @@ module.exports = function (grunt) {
 
 	grunt.registerTask('init', async function () {
 		const done = this.async();
-		let plugins = [];
+		let pluginList = [];
 		if (!process.argv.includes('--core')) {
 			await db.init();
-			plugins = await db.getSortedSetRange('plugins:active', 0, -1);
-			addBaseThemes(plugins);
-			if (!plugins.includes('nodebb-plugin-composer-default')) {
-				plugins.push('nodebb-plugin-composer-default');
+			pluginList = await plugins.getActive();
+			addBaseThemes(pluginList);
+			if (!pluginList.includes('nodebb-plugin-composer-default')) {
+				pluginList.push('nodebb-plugin-composer-default');
 			}
-			if (!plugins.includes('nodebb-theme-persona')) {
-				plugins.push('nodebb-theme-persona');
+			if (!pluginList.includes('nodebb-theme-persona')) {
+				pluginList.push('nodebb-theme-persona');
 			}
 		}
 
-		const styleUpdated_Client = plugins.map(p => `node_modules/${p}/*.less`)
-			.concat(plugins.map(p => `node_modules/${p}/*.css`))
-			.concat(plugins.map(p => `node_modules/${p}/+(public|static|less)/**/*.less`))
-			.concat(plugins.map(p => `node_modules/${p}/+(public|static)/**/*.css`));
+		const styleUpdated_Client = pluginList.map(p => `node_modules/${p}/*.scss`)
+			.concat(pluginList.map(p => `node_modules/${p}/*.css`))
+			.concat(pluginList.map(p => `node_modules/${p}/+(public|static|scss)/**/*.scss`))
+			.concat(pluginList.map(p => `node_modules/${p}/+(public|static)/**/*.css`));
 
-		const styleUpdated_Admin = plugins.map(p => `node_modules/${p}/*.less`)
-			.concat(plugins.map(p => `node_modules/${p}/*.css`))
-			.concat(plugins.map(p => `node_modules/${p}/+(public|static|less)/**/*.less`))
-			.concat(plugins.map(p => `node_modules/${p}/+(public|static)/**/*.css`));
+		const clientUpdated = pluginList.map(p => `node_modules/${p}/+(public|static)/**/*.js`);
+		const serverUpdated = pluginList.map(p => `node_modules/${p}/*.js`)
+			.concat(pluginList.map(p => `node_modules/${p}/+(lib|src)/**/*.js`));
 
-		const clientUpdated = plugins.map(p => `node_modules/${p}/+(public|static)/**/*.js`);
-		const serverUpdated = plugins.map(p => `node_modules/${p}/*.js`)
-			.concat(plugins.map(p => `node_modules/${p}/+(lib|src)/**/*.js`));
-
-		const templatesUpdated = plugins.map(p => `node_modules/${p}/+(public|static|templates)/**/*.tpl`);
-		const langUpdated = plugins.map(p => `node_modules/${p}/+(public|static|languages)/**/*.json`);
+		const templatesUpdated = pluginList.map(p => `node_modules/${p}/+(public|static|templates)/**/*.tpl`);
+		const langUpdated = pluginList.map(p => `node_modules/${p}/+(public|static|languages)/**/*.json`);
 
 		grunt.config(['watch'], {
-			styleUpdated_Client: {
+			styleUpdated: {
 				files: [
-					'public/less/**/*.less',
+					'public/scss/**/*.scss',
 					...styleUpdated_Client,
 				],
 				options: {
 					interval: 1000,
 				},
 			},
-			styleUpdated_Admin: {
-				files: [
-					'public/less/**/*.less',
-					...styleUpdated_Admin,
-				],
-				options: {
-					interval: 1000,
-				},
-			},
 			clientUpdated: {
 				files: [
 					'public/src/**/*.js',
@@ -105,9 +92,9 @@ module.exports = function (grunt) {
 					'app.js',
 					'install/*.js',
 					'src/**/*.js',
-					'public/src/modules/translator.js',
-					'public/src/modules/helpers.js',
-					'public/src/utils.js',
+					'public/src/modules/translator.common.js',
+					'public/src/modules/helpers.common.js',
+					'public/src/utils.common.js',
 					serverUpdated,
 					'!src/upgrades/**',
 				],
@@ -137,7 +124,7 @@ module.exports = function (grunt) {
 		});
 		const build = require('./src/meta/build');
 		if (!grunt.option('skip')) {
-			await build.build(true);
+			await build.build(true, { watch: true });
 		}
 		run();
 		done();
@@ -166,16 +153,14 @@ module.exports = function (grunt) {
 	grunt.event.removeAllListeners('watch');
 	grunt.event.on('watch', (action, filepath, target) => {
 		let compiling;
-		if (target === 'styleUpdated_Client') {
-			compiling = 'clientCSS';
-		} else if (target === 'styleUpdated_Admin') {
-			compiling = 'acpCSS';
+		if (target === 'styleUpdated') {
+			compiling = ['clientCSS', 'acpCSS'];
 		} else if (target === 'clientUpdated') {
-			compiling = 'js';
+			compiling = ['js'];
 		} else if (target === 'templatesUpdated') {
-			compiling = 'tpl';
+			compiling = ['tpl'];
 		} else if (target === 'langUpdated') {
-			compiling = 'lang';
+			compiling = ['lang'];
 		} else if (target === 'serverUpdated') {
 			// empty require cache
 			const paths = ['./src/meta/build.js', './src/meta/index.js'];
@@ -183,7 +168,7 @@ module.exports = function (grunt) {
 			return run();
 		}
 
-		require('./src/meta/build').build([compiling], (err) => {
+		require('./src/meta/build').build(compiling, { webpack: false }, (err) => {
 			if (err) {
 				winston.error(err.stack);
 			}
@@ -194,10 +179,10 @@ module.exports = function (grunt) {
 	});
 };
 
-function addBaseThemes(plugins) {
-	let themeId = plugins.find(p => p.includes('nodebb-theme-'));
+function addBaseThemes(pluginList) {
+	let themeId = pluginList.find(p => p.includes('nodebb-theme-'));
 	if (!themeId) {
-		return plugins;
+		return pluginList;
 	}
 	let baseTheme;
 	do {
@@ -208,9 +193,9 @@ function addBaseThemes(plugins) {
 		}
 
 		if (baseTheme) {
-			plugins.push(baseTheme);
+			pluginList.push(baseTheme);
 			themeId = baseTheme;
 		}
 	} while (baseTheme);
-	return plugins;
+	return pluginList;
 }

README.md

@@ -1,22 +1,15 @@
-# ![NodeBB](public/images/logo.svg)
+# ![NodeBB](public/images/sm-card.png)
 
-[![Build Status](https://travis-ci.org/NodeBB/NodeBB.svg?branch=master)](https://travis-ci.org/NodeBB/NodeBB)
+[![Workflow](https://github.com/NodeBB/NodeBB/actions/workflows/test.yaml/badge.svg)](https://github.com/NodeBB/NodeBB/actions/workflows/test.yaml)
 [![Coverage Status](https://coveralls.io/repos/github/NodeBB/NodeBB/badge.svg?branch=master)](https://coveralls.io/github/NodeBB/NodeBB?branch=master)
-[![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)
+[![](https://dcbadge.vercel.app/api/server/p6YKPXu7er?style=flat)](https://discord.gg/p6YKPXu7er)
 
-[**NodeBB Forum Software**](https://nodebb.org) is powered by Node.js and supports either Redis, MongoDB, or a PostgreSQL database. It utilizes web sockets for instant interactions and real-time notifications. NodeBB 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.
+[**NodeBB Forum Software**](https://nodebb.org) is powered by Node.js and supports either Redis, MongoDB, or a PostgreSQL database. It utilizes web sockets for instant interactions and real-time notifications. NodeBB takes the best of the modern web: real-time streaming discussions, mobile responsiveness, and rich RESTful read/write APIs, while staying true to the original bulletin board/forum format → categorical hierarchies, local user accounts, and asynchronous messaging.
 
-Additional functionality is enabled through the use of third-party plugins.
+NodeBB by itself contains a "common core" of basic functionality, while additional functionality and integrations are enabled through the use of third-party plugins.
 
-* [Demo](https://try.nodebb.org)
-* [Developer Community](http://community.nodebb.org)
-* [Documentation & Installation Instructions](http://docs.nodebb.org)
-* [Help translate NodeBB](https://www.transifex.com/projects/p/nodebb/)
-* [NodeBB Blog](http://blog.nodebb.org)
-* [Premium Hosting for NodeBB](http://www.nodebb.org/ "NodeBB")
-* [Follow us on Twitter](http://www.twitter.com/NodeBB/ "NodeBB Twitter")
-* [Like us on Facebook](http://www.facebook.com/NodeBB/ "NodeBB Facebook")
+### [Try it now](//try.nodebb.org) | [Documentation](//docs.nodebb.org)
 
 ## Screenshots
 
@@ -31,26 +24,23 @@ NodeBB's theming engine is highly flexible and does not restrict your design cho
 [![](http://i.imgur.com/LmHtPhob.png)](http://i.imgur.com/LmHtPho.png)
 [![](http://i.imgur.com/paiJPJkb.jpg)](http://i.imgur.com/paiJPJk.jpg)
 
-Our minimalist "Persona" theme gets you going right away, no coding experience required.
-
-[![](http://i.imgur.com/HwNEXGu.png)](http://i.imgur.com/HwNEXGu.png)
-[![](http://i.imgur.com/II1byYs.png)](http://i.imgur.com/II1byYs.png)
-
+Our minimalist "Harmony" theme gets you going right away, no coding experience required.
 
+![Rendering of a NodeBB install on desktop and mobile devices](https://user-images.githubusercontent.com/923011/228570420-2a4db745-b20d-474a-a571-1b59259508ef.png)
 
 ## How can I follow along/contribute?
 
 * If you are a developer, feel free to check out the source and submit pull requests. We also have a wide array of [plugins](http://community.nodebb.org/category/7/nodebb-plugins) which would be a great starting point for learning the codebase.
-* If you are a designer, [NodeBB needs themes](http://community.nodebb.org/category/10/nodebb-themes)! NodeBB's theming system allows extension of the base templates as well as styling via LESS or CSS. NodeBB's base theme utilizes [Bootstrap 3](http://getbootstrap.com/) but themes can choose to use a different framework altogether.
-* If you know languages other than English you can help us translate NodeBB. We use [Transifex](https://www.transifex.com/projects/p/nodebb/) for internationalization.
+* If you are a designer, [NodeBB needs themes](http://community.nodebb.org/category/10/nodebb-themes)! NodeBB's theming system allows extension of the base templates as well as styling via SCSS or CSS. NodeBB's base theme utilizes [Bootstrap 5](http://getbootstrap.com/) as a frontend toolkit.
+* If you know languages other than English you can help us translate NodeBB. We use [Transifex](https://explore.transifex.com/nodebb/nodebb/) for internationalization.
 * Please don't forget to **like**, **follow**, and **star our repo**! Join our growing [community](http://community.nodebb.org) to keep up to date with the latest NodeBB development.
 
 ## Requirements
 
 NodeBB requires the following software to be installed:
 
-* A version of Node.js at least 12 or greater ([installation/upgrade instructions](https://github.com/nodesource/distributions))
-* MongoDB, version 2.6 or greater **or** Redis, version 2.8.9 or greater
+* A version of Node.js at least 16 or greater ([installation/upgrade instructions](https://github.com/nodesource/distributions))
+* MongoDB, version 3.6 or greater **or** Redis, version 2.8.9 or greater
 * If you are using [clustering](https://docs.nodebb.org/configuring/scaling/) you need Redis installed and configured.
 * nginx, version 1.3.13 or greater (**only if** intending to use nginx to proxy requests to a NodeBB)
 
@@ -78,3 +68,15 @@ Detailed upgrade instructions are listed in [Upgrading NodeBB](https://docs.node
 NodeBB is licensed under the **GNU General Public License v3 (GPL-3)** (http://www.gnu.org/copyleft/gpl.html).
 
 Interested in a sublicense agreement for use of NodeBB in a non-free/restrictive environment? Contact us at sales@nodebb.org.
+
+## More Information/Links
+
+* [Demo](https://try.nodebb.org)
+* [Developer Community](http://community.nodebb.org)
+* [Documentation & Installation Instructions](https://docs.nodebb.org)
+* [Help translate NodeBB](https://explore.transifex.com/nodebb/nodebb/)
+* [NodeBB Blog](https://nodebb.org/blog)
+* [Premium Hosting for NodeBB](https://www.nodebb.org/ "NodeBB")
+* Unofficial IRC community – channel `#nodebb` on Libera.chat
+* [Follow us on Twitter](http://www.twitter.com/NodeBB/ "NodeBB Twitter")
+* [Like us on Facebook](http://www.facebook.com/NodeBB/ "NodeBB Facebook")

app.js

@@ -1,7 +1,7 @@
 /*
 	NodeBB - A better forum platform for the modern web
 	https://github.com/NodeBB/NodeBB/
-	Copyright (C) 2013-2017  NodeBB Inc.
+	Copyright (C) 2013-2021  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
@@ -71,7 +71,7 @@ if (nconf.get('setup') || nconf.get('install')) {
 	});
 } else if (nconf.get('activate')) {
 	require('./src/cli/manage').activate(nconf.get('activate'));
-} else if (nconf.get('plugins')) {
+} else if (nconf.get('plugins') && typeof nconf.get('plugins') !== 'object') {
 	require('./src/cli/manage').listPlugins();
 } else if (nconf.get('build')) {
 	require('./src/cli/manage').build(nconf.get('build'));

install/data/defaults.json

@@ -4,6 +4,7 @@
     "defaultLang": "en-GB",
     "loginDays": 14,
     "loginSeconds": 0,
+    "sessionDuration": 0,
     "loginAttempts": 5,
     "lockoutDuration": 60,
     "adminReloginDuration": 60,
@@ -14,6 +15,7 @@
     "newbiePostEditDuration": 3600,
     "postDeleteDuration": 0,
     "enablePostHistory": 1,
+    "topicBacklinks": 1,
     "postCacheSize": 10485760,
     "disableChat": 0,
     "chatEditDuration": 0,
@@ -24,6 +26,7 @@
     "postQueue": 0,
     "postQueueReputationThreshold": 0,
     "groupsExemptFromPostQueue": ["administrators", "Global Moderators"],
+    "groupsExemptFromMaintenanceMode": ["administrators", "Global Moderators"],
     "minimumPostLength": 8,
     "maximumPostLength": 32767,
     "systemTags": "",
@@ -44,6 +47,7 @@
     "allowMultipleBadges": 0,
     "maximumFileSize": 2048,
     "stripEXIFData": 1,
+    "orphanExpiryDays": 0,
     "resizeImageWidthThreshold": 2000,
     "resizeImageWidth": 760,
     "rejectImageWidth": 5000,
@@ -65,10 +69,10 @@
     "profileImageDimension": 200,
     "profile:convertProfileImageToPNG": 0,
     "profile:keepAllUserImages": 0,
-    "requireEmailConfirmation": 0,
     "gdpr_enabled": 1,
     "allowProfileImageUploads": 1,
     "teaserPost": "last-reply",
+    "showPostPreviewsOnHover": 1,
     "allowPrivateGroups": 1,
     "unreadCutoff": 2,
     "bookmarkThreshold": 5,
@@ -76,9 +80,14 @@
     "reputation:disabled": 0,
     "downvote:disabled": 0,
     "disableSignatures": 0,
+    "signatures:hideDuplicates": 0,
+    "upvotesPerDay": 20,
+    "upvotesPerUserPerDay": 6,
     "downvotesPerDay": 10,
     "downvotesPerUserPerDay": 3,
+    "min:rep:chat": 0,
     "min:rep:downvote": 0,
+    "min:rep:upvote": 0,
     "min:rep:flag": 0,
     "min:rep:profile-picture": 0,
     "min:rep:cover-picture": 0,
@@ -86,6 +95,9 @@
     "min:rep:aboutme": 0,
     "min:rep:signature": 0,
     "flags:limitPerTarget": 0,
+    "flags:autoFlagOnDownvoteThreshold": 0,
+    "flags:actionOnResolve": "rescind",
+    "flags:actionOnReject": "rescind",
     "notificationType_upvote": "notification",
     "notificationType_new-topic": "notification",
     "notificationType_new-reply": "notification",
@@ -108,6 +120,9 @@
     "postsPerPage": 20,
     "categoriesPerPage": 50,
     "userSearchResultsPerPage": 50,
+    "searchDefaultSortBy": "relevance",
+    "searchDefaultIn": "titlesposts",
+    "searchDefaultInQuick": "titles",
     "maximumGroupNameLength": 255,
     "maximumGroupTitleLength": 40,
     "preventTopicDeleteAfterReplies": 0,
@@ -133,11 +148,20 @@
     "maximumRelatedTopics": 0,
     "disableEmailSubscriptions": 0,
     "emailConfirmInterval": 10,
+    "emailConfirmExpiry": 24,
     "removeEmailNotificationImages": 0,
+    "sendValidationEmail": 1,
+    "includeUnverifiedEmails": 0,
+    "emailPrompt": 1,
+    "sendEmailToBanned": 0,
+    "requireEmailAddress": 0,
     "inviteExpiration": 7,
     "dailyDigestFreq": "off",
     "digestHour": 17,
     "passwordExpiryDays": 0,
+    "cross-origin-embedder-policy": 0,
+    "cross-origin-opener-policy": "same-origin",
+    "cross-origin-resource-policy": "same-origin",
     "hsts-maxage": 31536000,
     "hsts-subdomains": 0,
     "hsts-preload": 0,
@@ -158,5 +182,6 @@
     "composer:showHelpTab": 1,
     "composer:allowPluginHelp": 1,
     "maxReconnectionAttempts": 5,
-    "reconnectionDelay": 1500
+    "reconnectionDelay": 1500,
+    "disableCustomUserSkins": 0
 }

install/data/footer.json

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

install/data/navigation.json

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

install/databases.js

@@ -3,10 +3,6 @@
 const prompt = require('prompt');
 const winston = require('winston');
 
-const util = require('util');
-
-const promptGet = util.promisify((schema, callback) => prompt.get(schema, callback));
-
 const questions = {
 	redis: require('../src/database/redis').questions,
 	mongo: require('../src/database/mongo').questions,
@@ -28,17 +24,17 @@ async function getDatabaseConfig(config) {
 		if (config['redis:host'] && config['redis:port']) {
 			return config;
 		}
-		return await promptGet(questions.redis);
+		return await prompt.get(questions.redis);
 	} else if (config.database === 'mongo') {
 		if ((config['mongo:host'] && config['mongo:port']) || config['mongo:uri']) {
 			return config;
 		}
-		return await promptGet(questions.mongo);
+		return await prompt.get(questions.mongo);
 	} else if (config.database === 'postgres') {
 		if (config['postgres:host'] && config['postgres:port']) {
 			return config;
 		}
-		return await promptGet(questions.postgres);
+		return await prompt.get(questions.postgres);
 	}
 	throw new Error(`unknown database : ${config.database}`);
 }

install/package.json

@@ -2,8 +2,8 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "1.17.2",
-    "homepage": "http://www.nodebb.org",
+    "version": "3.0.0-rc.2",
+    "homepage": "https://www.nodebb.org",
     "repository": {
         "type": "git",
         "url": "https://github.com/NodeBB/NodeBB/"
@@ -28,136 +28,152 @@
         ]
     },
     "dependencies": {
-        "@adactive/bootstrap-tagsinput": "^0.8.2",
-        "ace-builds": "^1.4.12",
-        "archiver": "^5.2.0",
-        "async": "^3.2.0",
-        "autoprefixer": "10.3.1",
+        "@adactive/bootstrap-tagsinput": "0.8.2",
+        "@isaacs/ttlcache": "1.2.2",
+        "@popperjs/core": "2.11.7",
+        "ace-builds": "1.16.0",
+        "archiver": "5.3.1",
+        "async": "3.2.4",
+        "autoprefixer": "10.4.14",
         "bcryptjs": "2.4.3",
-        "benchpressjs": "2.4.3",
-        "body-parser": "^1.19.0",
-        "bootbox": "5.5.2",
-        "bootstrap": "^3.4.1",
-        "chart.js": "^2.9.4",
-        "cli-graph": "^3.2.2",
-        "clipboard": "^2.0.6",
-        "colors": "^1.4.0",
-        "commander": "^7.1.0",
-        "compare-versions": "3.6.0",
-        "compression": "^1.7.4",
-        "connect-flash": "^0.1.1",
-        "connect-mongo": "4.4.1",
-        "connect-multiparty": "^2.2.0",
-        "connect-pg-simple": "^6.2.1",
-        "connect-redis": "6.0.0",
-        "cookie-parser": "^1.4.5",
-        "cron": "^1.8.2",
-        "cropperjs": "^1.5.11",
-        "csurf": "^1.11.0",
-        "daemon": "^1.1.0",
-        "diff": "^5.0.0",
-        "express": "^4.17.1",
-        "express-session": "^1.17.1",
-        "express-useragent": "^1.0.15",
-        "graceful-fs": "^4.2.6",
-        "helmet": "^4.4.1",
-        "html-to-text": "7.1.1",
-        "ipaddr.js": "^2.0.0",
-        "jquery": "3.6.0",
-        "jquery-deserialize": "2.0.0-rc1",
+        "benchpressjs": "2.5.1",
+        "body-parser": "1.20.2",
+        "bootbox": "6.0.0",
+        "bootstrap": "5.2.3",
+        "bootswatch": "5.2.3",
+        "chalk": "4.1.2",
+        "chart.js": "2.9.4",
+        "cli-graph": "3.2.2",
+        "clipboard": "2.0.11",
+        "colors": "1.4.0",
+        "commander": "10.0.0",
+        "compare-versions": "5.0.3",
+        "compression": "1.7.4",
+        "connect-flash": "0.1.1",
+        "connect-mongo": "5.0.0",
+        "connect-multiparty": "2.2.0",
+        "connect-pg-simple": "8.0.0",
+        "connect-redis": "7.0.1",
+        "cookie-parser": "1.4.6",
+        "cron": "2.3.0",
+        "cropperjs": "1.5.13",
+        "csrf-sync": "4.0.1",
+        "daemon": "1.1.0",
+        "diff": "5.1.0",
+        "esbuild": "0.17.15",
+        "express": "4.18.2",
+        "express-session": "1.17.3",
+        "express-useragent": "1.0.15",
+        "file-loader": "6.2.0",
+        "fs-extra": "11.1.1",
+        "graceful-fs": "4.2.11",
+        "helmet": "6.0.1",
+        "html-to-text": "9.0.5",
+        "ipaddr.js": "2.0.1",
+        "jquery": "3.6.4",
+        "jquery-deserialize": "2.0.0",
         "jquery-form": "4.3.0",
         "jquery-serializeobject": "1.0.0",
-        "jquery-ui": "1.12.1",
+        "jquery-ui": "1.13.2",
         "jsesc": "3.0.2",
-        "json2csv": "5.0.6",
-        "jsonwebtoken": "^8.5.1",
-        "less": "^3.11.1",
-        "lodash": "^4.17.21",
-        "logrotate-stream": "^0.2.7",
-        "lru-cache": "6.0.0",
-        "material-design-lite": "^1.3.0",
-        "mime": "^2.5.2",
-        "mkdirp": "^1.0.4",
-        "mongodb": "3.6.10",
-        "morgan": "^1.10.0",
-        "mousetrap": "^1.6.5",
-        "multiparty": "4.2.2",
-        "@nodebb/bootswatch": "3.4.2",
-        "nconf": "^0.11.2",
-        "nodebb-plugin-composer-default": "6.5.34",
-        "nodebb-plugin-dbsearch": "5.0.2",
-        "nodebb-plugin-emoji": "^3.5.0",
-        "nodebb-plugin-emoji-android": "2.0.5",
-        "nodebb-plugin-markdown": "8.14.2",
-        "nodebb-plugin-mentions": "2.13.11",
-        "nodebb-plugin-spam-be-gone": "0.7.9",
-        "nodebb-rewards-essentials": "0.1.5",
-        "nodebb-theme-lavender": "5.2.1",
-        "nodebb-theme-persona": "11.0.26",
-        "nodebb-theme-slick": "1.4.7",
-        "nodebb-theme-vanilla": "12.0.8",
-        "nodebb-widget-essentials": "5.0.4",
-        "nodemailer": "^6.5.0",
+        "json2csv": "5.0.7",
+        "jsonwebtoken": "9.0.0",
+        "less": "4.1.3",
+        "lodash": "4.17.21",
+        "logrotate-stream": "0.2.9",
+        "lru-cache": "8.0.4",
+        "material-design-lite": "1.3.0",
+        "mime": "3.0.0",
+        "mkdirp": "2.1.6",
+        "mongodb": "5.2.0",
+        "morgan": "1.10.0",
+        "mousetrap": "1.6.5",
+        "multiparty": "4.2.3",
+        "nconf": "0.12.0",
+        "nodebb-plugin-2factor": "7.0.4",
+        "nodebb-plugin-composer-default": "10.0.44",
+        "nodebb-plugin-dbsearch": "6.0.0",
+        "nodebb-plugin-emoji": "5.0.5",
+        "nodebb-plugin-emoji-android": "4.0.0",
+        "nodebb-plugin-markdown": "12.0.2",
+        "nodebb-plugin-mentions": "4.0.6",
+        "nodebb-plugin-ntfy": "1.0.15",
+        "nodebb-plugin-spam-be-gone": "2.0.6",
+        "nodebb-rewards-essentials": "0.2.3",
+        "nodebb-theme-harmony": "1.0.0-beta.102",
+        "nodebb-theme-lavender": "7.0.9",
+        "nodebb-theme-peace": "2.0.19",
+        "nodebb-theme-persona": "13.0.55",
+        "nodebb-widget-essentials": "7.0.7",
+        "nodemailer": "6.9.1",
         "nprogress": "0.2.0",
-        "passport": "^0.4.1",
-        "passport-http-bearer": "^1.0.1",
+        "passport": "0.6.0",
+        "passport-http-bearer": "1.0.1",
         "passport-local": "1.0.0",
-        "pg": "^8.5.1",
-        "pg-cursor": "^2.5.2",
-        "postcss": "8.3.5",
+        "pg": "8.10.0",
+        "pg-cursor": "2.9.0",
+        "postcss": "8.4.21",
         "postcss-clean": "1.2.0",
-        "prompt": "^1.1.0",
-        "ioredis": "4.27.6",
+        "progress-webpack-plugin": "1.0.16",
+        "prompt": "1.3.0",
+        "ioredis": "5.3.1",
         "request": "2.88.2",
-        "request-promise-native": "^1.0.9",
-        "requirejs": "2.3.6",
-        "rimraf": "3.0.2",
-        "rss": "^1.2.2",
-        "sanitize-html": "^2.3.2",
-        "semver": "^7.3.4",
-        "serve-favicon": "^2.5.0",
-        "sharp": "0.28.3",
-        "sitemap": "^7.0.0",
+        "request-promise-native": "1.0.9",
+        "rimraf": "4.4.1",
+        "rss": "1.2.2",
+        "rtlcss": "4.0.0",
+        "sanitize-html": "2.10.0",
+        "sass": "1.60.0",
+        "semver": "7.3.8",
+        "serve-favicon": "2.5.0",
+        "sharp": "0.32.0",
+        "sitemap": "7.1.1",
         "slideout": "1.0.1",
-        "socket.io": "4.1.3",
-        "socket.io-adapter-cluster": "^1.0.1",
-        "socket.io-client": "4.1.3",
-        "@socket.io/redis-adapter": "7.0.0",
-        "sortablejs": "1.14.0",
-        "spdx-license-list": "^6.4.0",
+        "socket.io": "4.6.1",
+        "socket.io-client": "4.6.1",
+        "@socket.io/redis-adapter": "8.1.0",
+        "sortablejs": "1.15.0",
+        "spdx-license-list": "6.6.0",
         "spider-detector": "2.0.0",
-        "textcomplete": "^0.18.0",
-        "textcomplete.contenteditable": "^0.1.1",
-        "timeago": "^1.6.7",
+        "terser-webpack-plugin": "5.3.7",
+        "textcomplete": "0.18.2",
+        "textcomplete.contenteditable": "0.1.1",
+        "timeago": "1.6.7",
         "tinycon": "0.6.8",
-        "toobusy-js": "^0.5.1",
-        "uglify-es": "^3.3.9",
-        "validator": "13.6.0",
-        "visibilityjs": "2.0.2",
-        "winston": "3.3.3",
-        "xml": "^1.0.1",
-        "xregexp": "^5.0.1",
-        "yargs": "16.2.0",
-        "zxcvbn": "^4.4.2"
+        "toobusy-js": "0.5.1",
+        "validator": "13.9.0",
+        "webpack": "5.77.0",
+        "webpack-merge": "5.8.0",
+        "winston": "3.8.2",
+        "xml": "1.0.1",
+        "xregexp": "5.1.1",
+        "yargs": "17.7.1",
+        "zxcvbn": "4.4.2"
     },
     "devDependencies": {
-        "@apidevtools/swagger-parser": "10.0.2",
-        "@commitlint/cli": "12.1.4",
-        "@commitlint/config-angular": "12.1.4",
+        "@apidevtools/swagger-parser": "10.1.0",
+        "@commitlint/cli": "17.5.1",
+        "@commitlint/config-angular": "17.4.4",
         "coveralls": "3.1.1",
-        "eslint": "7.30.0",
-        "eslint-config-airbnb-base": "14.2.1",
-        "eslint-plugin-import": "2.23.4",
-        "grunt": "1.4.1",
+        "eslint": "8.37.0",
+        "eslint-config-nodebb": "0.2.1",
+        "eslint-plugin-import": "2.27.5",
+        "grunt": "1.6.1",
         "grunt-contrib-watch": "1.1.0",
-        "husky": "6.0.0",
-        "jsdom": "16.6.0",
-        "lint-staged": "11.0.1",
-        "mocha": "8.4.0",
+        "husky": "8.0.3",
+        "jsdom": "21.1.1",
+        "lint-staged": "13.2.0",
+        "mocha": "10.2.0",
         "mocha-lcov-reporter": "1.3.0",
         "mockdate": "3.0.5",
         "nyc": "15.1.0",
-        "smtp-server": "3.9.0"
+        "smtp-server": "3.11.0"
+    },
+    "optionalDependencies": {
+        "sass-embedded": "1.60.0"
+    },
+    "resolutions": {
+        "*/jquery": "3.6.4"
     },
     "bugs": {
         "url": "https://github.com/NodeBB/NodeBB/issues"
@@ -166,11 +182,6 @@
         "node": ">=12"
     },
     "maintainers": [
-        {
-            "name": "Andrew Rodrigues",
-            "email": "andrew@nodebb.org",
-            "url": "https://github.com/psychobunny"
-        },
         {
             "name": "Julian Lam",
             "email": "julian@nodebb.org",

install/web.js

@@ -6,18 +6,14 @@ const bodyParser = require('body-parser');
 const fs = require('fs');
 const path = require('path');
 const childProcess = require('child_process');
-const less = require('less');
-const util = require('util');
 
-const lessRenderAsync = util.promisify(
-	(style, opts, cb) => less.render(String(style), opts, cb)
-);
-const uglify = require('uglify-es');
+const webpack = require('webpack');
 const nconf = require('nconf');
 
 const Benchpress = require('benchpressjs');
 const mkdirp = require('mkdirp');
 const { paths } = require('../src/constants');
+const sass = require('../src/utils').getSass();
 
 const app = express();
 let server;
@@ -50,16 +46,6 @@ winston.configure({
 });
 
 const web = module.exports;
-
-const scripts = [
-	'node_modules/jquery/dist/jquery.js',
-	'node_modules/xregexp/xregexp-all.js',
-	'public/src/modules/slugify.js',
-	'public/src/utils.js',
-	'public/src/installer/install.js',
-	'node_modules/zxcvbn/dist/zxcvbn.js',
-];
-
 let installing = false;
 let success = false;
 let error = false;
@@ -72,6 +58,8 @@ web.install = async function (port) {
 	winston.info(`Launching web installer on port ${port}`);
 
 	app.use(express.static('public', {}));
+	app.use('/assets', express.static(path.join(__dirname, '../build/public'), {}));
+
 	app.engine('tpl', (filepath, options, callback) => {
 		filepath = filepath.replace(/\.tpl$/, '.js');
 
@@ -85,8 +73,8 @@ web.install = async function (port) {
 	try {
 		await Promise.all([
 			compileTemplate(),
-			compileLess(),
-			compileJS(),
+			compileSass(),
+			runWebpack(),
 			copyCSS(),
 			loadDefaults(),
 		]);
@@ -97,6 +85,13 @@ web.install = async function (port) {
 	}
 };
 
+async function runWebpack() {
+	const util = require('util');
+	const webpackCfg = require('../webpack.installer');
+	const compiler = webpack(webpackCfg);
+	const webpackRun = util.promisify(compiler.run).bind(compiler);
+	await webpackRun();
+}
 
 function launchExpress(port) {
 	server = app.listen(port, () => {
@@ -117,7 +112,7 @@ function ping(req, res) {
 }
 
 function welcome(req, res) {
-	const dbs = ['redis', 'mongo', 'postgres'];
+	const dbs = ['mongo', 'redis', 'postgres'];
 	const databases = dbs.map((databaseName) => {
 		const questions = require(`../src/database/${databaseName}`).questions.filter(question => question && !question.hideOnWebInstall);
 
@@ -150,29 +145,27 @@ function install(req, res) {
 	}
 	req.setTimeout(0);
 	installing = true;
-	const setupEnvVars = nconf.get();
-	for (const [key, value] of Object.entries(req.body)) {
-		if (!process.env.hasOwnProperty(key)) {
-			setupEnvVars[key.replace(':', '__')] = value;
-		}
-	}
 
-	// Flatten any objects in setupEnvVars
-	const pushToRoot = function (parentKey, key) {
-		setupEnvVars[`${parentKey}__${key}`] = setupEnvVars[parentKey][key];
+	const database = nconf.get('database') || req.body.database || 'mongo';
+	const setupEnvVars = {
+		...process.env,
+		NODEBB_URL: nconf.get('url') || req.body.url || (`${req.protocol}://${req.get('host')}`),
+		NODEBB_PORT: nconf.get('port') || 4567,
+		NODEBB_ADMIN_USERNAME: nconf.get('admin:username') || req.body['admin:username'],
+		NODEBB_ADMIN_PASSWORD: nconf.get('admin:password') || req.body['admin:password'],
+		NODEBB_ADMIN_EMAIL: nconf.get('admin:email') || req.body['admin:email'],
+		NODEBB_DB: database,
+		NODEBB_DB_HOST: nconf.get(`${database}:host`) || req.body[`${database}:host`],
+		NODEBB_DB_PORT: nconf.get(`${database}:port`) || req.body[`${database}:port`],
+		NODEBB_DB_USER: nconf.get(`${database}:username`) || req.body[`${database}:username`],
+		NODEBB_DB_PASSWORD: nconf.get(`${database}:password`) || req.body[`${database}:password`],
+		NODEBB_DB_NAME: nconf.get(`${database}:database`) || req.body[`${database}:database`],
+		NODEBB_DB_SSL: nconf.get(`${database}:ssl`) || req.body[`${database}:ssl`],
+		defaultPlugins: JSON.stringify(nconf.get('defaultplugins') || nconf.get('defaultPlugins') || []),
 	};
-	for (const [parentKey, value] of Object.entries(setupEnvVars)) {
-		if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
-			Object.keys(value).forEach(key => pushToRoot(parentKey, key));
-			delete setupEnvVars[parentKey];
-		} else if (Array.isArray(value)) {
-			setupEnvVars[parentKey] = JSON.stringify(value);
-		}
-	}
 
 	winston.info('Starting setup process');
-	winston.info(setupEnvVars);
-	launchUrl = setupEnvVars.url;
+	launchUrl = setupEnvVars.NODEBB_URL;
 
 	const child = require('child_process').fork('app', ['--setup'], {
 		env: setupEnvVars,
@@ -213,15 +206,20 @@ async function launch(req, res) {
 		}
 
 		const filesToDelete = [
-			'installer.css',
-			'installer.min.js',
-			'bootstrap.min.css',
+			path.join(__dirname, '../public', 'installer.css'),
+			path.join(__dirname, '../public', 'bootstrap.min.css'),
+			path.join(__dirname, '../build/public', 'installer.min.js'),
 		];
-		await Promise.all(
-			filesToDelete.map(
-				filename => fs.promises.unlink(path.join(__dirname, '../public', filename))
-			)
-		);
+		try {
+			await Promise.all(
+				filesToDelete.map(
+					filename => fs.promises.unlink(filename)
+				)
+			);
+		} catch (err) {
+			console.log(err.stack);
+		}
+
 		child.unref();
 		process.exit(0);
 	} catch (err) {
@@ -249,51 +247,42 @@ async function compileTemplate() {
 	]);
 }
 
-async function compileLess() {
+async function compileSass() {
 	try {
-		const installSrc = path.join(__dirname, '../public/less/install.less');
+		const installSrc = path.join(__dirname, '../public/scss/install.scss');
 		const style = await fs.promises.readFile(installSrc);
-		const css = await lessRenderAsync(style, { filename: path.resolve(installSrc) });
-		await fs.promises.writeFile(path.join(__dirname, '../public/installer.css'), css.css);
+		const scssOutput = sass.compileString(String(style), {
+			loadPaths: [
+				path.join(__dirname, '../public/scss'),
+			],
+		});
+
+		await fs.promises.writeFile(path.join(__dirname, '../public/installer.css'), scssOutput.css.toString());
 	} catch (err) {
-		winston.error(`Unable to compile LESS: \n${err.stack}`);
+		winston.error(`Unable to compile SASS: \n${err.stack}`);
 		throw err;
 	}
 }
 
-async function compileJS() {
-	let code = '';
-
-	for (const srcPath of scripts) {
-		// eslint-disable-next-line no-await-in-loop
-		const buffer = await fs.promises.readFile(path.join(__dirname, '..', srcPath));
-		code += buffer.toString();
-	}
-	const minified = uglify.minify(code, {
-		compress: false,
-	});
-	if (!minified.code) {
-		throw new Error('[[error:failed-to-minify]]');
-	}
-	await fs.promises.writeFile(path.join(__dirname, '../public/installer.min.js'), minified.code);
-}
-
 async function copyCSS() {
-	const src = await fs.promises.readFile(
-		path.join(__dirname, '../node_modules/bootstrap/dist/css/bootstrap.min.css'), 'utf8'
+	await fs.promises.copyFile(
+		path.join(__dirname, '../node_modules/bootstrap/dist/css/bootstrap.min.css'),
+		path.join(__dirname, '../public/bootstrap.min.css'),
 	);
-	await fs.promises.writeFile(path.join(__dirname, '../public/bootstrap.min.css'), src);
 }
 
 async function loadDefaults() {
 	const setupDefaultsPath = path.join(__dirname, '../setup.json');
 	try {
-		await fs.promises.access(setupDefaultsPath, fs.constants.F_OK + fs.constants.R_OK);
+		// eslint-disable-next-line no-bitwise
+		await fs.promises.access(setupDefaultsPath, fs.constants.F_OK | fs.constants.R_OK);
 	} catch (err) {
 		// setup.json not found or inaccessible, proceed with no defaults
 		if (err.code !== 'ENOENT') {
 			throw err;
 		}
+
+		return;
 	}
 	winston.info('[installer] Found setup.json, populating default values');
 	nconf.file({

loader.js

@@ -5,7 +5,6 @@ const fs = require('fs');
 const url = require('url');
 const path = require('path');
 const { fork } = require('child_process');
-const async = require('async');
 const logrotate = require('logrotate-stream');
 const mkdirp = require('mkdirp');
 
@@ -31,12 +30,10 @@ const output = logrotate({ file: outputLogFilePath, size: '1m', keep: 3, compres
 const silent = nconf.get('silent') === 'false' ? false : nconf.get('silent') !== false;
 let numProcs;
 const workers = [];
-const Loader = {
-	timesStarted: 0,
-};
+const Loader = {};
 const appPath = path.join(__dirname, 'app.js');
 
-Loader.init = function (callback) {
+Loader.init = function () {
 	if (silent) {
 		console.log = (...args) => {
 			output.write(`${args.join(' ')}\n`);
@@ -45,36 +42,19 @@ Loader.init = function (callback) {
 
 	process.on('SIGHUP', Loader.restart);
 	process.on('SIGTERM', Loader.stop);
-	callback();
 };
 
-Loader.displayStartupMessages = function (callback) {
+Loader.displayStartupMessages = function () {
 	console.log('');
-	console.log(`NodeBB v${pkg.version} Copyright (C) 2013-2014 NodeBB Inc.`);
+	console.log(`NodeBB v${pkg.version} Copyright (C) 2013-${(new Date()).getFullYear()} NodeBB Inc.`);
 	console.log('This program comes with ABSOLUTELY NO WARRANTY.');
 	console.log('This is free software, and you are welcome to redistribute it under certain conditions.');
 	console.log('For the full license, please visit: http://www.gnu.org/copyleft/gpl.html');
 	console.log('');
-	callback();
 };
 
 Loader.addWorkerEvents = function (worker) {
 	worker.on('exit', (code, signal) => {
-		if (code !== 0) {
-			if (Loader.timesStarted < numProcs * 3) {
-				Loader.timesStarted += 1;
-				if (Loader.crashTimer) {
-					clearTimeout(Loader.crashTimer);
-				}
-				Loader.crashTimer = setTimeout(() => {
-					Loader.timesStarted = 0;
-				}, 10000);
-			} else {
-				console.log(`${numProcs * 3} restarts in 10 seconds, most likely an error on startup. Halting.`);
-				process.exit();
-			}
-		}
-
 		console.log(`[cluster] Child Process (${worker.pid}) has exited (code: ${code}, signal: ${signal})`);
 		if (!(worker.suicide || code === 0)) {
 			console.log('[cluster] Spinning up another process...');
@@ -107,17 +87,13 @@ Loader.addWorkerEvents = function (worker) {
 	});
 };
 
-Loader.start = function (callback) {
+Loader.start = function () {
 	numProcs = getPorts().length;
 	console.log(`Clustering enabled: Spinning up ${numProcs} process(es).\n`);
 
 	for (let x = 0; x < numProcs; x += 1) {
 		forkWorker(x, x === 0);
 	}
-
-	if (callback) {
-		callback();
-	}
 };
 
 function forkWorker(index, isPrimary) {
@@ -215,12 +191,25 @@ fs.open(pathToConfig, 'r', (err) => {
 
 	if (nconf.get('daemon') !== 'false' && nconf.get('daemon') !== false) {
 		if (file.existsSync(pidFilePath)) {
+			let pid = 0;
 			try {
-				const	pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
-				process.kill(pid, 0);
-				process.exit();
-			} catch (e) {
-				fs.unlinkSync(pidFilePath);
+				pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
+				if (pid) {
+					process.kill(pid, 0);
+					console.info(`Process "${pid}" from pidfile already running, exiting`);
+					process.exit();
+				} else {
+					console.info(`Invalid pid "${pid}" from pidfile, deleting pidfile`);
+					fs.unlinkSync(pidFilePath);
+				}
+			} catch (err) {
+				if (err.code === 'ESRCH') {
+					console.info(`Process "${pid}" from pidfile not found, deleting pidfile`);
+					fs.unlinkSync(pidFilePath);
+				} else {
+					console.error(err.stack);
+					throw err;
+				}
 			}
 		}
 
@@ -232,15 +221,12 @@ fs.open(pathToConfig, 'r', (err) => {
 
 		fs.writeFileSync(pidFilePath, String(process.pid));
 	}
-
-	async.series([
-		Loader.init,
-		Loader.displayStartupMessages,
-		Loader.start,
-	], (err) => {
-		if (err) {
-			console.error('[loader] Error during startup');
-			throw err;
-		}
-	});
+	try {
+		Loader.init();
+		Loader.displayStartupMessages();
+		Loader.start();
+	} catch (err) {
+		console.error('[loader] Error during startup');
+		throw err;
+	}
 });

public/.eslintrc

@@ -1,82 +1,3 @@
 {
-	"globals": {
-		"app": true,
-		"io": true,
-		"socket": true,
-		"ajaxify": true,
-		"config": true,
-		"utils": true,
-		"overrides": true,
-		"componentHandler": true,
-		"bootbox": true,
-		"Visibility": true,
-		"Tinycon": true,
-		"Promise": true
-	},
-	"env": {
-		"jquery": true,
-		"amd": true,
-		"browser": true,
-		"es6": true
-	},
-	"rules": {
-		"comma-dangle": ["error", {
-			"arrays": "always-multiline",
-			"objects": "always-multiline",
-			"imports": "always-multiline",
-			"exports": "always-multiline",
-			"functions": "never"
-		}],
-		"block-scoped-var": "off",
-		"no-dupe-class-members": "off",
-		"prefer-object-spread": "off",
-		"prefer-reflect": "off",
-
-		// 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",
-		// identical to airbnb rule
-		// except for allowing for..in, because for..of is unavailable on some clients
-		"no-restricted-syntax": [
-			"error",
-			{
-				"selector": "ForOfStatement",
-				"message": "iterators/generators require regenerator-runtime, which is too heavyweight for this guide to allow them. Separately, loops should be avoided in favor of array iterations."
-			},
-			{
-				"selector": "LabeledStatement",
-				"message": "Labels are a form of GOTO; using them makes code confusing and hard to maintain and understand."
-			},
-			{
-				"selector": "WithStatement",
-				"message": "`with` is disallowed in strict mode because it makes code impossible to predict and optimize."
-			}
-		]
-	},
-	"parserOptions": {
-		"ecmaVersion": 2018,
-		"ecmaFeatures": {
-			"classes": false,
-			"defaultParams": 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,
-			"superInFunctions": false
-		}
-	}
+	"extends": "nodebb/public"
 }

public/.jshintrc

@@ -1,83 +0,0 @@
-{
-    "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,
-		"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/language/README.md

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

public/language/ar/_DO_NOT_EDIT_FILES_HERE.md

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

public/language/ar/admin/admin.json

@@ -3,5 +3,7 @@
 	"alert.confirm-restart": "هل تريد بالتأكيد إعادة تشغيل NodeBB؟",
 
 	"acp-title": "لوحة تحكم إدارة NodeBB | %1",
-	"settings-header-contents": "محتويات"
+	"settings-header-contents": "محتويات",
+	"changes-not-saved": "لم يتم حفظ التغييرات",
+	"changes-not-saved-message": "حدثت مشكلة أثناء حفظ التغييرات في NodeBB. (%1)"
 }

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

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

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

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

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

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

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

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

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

@@ -7,5 +7,5 @@
     "revert-confirm": "هل أنت متأكد من أنك ترغب في استعادة قااب NodeBB الافتراضي؟",
     "theme-changed": "تم تغيير القالب",
     "revert-success": "لقد قمت بنجاح بإستعادة القالب الأساسي لـNodeBB",
-    "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
+    "restart-to-activate": "يرجى إعادة بناء وإعادة تشغيل NodeBB لتنشيط هذا الثيم."
 }

public/language/ar/admin/dashboard.json

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

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

@@ -1,14 +1,18 @@
 {
-	"you-are-on": "You are on <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</strong>",
-	"nodes-responded": "%1 nodes responded within %2ms!",
-	"host": "host",
+	"you-are-on": "أنت في <strong> %1:%2 </strong>",
+	"ip": "رقم الآي بي <strong> %1 </strong>",
+	"nodes-responded": "عدد %1 نقطة/نقاط استجابوا خلال %2 جزء من الثانية.",
+	"host": "المضيف",
 	"primary": "primary / run jobs",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "online",
 	"git": "git",
-	"memory": "memory",
+	"process-memory": "process memory",
+	"system-memory": "system memory",
+	"used-memory-process": "Used memory by process",
+	"used-memory-os": "Used system memory",
+	"total-memory-os": "Total system memory",
 	"load": "system load",
 	"cpu-usage": "cpu usage",
 	"uptime": "uptime",

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

@@ -1,12 +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",
+	"logger-settings": "إعدادات المسجِّل",
+	"description": "من خلال تمكين مربعات الاختيار ، ستتلقى سجلات إلى جهازك الطرفي. إذا حددت مسارًا ، فسيتم بعد ذلك حفظ السجلات في ملف بدلاً من ذلك. يعد تسجيل HTTP مفيدًا لجمع الإحصائيات حول من ومتى وماذا يصل الأشخاص في المنتدى. بالإضافة إلى تسجيل طلبات HTTP ، يمكننا أيضًا تسجيل أحداث socket.io. يمكن أن يكون تسجيل Socket.io ، جنبًا إلى جنب مع شاشة redis-cli ، مفيدًا جدًا في تعلم العناصر الداخلية لـ NodeBB.",
+	"explanation": "ما عليك سوى تحديدأو/ إلغاء تحديد إعدادات التسجيل لتمكين أو تعطيل التسجيل أثناء التنقل. لا حاجة لإعادة التشغيل.",
+	"enable-http": "تمكين سجلات HTTP",
+	"enable-socket": "تفعيل تسجيل أحداث socket.io",
+	"file-path": "مسار ملف السجل",
+	"file-path-placeholder": "/path/to/log/file.log ::: اتركه فارغا لاظهار السجلات لنافذة الطرفية",
 
-	"control-panel": "Logger Control Panel",
-	"update-settings": "Update Logger Settings"
+	"control-panel": "لوحة تحكم المسجل",
+	"update-settings": "تحديث إعدادات المسجل"
 }

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

@@ -1,17 +1,15 @@
 {
-	"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",
+	"rewards": "المكافآت",
+	"condition-if-users": "إذا كان للمستخدم",
+	"condition-is": "يكون: ",
+	"condition-then": "عندئذ:",
+	"max-claims": "عدد المرات التي يمكن فيها المطالبة بالمكافأة",
+	"zero-infinite": "أدخل 0 للقيمة اللانهائية",
+	"delete": "احذف",
+	"enable": "مكّن",
+	"disable": "عطّل",
 
-	"alert.delete-success": "Successfully deleted reward",
-	"alert.no-inputs-found": "Illegal reward - no inputs found!",
-	"alert.save-success": "Successfully saved rewards"
+	"alert.delete-success": "المكافآت المحذوفة بنجاح",
+	"alert.no-inputs-found": "مكافأة غير قانونية - لم يتم العثور على مدخلات!",
+	"alert.save-success": "المكافآت المحفوظة بنجاح"
 }

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

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

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

@@ -1,79 +0,0 @@
-{
-	"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/languages.json

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

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

@@ -1,23 +0,0 @@
-{
-	"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/sounds.json

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

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

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

@@ -13,6 +13,7 @@
 	"resent-single": "Manual digest resend completed",
 	"resent-day": "Daily digest resent",
 	"resent-week": "Weekly digest resent",
+	"resent-biweek": "Bi-Weekly digest resent",
 	"resent-month": "Monthly digest resent",
 	"null": "<em>Never</em>",
 	"manual-run": "Manual digest run:",

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

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

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

@@ -10,6 +10,7 @@
 	"upload-files": "Upload Files",
 	"signature": "Signature",
 	"ban": "Ban",
+	"mute": "Mute",
 	"invite": "Invite",
 	"search-content": "Search Content",
 	"search-users": "Search Users",
@@ -48,13 +49,15 @@
 	"alert.confirm-moderate": "<strong>Are you sure you wish to grant the moderation privilege to this user group?</strong> This group is public, and any users can join at will.",
 	"alert.confirm-admins-mods": "<strong>Are you sure you wish to grant the &quot;Admins &amp; Mods&quot; privilege to this user/group?</strong> Users with this privilege are able to promote and demote other users into privileged positions, <em>including super administrator</em>",
 	"alert.confirm-save": "Please confirm your intention to save these privileges",
-	"alert.saved": "Privilege changes saved and applied",
 	"alert.confirm-discard": "Are you sure you wish to discard your privilege changes?",
 	"alert.discarded": "Privilege changes discarded",
-	"alert.confirm-copyToAll": "Are you sure you wish to apply this privilege set to <strong>all categories</strong>?",
-	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's privilege set to <strong>all categories</strong>?",
-	"alert.confirm-copyToChildren": "Are you sure you wish to apply this privilege set to <strong>all descendant (child) categories</strong>?",
-	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToAll": "Are you sure you wish to apply this set of <strong>%1</strong> to <strong>all categories</strong>?",
+	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's set of <strong>%1</strong> to <strong>all categories</strong>?",
+	"alert.confirm-copyToChildren": "Are you sure you wish to apply this set of <strong>%1</strong> to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's set of <strong>%1</strong> to <strong>all descendant (child) categories</strong>?",
 	"alert.no-undo": "<em>This action cannot be undone.</em>",
-	"alert.admin-warning": "Administrators implicitly get all privileges"
+	"alert.admin-warning": "Administrators implicitly get all privileges",
+  	"alert.copyPrivilegesFrom-title": "Select a category to copy from",
+  	"alert.copyPrivilegesFrom-warning": "This will copy <strong>%1</strong> from the selected category.",
+  	"alert.copyPrivilegesFromGroup-warning": "This will copy this group's set of <strong>%1</strong> from the selected category."
 }

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

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

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

@@ -5,5 +5,7 @@
     "orphaned": "Orphaned",
     "size/filecount": "Size / Filecount",
     "confirm-delete": "Do you really want to delete this file?",
-    "filecount": "%1 files"
+    "filecount": "%1 files",
+    "new-folder": "New Folder",
+    "name-new-folder": "Enter a name for new the folder"
 }

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

@@ -18,7 +18,8 @@
 	"download-csv": "Download CSV",
 	"manage-groups": "Manage Groups",
 	"add-group": "Add Group",
-	"invite": "Invite",
+	"create": "Create User",
+	"invite": "Invite by Email",
 	"new": "New User",
 	"filter-by": "Filter by",
 	"pills.unvalidated": "Not Validated",
@@ -47,6 +48,7 @@
 	"users.uid": "uid",
 	"users.username": "username",
 	"users.email": "email",
+	"users.no-email": "(no email)",
 	"users.ip": "IP",
 	"users.postcount": "postcount",
 	"users.reputation": "reputation",
@@ -61,7 +63,7 @@
 	"create.password": "Password",
 	"create.password-confirm": "Confirm Password",
 
-	"temp-ban.length": "Ban Length",
+	"temp-ban.length": "Length",
 	"temp-ban.reason": "Reason <span class=\"text-muted\">(Optional)</span>",
 	"temp-ban.hours": "Hours",
 	"temp-ban.days": "Days",
@@ -89,6 +91,7 @@
 	"alerts.validate-email-success": "Emails validated",
 	"alerts.validate-force-password-reset-success": "User(s) passwords have been reset and their existing sessions have been revoked.",
 	"alerts.password-reset-confirm": "Do you want to send password reset email(s) to these user(s)?",
+	"alerts.password-reset-email-sent": "Password reset email sent.",
 	"alerts.confirm-delete": "<strong>Warning!</strong><p>Do you really want to delete <strong>user(s)</strong>?</p><p>This action is not reversible! Only the user account will be deleted, their posts and topics will remain.</p>",
 	"alerts.delete-success": "User(s) Deleted!",
 	"alerts.confirm-delete-content": "<strong>Warning!</strong><p>Do you really want to delete these user(s) <strong>content</strong>?</p><p>This action is not reversible! The users' accounts will remain, but their posts and topics will be deleted.</p>",

public/language/ar/admin/menu.json

@@ -4,6 +4,7 @@
 	"dashboard/logins": "Logins",
 	"dashboard/users": "Users",
 	"dashboard/topics": "Topics",
+	"dashboard/searches": "Searches",
 	"section-general": "عام",
 
 	"section-manage": "إدارة",
@@ -75,7 +76,7 @@
 	"logout": "Log out",
 	"view-forum": "View Forum",
 
-	"search.placeholder": "Press "/" to search for settings",
+	"search.placeholder": "Search settings",
 	"search.no-results": "No results...",
 	"search.search-forum": "Search the forum for <strong></strong>",
 	"search.keep-typing": "Type more to see results...",

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

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

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

@@ -11,6 +11,9 @@
 	"uid": "User ID",
 	"uid-help-text": "Specify a User ID to associate with this token. If the user ID is <code>0</code>, it will be considered a <em>master</em> token, which can assume the identity of other users based on the <code>_uid</code> parameter",
 	"description": "Description",
+	"last-seen-ago": "Last used <span class=\"timeago\" title=\"%1\"></span>.",
+	"last-seen-on": "Last used on <span class=\"timeago\" title=\"%1\"></span>.",
+	"last-seen-never": "This key has never been used.",
 	"no-description": "No description specified.",
 	"token-on-save": "Token will be generated once form is saved"
 }

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

@@ -5,14 +5,18 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
-	"smtp-transport.enabled": "Use an external email server to send emails",
+	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
 	"smtp-transport.service": "Select a service",
 	"smtp-transport.service-custom": "Custom Service",
-	"smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.",
-	"smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to <a href=\"https://www.google.com/settings/security/lesssecureapps\">configure your GMail account to allow less secure apps</a>.",
-	"smtp-transport.gmail-warning2": "For more information about this workaround, <a href=\"https://nodemailer.com/usage/using-gmail/\">please consult this NodeMailer article on the issue.</a> An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. <a href=\"../extend/plugins\">Browse available plugins here</a>.",
+	"smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select &quot;Custom Service&quot; and enter the details below.",
+	"smtp-transport.gmail-warning1": "If you are using GMail as your email provider, you will have to generate an &quot;App Password&quot; in order for NodeBB to authenticate successfully. You can generate one at the <a href=\"https://myaccount.google.com/apppasswords\">App Passwords <i class=\"fa fa-external-link\"></i></a> page.",
+	"smtp-transport.gmail-warning2": "For more information about this workaround, <a href=\"https://nodemailer.com/usage/using-gmail/\">please consult this NodeMailer article <i class=\"fa fa-external-link\"></i></a> on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. <a href=\"../extend/plugins\">Browse available plugins here</a>.",
+	"smtp-transport.auto-enable-toast": "It looks like you&apos;re configuring an SMTP transport. We enabled the \"SMTP Transport\" option for you.",
 	"smtp-transport.host": "SMTP Host",
 	"smtp-transport.port": "SMTP Port",
 	"smtp-transport.security": "Connection security",
@@ -36,6 +40,13 @@
 	"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>",
-	"notifications.settings": "Email notification settings",
-	"notifications.remove-images": "Remove images from email notifications"
-}
+	"notifications.remove-images": "Remove images from email notifications",
+	"require-email-address": "Require new users to specify an email address",
+	"require-email-address-warning": "By default, users can opt-out of entering an email address by leaving the field blank. Enabling this option means they have to enter an email address in order to proceed with registration. <strong>It does not ensure user will enter a real email address, nor even an address they own.</strong>",
+	"send-validation-email": "Send validation emails when an email is added or changed",
+	"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
+	"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). <strong>Enable this setting at your own risk</strong> &ndash; sending emails to unverified addresses may be a violation of regional anti-spam laws.",
+	"prompt": "Prompt users to enter or confirm their emails",
+	"prompt-help": "If a user does not have an email set, or their email is not confirmed, a warning will be shown on screen.",
+	"sendEmailToBanned": "Send emails to users even if they have been banned"
+}

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

@@ -3,9 +3,9 @@
 	"title": "عنوان الموقع",
 	"title.short": "عنوان قصير",
 	"title.short-placeholder": "ان لم تقم بكتابة عنوان مختصر, سيتم استخدام عنوان الموقع الكلي",
-	"title.url": "الرابط",
+	"title.url": "Title Link URL",
 	"title.url-placeholder": "The URL of the site title",
-	"title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.",
+	"title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index. <br> Note: This is not the external URL used in emails, etc. That is set by the <code>url</code> property in config.json",
 	"title.name": "اسم المنتدي",
 	"title.show-in-header": "Show Site Title in Header",
 	"browser-title": "عنوان المتصفح",
@@ -20,9 +20,9 @@
 	"logo.image": "صورة",
 	"logo.image-placeholder": "Path to a logo to display on forum header",
 	"logo.upload": "رفع",
-	"logo.url": "الرابط",
+	"logo.url": "Logo Link 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.url-help": "When the logo is clicked, send users to this address. If left blank, user will be sent to the forum index. <br> Note: This is not the external URL used in emails, etc. That is set by the <code>url</code> property in config.json",
 	"logo.alt-text": "نص بديل",
 	"log.alt-text-placeholder": "Alternative text for accessibility",
 	"favicon": "صورة المفضله",
@@ -35,7 +35,10 @@
 	"maskable-icon.help": "Recommended size and format: 512x512, PNG format only. If no maskable icon is specified, NodeBB will fall back to the Touch Icon.",
 	"outgoing-links": "Outgoing Links",
 	"outgoing-links.warning-page": "Use Outgoing Links Warning Page",
-	"search-default-sort-by": "الترتيب الافتراضي للبحث",
+	"search": "Search",
+	"search-default-in": "Search In",
+	"search-default-in-quick": "Quick Search In",
+	"search-default-sort-by": "Sort by",
 	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page",
 	"site-colors": "Site Color Metadata",
 	"theme-color": "لون الثيم",
@@ -44,4 +47,4 @@
 	"undo-timeout": "Undo Timeout",
 	"undo-timeout-help": "Some operations such as moving topics will allow for the moderator to undo their action within a certain timeframe. Set to 0 to disable undo completely.",
 	"topic-tools": "Topic Tools"
-}
+}

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

@@ -11,6 +11,8 @@
 	"properties": "Properties:",
 	"groups": "Groups:",
 	"open-new-window": "Open in a new window",
+	"dropdown": "Dropdown",
+	"dropdown-placeholder": "Place your dropdown menu items below, ie: <br/>&lt;li&gt;&lt;a class=&quot;dropdown-item&quot; href&#x3D;&quot;https://myforum.com&quot;&gt;Link 1&lt;/a&gt;&lt;/li&gt;",
 
 	"btn.delete": "Delete",
 	"btn.disable": "Disable",
@@ -20,4 +22,4 @@
 	"custom-route": "Custom Route",
 	"core": "core",
 	"plugin": "plugin"
-}
+}

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

@@ -2,5 +2,6 @@
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
 	"welcome-notification-link": "Welcome Notification Link",
-	"welcome-notification-uid": "Welcome Notification User (UID)"
+	"welcome-notification-uid": "Welcome Notification User (UID)",
+	"post-queue-notification-uid": "Post Queue User (UID)"
 }

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

@@ -40,6 +40,7 @@
 	"teaser.last-post": "Last – Show the latest post, including the original post, if no replies",
 	"teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies",
 	"teaser.first": "First",
+	"showPostPreviewsOnHover": "Show a preview of posts when mouse overed",
 	"unread": "Unread Settings",
 	"unread.cutoff": "Unread cutoff days",
 	"unread.min-track-last": "Minimum posts in topic before tracking last read",
@@ -50,12 +51,16 @@
 	"signature.disable": "Disable signatures",
 	"signature.no-links": "Disable links in signatures",
 	"signature.no-images": "Disable images in signatures",
+	"signature.hide-duplicates": "Hide duplicate signatures in topics",
 	"signature.max-length": "Maximum Signature Length",
 	"composer": "Composer Settings",
 	"composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.",
 	"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",
+	"backlinks": "Backlinks",
+	"backlinks.enabled": "Enable topic backlinks",
+	"backlinks.help": "If a post references another topic, a link back to the post will be inserted into the referenced topic at that point in time.",
 	"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

@@ -4,9 +4,13 @@
 	"disable-down-voting": "Disable Down Voting",
 	"votes-are-public": "All Votes Are Public",
 	"thresholds": "Activity Thresholds",
+	"min-rep-upvote": "Minimum reputation to upvote posts",
+	"upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)",
+	"upvotes-per-user-per-day": "Upvotes per user per day (set to 0 for unlimited upvotes)",
 	"min-rep-downvote": "Minimum reputation to downvote posts",
 	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
 	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
+	"min-rep-chat": "Minimum reputation to send chat messages",
 	"min-rep-flag": "Minimum reputation to flag posts",
 	"min-rep-website": "Minimum reputation to add \"Website\" to user profile",
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",
@@ -18,5 +22,10 @@
 	"flags.limit-per-target": "Maximum number of times something can be flagged",
 	"flags.limit-per-target-placeholder": "Default: 0",
 	"flags.limit-per-target-help": "When a post or user is flagged multiple times, each additional flag is considered a "report" and added to the original flag. Set this option to a number other than zero to limit the number of reports an item can receive.",
-	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned"
+  	"flags.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (Set to 0 to disable, default: 0)",
+	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned",
+	"flags.action-on-resolve": "Do the following when a flag is resolved",
+	"flags.action-on-reject": "Do the following when a flag is rejected",
+	"flags.action.nothing": "Do nothing",
+	"flags.action.rescind": "Rescind the notification send to moderators/administrators"
 }

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

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

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

@@ -1,12 +1,10 @@
 {
 	"authentication": "المصادقة",
-	"require-email-confirmation": "يطلب تأكيد البريد الإلكتروني",
 	"email-confirm-interval": "لا يمكن للمستخدم إعادة إرسال رسالة تأكيد البريد الالكتروني حتى مرور",
-	"email-confirm-email2": "دقائق",
+	"email-confirm-interval2": "minutes have elapsed",
 	"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://ec.europa.eu/info/priorities/justice-and-fundamental-rights/data-protection/2018-reform-eu-data-protection-rules/eu-data-protection-rules_en\">General Data Protection Regulation (GDPR)</a>. <strong>Note</strong>: Enabling GDPR does not force pre-existing users to provide consent. To do so, you will need to install the GDPR plugin.",
@@ -31,6 +29,8 @@
 	"session-time-days": "Days",
 	"session-time-seconds": "Seconds",
 	"session-time-help": "These values are used to govern how long a user stays logged in when they check &quot;Remember Me&quot; on login. Note that only one of these values will be used. If there is no <i>seconds</i> value we fall back to <i>days</i>. If there is no <i>days</i> value we default to <i>14 days</i>.",
+	"session-duration": "Session length if \"Remember Me\" is not checked (seconds)",
+	"session-duration-help": "By default — or if set to <code>0</code> — a user will stay logged in for the duration of the session (e.g. however long the browser window/tab remains open). Set this value to explicitly invalidate the session after the specified number of seconds.",
 	"online-cutoff": "Minutes after user is considered inactive",
 	"online-cutoff-help": "If user performs no actions for this duration, they are considered inactive and they do not receive realtime updates.",
 	"registration": "تسجيل المستخدم",
@@ -71,6 +71,7 @@
 	"digest-freq.off": "Off",
 	"digest-freq.daily": "Daily",
 	"digest-freq.weekly": "Weekly",
+	"digest-freq.biweekly": "Bi-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",

public/language/ar/email.json

@@ -6,7 +6,9 @@
     "greeting_no_name": "مرحبًا",
     "greeting_with_name": "مرحبًا بك يا %1",
     "email.verify-your-email.subject": "Please verify your email",
-    "email.verify.text1": "Your email address has changed!",
+    "email.verify.text1": "You've requested that we change or confirm your email address",
+    "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. <strong>If you did not request this, no action is required on your part.</strong>",
+    "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).",
     "welcome.text1": "شكرًا على تسجيلك في %1!",
     "welcome.text2": "لتفعيل حسابك، نحتاج إلى التأكد من صحة عنوان البريد الإلكتروني الذي سجلت به.",
     "welcome.text3": "تم قبول نتسجيلك ، يمكنك الدخول باتسخدام اسم المستخدم و كلمة المرور.",
@@ -46,6 +48,8 @@
     "unsub.cta": "انقر هنا لتغيير تلك الإعدادات",
     "unsubscribe": "unsubscribe",
     "unsub.success": "You will no longer receive emails from the <strong>%1</strong> mailing list",
+    "unsub.failure.title": "Unable to unsubscribe",
+    "unsub.failure.message": "Unfortunately, we were not able to unsubscribe you from the mailing list, as there was an issue with the link. However, you can alter your email preferences by going to <a href=\"%2\">your user settings</a>.<br /><br />(error: <code>%1</code>)",
     "banned.subject": "You have been banned from %1",
     "banned.text1": "The user %1 has been banned from %2.",
     "banned.text2": "This ban will last until %1.",

public/language/ar/error.json

@@ -1,6 +1,8 @@
 {
     "invalid-data": "بيانات غير صحيحة",
     "invalid-json": "Invalid JSON",
+    "wrong-parameter-type": "A value of type %3 was expected for property `%1`, but %2 was received instead",
+    "required-parameters-missing": "Required parameters were missing from this API call: %1",
     "not-logged-in": "لم تقم بتسجيل الدخول",
     "account-locked": "تم حظر حسابك مؤقتًا.",
     "search-requires-login": "البحث في المنتدى يتطلب حساب - الرجاء تسجيل الدخول أو التسجيل",
@@ -9,6 +11,7 @@
     "invalid-tid": "موضوع غير متواجد",
     "invalid-pid": "رد غير موجود",
     "invalid-uid": "مستخدم غير موجود",
+    "invalid-mid": "Invalid Chat Message ID",
     "invalid-date": "A valid date must be provided",
     "invalid-username": "اسم المستخدم غير مقبول",
     "invalid-email": "البريد الاكتروني غير مقبول",
@@ -25,14 +28,18 @@
     "invalid-event": "Invalid event: %1",
     "local-login-disabled": "Local login system has been disabled for non-privileged accounts.",
     "csrf-invalid": "لم تتمكن من تسجيل الدخول. هنالك أحتمال ان جلستك انتهت. رجاءًا حاول مرة اخرى.",
+    "invalid-path": "Invalid path",
+    "folder-exists": "Folder exists",
     "invalid-pagination-value": "رقم الصفحة غير صحيح ، يجب أن يكون بين %1 و %2 .",
     "username-taken": "اسم المستخدم مأخوذ",
     "email-taken": "البريد الالكتروني مأخوذ",
+    "email-nochange": "The email entered is the same as the email already on file.",
     "email-invited": "Email was already invited",
-    "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.",
+    "email-not-confirmed": "Posting in some categories or topics is enabled once your email is confirmed, please click here to send a confirmation email.",
     "email-not-confirmed-chat": "لا يمكنك الدردشة حتى تقوم بتأكيد بريدك الإلكتروني، الرجاء إضغط هنا لتأكيد بريدك اﻹلكتروني.",
-    "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-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You may not be able to post in some categories or chat until your email is confirmed.",
+    "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery, and may be necessary for chatting and posting in some categories. Please click here to enter an email.",
+    "user-doesnt-have-email": "User \"%1\" does not have an email set.",
     "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.",
@@ -54,6 +61,8 @@
     "no-group": "مجموعة غير موجودة",
     "no-user": "اسم مستخدم غير موجود",
     "no-teaser": "مقتطف غير موجود",
+    "no-flag": "Flag does not exist",
+    "no-chat-room": "Chat room does not exist",
     "no-privileges": "لاتملك الصلاحيات اللازمة للقيام بهذه العملية",
     "category-disabled": "قائمة معطلة",
     "topic-locked": "الموضوع مقفول",
@@ -80,6 +89,7 @@
     "category-not-selected": "Category not selected.",
     "too-many-posts": "يسمح لك بالنشر مرة كل %1 ثانية - يرجى الإنتظار قبل النشر مجدداً",
     "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
+    "already-posting": "You are already posting",
     "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",
     "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 character(s)",
     "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
@@ -100,6 +110,10 @@
     "already-bookmarked": "You have already bookmarked this post",
     "already-unbookmarked": "You have already unbookmarked this post",
     "cant-ban-other-admins": "لايمكن حظر مدبر نظام آخر.",
+    "cant-mute-other-admins": "You can't mute other admins!",
+    "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)",
+    "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)",
+    "cant-make-banned-users-admin": "You can't make banned users admin.",
     "cant-remove-last-admin": "رجاءًا ، أضف مدير أخر قبل حذف صلاحيات الإدارة من حسابك.",
     "account-deletion-disabled": "Account deletion is disabled",
     "cant-delete-admin": "رجاءًا أزل صلاحيات الإدارة قبل حذف الحساب. ",
@@ -137,29 +151,35 @@
     "invalid-chat-message": "الرسالة غير صالحة.",
     "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.",
     "chat-room-does-not-exist": "Chat room does not exist.",
+    "cant-add-users-to-chat-room": "Can't add users to chat room.",
+    "cant-remove-users-from-chat-room": "Can't remove users from chat room.",
+    "chat-room-name-too-long": "Chat room name too long.",
     "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",
+    "not-enough-reputation-to-chat": "You need %1 reputation to chat",
+    "not-enough-reputation-to-upvote": "You need %1 reputation to upvote",
+    "not-enough-reputation-to-downvote": "You need %1 reputation to downvote",
+    "not-enough-reputation-to-flag": "You need %1 reputation to flag this post",
+    "not-enough-reputation-min-rep-website": "You need %1 reputation to add a website",
+    "not-enough-reputation-min-rep-aboutme": "You need %1 reputation to add an about me",
+    "not-enough-reputation-min-rep-signature": "You need %1 reputation to add a signature",
+    "not-enough-reputation-min-rep-profile-picture": "You need %1 reputation to add a profile picture",
+    "not-enough-reputation-min-rep-cover-picture": "You need %1 reputation to add a cover picture",
     "post-already-flagged": "You have already flagged this post",
     "user-already-flagged": "You have already flagged this user",
     "post-flagged-too-many-times": "This post has been flagged by others already",
     "user-flagged-too-many-times": "This user has been flagged by others already",
     "cant-flag-privileged": "You are not allowed to flag the profiles or content of privileged users (moderators/global moderators/admins)",
     "self-vote": "You cannot vote on your own post",
+    "too-many-upvotes-today": "You can only upvote %1 times a day",
+    "too-many-upvotes-today-user": "You can only upvote a user %1 times a day",
     "too-many-downvotes-today": "You can only downvote %1 times a day",
     "too-many-downvotes-today-user": "You can only downvote a user %1 times a day",
     "reload-failed": "المنتدى واجه مشكلة أثناء إعادة التحميل: \"%1\".  سيواصل المنتدى خدمة العملاء السابقين لكن يجب عليك إلغاء أي تغيير قمت به قبل إعادة التحميل.",
@@ -190,6 +210,8 @@
     "no-connection": "There seems to be a problem with your internet connection",
     "socket-reconnect-failed": "Unable to reach the server at this time. Click here to try again, or try again later",
     "plugin-not-whitelisted": "Unable to install plugin – only plugins whitelisted by the NodeBB Package Manager can be installed via the ACP",
+    "plugins-set-in-configuration": "You are not allowed to change plugin state as they are defined at runtime (config.json, environmental variables or terminal arguments), please modify the configuration instead.",
+    "theme-not-set-in-configuration": "When defining active plugins in configuration, changing themes requires adding the new theme to the list of active plugins before updating it in the ACP",
     "topic-event-unrecognized": "Topic event '%1' unrecognized",
     "cant-set-child-as-parent": "Can't set child as parent category",
     "cant-set-self-as-parent": "Can't set self as parent category",
@@ -202,5 +224,6 @@
     "api.429": "You have made too many requests, please try again later",
     "api.500": "An unexpected error was encountered while attempting to service your request.",
     "api.501": "The route you are trying to call is not implemented yet, please try again tomorrow",
-    "api.503": "The route you are trying to call is not currently available due to a server configuration"
+    "api.503": "The route you are trying to call is not currently available due to a server configuration",
+    "api.reauth-required": "The resource you are trying to access requires (re-)authentication."
 }

public/language/ar/flags.json

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

public/language/ar/global.json

@@ -23,7 +23,7 @@
     "close": "أغلق",
     "pagination": "الصفحات",
     "pagination.out_of": "%1 من %2",
-    "pagination.enter_index": "أدخل الرقم التسلسلي",
+    "pagination.enter_index": "Go to post index",
     "header.admin": "مدير النظام",
     "header.categories": "الأقسام",
     "header.recent": "حديث",
@@ -37,9 +37,13 @@
     "header.notifications": "التنبيهات",
     "header.search": "بحث",
     "header.profile": "ملف",
+    "header.account": "Account",
     "header.navigation": "الاستكشاف",
+    "header.manage": "Manage",
+    "header.drafts": "Drafts",
     "notifications.loading": "تحميل التنبيهات",
     "chats.loading": "تحميل الدردشات",
+    "drafts.loading": "Loading Drafts",
     "motd.welcome": "مرحبا بكم في NodeBB، منصة المناقشة المستقبلية.",
     "previouspage": "الصفحة السابقة",
     "nextpage": "الصفحة التالية",
@@ -54,8 +58,10 @@
     "users": "الأعضاء",
     "topics": "المواضيع",
     "posts": "المشاركات",
-    "x-posts": "%1 posts",
+    "x-posts": "<span class=\"formatted-number\">%1</span> posts",
+    "x-topics": "<span class=\"formatted-number\">%1</span> topics",
     "best": "الأفضل",
+    "controversial": "Controversial",
     "votes": "Votes",
     "x-votes": "%1 votes",
     "voters": "Voters",
@@ -68,8 +74,10 @@
     "reputation": "السمعة",
     "lastpost": "Last post",
     "firstpost": "First post",
+    "about": "About",
     "read_more": "اقرأ المزيد",
     "more": "المزيد",
+    "none": "None",
     "posted_ago_by_guest": "كتب %1 بواسطة زائر",
     "posted_ago_by": "كتب %1 بواسطة %2",
     "posted_ago": "كتب %1",
@@ -80,11 +88,13 @@
     "user_posted_ago": "%1 كتب %2",
     "guest_posted_ago": "كتب زائر %1",
     "last_edited_by": "اخر تحرير بواسطة 1%",
+    "edited-timestamp": "Edited %1",
     "norecentposts": "لاوجود لمشاركات جديدة",
     "norecenttopics": "لاوجود لمواضيع جديدة",
     "recentposts": "آخر المشاركات",
     "recentips": "آخر عناوين ال IP التي سجلت الدخول",
     "moderator_tools": "أدوات المشرف",
+    "status": "Status",
     "online": "المتواجدون حاليًّا",
     "away": "غير متواجد",
     "dnd": "عدم الإزعاج",
@@ -120,5 +130,7 @@
     "edited": "حُرِر",
     "disabled": "معطل",
     "select": "تحديد",
-    "user-search-prompt": "Type something here to find users..."
+    "user-search-prompt": "Type something here to find users...",
+    "hidden": "Hidden",
+    "sort": "Sort"
 }

public/language/ar/groups.json

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

public/language/ar/login.json

@@ -1,7 +1,6 @@
 {
     "username-email": "اسم المستخدم / البريد الإلكتروني",
     "username": "اسم المستخدم",
-    "email": "البريد الإلكتروني",
     "remember_me": "تذكرني؟",
     "forgot_password": "نسيت كلمة المرور؟",
     "alternative_logins": "تسجيلات الدخول البديلة",

public/language/ar/modules.json

@@ -1,13 +1,17 @@
 {
     "chat.chatting_with": "Chat with",
-    "chat.placeholder": "أكتب رسالة دردشة هنا، اضغط ENTER للإرسال",
+    "chat.placeholder": "Type chat message here, drag & drop images, press enter to send",
+    "chat.placeholder.mobile": "Type chat message here",
     "chat.scroll-up-alert": "You are looking at older messages, click here to go to most recent message.",
+    "chat.usernames-and-x-others": "%1 & %2 others",
+    "chat.chat-with-usernames": "Chat with %1",
+    "chat.chat-with-usernames-and-x-others": "Chat with %1 & %2 others",
     "chat.send": "أرسل",
     "chat.no_active": "لا يوجد لديك دردشات نشطة.",
     "chat.user_typing": "%1 يكتب رسالة...",
     "chat.user_has_messaged_you": "%1 أرسل لك رسالة.",
-    "chat.see_all": "عرض كل المحادثات",
-    "chat.mark_all_read": "Mark all chats read",
+    "chat.see_all": "All chats",
+    "chat.mark_all_read": "Mark all read",
     "chat.no-messages": "المرجو اختيار مرسل إليه لمعاينة تاريخ الدردشات",
     "chat.no-users-in-room": "No users in this room",
     "chat.recent-chats": "آخر الدردشات",
@@ -42,6 +46,7 @@
     "composer.compose": "اكتب",
     "composer.show_preview": "عرض المعاينة",
     "composer.hide_preview": "إخفاء المعاينة",
+    "composer.help": "Help",
     "composer.user_said_in": "%1 كتب في  %2",
     "composer.user_said": "%1 كتب:",
     "composer.discard": "هل أنت متأكد أنك تريد التخلي عن التغييرات؟",
@@ -54,7 +59,7 @@
     "composer.formatting.strikethrough": "Strikethrough",
     "composer.formatting.code": "Code",
     "composer.formatting.link": "Link",
-    "composer.formatting.picture": "Picture",
+    "composer.formatting.picture": "Image Link",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
     "composer.zen_mode": "Zen Mode",
@@ -65,9 +70,14 @@
     "composer.schedule-time": "Time",
     "composer.cancel-scheduling": "Cancel Scheduling",
     "composer.set-schedule-date": "Set Date",
+    "composer.discard-all-drafts": "Discard all drafts",
+    "composer.no-drafts": "You have no drafts",
+    "composer.discard-draft-confirm": "Do you want to discard this draft?",
     "bootbox.ok": "OK",
     "bootbox.cancel": "إلغاء",
     "bootbox.confirm": "تأكيد",
+    "bootbox.submit": "Submit",
+    "bootbox.send": "Send",
     "cover.dragging_title": "Cover Photo Positioning",
     "cover.dragging_message": "Drag the cover photo to the desired position and click \"Save\"",
     "cover.saved": "Cover photo image and position saved",

public/language/ar/notifications.json

@@ -1,8 +1,8 @@
 {
     "title": "التنبيهات",
     "no_notifs": "ليس لديك أية تنبيهات جديدة",
-    "see_all": "عرض كل التنبيهات",
-    "mark_all_read": "اجعل كل التنبيهات مقروءة",
+    "see_all": "All notifications",
+    "mark_all_read": "Mark all read",
     "back_to_home": "عودة إلى %1",
     "outgoing_link": "رابط خارجي",
     "outgoing_link_message": "أنت تغادر اﻻن %1",
@@ -50,6 +50,7 @@
     "users-csv-exported": "Users csv exported, click to download",
     "post-queue-accepted": "Your queued post has been accepted. Click here to see your post.",
     "post-queue-rejected": "Your queued post has been rejected.",
+    "post-queue-notify": "Queued post received a notification:<br/>\"%1\"",
     "email-confirmed": "تم التحقق من عنوان البريد الإلكتروني",
     "email-confirmed-message": "شكرًا على إثبات صحة عنوان بريدك الإلكتروني. صار حسابك مفعلًا بالكامل.",
     "email-confirm-error-message": "حدث خطأ أثناء التحقق من عنوان بريدك الإلكتروني. ربما رمز التفعيل خاطئ أو انتهت صلاحيته.",

public/language/ar/pages.json

@@ -49,11 +49,13 @@
     "account/watched_categories": "%1's Watched Categories",
     "account/bookmarks": "%1's Bookmarked Posts",
     "account/settings": "خيارات المستخدم",
+    "account/settings-of": "Changing settings of %1",
     "account/watched": "Topics watched by %1",
     "account/ignored": "Topics ignored by %1",
     "account/upvoted": "Posts upvoted by %1",
     "account/downvoted": "Posts downvoted by %1",
     "account/best": "Best posts made by %1",
+    "account/controversial": "Controversial posts made by %1",
     "account/blocks": "Blocked users for %1",
     "account/uploads": "Uploads by %1",
     "account/sessions": "Login Sessions",

public/language/ar/post-queue.json

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

public/language/ar/recent.json

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

public/language/ar/register.json

@@ -1,5 +1,6 @@
 {
     "register": "تسجيل",
+    "already-have-account": "Already have an account?",
     "cancel_registration": "إلغاء التسجيل",
     "help.email": "افتراضيا، سيتم إخفاء بريدك الإلكتروني من العامة.",
     "help.username_restrictions": "اسم مستخدم فريدة من نوعها بين 1% و 2% حرفا. بإمكان الآخرين مناداتك بـ @<span id='yourUsername'>اسم المستخدم</span>.",
@@ -20,8 +21,9 @@
     "registration-added-to-queue": "تمت إضافتك في قائمة الإنتضار. ستتلقى رسالة إلكترونية عند الموافقة على تسجيلك من قبل الإدارة.",
     "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.",
     "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.",
-    "interstitial.intro": "نحتاج إلى بعض المعلومات الإضافية قبل أن نتمكن من إنشاء حسابك.",
-    "interstitial.errors-found": "تعذر علينا إتمام عملية التسجيل:",
+    "interstitial.intro": "We'd like some additional information in order to update your account&hellip;",
+    "interstitial.intro-new": "We'd like some additional information before we can create your account&hellip;",
+    "interstitial.errors-found": "Please review the entered information:",
     "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/search.json

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

public/language/ar/social.json

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

public/language/ar/tags.json

@@ -1,5 +1,7 @@
 {
+    "all-tags": "All tags",
     "no_tag_topics": "لا يوجد مواضيع بهذه الكلمة الدلالية.",
+    "no-tags-found": "No tags found",
     "tags": "الكلمات الدلالية",
     "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "أدخل الكلمات الدلالية...",

public/language/ar/top.json

@@ -0,0 +1,4 @@
+{
+	"title": "Top",
+	"no_top_topics": "No top topics"
+}

public/language/ar/topic.json

@@ -20,6 +20,8 @@
     "login-to-view": "🔒 Log in to view",
     "edit": "تعديل",
     "delete": "حذف",
+    "delete-event": "Delete Event",
+    "delete-event-confirm": "Are you sure you want to delete this event?",
     "purge": "تطهير",
     "restore": "استعادة",
     "move": "نقل",
@@ -37,13 +39,30 @@
     "copy-ip": "Copy IP",
     "ban-ip": "Ban IP",
     "view-history": "Edit History",
-    "locked-by": "Locked by",
-    "unlocked-by": "Unlocked by",
-    "pinned-by": "Pinned by",
-    "unpinned-by": "Unpinned by",
-    "deleted-by": "Deleted by",
-    "restored-by": "Restored by",
-    "queued-by": "Post queued for approval →",
+    "wrote-ago": "wrote <a href=\"%1\" class=\"timeago text-muted\" title=\"%2\"></a>",
+    "wrote-on": "wrote on <a href=\"%1\" class=\"timeago text-muted\" title=\"%2\"></a>",
+    "replied-to-user-ago": "replied to <a component=\"post/parent\" data-topid=\"%1\" href=\"%2\">%3</a> <a href=\"%4\" class=\"timeago text-muted\" title=\"%5\"></a>",
+    "replied-to-user-on": "replied to <a component=\"post/parent\" data-topid=\"%1\" href=\"%2\">%3</a> on <a hrf=\"%4\" class=\"timeago text-muted\" title=\"%5\"></a>",
+    "user-locked-topic-ago": "%1 locked this topic %2",
+    "user-locked-topic-on": "%1 locked this topic on %2",
+    "user-unlocked-topic-ago": "%1 unlocked this topic %2",
+    "user-unlocked-topic-on": "%1 unlocked this topic on %2",
+    "user-pinned-topic-ago": "%1 pinned this topic %2",
+    "user-pinned-topic-on": "%1 pinned this topic on %2",
+    "user-unpinned-topic-ago": "%1 unpinned this topic %2",
+    "user-unpinned-topic-on": "%1 unpinned this topic on %2",
+    "user-deleted-topic-ago": "%1 deleted this topic %2",
+    "user-deleted-topic-on": "%1 deleted this topic on %2",
+    "user-restored-topic-ago": "%1 restored this topic %2",
+    "user-restored-topic-on": "%1 restored this topic on %2",
+    "user-moved-topic-from-ago": "%1 moved this topic from %2 %3",
+    "user-moved-topic-from-on": "%1 moved this topic from %2 on %3",
+    "user-queued-post-ago": "%1 <a href=\"%2\">queued</a> post for approval %3",
+    "user-queued-post-on": "%1 <a href=\"%2\">queued</a> post for approval on %3",
+    "user-referenced-topic-ago": "%1 <a href=\"%2\">referenced</a> this topic %3",
+    "user-referenced-topic-on": "%1 <a href=\"%2\">referenced</a> this topic on %3",
+    "user-forked-topic-ago": "%1 <a href=\"%2\">forked</a> this topic %3",
+    "user-forked-topic-on": "%1 <a href=\"%2\">forked</a> this topic on %3",
     "bookmark_instructions": "اضغط هنا للعودة لأخر مشاركة مقروءة في الموضوع",
     "flag-post": "Flag this post",
     "flag-user": "Flag this user",
@@ -90,7 +109,7 @@
     "thread_tools.purge": "تطهير الموضوع",
     "thread_tools.purge_confirm": "هل أنت متأكد أنك تريد تطهير هذا الموضوع؟",
     "thread_tools.merge_topics": "Merge Topics",
-    "thread_tools.merge": "Merge",
+    "thread_tools.merge": "Merge Topic",
     "topic_move_success": "This topic will be moved to \"%1\" shortly. Click here to undo.",
     "topic_move_multiple_success": "These topics will be moved to \"%1\" shortly. Click here to undo.",
     "topic_move_all_success": "All topics will be moved to \"%1\" shortly. Click here to undo.",
@@ -108,6 +127,7 @@
     "bookmark": "Bookmark",
     "bookmarks": "Bookmarks",
     "bookmarks.has_no_bookmarks": "You haven't bookmarked any posts yet.",
+    "copy-permalink": "Copy Permalink",
     "loading_more_posts": "تحميل المزيد من المشاركات",
     "move_topic": "نقل الموضوع",
     "move_topics": "نقل المواضيع",
@@ -115,7 +135,7 @@
     "post_moved": "تم نقل المشاركة",
     "fork_topic": "فرع الموضوع",
     "enter-new-topic-title": "Enter new topic title",
-    "fork_topic_instruction": "إضغط على المشاركات التي تريد تفريعها",
+    "fork_topic_instruction": "Click the posts you want to fork, enter a title for the new topic and click fork topic",
     "fork_no_pids": "لم تختر أي مشاركة",
     "no-posts-selected": "No posts selected!",
     "x-posts-selected": "%1 post(s) selected",
@@ -130,11 +150,14 @@
     "merge-new-title-for-topic": "New title for topic",
     "topic-id": "Topic ID",
     "move_posts_instruction": "Click the posts you want to move then enter a topic ID or go to the target topic",
+    "move_topic_instruction": "Select the target category and then click move",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "أدخل عنوان موضوعك هنا...",
     "composer.handle_placeholder": "Enter your name/handle here",
+    "composer.hide": "Hide",
     "composer.discard": "نبذ التغييرات",
     "composer.submit": "حفظ",
+    "composer.additional-options": "Additional Options",
     "composer.schedule": "Schedule",
     "composer.replying_to": "الرد على %1",
     "composer.new_topic": "موضوع جديد",
@@ -155,6 +178,7 @@
     "newest_to_oldest": "من الأحدث إلى الأقدم",
     "most_votes": "Most Votes",
     "most_posts": "Most Posts",
+    "most_views": "Most Views",
     "stale.title": "Create new topic instead?",
     "stale.warning": "The topic you are replying to is quite old. Would you like to create a new topic instead, and reference this one in your reply?",
     "stale.create": "موضوع جديد",
@@ -173,5 +197,10 @@
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier",
     "first-post": "First post",
-    "last-post": "Last post"
+    "last-post": "Last post",
+    "go-to-my-next-post": "Go to my next post",
+    "no-more-next-post": "You don't have more posts in this topic",
+    "post-quick-reply": "Quick reply",
+    "navigator.index": "Post %1 of %2",
+    "navigator.unread": "%1 unread"
 }

public/language/ar/user.json

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

public/language/ar/users.json

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

public/language/bg/_DO_NOT_EDIT_FILES_HERE.md

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

public/language/bg/admin/admin.json

@@ -3,5 +3,7 @@
 	"alert.confirm-restart": "Наистина ли искате да рестартирате NodeBB?",
 
 	"acp-title": "%1 | Контролен панел за администратори на NodeBB",
-	"settings-header-contents": "Съдържание"
+	"settings-header-contents": "Съдържание",
+	"changes-not-saved": "Промените не са запазени",
+	"changes-not-saved-message": "Възникна проблем при запазването на промените Ви по NodeBB. (%1)"
 }

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

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

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

@@ -3,6 +3,7 @@
 	"no-events": "Няма събития",
 	"control-panel": "Контролен панел за събитията",
 	"delete-events": "Изтриване на събитията",
+	"confirm-delete-all-events": "Наистина ли искате да изтриете всички събития в журнала?",
 	"filters": "Филтри",
 	"filters-apply": "Прилагане на филтрите",
 	"filter-type": "Вид събитие",

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

@@ -1,7 +1,7 @@
 {
-	"custom-css": "Персонализиран CSS/LESS",
-	"custom-css.description": "Въведете своите собствени декларации на CSS/LESS, те ще бъдат приложени след всички останали стилове.",
-	"custom-css.enable": "Включване на персонализиран CSS/LESS",
+	"custom-css": "Персонализиран CSS/SASS",
+	"custom-css.description": "Въведете своите собствени декларации на CSS/SASS. Те ще бъдат приложени след всички останали стилове.",
+	"custom-css.enable": "Включване на персонализиран CSS/SASS",
 
 	"custom-js": "Персонализиран код на Javascript",
 	"custom-js.description": "Въведете свой собствен код на javascript тук. Той ще бъде изпълнен след като страницата се зареди напълно.",

public/language/bg/admin/dashboard.json

@@ -56,8 +56,8 @@
 	"active-users.total": "Общо",
 	"active-users.connections": "Връзки",
 
-	"anonymous-registered-users": "Анонимни към регистрирани потребители",
-	"anonymous": "Анонимни",
+	"guest-registered-users": "Гости към регистрирани потребители",
+	"guest": "Гост",
 	"registered": "Регистрирани",
 
 	"user-presence": "Присъствие на потребителите ",
@@ -68,6 +68,7 @@
 	"unread": "Непрочетени",
 
 	"high-presence-topics": "Теми с най-голяма присъственост",
+	"popular-searches": "Популярни търсения",
 
 	"graphs.page-views": "Преглеждания на страниците",
 	"graphs.page-views-registered": "Преглеждания на страниците от регистрирани потребители",
@@ -75,14 +76,18 @@
 	"graphs.page-views-bot": "Преглеждания на страниците от ботове",
 	"graphs.unique-visitors": "Уникални посетители",
 	"graphs.registered-users": "Регистрирани потребители",
-	"graphs.anonymous-users": "Анонимни потребители",
+	"graphs.guest-users": "Гости",
 	"last-restarted-by": "Последно рестартиране от",
 	"no-users-browsing": "Няма разглеждащи потребители",
 
 	"back-to-dashboard": "Назад към таблото",
 	"details.no-users": "В избрания период не са се регистрирали нови потребители",
 	"details.no-topics": "В избрания период не са публикувани нови теми",
+	"details.no-searches": "В избрания период не са правени търсения",
 	"details.no-logins": "В избрания период не са отчетени вписвания",
 	"details.logins-static": "NodeBB запазва данни за сесията в продължение на %1 дни, така че в следната таблица могат да се видят само последните активни сесии",
-	"details.logins-login-time": "Време на вписване"
+	"details.logins-login-time": "Време на вписване",
+	"start": "Начало",
+	"end": "Край",
+	"filter": "Филтриране"
 }

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

@@ -8,7 +8,11 @@
 	"nodejs": "nodejs",
 	"online": "на линия",
 	"git": "git",
-	"memory": "памет",
+	"process-memory": "памет на процеса",
+	"system-memory": "системна памет",
+	"used-memory-process": "Използвана памет от процеса",
+	"used-memory-os": "Използвана системна памет",
+	"total-memory-os": "Обща системна памет",
 	"load": "натоварване на системата",
 	"cpu-usage": "използване на процесора",
 	"uptime": "активно време",

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

@@ -8,8 +8,6 @@
 	"delete": "Изтриване",
 	"enable": "Включване",
 	"disable": "Изключване",
-	"control-panel": "Управление на наградите",
-	"new-reward": "Нова награда",
 
 	"alert.delete-success": "Наградата е изтрита успешно",
 	"alert.no-inputs-found": "Неправомерна награда — няма нищо въведено!",

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

@@ -8,9 +8,9 @@
 	"containers.none": "Няма",
 	"container.well": "Кладенец",
 	"container.jumbotron": "Джъмботрон",
-	"container.panel": "Панел",
-	"container.panel-header": "Заглавна част на панел",
-	"container.panel-body": "Основна част на панел",
+	"container.card": "Карта",
+	"container.card-header": "Заглавна част на карта",
+	"container.card-body": "Основна част на карта",
 	"container.alert": "Предупреждение",
 
 	"alert.confirm-delete": "Наистина ли искате да изтриете джаджата?",

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

@@ -1,79 +0,0 @@
-{
-	"forum-traffic": "Трафик на форума",
-	"page-views": "Преглеждания на страниците",
-	"unique-visitors": "Уникални посетители",
-	"new-users": "Нови потребители",
-	"posts": "Публикации",
-	"topics": "Теми",
-	"page-views-seven": "Последните 7 дни",
-	"page-views-thirty": "Последните 30 дни",
-	"page-views-last-day": "Последните 24 часа",
-	"page-views-custom": "Интервал по избор",
-	"page-views-custom-start": "Начална дата",
-	"page-views-custom-end": "Крайна дата",
-	"page-views-custom-help": "Въведете интервал от дати, за които искате да видите преглежданията на страниците. Ако не се появи календар за избор, можете да въведете датите във формат: <code>ГГГГ-ММ-ДД</code>",
-	"page-views-custom-error": "Моля, въведете правилен интервал от дати във формата: <code>ГГГГ-ММ-ДД</code>",
-
-	"stats.yesterday": "Вчера",
-	"stats.today": "Днес",
-	"stats.last-week": "Миналата седмица",
-	"stats.this-week": "Тази седмица",
-	"stats.last-month": "Миналия месец",
-	"stats.this-month": "Този месец",
-	"stats.all": "От началото",
-
-	"updates": "Обновления",
-	"running-version": "Вие използвате <strong>NodeBB версия <span id=\"version\">%1</span></strong>.",
-	"keep-updated": "Стремете се винаги да използвате най-новата версия на NodeBB, за да се възползвате от последните подобрения на сигурността и поправки на проблеми.",
-	"up-to-date": "<p>Вие използвате <strong>най-новата версия</strong> <i class=\"fa fa-check\"></i></p>",
-	"upgrade-available": "<p>Има нова версия (версия %1). Ако имате възможност, <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">обновете NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>Това е остаряла предварителна версия на NodeBB. Има нова версия (версия %1). Ако имате възможност, <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">обновете NodeBB</a>.</p>",
-	"prerelease-warning": "<p>Това е версия за <strong>предварителен преглед</strong> на NodeBB. Възможно е да има неочаквани неизправности. <i class=\"fa fa-exclamation-triangle\"></i></p>",
-	"running-in-development": "<span>Форумът работи в режим за разработчици, така че може да бъде уязвим. Моля, свържете се със системния си администратор.</span>",
-	"latest-lookup-failed": "<p>Не може да бъде извършена проверка за последната налична версия на NodeBB</p>",
-
-	"notices": "Забележки",
-	"restart-not-required": "Не се изисква рестартиране",
-	"restart-required": "Изисква се рестартиране",
-	"search-plugin-installed": "Добавката за търсене е инсталирана",
-	"search-plugin-not-installed": "Добавката за търсене не е инсталирана",
-	"search-plugin-tooltip": "Инсталирайте добавка за търсене от страницата с добавките, за да включите функционалността за търсене",
-
-	"control-panel": "Системен контрол",
-	"rebuild-and-restart": "Повторно изграждане и рестартиране",
-	"restart": "Рестартиране",
-	"restart-warning": "Повторното изграждане и рестартирането на NodeBB ще прекъснат всички връзки за няколко секунди.",
-	"restart-disabled": "Възможностите за повторно изграждане и рестартиране на NodeBB са изключени, тъй като изглежда, че NodeBB не се изпълнява чрез подходящия демон.",
-	"maintenance-mode": "Режим на профилактика",
-	"maintenance-mode-title": "Щракнете тук, за да зададете режим на профилактика на NodeBB",
-	"realtime-chart-updates": "Актуализации на таблиците в реално време",
-
-	"active-users": "Дейни потребители",
-	"active-users.users": "Потребители",
-	"active-users.guests": "Гости",
-	"active-users.total": "Общо",
-	"active-users.connections": "Връзки",
-
-	"anonymous-registered-users": "Анонимни към регистрирани потребители",
-	"anonymous": "Анонимни",
-	"registered": "Регистрирани",
-
-	"user-presence": "Присъствие на потребителите ",
-	"on-categories": "В списъка с категории",
-	"reading-posts": "Четящи публикации",
-	"browsing-topics": "Разглеждащи теми",
-	"recent": "Скорошни",
-	"unread": "Непрочетени",
-
-	"high-presence-topics": "Теми с най-голяма присъственост",
-
-	"graphs.page-views": "Преглеждания на страниците",
-	"graphs.page-views-registered": "Преглеждания на страниците от регистрирани потребители",
-	"graphs.page-views-guest": "Преглеждания на страниците от гости",
-	"graphs.page-views-bot": "Преглеждания на страниците от ботове",
-	"graphs.unique-visitors": "Уникални посетители",
-	"graphs.registered-users": "Регистрирани потребители",
-	"graphs.anonymous-users": "Анонимни потребители",
-	"last-restarted-by": "Последно рестартиране от",
-	"no-users-browsing": "Няма разглеждащи потребители"
-}

public/language/bg/admin/general/homepage.json

@@ -1,8 +0,0 @@
-{
-	"home-page": "Начална страница",
-	"description": "Изберете коя страница да бъде показана, когато потребителите отидат на главния адрес на форума.",
-	"home-page-route": "Път на началната страница",
-	"custom-route": "Персонализиран път",
-	"allow-user-home-pages": "Разрешаване на потребителските начални страници",
-	"home-page-title": "Заглавие на началната страница (по подразбиране: „Начало“)"
-}

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

@@ -1,6 +0,0 @@
-{
-	"language-settings": "Езикови настройки",
-	"description": "Езикът по подразбиране определя езиковите настройки за всички потребители, които посещават Вашия форум. <br />Отделните потребители могат да сменят езика си от страницата с настройки на профила си.",
-	"default-language": "Език по подразбиране",
-	"auto-detect": "Автоматично разпознаване на езика за гостите"
-}

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

@@ -1,23 +0,0 @@
-{
-	"icon": "Иконка:",
-	"change-icon": "промяна",
-	"route": "Маршрут:",
-	"tooltip": "Подсказка:",
-	"text": "Текст:",
-	"text-class": "Текстов клас: <small>незадължително</small>",
-	"class": "Клас: <small>незадължително</small>",
-	"id": "Идентификатор: <small>незадължително</small>",
-
-	"properties": "Свойства:",
-	"groups": "Групи:",
-	"open-new-window": "Отваряне в нов прозорец",
-
-	"btn.delete": "Изтриване",
-	"btn.disable": "Изключване",
-	"btn.enable": "Включване",
-
-	"available-menu-items": "Налични елементи за менюто",
-	"custom-route": "Персонализиран маршрут",
-	"core": "ядро",
-	"plugin": "добавка"
-}

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

@@ -1,5 +0,0 @@
-{
-	"post-sharing": "Споделяне на публикации",
-	"info-plugins-additional": "Добавките могат да добавят допълнителни мрежи за споделяне на публикации.",
-	"save-success": "Мрежите за споделяне на публикации са запазени успешно!"
-}

public/language/bg/admin/general/sounds.json

@@ -1,9 +0,0 @@
-{
-	"notifications": "Известия",
-	"chat-messages": "Съобщения в разговори",
-	"play-sound": "Пускане",
-	"incoming-message": "Входящо съобщение",
-	"outgoing-message": "Изходящо съобщение",
-	"upload-new-sound": "Качване на нов звук",
-	"saved": "Настройките са запазени"
-}

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

@@ -1,8 +1,10 @@
 {
     "administrators": "Администратори",
     "global-moderators": "Глобални модератори",
+    "moderators": "Модератори",
     "no-global-moderators": "Няма глобални модератори",
-    "moderators-of-category": "%1 модератори",
+    "no-sub-categories": "Няма подкатегории",
+    "subcategories": "%1 подкатегории",
     "no-moderators": "Няма модератори",
     "add-administrator": "Добавяне на администратор",
     "add-global-moderator": "Добавяне на глобален модератор",

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

@@ -13,6 +13,7 @@
 	"resent-single": "Ръчното повторно разпращане на резюмето е завършено",
 	"resent-day": "Дневното резюме беше изпратено повторно",
 	"resent-week": "Седмичното резюме беше изпратено повторно",
+	"resent-biweek": "Двуседмичното резюме беше изпратено повторно",
 	"resent-month": "Месечното резюме беше изпратено повторно",
 	"null": "<em>Никога</em>",
 	"manual-run": "Ръчно разпращане на резюмето:",

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

@@ -39,6 +39,5 @@
 	"revert": "Отмяна",
 
 	"edit.no-users-found": "Няма намерени потребители",
-	"edit.confirm-remove-user": "Наистина ли искате да премахнете този потребител?",
-	"edit.save-success": "Промените са запазени!"
+	"edit.confirm-remove-user": "Наистина ли искате да премахнете този потребител?"
 }