chore: bump version to beta.1

chore: up composer
chore: up persona
2025-12-20 07:20:27 +01:00 · 2023-01-16 17:30:21 -05:00 · 2023-01-16 14:41:56 -05:00 · 2023-01-16 14:22:59 -05:00 · 2023-01-16 14:20:07 -05:00 · 2023-01-16 13:38:30 -05:00
3896 changed files with 59354 additions and 96989 deletions
--- a/.docker/.gitkeep
+++ b/.docker/.gitkeep
--- a/.docker/build/.gitkeep
+++ b/.docker/build/.gitkeep
--- a/.docker/config/.gitkeep
+++ b/.docker/config/.gitkeep
--- a/.docker/database/mongo/data/.gitkeep
+++ b/.docker/database/mongo/data/.gitkeep
--- a/.docker/database/postgresql/data/.gitkeep
+++ b/.docker/database/postgresql/data/.gitkeep
--- a/.docker/database/redis/data/.gitkeep
+++ b/.docker/database/redis/data/.gitkeep
--- a/.docker/public/uploads/.gitkeep
+++ b/.docker/public/uploads/.gitkeep
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,10 +0,0 @@
-.*
-logs
-test
-node_modules
-commitlint.config.js
-nodebb.bat
-renovate.json
-*.yml
-*.md
-Dockerfile
--- a/.eslintignore
+++ b/.eslintignore
@@ -18,4 +18,3 @@ logs/
 .eslintrc
 test/files
 *.min.js
-install/docker/
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -13,60 +13,42 @@ on:
 # 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@v4
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2

-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Get current date in NST
-        run: echo "CURRENT_DATE_NST=$(date +'%Y%m%d-%H%M%S' -d '-3 hours -30 minutes')" >> $GITHUB_ENV
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Docker meta
        id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v4
        with:
-          images: ghcr.io/${{ github.repository }}
+          images: nodebb/docker
          tags: |
            type=semver,pattern={{version}}
            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}.x
-            type=raw,value=latest,enable={{is_default_branch}}
-            type=ref,event=branch,enable=${{ github.event.repository.default_branch != github.ref }}
-            type=raw,value=${{ env.CURRENT_DATE_NST }}
-          flavor: |
-            latest=true
-
-      - name: Cache node_modules
-        id: cache-node-modules
-        uses: actions/cache@v4
-        with:
-          path: var-cache-node-modules
-          key: var-cache-node-modules-${{ hashFiles('Dockerfile', 'install/package.json') }}
+            type=raw,value=latest

      - name: Build and push Docker images
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v3
        with:
-          cache-from: type=gha
-          cache-to: type=gha,mode=min
          context: .
          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
          push: true
          tags: ${{ steps.meta.outputs.tags }}
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -5,10 +5,12 @@ on:
    branches:
      - master
      - develop
+      - bootstrap5
  pull_request:
    branches:
      - master
      - develop
+      - bootstrap5

 defaults:
  run:
@@ -27,19 +29,19 @@ jobs:
      fail-fast: false
      matrix:
        os: [ubuntu-latest]
-        node: [18, 20]
+        node: [14, 16, 18]
        database: [mongo-dev, mongo, redis, postgres]
        include:
          # only run coverage once
          - os: ubuntu-latest
-            node: 18
+            node: 14
            coverage: true
          # test under development once
          - database: mongo-dev
            test_env: development
          # only run eslint once
          - os: ubuntu-latest
-            node: 18
+            node: 14
            database: mongo-dev
            lint: true
    runs-on: ${{ matrix.os }}
@@ -48,7 +50,7 @@ jobs:

    services:
      postgres:
-        image: 'postgres:17-alpine'
+        image: 'postgres:14-alpine'
        env:
          POSTGRES_USER: postgres
          POSTGRES_PASSWORD: postgres
@@ -63,7 +65,7 @@ jobs:
          - 5432:5432

      redis:
-        image: 'redis:7.4.1'
+        image: 'redis:2.8.23'
        # Set health checks to wait until redis has started
        options: >-
          --health-cmd "redis-cli ping"
@@ -75,18 +77,18 @@ jobs:
          - 6379:6379

      mongo:
-        image: 'mongo:8.0'
+        image: 'mongo:3.7'
        ports:
          # Maps port 27017 on service container to the host
          - 27017:27017

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2

      - run: cp install/package.json package.json

      - name: Install Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v2
        with:
          node-version: ${{ matrix.node }}

@@ -192,7 +194,7 @@ jobs:
        run: npm run coverage

      - name: Test coverage
-        uses: coverallsapp/github-action@cfd0633edbd2411b532b808ba7a8b5e04f76d2c8 # v2.3.4
+        uses: coverallsapp/github-action@1.1.3
        if: matrix.coverage
        with:
          github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -206,7 +208,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Coveralls Finished
-        uses: coverallsapp/github-action@cfd0633edbd2411b532b808ba7a8b5e04f76d2c8 # v2.3.4
+        uses: coverallsapp/github-action@1.1.3
        with:
          github-token: ${{ secrets.GITHUB_TOKEN }}
          parallel-finished: true
--- a/.gitignore
+++ b/.gitignore
@@ -69,7 +69,4 @@ package-lock.json
 /package.json
 *.mongodb
 link-plugins.sh
-test.sh
-
-.docker/**
-!**/.gitkeep
+test.sh
--- a/.tx/config
+++ b/.tx/config
@@ -28,7 +28,6 @@ trans.fa_IR     = public/language/fa-IR/admin/admin.json
 trans.id        = public/language/id/admin/admin.json
 trans.ms        = public/language/ms/admin/admin.json
 trans.nb        = public/language/nb/admin/admin.json
-trans.nn_NO     = public/language/nn-NO/admin/admin.json
 trans.sk        = public/language/sk/admin/admin.json
 trans.cs        = public/language/cs/admin/admin.json
 trans.fi        = public/language/fi/admin/admin.json
@@ -87,7 +86,6 @@ trans.bg        = public/language/bg/admin/advanced/cache.json
 trans.cs        = public/language/cs/admin/advanced/cache.json
 trans.lt        = public/language/lt/admin/advanced/cache.json
 trans.nb        = public/language/nb/admin/advanced/cache.json
-trans.nn_NO     = public/language/nn-NO/admin/advanced/cache.json
 trans.uk        = public/language/uk/admin/advanced/cache.json
 trans.el        = public/language/el/admin/advanced/cache.json
 trans.pl        = public/language/pl/admin/advanced/cache.json
@@ -129,7 +127,6 @@ trans.zh_TW     = public/language/zh-TW/admin/advanced/database.json
 trans.gl        = public/language/gl/admin/advanced/database.json
 trans.it        = public/language/it/admin/advanced/database.json
 trans.nb        = public/language/nb/admin/advanced/database.json
-trans.nn_NO     = public/language/nn-NO/admin/advanced/database.json
 trans.bn        = public/language/bn/admin/advanced/database.json
 trans.da        = public/language/da/admin/advanced/database.json
 trans.de        = public/language/de/admin/advanced/database.json
@@ -179,7 +176,6 @@ trans.vi        = public/language/vi/admin/advanced/errors.json
 trans.de        = public/language/de/admin/advanced/errors.json
 trans.ko        = public/language/ko/admin/advanced/errors.json
 trans.nb        = public/language/nb/admin/advanced/errors.json
-trans.nn_NO     = public/language/nn-NO/admin/advanced/errors.json
 trans.sc        = public/language/sc/admin/advanced/errors.json
 trans.sl        = public/language/sl/admin/advanced/errors.json
 trans.tr        = public/language/tr/admin/advanced/errors.json
@@ -236,7 +232,6 @@ trans.fa_IR     = public/language/fa-IR/admin/advanced/events.json
 trans.ms        = public/language/ms/admin/advanced/events.json
 trans.tr        = public/language/tr/admin/advanced/events.json
 trans.nb        = public/language/nb/admin/advanced/events.json
-trans.nn_NO     = public/language/nn-NO/admin/advanced/events.json
 trans.pt_PT     = public/language/pt-PT/admin/advanced/events.json
 trans.sk        = public/language/sk/admin/advanced/events.json
 trans.en@pirate = public/language/en-x-pirate/admin/advanced/events.json
@@ -281,7 +276,6 @@ trans.hr        = public/language/hr/admin/advanced/logs.json
 trans.ja        = public/language/ja/admin/advanced/logs.json
 trans.lt        = public/language/lt/admin/advanced/logs.json
 trans.nb        = public/language/nb/admin/advanced/logs.json
-trans.nn_NO     = public/language/nn-NO/admin/advanced/logs.json
 trans.rw        = public/language/rw/admin/advanced/logs.json
 trans.es        = public/language/es/admin/advanced/logs.json
 trans.sv        = public/language/sv/admin/advanced/logs.json
@@ -334,7 +328,6 @@ trans.bg        = public/language/bg/admin/appearance/customise.json
 trans.he        = public/language/he/admin/appearance/customise.json
 trans.lt        = public/language/lt/admin/appearance/customise.json
 trans.nb        = public/language/nb/admin/appearance/customise.json
-trans.nn_NO     = public/language/nn-NO/admin/appearance/customise.json
 trans.pl        = public/language/pl/admin/appearance/customise.json
 trans.sl        = public/language/sl/admin/appearance/customise.json
 trans.zh_TW     = public/language/zh-TW/admin/appearance/customise.json
@@ -409,7 +402,6 @@ trans.en@pirate = public/language/en-x-pirate/admin/appearance/skins.json
 trans.it        = public/language/it/admin/appearance/skins.json
 trans.ja        = public/language/ja/admin/appearance/skins.json
 trans.nb        = public/language/nb/admin/appearance/skins.json
-trans.nn_NO     = public/language/nn-NO/admin/appearance/skins.json
 trans.fr        = public/language/fr/admin/appearance/skins.json
 trans.fa_IR     = public/language/fa-IR/admin/appearance/skins.json
 trans.gl        = public/language/gl/admin/appearance/skins.json
@@ -461,7 +453,6 @@ trans.hy        = public/language/hy/admin/appearance/themes.json
 trans.id        = public/language/id/admin/appearance/themes.json
 trans.ko        = public/language/ko/admin/appearance/themes.json
 trans.nb        = public/language/nb/admin/appearance/themes.json
-trans.nn_NO     = public/language/nn-NO/admin/appearance/themes.json
 trans.pl        = public/language/pl/admin/appearance/themes.json
 trans.pt_PT     = public/language/pt-PT/admin/appearance/themes.json
 trans.tr        = public/language/tr/admin/appearance/themes.json
@@ -529,7 +520,6 @@ trans.fi        = public/language/fi/admin/dashboard.json
 trans.hr        = public/language/hr/admin/dashboard.json
 trans.it        = public/language/it/admin/dashboard.json
 trans.nb        = public/language/nb/admin/dashboard.json
-trans.nn_NO     = public/language/nn-NO/admin/dashboard.json

 [o:nodebb:p:nodebb:r:admin-development-info]
 file_filter     = public/language/<lang>/admin/development/info.json
@@ -566,7 +556,6 @@ trans.zh_CN     = public/language/zh-CN/admin/development/info.json
 trans.cs        = public/language/cs/admin/development/info.json
 trans.ja        = public/language/ja/admin/development/info.json
 trans.nb        = public/language/nb/admin/development/info.json
-trans.nn_NO     = public/language/nn-NO/admin/development/info.json
 trans.sq_AL     = public/language/sq-AL/admin/development/info.json
 trans.sv        = public/language/sv/admin/development/info.json
 trans.bg        = public/language/bg/admin/development/info.json
@@ -602,7 +591,6 @@ trans.id        = public/language/id/admin/development/logger.json
 trans.ko        = public/language/ko/admin/development/logger.json
 trans.lt        = public/language/lt/admin/development/logger.json
 trans.nb        = public/language/nb/admin/development/logger.json
-trans.nn_NO     = public/language/nn-NO/admin/development/logger.json
 trans.pt_BR     = public/language/pt-BR/admin/development/logger.json
 trans.ro        = public/language/ro/admin/development/logger.json
 trans.fi        = public/language/fi/admin/development/logger.json
@@ -654,7 +642,6 @@ trans.th        = public/language/th/admin/extend/plugins.json
 trans.en_US     = public/language/en-US/admin/extend/plugins.json
 trans.he        = public/language/he/admin/extend/plugins.json
 trans.nb        = public/language/nb/admin/extend/plugins.json
-trans.nn_NO     = public/language/nn-NO/admin/extend/plugins.json
 trans.sk        = public/language/sk/admin/extend/plugins.json
 trans.uk        = public/language/uk/admin/extend/plugins.json
 trans.es        = public/language/es/admin/extend/plugins.json
@@ -715,7 +702,6 @@ trans.hr        = public/language/hr/admin/extend/rewards.json
 trans.ja        = public/language/ja/admin/extend/rewards.json
 trans.ko        = public/language/ko/admin/extend/rewards.json
 trans.nb        = public/language/nb/admin/extend/rewards.json
-trans.nn_NO     = public/language/nn-NO/admin/extend/rewards.json
 trans.bg        = public/language/bg/admin/extend/rewards.json
 trans.bn        = public/language/bn/admin/extend/rewards.json
 trans.da        = public/language/da/admin/extend/rewards.json
@@ -752,7 +738,6 @@ trans.bn        = public/language/bn/admin/extend/widgets.json
 trans.el        = public/language/el/admin/extend/widgets.json
 trans.id        = public/language/id/admin/extend/widgets.json
 trans.nb        = public/language/nb/admin/extend/widgets.json
-trans.nn_NO     = public/language/nn-NO/admin/extend/widgets.json
 trans.ro        = public/language/ro/admin/extend/widgets.json
 trans.rw        = public/language/rw/admin/extend/widgets.json
 trans.ar        = public/language/ar/admin/extend/widgets.json
@@ -803,7 +788,6 @@ source_lang     = en_GB
 type            = KEYVALUEJSON
 trans.hu        = public/language/hu/admin/manage/admins-mods.json
 trans.nb        = public/language/nb/admin/manage/admins-mods.json
-trans.nn_NO     = public/language/nn-NO/admin/manage/admins-mods.json
 trans.ru        = public/language/ru/admin/manage/admins-mods.json
 trans.fr        = public/language/fr/admin/manage/admins-mods.json
 trans.he        = public/language/he/admin/manage/admins-mods.json
@@ -870,7 +854,6 @@ trans.en_US     = public/language/en-US/admin/manage/categories.json
 trans.fr        = public/language/fr/admin/manage/categories.json
 trans.it        = public/language/it/admin/manage/categories.json
 trans.nb        = public/language/nb/admin/manage/categories.json
-trans.nn_NO     = public/language/nn-NO/admin/manage/categories.json
 trans.ru        = public/language/ru/admin/manage/categories.json
 trans.sr        = public/language/sr/admin/manage/categories.json
 trans.fa_IR     = public/language/fa-IR/admin/manage/categories.json
@@ -947,7 +930,6 @@ trans.zh_CN     = public/language/zh-CN/admin/manage/digest.json
 trans.ar        = public/language/ar/admin/manage/digest.json
 trans.ja        = public/language/ja/admin/manage/digest.json
 trans.nb        = public/language/nb/admin/manage/digest.json
-trans.nn_NO     = public/language/nn-NO/admin/manage/digest.json
 trans.sk        = public/language/sk/admin/manage/digest.json
 trans.pt_PT     = public/language/pt-PT/admin/manage/digest.json
 trans.sc        = public/language/sc/admin/manage/digest.json
@@ -965,7 +947,6 @@ trans.tr        = public/language/tr/admin/manage/groups.json
 trans.uk        = public/language/uk/admin/manage/groups.json
 trans.zh_TW     = public/language/zh-TW/admin/manage/groups.json
 trans.nb        = public/language/nb/admin/manage/groups.json
-trans.nn_NO     = public/language/nn-NO/admin/manage/groups.json
 trans.id        = public/language/id/admin/manage/groups.json
 trans.lt        = public/language/lt/admin/manage/groups.json
 trans.pl        = public/language/pl/admin/manage/groups.json
@@ -1037,7 +1018,6 @@ trans.hy        = public/language/hy/admin/manage/privileges.json
 trans.sr        = public/language/sr/admin/manage/privileges.json
 trans.ja        = public/language/ja/admin/manage/privileges.json
 trans.nb        = public/language/nb/admin/manage/privileges.json
-trans.nn_NO     = public/language/nn-NO/admin/manage/privileges.json
 trans.nl        = public/language/nl/admin/manage/privileges.json
 trans.sv        = public/language/sv/admin/manage/privileges.json
 trans.et        = public/language/et/admin/manage/privileges.json
@@ -1081,7 +1061,6 @@ trans.da        = public/language/da/admin/manage/registration.json
 trans.et        = public/language/et/admin/manage/registration.json
 trans.it        = public/language/it/admin/manage/registration.json
 trans.nb        = public/language/nb/admin/manage/registration.json
-trans.nn_NO     = public/language/nn-NO/admin/manage/registration.json
 trans.pt_BR     = public/language/pt-BR/admin/manage/registration.json
 trans.hy        = public/language/hy/admin/manage/registration.json
 trans.uk        = public/language/uk/admin/manage/registration.json
@@ -1125,7 +1104,6 @@ trans.da        = public/language/da/admin/manage/tags.json
 trans.en_US     = public/language/en-US/admin/manage/tags.json
 trans.hu        = public/language/hu/admin/manage/tags.json
 trans.nb        = public/language/nb/admin/manage/tags.json
-trans.nn_NO     = public/language/nn-NO/admin/manage/tags.json
 trans.ru        = public/language/ru/admin/manage/tags.json
 trans.sq_AL     = public/language/sq-AL/admin/manage/tags.json
 trans.de        = public/language/de/admin/manage/tags.json
@@ -1174,7 +1152,6 @@ source_lang     = en_GB
 type            = KEYVALUEJSON
 trans.ms        = public/language/ms/admin/manage/uploads.json
 trans.nb        = public/language/nb/admin/manage/uploads.json
-trans.nn_NO     = public/language/nn-NO/admin/manage/uploads.json
 trans.tr        = public/language/tr/admin/manage/uploads.json
 trans.bg        = public/language/bg/admin/manage/uploads.json
 trans.bn        = public/language/bn/admin/manage/uploads.json
@@ -1232,7 +1209,6 @@ trans.fr        = public/language/fr/admin/manage/users.json
 trans.ko        = public/language/ko/admin/manage/users.json
 trans.ms        = public/language/ms/admin/manage/users.json
 trans.nb        = public/language/nb/admin/manage/users.json
-trans.nn_NO     = public/language/nn-NO/admin/manage/users.json
 trans.pt_BR     = public/language/pt-BR/admin/manage/users.json
 trans.zh_CN     = public/language/zh-CN/admin/manage/users.json
 trans.zh_TW     = public/language/zh-TW/admin/manage/users.json
@@ -1321,7 +1297,6 @@ trans.el        = public/language/el/admin/menu.json
 trans.gl        = public/language/gl/admin/menu.json
 trans.lv        = public/language/lv/admin/menu.json
 trans.nb        = public/language/nb/admin/menu.json
-trans.nn_NO     = public/language/nn-NO/admin/menu.json
 trans.pt_PT     = public/language/pt-PT/admin/menu.json
 trans.bn        = public/language/bn/admin/menu.json
 trans.et        = public/language/et/admin/menu.json
@@ -1349,7 +1324,6 @@ trans.rw        = public/language/rw/admin/settings/advanced.json
 trans.sl        = public/language/sl/admin/settings/advanced.json
 trans.it        = public/language/it/admin/settings/advanced.json
 trans.nb        = public/language/nb/admin/settings/advanced.json
-trans.nn_NO     = public/language/nn-NO/admin/settings/advanced.json
 trans.pt_PT     = public/language/pt-PT/admin/settings/advanced.json
 trans.sq_AL     = public/language/sq-AL/admin/settings/advanced.json
 trans.sr        = public/language/sr/admin/settings/advanced.json
@@ -1406,7 +1380,6 @@ trans.zh_TW     = public/language/zh-TW/admin/settings/api.json
 trans.cs        = public/language/cs/admin/settings/api.json
 trans.it        = public/language/it/admin/settings/api.json
 trans.nb        = public/language/nb/admin/settings/api.json
-trans.nn_NO     = public/language/nn-NO/admin/settings/api.json
 trans.pt_PT     = public/language/pt-PT/admin/settings/api.json
 trans.ru        = public/language/ru/admin/settings/api.json
 trans.uk        = public/language/uk/admin/settings/api.json
@@ -1455,7 +1428,6 @@ trans.hr        = public/language/hr/admin/settings/chat.json
 trans.ja        = public/language/ja/admin/settings/chat.json
 trans.ko        = public/language/ko/admin/settings/chat.json
 trans.nb        = public/language/nb/admin/settings/chat.json
-trans.nn_NO     = public/language/nn-NO/admin/settings/chat.json
 trans.nl        = public/language/nl/admin/settings/chat.json
 trans.uk        = public/language/uk/admin/settings/chat.json
 trans.he        = public/language/he/admin/settings/chat.json
@@ -1523,7 +1495,6 @@ trans.hr        = public/language/hr/admin/settings/cookies.json
 trans.ja        = public/language/ja/admin/settings/cookies.json
 trans.pt_PT     = public/language/pt-PT/admin/settings/cookies.json
 trans.nb        = public/language/nb/admin/settings/cookies.json
-trans.nn_NO     = public/language/nn-NO/admin/settings/cookies.json
 trans.sc        = public/language/sc/admin/settings/cookies.json
 trans.bg        = public/language/bg/admin/settings/cookies.json
 trans.fi        = public/language/fi/admin/settings/cookies.json
@@ -1552,7 +1523,6 @@ trans.pt_PT     = public/language/pt-PT/admin/settings/email.json
 trans.sr        = public/language/sr/admin/settings/email.json
 trans.ms        = public/language/ms/admin/settings/email.json
 trans.nb        = public/language/nb/admin/settings/email.json
-trans.nn_NO     = public/language/nn-NO/admin/settings/email.json
 trans.ru        = public/language/ru/admin/settings/email.json
 trans.sk        = public/language/sk/admin/settings/email.json
 trans.fr        = public/language/fr/admin/settings/email.json
@@ -1629,7 +1599,6 @@ trans.es        = public/language/es/admin/settings/general.json
 trans.fa_IR     = public/language/fa-IR/admin/settings/general.json
 trans.ms        = public/language/ms/admin/settings/general.json
 trans.nb        = public/language/nb/admin/settings/general.json
-trans.nn_NO     = public/language/nn-NO/admin/settings/general.json
 trans.sr        = public/language/sr/admin/settings/general.json
 trans.da        = public/language/da/admin/settings/general.json
 trans.en@pirate = public/language/en-x-pirate/admin/settings/general.json
@@ -1655,7 +1624,6 @@ trans.et        = public/language/et/admin/settings/group.json
 trans.fr        = public/language/fr/admin/settings/group.json
 trans.it        = public/language/it/admin/settings/group.json
 trans.nb        = public/language/nb/admin/settings/group.json
-trans.nn_NO     = public/language/nn-NO/admin/settings/group.json
 trans.es        = public/language/es/admin/settings/group.json
 trans.fa_IR     = public/language/fa-IR/admin/settings/group.json
 trans.gl        = public/language/gl/admin/settings/group.json
@@ -1731,7 +1699,6 @@ trans.fi        = public/language/fi/admin/settings/guest.json
 trans.hu        = public/language/hu/admin/settings/guest.json
 trans.ja        = public/language/ja/admin/settings/guest.json
 trans.nb        = public/language/nb/admin/settings/guest.json
-trans.nn_NO     = public/language/nn-NO/admin/settings/guest.json
 trans.pl        = public/language/pl/admin/settings/guest.json
 trans.sl        = public/language/sl/admin/settings/guest.json
 trans.vi        = public/language/vi/admin/settings/guest.json
@@ -1756,7 +1723,6 @@ source_file     = public/language/en-GB/admin/settings/homepage.json
 source_lang     = en_GB
 type            = KEYVALUEJSON
 trans.nb        = public/language/nb/admin/settings/homepage.json
-trans.nn_NO     = public/language/nn-NO/admin/settings/homepage.json
 trans.tr        = public/language/tr/admin/settings/homepage.json
 trans.vi        = public/language/vi/admin/settings/homepage.json
 trans.et        = public/language/et/admin/settings/homepage.json
@@ -1853,7 +1819,6 @@ trans.en_US     = public/language/en-US/admin/settings/languages.json
 trans.es        = public/language/es/admin/settings/languages.json
 trans.ms        = public/language/ms/admin/settings/languages.json
 trans.nb        = public/language/nb/admin/settings/languages.json
-trans.nn_NO     = public/language/nn-NO/admin/settings/languages.json
 trans.rw        = public/language/rw/admin/settings/languages.json

 [o:nodebb:p:nodebb:r:admin-settings-navigation]
@@ -1902,7 +1867,6 @@ trans.hr        = public/language/hr/admin/settings/navigation.json
 trans.id        = public/language/id/admin/settings/navigation.json
 trans.ko        = public/language/ko/admin/settings/navigation.json
 trans.nb        = public/language/nb/admin/settings/navigation.json
-trans.nn_NO     = public/language/nn-NO/admin/settings/navigation.json
 trans.pl        = public/language/pl/admin/settings/navigation.json
 trans.sv        = public/language/sv/admin/settings/navigation.json
 trans.el        = public/language/el/admin/settings/navigation.json
@@ -1949,7 +1913,6 @@ trans.zh_CN     = public/language/zh-CN/admin/settings/notifications.json
 trans.ko        = public/language/ko/admin/settings/notifications.json
 trans.lv        = public/language/lv/admin/settings/notifications.json
 trans.nb        = public/language/nb/admin/settings/notifications.json
-trans.nn_NO     = public/language/nn-NO/admin/settings/notifications.json
 trans.pl        = public/language/pl/admin/settings/notifications.json
 trans.bg        = public/language/bg/admin/settings/notifications.json
 trans.da        = public/language/da/admin/settings/notifications.json
@@ -2011,7 +1974,6 @@ trans.zh_TW     = public/language/zh-TW/admin/settings/pagination.json
 trans.bn        = public/language/bn/admin/settings/pagination.json
 trans.hy        = public/language/hy/admin/settings/pagination.json
 trans.nb        = public/language/nb/admin/settings/pagination.json
-trans.nn_NO     = public/language/nn-NO/admin/settings/pagination.json
 trans.sr        = public/language/sr/admin/settings/pagination.json
 trans.sv        = public/language/sv/admin/settings/pagination.json

@@ -2045,7 +2007,6 @@ trans.it        = public/language/it/admin/settings/post.json
 trans.th        = public/language/th/admin/settings/post.json
 trans.gl        = public/language/gl/admin/settings/post.json
 trans.nb        = public/language/nb/admin/settings/post.json
-trans.nn_NO     = public/language/nn-NO/admin/settings/post.json
 trans.sc        = public/language/sc/admin/settings/post.json
 trans.zh_CN     = public/language/zh-CN/admin/settings/post.json
 trans.rw        = public/language/rw/admin/settings/post.json
@@ -2093,7 +2054,6 @@ trans.sc        = public/language/sc/admin/settings/reputation.json
 trans.hr        = public/language/hr/admin/settings/reputation.json
 trans.ko        = public/language/ko/admin/settings/reputation.json
 trans.nb        = public/language/nb/admin/settings/reputation.json
-trans.nn_NO     = public/language/nn-NO/admin/settings/reputation.json
 trans.bn        = public/language/bn/admin/settings/reputation.json
 trans.de        = public/language/de/admin/settings/reputation.json
 trans.et        = public/language/et/admin/settings/reputation.json
@@ -2144,7 +2104,6 @@ trans.cs        = public/language/cs/admin/settings/social.json
 trans.en_US     = public/language/en-US/admin/settings/social.json
 trans.fi        = public/language/fi/admin/settings/social.json
 trans.nb        = public/language/nb/admin/settings/social.json
-trans.nn_NO     = public/language/nn-NO/admin/settings/social.json
 trans.pl        = public/language/pl/admin/settings/social.json
 trans.th        = public/language/th/admin/settings/social.json
 trans.bg        = public/language/bg/admin/settings/social.json
@@ -2202,7 +2161,6 @@ trans.fi        = public/language/fi/admin/settings/sockets.json
 trans.it        = public/language/it/admin/settings/sockets.json
 trans.ro        = public/language/ro/admin/settings/sockets.json
 trans.nb        = public/language/nb/admin/settings/sockets.json
-trans.nn_NO     = public/language/nn-NO/admin/settings/sockets.json
 trans.sq_AL     = public/language/sq-AL/admin/settings/sockets.json
 trans.bg        = public/language/bg/admin/settings/sockets.json
 trans.bn        = public/language/bn/admin/settings/sockets.json
@@ -2253,7 +2211,6 @@ trans.en@pirate = public/language/en-x-pirate/admin/settings/sounds.json
 trans.fa_IR     = public/language/fa-IR/admin/settings/sounds.json
 trans.fi        = public/language/fi/admin/settings/sounds.json
 trans.nb        = public/language/nb/admin/settings/sounds.json
-trans.nn_NO     = public/language/nn-NO/admin/settings/sounds.json
 trans.th        = public/language/th/admin/settings/sounds.json
 trans.ar        = public/language/ar/admin/settings/sounds.json
 trans.da        = public/language/da/admin/settings/sounds.json
@@ -2309,7 +2266,6 @@ trans.bn        = public/language/bn/admin/settings/tags.json
 trans.hr        = public/language/hr/admin/settings/tags.json
 trans.ko        = public/language/ko/admin/settings/tags.json
 trans.nb        = public/language/nb/admin/settings/tags.json
-trans.nn_NO     = public/language/nn-NO/admin/settings/tags.json
 trans.el        = public/language/el/admin/settings/tags.json
 trans.et        = public/language/et/admin/settings/tags.json
 trans.he        = public/language/he/admin/settings/tags.json
@@ -2347,7 +2303,6 @@ trans.fa_IR     = public/language/fa-IR/admin/settings/uploads.json
 trans.he        = public/language/he/admin/settings/uploads.json
 trans.ja        = public/language/ja/admin/settings/uploads.json
 trans.nb        = public/language/nb/admin/settings/uploads.json
-trans.nn_NO     = public/language/nn-NO/admin/settings/uploads.json
 trans.nl        = public/language/nl/admin/settings/uploads.json
 trans.zh_TW     = public/language/zh-TW/admin/settings/uploads.json
 trans.ro        = public/language/ro/admin/settings/uploads.json
@@ -2399,7 +2354,6 @@ trans.sq_AL     = public/language/sq-AL/admin/settings/user.json
 trans.gl        = public/language/gl/admin/settings/user.json
 trans.hu        = public/language/hu/admin/settings/user.json
 trans.nb        = public/language/nb/admin/settings/user.json
-trans.nn_NO     = public/language/nn-NO/admin/settings/user.json
 trans.sv        = public/language/sv/admin/settings/user.json
 trans.uk        = public/language/uk/admin/settings/user.json
 trans.cs        = public/language/cs/admin/settings/user.json
@@ -2478,7 +2432,6 @@ trans.ar        = public/language/ar/admin/settings/web-crawler.json
 trans.de        = public/language/de/admin/settings/web-crawler.json
 trans.hy        = public/language/hy/admin/settings/web-crawler.json
 trans.nb        = public/language/nb/admin/settings/web-crawler.json
-trans.nn_NO     = public/language/nn-NO/admin/settings/web-crawler.json
 trans.ro        = public/language/ro/admin/settings/web-crawler.json
 trans.sr        = public/language/sr/admin/settings/web-crawler.json
 trans.zh_TW     = public/language/zh-TW/admin/settings/web-crawler.json
@@ -2492,166 +2445,6 @@ trans.bn        = public/language/bn/admin/settings/web-crawler.json
 trans.pt_PT     = public/language/pt-PT/admin/settings/web-crawler.json
 trans.sc        = public/language/sc/admin/settings/web-crawler.json

-[o:nodebb:p:nodebb:r:themes-harmony]
-file_filter     = public/language/<lang>/themes/harmony.json
-source_file     = public/language/en-GB/themes/harmony.json
-source_lang     = en_GB
-type            = KEYVALUEJSON
-trans.th        = public/language/th/themes/harmony.json
-trans.bg        = public/language/bg/themes/harmony.json
-trans.hr        = public/language/hr/themes/harmony.json
-trans.hy        = public/language/hy/themes/harmony.json
-trans.sk        = public/language/sk/themes/harmony.json
-trans.sl        = public/language/sl/themes/harmony.json
-trans.sq_AL     = public/language/sq-AL/themes/harmony.json
-trans.sv        = public/language/sv/themes/harmony.json
-trans.vi        = public/language/vi/themes/harmony.json
-trans.da        = public/language/da/themes/harmony.json
-trans.en_US     = public/language/en-US/themes/harmony.json
-trans.gl        = public/language/gl/themes/harmony.json
-trans.ko        = public/language/ko/themes/harmony.json
-trans.lt        = public/language/lt/themes/harmony.json
-trans.pt_BR     = public/language/pt-BR/themes/harmony.json
-trans.hu        = public/language/hu/themes/harmony.json
-trans.lv        = public/language/lv/themes/harmony.json
-trans.ro        = public/language/ro/themes/harmony.json
-trans.ru        = public/language/ru/themes/harmony.json
-trans.sr        = public/language/sr/themes/harmony.json
-trans.bn        = public/language/bn/themes/harmony.json
-trans.he        = public/language/he/themes/harmony.json
-trans.nl        = public/language/nl/themes/harmony.json
-trans.sc        = public/language/sc/themes/harmony.json
-trans.zh_CN     = public/language/zh-CN/themes/harmony.json
-trans.fi        = public/language/fi/themes/harmony.json
-trans.ja        = public/language/ja/themes/harmony.json
-trans.nb        = public/language/nb/themes/harmony.json
-trans.nn_NO     = public/language/nn-NO/themes/harmony.json
-trans.pl        = public/language/pl/themes/harmony.json
-trans.zh_TW     = public/language/zh-TW/themes/harmony.json
-trans.ar        = public/language/ar/themes/harmony.json
-trans.cs        = public/language/cs/themes/harmony.json
-trans.fa_IR     = public/language/fa-IR/themes/harmony.json
-trans.ms        = public/language/ms/themes/harmony.json
-trans.pt_PT     = public/language/pt-PT/themes/harmony.json
-trans.tr        = public/language/tr/themes/harmony.json
-trans.en@pirate = public/language/en-x-pirate/themes/harmony.json
-trans.fr        = public/language/fr/themes/harmony.json
-trans.id        = public/language/id/themes/harmony.json
-trans.uk        = public/language/uk/themes/harmony.json
-trans.de        = public/language/de/themes/harmony.json
-trans.el        = public/language/el/themes/harmony.json
-trans.es        = public/language/es/themes/harmony.json
-trans.et        = public/language/et/themes/harmony.json
-trans.it        = public/language/it/themes/harmony.json
-trans.rw        = public/language/rw/themes/harmony.json
-
-[o:nodebb:p:nodebb:r:themes-persona]
-file_filter     = public/language/<lang>/themes/persona.json
-source_file     = public/language/en-GB/themes/persona.json
-source_lang     = en_GB
-type            = KEYVALUEJSON
-trans.th        = public/language/th/themes/persona.json
-trans.bg        = public/language/bg/themes/persona.json
-trans.hr        = public/language/hr/themes/persona.json
-trans.hy        = public/language/hy/themes/persona.json
-trans.sk        = public/language/sk/themes/persona.json
-trans.sl        = public/language/sl/themes/persona.json
-trans.sq_AL     = public/language/sq-AL/themes/persona.json
-trans.sv        = public/language/sv/themes/persona.json
-trans.vi        = public/language/vi/themes/persona.json
-trans.da        = public/language/da/themes/persona.json
-trans.en_US     = public/language/en-US/themes/persona.json
-trans.gl        = public/language/gl/themes/persona.json
-trans.ko        = public/language/ko/themes/persona.json
-trans.lt        = public/language/lt/themes/persona.json
-trans.pt_BR     = public/language/pt-BR/themes/persona.json
-trans.hu        = public/language/hu/themes/persona.json
-trans.lv        = public/language/lv/themes/persona.json
-trans.ro        = public/language/ro/themes/persona.json
-trans.ru        = public/language/ru/themes/persona.json
-trans.sr        = public/language/sr/themes/persona.json
-trans.bn        = public/language/bn/themes/persona.json
-trans.he        = public/language/he/themes/persona.json
-trans.nl        = public/language/nl/themes/persona.json
-trans.sc        = public/language/sc/themes/persona.json
-trans.zh_CN     = public/language/zh-CN/themes/persona.json
-trans.fi        = public/language/fi/themes/persona.json
-trans.ja        = public/language/ja/themes/persona.json
-trans.nb        = public/language/nb/themes/persona.json
-trans.nn_NO     = public/language/nn-NO/themes/persona.json
-trans.pl        = public/language/pl/themes/persona.json
-trans.zh_TW     = public/language/zh-TW/themes/persona.json
-trans.ar        = public/language/ar/themes/persona.json
-trans.cs        = public/language/cs/themes/persona.json
-trans.fa_IR     = public/language/fa-IR/themes/persona.json
-trans.ms        = public/language/ms/themes/persona.json
-trans.pt_PT     = public/language/pt-PT/themes/persona.json
-trans.tr        = public/language/tr/themes/persona.json
-trans.en@pirate = public/language/en-x-pirate/themes/persona.json
-trans.fr        = public/language/fr/themes/persona.json
-trans.id        = public/language/id/themes/persona.json
-trans.uk        = public/language/uk/themes/persona.json
-trans.de        = public/language/de/themes/persona.json
-trans.el        = public/language/el/themes/persona.json
-trans.es        = public/language/es/themes/persona.json
-trans.et        = public/language/et/themes/persona.json
-trans.it        = public/language/it/themes/persona.json
-trans.rw        = public/language/rw/themes/persona.json
-
-
-[o:nodebb:p:nodebb:r:aria]
-file_filter     = public/language/<lang>/aria.json
-source_file     = public/language/en-GB/aria.json
-source_lang     = en_GB
-type            = KEYVALUEJSON
-trans.th        = public/language/th/aria.json
-trans.bg        = public/language/bg/aria.json
-trans.hr        = public/language/hr/aria.json
-trans.hy        = public/language/hy/aria.json
-trans.sk        = public/language/sk/aria.json
-trans.sl        = public/language/sl/aria.json
-trans.sq_AL     = public/language/sq-AL/aria.json
-trans.sv        = public/language/sv/aria.json
-trans.vi        = public/language/vi/aria.json
-trans.da        = public/language/da/aria.json
-trans.en_US     = public/language/en-US/aria.json
-trans.gl        = public/language/gl/aria.json
-trans.ko        = public/language/ko/aria.json
-trans.lt        = public/language/lt/aria.json
-trans.pt_BR     = public/language/pt-BR/aria.json
-trans.hu        = public/language/hu/aria.json
-trans.lv        = public/language/lv/aria.json
-trans.ro        = public/language/ro/aria.json
-trans.ru        = public/language/ru/aria.json
-trans.sr        = public/language/sr/aria.json
-trans.bn        = public/language/bn/aria.json
-trans.he        = public/language/he/aria.json
-trans.nl        = public/language/nl/aria.json
-trans.sc        = public/language/sc/aria.json
-trans.zh_CN     = public/language/zh-CN/aria.json
-trans.fi        = public/language/fi/aria.json
-trans.ja        = public/language/ja/aria.json
-trans.nb        = public/language/nb/aria.json
-trans.nn_NO     = public/language/nn-NO/aria.json
-trans.pl        = public/language/pl/aria.json
-trans.zh_TW     = public/language/zh-TW/aria.json
-trans.ar        = public/language/ar/aria.json
-trans.cs        = public/language/cs/aria.json
-trans.fa_IR     = public/language/fa-IR/aria.json
-trans.ms        = public/language/ms/aria.json
-trans.pt_PT     = public/language/pt-PT/aria.json
-trans.tr        = public/language/tr/aria.json
-trans.en@pirate = public/language/en-x-pirate/aria.json
-trans.fr        = public/language/fr/aria.json
-trans.id        = public/language/id/aria.json
-trans.uk        = public/language/uk/aria.json
-trans.de        = public/language/de/aria.json
-trans.el        = public/language/el/aria.json
-trans.es        = public/language/es/aria.json
-trans.et        = public/language/et/aria.json
-trans.it        = public/language/it/aria.json
-trans.rw        = public/language/rw/aria.json
-
 [o:nodebb:p:nodebb:r:category]
 file_filter     = public/language/<lang>/category.json
 source_file     = public/language/en-GB/category.json
@@ -2685,7 +2478,6 @@ trans.zh_CN     = public/language/zh-CN/category.json
 trans.fi        = public/language/fi/category.json
 trans.ja        = public/language/ja/category.json
 trans.nb        = public/language/nb/category.json
-trans.nn_NO     = public/language/nn-NO/category.json
 trans.pl        = public/language/pl/category.json
 trans.zh_TW     = public/language/zh-TW/category.json
 trans.ar        = public/language/ar/category.json
@@ -2752,7 +2544,6 @@ trans.sr        = public/language/sr/email.json
 trans.tr        = public/language/tr/email.json
 trans.en_US     = public/language/en-US/email.json
 trans.nb        = public/language/nb/email.json
-trans.nn_NO     = public/language/nn-NO/email.json
 trans.nl        = public/language/nl/email.json
 trans.pt_BR     = public/language/pt-BR/email.json
 trans.rw        = public/language/rw/email.json
@@ -2791,7 +2582,6 @@ trans.vi        = public/language/vi/error.json
 trans.fa_IR     = public/language/fa-IR/error.json
 trans.gl        = public/language/gl/error.json
 trans.nb        = public/language/nb/error.json
-trans.nn_NO     = public/language/nn-NO/error.json
 trans.pl        = public/language/pl/error.json
 trans.ro        = public/language/ro/error.json
 trans.uk        = public/language/uk/error.json
@@ -2817,7 +2607,6 @@ source_file     = public/language/en-GB/flags.json
 source_lang     = en_GB
 type            = KEYVALUEJSON
 trans.nb        = public/language/nb/flags.json
-trans.nn_NO     = public/language/nn-NO/flags.json
 trans.ru        = public/language/ru/flags.json
 trans.sc        = public/language/sc/flags.json
 trans.fi        = public/language/fi/flags.json
@@ -2888,7 +2677,6 @@ trans.sk        = public/language/sk/global.json
 trans.sr        = public/language/sr/global.json
 trans.tr        = public/language/tr/global.json
 trans.nb        = public/language/nb/global.json
-trans.nn_NO     = public/language/nn-NO/global.json
 trans.pt_BR     = public/language/pt-BR/global.json
 trans.pt_PT     = public/language/pt-PT/global.json
 trans.bg        = public/language/bg/global.json
@@ -2932,7 +2720,6 @@ trans.hy        = public/language/hy/groups.json
 trans.pt_PT     = public/language/pt-PT/groups.json
 trans.ms        = public/language/ms/groups.json
 trans.nb        = public/language/nb/groups.json
-trans.nn_NO     = public/language/nn-NO/groups.json
 trans.ro        = public/language/ro/groups.json
 trans.vi        = public/language/vi/groups.json
 trans.fa_IR     = public/language/fa-IR/groups.json
@@ -2995,7 +2782,6 @@ trans.fa_IR     = public/language/fa-IR/ip-blacklist.json
 trans.fr        = public/language/fr/ip-blacklist.json
 trans.gl        = public/language/gl/ip-blacklist.json
 trans.nb        = public/language/nb/ip-blacklist.json
-trans.nn_NO     = public/language/nn-NO/ip-blacklist.json
 trans.sv        = public/language/sv/ip-blacklist.json
 trans.th        = public/language/th/ip-blacklist.json
 trans.bn        = public/language/bn/ip-blacklist.json
@@ -3041,7 +2827,6 @@ trans.en_US     = public/language/en-US/language.json
 trans.et        = public/language/et/language.json
 trans.ja        = public/language/ja/language.json
 trans.nb        = public/language/nb/language.json
-trans.nn_NO     = public/language/nn-NO/language.json
 trans.sk        = public/language/sk/language.json
 trans.el        = public/language/el/language.json
 trans.es        = public/language/es/language.json
@@ -3118,7 +2903,6 @@ trans.en@pirate = public/language/en-x-pirate/login.json
 trans.hy        = public/language/hy/login.json
 trans.id        = public/language/id/login.json
 trans.nb        = public/language/nb/login.json
-trans.nn_NO     = public/language/nn-NO/login.json
 trans.ru        = public/language/ru/login.json
 trans.rw        = public/language/rw/login.json
 trans.th        = public/language/th/login.json
@@ -3146,7 +2930,6 @@ trans.fa_IR     = public/language/fa-IR/modules.json
 trans.hr        = public/language/hr/modules.json
 trans.lv        = public/language/lv/modules.json
 trans.nb        = public/language/nb/modules.json
-trans.nn_NO     = public/language/nn-NO/modules.json
 trans.ro        = public/language/ro/modules.json
 trans.sv        = public/language/sv/modules.json
 trans.en@pirate = public/language/en-x-pirate/modules.json
@@ -3228,7 +3011,6 @@ trans.ms        = public/language/ms/notifications.json
 trans.hr        = public/language/hr/notifications.json
 trans.id        = public/language/id/notifications.json
 trans.nb        = public/language/nb/notifications.json
-trans.nn_NO     = public/language/nn-NO/notifications.json
 trans.ar        = public/language/ar/notifications.json
 trans.da        = public/language/da/notifications.json
 trans.en@pirate = public/language/en-x-pirate/notifications.json
@@ -3241,7 +3023,6 @@ source_lang     = en_GB
 type            = KEYVALUEJSON
 trans.he        = public/language/he/pages.json
 trans.nb        = public/language/nb/pages.json
-trans.nn_NO     = public/language/nn-NO/pages.json
 trans.sv        = public/language/sv/pages.json
 trans.pt_BR     = public/language/pt-BR/pages.json
 trans.tr        = public/language/tr/pages.json
@@ -3338,7 +3119,6 @@ trans.pt_PT     = public/language/pt-PT/post-queue.json
 trans.fi        = public/language/fi/post-queue.json
 trans.he        = public/language/he/post-queue.json
 trans.nb        = public/language/nb/post-queue.json
-trans.nn_NO     = public/language/nn-NO/post-queue.json

 [o:nodebb:p:nodebb:r:recent]
 file_filter     = public/language/<lang>/recent.json
@@ -3378,7 +3158,6 @@ trans.bn        = public/language/bn/recent.json
 trans.en@pirate = public/language/en-x-pirate/recent.json
 trans.ja        = public/language/ja/recent.json
 trans.nb        = public/language/nb/recent.json
-trans.nn_NO     = public/language/nn-NO/recent.json
 trans.nl        = public/language/nl/recent.json
 trans.sv        = public/language/sv/recent.json
 trans.th        = public/language/th/recent.json
@@ -3416,7 +3195,6 @@ trans.bg        = public/language/bg/register.json
 trans.de        = public/language/de/register.json
 trans.hr        = public/language/hr/register.json
 trans.nb        = public/language/nb/register.json
-trans.nn_NO     = public/language/nn-NO/register.json
 trans.gl        = public/language/gl/register.json
 trans.sk        = public/language/sk/register.json
 trans.hy        = public/language/hy/register.json
@@ -3486,7 +3264,6 @@ trans.en_US     = public/language/en-US/reset_password.json
 trans.lt        = public/language/lt/reset_password.json
 trans.lv        = public/language/lv/reset_password.json
 trans.nb        = public/language/nb/reset_password.json
-trans.nn_NO     = public/language/nn-NO/reset_password.json
 trans.sk        = public/language/sk/reset_password.json
 trans.el        = public/language/el/reset_password.json
 trans.es        = public/language/es/reset_password.json
@@ -3499,59 +3276,6 @@ trans.pl        = public/language/pl/reset_password.json
 trans.sl        = public/language/sl/reset_password.json
 trans.th        = public/language/th/reset_password.json

-[o:nodebb:p:nodebb:r:rewards]
-file_filter     = public/language/<lang>/rewards.json
-source_file     = public/language/en-GB/rewards.json
-source_lang     = en_GB
-type            = KEYVALUEJSON
-trans.bg        = public/language/bg/rewards.json
-trans.fr        = public/language/fr/rewards.json
-trans.hr        = public/language/hr/rewards.json
-trans.hy        = public/language/hy/rewards.json
-trans.ja        = public/language/ja/rewards.json
-trans.pt_PT     = public/language/pt-PT/rewards.json
-trans.zh_CN     = public/language/zh-CN/rewards.json
-trans.sv        = public/language/sv/rewards.json
-trans.de        = public/language/de/rewards.json
-trans.fa_IR     = public/language/fa-IR/rewards.json
-trans.gl        = public/language/gl/rewards.json
-trans.hu        = public/language/hu/rewards.json
-trans.id        = public/language/id/rewards.json
-trans.rw        = public/language/rw/rewards.json
-trans.sc        = public/language/sc/rewards.json
-trans.vi        = public/language/vi/rewards.json
-trans.bn        = public/language/bn/rewards.json
-trans.he        = public/language/he/rewards.json
-trans.ro        = public/language/ro/rewards.json
-trans.sq_AL     = public/language/sq-AL/rewards.json
-trans.ar        = public/language/ar/rewards.json
-trans.cs        = public/language/cs/rewards.json
-trans.ko        = public/language/ko/rewards.json
-trans.ms        = public/language/ms/rewards.json
-trans.pt_BR     = public/language/pt-BR/rewards.json
-trans.sr        = public/language/sr/rewards.json
-trans.tr        = public/language/tr/rewards.json
-trans.ru        = public/language/ru/rewards.json
-trans.zh_TW     = public/language/zh-TW/rewards.json
-trans.da        = public/language/da/rewards.json
-trans.en@pirate = public/language/en-x-pirate/rewards.json
-trans.en_US     = public/language/en-US/rewards.json
-trans.lt        = public/language/lt/rewards.json
-trans.lv        = public/language/lv/rewards.json
-trans.nb        = public/language/nb/rewards.json
-trans.nn_NO     = public/language/nn-NO/rewards.json
-trans.sk        = public/language/sk/rewards.json
-trans.el        = public/language/el/rewards.json
-trans.es        = public/language/es/rewards.json
-trans.et        = public/language/et/rewards.json
-trans.uk        = public/language/uk/rewards.json
-trans.fi        = public/language/fi/rewards.json
-trans.it        = public/language/it/rewards.json
-trans.nl        = public/language/nl/rewards.json
-trans.pl        = public/language/pl/rewards.json
-trans.sl        = public/language/sl/rewards.json
-trans.th        = public/language/th/rewards.json
-
 [o:nodebb:p:nodebb:r:search]
 file_filter     = public/language/<lang>/search.json
 source_file     = public/language/en-GB/search.json
@@ -3582,7 +3306,6 @@ trans.zh_TW     = public/language/zh-TW/search.json
 trans.cs        = public/language/cs/search.json
 trans.he        = public/language/he/search.json
 trans.nb        = public/language/nb/search.json
-trans.nn_NO     = public/language/nn-NO/search.json
 trans.zh_CN     = public/language/zh-CN/search.json
 trans.lv        = public/language/lv/search.json
 trans.rw        = public/language/rw/search.json
@@ -3605,59 +3328,6 @@ trans.et        = public/language/et/search.json
 trans.hy        = public/language/hy/search.json
 trans.lt        = public/language/lt/search.json

-[o:nodebb:p:nodebb:r:social]
-file_filter     = public/language/<lang>/social.json
-source_file     = public/language/en-GB/social.json
-source_lang     = en_GB
-type            = KEYVALUEJSON
-trans.da        = public/language/da/social.json
-trans.en_US     = public/language/en-US/social.json
-trans.ms        = public/language/ms/social.json
-trans.hr        = public/language/hr/social.json
-trans.hu        = public/language/hu/social.json
-trans.id        = public/language/id/social.json
-trans.bg        = public/language/bg/social.json
-trans.de        = public/language/de/social.json
-trans.en@pirate = public/language/en-x-pirate/social.json
-trans.fa_IR     = public/language/fa-IR/social.json
-trans.fi        = public/language/fi/social.json
-trans.sc        = public/language/sc/social.json
-trans.sk        = public/language/sk/social.json
-trans.sl        = public/language/sl/social.json
-trans.sq_AL     = public/language/sq-AL/social.json
-trans.sr        = public/language/sr/social.json
-trans.bn        = public/language/bn/social.json
-trans.ja        = public/language/ja/social.json
-trans.ko        = public/language/ko/social.json
-trans.pl        = public/language/pl/social.json
-trans.ro        = public/language/ro/social.json
-trans.zh_TW     = public/language/zh-TW/social.json
-trans.cs        = public/language/cs/social.json
-trans.he        = public/language/he/social.json
-trans.nb        = public/language/nb/social.json
-trans.nn_NO     = public/language/nn-NO/social.json
-trans.zh_CN     = public/language/zh-CN/social.json
-trans.lv        = public/language/lv/social.json
-trans.rw        = public/language/rw/social.json
-trans.sv        = public/language/sv/social.json
-trans.ru        = public/language/ru/social.json
-trans.tr        = public/language/tr/social.json
-trans.uk        = public/language/uk/social.json
-trans.el        = public/language/el/social.json
-trans.fr        = public/language/fr/social.json
-trans.gl        = public/language/gl/social.json
-trans.it        = public/language/it/social.json
-trans.pt_BR     = public/language/pt-BR/social.json
-trans.nl        = public/language/nl/social.json
-trans.pt_PT     = public/language/pt-PT/social.json
-trans.th        = public/language/th/social.json
-trans.vi        = public/language/vi/social.json
-trans.ar        = public/language/ar/social.json
-trans.es        = public/language/es/social.json
-trans.et        = public/language/et/social.json
-trans.hy        = public/language/hy/social.json
-trans.lt        = public/language/lt/social.json
-
 [o:nodebb:p:nodebb:r:success]
 file_filter     = public/language/<lang>/success.json
 source_file     = public/language/en-GB/success.json
@@ -3707,7 +3377,6 @@ trans.da        = public/language/da/success.json
 trans.el        = public/language/el/success.json
 trans.gl        = public/language/gl/success.json
 trans.nb        = public/language/nb/success.json
-trans.nn_NO     = public/language/nn-NO/success.json
 trans.sr        = public/language/sr/success.json
 trans.uk        = public/language/uk/success.json

@@ -3751,7 +3420,6 @@ trans.gl        = public/language/gl/tags.json
 trans.lv        = public/language/lv/tags.json
 trans.ms        = public/language/ms/tags.json
 trans.nb        = public/language/nb/tags.json
-trans.nn_NO     = public/language/nn-NO/tags.json
 trans.sv        = public/language/sv/tags.json
 trans.sq_AL     = public/language/sq-AL/tags.json
 trans.zh_TW     = public/language/zh-TW/tags.json
@@ -3810,7 +3478,6 @@ trans.sv        = public/language/sv/top.json
 trans.th        = public/language/th/top.json
 trans.it        = public/language/it/top.json
 trans.nb        = public/language/nb/top.json
-trans.nn_NO     = public/language/nn-NO/top.json
 trans.sr        = public/language/sr/top.json
 trans.tr        = public/language/tr/top.json
 trans.zh_TW     = public/language/zh-TW/top.json
@@ -3825,7 +3492,6 @@ type            = KEYVALUEJSON
 trans.et        = public/language/et/topic.json
 trans.hu        = public/language/hu/topic.json
 trans.nb        = public/language/nb/topic.json
-trans.nn_NO     = public/language/nn-NO/topic.json
 trans.nl        = public/language/nl/topic.json
 trans.sk        = public/language/sk/topic.json
 trans.ar        = public/language/ar/topic.json
@@ -3908,7 +3574,6 @@ trans.sk        = public/language/sk/unread.json
 trans.bn        = public/language/bn/unread.json
 trans.cs        = public/language/cs/unread.json
 trans.nb        = public/language/nb/unread.json
-trans.nn_NO     = public/language/nn-NO/unread.json
 trans.rw        = public/language/rw/unread.json
 trans.sq_AL     = public/language/sq-AL/unread.json
 trans.tr        = public/language/tr/unread.json
@@ -3953,7 +3618,6 @@ trans.et        = public/language/et/uploads.json
 trans.id        = public/language/id/uploads.json
 trans.ms        = public/language/ms/uploads.json
 trans.nb        = public/language/nb/uploads.json
-trans.nn_NO     = public/language/nn-NO/uploads.json
 trans.pt_PT     = public/language/pt-PT/uploads.json
 trans.da        = public/language/da/uploads.json
 trans.es        = public/language/es/uploads.json
@@ -4023,7 +3687,6 @@ trans.hr        = public/language/hr/user.json
 trans.hy        = public/language/hy/user.json
 trans.ja        = public/language/ja/user.json
 trans.nb        = public/language/nb/user.json
-trans.nn_NO     = public/language/nn-NO/user.json
 trans.nl        = public/language/nl/user.json
 trans.ro        = public/language/ro/user.json
 trans.sc        = public/language/sc/user.json
@@ -4057,7 +3720,6 @@ trans.he        = public/language/he/users.json
 trans.ja        = public/language/ja/users.json
 trans.ko        = public/language/ko/users.json
 trans.nb        = public/language/nb/users.json
-trans.nn_NO     = public/language/nn-NO/users.json
 trans.pt_PT     = public/language/pt-PT/users.json
 trans.sr        = public/language/sr/users.json
 trans.zh_CN     = public/language/zh-CN/users.json
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/90
+++ b/90
@@ -1,75 +1,25 @@
-FROM node:lts as build
+FROM node:lts
+
+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 --chown=node:node install/package.json /usr/src/app/package.json
+
+USER node
+
+RUN npm install --only=prod && \
+    npm cache clean --force
+
+COPY --chown=node:node . /usr/src/app

 ENV NODE_ENV=production \
-    DAEMON=false \
-    SILENT=false \
-    USER=nodebb \
-    UID=1001 \
-    GID=1001
-
-WORKDIR /usr/src/app/
-
-COPY . /usr/src/app/
-
-# Install corepack to allow usage of other package managers
-RUN corepack enable
-
-# Removing unnecessary files for us
-RUN find . -mindepth 1 -maxdepth 1 -name '.*' ! -name '.' ! -name '..' -exec bash -c 'echo "Deleting {}"; rm -rf {}' \;
-
-# Prepage package.json
-RUN cp /usr/src/app/install/package.json /usr/src/app/
-
-RUN apt-get update \
-    && DEBIAN_FRONTEND=noninteractive \
-    apt-get -y --no-install-recommends install \
-        tini
-
-RUN groupadd --gid ${GID} ${USER} \
-    && useradd --uid ${UID} --gid ${GID} --home-dir /usr/src/app/ --shell /bin/bash ${USER} \
-    && chown -R ${USER}:${USER} /usr/src/app/
-
-USER ${USER}
-
-RUN npm install --omit=dev
-    # TODO: generate lockfiles for each package manager
-    ## pnpm import \
-
-FROM node:lts-slim AS final
-
-ENV NODE_ENV=production \
-    DAEMON=false \
-    SILENT=false \
-    USER=nodebb \
-    UID=1001 \
-    GID=1001
-
-WORKDIR /usr/src/app/
-
-RUN corepack enable \
-    && groupadd --gid ${GID} ${USER} \
-    && useradd --uid ${UID} --gid ${GID} --home-dir /usr/src/app/ --shell /bin/bash ${USER} \
-    && mkdir -p /usr/src/app/logs/ /opt/config/ \
-    && chown -R ${USER}:${USER} /usr/src/app/ /opt/config/
-
-COPY --from=build --chown=${USER}:${USER} /usr/src/app/ /usr/src/app/install/docker/setup.json /usr/src/app/
-COPY --from=build --chown=${USER}:${USER} /usr/bin/tini /usr/src/app/install/docker/entrypoint.sh /usr/local/bin/
-
-RUN chmod +x /usr/local/bin/entrypoint.sh \
-    && chmod +x /usr/local/bin/tini
-
-# TODO: Have docker-compose use environment variables to create files like setup.json and config.json.
-# COPY --from=hairyhenderson/gomplate:stable /gomplate /usr/local/bin/gomplate
-
-USER ${USER}
+    daemon=false \
+    silent=false

 EXPOSE 4567

-VOLUME ["/usr/src/app/node_modules", "/usr/src/app/build", "/usr/src/app/public/uploads", "/opt/config/"]
-
-# Utilising tini as our init system within the Docker container for graceful start-up and termination.
-# Tini serves as an uncomplicated init system, adept at managing the reaping of zombie processes and forwarding signals.
-# This approach is crucial to circumvent issues with unmanaged subprocesses and signal handling in containerised environments.
-# By integrating tini, we enhance the reliability and stability of our Docker containers.
-# Ensures smooth start-up and shutdown processes, and reliable, safe handling of signal processing.
-ENTRYPOINT ["tini", "--", "entrypoint.sh"]
+CMD test -n "${SETUP}" && ./nodebb setup || node ./nodebb build; node ./nodebb start
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -49,8 +49,8 @@ module.exports = function (grunt) {
 			if (!pluginList.includes('nodebb-plugin-composer-default')) {
 				pluginList.push('nodebb-plugin-composer-default');
 			}
-			if (!pluginList.includes('nodebb-theme-harmony')) {
-				pluginList.push('nodebb-theme-harmony');
+			if (!pluginList.includes('nodebb-theme-persona')) {
+				pluginList.push('nodebb-theme-persona');
 			}
 		}

@@ -65,7 +65,7 @@ module.exports = function (grunt) {

 		const templatesUpdated = pluginList.map(p => `node_modules/${p}/+(public|static|templates)/**/*.tpl`);
 		const langUpdated = pluginList.map(p => `node_modules/${p}/+(public|static|languages)/**/*.json`);
-		const interval = 100;
+
 		grunt.config(['watch'], {
 			styleUpdated: {
 				files: [
@@ -73,7 +73,7 @@ module.exports = function (grunt) {
 					...styleUpdated_Client,
 				],
 				options: {
-					interval: interval,
+					interval: 1000,
 				},
 			},
 			clientUpdated: {
@@ -84,7 +84,7 @@ module.exports = function (grunt) {
 					'node_modules/benchpressjs/build/benchpress.js',
 				],
 				options: {
-					interval: interval,
+					interval: 1000,
 				},
 			},
 			serverUpdated: {
@@ -99,7 +99,7 @@ module.exports = function (grunt) {
 					'!src/upgrades/**',
 				],
 				options: {
-					interval: interval,
+					interval: 1000,
 				},
 			},
 			templatesUpdated: {
@@ -108,7 +108,7 @@ module.exports = function (grunt) {
 					...templatesUpdated,
 				],
 				options: {
-					interval: interval,
+					interval: 1000,
 				},
 			},
 			langUpdated: {
@@ -118,7 +118,7 @@ module.exports = function (grunt) {
 					...langUpdated,
 				],
 				options: {
-					interval: interval,
+					interval: 1000,
 				},
 			},
 		});
--- a/README.md
+++ b/README.md
@@ -24,14 +24,17 @@ 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 "Harmony" theme gets you going right away, no coding experience required.
+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)
+

-![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 SCSS or CSS. NodeBB's base theme utilizes [Bootstrap 5](http://getbootstrap.com/) as a frontend toolkit.
+* 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://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.

@@ -39,15 +42,14 @@ Our minimalist "Harmony" theme gets you going right away, no coding experience r

 NodeBB requires the following software to be installed:

-* A version of Node.js at least 16 or greater ([installation/upgrade instructions](https://github.com/nodesource/distributions))
+* A version of Node.js at least 12 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)

 ## Installation

-[Please refer to platform-specific installation documentation](https://docs.nodebb.org/installing/os).
-If installing via the cloud (or using Docker), [please see cloud-based installation documentation](https://docs.nodebb.org/installing/cloud/).
+[Please refer to platform-specific installation documentation](https://docs.nodebb.org/installing/os)

 ## Securing NodeBB

@@ -60,7 +62,6 @@ It is important to ensure that your NodeBB and database servers are secured. Bea
 2. Use `iptables` to secure your server from unintended open ports. In Ubuntu, `ufw` provides a friendlier interface to working with `iptables`.
    * e.g. If your NodeBB is proxied, no ports should be open except 80 (and possibly 22, for SSH access)

-
 ## Upgrading NodeBB

 Detailed upgrade instructions are listed in [Upgrading NodeBB](https://docs.nodebb.org/configuring/upgrade/)
@@ -75,10 +76,10 @@ Interested in a sublicense agreement for use of NodeBB in a non-free/restrictive

 * [Demo](https://try.nodebb.org)
 * [Developer Community](http://community.nodebb.org)
-* [Documentation & Installation Instructions](https://docs.nodebb.org)
+* [Documentation & Installation Instructions](http://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")
+* [NodeBB Blog](http://blog.nodebb.org)
+* [Premium Hosting for NodeBB](http://www.nodebb.org/ "NodeBB")
 * Unofficial IRC community &ndash; 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")
--- a/dev.Dockerfile
+++ b/dev.Dockerfile
@@ -1,77 +0,0 @@
-FROM node:lts AS git
-
-ENV USER=nodebb \
-    UID=1001 \
-    GID=1001
-
-WORKDIR /usr/src/app/
-
-RUN groupadd --gid ${GID} ${USER} \
-    && useradd --uid ${UID} --gid ${GID} --home-dir /usr/src/app/ --shell /bin/bash ${USER} \
-    && chown -R ${USER}:${USER} /usr/src/app/
-
-RUN apt-get update \
-    && apt-get -y --no-install-recommends install tini
-
-USER ${USER}
-
-# Change to the git branch you want to test
-RUN git clone --recurse-submodules -j8 --depth 1 https://github.com/NodeBB/NodeBB.git .
-
-RUN find . -mindepth 1 -maxdepth 1 -name '.*' ! -name '.' ! -name '..' -exec bash -c 'echo "Deleting {}"; rm -rf {}' \;
-
-FROM node:lts AS node_modules_touch
-
-ENV NODE_ENV=development \
-    USER=nodebb \
-    UID=1001 \
-    GID=1001
-
-WORKDIR /usr/src/app/
-
-RUN corepack enable \
-  && groupadd --gid ${GID} ${USER} \
-  && useradd --uid ${UID} --gid ${GID} --home-dir /usr/src/app/ --shell /bin/bash ${USER} \
-  && chown -R ${USER}:${USER} /usr/src/app/
-
-COPY --from=git --chown=${USER}:${USER} /usr/src/app/install/package.json /usr/src/app/
-
-USER ${USER}
-
-RUN npm install
-  
-FROM node:lts-slim AS final
-
-ENV NODE_ENV=development \
-    DAEMON=false \
-    SILENT=false \
-    USER=nodebb \
-    UID=1001 \
-    GID=1001
-
-WORKDIR /usr/src/app/
-
-RUN corepack enable \
-    && groupadd --gid ${GID} ${USER} \
-    && useradd --uid ${UID} --gid ${GID} --home-dir /usr/src/app/ --shell /bin/bash ${USER} \
-    && mkdir -p /usr/src/app/logs/ /opt/config/ \
-    && chown -R ${USER}:${USER} /usr/src/app/ /opt/config/
-
-COPY --from=build --chown=${USER}:${USER} /usr/src/app/ /usr/src/app/install/docker/setup.json /usr/src/app/
-COPY --from=build --chown=${USER}:${USER} /usr/bin/tini /usr/src/app/install/docker/entrypoint.sh /usr/local/bin/
-COPY --from=node_modules_touch --chown=${USER}:${USER} /usr/src/app/ /usr/src/app/
-COPY --from=git --chown=${USER}:${USER} /usr/src/app/ /usr/src/app/
-
-RUN chmod +x /usr/local/bin/entrypoint.sh \
-    && chmod +x /usr/local/bin/tini
-
-# TODO: Have docker-compose use environment variables to create files like setup.json and config.json.
-# COPY --from=hairyhenderson/gomplate:stable /gomplate /usr/local/bin/gomplate
-
-USER ${USER}
-
-EXPOSE 4567
-
-VOLUME ["/usr/src/app/node_modules", "/usr/src/app/build", "/usr/src/app/public/uploads", "/opt/config/"]
-
-ENTRYPOINT ["tini", "--", "entrypoint.sh"]
--- a/docker-compose-pgsql.yml
+++ b/docker-compose-pgsql.yml
@@ -1,70 +0,0 @@
-version: '3.8'
-
-services:
-  nodebb:
-    build: .
-    # image: ghcr.io/nodebb/nodebb:latest
-    restart: unless-stopped
-    ports:
-      - '4567:4567' # comment this out if you don't want to expose NodeBB to the host, or change the first number to any port you want
-    volumes:
-      - nodebb-build:/usr/src/app/build
-      - nodebb-uploads:/usr/src/app/public/uploads
-      - nodebb-config:/opt/config
-      - ./install/docker/setup.json:/usr/src/app/setup.json
-
-  postgres:
-    image: postgres:17.0-alpine
-    restart: unless-stopped
-    environment:
-      POSTGRES_USER: nodebb
-      POSTGRES_PASSWORD: nodebb
-      POSTGRES_DB: nodebb
-    volumes:
-      - postgres-data:/var/lib/postgresql/data
-
-  redis:
-    image: redis:7.4.1-alpine
-    restart: unless-stopped
-    command: ['redis-server', '--appendonly', 'yes', '--loglevel', 'warning']
-    # command: ["redis-server", "--save", "60", "1", "--loglevel", "warning"] # uncomment if you want to use snapshotting instead of AOF
-    volumes:
-      - redis-data:/data
-    profiles:
-      - redis
-
-volumes:
-  postgres-data:
-    driver: local
-    driver_opts:
-      o: bind
-      type: none
-      device: ./.docker/database/postgresql/data
-
-  redis-data:
-    driver: local
-    driver_opts:
-      o: bind
-      type: none
-      device: ./.docker/database/redis
-
-  nodebb-build:
-    driver: local
-    driver_opts:
-      o: bind
-      type: none
-      device: ./.docker/build
-
-  nodebb-uploads:
-    driver: local
-    driver_opts:
-      o: bind
-      type: none
-      device: ./.docker/public/uploads
-
-  nodebb-config:
-    driver: local
-    driver_opts:
-      o: bind
-      type: none
-      device: ./.docker/config
--- a/docker-compose-redis.yml
+++ b/docker-compose-redis.yml
@@ -1,51 +0,0 @@
-version: '3.8'
-
-services:
-  nodebb:
-    build: .
-    # image: ghcr.io/nodebb/nodebb:latest
-    restart: unless-stopped
-    ports:
-      - '4567:4567' # comment this out if you don't want to expose NodeBB to the host, or change the first number to any port you want
-    volumes:
-      - nodebb-build:/usr/src/app/build
-      - nodebb-uploads:/usr/src/app/public/uploads
-      - nodebb-config:/opt/config
-      - ./install/docker/setup.json:/usr/src/app/setup.json
-
-  redis:
-    image: redis:7.4.1-alpine
-    restart: unless-stopped
-    command: ['redis-server', '--appendonly', 'yes', '--loglevel', 'warning']
-    # command: ["redis-server", "--save", "60", "1", "--loglevel", "warning"] # uncomment if you want to use snapshotting instead of AOF
-    volumes:
-      - redis-data:/data
-
-volumes:
-  redis-data:
-    driver: local
-    driver_opts:
-      o: bind
-      type: none
-      device: ./.docker/database/redis
-
-  nodebb-build:
-    driver: local
-    driver_opts:
-      o: bind
-      type: none
-      device: ./.docker/build
-
-  nodebb-uploads:
-    driver: local
-    driver_opts:
-      o: bind
-      type: none
-      device: ./.docker/public/uploads
-
-  nodebb-config:
-    driver: local
-    driver_opts:
-      o: bind
-      type: none
-      device: ./.docker/config
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,91 +1,24 @@
-version: '3.8'
+version: '3.5'

 services:
-  nodebb:
+  node:
    build: .
-    # image: ghcr.io/nodebb/nodebb:latest
    restart: unless-stopped
-    ports:
-      - '4567:4567' # comment this out if you don't want to expose NodeBB to the host, or change the first number to any port you want
-    volumes:
-      - nodebb-build:/usr/src/app/build
-      - nodebb-uploads:/usr/src/app/public/uploads
-      - nodebb-config:/opt/config
-      - ./install/docker/setup.json:/usr/src/app/setup.json
+    depends_on:
+      - db
+    expose:
+      - 4567 # use a reverse proxy like Traefik

-  mongo:
-    image: 'mongo:7-jammy'
+  db:
+    image: mongo:bionic
    restart: unless-stopped
-    ports:
-      - '27017:27017'
+    expose:
+      - 27017
    environment:
-      MONGO_INITDB_ROOT_USERNAME: nodebb
-      MONGO_INITDB_ROOT_PASSWORD: nodebb
-      MONGO_INITDB_DATABASE: nodebb
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: root
    volumes:
-      - mongo-data:/data/db
-      - ./install/docker/mongodb-user-init.js:/docker-entrypoint-initdb.d/user-init.js
-  redis:
-    image: redis:7.4.1-alpine
-    restart: unless-stopped
-    command: ['redis-server', '--appendonly', 'yes', '--loglevel', 'warning']
-    # command: ['redis-server', '--save', '60', '1', '--loglevel', 'warning'] # uncomment if you want to use snapshotting instead of AOF
-    volumes:
-      - redis-data:/data
-    profiles:
-      - redis
-
-  postgres:
-    image: postgres:17.0-alpine
-    restart: unless-stopped
-    environment:
-      POSTGRES_USER: nodebb
-      POSTGRES_PASSWORD: nodebb
-      POSTGRES_DB: nodebb
-    volumes:
-      - postgres-data:/var/lib/postgresql/data
-    profiles:
-      - postgres
+      - mongo:/data/db

 volumes:
-  mongo-data:
-    driver: local
-    driver_opts:
-      o: bind
-      type: none
-      device: ./.docker/database/mongo/data
-
-  redis-data:
-    driver: local
-    driver_opts:
-      o: bind
-      type: none
-      device: ./.docker/database/redis
-
-  postgres-data:
-    driver: local
-    driver_opts:
-      o: bind
-      type: none
-      device: ./.docker/database/postgresql/data
-
-  nodebb-build:
-    driver: local
-    driver_opts:
-      o: bind
-      type: none
-      device: ./.docker/build
-
-  nodebb-uploads:
-    driver: local
-    driver_opts:
-      o: bind
-      type: none
-      device: ./.docker/public/uploads
-
-  nodebb-config:
-    driver: local
-    driver_opts:
-      o: bind
-      type: none
-      device: ./.docker/config
+  mongo:
--- a/install/data/defaults.json
+++ b/install/data/defaults.json
@@ -4,7 +4,6 @@
    "defaultLang": "en-GB",
    "loginDays": 14,
    "loginSeconds": 0,
-    "sessionDuration": 0,
    "loginAttempts": 5,
    "lockoutDuration": 60,
    "adminReloginDuration": 60,
@@ -16,18 +15,16 @@
    "postDeleteDuration": 0,
    "enablePostHistory": 1,
    "topicBacklinks": 1,
-    "postCacheSize": 20971520,
+    "postCacheSize": 10485760,
    "disableChat": 0,
    "chatEditDuration": 0,
    "chatDeleteDuration": 0,
-    "chatMessageDelay": 2000,
-    "newbieChatMessageDelay": 120000,
+    "chatMessageDelay": 200,
    "notificationSendDelay": 60,
-    "newbieReputationThreshold": 3,
+    "newbiePostDelayThreshold": 3,
    "postQueue": 0,
    "postQueueReputationThreshold": 0,
    "groupsExemptFromPostQueue": ["administrators", "Global Moderators"],
-    "groupsExemptFromNewUserRestrictions": ["administrators", "Global Moderators"],
    "groupsExemptFromMaintenanceMode": ["administrators", "Global Moderators"],
    "minimumPostLength": 8,
    "maximumPostLength": 32767,
@@ -42,11 +39,11 @@
    "registrationApprovalType": "normal",
    "allowAccountDelete": 1,
    "privateUploads": 0,
-    "allowedFileExtensions": "png,jpg,bmp,txt,webp,webm,mp4,gif",
+    "allowedFileExtensions": "png,jpg,bmp,txt",
    "uploadRateLimitThreshold": 10,
    "uploadRateLimitCooldown": 60,
    "allowUserHomePage": 1,
-    "allowMultipleBadges": 1,
+    "allowMultipleBadges": 0,
    "maximumFileSize": 2048,
    "stripEXIFData": 1,
    "orphanExpiryDays": 0,
@@ -66,7 +63,6 @@
    "maximumAboutMeLength": 1000,
    "maximumUsersInChatRoom": 0,
    "maximumChatMessageLength": 1000,
-    "maximumChatRoomNameLength": 50,
    "maximumProfileImageSize": 256,
    "maximumCoverImageSize": 2048,
    "profileImageDimension": 200,
@@ -91,7 +87,6 @@
    "min:rep:chat": 0,
    "min:rep:downvote": 0,
    "min:rep:upvote": 0,
-    "min:rep:post-links": 0,
    "min:rep:flag": 0,
    "min:rep:profile-picture": 0,
    "min:rep:cover-picture": 0,
@@ -99,8 +94,6 @@
    "min:rep:aboutme": 0,
    "min:rep:signature": 0,
    "flags:limitPerTarget": 0,
-    "flags:postFlagsPerDay": 10,
-    "flags:userFlagsPerDay": 10,
    "flags:autoFlagOnDownvoteThreshold": 0,
    "flags:actionOnResolve": "rescind",
    "flags:actionOnReject": "rescind",
@@ -137,8 +130,7 @@
    "sitemapTopics": 500,
    "maintenanceMode": 0,
    "maintenanceModeStatus": 503,
-    "upvoteVisibility": "all",
-    "downvoteVisibility": "privileged",
+    "votesArePublic": 0,
    "maximumInvites": 0,
    "username:disableEdit": 0,
    "email:disableEdit": 0,
@@ -179,7 +171,7 @@
    "onlineCutoff": 30,
    "timeagoCutoff": 30,
    "necroThreshold": 7,
-    "categoryWatchState": "tracking",
+    "categoryWatchState": "watching",
    "submitPluginUsage": 1,
    "showAverageApprovalTime": 1,
    "autoApproveTime": 0,
@@ -189,6 +181,5 @@
    "composer:showHelpTab": 1,
    "composer:allowPluginHelp": 1,
    "maxReconnectionAttempts": 5,
-    "reconnectionDelay": 1500,
-    "disableCustomUserSkins": 0
-}
+    "reconnectionDelay": 1500
+}
--- a/install/data/welcome.md
+++ b/install/data/welcome.md
@@ -1,9 +1,9 @@
-### Welcome to your brand new NodeBB forum!
+# Welcome to your brand new NodeBB forum!

 This is what a topic and post looks like. As an administrator, you can edit the post\'s title and content.
 To customise your forum, go to the [Administrator Control Panel](../../admin). You can modify all aspects of your forum there, including installation of third-party plugins.

-#### Additional Resources
+## Additional Resources

 * [NodeBB Documentation](https://docs.nodebb.org)
 * [Community Support Forum](https://community.nodebb.org)
--- a/install/docker/entrypoint.sh
+++ b/install/docker/entrypoint.sh
@@ -1,198 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Function to set default values for environment variables
-set_defaults() {
-  export CONFIG_DIR="${CONFIG_DIR:-/opt/config}"
-  export CONFIG="$CONFIG_DIR/config.json"
-  export NODEBB_INIT_VERB="${NODEBB_INIT_VERB:-install}"
-  export NODEBB_BUILD_VERB="${NODEBB_BUILD_VERB:-build}"
-  export START_BUILD="${START_BUILD:-${FORCE_BUILD_BEFORE_START:-false}}"
-  export SETUP="${SETUP:-}"
-  export PACKAGE_MANAGER="${PACKAGE_MANAGER:-npm}"
-  export OVERRIDE_UPDATE_LOCK="${OVERRIDE_UPDATE_LOCK:-false}"
-}
-
-# Function to check if a directory exists and is writable
-check_directory() {
-  local dir="$1"
-  if [ ! -d "$dir" ]; then
-    echo "Error: Directory $dir does not exist. Creating..."
-    mkdir -p "$dir" || {
-      echo "Error: Failed to create directory $dir"
-      exit 1
-    }
-  fi
-  if [ ! -w "$dir" ]; then
-    echo "Warning: No write permission for directory $dir, attempting to fix..."
-    chown -R $USER:$USER "$dir" || true # attempt to change ownership, do not exit on failure
-    chmod -R 760 "$dir" || true # attempt to change permissions, do not exit on failure
-    if [ ! -w "$dir" ]; then
-      echo "Error: No write permission for directory $dir. Exiting..."
-      exit 1
-    fi
-  fi
-}
-
-# Function to copy or link package.json and lock files based on package manager
-copy_or_link_files() {
-  local src_dir="$1"
-  local dest_dir="$2"
-  local package_manager="$3"
-  local lock_file
-
-  case "$package_manager" in
-    yarn) lock_file="yarn.lock" ;;
-    npm) lock_file="package-lock.json" ;;
-    pnpm) lock_file="pnpm-lock.yaml" ;;
-    *)
-      echo "Unknown package manager: $package_manager"
-      exit 1
-      ;;
-  esac
-
-  # Check if source and destination files are the same
-  if [ "$(realpath "$src_dir/package.json")" != "$(realpath "$dest_dir/package.json")" ] || [ "$OVERRIDE_UPDATE_LOCK" = true ]; then
-    cp "$src_dir/package.json" "$dest_dir/package.json"
-  fi
-
-  if [ "$(realpath "$src_dir/$lock_file")" != "$(realpath "$dest_dir/$lock_file")" ] || [ "$OVERRIDE_UPDATE_LOCK" = true ]; then
-    cp "$src_dir/$lock_file" "$dest_dir/$lock_file"
-  fi
-
-  # Remove unnecessary lock files in src_dir
-  rm -f "$src_dir/"{yarn.lock,package-lock.json,pnpm-lock.yaml}
-
-  # Symbolically link the copied files in src_dir to dest_dir
-  ln -fs "$dest_dir/package.json" "$src_dir/package.json"
-  ln -fs "$dest_dir/$lock_file" "$src_dir/$lock_file"
-}
-
-# Function to install dependencies using pnpm
-install_dependencies() {
-  case "$PACKAGE_MANAGER" in
-    yarn) yarn install || {
-      echo "Failed to install dependencies with yarn"
-      exit 1
-    } ;;
-    npm) npm install || {
-      echo "Failed to install dependencies with npm"
-      exit 1
-    } ;;
-    pnpm) pnpm install || {
-      echo "Failed to install dependencies with pnpm"
-      exit 1
-    } ;;
-    *)
-      echo "Unknown package manager: $PACKAGE_MANAGER"
-      exit 1
-      ;;
-  esac
-}
-
-# Function to start setup session
-start_setup_session() {
-  local config="$1"
-  echo "Starting setup session"
-  exec /usr/src/app/nodebb setup --config="$config"
-}
-
-# Handle building and upgrading NodeBB
-build_forum() {
-  local config="$1"
-  local start_build="$2"
-  local package_hash=$(md5sum install/package.json | head -c 32)
-  if [ "$package_hash" = "$(cat $CONFIG_DIR/install_hash.md5 || true)" ]; then
-      echo "package.json was updated. Upgrading..."
-      /usr/src/app/nodebb upgrade --config="$config" || {
-          echo "Failed to build NodeBB. Exiting..."
-          exit 1
-        }
-  elif [ "$start_build" = true ]; then
-    echo "Build before start is enabled. Building..."
-    /usr/src/app/nodebb "${NODEBB_BUILD_VERB}" --config="$config" || {
-        echo "Failed to build NodeBB. Exiting..."
-        exit 1
-      }
-  else
-    echo "No changes in package.json. Skipping build..."
-    return
-  fi
-  echo -n $package_hash > $CONFIG_DIR/install_hash.md5
-}
-
-
-# Function to start forum
-start_forum() {
-  local config="$1"
-  local start_build="$2"
-
-  build_forum "$config" "$start_build"
-
-  case "$PACKAGE_MANAGER" in
-    yarn)
-      yarn start --config="$config" --no-silent --no-daemon || {
-        echo "Failed to start forum with yarn"
-        exit 1
-      }
-      ;;
-    npm)
-      npm start -- --config="$config" --no-silent --no-daemon || {
-        echo "Failed to start forum with npm"
-        exit 1
-      }
-      ;;
-    pnpm)
-      pnpm start -- --config="$config" --no-silent --no-daemon || {
-        echo "Failed to start forum with pnpm"
-        exit 1
-      }
-      ;;
-    *)
-      echo "Unknown package manager: $PACKAGE_MANAGER"
-      exit 1
-      ;;
-  esac
-}
-
-# Function to start installation session
-start_installation_session() {
-  local nodebb_init_verb="$1"
-  local config="$2"
-
-  echo "Config file not found at $config"
-  echo "Starting installation session"
-  exec /usr/src/app/nodebb "$nodebb_init_verb" --config="$config"
-}
-
-# Function for debugging and logging
-debug_log() {
-  local message="$1"
-  echo "DEBUG: $message"
-}
-
-# Main function
-main() {
-  set_defaults
-  check_directory "$CONFIG_DIR"
-  copy_or_link_files /usr/src/app "$CONFIG_DIR" "$PACKAGE_MANAGER"
-  install_dependencies
-
-  debug_log "PACKAGE_MANAGER: $PACKAGE_MANAGER"
-  debug_log "CONFIG location: $CONFIG"
-  debug_log "START_BUILD: $START_BUILD"
-
-  if [ -n "$SETUP" ]; then
-    start_setup_session "$CONFIG"
-  fi
-
-  if [ -f "$CONFIG" ]; then
-    start_forum "$CONFIG" "$START_BUILD"
-  else
-    start_installation_session "$NODEBB_INIT_VERB" "$CONFIG"
-  fi
-}
-
-# Execute main function
-main "$@"
--- a/install/docker/mongodb-user-init.js
+++ b/install/docker/mongodb-user-init.js
@@ -1 +0,0 @@
-db.createUser( { user: 'nodebb', pwd: 'nodebb', roles: [ { role: 'readWrite', db: 'nodebb' }, { role: 'clusterMonitor', db: 'admin' } ] } )
--- a/install/docker/setup.json
+++ b/install/docker/setup.json
@@ -1,23 +0,0 @@
-{
-    "defaults": {
-        "mongo": {
-            "host": "mongo",
-            "port": 27017,
-            "database": "nodebb",
-            "username": "nodebb",
-            "password": "nodebb"
-        },
-        "redis": {
-            "host": "redis",
-            "port": 6379,
-            "database": 0
-        },
-        "postgres": {
-            "host": "postgres",
-            "port": 5432,
-            "database": "nodebb",
-            "username": "nodebb",
-            "password": "nodebb"
-        }
-    }
-}
--- a/install/package.json
+++ b/install/package.json
@@ -2,7 +2,7 @@
    "name": "nodebb",
    "license": "GPL-3.0",
    "description": "NodeBB Forum",
-    "version": "3.10.3",
+    "version": "3.0.0-beta.1",
    "homepage": "https://www.nodebb.org",
    "repository": {
        "type": "git",
@@ -29,162 +29,157 @@
    },
    "dependencies": {
        "@adactive/bootstrap-tagsinput": "0.8.2",
-        "@fontsource/inter": "5.1.0",
-        "@fontsource/poppins": "5.1.0",
-        "@fortawesome/fontawesome-free": "6.6.0",
-        "@isaacs/ttlcache": "1.4.1",
-        "@nodebb/spider-detector": "2.0.3",
-        "@popperjs/core": "2.11.8",
-        "@textcomplete/contenteditable": "0.1.13",
-        "@textcomplete/core": "0.1.13",
-        "@textcomplete/textarea": "0.1.13",
-        "ace-builds": "1.36.4",
-        "archiver": "7.0.1",
-        "async": "3.2.6",
-        "autoprefixer": "10.4.20",
+        "@isaacs/ttlcache": "1.2.1",
+        "@popperjs/core": "2.11.6",
+        "ace-builds": "1.14.0",
+        "archiver": "5.3.1",
+        "async": "3.2.4",
+        "autoprefixer": "10.4.13",
        "bcryptjs": "2.4.3",
-        "benchpressjs": "2.5.1",
-        "body-parser": "1.20.3",
+        "benchpressjs": "2.4.3",
+        "body-parser": "1.20.1",
        "bootbox": "6.0.0",
-        "bootstrap": "5.3.3",
-        "bootswatch": "5.3.3",
+        "bootstrap": "5.2.3",
+        "bootswatch": "5.2.3",
        "chalk": "4.1.2",
-        "chart.js": "4.4.6",
+        "chart.js": "2.9.4",
        "cli-graph": "3.2.2",
        "clipboard": "2.0.11",
        "colors": "1.4.0",
-        "commander": "12.1.0",
-        "compare-versions": "6.1.1",
-        "compression": "1.7.5",
+        "commander": "9.4.1",
+        "compare-versions": "5.0.3",
+        "compression": "1.7.4",
        "connect-flash": "0.1.1",
-        "connect-mongo": "5.1.0",
+        "connect-mongo": "4.6.0",
        "connect-multiparty": "2.2.0",
-        "connect-pg-simple": "10.0.0",
-        "connect-redis": "7.1.1",
-        "cookie-parser": "1.4.7",
-        "cron": "3.1.9",
-        "cropperjs": "1.6.2",
-        "csrf-sync": "4.0.3",
+        "connect-pg-simple": "8.0.0",
+        "connect-redis": "6.1.3",
+        "cookie-parser": "1.4.6",
+        "cron": "2.1.0",
+        "cropperjs": "1.5.13",
+        "csurf": "1.11.0",
        "daemon": "1.1.0",
-        "diff": "7.0.0",
-        "esbuild": "0.24.0",
-        "express": "4.21.1",
-        "express-session": "1.18.1",
+        "diff": "5.1.0",
+        "esbuild": "0.16.10",
+        "express": "4.18.2",
+        "express-session": "1.17.3",
        "express-useragent": "1.0.15",
-        "fetch-cookie": "3.0.1",
        "file-loader": "6.2.0",
-        "fs-extra": "11.2.0",
-        "graceful-fs": "4.2.11",
-        "helmet": "7.2.0",
-        "html-to-text": "9.0.5",
-        "imagesloaded": "5.0.0",
-        "ipaddr.js": "2.2.0",
-        "jquery": "3.7.1",
+        "fs-extra": "11.1.0",
+        "graceful-fs": "4.2.10",
+        "helmet": "5.1.1",
+        "html-to-text": "9.0.3",
+        "ipaddr.js": "2.0.1",
+        "jquery": "3.6.3",
        "jquery-deserialize": "2.0.0",
        "jquery-form": "4.3.0",
        "jquery-serializeobject": "1.0.0",
-        "jquery-ui": "1.14.1",
+        "jquery-ui": "1.13.2",
        "jsesc": "3.0.2",
        "json2csv": "5.0.7",
-        "jsonwebtoken": "9.0.2",
+        "jsonwebtoken": "8.5.1",
+        "less": "4.1.3",
        "lodash": "4.17.21",
-        "logrotate-stream": "0.2.9",
-        "lru-cache": "10.4.3",
+        "logrotate-stream": "0.2.8",
+        "lru-cache": "7.14.1",
+        "material-design-lite": "1.3.0",
        "mime": "3.0.0",
-        "mkdirp": "3.0.1",
-        "mongodb": "6.10.0",
+        "mkdirp": "1.0.4",
+        "mongodb": "4.13.0",
        "morgan": "1.10.0",
        "mousetrap": "1.6.5",
        "multiparty": "4.2.3",
-        "nconf": "0.12.1",
-        "nodebb-plugin-2factor": "7.5.6",
-        "nodebb-plugin-composer-default": "10.2.42",
-        "nodebb-plugin-dbsearch": "6.2.5",
-        "nodebb-plugin-emoji": "5.1.15",
+        "nconf": "0.12.0",
+        "nodebb-plugin-2factor": "6.0.3",
+        "nodebb-plugin-composer-default": "10.0.20",
+        "nodebb-plugin-dbsearch": "6.0.0",
+        "nodebb-plugin-emoji": "5.0.3",
        "nodebb-plugin-emoji-android": "4.0.0",
-        "nodebb-plugin-markdown": "12.2.8",
-        "nodebb-plugin-mentions": "4.4.3",
-        "nodebb-plugin-ntfy": "1.7.7",
-        "nodebb-plugin-spam-be-gone": "2.2.2",
-        "nodebb-rewards-essentials": "1.0.0",
-        "nodebb-theme-harmony": "1.2.79",
-        "nodebb-theme-lavender": "7.1.10",
-        "nodebb-theme-peace": "2.2.8",
-        "nodebb-theme-persona": "13.3.42",
-        "nodebb-widget-essentials": "7.0.30",
-        "nodemailer": "6.9.16",
+        "nodebb-plugin-markdown": "12.0.1",
+        "nodebb-plugin-mentions": "4.0.2",
+        "nodebb-plugin-ntfy": "1.0.0",
+        "nodebb-plugin-spam-be-gone": "2.0.4",
+        "nodebb-rewards-essentials": "0.2.1",
+        "nodebb-theme-harmony": "1.0.0-beta.1",
+        "nodebb-theme-lavender": "7.0.5",
+        "nodebb-theme-peace": "2.0.14",
+        "nodebb-theme-persona": "13.0.37",
+        "nodebb-widget-essentials": "7.0.2",
+        "nodemailer": "6.8.0",
        "nprogress": "0.2.0",
-        "passport": "0.7.0",
+        "passport": "0.6.0",
        "passport-http-bearer": "1.0.1",
        "passport-local": "1.0.0",
-        "pg": "8.13.1",
-        "pg-cursor": "2.12.1",
-        "postcss": "8.4.47",
+        "pg": "8.8.0",
+        "pg-cursor": "2.7.4",
+        "postcss": "8.4.20",
        "postcss-clean": "1.2.0",
        "progress-webpack-plugin": "1.0.16",
        "prompt": "1.3.0",
-        "ioredis": "5.4.1",
-        "rimraf": "5.0.10",
+        "ioredis": "5.2.4",
+        "request": "2.88.2",
+        "request-promise-native": "1.0.9",
+        "rimraf": "3.0.2",
        "rss": "1.2.2",
-        "rtlcss": "4.3.0",
-        "sanitize-html": "2.13.1",
-        "sass": "1.80.6",
-        "semver": "7.6.3",
+        "rtlcss": "4.0.0",
+        "sanitize-html": "2.8.1",
+        "sass": "1.54.9",
+        "semver": "7.3.8",
        "serve-favicon": "2.5.0",
-        "sharp": "0.32.6",
-        "sitemap": "8.0.0",
-        "socket.io": "4.8.1",
-        "socket.io-client": "4.8.1",
-        "@socket.io/redis-adapter": "8.3.0",
-        "sortablejs": "1.15.3",
-        "spdx-license-list": "6.9.0",
-        "terser-webpack-plugin": "5.3.10",
+        "sharp": "0.31.3",
+        "sitemap": "7.1.1",
+        "slideout": "1.0.1",
+        "socket.io": "4.5.4",
+        "socket.io-client": "4.5.4",
+        "@socket.io/redis-adapter": "8.0.0",
+        "sortablejs": "1.15.0",
+        "spdx-license-list": "6.6.0",
+        "spider-detector": "2.0.0",
+        "terser-webpack-plugin": "5.3.6",
        "textcomplete": "0.18.2",
        "textcomplete.contenteditable": "0.1.1",
        "timeago": "1.6.7",
        "tinycon": "0.6.8",
        "toobusy-js": "0.5.1",
-        "tough-cookie": "5.0.0",
-        "validator": "13.12.0",
-        "webpack": "5.96.1",
-        "webpack-merge": "6.0.1",
-        "winston": "3.16.0",
-        "workerpool": "9.2.0",
+        "validator": "13.7.0",
+        "webpack": "5.75.0",
+        "webpack-merge": "5.8.0",
+        "winston": "3.8.2",
        "xml": "1.0.1",
        "xregexp": "5.1.1",
-        "yargs": "17.7.2",
+        "yargs": "17.6.2",
        "zxcvbn": "4.4.2"
    },
    "devDependencies": {
-        "@apidevtools/swagger-parser": "10.1.0",
-        "@commitlint/cli": "19.5.0",
-        "@commitlint/config-angular": "19.5.0",
+        "@apidevtools/swagger-parser": "10.0.3",
+        "@commitlint/cli": "17.3.0",
+        "@commitlint/config-angular": "17.3.0",
        "coveralls": "3.1.1",
-        "eslint": "8.57.1",
+        "eslint": "8.30.0",
        "eslint-config-nodebb": "0.2.1",
-        "eslint-plugin-import": "2.31.0",
-        "grunt": "1.6.1",
+        "eslint-plugin-import": "2.26.0",
+        "grunt": "1.5.3",
        "grunt-contrib-watch": "1.1.0",
-        "husky": "8.0.3",
-        "jsdom": "25.0.1",
-        "lint-staged": "15.2.10",
-        "mocha": "10.8.2",
+        "husky": "8.0.2",
+        "jsdom": "20.0.3",
+        "lint-staged": "13.1.0",
+        "mocha": "10.2.0",
        "mocha-lcov-reporter": "1.3.0",
        "mockdate": "3.0.5",
-        "nyc": "17.1.0",
-        "smtp-server": "3.13.6"
+        "nyc": "15.1.0",
+        "smtp-server": "3.11.0"
    },
    "optionalDependencies": {
-        "sass-embedded": "1.80.6"
+        "sass-embedded": "1.55.0"
    },
    "resolutions": {
-        "*/jquery": "3.7.1"
+        "*/jquery": "3.6.3"
    },
    "bugs": {
        "url": "https://github.com/NodeBB/NodeBB/issues"
    },
    "engines": {
-        "node": ">=18"
+        "node": ">=12"
    },
    "maintainers": [
        {
@@ -198,4 +193,4 @@
            "url": "https://github.com/barisusakli"
        }
    ]
-}
+}
--- a/install/web.js
+++ b/install/web.js
@@ -11,7 +11,7 @@ const webpack = require('webpack');
 const nconf = require('nconf');

 const Benchpress = require('benchpressjs');
-const { mkdirp } = require('mkdirp');
+const mkdirp = require('mkdirp');
 const { paths } = require('../src/constants');
 const sass = require('../src/utils').getSass();

@@ -50,9 +50,6 @@ let installing = false;
 let success = false;
 let error = false;
 let launchUrl;
-let timeStart = 0;
-const totalTime = 1000 * 60 * 3;
-

 const viewsDir = path.join(paths.baseDir, 'build/public/templates');

@@ -105,32 +102,11 @@ function launchExpress(port) {
 function setupRoutes() {
 	app.get('/', welcome);
 	app.post('/', install);
-	app.get('/testdb', testDatabase);
+	app.post('/launch', launch);
 	app.get('/ping', ping);
 	app.get('/sping', ping);
 }

-async function testDatabase(req, res) {
-	let db;
-	try {
-		const keys = Object.keys(req.query);
-		const dbName = keys[0].split(':')[0];
-		db = require(`../src/database/${dbName}`);
-
-		const opts = {};
-		keys.forEach((key) => {
-			opts[key.replace(`${dbName}:`, '')] = req.query[key];
-		});
-
-		await db.init(opts);
-		const global = await db.getObject('global');
-		await db.close();
-		res.json({ success: 1, dbfull: !!global });
-	} catch (err) {
-		res.json({ error: err.stack });
-	}
-}
-
 function ping(req, res) {
 	res.status(200).send(req.path === '/sping' ? 'healthy' : '200');
 }
@@ -147,6 +123,7 @@ function welcome(req, res) {
 	});

 	const defaults = require('./data/defaults.json');
+
 	res.render('install/index', {
 		url: nconf.get('url') || (`${req.protocol}://${req.get('host')}`),
 		launchUrl: launchUrl,
@@ -159,7 +136,6 @@ function welcome(req, res) {
 		minimumPasswordLength: defaults.minimumPasswordLength,
 		minimumPasswordStrength: defaults.minimumPasswordStrength,
 		installing: installing,
-		percentInstalled: installing ? ((Date.now() - timeStart) / totalTime * 100).toFixed(2) : 0,
 	});
 }

@@ -167,15 +143,12 @@ function install(req, res) {
 	if (installing) {
 		return welcome(req, res);
 	}
-	timeStart = Date.now();
 	req.setTimeout(0);
 	installing = true;

 	const database = nconf.get('database') || req.body.database || 'mongo';
 	const setupEnvVars = {
 		...process.env,
-		CONFIG: nconf.get('config'),
-		NODEBB_CONFIG: nconf.get('config'),
 		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'],
@@ -197,22 +170,21 @@ function install(req, res) {
 	const child = require('child_process').fork('app', ['--setup'], {
 		env: setupEnvVars,
 	});
-	child.on('error', (err) => {
-		error = true;
-		success = false;
-		winston.error(err.stack);
-	});
+
 	child.on('close', (data) => {
+		installing = false;
 		success = data === 0;
 		error = data !== 0;
-		launch();
+
+		welcome(req, res);
 	});
-	welcome(req, res);
 }

-async function launch() {
+async function launch(req, res) {
 	try {
+		res.json({});
 		server.close();
+		req.setTimeout(0);
 		let child;

 		if (!nconf.get('launchCmd')) {
--- a/loader.js
+++ b/loader.js
@@ -6,7 +6,7 @@ const url = require('url');
 const path = require('path');
 const { fork } = require('child_process');
 const logrotate = require('logrotate-stream');
-const { mkdirp } = require('mkdirp');
+const mkdirp = require('mkdirp');

 const file = require('./src/file');
 const pkg = require('./package.json');
@@ -30,7 +30,9 @@ 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 = {};
+const Loader = {
+	timesStarted: 0,
+};
 const appPath = path.join(__dirname, 'app.js');

 Loader.init = function () {
@@ -55,6 +57,21 @@ Loader.displayStartupMessages = function () {

 Loader.addWorkerEvents = function (worker) {
 	worker.on('exit', (code, signal) => {
+		if (code !== 0) {
+			if (Loader.timesStarted < numProcs * 3) {
+				Loader.timesStarted += 1;
+				if (Loader.crashTimer) {
+					clearTimeout(Loader.crashTimer);
+				}
+				Loader.crashTimer = setTimeout(() => {
+					Loader.timesStarted = 0;
+				}, 10000);
+			} else {
+				console.log(`${numProcs * 3} restarts in 10 seconds, most likely an error on startup. Halting.`);
+				process.exit();
+			}
+		}
+
 		console.log(`[cluster] Child Process (${worker.pid}) has exited (code: ${code}, signal: ${signal})`);
 		if (!(worker.suicide || code === 0)) {
 			console.log('[cluster] Spinning up another process...');
@@ -99,9 +116,7 @@ Loader.start = function () {
 function forkWorker(index, isPrimary) {
 	const ports = getPorts();
 	const args = [];
-	if (nconf.get('max-memory')) {
-		args.push(`--max-old-space-size=${nconf.get('max-memory')}`);
-	}
+
 	if (!ports[index]) {
 		return console.log(`[cluster] invalid port for worker : ${index} ports: ${ports.length}`);
 	}
--- a/public/500.html
+++ b/public/500.html
@@ -1,41 +0,0 @@
-<html>
-<head>
-	<title>Internal Server Error</title>
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<link rel="stylesheet" type="text/css" href="/assets/5xx.css" />
-
-	<script type="text/javascript">
-	window.onload = function() {
-		let count = 0;
-		const bounce = document.getElementById('click-me');
-		bounce.onclick = function() {
-			count++;
-			bounce.className = '';
-			setTimeout(function() {
-				bounce.className = 'animated bounce';
-			}, 50);
-
-			if (count > 5) {
-				document.getElementById('hide').className = '';
-			}
-		};
-	}
-	</script>
-</head>
-<body>
-	<div class="wrapper">
-		<div class="center">
-			<h1 id="click-me" class="animated bounce">500</h1>
-			<p>
-				<strong>Internal server error. </strong>
-			</p>
-			<p>
-				{message}
-			</p>
-			<p>
-				&nbsp;<small id="hide" class="hide">Alright. You can stop clicking... it's not going to make the site come back sooner!</small>
-			</p>
-		</div>
-	</div>
-</body>
-</html>
--- a/public/503.html
+++ b/public/503.html
@@ -2,12 +2,148 @@
 <head>
 	<title>Excessive Load Warning</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<link rel="stylesheet" type="text/css" href="/assets/5xx.css" />
+	<style type="text/css">
+	body {
+		background: #00A9EA;
+		color: white;
+		/* see public/less/admin/vars.less for documentation on system font family */
+		font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+		text-align: center;
+		-webkit-transform-style: preserve-3d;
+		-moz-transform-style: preserve-3d;
+		transform-style: preserve-3d;
+	}

+	h1 {
+		font-size: 250px;
+		color: #fff;
+		opacity: 0.5;
+		margin: 10px;
+		cursor: pointer;
+		-moz-user-select: none;
+		-khtml-user-select: none;
+		-webkit-user-select: none;
+	}
+
+	p {
+		font-size: 20px;
+	}
+
+	p strong {
+		font-size: 28px;
+	}
+
+	@media (max-width: 640px) {
+		h1 {
+			font-size: 125px;
+		}
+
+		p {
+			font-size: 16px;
+		}
+
+		p strong {
+			font-size: 20px;
+		}
+	}
+
+	.center {
+		position: relative;
+		top: 50%;
+		-webkit-transform: translateY(50%);
+		-ms-transform: translateY(50%);
+		transform: translateY(50%);
+	}
+
+	@-webkit-keyframes bounce {
+		0%, 20%, 53%, 80%, 100% {
+			-webkit-transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+			transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+			-webkit-transform: translate3d(0,0,0);
+			transform: translate3d(0,0,0);
+		}
+
+		40%, 43% {
+			-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+			transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+			-webkit-transform: translate3d(0, -30px, 0);
+			transform: translate3d(0, -30px, 0);
+		}
+
+		70% {
+			-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+			transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+			-webkit-transform: translate3d(0, -15px, 0);
+			transform: translate3d(0, -15px, 0);
+		}
+
+		90% {
+			-webkit-transform: translate3d(0,-4px,0);
+			transform: translate3d(0,-4px,0);
+		}
+	}
+
+	@keyframes bounce {
+		0%, 20%, 53%, 80%, 100% {
+			-webkit-transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+			transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+			-webkit-transform: translate3d(0,0,0);
+			transform: translate3d(0,0,0);
+		}
+
+		40%, 43% {
+			-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+			transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+			-webkit-transform: translate3d(0, -30px, 0);
+			transform: translate3d(0, -30px, 0);
+		}
+
+		70% {
+			-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+			transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+			-webkit-transform: translate3d(0, -15px, 0);
+			transform: translate3d(0, -15px, 0);
+		}
+
+		90% {
+			-webkit-transform: translate3d(0,-4px,0);
+			transform: translate3d(0,-4px,0);
+		}
+	}
+
+	.bounce {
+		-webkit-animation-name: bounce;
+		animation-name: bounce;
+		-webkit-transform-origin: center bottom;
+		-ms-transform-origin: center bottom;
+		transform-origin: center bottom;
+	}
+
+	.animated {
+		-webkit-animation-duration: 1s;
+		animation-duration: 1s;
+		-webkit-animation-fill-mode: both;
+		animation-fill-mode: both;
+	}
+
+	.animated.infinite {
+		-webkit-animation-iteration-count: infinite;
+		animation-iteration-count: infinite;
+	}
+
+	.animated.hinge {
+		-webkit-animation-duration: 2s;
+		animation-duration: 2s;
+	}
+
+	.hide {
+		display: none;
+	}
+	</style>
 	<script type="text/javascript">
 	window.onload = function() {
-		let count = 0;
-		const bounce = document.getElementById('click-me');
+		var count = 0,
+			bounce = document.getElementById('click-me');
 		bounce.onclick = function() {
 			count++;
 			bounce.className = '';
--- a/public/5xx.css
+++ b/public/5xx.css
@@ -1,135 +0,0 @@
-body {
-	background: #00A9EA;
-	color: white;
-	font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-	text-align: center;
-	-webkit-transform-style: preserve-3d;
-	-moz-transform-style: preserve-3d;
-	transform-style: preserve-3d;
-}
-
-h1 {
-	font-size: 250px;
-	color: #fff;
-	opacity: 0.5;
-	margin: 10px;
-	cursor: pointer;
-	-moz-user-select: none;
-	-khtml-user-select: none;
-	-webkit-user-select: none;
-}
-
-p {
-	font-size: 20px;
-}
-
-p strong {
-	font-size: 28px;
-}
-
-@media (max-width: 640px) {
-	h1 {
-		font-size: 125px;
-	}
-
-	p {
-		font-size: 16px;
-	}
-
-	p strong {
-		font-size: 20px;
-	}
-}
-
-.center {
-	position: relative;
-	top: 50%;
-	-webkit-transform: translateY(50%);
-	-ms-transform: translateY(50%);
-	transform: translateY(50%);
-}
-
-@-webkit-keyframes bounce {
-	0%, 20%, 53%, 80%, 100% {
-		-webkit-transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
-		transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
-		-webkit-transform: translate3d(0,0,0);
-		transform: translate3d(0,0,0);
-	}
-
-	40%, 43% {
-		-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
-		transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
-		-webkit-transform: translate3d(0, -30px, 0);
-		transform: translate3d(0, -30px, 0);
-	}
-
-	70% {
-		-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
-		transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
-		-webkit-transform: translate3d(0, -15px, 0);
-		transform: translate3d(0, -15px, 0);
-	}
-
-	90% {
-		-webkit-transform: translate3d(0,-4px,0);
-		transform: translate3d(0,-4px,0);
-	}
-}
-
-@keyframes bounce {
-	0%, 20%, 53%, 80%, 100% {
-		-webkit-transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
-		transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
-		-webkit-transform: translate3d(0,0,0);
-		transform: translate3d(0,0,0);
-	}
-
-	40%, 43% {
-		-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
-		transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
-		-webkit-transform: translate3d(0, -30px, 0);
-		transform: translate3d(0, -30px, 0);
-	}
-
-	70% {
-		-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
-		transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
-		-webkit-transform: translate3d(0, -15px, 0);
-		transform: translate3d(0, -15px, 0);
-	}
-
-	90% {
-		-webkit-transform: translate3d(0,-4px,0);
-		transform: translate3d(0,-4px,0);
-	}
-}
-
-.bounce {
-	-webkit-animation-name: bounce;
-	animation-name: bounce;
-	-webkit-transform-origin: center bottom;
-	-ms-transform-origin: center bottom;
-	transform-origin: center bottom;
-}
-
-.animated {
-	-webkit-animation-duration: 1s;
-	animation-duration: 1s;
-	-webkit-animation-fill-mode: both;
-	animation-fill-mode: both;
-}
-
-.animated.infinite {
-	-webkit-animation-iteration-count: infinite;
-	animation-iteration-count: infinite;
-}
-
-.animated.hinge {
-	-webkit-animation-duration: 2s;
-	animation-duration: 2s;
-}
-
-.hide {
-	display: none;
-}
--- a/public/language/ar/admin/admin.json
+++ b/public/language/ar/admin/admin.json
@@ -6,13 +6,6 @@
 	"settings-header-contents": "محتويات",
 	"changes-saved": "Changes Saved",
 	"changes-saved-message": "Your changes to the NodeBB configuration have been saved.",
-	"changes-not-saved": "لم يتم حفظ التغييرات",
-	"changes-not-saved-message": "حدثت مشكلة أثناء حفظ التغييرات في NodeBB. (%1)",
-	"save-changes": "Save changes",
-	"min": "Min:",
-	"max": "Max:",
-	"view": "View",
-	"edit": "Edit",
-	"add": "Add",
-	"select-icon": "Select Icon"
+	"changes-not-saved": "Changes Not Saved",
+	"changes-not-saved-message": "NodeBB encountered a problem saving your changes. (%1)"
 }
--- a/public/language/ar/admin/advanced/cache.json
+++ b/public/language/ar/admin/advanced/cache.json
@@ -1,9 +1,8 @@
 {
-	"cache": "Cache",
 	"post-cache": "التخزين المؤقت للمشاركات",
-	"group-cache": "التخزين المؤقت للمجموعات",
-	"local-cache": "تخزين مؤقت محلي",
-	"object-cache": "تخزين مؤقت للأشياء",
+	"group-cache": "Group Cache",
+	"local-cache": "Local Cache",
+	"object-cache": "Object Cache",
 	"percent-full": "1% كاملة",
 	"post-cache-size": "حجم التخزين المؤقت للمشاركات",
 	"items-in-cache": "العناصر في التخزين المؤقت"
--- a/public/language/ar/admin/advanced/database.json
+++ b/public/language/ar/admin/advanced/database.json
@@ -1,52 +1,52 @@
 {
-	"x-b": "٪1 بايت",
-	"x-mb": "٪1 ميقا بايت",
-	"x-gb": "٪1 قيقا بايت",
-	"uptime-seconds": "مدة التشغيل بالثواني",
-	"uptime-days": "مدة التشغيل بالأيام",
+	"x-b": "%1 b",
+	"x-mb": "%1 mb",
+	"x-gb": "%1 gb",
+	"uptime-seconds": "Uptime in Seconds",
+	"uptime-days": "Uptime in Days",

-	"mongo": "MongoDB",
-	"mongo.version": "اصدار MongoDB",
-	"mongo.storage-engine": "محرك التخزين",
-	"mongo.collections": "التجميعات",
-	"mongo.objects": "العناصر",
-	"mongo.avg-object-size": "معدل حجم العناصر",
-	"mongo.data-size": "حجم البيانات",
-	"mongo.storage-size": "حجم التخرين",
-	"mongo.index-size": "حجم الفهرس",
-	"mongo.file-size": "حجم الملف",
-	"mongo.resident-memory": "الذاكرة الساكنة",
+	"mongo": "Mongo",
+	"mongo.version": "MongoDB Version",
+	"mongo.storage-engine": "Storage Engine",
+	"mongo.collections": "Collections",
+	"mongo.objects": "Objects",
+	"mongo.avg-object-size": "Avg. Object Size",
+	"mongo.data-size": "Data Size",
+	"mongo.storage-size": "Storage Size",
+	"mongo.index-size": "Index Size",
+	"mongo.file-size": "File Size",
+	"mongo.resident-memory": "Resident Memory",
 	"mongo.virtual-memory": "الذاكرة الإفتراضية",
 	"mongo.mapped-memory": "Mapped Memory",
-	"mongo.bytes-in": "البايتات الواردة",
-	"mongo.bytes-out": "البايتات الصادرة",
-	"mongo.num-requests": "عدد الطلبات",
-	"mongo.raw-info": "معلومات MongoDB الأولية",
-	"mongo.unauthorized": "لم يستطع NodeBB من الاستعلام عن احصاءات قواعد البيانات ل MongoDB. الرجاء التأكد من أن المستخدم في NodeBB يحتوي على دور &quot;clusterMonitor&quot; ال &quot;admin&quot; لقواعد البيانات.",
+	"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 &quot;clusterMonitor&quot; role for the &quot;admin&quot; database.",

 	"redis": "Redis",
-	"redis.version": "إصدار Redis",
-	"redis.keys": "المفاتيح",
-	"redis.expires": "ينتهي ",
-	"redis.avg-ttl": "متوسط وقت الانعاش",
-	"redis.connected-clients": "العميل المتصل",
-	"redis.connected-slaves": "البدلاء المتصلين",
-	"redis.blocked-clients": "العملاء المحظورون",
+	"redis.version": "Redis Version",
+	"redis.keys": "Keys",
+	"redis.expires": "Expires",
+	"redis.avg-ttl": "Average TTL",
+	"redis.connected-clients": "Connected Clients",
+	"redis.connected-slaves": "Connected Slaves",
+	"redis.blocked-clients": "Blocked Clients",
 	"redis.used-memory": "الذاكرة المستخدمة",
-	"redis.memory-frag-ratio": "نسبة تجزئة الذاكرة",
+	"redis.memory-frag-ratio": "Memory Fragmentation Ratio",
 	"redis.total-connections-recieved": "إجمالي الاتصالات المستلمة",
 	"redis.total-commands-processed": "إجمالي الأوامر التي تمت معالجتها",
-	"redis.iops": "العمليات اللحظية في الثانية",
-	"redis.iinput": "الإدخال الفوري في الثانية",
-	"redis.ioutput": "المخرجات الفورية في الثانية",
-	"redis.total-input": "مجموع المدخلات",
-	"redis.total-output": "مجموع المخرجات",
+	"redis.iops": "Instantaneous Ops. Per Second",
+	"redis.iinput": "Instantaneous Input Per Second",
+	"redis.ioutput": "Instantaneous Output Per Second",
+	"redis.total-input": "Total Input",
+	"redis.total-output": "Total Ouput",

-	"redis.keyspace-hits": "المفاتيح المضغوطة",
-	"redis.keyspace-misses": "المفاتيح المخفقة",
-	"redis.raw-info": "معلومات Redis الأولية",
+	"redis.keyspace-hits": "Keyspace Hits",
+	"redis.keyspace-misses": "Keyspace Misses",
+	"redis.raw-info": "Redis Raw Info",

 	"postgres": "Postgres",
-	"postgres.version": "إصدار PostgreSQL",
-	"postgres.raw-info": "معلومات Postgres الأولية"
+	"postgres.version": "PostgreSQL Version",
+	"postgres.raw-info": "Postgres Raw Info"
 }
--- a/public/language/ar/admin/advanced/errors.json
+++ b/public/language/ar/admin/advanced/errors.json
@@ -1,5 +1,4 @@
 {
-	"errors": "Errors",
 	"figure-x": "شكل %1",
 	"error-events-per-day": "<code>%1</code> حدث كل يوم ",
 	"error.404": "404 لم يتم العثور",
--- a/public/language/ar/admin/advanced/events.json
+++ b/public/language/ar/admin/advanced/events.json
@@ -3,15 +3,11 @@
 	"no-events": "لا توجد أحداث",
 	"control-panel": "لوحة تحكم الأحداث",
 	"delete-events": "حذف الاحداث",
-	"confirm-delete-all-events": "هل أنت متاكد أنك تريد حذف كل سجل اﻻحداث؟",
+	"confirm-delete-all-events": "Are you sure you want to delete all logged events?",
 	"filters": "تصفية",
 	"filters-apply": "تطبيق التصفية",
 	"filter-type": "نوع الحدث",
 	"filter-start": "تاريخ البدء",
 	"filter-end": "تاريخ الانتهاء",
-	"filter-user": "Filter by User",
-	"filter-user.placeholder": "Type user name to filter...",
-	"filter-group": "Filter by Group",
-	"filter-group.placeholder": "Type group name to filter...",
-	"filter-per-page": "لكل صفحة"
+	"filter-perPage": "لكل صفحة"
 }
--- a/public/language/ar/admin/appearance/customise.json
+++ b/public/language/ar/admin/appearance/customise.json
@@ -1,20 +1,16 @@
 {
-	"customise": "Customise",
-	"custom-css": "Custom CSS/SASS",
-	"custom-css.description": "Enter your own CSS/SASS declarations here, which will be applied after all other styles.",
-	"custom-css.enable": "Enable Custom CSS/SASS",
+	"custom-css": "Custom CSS/LESS",
+	"custom-css.description": "Enter your own CSS/LESS declarations here, which will be applied after all other styles.",
+	"custom-css.enable": "Enable Custom CSS/LESS",

 	"custom-js": "Javascript مخصصة",
 	"custom-js.description": "أدخل Javascript الخاص بك هنا. سيتم تنفيذها بعد تحميل الصفحة بالكامل.",
 	"custom-js.enable": "تفعيل Javascript المخصصة",

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

 	"custom-css.livereload": "تفعيل إعادة التحميل المباشرة",
-	"custom-css.livereload.description": "فعل هذا الخيار لإجبار جميع الجلسات في الأجهزة التي قمت بتسجيل الدخول فيها  بحسابك على التحديث عند النقر على زر الحفظ",
-	"bsvariables": "_variables.scss",
-	"bsvariables.description": "Override bootstrap variables here. You can also use a tool like <a href=\"https://bootstrap.build/app\">bootstrap.build</a> and paste the output here.<br/>Changes require a rebuild & restart.",
-	"bsvariables.enable": "Enable _variables.scss"
+	"custom-css.livereload.description": "فعل هذا الخيار لإجبار جميع الجلسات في الأجهزة التي قمت بتسجيل الدخول فيها  بحسابك على التحديث عند النقر على زر الحفظ"
 }
--- a/public/language/ar/admin/appearance/skins.json
+++ b/public/language/ar/admin/appearance/skins.json
@@ -1,16 +1,7 @@
 {
-	"skins": "Skins",
-	"bootswatch-skins": "Bootswatch Skins",
-	"custom-skins": "Custom Skins",
-	"add-skin": "Add Skin",
-	"save-custom-skins": "Save Custom Skins",
-	"save-custom-skins-success": "Custom skins saved successfully",
-	"custom-skin-name": "Custom Skin Name",
-	"custom-skin-variables": "Custom Skin Variables",
 	"loading": "جاري تحميل السمات...",
 	"homepage": "الصفحة الرئيسية",
 	"select-skin": "إختيار السمة",
-	"revert-skin": "Revert Skin",
 	"current-skin": "السمة الحالية",
 	"skin-updated": "تم تحديث السمة",
 	"applied-success": "تم تطبيق السمة %1 بنجاح",
--- a/public/language/ar/admin/appearance/themes.json
+++ b/public/language/ar/admin/appearance/themes.json
@@ -1,13 +1,11 @@
 {
-    "themes": "Themes",
    "checking-for-installed": "جاري التحقق من القوالب المثبتة...",
    "homepage": "الصفحة الرئيسية",
    "select-theme": "إختيار القالب",
-    "revert-theme": "Revert Theme",
    "current-theme": "القالب المستخدم حالياً",
    "no-themes": "لم يتم العثور على قوالب مثبتة",
    "revert-confirm": "هل أنت متأكد من أنك ترغب في استعادة قااب NodeBB الافتراضي؟",
    "theme-changed": "تم تغيير القالب",
    "revert-success": "لقد قمت بنجاح بإستعادة القالب الأساسي لـNodeBB",
-    "restart-to-activate": "يرجى إعادة بناء وإعادة تشغيل NodeBB لتنشيط هذا الثيم."
+    "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
 }
--- a/public/language/ar/admin/dashboard.json
+++ b/public/language/ar/admin/dashboard.json
@@ -1,9 +1,9 @@
 {
-	"forum-traffic": "حركة المنتدى",
+	"forum-traffic": "Forum Traffic",
 	"page-views": "مشاهدات الصفحات",
 	"unique-visitors": "زائرين فريدين",
-	"logins": "عمليات تسجيل الدخول",
-	"new-users": "مستخدم جديد",
+	"logins": "Logins",
+	"new-users": "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": "الأمس",
-	"stats.today": "اليوم",
-	"stats.last-week": "الاسبوع الماضي",
-	"stats.this-week": "هذا الاسبوع",
-	"stats.last-month": "الشهر الماضي",
-	"stats.this-month": "هذا الشهر",
+	"stats.yesterday": "Yesterday",
+	"stats.today": "Today",
+	"stats.last-week": "Last Week",
+	"stats.this-week": "This Week",
+	"stats.last-month": "Last Month",
+	"stats.this-month": "This Month",
 	"stats.all": "كل الوقت",

 	"updates": "تحديثات",
 	"running-version": "المنتدى يعمل حاليا على <strong>NodeBB الإصدار<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "تأكد دائما من أن NodeBB يعمل على احدث إصدار للحصول على أحدث التصحيحات الأمنية وإصلاحات الأخطاء.",
-	"up-to-date": "You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i>",
-	"upgrade-available": "A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">upgrading your NodeBB</a>.",
-	"prerelease-upgrade-available": "This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">upgrading your NodeBB</a>.",
-	"prerelease-warning": "This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i>",
-	"fallback-emailer-not-found": "مرسل البريد الإلكتروني الاحتياطي غير موجود!",
-	"running-in-development": "Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator",
-	"latest-lookup-failed": "Failed to look up latest available version of NodeBB",
+	"up-to-date": "<p>المنتدى <strong>يعمل على أحدث إصدار</strong> <i class=\"fa fa-check\"></i></p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">upgrading your NodeBB</a>.</p>",
+	"prerelease-warning": "<p>هذه نسخة <strong>ماقبل الإصدار</strong> من NodeBB. قد تحدث أخطاء غير مقصودة. <i class=\"fa fa-exclamation-triangle\"></i></p>",
+	"fallback-emailer-not-found": "Fallback emailer not found!",
+	"running-in-development": "المنتدى قيد التشغيل في وضع \"المطورين\". وقد تكون هناك ثغرات أمنية مفتوحة؛ من فضلك تواصل مع مسؤول نظامك.",
+	"latest-lookup-failed": "<p>Failed to look up latest available version of NodeBB</p>",

 	"notices": "إشعارات",
 	"restart-not-required": "إعادة التشغيل غير مطلوب",
@@ -42,23 +42,22 @@
 	"search-plugin-tooltip": "نصب إضافة البحث من صفحة الإضافات البرمجية لتنشيط وظيفة البحث",

 	"control-panel": "التحكم بالنظام",
-	"rebuild-and-restart": "أعد البناء &amp; وأعد التشغيل",
-	"restart": "أعد التشغيل",
-	"restart-warning": "ستؤدي إعادة بناء أو إعادة تشغيل NodeBB إلى إنقطاع الاتصال بالمنتدى لبضع ثوان.",
-	"restart-disabled": "تم تعطيل إعادة بناء NodeBB وإعادة تشغيله حيث لا يبدو أنك تقوم بتشغيله عبر البرنامج الخفي المناسب.",
+	"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",
-	"dark-mode": "Dark Mode",
 	"realtime-chart-updates": "التحديث الفوري للرسم البياني",

 	"active-users": "المستخدمين النشطين",
 	"active-users.users": "الأعضاء",
 	"active-users.guests": "الزوار",
 	"active-users.total": "المجموع",
-	"active-users.connections": "روابط الاتصال",
+	"active-users.connections": "Connections",

-	"guest-registered-users": "الزائر مقابل المستخدمين المسجلين",
-	"guest": "الزائر",
+	"guest-registered-users": "Guest vs Registered Users",
+	"guest": "Guest",
 	"registered": "مسجل",

 	"user-presence": "تواجد المستخدمين",
@@ -69,33 +68,23 @@
 	"unread": "غير مقروء",

 	"high-presence-topics": "مواضيع ذات حضور قوي",
-	"popular-searches": "عمليات البحث الشائعة",
+	"popular-searches": "Popular Searches",

 	"graphs.page-views": "مشاهدات الصفحة",
-	"graphs.page-views-registered": "زيارات الصفحات المسجلة",
-	"graphs.page-views-guest": "زيارات الصفحات للزوار",
-	"graphs.page-views-bot": "زيارات الصفحات الآلية",
+	"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.guest-users": "المستخدمين الزوار",
-	"last-restarted-by": "آخر إعادة تشغيل بواسطة",
-	"no-users-browsing": "لا يوجد مستخدمين يتصفحون",
+	"graphs.guest-users": "Guest Users",
+	"last-restarted-by": "Last restarted by",
+	"no-users-browsing": "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": "وقت تسجيل الدخول",
-	"start": "بدء",
-	"end": "إنهاء",
-	"filter": "تصفية",
-	"view-as-json": "View as JSON",
-	"expand-analytics": "Expand analytics",
-	"clear-search-history": "Clear Search History",
-	"clear-search-history-confirm": "Are you sure you want to clear entire search history?",
-	"search-term": "Term",
-	"search-count": "Count",
-	"view-all": "View all"
+	"back-to-dashboard": "Back to Dashboard",
+	"details.no-users": "No users have joined within the selected timeframe",
+	"details.no-topics": "No topics have been posted within the selected timeframe",
+	"details.no-searches": "No searches have been made yet",
+	"details.no-logins": "No logins have been recorded within the selected timeframe",
+	"details.logins-static": "NodeBB only saves session data for %1 days, and so this table below will only show the most recently active sessions",
+	"details.logins-login-time": "Login Time"
 }
--- a/public/language/ar/admin/development/info.json
+++ b/public/language/ar/admin/development/info.json
@@ -1,9 +1,9 @@
 {
-	"you-are-on": "أنت في <strong> %1:%2 </strong>",
-	"ip": "رقم الآي بي <strong> %1 </strong>",
-	"nodes-responded": "عدد %1 نقطة/نقاط استجابوا خلال %2 جزء من الثانية.",
-	"host": "المضيف",
-	"primary": "primary / jobs",
+	"you-are-on": "You are on <strong>%1:%2</strong>",
+	"ip": "IP <strong>%1</strong>",
+	"nodes-responded": "%1 nodes responded within %2ms!",
+	"host": "host",
+	"primary": "primary / run jobs",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "online",
@@ -19,7 +19,6 @@

 	"registered": "Registered",
 	"sockets": "Sockets",
-	"connection-count": "Connection Count",
 	"guests": "Guests",

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

-	"control-panel": "لوحة تحكم المسجل",
-	"update-settings": "تحديث إعدادات المسجل"
+	"control-panel": "Logger Control Panel",
+	"update-settings": "Update Logger Settings"
 }
--- a/public/language/ar/admin/extend/plugins.json
+++ b/public/language/ar/admin/extend/plugins.json
@@ -1,5 +1,4 @@
 {
-	"plugins": "Plugins",
 	"trending": "Trending",
 	"installed": "منصبة",
 	"active": "مفعلة",
--- a/public/language/ar/admin/extend/rewards.json
+++ b/public/language/ar/admin/extend/rewards.json
@@ -1,17 +1,15 @@
 {
-	"rewards": "المكافآت",
-	"add-reward": "Add reward",
-	"condition-if-users": "إذا كان للمستخدم",
-	"condition-is": "يكون: ",
-	"condition-then": "عندئذ:",
-	"max-claims": "عدد المرات التي يمكن فيها المطالبة بالمكافأة",
-	"zero-infinite": "أدخل 0 للقيمة اللانهائية",
-	"select-reward": "Select reward",
-	"delete": "احذف",
-	"enable": "مكّن",
-	"disable": "عطّل",
+	"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",

-	"alert.delete-success": "المكافآت المحذوفة بنجاح",
-	"alert.no-inputs-found": "مكافأة غير قانونية - لم يتم العثور على مدخلات!",
-	"alert.save-success": "المكافآت المحفوظة بنجاح"
+	"alert.delete-success": "Successfully deleted reward",
+	"alert.no-inputs-found": "Illegal reward - no inputs found!",
+	"alert.save-success": "Successfully saved rewards"
 }
--- a/public/language/ar/admin/extend/widgets.json
+++ b/public/language/ar/admin/extend/widgets.json
@@ -1,19 +1,16 @@
 {
-	"widgets": "Widgets",
 	"available": "Available Widgets",
 	"explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.",
 	"none-installed": "No widgets found! Activate the widget essentials plugin in the <a href=\"%1\">plugins</a> control panel.",
 	"clone-from": "Clone widgets from",
 	"containers.available": "Available Containers",
-	"containers.explanation": "Drag and drop on top of any widget",
+	"containers.explanation": "Drag and drop on top of any active widget",
 	"containers.none": "None",
 	"container.well": "Well",
 	"container.jumbotron": "Jumbotron",
-	"container.card": "Card",
-	"container.card-header": "Card Header",
-	"container.card-body": "Card Body",
-	"container.title": "Title",
-	"container.body": "Body",
+	"container.panel": "Panel",
+	"container.panel-header": "Panel Header",
+	"container.panel-body": "Panel Body",
 	"container.alert": "Alert",

 	"alert.confirm-delete": "Are you sure you wish to delete this widget?",
@@ -29,9 +26,5 @@
 	"container.placeholder": "Drag and drop a container or enter HTML here.",
 	"show-to-groups": "Show to groups",
 	"hide-from-groups": "Hide from groups",
-	"start-date": "Start date",
-	"end-date": "End date",
-	"hide-on-mobile": "Hide on mobile",
-	"hide-drafts": "Hide drafts",
-	"show-drafts": "Show drafts"
+	"hide-on-mobile": "Hide on mobile"
 }
--- a/public/language/ar/admin/manage/admins-mods.json
+++ b/public/language/ar/admin/manage/admins-mods.json
@@ -1,11 +1,10 @@
 {
-    "manage-admins-and-mods": "Manage Admins & Mods",
    "administrators": "Administrators",
    "global-moderators": "Global Moderators",
    "moderators": "Moderators",
    "no-global-moderators": "No Global Moderators",
    "no-sub-categories": "No subcategories",
-    "view-children": "View children (%1)",
+    "subcategories": "%1 subcategories",
    "no-moderators": "No Moderators",
    "add-administrator": "Add Administrator",
    "add-global-moderator": "Add Global Moderator",
--- a/public/language/ar/admin/manage/categories.json
+++ b/public/language/ar/admin/manage/categories.json
@@ -1,11 +1,7 @@
 {
-	"manage-categories": "Manage Categories",
-	"add-category": "Add category",
-	"jump-to": "Jump to...",
 	"settings": "اعدادات القسم",
-	"edit-category": "Edit Category",
 	"privileges": "الصلاحيات",
-	"back-to-categories": "Back to categories",
+
 	"name": "Category Name",
 	"description": "Category Description",
 	"bg-color": "Background Colour",
@@ -19,10 +15,8 @@
 	"post-queue": "Post queue",
 	"tag-whitelist": "Tag Whitelist",
 	"upload-image": "Upload Image",
-	"upload": "Upload",
 	"delete-image": "Remove",
 	"category-image": "Category Image",
-	"image-and-icon": "Image & Icon",
 	"parent-category": "Parent Category",
 	"optional-parent-category": "(Optional) Parent Category",
 	"top-level": "Top Level",
@@ -37,7 +31,6 @@
 	"disable": "Disable",
 	"edit": "Edit",
 	"analytics": "Analytics",
-
 	"view-category": "View category",
 	"set-order": "Set order",
 	"set-order-help": "Setting the order of the category will move this category to that order and update the order of other categories as necessary. Minimum order is 1 which puts the category at the top.",
--- a/public/language/ar/admin/manage/groups.json
+++ b/public/language/ar/admin/manage/groups.json
@@ -1,10 +1,4 @@
 {
-	"manage-groups": "Manage Groups",
-	"add-group": "Add group",
-	"edit-group": "Edit Group",
-	"back-to-groups": "Back to groups",
-	"view-group": "View group",
-	"icon-and-title": "Icon & Title",
 	"name": "اسم المجموعة",
 	"badge": "Badge",
 	"properties": "Properties",
@@ -16,7 +10,7 @@
 	"edit": "Edit",
 	"delete": "Delete",
 	"privileges": "Privileges",
-	"members-csv": "Members (CSV)",
+	"download-csv": "CSV",
 	"search-placeholder": "Search",
 	"create": "Create Group",
 	"description-placeholder": "A short description about your group",
@@ -45,5 +39,6 @@
 	"revert": "Revert",

 	"edit.no-users-found": "No Users Found",
-	"edit.confirm-remove-user": "Are you sure you want to remove this user?"
+	"edit.confirm-remove-user": "Are you sure you want to remove this user?",
+	"edit.save-success": "Changes saved!"
 }
--- a/public/language/ar/admin/manage/privileges.json
+++ b/public/language/ar/admin/manage/privileges.json
@@ -1,6 +1,4 @@
 {
-	"manage-privileges": "Manage Privileges",
-	"discard-changes": "Discard changes",
 	"global": "Global",
 	"admin": "Admin",
 	"group-privileges": "Group Privileges",
@@ -8,7 +6,6 @@
 	"edit-privileges": "Edit Privileges",
  	"select-clear-all": "Select/Clear All",
 	"chat": "Chat",
-	"chat-with-privileged": "Chat with Privileged",
 	"upload-images": "Upload Images",
 	"upload-files": "Upload Files",
 	"signature": "Signature",
@@ -34,7 +31,7 @@
 	"edit-posts": "Edit Posts",
 	"view-edit-history": "View Edit History",
 	"delete-posts": "Delete Posts",
-	"view-deleted": "View Deleted Posts",
+	"view_deleted": "View Deleted Posts",
 	"upvote-posts": "Upvote Posts",
 	"downvote-posts": "Downvote Posts",
 	"delete-topics": "Delete Topics",
@@ -52,6 +49,7 @@
 	"alert.confirm-moderate": "<strong>Are you sure you wish to grant the moderation privilege to this user group?</strong> This group is public, and any users can join at will.",
 	"alert.confirm-admins-mods": "<strong>Are you sure you wish to grant the &quot;Admins &amp; Mods&quot; privilege to this user/group?</strong> Users with this privilege are able to promote and demote other users into privileged positions, <em>including super administrator</em>",
 	"alert.confirm-save": "Please confirm your intention to save these privileges",
+	"alert.saved": "Privilege changes saved and applied",
 	"alert.confirm-discard": "Are you sure you wish to discard your privilege changes?",
 	"alert.discarded": "Privilege changes discarded",
 	"alert.confirm-copyToAll": "Are you sure you wish to apply this set of <strong>%1</strong> to <strong>all categories</strong>?",
--- a/public/language/ar/admin/manage/registration.json
+++ b/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": "اﻹسم",
-	"list.email": "البريد الإلكتروني",
+	"list.name": "Name",
+	"list.email": "Email",
 	"list.ip": "IP",
-	"list.time": "التوقيت",
+	"list.time": "Time",
 	"list.username-spam": "Frequency: %1 Appears: %2 Confidence: %3",
 	"list.email-spam": "Frequency: %1 Appears: %2",
 	"list.ip-spam": "Frequency: %1 Appears: %2",

-	"invitations": "الدعوات",
+	"invitations": "Invitations",
 	"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": "أسم المستخدم الداعي",
-	"invitations.invitee-email": "البريد اﻻلكتروني للمدعو",
-	"invitations.invitee-username": "اسم المستخم للمدعو (اذا كان مسجل)",
+	"invitations.inviter-username": "Inviter Username",
+	"invitations.invitee-email": "Invitee Email",
+	"invitations.invitee-username": "Invitee Username (if registered)",

-	"invitations.confirm-delete": "هل أنت متأكد من أنك تريد حذف هذه الدعوة؟"
+	"invitations.confirm-delete": "Are you sure you wish to delete this invitation?"
 } 
--- a/public/language/ar/admin/manage/tags.json
+++ b/public/language/ar/admin/manage/tags.json
@@ -1,11 +1,9 @@
 {
-	"manage-tags": "Manage Tags",
 	"none": "Your forum does not have any topics with tags yet.",
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
-	"add-tag": "Add tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
--- a/public/language/ar/admin/manage/uploads.json
+++ b/public/language/ar/admin/manage/uploads.json
@@ -1,5 +1,4 @@
 {
-    "manage-uploads": "Manage Uploads",
    "upload-file": "Upload File",
    "filename": "Filename",
    "usage": "Post Usage",
--- a/public/language/ar/admin/manage/users.json
+++ b/public/language/ar/admin/manage/users.json
@@ -1,29 +1,22 @@
 {
-	"manage-users": "Manage Users",
 	"users": "المستخدمين",
 	"edit": "Actions",
 	"make-admin": "Make Admin",
 	"remove-admin": "Remove Admin",
-	"change-email": "Change Email",
-	"new-email": "New Email",
 	"validate-email": "Validate Email",
 	"send-validation-email": "Send Validation Email",
-	"change-password": "Change Password",
 	"password-reset-email": "Send Password Reset Email",
 	"force-password-reset": "Force Password Reset & Log User Out",
-	"ban": "Ban",
-	"ban-users": "Ban User(s)",
+	"ban": "Ban User(s)",
 	"temp-ban": "Ban User(s) Temporarily",
 	"unban": "Unban User(s)",
 	"reset-lockout": "Reset Lockout",
 	"reset-flags": "Reset Flags",
-	"delete": "Delete",
-	"delete-users": "Delete <strong>User(s)</strong>",
+	"delete": "Delete <strong>User(s)</strong>",
 	"delete-content": "Delete User(s) <strong>Content</strong>",
 	"purge": "Delete <strong>User(s)</strong> and <strong>Content</strong>",
 	"download-csv": "Download CSV",
 	"manage-groups": "Manage Groups",
-	"set-reputation": "Set Reputation",
 	"add-group": "Add Group",
 	"create": "Create User",
 	"invite": "Invite by Email",
@@ -56,10 +49,6 @@
 	"users.username": "username",
 	"users.email": "email",
 	"users.no-email": "(no email)",
-	"users.validated": "Validated",
-	"users.not-validated": "Not Validated",
-	"users.validation-pending": "Validation Pending",
-	"users.validation-expired": "Validation Expired",
 	"users.ip": "IP",
 	"users.postcount": "postcount",
 	"users.reputation": "reputation",
@@ -86,7 +75,6 @@
 	"alerts.button-ban-x": "Ban %1 user(s)",
 	"alerts.unban-success": "User(s) unbanned!",
 	"alerts.lockout-reset-success": "Lockout(s) reset!",
-	"alerts.password-change-success": "Password(s) changed!",
 	"alerts.flag-reset-success": "Flags(s) reset!",
 	"alerts.no-remove-yourself-admin": "You can't remove yourself as Administrator!",
 	"alerts.make-admin-success": "User is now administrator.",
@@ -112,7 +100,6 @@
 	"alerts.create": "Create User",
 	"alerts.button-create": "Create",
 	"alerts.button-cancel": "Cancel",
-	"alerts.button-change": "Change",
 	"alerts.error-passwords-different": "Passwords must match!",
 	"alerts.error-x": "<strong>Error</strong><p>%1</p>",
 	"alerts.create-success": "User created!",
@@ -120,32 +107,6 @@
 	"alerts.prompt-email": "Emails: ",
 	"alerts.email-sent-to": "An invitation email has been sent to %1",
 	"alerts.x-users-found": "%1 user(s) found, (%2 seconds)",
-	"alerts.select-a-single-user-to-change-email": "Select a single user to change email",
-	"export": "Export",
-	"export-users-fields-title": "Select CSV Fields",
-	"export-field-email": "Email",
-	"export-field-username": "Username",
-	"export-field-uid": "UID",
-	"export-field-ip": "IP",
-	"export-field-joindate": "Join date",
-	"export-field-lastonline": "Last Online",
-	"export-field-lastposttime": "Last Post Time",
-	"export-field-reputation": "Reputation",
-	"export-field-postcount": "Post Count",
-	"export-field-topiccount": "Topic Count",
-	"export-field-profileviews": "Profile Views",
-	"export-field-followercount": "Follower Count",
-	"export-field-followingcount": "Following Count",
-	"export-field-fullname": "Full Name",
-	"export-field-website": "Website",
-	"export-field-location": "Location",
-	"export-field-birthday": "Birthday",
-	"export-field-signature": "Signature",
-	"export-field-aboutme": "About Me",
-
 	"export-users-started": "Exporting users as csv, this might take a while. You will receive a notification when it is complete.",
-	"export-users-completed": "Users exported as csv, click here to download.",
-	"email": "Email",
-	"password": "Password",
-	"manage": "Manage"
+	"export-users-completed": "Users exported as csv, click here to download."
 }
--- a/public/language/ar/admin/menu.json
+++ b/public/language/ar/admin/menu.json
@@ -14,7 +14,6 @@
 	"manage/users": "الأعضاء",
 	"manage/admins-mods": "Admins & Mods",
 	"manage/registration": "قائمة انتظار التسجيل",
-	"manage/flagged-content": "Flagged Content",
 	"manage/post-queue": "قائمة انتظار المشاركة",
 	"manage/groups": "المجموعات",
 	"manage/ip-blacklist": "قائمة حظر عناوين IP",
@@ -73,9 +72,7 @@
 	"development/info": "Info",

 	"rebuild-and-restart-forum": "Rebuild & Restart Forum",
-	"rebuild-and-restart": "Rebuild & Restart",
 	"restart-forum": "Restart Forum",
-	"restart": "Restart",
 	"logout": "Log out",
 	"view-forum": "View Forum",

--- a/public/language/ar/admin/settings/api.json
+++ b/public/language/ar/admin/settings/api.json
@@ -3,27 +3,14 @@
 	"settings": "Settings",
 	"lead-text": "From this page you can configure access to the Write API in NodeBB.",
 	"intro": "By default, the Write API authenticates users based on their session cookie, but NodeBB also supports Bearer authentication via tokens generated via this page.",
-	"warning": "<strong>Be advised</strong> — treat tokens like passwords. If they are leaked, your account should be considered compromised.",
 	"docs": "Click here to access the full API specification",

 	"require-https": "Require API usage via HTTPS only",
 	"require-https-caveat": "<strong>Note</strong>: Some installations involving load balancers may proxy their requests to NodeBB using HTTP, in which case this option should remain disabled.",

 	"uid": "User ID",
-	"token": "Token",
 	"uid-help-text": "Specify a User ID to associate with this token. If the user ID is <code>0</code>, it will be considered a <em>master</em> token, which can assume the identity of other users based on the <code>_uid</code> parameter",
 	"description": "Description",
-	"last-seen": "Last seen",
-	"created": "Created",
-	"create-token": "Create Token",
-	"update-token": "Update Token",
-	"master-token": "Master token",
-	"last-seen-never": "This key has never been used.",
 	"no-description": "No description specified.",
-	"actions": "Actions",
-	"edit": "Edit",
-	"roll": "Roll",
-
-	"delete-confirm": "Are you sure you wish to delete this token? It will not be recoverable.",
-	"roll-confirm": "Are you sure you wish to regenerate this token? The old token will be immediately revoked and will not be recoverable."
+	"token-on-save": "Token will be generated once form is saved"
 }
--- a/public/language/ar/admin/settings/chat.json
+++ b/public/language/ar/admin/settings/chat.json
@@ -1,15 +1,12 @@
 {
-	"zero-is-disabled": "Enter 0 to disable this restriction",
 	"chat-settings": "Chat Settings",
 	"disable": "Disable chat",
 	"disable-editing": "Disable chat message editing/deletion",
 	"disable-editing-help": "Administrators and global moderators are exempt from this restriction",
 	"max-length": "Maximum length of chat messages",
-	"max-chat-room-name-length": "Maximum length of chat room names",
 	"max-room-size": "Maximum number of users in chat rooms",
-	"delay": "Time between chat messages (ms)",
-	"notification-delay": "Notification delay for chat messages",
-	"notification-delay-help": "Additional messages sent between this time are collated, and the user is notified once per delay period. Set this to 0 to disable the delay.",
-	"restrictions.seconds-edit-after": "Number of seconds a chat message will remain editable.",
-	"restrictions.seconds-delete-after": "Number of seconds a chat message will remain deletable."
+	"delay": "Time between chat messages in milliseconds",
+	"notification-delay": "Notification delay for chat messages. (0 for no delay)",
+	"restrictions.seconds-edit-after": "Number of seconds a chat message will remain editable. (0 disabled)",
+	"restrictions.seconds-delete-after": "Number of seconds a chat message will remain deletable. (0 disabled)"
 }
--- a/public/language/ar/admin/settings/email.json
+++ b/public/language/ar/admin/settings/email.json
@@ -42,7 +42,7 @@
 	"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>",
 	"notifications.remove-images": "Remove images from email notifications",
 	"require-email-address": "Require new users to specify an email address",
-	"require-email-address-warning": "By default, users can opt-out of entering an email address by leaving the field blank. Enabling this option means new users will have to enter <strong>and confirm</strong> an email address in order to proceed with registration and subsequent access to the forum. <strong>It does not ensure user will enter a real email address, nor even an address they own.</strong>",
+	"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.",
--- a/public/language/ar/admin/settings/general.json
+++ b/public/language/ar/admin/settings/general.json
@@ -1,13 +1,11 @@
 {
-	"general-settings": "General Settings",
-	"on-this-page": "On this page:",
 	"site-settings": "اعدادات الموقع",
 	"title": "عنوان الموقع",
 	"title.short": "عنوان قصير",
 	"title.short-placeholder": "ان لم تقم بكتابة عنوان مختصر, سيتم استخدام عنوان الموقع الكلي",
 	"title.url": "Title Link URL",
 	"title.url-placeholder": "The URL of the site title",
-	"title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index. Note: This is not the external URL used in emails, etc. That is set by the <code>url</code> property in config.json",
+	"title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index. <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": "عنوان المتصفح",
@@ -18,7 +16,7 @@
 	"description": "وصف الموقع",
 	"keywords": "الكلمات الدليله للموقع",
 	"keywords-placeholder": "Keywords describing your community, comma-separated",
-	"logo-and-icons": "Site Logo & Icons",
+	"logo": "شعار الموقع",
 	"logo.image": "صورة",
 	"logo.image-placeholder": "Path to a logo to display on forum header",
 	"logo.upload": "رفع",
--- a/public/language/ar/admin/settings/guest.json
+++ b/public/language/ar/admin/settings/guest.json
@@ -1,6 +1,5 @@
 {
 	"settings": "Settings",
-	"guest-settings": "Guest Settings",
 	"handles.enabled": "Allow guest handles",
 	"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
 	"topic-views.enabled": "Allow guests to increase topic view counts",
--- a/public/language/ar/admin/settings/navigation.json
+++ b/public/language/ar/admin/settings/navigation.json
@@ -1,5 +1,4 @@
 {
-	"navigation": "Navigation",
 	"icon": "Icon:",
 	"change-icon": "change",
 	"route": "Route:",
@@ -10,10 +9,10 @@
 	"id": "ID: <small>optional</small>",

 	"properties": "Properties:",
-	"show-to-groups": "Show to Groups:",
+	"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;",
+	"dropdown-placeholder": "Place your dropdown menu items below, ie: <br/>&lt;li&gt;&lt;a href&#x3D;&quot;https://myforum.com&quot;&gt;Link 1&lt;/a&gt;&lt;/li&gt;",

 	"btn.delete": "Delete",
 	"btn.disable": "Disable",
--- a/public/language/ar/admin/settings/post.json
+++ b/public/language/ar/admin/settings/post.json
@@ -1,18 +1,15 @@
 {
-	"general": "General",
 	"sorting": "Post Sorting",
 	"sorting.post-default": "Default Post Sorting",
 	"sorting.oldest-to-newest": "Oldest to Newest",
 	"sorting.newest-to-oldest": "Newest to Oldest",
-	"sorting.recently-replied": "Recently Replied",
-	"sorting.recently-created": "Recently Created",
 	"sorting.most-votes": "Most Votes",
 	"sorting.most-posts": "Most Posts",
-	"sorting.most-views": "Most Views",
 	"sorting.topic-default": "Default Topic Sorting",
 	"length": "Post Length",
 	"post-queue": "Post Queue",
 	"restrictions": "Posting Restrictions",
+	"restrictions-new": "New User Restrictions",
 	"restrictions.post-queue": "Enable post queue",
 	"restrictions.post-queue-rep-threshold": "Reputation required to bypass post queue",
 	"restrictions.groups-exempt-from-post-queue": "Select groups that should be exempt from the post queue",
@@ -20,13 +17,18 @@
 	"restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval",
 	"restrictions-new.post-queue-help": "Enabling new user restrictions will set restrictions on posts created by new users",
 	"restrictions.seconds-between": "Number of seconds between posts",
+	"restrictions.seconds-between-new": "Seconds between posts for new users",
+	"restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted",
+	"restrictions.seconds-before-new": "Seconds before a new user can make their first post",
 	"restrictions.seconds-edit-after": "Number of seconds a post remains editable (set to 0 to disable)",
 	"restrictions.seconds-delete-after": "Number of seconds a post remains deletable (set to 0 to disable)",
 	"restrictions.replies-no-delete": "Number of replies after users are disallowed to delete their own topics (set to 0 to disable)",
-	"restrictions.title-length": "Title Length",
-	"restrictions.post-length": "Post Length",
+	"restrictions.min-title-length": "Minimum Title Length",
+	"restrictions.max-title-length": "Maximum Title Length",
+	"restrictions.min-post-length": "Minimum Post Length",
+	"restrictions.max-post-length": "Maximum Post Length",
 	"restrictions.days-until-stale": "Days until topic is considered stale",
-	"restrictions.stale-help": "If a topic is considered \"stale\", then a warning will be shown to users who attempt to reply to that topic. (set to 0 to disable)",
+	"restrictions.stale-help": "If a topic is considered \"stale\", then a warning will be shown to users who attempt to reply to that topic.",
 	"timestamp": "Timestamp",
 	"timestamp.cut-off": "Date cut-off (in days)",
 	"timestamp.cut-off-help": "Dates &amp; times will be shown in a relative manner (e.g. \"3 hours ago\" / \"5 days ago\"), and localised into various\n\t\t\t\t\tlanguages. After a certain point, this text can be switched to display the localised date itself\n\t\t\t\t\t(e.g. 5 Nov 2016 15:30).<br /><em>(Default: <code>30</code>, or one month). Set to 0 to always display dates, leave blank to always display relative times.</em>",
@@ -39,9 +41,10 @@
 	"teaser.last-reply": "Last &ndash; 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-and-recent": "Unread & Recent Settings",
+	"unread": "Unread Settings",
 	"unread.cutoff": "Unread cutoff days",
 	"unread.min-track-last": "Minimum posts in topic before tracking last read",
+	"recent": "Recent Settings",
 	"recent.max-topics": "Maximum topics on /recent",
 	"recent.categoryFilter.disable": "Disable filtering of topics in ignored categories on the /recent page",
 	"signature": "Signature Settings",
--- a/public/language/ar/admin/settings/reputation.json
+++ b/public/language/ar/admin/settings/reputation.json
@@ -2,14 +2,7 @@
 	"reputation": "Reputation Settings",
 	"disable": "Disable Reputation System",
 	"disable-down-voting": "Disable Down Voting",
-	"upvote-visibility": "Up Vote visibility",
-	"upvote-visibility-all": "Everyone can see up votes",
-	"upvote-visibility-loggedin": "Only logged in users can see up votes",
-	"upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes",
-	"downvote-visibility": "Down Vote visibility",
-	"downvote-visibility-all": "Everyone can see down votes",
-	"downvote-visibility-loggedin": "Only logged in users can see down votes",
-	"downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes",
+	"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)",
@@ -18,7 +11,6 @@
 	"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-post-links": "Minimum reputation to post links",
 	"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",
@@ -30,15 +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 &quot;report&quot; 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.limit-post-flags-per-day": "Maximum number of times a user can flag posts in a day",
-	"flags.limit-post-flags-per-day-help": "Set to 0 to disable, (default: 10)",
-	"flags.limit-user-flags-per-day": "Maximum number of times a user can flag users in a day",
-	"flags.limit-user-flags-per-day-help": "Set to 0 to disable, (default: 10)",
-  	"flags.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts",
-	"flags.auto-flag-on-downvote-threshold-help": "Set to 0 to disable, (default: 0)",
+  	"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 sent to moderators/administrators"
+	"flags.action.rescind": "Rescind the notification send to moderators/administrators"
 }
--- a/public/language/ar/admin/settings/social.json
+++ b/public/language/ar/admin/settings/social.json
@@ -1,4 +1,5 @@
 {
 	"post-sharing": "Post Sharing",
-	"info-plugins-additional": "Plugins can add additional networks for sharing posts."
+	"info-plugins-additional": "Plugins can add additional networks for sharing posts.",
+	"save-success": "Successfully saved Post Sharing Networks!"
 }
--- a/public/language/ar/admin/settings/tags.json
+++ b/public/language/ar/admin/settings/tags.json
@@ -3,7 +3,6 @@
    "link-to-manage": "Manage Tags",
    "system-tags": "System Tags",
    "system-tags-help": "Only privileged users will be able to use these tags.",
-    "tags-per-topic": "Tags per topic",
    "min-per-topic": "Minimum Tags per Topic",
    "max-per-topic": "Maximum Tags per Topic",
    "min-length": "Minimum Tag Length",
--- a/public/language/ar/admin/settings/user.json
+++ b/public/language/ar/admin/settings/user.json
@@ -6,8 +6,8 @@
 	"allow-login-with.username-email": "اسم المستخدم أو البريد الالكتروني",
 	"allow-login-with.username": "اسم المستخدم فقط",
 	"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.",
+	"gdpr_enabled": "Enable GDPR consent collection",
+	"gdpr_enabled_help": "When enabled, all new registrants will be required to explicitly give consent for data collection and usage under the <a href=\"https://ec.europa.eu/info/priorities/justice-and-fundamental-rights/data-protection/2018-reform-eu-data-protection-rules/eu-data-protection-rules_en\">General Data Protection Regulation (GDPR)</a>. <strong>Note</strong>: Enabling GDPR does not force pre-existing users to provide consent. To do so, you will need to install the GDPR plugin.",
 	"disable-username-changes": "عدم السماح بتغيير اسم المستخدم",
 	"disable-email-changes": "عدم السماح بتغيير البريد الالكتروني",
 	"disable-password-changes": "عدم السماح بتغيير كلمة المرور",
@@ -29,8 +29,6 @@
 	"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": "تسجيل المستخدم",
@@ -59,7 +57,7 @@
 	"max-about-me-length": "الحد الأعلى من الأحرف في حقل \"عني\"",
 	"terms-of-use": "شروط استخدام المنتدى <small>(تترك فارغة لتعطيلها)</small>",
 	"user-search": "بحث الأعضاء",
-	"user-search-results-per-page": "Number of users to display in search results",
+	"user-search-results-per-page": "عدد النتائج المراد عرضها",
 	"default-user-settings": "إعدادات الأعضاء الافتراضية",
 	"show-email": "عرض البريد الإلكتروني",
 	"show-fullname": "عرض الاسم الكامل",
@@ -79,14 +77,7 @@
 	"follow-replied-topics": "Follow topics that you reply to",
 	"default-notification-settings": "Default notification settings",
 	"categoryWatchState": "Default category watch state",
-	"categoryWatchState.tracking": "Tracking",
+	"categoryWatchState.watching": "Watching",
 	"categoryWatchState.notwatching": "Not Watching",
-	"categoryWatchState.ignoring": "Ignoring",
-	"restrictions-new": "New User Restrictions",
-	"restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted",
-	"restrictions.seconds-between-new": "Seconds between posts for new users",
-	"restrictions.seconds-before-new": "Seconds before a new user can make their first post",
-	"restrictions.seconds-edit-after-new": "Number of seconds a post remains editable for new users (set to 0 to disable)",
-	"restrictions.milliseconds-between-messages": "Time between chat messages for new users (ms)",
-	"restrictions.groups-exempt-from-new-user-restrictions": "Select groups that should be exempt from the new user restrictions"
+	"categoryWatchState.ignoring": "Ignoring"
 }
--- a/public/language/ar/aria.json
+++ b/public/language/ar/aria.json
@@ -1,8 +0,0 @@
-{
-	"post-sort-option": "Post sort option, %1",
-	"topic-sort-option": "Topic sort option, %1",
-	"user-avatar-for": "User avatar for %1",
-	"user-watched-tags": "User watched tags",
-	"delete-upload-button": "Delete upload button",
-	"group-page-link-for": "Group page link for %1"
-}
--- a/public/language/ar/category.json
+++ b/public/language/ar/category.json
@@ -1,24 +1,21 @@
 {
    "category": "قسم",
    "subcategories": "قسم فرعي",
-    "new-topic-button": "موضوع جديد",
+    "new_topic_button": "موضوع جديد",
    "guest-login-post": "سجل الدخول للمشاركة",
-    "no-topics": "<strong>لا توجد مواضيع في هذه القسم</strong>لم لا تحاول إنشاء موضوع؟<br />",
+    "no_topics": "<strong>لا توجد مواضيع في هذه القسم</strong>لم لا تحاول إنشاء موضوع؟<br />",
    "browsing": "تصفح",
-    "no-replies": "لم يرد أحد",
-    "no-new-posts": "لا توجد مشاركات جديدة.",
+    "no_replies": "لم يرد أحد",
+    "no_new_posts": "لا توجد مشاركات جديدة.",
    "watch": "تابع",
    "ignore": "تجاهل",
    "watching": "متابع",
-    "tracking": "Tracking",
    "not-watching": "لست متابع",
    "ignoring": "متجاهل",
-    "watching.description": "Notify me of new topics.<br/>Show topics in unread & recent",
-    "tracking.description": "Shows topics in unread & recent",
+    "watching.description": "أظهر المواضيع في الغير مقروء و الحديث",
    "not-watching.description": "Do not show topics in unread, show in recent",
-    "ignoring.description": "Do not show topics in unread & recent",
+    "ignoring.description": "Do not show topics in unread and recent",
    "watching.message": "You are now watching updates from this category and all subcategories",
-    "tracking.message": "You are now tracking updates from this category and all subcategories",
    "notwatching.message": "You are not watching updates from this category and all subcategories",
    "ignoring.message": "You are now ignoring updates from this category and all subcategories",
    "watched-categories": "الأقسام المُتابعة",
--- a/public/language/ar/email.json
+++ b/public/language/ar/email.json
@@ -3,8 +3,8 @@
    "password-reset-requested": "Password Reset Requested!",
    "welcome-to": "مرحبًا بك في %1",
    "invite": "دعوة من %1",
-    "greeting-no-name": "مرحبًا",
-    "greeting-with-name": "مرحبًا بك يا %1",
+    "greeting_no_name": "مرحبًا",
+    "greeting_with_name": "مرحبًا بك يا %1",
    "email.verify-your-email.subject": "Please verify your email",
    "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>",
@@ -22,9 +22,7 @@
    "reset.notify.subject": "تم تغيير كلمة المرور بنجاح",
    "reset.notify.text1": "نحيطك علما أن كلمة مرورك قد تم تغييرها في %1",
    "reset.notify.text2": "إن لم يكن لديك علم بهذا، المرجو إشعار مدبر النظام بأسرع مايمكن.",
-    "digest.unread-rooms": "Unread rooms",
-    "digest.room-name-unreadcount": "%1 (%2 unread)",
-    "digest.latest-topics": "آخر المستجدات من %1",
+    "digest.latest_topics": "آخر المستجدات من %1",
    "digest.top-topics": "Top topics from %1",
    "digest.popular-topics": "Popular topics from %1",
    "digest.cta": "انقر هنا لمشاهدة %1",
@@ -36,8 +34,7 @@
    "digest.title.day": "Your Daily Digest",
    "digest.title.week": "Your Weekly Digest",
    "digest.title.month": "Your Monthly Digest",
-    "notif.chat.new-message-from-user": "New message from \"%1\"",
-    "notif.chat.new-message-from-user-in-room": "New message from %1 in room %2",
+    "notif.chat.subject": "هناك محادثة جديدة من %1",
    "notif.chat.cta": "انقر هنا لمتابعة المحادثة",
    "notif.chat.unsub.info": "تم إرسال هذا الإشعار بوجودة محادثة جديدة وفقا لخيارات تسجيلك.",
    "notif.post.unsub.info": "تم إشعارك بهذه المشاركة بناءً على الخيارات التي سبق وأن حددتها.",
--- a/public/language/ar/error.json
+++ b/public/language/ar/error.json
@@ -32,7 +32,7 @@
    "folder-exists": "Folder exists",
    "invalid-pagination-value": "رقم الصفحة غير صحيح ، يجب أن يكون بين %1 و %2 .",
    "username-taken": "اسم المستخدم مأخوذ",
-    "email-taken": "Email address is already 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": "Posting in some categories or topics is enabled once your email is confirmed, please click here to send a confirmation email.",
@@ -42,21 +42,19 @@
    "user-doesnt-have-email": "User \"%1\" does not have an email set.",
    "email-confirm-failed": "لم نستطع تفعيل بريدك الإلكتروني، المرجو المحاولة لاحقًا.",
    "confirm-email-already-sent": "لقد تم ارسال بريد التأكيد، الرجاء اﻹنتظار 1% دقائق لإعادة اﻹرسال",
-    "confirm-email-expired": "Confirmation email expired",
    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
    "digest-not-enabled": "This user does not have digests enabled, or the system default is not configured to send digests",
    "username-too-short": "اسم المستخدم قصير.",
    "username-too-long": "اسم المستخدم طويل",
-    "password-too-long": "كلمة السر طويلة",
+    "password-too-long": "كلمة السر طويلة ",
    "reset-rate-limited": "Too many password reset requests (rate limited)",
    "reset-same-password": "Please use a password that is different from your current one",
    "user-banned": "المستخدم محظور",
    "user-banned-reason": "Sorry, this account has been banned (Reason: %1)",
    "user-banned-reason-until": "Sorry, this account has been banned until %1 (Reason: %2)",
    "user-too-new": "عذرا, يجب أن تنتظر 1% ثواني قبل قيامك بأول مشاركة",
-    "blacklisted-ip": "نأسف، لقد تم حظرك من استخدام وتصفح المنتدى. إذا كنت تعتقد أن هذا خطأ رجاءًا اتصل بالإدارة.",
-    "cant-blacklist-self-ip": "You can't blacklist your own IP",
-    "ban-expiry-missing": "رجاءًا ضع تاريخ نهاية الحظر.",
+    "blacklisted-ip": "نأسف، لقد تم حظرك من استخدام وتصفح المنتدى. إذا كنت تعتقد أن هذا خطأ رجاءًا اتصل بالإدارة. ",
+    "ban-expiry-missing": "رجاءًا ضع تاريخ نهاية الحظر. ",
    "no-category": "قائمة غير موجودة",
    "no-topic": "موضوع غير موجود",
    "no-post": "رد غير موجود",
@@ -64,7 +62,6 @@
    "no-user": "اسم مستخدم غير موجود",
    "no-teaser": "مقتطف غير موجود",
    "no-flag": "Flag does not exist",
-    "no-chat-room": "Chat room does not exist",
    "no-privileges": "لاتملك الصلاحيات اللازمة للقيام بهذه العملية",
    "category-disabled": "قائمة معطلة",
    "topic-locked": "الموضوع مقفول",
@@ -91,11 +88,8 @@
    "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",
-    "too-many-posts-newbie-minutes": "As a new user, you can only post once every %1 minute(s) until you have earned %2 reputation - please wait before posting again",
-    "already-posting": "You are already posting",
    "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",
    "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 character(s)",
-    "tag-not-allowed": "Tag not allowed",
    "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
    "too-many-tags": "Too many tags. Topics can't have more than %1 tag(s)",
    "cant-use-system-tag": "You can not use this system tag.",
@@ -105,7 +99,6 @@
    "guest-upload-disabled": "خاصية رفع الملفات غير مفعلة للزوار.",
    "cors-error": "Unable to upload image due to misconfigured CORS",
    "upload-ratelimit-reached": "You have uploaded too many files at one time. Please try again later.",
-    "upload-error-fallback": "Unable to upload image — %1",
    "scheduling-to-past": "Please select a date in the future.",
    "invalid-schedule-date": "Please enter a valid date and time.",
    "cant-pin-scheduled": "Scheduled topics cannot be (un)pinned.",
@@ -121,7 +114,7 @@
    "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": "رجاءًا أزل صلاحيات الإدارة قبل حذف الحساب.",
+    "cant-delete-admin": "رجاءًا أزل صلاحيات الإدارة قبل حذف الحساب. ",
    "already-deleting": "Already deleting",
    "invalid-image": "Invalid image",
    "invalid-image-type": "نوع الصورة غير مدعوم. الأنواع المدعومة هي :  %1",
@@ -139,8 +132,6 @@
    "group-already-requested": "سبق وتم تسجيل طلب العضوية",
    "group-join-disabled": "You are not able to join this group at this time",
    "group-leave-disabled": "You are not able to leave this group at this time",
-    "group-user-not-pending": "User does not have a pending request to join this group.",
-    "gorup-user-not-invited": "User has not been invited to join this group.",
    "post-already-deleted": "سبق وتم حذف هذا الرد",
    "post-already-restored": "سبق وتم إلغاء حذف هذا الرد",
    "topic-already-deleted": "سبق وتم حذف هذا الموضوع",
@@ -150,10 +141,9 @@
    "invalid-file": "ملف غير مقبول",
    "uploads-are-disabled": "رفع الملفات غير مفعل",
    "signature-too-long": "عذرا، توقيعك يجب ألا يتجاوز %1 حرفًا.",
-    "about-me-too-long": "نأسف، ( عني ) لا يمكن أن يكون أكثر من %1 حرف.",
+    "about-me-too-long": "نأسف، ( عني ) لا يمكن أن يكون أكثر من %1 حرف. ",
    "cant-chat-with-yourself": "لايمكنك فتح محادثة مع نفسك",
    "chat-restricted": "هذا المستخدم عطل المحادثات الواردة عليه. يجب أن يتبعك حتى تتمكن من فتح محادثة معه.",
-    "chat-user-blocked": "You have been blocked by this user.",
    "chat-disabled": "نظام المحادثة معطل.",
    "too-many-messages": "لقد أرسلت الكثير من الرسائل، الرجاء اﻹنتظار قليلاً",
    "invalid-chat-message": "الرسالة غير صالحة.",
@@ -165,16 +155,12 @@
    "chat-deleted-already": "This chat message has already been deleted.",
    "chat-restored-already": "This chat message has already been restored.",
    "chat-room-does-not-exist": "Chat room does not exist.",
-    "cant-add-users-to-chat-room": "Can't add users to chat room.",
-    "cant-remove-users-from-chat-room": "Can't remove users from chat room.",
-    "chat-room-name-too-long": "Chat room name too long. Names can't be longer than %1 characters.",
    "already-voting-for-this-post": "لقد شاركت بالتصويت ، ألا تذكر؟",
    "reputation-system-disabled": "نظام السمعة معطل",
    "downvoting-disabled": "التصويتات السلبية معطلة",
    "not-enough-reputation-to-chat": "You need %1 reputation to chat",
    "not-enough-reputation-to-upvote": "You need %1 reputation to upvote",
    "not-enough-reputation-to-downvote": "You need %1 reputation to downvote",
-    "not-enough-reputation-to-post-links": "You need %1 reputation to post links",
    "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",
@@ -185,10 +171,7 @@
    "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",
-    "too-many-post-flags-per-day": "You can only flag %1 post(s) per day",
-    "too-many-user-flags-per-day": "You can only flag %1 user(s) per day",
    "cant-flag-privileged": "You are not allowed to flag the profiles or content of privileged users (moderators/global moderators/admins)",
-    "cant-locate-flag-report": "Cannot locate flag report",
    "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",
@@ -206,7 +189,6 @@
    "not-in-room": "المستخدم غير موجود في الغرفة.",
    "cant-kick-self": "لا يمكنك طرد نفسك من المجموعة.",
    "no-users-selected": "لا يوجد مستخدم محدد.",
-    "no-groups-selected": "No group(s) selected",
    "invalid-home-page-route": "Invalid home page route",
    "invalid-session": "Invalid Session",
    "invalid-session-text": "It looks like your login session is no longer active. Please refresh this page.",
@@ -222,7 +204,6 @@
    "already-unblocked": "This user is already unblocked",
    "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",
-    "invalid-plugin-id": "Invalid plugin ID",
    "plugin-not-whitelisted": "Unable to install plugin &ndash; 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",
@@ -238,6 +219,5 @@
    "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.reauth-required": "The resource you are trying to access requires (re-)authentication."
+    "api.503": "The route you are trying to call is not currently available due to a server configuration"
 }
--- a/public/language/ar/flags.json
+++ b/public/language/ar/flags.json
@@ -1,32 +1,27 @@
 {
 	"state": "الحالة",
-	"report": "Report",
 	"reports": "Reports",
 	"first-reported": "First Reported",
 	"no-flags": "Hooray! No flags found.",
-	"x-flags-found": "%1 flag(s) found.",
 	"assignee": "المحال إليه",
 	"update": "تحديث",
 	"updated": "تم التحديث",
 	"resolved": "Resolved",
-	"report-added": "Added",
-	"report-rescinded": "Rescinded",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
-	"target-aboutme-empty": "This user has no &quot;About Me&quot; 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",
-	"filter-targetUid": "Reportee",
+	"filter-reporterId": "Reporter UID",
+	"filter-targetUid": "Flagged UID",
 	"filter-type": "عنوان العلامة",
 	"filter-type-all": "كل المحتوي",
 	"filter-type-post": "مشاركة",
 	"filter-type-user": "مستخدم",
 	"filter-state": "الحالة",
-	"filter-assignee": "Assignee",
+	"filter-assignee": "Assignee UID",
 	"filter-cid": "Category",
 	"filter-quick-mine": "Assigned to me",
 	"filter-cid-all": "All categories",
@@ -50,7 +45,6 @@

 	"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?",
@@ -90,6 +84,6 @@
 	"bulk-actions": "Bulk Actions",
 	"bulk-resolve": "Resolve Flag(s)",
 	"bulk-success": "%1 flags updated",
-	"flagged-timeago": "Flagged <span class=\"timeago\" title=\"%1\"></span>",
+	"flagged-timeago-readable": "Flagged <span class=\"timeago\" title=\"%1\"></span> (%2)",
  	"auto-flagged": "[Auto Flagged] Received %1 downvotes."
 }
--- a/public/language/ar/global.json
+++ b/public/language/ar/global.json
@@ -4,35 +4,26 @@
    "buttons.close": "أغلق",
    "403.title": "غير مسموح بالدخول",
    "403.message": "يبدو أنك قد تعثرت على صفحة لا تمتلك الصلاحية للدخول إليها",
-    "403.login": "Perhaps you should <a class=\"alert-link\" href='%1/login'>try logging in</a>?",
+    "403.login": "ربما يجب عليك  <a href='%1/login'>تسجل دخولك</a>.",
    "404.title": "لم يتم العثور",
-    "404.message": "You seem to have stumbled upon a page that does not exist.<br/><div class=\"text-sm text-muted\">Return to the <a href='%1/'>home page</a>.</div>",
+    "404.message": "الصفحة غير موجودة. العودة لـ <a href='%1/'>الرئيسية</a>",
    "500.title": "خطأ داخلي",
    "500.message": "عفوا! يبدو وكأنه شيء ذهب على نحو خاطئ!",
    "400.title": "طلب سيئ",
-    "400.message": "It looks like this link is malformed, please double-check and try again.<br/><div class=\"text-sm text-muted\">Return to the <a href='%1/'>home page</a>.</div>",
+    "400.message": "الرابط غير صحيح. رجاءًا تأكد من الرابط أو ارجع لـ <a href='%1/'>الرئيسية</a>",
    "register": "تسجيل",
    "login": "دخول",
-    "please-log-in": "الرجاء تسجيل الدخول",
+    "please_log_in": "الرجاء تسجيل الدخول",
    "logout": "تسجيل الخروج",
-    "posting-restriction-info": "إضافة مشاركات جديد حكر على الأعضاء المسجلين، انقر هنا لتسجيل الدخول.",
-    "welcome-back": "مرحبًا بعودتك",
-    "you-have-successfully-logged-in": "تم سجيل الدخول بنجاح",
-    "save-changes": "حفظ التغييرات",
+    "posting_restriction_info": "إضافة مشاركات جديد حكر على الأعضاء المسجلين، انقر هنا لتسجيل الدخول.",
+    "welcome_back": "مرحبًا بعودتك",
+    "you_have_successfully_logged_in": "تم سجيل الدخول بنجاح",
+    "save_changes": "حفظ التغييرات",
    "save": "حفظ",
-    "create": "Create",
-    "cancel": "Cancel",
    "close": "أغلق",
    "pagination": "الصفحات",
-    "pagination.previouspage": "Previous Page",
-    "pagination.nextpage": "Next Page",
-    "pagination.firstpage": "First Page",
-    "pagination.lastpage": "Last Page",
-    "pagination.out-of": "%1 من %2",
-    "pagination.enter-index": "Go to post index",
-    "pagination.go-to-page": "Go to page",
-    "pagination.page-x": "Page %1",
-    "header.brand-logo": "Brand Logo",
+    "pagination.out_of": "%1 من %2",
+    "pagination.enter_index": "Go to post index",
    "header.admin": "مدير النظام",
    "header.categories": "الأقسام",
    "header.recent": "حديث",
@@ -46,18 +37,14 @@
    "header.notifications": "التنبيهات",
    "header.search": "بحث",
    "header.profile": "ملف",
-    "header.account": "Account",
    "header.navigation": "الاستكشاف",
-    "header.manage": "Manage",
-    "header.drafts": "Drafts",
    "notifications.loading": "تحميل التنبيهات",
    "chats.loading": "تحميل الدردشات",
-    "drafts.loading": "Loading Drafts",
    "motd.welcome": "مرحبا بكم في NodeBB، منصة المناقشة المستقبلية.",
+    "previouspage": "الصفحة السابقة",
+    "nextpage": "الصفحة التالية",
    "alert.success": "نجاح",
    "alert.error": "خطأ",
-    "alert.warning": "Warning",
-    "alert.info": "Info",
    "alert.banned": "محظور",
    "alert.banned.message": "You have just been banned, your access is now restricted.",
    "alert.unbanned": "Unbanned",
@@ -67,9 +54,7 @@
    "users": "الأعضاء",
    "topics": "المواضيع",
    "posts": "المشاركات",
-    "x-posts": "<span class=\"formatted-number\">%1</span> posts",
-    "x-topics": "<span class=\"formatted-number\">%1</span> topics",
-    "x-reputation": "<span class=\"formatted-number\">%1</span> reputation",
+    "x-posts": "%1 posts",
    "best": "الأفضل",
    "controversial": "Controversial",
    "votes": "Votes",
@@ -84,27 +69,24 @@
    "reputation": "السمعة",
    "lastpost": "Last post",
    "firstpost": "First post",
-    "about": "About",
-    "read-more": "اقرأ المزيد",
+    "read_more": "اقرأ المزيد",
    "more": "المزيد",
    "none": "None",
-    "posted-ago-by-guest": "كتب %1 بواسطة زائر",
-    "posted-ago-by": "كتب %1 بواسطة %2",
-    "posted-ago": "كتب %1",
-    "posted-in": "كتب في %1",
-    "posted-in-by": "كتب في 1% بواسطة %2",
-    "posted-in-ago": "كتب في %1 %2",
-    "posted-in-ago-by": "كتب في %1 %2 من طرف %3",
-    "user-posted-ago": "%1 كتب %2",
-    "guest-posted-ago": "كتب زائر %1",
-    "last-edited-by": "اخر تحرير بواسطة 1%",
-    "edited-timestamp": "Edited %1",
+    "posted_ago_by_guest": "كتب %1 بواسطة زائر",
+    "posted_ago_by": "كتب %1 بواسطة %2",
+    "posted_ago": "كتب %1",
+    "posted_in": "كتب في %1",
+    "posted_in_by": "كتب في 1% بواسطة %2",
+    "posted_in_ago": "كتب في %1 %2",
+    "posted_in_ago_by": "كتب في %1 %2 من طرف %3",
+    "user_posted_ago": "%1 كتب %2",
+    "guest_posted_ago": "كتب زائر %1",
+    "last_edited_by": "اخر تحرير بواسطة 1%",
    "norecentposts": "لاوجود لمشاركات جديدة",
    "norecenttopics": "لاوجود لمواضيع جديدة",
    "recentposts": "آخر المشاركات",
    "recentips": "آخر عناوين ال IP التي سجلت الدخول",
-    "moderator-tools": "أدوات المشرف",
-    "status": "Status",
+    "moderator_tools": "أدوات المشرف",
    "online": "المتواجدون حاليًّا",
    "away": "غير متواجد",
    "dnd": "عدم الإزعاج",
@@ -114,7 +96,7 @@
    "language": "اللغة",
    "guest": "زائر",
    "guests": "الزوار",
-    "former-user": "A Former User",
+    "former_user": "A Former User",
    "system-user": "System",
    "unknown-user": "Unknown user",
    "updated.title": "تم تحديث المنتدى",
@@ -122,12 +104,12 @@
    "privacy": "الخصوصية",
    "follow": "متابعة",
    "unfollow": "إلغاء المتابعة",
-    "delete-all": "حذف الكل",
+    "delete_all": "حذف الكل",
    "map": "خريطة",
    "sessions": "الجلسة",
-    "ip-address": "عنوان الآي بي",
-    "enter-page-number": "ادخل رقم الصفحة",
-    "upload-file": "ارفع ملف",
+    "ip_address": "عنوان الآي بي",
+    "enter_page_number": "ادخل رقم الصفحة",
+    "upload_file": "ارفع ملف",
    "upload": "ارفع",
    "uploads": "Uploads",
    "allowed-file-types": "صيغ الملفات المدعومة هي 1%",
@@ -136,16 +118,9 @@
    "play": "تشغيل",
    "cookies.message": "هذا الموقع يستخدم ملفات تعريف الارتباط لضمان حصولك على أفضل تجربة على موقعنا.",
    "cookies.accept": "فهمت الأمر!",
-    "cookies.learn-more": "أعرف المزيد",
+    "cookies.learn_more": "أعرف المزيد",
    "edited": "حُرِر",
    "disabled": "معطل",
    "select": "تحديد",
-    "selected": "Selected",
-    "copied": "Copied",
-    "user-search-prompt": "Type something here to find users...",
-    "hidden": "Hidden",
-    "sort": "Sort",
-    "actions": "Actions",
-    "rss-feed": "RSS Feed",
-    "skip-to-content": "Skip to content"
+    "user-search-prompt": "Type something here to find users..."
 }
--- a/public/language/ar/groups.json
+++ b/public/language/ar/groups.json
@@ -1,66 +1,64 @@
 {
-    "all-groups": "All groups",
    "groups": "المجموعات",
-    "members": "Members",
-    "view-group": "معاينة المجموعة",
+    "view_group": "معاينة المجموعة",
    "owner": "مالك المجموعة",
-    "new-group": "أنشئ مجموعة جديدة",
-    "no-groups-found": "لاوجدود لمجموعات يمكن معاينتها",
+    "new_group": "أنشئ مجموعة جديدة",
+    "no_groups_found": "لاوجدود لمجموعات يمكن معاينتها",
    "pending.accept": "موافق",
    "pending.reject": "رفض",
-    "pending.accept-all": "قبول الكل",
-    "pending.reject-all": "رفض الكل",
+    "pending.accept_all": "قبول الكل",
+    "pending.reject_all": "رفض الكل",
    "pending.none": "لايوجد أعضاء ينتظرون التفعيل حالياً",
    "invited.none": "لايوجد أعضاء مدعوون في  حالياً",
    "invited.uninvite": "إلغ الدعوة",
    "invited.search": "ابحث عن أعضاء لدعوتهم للمجموعة",
-    "invited.notification-title": "You have been invited to join <strong>%1</strong>",
-    "request.notification-title": "Group Membership Request from <strong>%1</strong>",
-    "request.notification-text": "<strong>%1</strong> has requested to become a member of <strong>%2</strong>",
+    "invited.notification_title": "You have been invited to join <strong>%1</strong>",
+    "request.notification_title": "Group Membership Request from <strong>%1</strong>",
+    "request.notification_text": "<strong>%1</strong> has requested to become a member of <strong>%2</strong>",
    "cover-save": "حفظ",
    "cover-saving": "جاري الحفظ",
    "details.title": "تفاصيل المجموعة",
    "details.members": "لائحة الأعضاء",
    "details.pending": "المستخدمون في الانتظار",
    "details.invited": "اﻷعضار المدعوون",
-    "details.has-no-posts": "أعضاء هذه المجموعة لم يضيفوا أية مشاركة",
-    "details.latest-posts": "آخر المشاركات",
+    "details.has_no_posts": "أعضاء هذه المجموعة لم يضيفوا أية مشاركة",
+    "details.latest_posts": "آخر المشاركات",
    "details.private": "خاص",
    "details.disableJoinRequests": "Disable join requests",
    "details.disableLeave": "Disallow users from leaving the group",
    "details.grant": "منح/سحب المِلكية",
    "details.kick": "طرد",
-    "details.kick-confirm": "Are you sure you want to remove this member from the group?",
+    "details.kick_confirm": "Are you sure you want to remove this member from the group?",
    "details.add-member": "Add Member",
-    "details.owner-options": "إدارة المجموعة",
-    "details.group-name": "اسم المجموعة",
-    "details.member-count": "عدد اﻷعضاء",
-    "details.creation-date": "تاريخ الإنشاء",
+    "details.owner_options": "إدارة المجموعة",
+    "details.group_name": "اسم المجموعة",
+    "details.member_count": "عدد اﻷعضاء",
+    "details.creation_date": "تاريخ الإنشاء",
    "details.description": "الوصف",
    "details.member-post-cids": "Category IDs to display posts from",
-    "details.badge-preview": "معاينة الوسام",
-    "details.change-icon": "تغيير الأيقونة",
-    "details.change-label-colour": "Change Label Colour",
-    "details.change-text-colour": "Change Text Colour",
-    "details.badge-text": "نص الوسام",
+    "details.badge_preview": "معاينة الوسام",
+    "details.change_icon": "تغيير الأيقونة",
+    "details.change_label_colour": "Change Label Colour",
+    "details.change_text_colour": "Change Text Colour",
+    "details.badge_text": "نص الوسام",
    "details.userTitleEnabled": "إظهار الوسام",
-    "details.private-help": "في حالة تفعيل الخيار، الانضمام إلى المجموعة يستلزم قبول مالكها",
+    "details.private_help": "في حالة تفعيل الخيار، الانضمام إلى المجموعة يستلزم قبول مالكها",
    "details.hidden": "مخفي",
-    "details.hidden-help": "في حالة تفعيل الخيار، لن تظهر المجموعة للعموم والإنضمام إليها سيتلزم دعوة.",
-    "details.delete-group": "حذف المجموعة",
-    "details.private-system-help": "Private groups is disabled at system level, this option does not do anything",
+    "details.hidden_help": "في حالة تفعيل الخيار، لن تظهر المجموعة للعموم والإنضمام إليها سيتلزم دعوة.",
+    "details.delete_group": "حذف المجموعة",
+    "details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
    "event.updated": "تم تحديث بيانات المجموعة",
    "event.deleted": "تم حذف المجموعة %1",
    "membership.accept-invitation": "اقبل الدعوة",
-    "membership.accept.notification-title": "You are now a member of <strong>%1</strong>",
+    "membership.accept.notification_title": "You are now a member of <strong>%1</strong>",
    "membership.invitation-pending": "الدعوة بانتظار القبول",
    "membership.join-group": "انظم للمجموعة",
    "membership.leave-group": "غادر المجموعة",
-    "membership.leave.notification-title": "<strong>%1</strong> has left group <strong>%2</strong>",
+    "membership.leave.notification_title": "<strong>%1</strong> has left group <strong>%2</strong>",
    "membership.reject": "رفض",
-    "new-group.group-name": "اسم المجموعة",
+    "new-group.group_name": "اسم المجموعة",
    "upload-group-cover": "Upload group cover",
    "bulk-invite-instructions": "Enter a list of comma separated usernames to invite to this group",
    "bulk-invite": "Bulk Invite",
-    "remove-group-cover-confirm": "Are you sure you want to remove the cover picture?"
+    "remove_group_cover_confirm": "Are you sure you want to remove the cover picture?"
 }
--- a/public/language/ar/login.json
+++ b/public/language/ar/login.json
@@ -1,12 +1,12 @@
 {
    "username-email": "اسم المستخدم / البريد الإلكتروني",
    "username": "اسم المستخدم",
-    "remember-me": "تذكرني؟",
-    "forgot-password": "نسيت كلمة المرور؟",
-    "alternative-logins": "تسجيلات الدخول البديلة",
-    "failed-login-attempt": "تسجيل الدخول غير ناجح",
-    "login-successful": "قمت بتسجيل الدخول بنجاح!",
-    "dont-have-account": "لا تملك حساب؟",
+    "remember_me": "تذكرني؟",
+    "forgot_password": "نسيت كلمة المرور؟",
+    "alternative_logins": "تسجيلات الدخول البديلة",
+    "failed_login_attempt": "تسجيل الدخول غير ناجح",
+    "login_successful": "قمت بتسجيل الدخول بنجاح!",
+    "dont_have_account": "لا تملك حساب؟",
    "logged-out-due-to-inactivity": "لقد تم تسجيل خروجك من لوحة تحكم بسبب عدم نشاطك",
    "caps-lock-enabled": "Caps Lock is enabled"
 }
--- a/public/language/ar/modules.json
+++ b/public/language/ar/modules.json
@@ -1,23 +1,13 @@
 {
-    "chat.room-id": "Room %1",
-    "chat.chatting-with": "Chat with",
-    "chat.placeholder": "Type chat message here, drag & drop images",
-    "chat.placeholder.mobile": "Type chat message",
-    "chat.placeholder.message-room": "Message #%1",
-    "chat.scroll-up-alert": "Go to most recent message",
-    "chat.usernames-and-x-others": "%1 & %2 others",
-    "chat.chat-with-usernames": "Chat with %1",
-    "chat.chat-with-usernames-and-x-others": "Chat with %1 & %2 others",
+    "chat.chatting_with": "Chat with",
+    "chat.placeholder": "Type chat message here, drag & drop images, press enter to send",
+    "chat.scroll-up-alert": "You are looking at older messages, click here to go to most recent message.",
    "chat.send": "أرسل",
-    "chat.no-active": "لا يوجد لديك دردشات نشطة.",
-    "chat.user-typing-1": "<strong>%1</strong> is typing ...",
-    "chat.user-typing-2": "<strong>%1</strong> and <strong>%2</strong> are typing ...",
-    "chat.user-typing-3": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> are typing ...",
-    "chat.user-typing-n": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> others are typing ...",
-    "chat.user-has-messaged-you": "%1 أرسل لك رسالة.",
-    "chat.replying-to": "Replying to %1",
-    "chat.see-all": "All chats",
-    "chat.mark-all-read": "Mark all read",
+    "chat.no_active": "لا يوجد لديك دردشات نشطة.",
+    "chat.user_typing": "%1 يكتب رسالة...",
+    "chat.user_has_messaged_you": "%1 أرسل لك رسالة.",
+    "chat.see_all": "All chats",
+    "chat.mark_all_read": "Mark all read",
    "chat.no-messages": "المرجو اختيار مرسل إليه لمعاينة تاريخ الدردشات",
    "chat.no-users-in-room": "No users in this room",
    "chat.recent-chats": "آخر الدردشات",
@@ -28,73 +18,38 @@
    "chat.pop-out": "افتح الدردشة في نافذة خاصة",
    "chat.minimize": "Minimize",
    "chat.maximize": "تكبير",
-    "chat.seven-days": "7 أيام",
-    "chat.thirty-days": "30 يومًا",
-    "chat.three-months": "3 أشهر",
-    "chat.delete-message-confirm": "هل أنت متأكد من أنك تريد حذف هذه الرسالة؟",
+    "chat.seven_days": "7 أيام",
+    "chat.thirty_days": "30 يومًا",
+    "chat.three_months": "3 أشهر",
+    "chat.delete_message_confirm": "هل أنت متأكد من أنك تريد حذف هذه الرسالة؟",
    "chat.retrieving-users": "Retrieving users...",
-    "chat.view-users-list": "View users list",
-    "chat.pinned-messages": "Pinned Messages",
-    "chat.no-pinned-messages": "There are no pinned messages",
-    "chat.pin-message": "Pin Message",
-    "chat.unpin-message": "Unpin Message",
-    "chat.public-rooms": "Public Rooms (%1)",
-    "chat.private-rooms": "Private Rooms (%1)",
-    "chat.create-room": "Create Chat Room",
-    "chat.private.option": "Private (Only visible to users added to room)",
-    "chat.public.option": "Public (Visible to every user in selected groups)",
-    "chat.public.groups-help": "To create a chat room that is visible to all users select registered-users from the group list.",
    "chat.manage-room": "Manage Chat Room",
-    "chat.add-user": "Add User",
-    "chat.notification-settings": "Notification Settings",
-    "chat.default-notification-setting": "Default Notification Setting",
-    "chat.notification-setting-room-default": "Room Default",
-    "chat.notification-setting-none": "No notifications",
-    "chat.notification-setting-at-mention-only": "@mention only",
-    "chat.notification-setting-all-messages": "All messages",
-    "chat.select-groups": "Select Groups",
    "chat.add-user-help": "Search for users here. When selected, the user will be added to the chat. The new user will not be able to see chat messages written before they were added to the conversation. Only room owners (<i class=\"fa fa-star text-warning\"></i>) may remove users from chat rooms.",
    "chat.confirm-chat-with-dnd-user": "This user has set their status to DnD(Do not disturb). Do you still want to chat with them?",
-    "chat.room-name-optional": "Room Name (Optional)",
    "chat.rename-room": "Rename Room",
    "chat.rename-placeholder": "Enter your room name here",
    "chat.rename-help": "The room name set here will be viewable by all participants in the room.",
-    "chat.leave": "Leave",
-    "chat.leave-room": "Leave Room",
+    "chat.leave": "Leave Chat",
    "chat.leave-prompt": "Are you sure you wish to leave this chat?",
    "chat.leave-help": "Leaving this chat will remove you from future correspondence in this chat. If you are re-added in the future, you will not see any chat history from prior to your re-joining.",
-    "chat.delete": "Delete",
-    "chat.delete-room": "Delete Room",
-    "chat.delete-prompt": "Are you sure you wish to delete this chat room?",
    "chat.in-room": "In this room",
    "chat.kick": "Kick",
    "chat.show-ip": "Show IP",
-    "chat.copy-text": "Copy Text",
-    "chat.copy-link": "Copy Link",
    "chat.owner": "Room Owner",
-    "chat.grant-rescind-ownership": "Grant/Rescind Ownership",
-    "chat.system.user-join": "%1 has joined the room <span class=\"timeago\" title=\"%2\"></span>",
-    "chat.system.user-leave": "%1 has left the room <span class=\"timeago\" title=\"%2\"></span>",
-    "chat.system.room-rename": "%2 has renamed this room to \"%1\" <span class=\"timeago\" title=\"%3\"></span>",
+    "chat.system.user-join": "%1 has joined the room",
+    "chat.system.user-leave": "%1 has left the room",
+    "chat.system.room-rename": "%2 has renamed this room: %1",
    "composer.compose": "اكتب",
-    "composer.show-preview": "عرض المعاينة",
-    "composer.hide-preview": "إخفاء المعاينة",
-    "composer.help": "Help",
-    "composer.user-said-in": "%1 كتب في  %2",
-    "composer.user-said": "%1 كتب:",
+    "composer.show_preview": "عرض المعاينة",
+    "composer.hide_preview": "إخفاء المعاينة",
+    "composer.user_said_in": "%1 كتب في  %2",
+    "composer.user_said": "%1 كتب:",
    "composer.discard": "هل أنت متأكد أنك تريد التخلي عن التغييرات؟",
-    "composer.submit-and-lock": "Submit and Lock",
-    "composer.toggle-dropdown": "Toggle Dropdown",
+    "composer.submit_and_lock": "Submit and Lock",
+    "composer.toggle_dropdown": "Toggle Dropdown",
    "composer.uploading": "Uploading %1",
    "composer.formatting.bold": "Bold",
    "composer.formatting.italic": "Italic",
-    "composer.formatting.heading": "Heading",
-    "composer.formatting.heading1": "Heading 1",
-    "composer.formatting.heading2": "Heading 2",
-    "composer.formatting.heading3": "Heading 3",
-    "composer.formatting.heading4": "Heading 4",
-    "composer.formatting.heading5": "Heading 5",
-    "composer.formatting.heading6": "Heading 6",
    "composer.formatting.list": "List",
    "composer.formatting.strikethrough": "Strikethrough",
    "composer.formatting.code": "Code",
@@ -102,26 +57,21 @@
    "composer.formatting.picture": "Image Link",
    "composer.upload-picture": "Upload Image",
    "composer.upload-file": "Upload File",
-    "composer.zen-mode": "Zen Mode",
-    "composer.select-category": "Select a category",
+    "composer.zen_mode": "Zen Mode",
+    "composer.select_category": "Select a category",
    "composer.textarea.placeholder": "Enter your post content here, drag and drop images",
-    "composer.post-queue-alert": "Hello👋!<br/>This forum uses a post queue system, since you are a new user your post will be hidden until it is approved by our moderation team.",
    "composer.schedule-for": "Schedule topic for",
    "composer.schedule-date": "Date",
    "composer.schedule-time": "Time",
    "composer.cancel-scheduling": "Cancel Scheduling",
-    "composer.change-schedule-date": "Change Date",
    "composer.set-schedule-date": "Set Date",
-    "composer.discard-all-drafts": "Discard all drafts",
-    "composer.no-drafts": "You have no drafts",
-    "composer.discard-draft-confirm": "Do you want to discard this draft?",
    "bootbox.ok": "OK",
    "bootbox.cancel": "إلغاء",
    "bootbox.confirm": "تأكيد",
    "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.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",
    "thumbs.modal.title": "Manage topic thumbnails",
    "thumbs.modal.no-thumbs": "No thumbnails found.",
--- a/public/language/ar/notifications.json
+++ b/public/language/ar/notifications.json
@@ -1,70 +1,49 @@
 {
    "title": "التنبيهات",
-    "no-notifs": "ليس لديك أية تنبيهات جديدة",
-    "see-all": "All notifications",
-    "mark-all-read": "Mark all read",
-    "back-to-home": "عودة إلى %1",
-    "outgoing-link": "رابط خارجي",
-    "outgoing-link-message": "أنت تغادر اﻻن %1",
-    "continue-to": "استمر إلى %1",
-    "return-to": "عودة إى %1",
-    "new-notification": "لديك تنبيه جديد",
-    "you-have-unread-notifications": "لديك تنبيهات غير مقروءة.",
+    "no_notifs": "ليس لديك أية تنبيهات جديدة",
+    "see_all": "All notifications",
+    "mark_all_read": "Mark all read",
+    "back_to_home": "عودة إلى %1",
+    "outgoing_link": "رابط خارجي",
+    "outgoing_link_message": "أنت تغادر اﻻن %1",
+    "continue_to": "استمر إلى %1",
+    "return_to": "عودة إى %1",
+    "new_notification": "لديك تنبيه جديد",
+    "you_have_unread_notifications": "لديك تنبيهات غير مقروءة.",
    "all": "الكل",
    "topics": "مواضيع",
-    "tags": "Tags",
-    "categories": "Categories",
    "replies": "ردود",
    "chat": "محادثات",
    "group-chat": "Group Chats",
-    "public-chat": "Public Chats",
    "follows": "متابعون",
    "upvote": "الموافقين",
-    "awards": "Awards",
    "new-flags": "New Flags",
    "my-flags": "Flags assigned to me",
    "bans": "الحظر",
-    "new-message-from": "رسالة جديدة من <strong>%1</strong>",
-    "new-messages-from": "%1 new messages from <strong>%2</strong>",
-    "new-message-in": "New message in <strong>%1</strong>",
-    "new-messages-in": "%1 new messages in <strong>%2</strong>",
-    "user-posted-in-public-room": "<strong>%1</strong> wrote in <strong class=\"text-nowrap\"><i class=\"fa %2\"></i>%3</strong>",
-    "user-posted-in-public-room-dual": "<strong>%1</strong> and <strong>%2</strong> wrote in <strong class=\"text-nowrap\"><i class=\"fa %3\"></i>%4</strong>",
-    "user-posted-in-public-room-triple": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> wrote in <strong class=\"text-nowrap\"><i class=\"fa %4\"></i>%5</strong>",
-    "user-posted-in-public-room-multiple": "<strong>%1</strong>, <strong>%2</strong> and %3 others wrote in <strong class=\"text-nowrap\"><i class=\"fa %4\"></i>%5</strong>",
-    "upvoted-your-post-in": "<strong>%1</strong> أضاف صوتًا إيجابيا إلى مشاركتك في <strong>%2</strong>.",
-    "upvoted-your-post-in-dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
-    "upvoted-your-post-in-triple": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> have upvoted your post in <strong>%4</strong>.",
-    "upvoted-your-post-in-multiple": "<strong>%1</strong>, <strong>%2</strong> and %3 others have upvoted your post in <strong>%4</strong>.",
-    "moved-your-post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
-    "moved-your-topic": "<strong>%1</strong> has moved <strong>%2</strong>",
-    "user-flagged-post-in": "<strong>%1</strong> أشعَرَ بمشاركة مخلة في <strong>%2</strong>",
-    "user-flagged-post-in-dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
-    "user-flagged-post-in-triple": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> flagged a post in <strong>%4</strong>",
-    "user-flagged-post-in-multiple": "<strong>%1</strong>, <strong>%2</strong> and %3 others flagged a post in <strong>%4</strong>",
-    "user-flagged-user": "<strong>%1</strong> flagged a user profile (%2)",
-    "user-flagged-user-dual": "<strong>%1</strong> and <strong>%2</strong> flagged a user profile (%3)",
-    "user-flagged-user-triple": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> flagged a user profile (%4)",
-    "user-flagged-user-multiple": "<strong>%1</strong>, <strong>%2</strong> and %3 others flagged a user profile (%4)",
-    "user-posted-to": "<strong>%1</strong> أضاف ردا إلى: <strong>%2</strong>",
-    "user-posted-to-dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
-    "user-posted-to-triple": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> have posted replies to: <strong>%4</strong>",
-    "user-posted-to-multiple": "<strong>%1</strong>, <strong>%2</strong> and %3 others have posted replies to: <strong>%4</strong>",
-    "user-posted-topic": "<strong>%1</strong> أنشأ موضوعًا جديدًا: <strong>%2</strong>",
-    "user-edited-post": "<strong>%1</strong> has edited a post in <strong>%2</strong>",
-    "user-posted-topic-with-tag": "<strong>%1</strong> has posted <strong>%2</strong> (tagged %3)",
-    "user-posted-topic-with-tag-dual": "<strong>%1</strong> has posted <strong>%2</strong> (tagged %3 and %4)",
-    "user-posted-topic-with-tag-triple": "<strong>%1</strong> has posted <strong>%2</strong> (tagged %3, %4, and %5)",
-    "user-posted-topic-with-tag-multiple": "<strong>%1</strong> has posted <strong>%2</strong> (tagged %3)",
-    "user-posted-topic-in-category": "<strong>%1</strong> has posted a new topic in <strong>%2</strong>",
-    "user-started-following-you": "<strong>%1</strong> صار يتابعك.",
-    "user-started-following-you-dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
-    "user-started-following-you-triple": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> started following you.",
-    "user-started-following-you-multiple": "<strong>%1</strong>, <strong>%2</strong> and %3 others started following you.",
-    "new-register": "<strong>%1</strong> sent a registration request.",
-    "new-register-multiple": "There are <strong>%1</strong> registration requests awaiting review.",
-    "flag-assigned-to-you": "تم تخصيص العلامة 1%  لك",
-    "post-awaiting-review": "Post awaiting review",
+    "new_message_from": "رسالة جديدة من <strong>%1</strong>",
+    "upvoted_your_post_in": "<strong>%1</strong> أضاف صوتًا إيجابيا إلى مشاركتك في <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
+    "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
+    "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
+    "user_flagged_post_in": "<strong>%1</strong> أشعَرَ بمشاركة مخلة في <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
+    "user_flagged_user": "<strong>%1</strong> flagged a user profile (%2)",
+    "user_flagged_user_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a user profile (%3)",
+    "user_flagged_user_multiple": "<strong>%1</strong> and %2 others flagged a user profile (%3)",
+    "user_posted_to": "<strong>%1</strong> أضاف ردا إلى: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
+    "user_posted_topic": "<strong>%1</strong> أنشأ موضوعًا جديدًا: <strong>%2</strong>",
+    "user_edited_post": "<strong>%1</strong> has edited a post in <strong>%2</strong>",
+    "user_started_following_you": "<strong>%1</strong> صار يتابعك.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
+    "new_register": "<strong>%1</strong> sent a registration request.",
+    "new_register_multiple": "There are <strong>%1</strong> registration requests awaiting review.",
+    "flag_assigned_to_you": "تم تخصيص العلامة 1%  لك",
+    "post_awaiting_review": "Post awaiting review",
    "profile-exported": "<strong>%1</strong> profile exported, click to download",
    "posts-exported": "<strong>%1</strong> posts exported, click to download",
    "uploads-exported": "<strong>%1</strong> uploads exported, click to download",
@@ -75,28 +54,23 @@
    "email-confirmed": "تم التحقق من عنوان البريد الإلكتروني",
    "email-confirmed-message": "شكرًا على إثبات صحة عنوان بريدك الإلكتروني. صار حسابك مفعلًا بالكامل.",
    "email-confirm-error-message": "حدث خطأ أثناء التحقق من عنوان بريدك الإلكتروني. ربما رمز التفعيل خاطئ أو انتهت صلاحيته.",
-    "email-confirm-error-message-already-validated": "Your email address was already validated.",
    "email-confirm-sent": "تم إرسال بريد التفعيل.",
    "none": "None",
-    "notification-only": "التنبيهات فقط",
-    "email-only": "البريد الالكتروني فقط",
-    "notification-and-email": "التنبيهات والبريد اﻻلكتروني",
-    "notificationType-upvote": "عندما يوافقك احدهم على منشورك",
-    "notificationType-new-topic": "When someone you follow posts a topic",
-    "notificationType-new-topic-with-tag": "When a topic is posted with a tag you follow",
-    "notificationType-new-topic-in-category": "When a topic is posted in a category you are watching",
-    "notificationType-new-reply": "When a new reply is posted in a topic you are watching",
-    "notificationType-post-edit": "When a post is edited in a topic you are watching",
-    "notificationType-follow": "When someone starts following you",
-    "notificationType-new-chat": "When you receive a chat message",
-    "notificationType-new-group-chat": "When you receive a group chat message",
-    "notificationType-new-public-chat": "When you receive a public group chat message",
-    "notificationType-group-invite": "When you receive a group invite",
-    "notificationType-group-leave": "When a user leaves your group",
-    "notificationType-group-request-membership": "When someone requests to join a group you own",
-    "notificationType-new-register": "When someone gets added to registration queue",
-    "notificationType-post-queue": "When a new post is queued",
-    "notificationType-new-post-flag": "When a post is flagged",
-    "notificationType-new-user-flag": "When a user is flagged",
-    "notificationType-new-reward": "When you earn a new reward"
+    "notification_only": "التنبيهات فقط",
+    "email_only": "البريد الالكتروني فقط",
+    "notification_and_email": "التنبيهات والبريد اﻻلكتروني",
+    "notificationType_upvote": "عندما يوافقك احدهم على منشورك",
+    "notificationType_new-topic": "When someone you follow posts a topic",
+    "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_post-edit": "When a post is edited in a topic you are watching",
+    "notificationType_follow": "When someone starts following you",
+    "notificationType_new-chat": "When you receive a chat message",
+    "notificationType_new-group-chat": "When you receive a group chat message",
+    "notificationType_group-invite": "When you receive a group invite",
+    "notificationType_group-leave": "When a user leaves your group",
+    "notificationType_group-request-membership": "When someone requests to join a group you own",
+    "notificationType_new-register": "When someone gets added to registration queue",
+    "notificationType_post-queue": "When a new post is queued",
+    "notificationType_new-post-flag": "When a post is flagged",
+    "notificationType_new-user-flag": "When a user is flagged"
 }
--- a/public/language/ar/pages.json
+++ b/public/language/ar/pages.json
@@ -14,7 +14,6 @@
    "flagged-content": "Flagged Content",
    "ip-blacklist": "IP Blacklist",
    "post-queue": "Post Queue",
-    "registration-queue": "Registration Queue",
    "users/online": "اﻷعضاء المتصلون",
    "users/latest": "أحدث اﻷعضاء",
    "users/sort-posts": "الأعضاء الأكثر نشاطاً",
@@ -47,14 +46,11 @@
    "account/latest-posts": "Latest posts made by %1",
    "account/topics": "Topics created by %1",
    "account/groups": "%1's Groups",
-    "account/watched-categories": "%1's Watched Categories",
-    "account/watched-tags": "%1's Watched Tags",
+    "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/read": "Topics read by %1",
    "account/upvoted": "Posts upvoted by %1",
    "account/downvoted": "Posts downvoted by %1",
    "account/best": "Best posts made by %1",
@@ -63,7 +59,7 @@
    "account/uploads": "Uploads by %1",
    "account/sessions": "Login Sessions",
    "confirm": "تم التحقق من عنوان البريد الإلكتروني",
-    "maintenance.text": "%1 is currently undergoing maintenance.<br/>Please come back another time.",
+    "maintenance.text": "جاري صيانة %1. المرجو العودة لاحقًا.",
    "maintenance.messageIntro": "بالإضافة إلى ذلك، قام مدبر النظام بترك هذه الرسالة:",
    "throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
 }
--- a/public/language/ar/post-queue.json
+++ b/public/language/ar/post-queue.json
@@ -1,14 +1,8 @@

 {
 	"post-queue": "Post Queue",
-	"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": "The post queue is currently <strong>disabled</strong>. 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",
-	"public-intro": "If you have any queued posts, they will be shown here.",
-	"public-description": "This forum is configured to automatically queue posts from new accounts, pending moderator approval.<br />If you have queued posts awaiting approval, you will be able to see them here.",
+	"description": "There are no posts in the post queue. <br> To enable this feature, go to <a href=\"%1\">Settings &rarr; Post &rarr; Post Queue</a> and enable <strong>Post Queue</strong>.",
 	"user": "User",
-	"when": "When",
 	"category": "Category",
 	"title": "Title",
 	"content": "Content",
@@ -25,7 +19,6 @@
 	"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",
@@ -33,11 +26,6 @@
 	"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",
-	"links-in-this-post": "Links in this post"
+	"bulk-reject-success": "%1 posts rejected"
 }
--- a/public/language/ar/recent.json
+++ b/public/language/ar/recent.json
@@ -5,7 +5,15 @@
    "month": "شهر",
    "year": "سنة",
    "alltime": "دائمًا",
-    "no-recent-topics": "لايوجد مواضيع جديدة",
-    "no-popular-topics": "لا يوجد مواضيع شائعة",
-    "load-new-posts": "Load new posts"
+    "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": "إضغط هنا لإعادة التحميل"
 }
--- a/public/language/ar/register.json
+++ b/public/language/ar/register.json
@@ -1,32 +1,31 @@
 {
    "register": "تسجيل",
-    "already-have-account": "Already have an account?",
-    "cancel-registration": "إلغاء التسجيل",
+    "cancel_registration": "إلغاء التسجيل",
    "help.email": "افتراضيا، سيتم إخفاء بريدك الإلكتروني من العامة.",
-    "help.username-restrictions": "اسم مستخدم فريدة من نوعها بين 1% و 2% حرفا. بإمكان الآخرين مناداتك بـ @<span id='yourUsername'>اسم المستخدم</span>.",
-    "help.minimum-password-length": "كلمة المرور يجب أن تتكون على الأقل من 1% أحرف/حروف",
-    "email-address": "عنوان البريد الإلكتروني",
-    "email-address-placeholder": "ادخل عنوان البريد الإلكتروني",
+    "help.username_restrictions": "اسم مستخدم فريدة من نوعها بين 1% و 2% حرفا. بإمكان الآخرين مناداتك بـ @<span id='yourUsername'>اسم المستخدم</span>.",
+    "help.minimum_password_length": "كلمة المرور يجب أن تتكون على الأقل من 1% أحرف/حروف",
+    "email_address": "عنوان البريد الإلكتروني",
+    "email_address_placeholder": "ادخل عنوان البريد الإلكتروني",
    "username": "اسم المستخدم",
-    "username-placeholder": "أدخل اسم المستخدم",
+    "username_placeholder": "أدخل اسم المستخدم",
    "password": "كلمة المرور",
-    "password-placeholder": "أدخل كلمة المرور",
-    "confirm-password": "تأكيد كلمة المرور",
-    "confirm-password-placeholder": "تأكيد كلمة المرور",
-    "register-now-button": "قم بالتسجيل الآن",
-    "alternative-registration": "طريقة تسجيل بديلة",
-    "terms-of-use": "شروط الاستخدام",
-    "agree-to-terms-of-use": "أوافق على شروط الاستخدام",
-    "terms-of-use-error": "يجب عليك الموافقة على شروط الاستخدام",
+    "password_placeholder": "أدخل كلمة المرور",
+    "confirm_password": "تأكيد كلمة المرور",
+    "confirm_password_placeholder": "تأكيد كلمة المرور",
+    "register_now_button": "قم بالتسجيل الآن",
+    "alternative_registration": "طريقة تسجيل بديلة",
+    "terms_of_use": "شروط الاستخدام",
+    "agree_to_terms_of_use": "أوافق على شروط الاستخدام",
+    "terms_of_use_error": "يجب عليك الموافقة على شروط الاستخدام",
    "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": "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.",
+    "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.",
    "invite.error-admin-only": "Direct user registration has been disabled. Please contact an administrator for more details.",
    "invite.error-invite-only": "Direct user registration has been disabled. You must be invited by an existing user in order to access this forum.",
    "invite.error-invalid-data": "The registration data received does not correspond to our records. Please contact an administrator for more details"
--- a/public/language/ar/reset_password.json
+++ b/public/language/ar/reset_password.json
@@ -1,18 +1,18 @@
 {
-    "reset-password": "إعادة تعيين كلمة المرور",
-    "update-password": "تحديث كلمة المرور",
-    "password-changed.title": "تم تغير كلمة المرور",
-    "password-changed.message": "<p>تم تغير كلمة المرور بنجاح، الرجاء <a href='/login'>إعادة الدخول</a></p>",
-    "wrong-reset-code.title": "رمز إعادة التعيين غير صحيح",
-    "wrong-reset-code.message": "رمز إعادة التعين غير صحيح، يرجى المحاولة مرة أخرى أو <a href='/reset'>اطلب رمزا جديدا</a>",
-    "new-password": "كلمة المرور الجديدة",
-    "repeat-password": "تأكيد كلمة المرور",
-    "changing-password": "Changing Password",
-    "enter-email": "يرجى إدخال <strong>عنوان البريد الإلكتروني</strong> الخاص بك وسوف نرسل لك رسالة بالبريد الالكتروني مع تعليمات حول كيفية إستعادة حسابك.",
-    "enter-email-address": "ادخل عنوان البريد الإلكتروني",
-    "password-reset-sent": "If the specified address corresponds to an existing user account, a password reset email was sent. Please note that only one email will be sent per minute.",
-    "invalid-email": "بريد إلكتروني غير صالح أو غير موجود",
-    "password-too-short": "كلمة المرور التي أدخلتها قصيرة، الرجاء اختر  كلمة مرور مختلفة",
-    "passwords-do-not-match": "كلمتا السر التي أدخلتهما غير متطابقتان",
-    "password-expired": "لقد انتهت صلاحية كلمة المرور الخاصة بك، الرجاء اختيار كلمة مرور جديدة"
+    "reset_password": "إعادة تعيين كلمة المرور",
+    "update_password": "تحديث كلمة المرور",
+    "password_changed.title": "تم تغير كلمة المرور",
+    "password_changed.message": "<p>تم تغير كلمة المرور بنجاح، الرجاء <a href='/login'>إعادة الدخول</a></p>",
+    "wrong_reset_code.title": "رمز إعادة التعيين غير صحيح",
+    "wrong_reset_code.message": "رمز إعادة التعين غير صحيح، يرجى المحاولة مرة أخرى أو <a href='/reset'>اطلب رمزا جديدا</a>",
+    "new_password": "كلمة المرور الجديدة",
+    "repeat_password": "تأكيد كلمة المرور",
+    "changing_password": "Changing Password",
+    "enter_email": "يرجى إدخال <strong>عنوان البريد الإلكتروني</strong> الخاص بك وسوف نرسل لك رسالة بالبريد الالكتروني مع تعليمات حول كيفية إستعادة حسابك.",
+    "enter_email_address": "ادخل عنوان البريد الإلكتروني",
+    "password_reset_sent": "If the specified address corresponds to an existing user account, a password reset email was sent. Please note that only one email will be sent per minute.",
+    "invalid_email": "بريد إلكتروني غير صالح أو غير موجود",
+    "password_too_short": "كلمة المرور التي أدخلتها قصيرة، الرجاء اختر  كلمة مرور مختلفة",
+    "passwords_do_not_match": "كلمتا السر التي أدخلتهما غير متطابقتان",
+    "password_expired": "لقد انتهت صلاحية كلمة المرور الخاصة بك، الرجاء اختيار كلمة مرور جديدة"
 }
--- a/public/language/ar/rewards.json
+++ b/public/language/ar/rewards.json
@@ -1,10 +0,0 @@
-{
-	"awarded-x-reputation": "You have been awarded <strong>%1</strong> reputation",
-	"awarded-group-membership": "You have been added to the group <strong>%1</strong>",
-
-	"essentials/user.reputation-conditional-value": "<span class=\"text-xs\">(Reputation %1 %2)</span>",
-	"essentials/user.postcount-conditional-value": "<span class=\"text-xs\">(Post Count %1 %2)</span>",
-	"essentials/user.lastonline-conditional-value": "<span class=\"text-xs\">(Last Online %1 %2)</span>",
-	"essentials/user.joindate-conditional-value": "<span class=\"text-xs\">(Join Date %1 %2)</span>",
-	"essentials/user.daysregistered-conditional-value": "<span class=\"text-xs\">(Days Registered %1 %2)</span>"
-}
--- a/public/language/ar/search.json
+++ b/public/language/ar/search.json
@@ -1,42 +1,21 @@
 {
-    "type-to-search": "Type to search",
-    "results-matching": "%1 نتيجة (نتائج) موافقة لـ \"%2\", (%3 ثواني)",
+    "results_matching": "%1 نتيجة (نتائج) موافقة لـ \"%2\", (%3 ثواني)",
    "no-matches": "لم يتم العثور على نتائج.",
    "advanced-search": "بحث متقدم",
    "in": "في",
-    "in-titles": "In titles",
-    "in-titles-posts": "In titles and posts",
-    "in-posts": "In posts",
-    "in-bookmarks": "In bookmarks",
-    "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",
+    "titles": "العناوين",
+    "titles-posts": "العناوين والمشاركات",
    "match-words": "Match words",
-    "match-all-words": "Match all words",
-    "match-any-word": "Match any word",
    "all": "All",
    "any": "Any",
    "posted-by": "مشاركة من طرف",
-    "posted-by-usernames": "Posted by: %1",
-    "type-a-username": "Type a username",
+    "in-categories": "في الفئات",
    "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": "أحدث من",
@@ -49,22 +28,7 @@
    "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",
@@ -75,36 +39,11 @@
    "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\""
 }
--- a/public/language/ar/social.json
+++ b/public/language/ar/social.json
@@ -1,12 +0,0 @@
-{
-	"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": "التسجيل باستخدام فيسبوك",
-	"sign-in-with-linkedin": "Sign in with LinkedIn",
-	"sign-up-with-linkedin": "Sign up with LinkedIn"
-}
--- a/public/language/ar/tags.json
+++ b/public/language/ar/tags.json
@@ -1,17 +1,8 @@
 {
-    "all-tags": "All tags",
-    "no-tag-topics": "لا يوجد مواضيع بهذه الكلمة الدلالية.",
-    "no-tags-found": "No tags found",
+    "no_tag_topics": "لا يوجد مواضيع بهذه الكلمة الدلالية.",
    "tags": "الكلمات الدلالية",
-    "enter-tags-here": "Enter tags, %1 - %2 characters.",
-    "enter-tags-here-short": "أدخل الكلمات الدلالية...",
-    "no-tags": "لا يوجد كلمات دلالية بعد.",
-    "select-tags": "Select Tags",
-    "tag-whitelist": "Tag Whitelist",
-    "watching": "Watching",
-    "not-watching": "Not Watching",
-    "watching.description": "Notify me of new topics.",
-    "not-watching.description": "Do not notify me of new topics.",
-    "following-tag.message": "You will now be receiving notifications when somebody posts a topic with this tag.",
-    "not-following-tag.message": "You will not receive notifications when somebody posts a topic with this tag."
+    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
+    "enter_tags_here_short": "أدخل الكلمات الدلالية...",
+    "no_tags": "لا يوجد كلمات دلالية بعد.",
+    "select_tags": "Select Tags"
 }
--- a/public/language/ar/themes/harmony.json
+++ b/public/language/ar/themes/harmony.json
@@ -1,20 +0,0 @@
-{
-	"theme-name": "Harmony Theme",
-	"skins": "Skins",
-	"collapse": "Collapse",
-	"expand": "Expand",
-	"sidebar-toggle": "Sidebar Toggle",
-	"login-register-to-search": "Login or register to search.",
-	"settings.title": "Theme settings",
-	"settings.enableQuickReply": "Enable quick reply",
-	"settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages",
-	"settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.",
-	"settings.centerHeaderElements": "Center header elements",
-	"settings.mobileTopicTeasers": "Show topic teasers on mobile",
-	"settings.stickyToolbar": "Sticky toolbar",
-	"settings.stickyToolbar.help": "The toolbar on topic and category pages will stick to the top of the page",
-	"settings.autohideBottombar": "Auto hide bottom bar",
-	"settings.autohideBottombar.help": "The bottom bar on mobile view will be hidden when the page is scrolled down",
-	"settings.openSidebars": "Open sidebars",
-	"settings.chatModals": "Enable chat modals"
-}
--- a/public/language/ar/themes/persona.json
+++ b/public/language/ar/themes/persona.json
@@ -1,10 +0,0 @@
-{
-    "settings.title": "Theme settings",
-    "settings.intro": "You can customise your theme settings here. Settings are stored on a per-device basis, so you are able to have different settings on different devices (phone, tablet, desktop, etc.)",
-    "settings.mobile-menu-side": "Switch which side each mobile menu is on",
-    "settings.autoHidingNavbar": "Automatically hide the navbar on scroll",
-    "settings.autoHidingNavbar-xs": "Very small screens (e.g. phones in portrait mode)",
-    "settings.autoHidingNavbar-sm": "Smaller screens (e.g. phones, some tablets)",
-    "settings.autoHidingNavbar-md": "Medium sized screens (e.g. tablets in landscape mode)",
-    "settings.autoHidingNavbar-lg": "Larger screens (e.g. desktop computers)"
-}
--- a/public/language/ar/top.json
+++ b/public/language/ar/top.json
@@ -1,4 +1,4 @@
 {
-	"title": "أعلى الصفحة",
-	"no-top-topics": "لا توجد مواضيع أعلى الصفحة"
+	"title": "Top",
+	"no_top_topics": "No top topics"
 }
--- a/public/language/ar/topic.json
+++ b/public/language/ar/topic.json
@@ -1,24 +1,23 @@
 {
    "topic": "موضوع",
-    "title": "العنوان",
-    "no-topics-found": "لا توجد مواضيع !",
-    "no-posts-found": "لا  توجد مشاركات!",
-    "post-is-deleted": "هذه المشاركة محذوفة!",
-    "topic-is-deleted": "هذا الموضوع محذوف",
+    "title": "Title",
+    "no_topics_found": "لا توجد مواضيع !",
+    "no_posts_found": "لا  توجد مشاركات!",
+    "post_is_deleted": "هذه المشاركة محذوفة!",
+    "topic_is_deleted": "هذا الموضوع محذوف",
    "profile": "الملف الشخصي",
-    "posted-by": "كتب من طرف %1",
-    "posted-by-guest": "كتب من طرف زائر",
+    "posted_by": "كتب من طرف %1",
+    "posted_by_guest": "كتب من طرف زائر",
    "chat": "دردشة",
-    "notify-me": "تلق تنبيهات بالردود الجديدة في هذا الموضوع",
+    "notify_me": "تلق تنبيهات بالردود الجديدة في هذا الموضوع",
    "quote": "اقتبس",
    "reply": "رد",
-    "replies-to-this-post": "%1 الردود",
-    "one-reply-to-this-post": "1 رد",
-    "last-reply-time": "آخر رد",
-    "reply-options": "Reply options",
+    "replies_to_this_post": "%1 Replies",
+    "one_reply_to_this_post": "1 Reply",
+    "last_reply_time": "Last reply",
    "reply-as-topic": "رد بموضوع",
    "guest-login-reply": "يجب عليك تسجيل الدخول للرد",
-    "login-to-view": "سجل الدخول للمشاهدة",
+    "login-to-view": "🔒 Log in to view",
    "edit": "تعديل",
    "delete": "حذف",
    "delete-event": "Delete Event",
@@ -33,165 +32,142 @@
    "tools": "أدوات",
    "locked": "مقفل",
    "pinned": "مثبت",
-    "pinned-with-expiry": "مثبت حتى %1",
+    "pinned-with-expiry": "Pinned until %1",
    "scheduled": "Scheduled",
-    "deleted": "Deleted",
    "moved": "منقول",
    "moved-from": "Moved from %1",
-    "copy-code": "Copy Code",
    "copy-ip": "Copy IP",
    "ban-ip": "Ban IP",
    "view-history": "Edit History",
-    "wrote-ago": "wrote <a href=\"%1\" class=\"timeago text-muted\" title=\"%2\"></a>",
-    "wrote-on": "wrote on <a href=\"%1\" class=\"timeago text-muted\" title=\"%2\"></a>",
-    "replied-to-user-ago": "replied to <a component=\"post/parent\" data-topid=\"%1\" href=\"%2\">%3</a> <a href=\"%4\" class=\"timeago text-muted\" title=\"%5\"></a>",
-    "replied-to-user-on": "replied to <a component=\"post/parent\" data-topid=\"%1\" href=\"%2\">%3</a> on <a href=\"%4\" class=\"timeago text-muted\" title=\"%5\"></a>",
-    "user-locked-topic-ago": "%1 locked this topic %2",
-    "user-locked-topic-on": "%1 locked this topic on %2",
-    "user-unlocked-topic-ago": "%1 unlocked this topic %2",
-    "user-unlocked-topic-on": "%1 unlocked this topic on %2",
-    "user-pinned-topic-ago": "%1 pinned this topic %2",
-    "user-pinned-topic-on": "%1 pinned this topic on %2",
-    "user-unpinned-topic-ago": "%1 unpinned this topic %2",
-    "user-unpinned-topic-on": "%1 unpinned this topic on %2",
-    "user-deleted-topic-ago": "%1 deleted this topic %2",
-    "user-deleted-topic-on": "%1 deleted this topic on %2",
-    "user-restored-topic-ago": "%1 restored this topic %2",
-    "user-restored-topic-on": "%1 restored this topic on %2",
-    "user-moved-topic-from-ago": "%1 moved this topic from %2 %3",
-    "user-moved-topic-from-on": "%1 moved this topic from %2 on %3",
-    "user-queued-post-ago": "%1 <a href=\"%2\">queued</a> post for approval %3",
-    "user-queued-post-on": "%1 <a href=\"%2\">queued</a> post for approval on %3",
-    "user-referenced-topic-ago": "%1 <a href=\"%2\">referenced</a> this topic %3",
-    "user-referenced-topic-on": "%1 <a href=\"%2\">referenced</a> this topic on %3",
-    "user-forked-topic-ago": "%1 <a href=\"%2\">forked</a> this topic %3",
-    "user-forked-topic-on": "%1 <a href=\"%2\">forked</a> this topic on %3",
-    "bookmark-instructions": "اضغط هنا للعودة لأخر مشاركة مقروءة في الموضوع",
+    "locked-by": "Locked by",
+    "unlocked-by": "Unlocked by",
+    "pinned-by": "Pinned by",
+    "unpinned-by": "Unpinned by",
+    "deleted-by": "Deleted by",
+    "restored-by": "Restored by",
+    "moved-from-by": "Moved from %1 by",
+    "queued-by": "Post queued for approval &rarr;",
+    "backlink": "Referenced by",
+    "forked-by": "Forked by",
+    "bookmark_instructions": "اضغط هنا للعودة لأخر مشاركة مقروءة في الموضوع",
    "flag-post": "Flag this post",
    "flag-user": "Flag this user",
    "already-flagged": "Already Flagged",
    "view-flag-report": "View Flag Report",
    "resolve-flag": "Resolve Flag",
-    "merged-message": "This topic has been merged into <a href=\"%1\">%2</a>",
-    "forked-message": "This topic was forked from <a href=\"%1\">%2</a>",
-    "deleted-message": "هذه المشاركة محذوفة. فقط من لهم صلاحية الإشراف على ا لمشاركات يمكنهم معاينتها.",
-    "following-topic.message": "ستستلم تنبيها عند كل مشاركة جديدة في هذا الموضوع.",
-    "not-following-topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
-    "ignoring-topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
-    "login-to-subscribe": "المرجو إنشاء حساب أو تسجيل الدخول حتى يمكنك متابعة هذا الموضوع.",
+    "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
+    "deleted_message": "هذه المشاركة محذوفة. فقط من لهم صلاحية الإشراف على ا لمشاركات يمكنهم معاينتها.",
+    "following_topic.message": "ستستلم تنبيها عند كل مشاركة جديدة في هذا الموضوع.",
+    "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
+    "login_to_subscribe": "المرجو إنشاء حساب أو تسجيل الدخول حتى يمكنك متابعة هذا الموضوع.",
    "markAsUnreadForAll.success": "تم تحديد الموضوع على أنه غير مقروء.",
-    "mark-unread": "حدده كغير مقروء",
-    "mark-unread.success": "الموضوع حدد على أنه غير مقروء",
+    "mark_unread": "حدده كغير مقروء",
+    "mark_unread.success": "الموضوع حدد على أنه غير مقروء",
    "watch": "مراقبة",
    "unwatch": "الغاء المراقبة",
    "watch.title": "استلم تنبيها بالردود الجديدة في هذا الموضوع",
    "unwatch.title": "ألغ مراقبة هذا الموضوع",
-    "share-this-post": "انشر هذا الموضوع",
+    "share_this_post": "انشر هذا الموضوع",
    "watching": "مراقبة",
    "not-watching": "غير مراقب",
    "ignoring": "تجاهل",
    "watching.description": "بلغني بالردود الجديدة<br/>\nاظهر الموضوع في غير مقروء",
    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
-    "thread-tools.title": "أدوات الموضوع",
-    "thread-tools.markAsUnreadForAll": "Mark Unread For All",
-    "thread-tools.pin": "علق الموضوع",
-    "thread-tools.unpin": "إلغاء تعليق الموضوع",
-    "thread-tools.lock": "أقفل الموضوع",
-    "thread-tools.unlock": "إلغاء إقفال الموضوع",
-    "thread-tools.move": "نقل الموضوع",
-    "thread-tools.move-posts": "Move Posts",
-    "thread-tools.move-all": "نقل الكل",
-    "thread-tools.change-owner": "Change Owner",
-    "thread-tools.select-category": "Select Category",
-    "thread-tools.fork": "إنشاء فرع الموضوع",
-    "thread-tools.tag": "Tag Topic",
-    "thread-tools.delete": "حذف الموضوع",
-    "thread-tools.delete-posts": "مشاركات محذوفة",
-    "thread-tools.delete-confirm": "هل أنت متأكد أنك تريد حذف هذا الموضوع؟",
-    "thread-tools.restore": "استعادة الموضوع",
-    "thread-tools.restore-confirm": "هل أنت متأكد أنك تريد استعادة هذا الموضوع؟",
-    "thread-tools.purge": "تطهير الموضوع",
-    "thread-tools.purge-confirm": "هل أنت متأكد أنك تريد تطهير هذا الموضوع؟",
-    "thread-tools.merge-topics": "Merge Topics",
-    "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.",
-    "topic-move-undone": "Topic move undone",
-    "topic-move-posts-success": "Posts will be moved shortly. Click here to undo.",
-    "topic-move-posts-undone": "Post move undone",
-    "post-delete-confirm": "هل أنت متأكد أنك تريد حذف هذه المشاركة؟",
-    "post-restore-confirm": "هل أنت متأكد أنك تريد استعادة هذه المشاركة؟",
-    "post-purge-confirm": "هل أنت متأكد أنك تريد تطهير هذه المشاركة؟",
+    "thread_tools.title": "أدوات الموضوع",
+    "thread_tools.markAsUnreadForAll": "Mark Unread For All",
+    "thread_tools.pin": "علق الموضوع",
+    "thread_tools.unpin": "إلغاء تعليق الموضوع",
+    "thread_tools.lock": "أقفل الموضوع",
+    "thread_tools.unlock": "إلغاء إقفال الموضوع",
+    "thread_tools.move": "نقل الموضوع",
+    "thread_tools.move-posts": "Move Posts",
+    "thread_tools.move_all": "نقل الكل",
+    "thread_tools.change_owner": "Change Owner",
+    "thread_tools.select_category": "Select Category",
+    "thread_tools.fork": "إنشاء فرع الموضوع",
+    "thread_tools.delete": "حذف الموضوع",
+    "thread_tools.delete-posts": "مشاركات محذوفة",
+    "thread_tools.delete_confirm": "هل أنت متأكد أنك تريد حذف هذا الموضوع؟",
+    "thread_tools.restore": "استعادة الموضوع",
+    "thread_tools.restore_confirm": "هل أنت متأكد أنك تريد استعادة هذا الموضوع؟",
+    "thread_tools.purge": "تطهير الموضوع",
+    "thread_tools.purge_confirm": "هل أنت متأكد أنك تريد تطهير هذا الموضوع؟",
+    "thread_tools.merge_topics": "Merge Topics",
+    "thread_tools.merge": "Merge",
+    "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.",
+    "topic_move_undone": "Topic move undone",
+    "topic_move_posts_success": "Posts will be moved shortly. Click here to undo.",
+    "topic_move_posts_undone": "Post move undone",
+    "post_delete_confirm": "هل أنت متأكد أنك تريد حذف هذه المشاركة؟",
+    "post_restore_confirm": "هل أنت متأكد أنك تريد استعادة هذه المشاركة؟",
+    "post_purge_confirm": "هل أنت متأكد أنك تريد تطهير هذه المشاركة؟",
    "pin-modal-expiry": "Expiration Date",
    "pin-modal-help": "You can optionally set an expiration date for the pinned topic(s) here. Alternatively, you can leave this field blank to have the topic stay pinned until it is manually unpinned.",
-    "load-categories": "تحميل الفئات",
-    "confirm-move": "انقل",
-    "confirm-fork": "فرع",
+    "load_categories": "تحميل الفئات",
+    "confirm_move": "انقل",
+    "confirm_fork": "فرع",
    "bookmark": "Bookmark",
    "bookmarks": "Bookmarks",
-    "bookmarks.has-no-bookmarks": "You haven't bookmarked any posts yet.",
+    "bookmarks.has_no_bookmarks": "You haven't bookmarked any posts yet.",
    "copy-permalink": "Copy Permalink",
-    "loading-more-posts": "تحميل المزيد من المشاركات",
-    "move-topic": "نقل الموضوع",
-    "move-topics": "نقل المواضيع",
-    "move-post": "نقل المشاركة",
-    "post-moved": "تم نقل المشاركة",
-    "fork-topic": "فرع الموضوع",
+    "loading_more_posts": "تحميل المزيد من المشاركات",
+    "move_topic": "نقل الموضوع",
+    "move_topics": "نقل المواضيع",
+    "move_post": "نقل المشاركة",
+    "post_moved": "تم نقل المشاركة",
+    "fork_topic": "فرع الموضوع",
    "enter-new-topic-title": "Enter new topic title",
-    "fork-topic-instruction": "Click the posts you want to fork, enter a title for the new topic and click fork topic",
-    "fork-no-pids": "لم تختر أي مشاركة",
+    "fork_topic_instruction": "إضغط على المشاركات التي تريد تفريعها",
+    "fork_no_pids": "لم تختر أي مشاركة",
    "no-posts-selected": "No posts selected!",
    "x-posts-selected": "%1 post(s) selected",
    "x-posts-will-be-moved-to-y": "%1 post(s) will be moved to \"%2\"",
-    "fork-pid-count": "1% مشاركة محددة",
-    "fork-success": "تم إنشاء فرع للموضوع بنجاح! إضغط هنا لمعاينة الفرع.",
-    "delete-posts-instruction": "Click the posts you want to delete/purge",
-    "merge-topics-instruction": "Click the topics you want to merge or search for them",
+    "fork_pid_count": "1% مشاركة محددة",
+    "fork_success": "تم إنشاء فرع للموضوع بنجاح! إضغط هنا لمعاينة الفرع.",
+    "delete_posts_instruction": "Click the posts you want to delete/purge",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
    "merge-topic-list-title": "List of topics to be merged",
    "merge-options": "Merge options",
    "merge-select-main-topic": "Select the main topic",
    "merge-new-title-for-topic": "New title for topic",
    "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",
+    "move_posts_instruction": "Click the posts you want to move then enter a topic ID or go to the target topic",
+    "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.discard": "نبذ التغييرات",
    "composer.submit": "حفظ",
    "composer.additional-options": "Additional Options",
-    "composer.post-later": "Post Later",
    "composer.schedule": "Schedule",
-    "composer.replying-to": "الرد على %1",
-    "composer.new-topic": "موضوع جديد",
-    "composer.editing-in": "Editing post in %1",
+    "composer.replying_to": "الرد على %1",
+    "composer.new_topic": "موضوع جديد",
+    "composer.editing": "Editing",
    "composer.uploading": "جاري الرفع",
-    "composer.thumb-url-label": "ألصق رابط الصورة المصغرة للموضوع",
-    "composer.thumb-title": "إضافة صورة مصغرة للموضوع",
-    "composer.thumb-url-placeholder": "http://example.com/thumb.png",
-    "composer.thumb-file-label": "أو قم برفع ملف",
-    "composer.thumb-remove": "تفريغ الخانات",
-    "composer.drag-and-drop-images": "اسحب وأسقص الصور هنا",
-    "more-users-and-guests": "%1 مستخدم(ين) و %2 زائر(ين)",
-    "more-users": "%1 مستخدم(ين)",
-    "more-guests": "%1 زائر(ين)",
-    "users-and-others": "%1 و %2 آخرين",
-    "sort-by": "ترتيب حسب",
-    "oldest-to-newest": "من الأقدم إلى الأحدث",
-    "newest-to-oldest": "من الأحدث إلى الأقدم",
-    "recently-replied": "Recently Replied",
-    "recently-created": "Recently Created",
-    "most-votes": "Most Votes",
-    "most-posts": "Most Posts",
-    "most-views": "Most Views",
+    "composer.thumb_url_label": "ألصق رابط الصورة المصغرة للموضوع",
+    "composer.thumb_title": "إضافة صورة مصغرة للموضوع",
+    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
+    "composer.thumb_file_label": "أو قم برفع ملف",
+    "composer.thumb_remove": "تفريغ الخانات",
+    "composer.drag_and_drop_images": "اسحب وأسقص الصور هنا",
+    "more_users_and_guests": "%1 مستخدم(ين) و %2 زائر(ين)",
+    "more_users": "%1 مستخدم(ين)",
+    "more_guests": "%1 زائر(ين)",
+    "users_and_others": "%1 و %2 آخرين",
+    "sort_by": "ترتيب حسب",
+    "oldest_to_newest": "من الأقدم إلى الأحدث",
+    "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": "موضوع جديد",
-    "stale.reply-anyway": "الرد على هذا الموضوع",
-    "link-back": "رد:  [%1](%2)",
+    "stale.reply_anyway": "الرد على هذا الموضوع ",
+    "link_back": "رد:  [%1](%2)",
    "diffs.title": "Post Edit History",
    "diffs.description": "This post has <strong>%1</strong> revisions. Click one of the revisions below to see the post content at that point in time.",
    "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
@@ -202,19 +178,11 @@
    "diffs.post-restored": "Post successfully restored to earlier revision",
    "diffs.delete": "Delete this revision",
    "diffs.deleted": "Revision deleted",
-    "timeago-later": "%1 later",
-    "timeago-earlier": "%1 earlier",
+    "timeago_later": "%1 later",
+    "timeago_earlier": "%1 earlier",
    "first-post": "First 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",
-    "open-composer": "Open composer",
-    "post-quick-reply": "Quick reply",
-    "navigator.index": "Post %1 of %2",
-    "navigator.unread": "%1 unread",
-    "upvote-post": "Upvote post",
-    "downvote-post": "Downvote post",
-    "post-tools": "Post tools",
-    "unread-posts-link": "Unread posts link",
-    "thumb-image": "Topic thumbnail image"
+    "post-quick-reply": "Post quick reply"
 }
--- a/public/language/ar/unread.json
+++ b/public/language/ar/unread.json
@@ -1,13 +1,12 @@
 {
    "title": "غير مقروء",
-    "no-unread-topics": "ليس هناك أي موضوع غير مقروء",
-    "load-more": "حمل المزيد",
-    "mark-as-read": "حدد غير مقروء",
-    "mark-as-unread": "Mark as Unread",
+    "no_unread_topics": "ليس هناك أي موضوع غير مقروء",
+    "load_more": "حمل المزيد",
+    "mark_as_read": "حدد غير مقروء",
    "selected": "المحددة",
    "all": "الكل",
-    "all-categories": "كل الفئات",
-    "topics-marked-as-read.success": "تم تحديد المواضيع على أنها مقروءة!",
+    "all_categories": "كل الفئات",
+    "topics_marked_as_read.success": "تم تحديد المواضيع على أنها مقروءة!",
    "all-topics": "كل المواضيع",
    "new-topics": "مواضيع جديدة",
    "watched-topics": "المواضيع المتابعة",
--- a/public/language/ar/user.json
+++ b/public/language/ar/user.json
@@ -1,33 +1,30 @@
 {
-    "user-menu": "User menu",
    "banned": "محظور",
-    "unbanned": "Unbanned",
-    "muted": "كتم",
-    "unmuted": "Unmuted",
+    "muted": "Muted",
    "offline": "غير متصل",
    "deleted": "محذوف",
    "username": "إسم المستخدم",
    "joindate": "تاريخ الإنضمام",
    "postcount": "عدد المشاركات",
    "email": "البريد الإلكتروني",
-    "confirm-email": "تأكيد عنوان البريد الإلكتروني",
-    "account-info": "معلومات الحساب",
-    "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>",
-    "delete-all": "Delete <strong>Account</strong> and <strong>Content</strong>",
-    "delete-account-confirm": "Are you sure you want to anonymize your posts and delete your account?<br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your password to confirm that you wish to destroy this account.",
-    "delete-this-account-confirm": "Are you sure you want to delete this account while leaving its contents behind?<br /><strong>This action is irreversible, posts will be anonymized, and you will not be able to restore post associations with the deleted account</strong><br /><br />",
-    "delete-account-content-confirm": "Are you sure you want to delete this account's content (posts/topics/uploads)? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
-    "delete-all-confirm": "Are you sure you want to delete this account and all of its content (posts/topics/uploads)? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
+    "confirm_email": "تأكيد عنوان البريد الإلكتروني",
+    "account_info": "معلومات الحساب",
+    "admin_actions_label": "Administrative Actions",
+    "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>",
+    "delete_all": "Delete <strong>Account</strong> and <strong>Content</strong>",
+    "delete_account_confirm": "Are you sure you want to anonymize your posts and delete your account?<br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your password to confirm that you wish to destroy this account.",
+    "delete_this_account_confirm": "Are you sure you want to delete this account while leaving its contents behind?<br /><strong>This action is irreversible, posts will be anonymized, and you will not be able to restore post associations with the deleted account</strong><br /><br />",
+    "delete_account_content_confirm": "Are you sure you want to delete this account's content (posts/topics/uploads)? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
+    "delete_all_confirm": "Are you sure you want to delete this account and all of its content (posts/topics/uploads)? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
    "account-deleted": "تم حذف الحساب",
-    "account-content-deleted": "تم حذف محتوى حساب",
+    "account-content-deleted": "Account content deleted",
    "fullname": "الاسم الكامل",
    "website": "الموقع الإلكتروني",
    "location": "الموقع",
@@ -35,101 +32,92 @@
    "joined": "تاريخ التسجيل",
    "lastonline": "تاريخ آخر دخول",
    "profile": "الملف الشخصي",
-    "profile-views": "عدد المشاهدات",
+    "profile_views": "عدد المشاهدات",
    "reputation": "السمعة",
-    "bookmarks": "المفضلات",
-    "watched-categories": "الأقسام المُتابعة",
-    "watched-tags": "Watched tags",
-    "change-all": "غير الكل",
+    "bookmarks": "Bookmarks",
+    "watched_categories": "Watched categories",
+    "change_all": "Change All",
    "watched": "متابع",
    "ignored": "تم تجاهله",
-    "read": "Read",
-    "default-category-watch-state": "حالة مشاهدة اﻻقسام الافتراضية",
+    "default-category-watch-state": "Default category watch state",
    "followers": "المتابعون",
    "following": "يتابع",
-    "blocks": "الكتل",
-    "blocked-users": "Blocked users",
-    "block-toggle": "تبديل الكتلة",
-    "block-user": "أحظر المستخدم",
-    "unblock-user": "ألغ حظر المستخدم",
+    "blocks": "Blocks",
+    "block_toggle": "Toggle Block",
+    "block_user": "Block User",
+    "unblock_user": "Unblock User",
    "aboutme": "معلومة عنك او السيرة الذاتية",
    "signature": "توقيع",
    "birthday": "عيد ميلاد",
    "chat": "محادثة",
-    "chat-with": "متابعة الدردشة مع %1",
-    "new-chat-with": "بدء دردشة جديدة مع %1",
-    "flag-profile": "ضع علامة على الملف الشخصي",
+    "chat_with": "متابعة الدردشة مع %1",
+    "new_chat_with": "بدء دردشة جديدة مع %1",
+    "flag-profile": "Flag Profile",
    "follow": "تابع",
    "unfollow": "إلغاء المتابعة",
    "more": "المزيد",
-    "profile-update-success": "تم تحديث الملف الشخصي بنجاح",
-    "change-picture": "تغيير الصورة",
-    "change-username": "تغيير اسم المستخدم",
-    "change-email": "تغيير البريد اﻹلكتروني",
-    "email-updated": "Email Updated",
-    "email-same-as-password": "Please enter your current password to continue &ndash; you've entered your new email again",
+    "profile_update_success": "تم تحديث الملف الشخصي بنجاح",
+    "change_picture": "تغيير الصورة",
+    "change_username": "تغيير اسم المستخدم",
+    "change_email": "تغيير البريد اﻹلكتروني",
+    "email_same_as_password": "Please enter your current password to continue &ndash; you've entered your new email again",
    "edit": "تعديل",
    "edit-profile": "تعديل الملف الشخصي",
-    "default-picture": "أيقونة افتراضية",
-    "uploaded-picture": "الصورة المرفوعة",
-    "upload-new-picture": "رفع صورة جديدة",
-    "upload-new-picture-from-url": "رفع صورة جديدة من رابط",
-    "current-password": "كلمة السر الحالية",
-    "new-password": "New Password",
-    "change-password": "تغيير كلمة السر",
-    "change-password-error": "كلمة سر غير صحيحة",
-    "change-password-error-wrong-current": "كلمة السر الحالية ليست صحيحة",
-    "change-password-error-same-password": "Your new password matches your current password, please use a new password.",
-    "change-password-error-match": "كلمة السر غير مطابقة لتأكيد كلمة السر",
-    "change-password-error-privileges": "ليس لديك الصلاحيات الكافية لتغيير كلمة السر هذه.",
-    "change-password-success": "تم تحديث كلمة السر خاصتك.",
-    "confirm-password": "تأكيد كلمة السر",
+    "default_picture": "أيقونة افتراضية",
+    "uploaded_picture": "الصورة المرفوعة",
+    "upload_new_picture": "رفع صورة جديدة",
+    "upload_new_picture_from_url": "رفع صورة جديدة من رابط",
+    "current_password": "كلمة السر الحالية",
+    "change_password": "تغيير كلمة السر",
+    "change_password_error": "كلمة سر غير صحيحة",
+    "change_password_error_wrong_current": "كلمة السر الحالية ليست صحيحة",
+    "change_password_error_match": "كلمة السر غير مطابقة لتأكيد كلمة السر",
+    "change_password_error_privileges": "ليس لديك الصلاحيات الكافية لتغيير كلمة السر هذه.",
+    "change_password_success": "تم تحديث كلمة السر خاصتك.",
+    "confirm_password": "تأكيد كلمة السر",
    "password": "كلمة السر",
-    "username-taken-workaround": "اسم المستخدم الذي اخترته مستخدم سابقا، لذلك قمنا بتغييره لك قليلا. أنت الآن مسجل بالاسم <strong>%1</strong>",
-    "password-same-as-username": "كلمة المرور مطابقة لاسم المستخدم الخاص بك، يرجى تحديد كلمة مرور أخرى.",
-    "password-same-as-email": "كلمة المرور مطابقة لبريدك الإلكتروني، يرجى تحديد كلمة مرور أخرى.",
-    "weak-password": "كلمة مرور ضعيفة.",
-    "upload-picture": "ارفع الصورة",
-    "upload-a-picture": "رفع صورة",
-    "remove-uploaded-picture": "إزالة الصورة المرفوعة",
-    "upload-cover-picture": "رفع صورة الغلاف",
-    "remove-cover-picture-confirm": "هل تريد بالتأكيد إزالة صورة الغلاف؟",
-    "crop-picture": "إقتصاص الصورة",
-    "upload-cropped-picture": "إقتصاص ورفع",
-    "avatar-background-colour": "لون الخلفية للصورة الرمزية",
+    "username_taken_workaround": "اسم المستخدم الذي اخترته مستخدم سابقا، لذلك قمنا بتغييره لك قليلا. أنت الآن مسجل بالاسم <strong>%1</strong>",
+    "password_same_as_username": "كلمة المرور مطابقة لاسم المستخدم الخاص بك، يرجى تحديد كلمة مرور أخرى.",
+    "password_same_as_email": "كلمة المرور مطابقة لبريدك الإلكتروني، يرجى تحديد كلمة مرور أخرى.",
+    "weak_password": "كلمة مرور ضعيفة.",
+    "upload_picture": "ارفع الصورة",
+    "upload_a_picture": "رفع صورة",
+    "remove_uploaded_picture": "إزالة الصورة المرفوعة",
+    "upload_cover_picture": "رفع صورة الغلاف",
+    "remove_cover_picture_confirm": "هل تريد بالتأكيد إزالة صورة الغلاف؟",
+    "crop_picture": "إقتصاص الصورة",
+    "upload_cropped_picture": "إقتصاص ورفع",
+    "avatar-background-colour": "Avatar background colour",
    "settings": "خيارات",
-    "show-email": "أظهر بريدي الإلكتروني",
-    "show-fullname": "أظهر اسمي الكامل",
-    "restrict-chats": "لاتسمح بورود محادثات إلا من طرف المستخدمين الذين أتابعهم.",
-    "digest-label": "اشترك في النشرة الدورية",
-    "digest-description": "استلام اشعارات بآخر مستجدات هذا القسم (التنبيهات والمواضيع الجديدة) عبر البريد الإلكتروني وفقا لجدول زمني محدد.",
-    "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-read-topics": "This user hasn't read any topics yet.",
-    "has-no-upvoted-posts": "هذا المستخدم لم يقم بالتصويت للأعلى لأي مشاركة حتى الآن.",
-    "has-no-downvoted-posts": "هذا المستخدم لم يقم بالتصويت للأسفل لأي مشاركة حتى الآن.",
-    "has-no-controversial-posts": "هذا المستخدم ﻻيمتلك تصويت للأسفل لأي مشاركة حتى الآن.",
-    "has-no-blocks": "أنت لم تحظر اي مستخدم",
-    "email-hidden": "البريد الإلكتروني مخفي",
+    "show_email": "أظهر بريدي الإلكتروني",
+    "show_fullname": "أظهر اسمي الكامل",
+    "restrict_chats": "لاتسمح بورود محادثات إلا من طرف المستخدمين الذين أتابعهم.",
+    "digest_label": "اشترك في النشرة الدورية",
+    "digest_description": "استلام اشعارات بآخر مستجدات هذا القسم (التنبيهات والمواضيع الجديدة) عبر البريد الإلكتروني وفقا لجدول زمني محدد.",
+    "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_controversial_posts": "This user does not have any downvoted posts yet.",
+    "has_no_blocks": "You have blocked no users.",
+    "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": "لغة صفحة اﻻدارة",
-    "notifications": "التنبيهات",
+    "paginate_description": "عرض المواضيع والردود موزعة على صفحات عوضاً عن التمرير اللانهائي.",
+    "topics_per_page": "المواضيع في كل صفحة",
+    "posts_per_page": "الردود في كل صفحة",
+    "max_items_per_page": "أقصى %1",
+    "acp_language": "Admin Page Language",
+    "notifications": "Notifications",
    "upvote-notif-freq": "معدل تكرار تنبيهات التصويت للأعلى",
    "upvote-notif-freq.all": "كل التصويتات للأعلى",
    "upvote-notif-freq.first": "First Per Post",
@@ -138,28 +126,22 @@
    "upvote-notif-freq.logarithmic": "On 10, 100, 1000...",
    "upvote-notif-freq.disabled": "معطل",
    "browsing": "خيارات التصفح",
-    "open-links-in-new-tab": "فتح الروابط الخارجية في نافدة جديدة",
-    "enable-topic-searching": "تفعيل خاصية البحث داخل المواضيع",
-    "topic-search-help": "إذا قمت بتفعيل ميزة البحث في-الموضوع،  سيتم تجاوز الخيار الافتراضي للمتصفح مما يؤدي للبحث بكامل الموضوع بدلا عن البحث في الجزء الظاهر في الشاشة.",
-    "update-url-with-post-index": "Update url with post index while browsing topics",
-    "scroll-to-my-post": "بعد اضافة رد على المشاركة, قم بإظهار المشاركة",
-    "follow-topics-you-reply-to": "متابعة المواضيع التي تقوم بالرد عليها",
-    "follow-topics-you-create": "متابعة المواضيع التي تقوم بإنشائها",
+    "open_links_in_new_tab": "فتح الروابط الخارجية في نافدة جديدة",
+    "enable_topic_searching": "تفعيل خاصية البحث داخل المواضيع",
+    "topic_search_help": "إذا قمت بتفعيل ميزة البحث في-الموضوع،  سيتم تجاوز الخيار الافتراضي للمتصفح مما يؤدي للبحث بكامل الموضوع بدلا عن البحث في الجزء الظاهر في الشاشة.",
+    "update_url_with_post_index": "Update url with post index while browsing topics",
+    "scroll_to_my_post": "بعد اضافة رد على المشاركة, قم بإظهار المشاركة",
+    "follow_topics_you_reply_to": "متابعة المواضيع التي تقوم بالرد عليها",
+    "follow_topics_you_create": "متابعة المواضيع التي تقوم بإنشائها",
    "grouptitle": "عنوان المجموعة",
    "group-order-help": "Select a group and use the arrows to order titles",
-    "show-group-title": "Show group title",
-    "hide-group-title": "Hide group title",
-    "order-group-up": "Order group up",
-    "order-group-down": "Order group down",
    "no-group-title": "لا يوجد عنوان للمجموعة",
    "select-skin": "إختر سمة",
-    "default": "Default (%1)",
-    "no-skin": "No Skin",
    "select-homepage": "إختر الصفحة الرئيسية",
    "homepage": "الصفحة الرئيسية",
-    "homepage-description": "حدد صفحة لاستخدامها كصفحة رئيسية للمنتدى أو \"لا شيء\" لاستخدام الصفحة الرئيسية الافتراضية.",
-    "custom-route": "مسار الصفحة الرئيسية المخصصة",
-    "custom-route-help": "Enter a route name here, without any preceding slash (e.g. \"recent\" or \"category/2/general-discussion\")",
+    "homepage_description": "حدد صفحة لاستخدامها كصفحة رئيسية للمنتدى أو \"لا شيء\" لاستخدام الصفحة الرئيسية الافتراضية.",
+    "custom_route": "مسار الصفحة الرئيسية المخصصة",
+    "custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\" or \"category/2/general-discussion\")",
    "sso.title": "خدمات تسجيل الدخول الموحد",
    "sso.associated": "مرتبط مع",
    "sso.not-associated": "انقر هنا لربط مع",
@@ -167,16 +149,11 @@
    "sso.dissociate-confirm-title": "تأكيد الفصل",
    "sso.dissociate-confirm": "هل تريد بالتأكيد فصل حسابك عن %1؟",
    "info.latest-flags": "أحدث العلامات",
-    "info.profile": "Profile",
-    "info.post": "Post",
-    "info.view-flag": "View flag",
-    "info.reported-by": "Reported by:",
    "info.no-flags": "لم يتم العثور على مشاركات معلمة",
    "info.ban-history": "سجل الحظر الأحدث",
    "info.no-ban-history": "هذا المستخدم لم يتم حظره مطلقا",
    "info.banned-until": "محظور حتى %1",
    "info.banned-expiry": "Expiry",
-    "info.ban-expired": "Ban expired",
    "info.banned-permanently": "محظور بشكل دائم",
    "info.banned-reason-label": "سبب",
    "info.banned-no-reason": "لم يتم إعطاء سبب.",
@@ -191,35 +168,32 @@
    "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.",
-    "consent.email-intro": "Occasionally, we may send emails to your registered email address in order to provide updates and/or to notify you of new activity that is pertinent to you. You can customise the frequency of the community digest (including disabling it outright), as well as select which types of notifications to receive via email, via your user settings page.",
-    "consent.digest-frequency": "Unless explicitly changed in your user settings, this community delivers email digests every %1.",
-    "consent.digest-off": "Unless explicitly changed in your user settings, this community does not send out email digests",
+    "consent.email_intro": "Occasionally, we may send emails to your registered email address in order to provide updates and/or to notify you of new activity that is pertinent to you. You can customise the frequency of the community digest (including disabling it outright), as well as select which types of notifications to receive via email, via your user settings page.",
+    "consent.digest_frequency": "Unless explicitly changed in your user settings, this community delivers email digests every %1.",
+    "consent.digest_off": "Unless explicitly changed in your user settings, this community does not send out email digests",
    "consent.received": "You have provided consent for this website to collect and process your information. No additional action is required.",
-    "consent.not-received": "You have not provided consent for data collection and processing. At any time this website&apos;s administration may elect to delete your account in order to become compliant with the General Data Protection Regulation.",
+    "consent.not_received": "You have not provided consent for data collection and processing. At any time this website&apos;s administration may elect to delete your account in order to become compliant with the General Data Protection Regulation.",
    "consent.give": "Give consent",
-    "consent.right-of-access": "You have the Right of Access",
-    "consent.right-of-access-description": "You have the right to access any data collected by this website upon request. You can retrieve a copy of this data by clicking the appropriate button below.",
-    "consent.right-to-rectification": "You have the Right to Rectification",
-    "consent.right-to-rectification-description": "You have the right to change or update any inaccurate data provided to us. Your profile can be updated by editing your profile, and post content can always be edited. If this is not the case, please contact this site&apos;s administrative team.",
-    "consent.right-to-erasure": "You have the Right to Erasure",
-    "consent.right-to-erasure-description": "At any time, you are able to revoke your consent to data collection and/or processing by deleting your account. Your individual profile can be deleted, although your posted content will remain. If you wish to delete both your account <strong>and</strong> your content, please contact the administrative team for this website.",
-    "consent.right-to-data-portability": "You have the Right to Data Portability",
-    "consent.right-to-data-portability-description": "You may request from us a machine-readable export of any collected data about you and your account. You can do so by clicking the appropriate button below.",
-    "consent.export-profile": "Export Profile (.json)",
+    "consent.right_of_access": "You have the Right of Access",
+    "consent.right_of_access_description": "You have the right to access any data collected by this website upon request. You can retrieve a copy of this data by clicking the appropriate button below.",
+    "consent.right_to_rectification": "You have the Right to Rectification",
+    "consent.right_to_rectification_description": "You have the right to change or update any inaccurate data provided to us. Your profile can be updated by editing your profile, and post content can always be edited. If this is not the case, please contact this site&apos;s administrative team.",
+    "consent.right_to_erasure": "You have the Right to Erasure",
+    "consent.right_to_erasure_description": "At any time, you are able to revoke your consent to data collection and/or processing by deleting your account. Your individual profile can be deleted, although your posted content will remain. If you wish to delete both your account <strong>and</strong> your content, please contact the administrative team for this website.",
+    "consent.right_to_data_portability": "You have the Right to Data Portability",
+    "consent.right_to_data_portability_description": "You may request from us a machine-readable export of any collected data about you and your account. You can do so by clicking the appropriate button below.",
+    "consent.export_profile": "Export Profile (.json)",
    "consent.export-profile-success": "Exporting profile, you will get a notification when it is complete.",
-    "consent.export-uploads": "Export Uploaded Content (.zip)",
+    "consent.export_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": "Export Posts (.csv)",
    "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.",
-    "emailUpdate.pending": "Your email address has not yet been confirmed, but an email has been sent out requesting confirmation. If you wish to invalidate that request and send a new confirmation request, please fill in the form below."
+    "emailUpdate.password-challenge": "Please enter your password in order to verify account ownership."
 }
--- a/public/language/ar/users.json
+++ b/public/language/ar/users.json
@@ -1,25 +1,23 @@
 {
-    "all-users": "All Users",
-    "followed-users": "Followed Users",
-    "latest-users": "أحدث الأعضاء",
-    "top-posters": "اﻷكثر مشاركة",
-    "most-reputation": "أعلى سمعة",
-    "most-flags": "معظم الأعلام",
+    "latest_users": "أحدث الأعضاء",
+    "top_posters": "اﻷكثر مشاركة",
+    "most_reputation": "أعلى سمعة",
+    "most_flags": "Most Flags",
    "search": "بحث",
-    "enter-username": "أدخل اسم مستخدم للبحث",
-    "search-user-for-chat": "Search for a user to start chat",
-    "load-more": "حمل المزيد",
+    "enter_username": "أدخل اسم مستخدم للبحث",
+    "search-user-for-chat": "ابحث عن مستخدم لبدء محادثة ",
+    "load_more": "حمل المزيد",
    "users-found-search-took": "تم إيجاد %1 مستخدمـ(ين)! استغرق البحث %2 ثانية.",
-    "filter-by": "تصفية بحسب",
+    "filter-by": "Filter By",
    "online-only": "المتصلون فقط",
    "invite": "دعوة",
-    "prompt-email": "البريد الإلكتروني:",
-    "groups-to-join": "المجموعات التي سيتم الانضمام إليها عند قبول الدعوة:",
+    "prompt-email": "Emails:",
+    "groups-to-join": "Groups to be joined when invite is accepted:",
    "invitation-email-sent": "تم إرسال دعوة بالبريد الإلكتروني إلى %1",
-    "user-list": "قائمة اﻷعضاء",
-    "recent-topics": "أحدث المواضيع",
-    "popular-topics": "المواضيع الأكثر شهرة",
-    "unread-topics": "المواضيع الغير مقروءة",
+    "user_list": "قائمة اﻷعضاء",
+    "recent_topics": "أحدث المواضيع",
+    "popular_topics": "المواضيع الأكثر شهرة",
+    "unread_topics": "المواضيع الغير مقروءة",
    "categories": "الأقسام",
    "tags": "الوسوم",
    "no-users-found": "لم يتم العثور على مستخدمين!"
--- a/public/language/bg/admin/admin.json
+++ b/public/language/bg/admin/admin.json
@@ -7,12 +7,5 @@
 	"changes-saved": "Промените са запазени",
 	"changes-saved-message": "Промените Ви в настройките на NodeBB  бяха запазени.",
 	"changes-not-saved": "Промените не са запазени",
-	"changes-not-saved-message": "Възникна проблем при запазването на промените Ви по NodeBB. (%1)",
-	"save-changes": "Запазване на промените",
-	"min": "Мин.:",
-	"max": "Макс.:",
-	"view": "Преглед",
-	"edit": "Редактиране",
-	"add": "Добавяне",
-	"select-icon": "Изберете иконка"
+	"changes-not-saved-message": "Възникна проблем при запазването на промените Ви по NodeBB. (%1)"
 }
--- a/public/language/bg/admin/advanced/cache.json
+++ b/public/language/bg/admin/advanced/cache.json
@@ -1,5 +1,4 @@
 {
-	"cache": "Кеш",
 	"post-cache": "Кеш за публикации",
 	"group-cache": "Кеш за групи",
 	"local-cache": "Локален кеш",
--- a/public/language/bg/admin/advanced/database.json
+++ b/public/language/bg/admin/advanced/database.json
@@ -5,7 +5,7 @@
 	"uptime-seconds": "Активно време в секунди",
 	"uptime-days": "Активно време в дни",

-	"mongo": "MongoDB",
+	"mongo": "Mongo",
 	"mongo.version": "Версия на MongoDB",
 	"mongo.storage-engine": "Система за съхранение",
 	"mongo.collections": "Колекции",
--- a/public/language/bg/admin/advanced/errors.json
+++ b/public/language/bg/admin/advanced/errors.json
@@ -1,5 +1,4 @@
 {
-	"errors": "Грешки",
 	"figure-x": "Фигура %1",
 	"error-events-per-day": "<code>%1</code> събития на ден",
 	"error.404": "Страницата не е намерена (Грешка 404)",
--- a/public/language/bg/admin/advanced/events.json
+++ b/public/language/bg/admin/advanced/events.json
@@ -9,9 +9,5 @@
 	"filter-type": "Вид събитие",
 	"filter-start": "Начална дата",
 	"filter-end": "Крайна дата",
-	"filter-user": "Филтриране по потребител",
-	"filter-user.placeholder": "Въведете име на потребител, за да филтрирате…",
-	"filter-group": "Филтриране по група",
-	"filter-group.placeholder": "Въведете име на група, за да филтрирате…",
-	"filter-per-page": "На страница"
+	"filter-perPage": "На страница"
 }
--- a/public/language/bg/admin/appearance/customise.json
+++ b/public/language/bg/admin/appearance/customise.json
@@ -1,8 +1,7 @@
 {
-	"customise": "Персонализиране",
-	"custom-css": "Персонализиран CSS/SASS",
-	"custom-css.description": "Въведете своите собствени декларации на CSS/SASS. Те ще бъдат приложени след всички останали стилове.",
-	"custom-css.enable": "Включване на персонализиран CSS/SASS",
+	"custom-css": "Персонализиран CSS/LESS",
+	"custom-css.description": "Въведете своите собствени декларации на CSS/LESS, те ще бъдат приложени след всички останали стилове.",
+	"custom-css.enable": "Включване на персонализиран CSS/LESS",

 	"custom-js": "Персонализиран код на Javascript",
 	"custom-js.description": "Въведете свой собствен код на javascript тук. Той ще бъде изпълнен след като страницата се зареди напълно.",
@@ -13,8 +12,5 @@
 	"custom-header.enable": "Включване на персонализирана заглавна част",

 	"custom-css.livereload": "Включване на моменталното презареждане",
-	"custom-css.livereload.description": "Ако включите това, всички сесии на всяко устройство, където използвате акаунта си, ще се презареждат, когато натискате „Запазване“.",
-	"bsvariables": "_variables.scss",
-	"bsvariables.description": "Тук може да промените променливите на bootstrap. Можете също да използвате и инструмент като <a href=\"https://bootstrap.build/app\">bootstrap.build</a> и да копирате резултата от него тук.<br/>Промените изискват повторно изграждане и рестартиране.",
-	"bsvariables.enable": "Включване на _variables.scss"
+	"custom-css.livereload.description": "Ако включите това, всички сесии на всяко устройство, където използвате акаунта си, ще се презареждат, когато натискате „Запазване“."
 }
--- a/public/language/bg/admin/appearance/skins.json
+++ b/public/language/bg/admin/appearance/skins.json
@@ -1,16 +1,7 @@
 {
-	"skins": "Облици",
-	"bootswatch-skins": "Облици от Bootswatch",
-	"custom-skins": "Персонализирани облици",
-	"add-skin": "Добавяне на облик",
-	"save-custom-skins": "Запазване на персонализираните облици",
-	"save-custom-skins-success": "Персонализираните облици са запазени успешно",
-	"custom-skin-name": "Име на персонализирания облик",
-	"custom-skin-variables": "Променливи на персонализирания облик",
 	"loading": "Зареждане на облиците…",
 	"homepage": "Начална страница",
 	"select-skin": "Изберете облик",
-	"revert-skin": "Отмяна на облика",
 	"current-skin": "Текущ облик",
 	"skin-updated": "Обликът е променен",
 	"applied-success": "Обликът „%1“ беше успешно приложен",
--- a/public/language/bg/admin/appearance/themes.json
+++ b/public/language/bg/admin/appearance/themes.json
@@ -1,9 +1,7 @@
 {
-    "themes": "Теми",
    "checking-for-installed": "Проверяване за инсталирани теми…",
    "homepage": "Начална страница",
    "select-theme": "Изберете тема",
-    "revert-theme": "Отмяна на темата",
    "current-theme": "Текуща тема",
    "no-themes": "Няма намерени инсталирани теми",
    "revert-confirm": "Наистина ли искате да възстановите стандартната тема на NodeBB?",
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`db.createUser( { user: 'nodebb', pwd: 'nodebb', roles: [ { role: 'readWrite', db: 'nodebb' }, { role: 'clusterMonitor', db: 'admin' } ] } )`