chore: bump version for alpha 2

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

.eslintignore

@@ -18,12 +18,3 @@ logs/
 .eslintrc
 test/files
 *.min.js
-
-/public/src/app.js
-/public/src/client.js
-/public/src/admin/admin.js
-/public/src/modules/translator.common.js
-/public/src/modules/pictureCropper.js
-/public/src/modules/ace-editor.js
-/public/src/client/account/header.js
-/public/src/client/test.js

.github/workflows/docker.yml

@@ -11,6 +11,9 @@ on:
   workflow_dispatch:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
+permissions:
+  contents: read
+
 jobs:
   release:
     runs-on: ubuntu-latest
@@ -21,13 +24,13 @@ jobs:
           fetch-depth: 0
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -43,7 +46,7 @@ jobs:
             type=raw,value=latest
 
       - name: Build and push Docker images
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           file: ./Dockerfile

.github/workflows/test.yaml

@@ -5,17 +5,25 @@ on:
     branches:
       - master
       - develop
+      - bootstrap5
   pull_request:
     branches:
       - master
       - develop
+      - bootstrap5
 
 defaults:
   run:
     shell: bash
 
+permissions:
+  contents: read
+
 jobs:
   test:
+    permissions:
+      checks: write  # for coverallsapp/github-action to create new checks
+      contents: read  # for actions/checkout to fetch code
     name: Lint and test
     strategy:
       fail-fast: false
@@ -42,7 +50,7 @@ jobs:
 
     services:
       postgres:
-        image: 'postgres:10-alpine'
+        image: 'postgres:14-alpine'
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
@@ -57,7 +65,7 @@ jobs:
           - 5432:5432
 
       redis:
-        image: 'redis:2.8.9'
+        image: 'redis:2.8.23'
         # Set health checks to wait until redis has started
         options: >-
           --health-cmd "redis-cli ping"
@@ -69,7 +77,7 @@ jobs:
           - 6379:6379
 
       mongo:
-        image: 'mongo:3.6'
+        image: 'mongo:3.7'
         ports:
           # Maps port 27017 on service container to the host
           - 27017:27017
@@ -194,6 +202,8 @@ jobs:
           parallel: true
 
   finish:
+    permissions:
+      checks: write  # for coverallsapp/github-action to create new checks
     needs: test
     runs-on: ubuntu-latest
     steps:

CHANGELOG.md

@@ -1,3 +1,458 @@
+#### v2.6.0 (2022-11-23)
+
+##### Chores
+
+* **i18n:**
+  *  fallback strings for new resources: nodebb.admin-settings-advanced (1d7dbf14)
+  *  fallback strings for new resources: nodebb.admin-settings-advanced (05b6758e)
+  *  fallback strings for new resources: nodebb.admin-settings-user, nodebb.admin-settings-email (9ad3b214)
+* **deps:**
+  *  update commitlint monorepo to v17.3.0 (#11058) (f4784205)
+  *  update dependency eslint to v8.28.0 (#11059) (d480f26b)
+  *  update dependency jsdom to v20.0.3 (#11054) (5750ded1)
+  *  update dependency jquery to v3.6.1 (#11048) (6611d44c)
+  *  update dependency eslint-config-nodebb to v0.2.1 (#11043) (07c81d5d)
+  *  update commitlint monorepo to v17.2.0 (#11026) (26be289e)
+  *  update dependency husky to v8.0.2 (#11018) (4b3978be)
+  *  update dependency eslint to v8.27.0 (#11004) (4fcef7c5)
+  *  update dependency jsdom to v20.0.2 (#11014) (a6e4fee1)
+  *  update dependency mocha to v10.1.0 (#10980) (ffa117ab)
+  *  update dependency eslint to v8.25.0 (3719233a)
+  *  update dependency jsdom to v20.0.1 (#10934) (241b7c4f)
+  *  update dependency eslint to v8.24.0 (#10922) (8bcbff33)
+  *  update commitlint monorepo (#10888) (3f30056a)
+  *  update postgres docker tag to v14 (#10829) (5aa55d29)
+  *  update dependency eslint to v8.23.1 (#10885) (0c6fb6e3)
+*  remove derpy extra changelog bits (445f09f0)
+*  incrementing version number - v2.5.8 (dec0e7de)
+*  update changelog for v2.5.8 (c9cd8975)
+*  incrementing version number - v2.5.7 (5836bf4a)
+*  incrementing version number - v2.5.6 (c7bd7dbf)
+*  incrementing version number - v2.5.5 (3509ed94)
+*  incrementing version number - v2.5.4 (e83260ca)
+*  incrementing version number - v2.5.3 (7e922936)
+*  incrementing version number - v2.5.2 (babcd17e)
+*  incrementing version number - v2.5.1 (ce3aa950)
+*  incrementing version number - v2.5.0 (01d276cb)
+*  incrementing version number - v2.4.5 (dd3e1a28)
+*  incrementing version number - v2.4.4 (d5525c87)
+*  incrementing version number - v2.4.3 (9c647c6c)
+*  incrementing version number - v2.4.2 (3aa7b855)
+*  incrementing version number - v2.4.1 (60cbd148)
+*  incrementing version number - v2.4.0 (4834cde3)
+*  incrementing version number - v2.3.1 (d2425942)
+*  incrementing version number - v2.3.0 (046ea120)
+
+##### New Features
+
+*  add permissions-policy header (864fe0f9)
+*  allow groups to be exempt from maintenance mode (3c85b944)
+*  add search data to filter:search.inContent (be92be4e)
+*  add relevant topic events to post objects (a584dae6)
+*  client-side hooks for navigator scroll action (135fe55b)
+*  j and k hotkeys in topic to navigate through it quickly (aeb94c32)
+*  a couple utility methods in navigator module to get and set count and index (9f9a835f)
+*  paginate recentposts.rss and (ebd7c05c)
+*  add quiet to action:settings.set (665f36b7)
+
+##### Bug Fixes
+
+*  https://github.com/NodeBB-Community/nodebb-plugin-custom-pages/issues/68 (110311b2)
+*  https://github.com/NodeBB-Community/nodebb-plugin-custom-pages/issues/68 (fc49665f)
+*  #11052, add missing await (bb82eb71)
+*  pin jquery version for all packages that include it as a subdependency (a87f64b4)
+*  #10877, define a resolution for jquery subdependency of timeago (5aaebdd3)
+*  #11044, allow banned users to post (abcfb631)
+*  check schedule privilege, closes #11032 (61090615)
+*  mixing of old and new bch syntax (1e484643)
+*  category ordering add test (61d32bde)
+*  use `--omit=dev` flag for npm instead of `--production` (53d47a58)
+*  update nav thumb on setIndex call (thx @barisusakli) (664bc5f5)
+*  do not call `navigator.update()` when `scrollToElement` is explicitly passed a new index value (b7287c1e)
+*  race condition where `navigator.update` was called when it should not be (fa643eb8)
+*  be tidier and explicitly clean up ctrl-f hotkey on topic page (5b9de0e5)
+*  listen to -d flag on cli upgrade (fe249fa5)
+*  automatically remove `lang` parameter if it matches the forum default (881c7c4d)
+* **deps:**
+  *  update socket.io packages to v4.5.4 (#11061) (709ca59d)
+  *  update dependency esbuild to v0.15.15 (#11056) (d449710e)
+  *  update dependency nodebb-theme-persona to v12.1.12 (#11057) (18eb35a1)
+  *  update dependency cropperjs to v1.5.13 (#11055) (13f3a048)
+  *  update dependency nodebb-plugin-markdown to v10.1.1 (#11047) (62a60cbf)
+  *  update dependency mongodb to v4.12.0 (#11049) (59b4d95f)
+  *  update dependency connect-pg-simple to v8 (#11033) (ca162c04)
+  *  update dependency ace-builds to v1.13.1 (#11045) (e0b9240d)
+  *  update dependency esbuild to v0.15.14 (a5355d78)
+  *  update dependency nodebb-theme-persona to v12.1.11 (2af7fd5f)
+  *  update dependency postcss to v8.4.19 (#11028) (b94bb1bf)
+  *  update dependency ace-builds to v1.13.0 (#11031) (313d0c32)
+  *  update dependency webpack to v5.75.0 (#11027) (40c9cc05)
+  *  update dependency yargs to v17.6.2 (#11025) (8d3907b5)
+  *  update dependency lru-cache to v7.14.1 (#11023) (1ea2a32b)
+  *  update dependency sharp to v0.31.2 (#11024) (51919f7a)
+  *  update dependency esbuild to v0.15.13 (#11021) (c4a1905b)
+  *  update dependency ioredis to v5.2.4 (#11022) (e144debb)
+  *  update dependency ace-builds to v1.12.5 (#11019) (de507f72)
+  *  update dependency mongodb to v4.11.0 (#10994) (9ca2482a)
+  *  update dependency autoprefixer to v10.4.13 (#11020) (35d67ad3)
+  *  update dependency nodebb-plugin-composer-default to v9.2.4 (#10998) (5a5771e1)
+  *  update dependency sanitize-html to v2.7.3 (#11008) (73a60854)
+  *  update dependency nodebb-plugin-composer-default to v9.2.3 (#10997) (ee4fde13)
+  *  update dependency esbuild to v0.15.12 (#10996) (29fddd65)
+  *  update dependency nodebb-plugin-composer-default to v9.2.2 (1fc2f1e8)
+  *  update dependency nodebb-theme-persona to v12.1.9 (6471b698)
+  *  bump composer-default (7b9e0847)
+  *  update dependency ace-builds to v1.12.3 (1e930f9d)
+  *  update dependency nodebb-theme-persona to v12.1.8 (#10982) (9900e5f4)
+  *  update dependency ace-builds to v1.12.2 (4260f0c2)
+  *  update dependency ace-builds to v1.12.1 (6485bc25)
+  *  update dependency ace-builds to v1.12.0 (#10978) (00ce8fd8)
+  *  update socket.io packages to v4.5.3 (#10977) (fb41fbe7)
+  *  update dependency nodebb-plugin-emoji to v4.0.6 (dcca3397)
+  *  update dependency esbuild to v0.15.11 (ff69c3e1)
+  *  update dependency @isaacs/ttlcache to v1.2.1 (647bbd57)
+  *  update dependency nodebb-plugin-mentions to v3.0.12 (60d0145b)
+  *  update dependency postcss to v8.4.18 (3c2a636c)
+  *  update dependency nodebb-plugin-spam-be-gone to v1.0.2 (#10958) (b68faa09)
+  *  update dependency body-parser to v1.20.1 (#10941) (0f63947b)
+  *  update dependency express to v4.18.2 (#10948) (ff53064c)
+  *  update dependency semver to v7.3.8 (#10937) (1b89b661)
+  *  update dependency nodebb-theme-persona to v12.1.7 (1873b527)
+  *  update dependency commander to v9.4.1 (#10928) (855a2bad)
+  *  update dependency postcss to v8.4.17 (#10929) (d84ee308)
+  *  update dependency nodemailer to v6.8.0 (#10925) (222ab6ae)
+  *  update dependency yargs to v17.6.0 (#10931) (7c3c3d02)
+  *  update dependency nodebb-plugin-spam-be-gone to v1.0.1 (#10912) (28d1844e)
+  *  update dependency ace-builds to v1.11.2 (#10923) (87c84fe8)
+  *  update dependency sharp to v0.31.1 (#10926) (8e23e410)
+  *  update dependency ace-builds to v1.11.1 (#10920) (ce77605a)
+  *  update dependency ace-builds to v1.11.0 (#10909) (d900fd17)
+  *  update dependency autoprefixer to v10.4.12 (#10911) (54294871)
+  *  update dependency compare-versions to v5 (#10890) (f971385b)
+  *  bump persona #10907 (846eda0a)
+  *  bump persona, #10907 (27c80d39)
+  *  update dependency mongodb to v4.10.0 (#10908) (bbe7f779)
+  *  update dependency nodebb-theme-persona to v12.1.3 (#10903) (0debc51b)
+  *  update dependency nodebb-plugin-2factor to v5.1.1 (02fe6875)
+  *  update dependency nodebb-theme-persona to v12.1.2 (425bf87b)
+  *  update dependency sanitize-html to v2.7.2 (#10893) (bfeb0368)
+  *  update dependency autoprefixer to v10.4.11 (#10892) (0758655a)
+  *  update dependency sharp to v0.31.0 (#10887) (2836be5c)
+  *  update socket.io packages to v4.5.2 (#10884) (22f3d0bb)
+  *  update dependency nodebb-plugin-2factor to v5.1.0 (#10886) (335990be)
+  *  update dependency autoprefixer to v10.4.10 (#10883) (0c2a88de)
+  *  update dependency winston to v3.8.2 (#10882) (d911a1bf)
+  *  update dependency pg to v8.8.0 (#10863) (01129a39)
+  *  update dependency nodebb-plugin-emoji to v4.0.5 (#10881) (34d243e4)
+  *  update dependency ioredis to v5.2.3 (#10861) (5e375e4a)
+  *  update dependency pg-cursor to v2.7.4 (#10862) (86b63fab)
+  *  update dependency mongodb to v4.9.1 (#10880) (5583ab95)
+  *  update dependency autoprefixer to v10.4.9 (#10879) (cc6798bb)
+  *  update dependency postcss to v8.4.16 (#10824) (8c680db5)
+  *  update dependency jquery to v3.6.1 (#10868) (6687f49b)
+  *  update dependency ace-builds to v1.10.1 (#10840) (c0c3ee01)
+  *  bump composer-default to v9.2.0 (29ddeaa1)
+
+##### Refactors
+
+*  don't prevent startup if staticDir is undefined (b34e859c)
+*  added new ajaxify method .cleanup, called before ajaxify.start. (3700174c)
+
+#### v2.5.8 (2022-11-09)
+
+##### Chores
+
+*  really fix indents this time (c2024f34)
+*  fix indents (d50512e7)
+*  add bootstrap5 to test runner for now (be5d6d29)
+*  incrementing version number - v2.5.7 (5836bf4a)
+*  update changelog for v2.5.7 (17e948ab)
+
+##### New Features
+
+*  new search hooks (b5d38bc6)
+*  add search data to filter:search.inContent (e3f21562)
+
+##### Bug Fixes
+
+*  pass csrf_token into calls to /register/abort, #11017 (2f9d8c35)
+*  check for csrf token on /register/abort, + theme changes for v2.x branches of themes (55a197a7)
+*  upgrade script to work from 0.x to 2.x (a31ba824)
+*  #10519, image height in emails (673261ff)
+*  fallback language strings for #10987 (b9c8c02f)
+*  #10993, apply autoLocale middleware to guests only (6f673f80)
+*  check cid as well as template (9227b82e)
+*  revert breaking change, add back SocketUser.emailConfirm (9ee30fe7)
+*  in appropriately named language key `email-confirm-email2` (09f3ac65)
+*  correctly pass dev flag to package installer (7672194c)
+*  use `--omit=dev` flag for npm instead of `--production` (09cfd0bd)
+
+##### Refactors
+
+*  use utils.debounce (d264c6ac)
+
+##### Tests
+
+*  fix tests again (06d15391)
+*  fix test (c833d3cd)
+
+#### v2.5.7 (2022-10-14)
+
+##### Chores
+
+*  incrementing version number - v2.5.6 (c7bd7dbf)
+*  update changelog for v2.5.6 (e92238d0)
+
+##### Performance Improvements
+
+*  speed up build (dd4e9cce)
+
+#### v2.5.6 (2022-10-13)
+
+##### Chores
+
+*  incrementing version number - v2.5.5 (3509ed94)
+*  update changelog for v2.5.5 (e7d0040d)
+
+##### Bug Fixes
+
+*  use admin:groups priv for groups (#10960) (b879b6a0)
+*  https://github.com/NodeBB/NodeBB/issues/10525 (e35b0a86)
+
+#### v2.5.5 (2022-10-11)
+
+##### Chores
+
+*  up plugins (b91ef6dd)
+*  incrementing version number - v2.5.4 (e83260ca)
+*  update changelog for v2.5.4 (aabf073c)
+
+#### v2.5.4 (2022-10-11)
+
+##### Chores
+
+*  🤔 (7240e8ce)
+*  incrementing version number - v2.5.3 (7e922936)
+*  update changelog for v2.5.3 (fdf240f6)
+
+##### Continuous Integration
+
+*  add minimum GitHub token permissions for workflows Signed-off-by: Ashish Kurmi <akurmi@stepsecurity.io> (fe0020fb)
+
+##### Bug Fixes
+
+*  EEXISTS error on linux if plugin/theme overrides core js file (ebd5dcc6)
+*  category ordering add test (177d9048)
+*  crash in category drag, closes #10932 (989b55d0)
+*  broken flag history on flag update (803398e9)
+*  scroll to post if theme doesn't have top navbar (aad0a618)
+*  add lru-cache to checked packages, to fix upgrade issue with lru-cache (14515f60)
+
+#### v2.5.3 (2022-09-19)
+
+##### Chores
+
+*  remove duplicate version increment lines in changelog (5dbcfef9)
+*  bring back treding plugins (8aa1596d)
+*  incrementing version number - v2.5.2 (babcd17e)
+*  update changelog for v2.5.2 (84b6a7c7)
+
+##### New Features
+
+*  store topic title and tags in diffs (#10900) (b5dd89e1)
+
+##### Bug Fixes
+
+*  #10906, allow `middleware.checkAccountPermissions` to be called with either uid or userslug in params (cf4f5447)
+*  #10896, unescape / in taskbar (8e2129f8)
+*  add back timeago to post history modal (d3e38df8)
+* **deps:**  bump composer-default to v9.1.1 (1d80a07e)
+
+##### Other Changes
+
+*  fix lint (3d5a6b39)
+
+##### Performance Improvements
+
+*  disable trending plugins, too slow due to nbbpm (b392450c)
+
+##### Tests
+
+*  add back /admin/extend/plugins test (1c9c39a8)
+
+#### v2.5.2 (2022-09-04)
+
+##### Chores
+
+*  incrementing version number - v2.5.1 (ce3aa950)
+*  update changelog for v2.5.1 (2b2fd4f3)
+
+##### Bug Fixes
+
+*  registration regression, closes #10875 (f6f37dc1)
+
+##### Other Changes
+
+*  fix lint error (b45e2413)
+
+##### Tests
+
+*  disable nbbpm test temporarily (1dc79d76)
+
+#### v2.5.1 (2022-09-02)
+
+##### Chores
+
+*  incrementing version number - v2.5.0 (01d276cb)
+*  update changelog for v2.5.0 (1076285d)
+
+##### Bug Fixes
+
+*  missing escape on ACP category backgroundImage property (67cb7035)
+* **deps:**  temporarily add back old textcomplete dependencies so emoji plugin can import them (61d1e9e0)
+
+#### v2.5.0 (2022-09-01)
+
+##### Breaking Changes
+
+*  reduce nodebb.min.js size by around 800kb (b7addffc)
+
+##### Chores
+
+* **i18n:**
+  *  fallback strings for new resources: nodebb.admin-settings-reputation (e20433ec)
+  *  fallback strings for new resources: nodebb.admin-settings-post (fcbbb4d6)
+  *  fallback strings for new resources: nodebb.admin-advanced-cache (90fc50e1)
+*  move @textcomplete and its modules to composer-default (3cbb7a3d)
+*  remove client-side js file for tpl that no longer exists (bc2ea860)
+*  incrementing version number - v2.4.5 (dd3e1a28)
+*  update changelog for v2.4.5 (d505cc47)
+
+* **deps:**
+  *  update dependency eslint to v8.22.0 (#10835) (8fce68d3)
+  *  update mongo docker tag to v3.7 (8afaed22)
+  *  update docker/setup-qemu-action action to v2 (4aecf399)
+  *  update redis docker tag to v2.8.23 (#10811) (269382e0)
+  *  update redis docker tag to v2.8.23 (#10811) (59fd0efe)
+
+##### Documentation Changes
+
+* **openapi:**  v3 spec for new user export routes (70652ad4)
+
+##### New Features
+
+*  remove visibilityjs (#10870) (19207325)
+*  introduce ACP defined option to rescind notif or do nothing on flag resolve/reject (15b1561f)
+*  allow v3 api to handle 202 and 204 response codes as well. (0cda5aa3)
+*  don't show signatures again in pagination mode in same topic (0a6900fc)
+*  setting to show signatures only once in topics, closes #10071 (aba420a3)
+*  add event type to topic event component (bcb94ede)
+*  allow plugins to add to admin cache list (#10833) (a9bbb586)
+
+##### Bug Fixes
+
+* **deps:**
+  *  update dependency compare-versions to v4.1.4 (884d4075)
+  *  update dependency mongodb to v4.9.0 (e51004e2)
+  *  update dependency lru-cache to v7.14.0 (d8a52f81)
+  *  bump composer-default to v9 (81f8d84f)
+  *  remove textcomplete in favour of @textcomplete/core (same package, just refactored) (b7bcc367)
+  *  update dependency nodebb-theme-persona to v12.1.1 (#10838) (444b4d57)
+  *  update dependency ace-builds to v1.9.5 (4c44d125)
+  *  update dependency lru-cache to v7.13.2 (4ddc0c7a)
+  *  update dependency nodemailer to v6.7.8 (dd385184)
+  *  pin dependency @isaacs/ttlcache to 1.2.0 (150a7488)
+  *  update dependency nodebb-plugin-composer-default to v8.0.1 (#10819) (9a7dd3a3)
+  *  update dependency nodebb-plugin-composer-default to v8.0.1 (#10819) (69c87c2c)
+*  empty thread tools container on open (a088eb19)
+*  add dropup handler to thread tools menu, updated how post tools menu adds dropup handler (c1936e87)
+*  empty thread tools container on open (df36d967)
+*  add dropup handler to thread tools menu, updated how post tools menu adds dropup handler (3dd3cd82)
+*  removing duplicate session rerolling code (as it is in passport@^0.6 now) (65b3996a)
+*  don't crash if post is undefined (e06e526e)
+*  return at least one in sizeCalculation (#10832) (3975fa2e)
+
+##### Refactors
+
+*  remove console.log (a2d0cd16)
+*  move export generation logic to v3 controller, GET/HEAD routes for exports (d0570518)
+*  use group.slug on acp group urls closes #8277 (14c79763)
+
+##### Tests
+
+*  have some build tests not pollute build folder (7c5a915d)
+*  User.hidePrivateData (b424ba46)
+*  passport0.6 (#10638) (33458701)
+
+#### v2.4.5 (2022-08-22)
+
+##### Chores
+
+*  incrementing version number - v2.4.4 (d5525c87)
+*  update changelog for v2.4.4 (77e492b8)
+
+##### Bug Fixes
+
+*  wrap passport.authenticate to pass in keepSessionInfo if not already set (9b96c33d)
+*  parseInt caller.uid closes #10849 (bc37a5c5)
+
+#### v2.4.4 (2022-08-18)
+
+##### Chores
+
+*  incrementing version number - v2.4.3 (9c647c6c)
+*  update changelog for v2.4.3 (06da15a5)
+
+##### Bug Fixes
+
+*  missing req, closes #10847 (489fb3a3)
+
+#### v2.4.3 (2022-08-18)
+
+##### Chores
+
+*  incrementing version number - v2.4.2 (3aa7b855)
+*  update changelog for v2.4.2 (ba7a3466)
+
+##### Bug Fixes
+
+*  #10845, disallow inline viewing of uploaded html files (4dc7fa05)
+
+#### v2.4.2 (2022-08-17)
+
+##### Chores
+
+*  incrementing version number - v2.4.1 (60cbd148)
+*  update changelog for v2.4.1 (4b6baabb)
+
+##### Documentation Changes
+
+*  explain what export routes actually do in OpenAPI documentation (#10836) (72e7b9f7)
+
+##### Bug Fixes
+
+*  #10841, incorrect conditional in email interstitial partial (ec048a01)
+*  don't crash if post is undefined (4a3e36a7)
+
+##### Tests
+
+*  passport0.6 (#10638) (6b2a6f90)
+
+#### v2.4.1 (2022-08-14)
+
+##### Chores
+
+* **deps:**
+  *  update docker/build-push-action action to v3 (bfd6318c)
+  *  update docker/login-action action to v2 (3d68accf)
+  *  update docker/setup-buildx-action action to v2 (371ac032)
+*  incrementing version number - v2.4.0 (4834cde3)
+*  update changelog for v2.4.0 (c4714ff7)
+
+##### Bug Fixes
+
+*  return at least one in sizeCalculation (#10832) (15ca460c)
+
 #### v2.4.0 (2022-08-10)
 
 ##### Chores
@@ -10,7 +465,6 @@
 *  opt-out of dependabot, due to conflicts with renovate (70d60289)
 *  incrementing version number - v2.3.1 (d2425942)
 *  update changelog for v2.3.1 (2f487175)
-*  incrementing version number - v2.3.0 (046ea120)
 * **i18n:**
   *  fallback strings for new resources: nodebb.admin-settings-email (cdaa8f21)
   *  fallback strings for new resources: nodebb.admin-settings-email (3e56c547)

Gruntfile.js

@@ -54,14 +54,9 @@ module.exports = function (grunt) {
 			}
 		}
 
-		const styleUpdated_Client = pluginList.map(p => `node_modules/${p}/*.less`)
+		const styleUpdated_Client = pluginList.map(p => `node_modules/${p}/*.scss`)
 			.concat(pluginList.map(p => `node_modules/${p}/*.css`))
-			.concat(pluginList.map(p => `node_modules/${p}/+(public|static|less)/**/*.less`))
-			.concat(pluginList.map(p => `node_modules/${p}/+(public|static)/**/*.css`));
-
-		const styleUpdated_Admin = pluginList.map(p => `node_modules/${p}/*.less`)
-			.concat(pluginList.map(p => `node_modules/${p}/*.css`))
-			.concat(pluginList.map(p => `node_modules/${p}/+(public|static|less)/**/*.less`))
+			.concat(pluginList.map(p => `node_modules/${p}/+(public|static|scss)/**/*.scss`))
 			.concat(pluginList.map(p => `node_modules/${p}/+(public|static)/**/*.css`));
 
 		const clientUpdated = pluginList.map(p => `node_modules/${p}/+(public|static)/**/*.js`);
@@ -72,24 +67,15 @@ module.exports = function (grunt) {
 		const langUpdated = pluginList.map(p => `node_modules/${p}/+(public|static|languages)/**/*.json`);
 
 		grunt.config(['watch'], {
-			styleUpdated_Client: {
+			styleUpdated: {
 				files: [
-					'public/less/**/*.less',
+					'public/scss/**/*.scss',
 					...styleUpdated_Client,
 				],
 				options: {
 					interval: 1000,
 				},
 			},
-			styleUpdated_Admin: {
-				files: [
-					'public/less/**/*.less',
-					...styleUpdated_Admin,
-				],
-				options: {
-					interval: 1000,
-				},
-			},
 			clientUpdated: {
 				files: [
 					'public/src/**/*.js',
@@ -138,10 +124,9 @@ module.exports = function (grunt) {
 		});
 		const build = require('./src/meta/build');
 		if (!grunt.option('skip')) {
-			await build.build(true, { webpack: false });
+			await build.build(true, { watch: true });
 		}
 		run();
-		await build.webpack({ watch: true });
 		done();
 	});
 
@@ -168,16 +153,14 @@ module.exports = function (grunt) {
 	grunt.event.removeAllListeners('watch');
 	grunt.event.on('watch', (action, filepath, target) => {
 		let compiling;
-		if (target === 'styleUpdated_Client') {
-			compiling = 'clientCSS';
-		} else if (target === 'styleUpdated_Admin') {
-			compiling = 'acpCSS';
+		if (target === 'styleUpdated') {
+			compiling = ['clientCSS', 'acpCSS'];
 		} else if (target === 'clientUpdated') {
-			compiling = 'js';
+			compiling = ['js'];
 		} else if (target === 'templatesUpdated') {
-			compiling = 'tpl';
+			compiling = ['tpl'];
 		} else if (target === 'langUpdated') {
-			compiling = 'lang';
+			compiling = ['lang'];
 		} else if (target === 'serverUpdated') {
 			// empty require cache
 			const paths = ['./src/meta/build.js', './src/meta/index.js'];
@@ -185,7 +168,7 @@ module.exports = function (grunt) {
 			return run();
 		}
 
-		require('./src/meta/build').build([compiling], { webpack: false }, (err) => {
+		require('./src/meta/build').build(compiling, { webpack: false }, (err) => {
 			if (err) {
 				winston.error(err.stack);
 			}

README.md

@@ -3,6 +3,7 @@
 [![Workflow](https://github.com/NodeBB/NodeBB/actions/workflows/test.yaml/badge.svg)](https://github.com/NodeBB/NodeBB/actions/workflows/test.yaml)
 [![Coverage Status](https://coveralls.io/repos/github/NodeBB/NodeBB/badge.svg?branch=master)](https://coveralls.io/github/NodeBB/NodeBB?branch=master)
 [![Code Climate](https://codeclimate.com/github/NodeBB/NodeBB/badges/gpa.svg)](https://codeclimate.com/github/NodeBB/NodeBB)
+[![](https://dcbadge.vercel.app/api/server/p6YKPXu7er?style=flat)](https://discord.gg/p6YKPXu7er)
 
 [**NodeBB Forum Software**](https://nodebb.org) is powered by Node.js and supports either Redis, MongoDB, or a PostgreSQL database. It utilizes web sockets for instant interactions and real-time notifications. NodeBB takes the best of the modern web: real-time streaming discussions, mobile responsiveness, and rich RESTful read/write APIs, while staying true to the original bulletin board/forum format → categorical hierarchies, local user accounts, and asynchronous messaging.
 

install/data/defaults.json

@@ -25,6 +25,7 @@
     "postQueue": 0,
     "postQueueReputationThreshold": 0,
     "groupsExemptFromPostQueue": ["administrators", "Global Moderators"],
+    "groupsExemptFromMaintenanceMode": ["administrators", "Global Moderators"],
     "minimumPostLength": 8,
     "maximumPostLength": 32767,
     "systemTags": "",
@@ -78,6 +79,7 @@
     "reputation:disabled": 0,
     "downvote:disabled": 0,
     "disableSignatures": 0,
+    "signatures:hideDuplicates": 0,
     "upvotesPerDay": 20,
     "upvotesPerUserPerDay": 6,
     "downvotesPerDay": 10,
@@ -93,6 +95,8 @@
     "min:rep:signature": 0,
     "flags:limitPerTarget": 0,
     "flags:autoFlagOnDownvoteThreshold": 0,
+    "flags:actionOnResolve": "rescind",
+    "flags:actionOnReject": "rescind",
     "notificationType_upvote": "notification",
     "notificationType_new-topic": "notification",
     "notificationType_new-reply": "notification",
@@ -143,6 +147,7 @@
     "maximumRelatedTopics": 0,
     "disableEmailSubscriptions": 0,
     "emailConfirmInterval": 10,
+    "emailConfirmExpiry": 24,
     "removeEmailNotificationImages": 0,
     "sendValidationEmail": 1,
     "includeUnverifiedEmails": 0,

install/data/navigation.json

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

install/package.json

@@ -2,8 +2,8 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "2.4.1",
-    "homepage": "http://www.nodebb.org",
+    "version": "3.0.0-alpha.2",
+    "homepage": "https://www.nodebb.org",
     "repository": {
         "type": "git",
         "url": "https://github.com/NodeBB/NodeBB/"
@@ -29,36 +29,39 @@
     },
     "dependencies": {
         "@adactive/bootstrap-tagsinput": "0.8.2",
-        "@isaacs/ttlcache": "^1.2.0",
-        "ace-builds": "1.8.1",
+        "@isaacs/ttlcache": "1.2.1",
+        "@popperjs/core": "2.11.6",
+        "ace-builds": "1.13.1",
         "archiver": "5.3.1",
         "async": "3.2.4",
-        "autoprefixer": "10.4.8",
+        "autoprefixer": "10.4.13",
         "bcryptjs": "2.4.3",
         "benchpressjs": "2.4.3",
-        "body-parser": "1.20.0",
-        "bootbox": "5.5.3",
-        "bootstrap": "3.4.1",
+        "body-parser": "1.20.1",
+        "bootbox": "https://github.com/makeusabrew/bootbox.git#v6-wip",
+        "bootstrap": "5.2.2",
+        "bootswatch": "5.2.2",
         "chalk": "4.1.2",
         "chart.js": "2.9.4",
         "cli-graph": "3.2.2",
         "clipboard": "2.0.11",
         "colors": "1.4.0",
-        "commander": "9.4.0",
-        "compare-versions": "4.1.3",
+        "commander": "9.4.1",
+        "compare-versions": "5.0.1",
         "compression": "1.7.4",
         "connect-flash": "0.1.1",
         "connect-mongo": "4.6.0",
         "connect-multiparty": "2.2.0",
-        "connect-pg-simple": "7.0.0",
+        "connect-pg-simple": "8.0.0",
         "connect-redis": "6.1.3",
         "cookie-parser": "1.4.6",
         "cron": "2.1.0",
-        "cropperjs": "1.5.12",
+        "cropperjs": "1.5.13",
         "csurf": "1.11.0",
         "daemon": "1.1.0",
         "diff": "5.1.0",
-        "express": "4.18.1",
+        "esbuild": "0.15.15",
+        "express": "4.18.2",
         "express-session": "1.17.3",
         "express-useragent": "1.0.15",
         "file-loader": "6.2.0",
@@ -67,7 +70,7 @@
         "helmet": "5.1.1",
         "html-to-text": "8.2.1",
         "ipaddr.js": "2.0.1",
-        "jquery": "3.6.0",
+        "jquery": "3.6.1",
         "jquery-deserialize": "2.0.0",
         "jquery-form": "4.3.0",
         "jquery-serializeobject": "1.0.0",
@@ -78,92 +81,98 @@
         "less": "4.1.3",
         "lodash": "4.17.21",
         "logrotate-stream": "0.2.8",
-        "lru-cache": "7.13.1",
+        "lru-cache": "7.14.1",
         "material-design-lite": "1.3.0",
         "mime": "3.0.0",
         "mkdirp": "1.0.4",
-        "mongodb": "4.8.1",
+        "mongodb": "4.12.1",
         "morgan": "1.10.0",
         "mousetrap": "1.6.5",
         "multiparty": "4.2.3",
-        "@nodebb/bootswatch": "3.4.2",
         "nconf": "0.12.0",
-        "nodebb-plugin-2factor": "5.0.2",
-        "nodebb-plugin-composer-default": "8.0.0",
-        "nodebb-plugin-dbsearch": "5.1.5",
-        "nodebb-plugin-emoji": "4.0.4",
-        "nodebb-plugin-emoji-android": "3.0.0",
-        "nodebb-plugin-markdown": "10.1.0",
-        "nodebb-plugin-mentions": "3.0.11",
-        "nodebb-plugin-spam-be-gone": "1.0.0",
+        "nodebb-plugin-2factor": "6.0.3",
+        "nodebb-plugin-composer-default": "10.0.16",
+        "nodebb-plugin-dbsearch": "6.0.0",
+        "nodebb-plugin-emoji": "5.0.3",
+        "nodebb-plugin-emoji-android": "4.0.0",
+        "nodebb-plugin-markdown": "11.0.2",
+        "nodebb-plugin-mentions": "4.0.2",
+        "nodebb-plugin-spam-be-gone": "2.0.4",
         "nodebb-rewards-essentials": "0.2.1",
-        "nodebb-theme-lavender": "6.0.0",
-        "nodebb-theme-persona": "12.1.0",
-        "nodebb-theme-slick": "2.0.2",
-        "nodebb-theme-vanilla": "12.1.18",
-        "nodebb-widget-essentials": "6.0.0",
-        "nodemailer": "6.7.7",
+        "nodebb-theme-lavender": "7.0.2",
+        "nodebb-theme-peace": "2.0.8",
+        "nodebb-theme-persona": "13.0.28",
+        "nodebb-widget-essentials": "7.0.2",
+        "nodemailer": "6.8.0",
         "nprogress": "0.2.0",
-        "passport": "0.5.2",
+        "passport": "0.6.0",
         "passport-http-bearer": "1.0.1",
         "passport-local": "1.0.0",
-        "pg": "8.7.3",
-        "pg-cursor": "2.7.3",
-        "postcss": "8.4.14",
+        "pg": "8.8.0",
+        "pg-cursor": "2.7.4",
+        "postcss": "8.4.19",
         "postcss-clean": "1.2.0",
+        "progress-webpack-plugin": "1.0.16",
         "prompt": "1.3.0",
-        "ioredis": "5.2.2",
+        "ioredis": "5.2.4",
         "request": "2.88.2",
         "request-promise-native": "1.0.9",
         "rimraf": "3.0.2",
         "rss": "1.2.2",
-        "sanitize-html": "2.7.1",
-        "semver": "7.3.7",
+        "rtlcss": "4.0.0",
+        "sanitize-html": "2.7.3",
+        "sass": "1.54.9",
+        "semver": "7.3.8",
         "serve-favicon": "2.5.0",
-        "sharp": "0.30.7",
+        "sharp": "0.31.2",
         "sitemap": "7.1.1",
         "slideout": "1.0.1",
-        "socket.io": "4.5.1",
-        "socket.io-client": "4.5.1",
+        "socket.io": "4.5.4",
+        "socket.io-client": "4.5.4",
         "@socket.io/redis-adapter": "7.2.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",
-        "uglify-es": "3.3.9",
         "validator": "13.7.0",
-        "visibilityjs": "2.0.2",
-        "webpack": "5.74.0",
+        "webpack": "5.75.0",
         "webpack-merge": "5.8.0",
-        "winston": "3.8.1",
+        "winston": "3.8.2",
         "xml": "1.0.1",
         "xregexp": "5.1.1",
-        "yargs": "17.5.1",
+        "yargs": "17.6.2",
         "zxcvbn": "4.4.2"
     },
     "devDependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@commitlint/cli": "17.0.3",
-        "@commitlint/config-angular": "17.0.3",
+        "@commitlint/cli": "17.3.0",
+        "@commitlint/config-angular": "17.3.0",
         "coveralls": "3.1.1",
-        "eslint": "8.21.0",
-        "eslint-config-nodebb": "0.1.1",
+        "eslint": "8.28.0",
+        "eslint-config-nodebb": "0.2.1",
         "eslint-plugin-import": "2.26.0",
         "grunt": "1.5.3",
         "grunt-contrib-watch": "1.1.0",
-        "husky": "8.0.1",
-        "jsdom": "20.0.0",
+        "husky": "8.0.2",
+        "jsdom": "20.0.3",
         "lint-staged": "13.0.3",
-        "mocha": "10.0.0",
+        "mocha": "10.1.0",
         "mocha-lcov-reporter": "1.3.0",
         "mockdate": "3.0.5",
         "nyc": "15.1.0",
         "smtp-server": "3.11.0"
     },
+    "optionalDependencies": {
+        "sass-embedded": "1.55.0"
+    },
+    "resolutions": {
+        "*/jquery": "3.6.1"
+    },
     "bugs": {
         "url": "https://github.com/NodeBB/NodeBB/issues"
     },
@@ -171,11 +180,6 @@
         "node": ">=12"
     },
     "maintainers": [
-        {
-            "name": "Andrew Rodrigues",
-            "email": "andrew@nodebb.org",
-            "url": "https://github.com/psychobunny"
-        },
         {
             "name": "Julian Lam",
             "email": "julian@nodebb.org",
@@ -187,4 +191,4 @@
             "url": "https://github.com/barisusakli"
         }
     ]
-}
+}

install/web.js

@@ -6,7 +6,6 @@ const bodyParser = require('body-parser');
 const fs = require('fs');
 const path = require('path');
 const childProcess = require('child_process');
-const less = require('less');
 
 const webpack = require('webpack');
 const nconf = require('nconf');
@@ -14,6 +13,7 @@ const nconf = require('nconf');
 const Benchpress = require('benchpressjs');
 const mkdirp = require('mkdirp');
 const { paths } = require('../src/constants');
+const sass = require('../src/utils').getSass();
 
 const app = express();
 let server;
@@ -73,7 +73,7 @@ web.install = async function (port) {
 	try {
 		await Promise.all([
 			compileTemplate(),
-			compileLess(),
+			compileSass(),
 			runWebpack(),
 			copyCSS(),
 			loadDefaults(),
@@ -247,23 +247,28 @@ async function compileTemplate() {
 	]);
 }
 
-async function compileLess() {
+async function compileSass() {
 	try {
-		const installSrc = path.join(__dirname, '../public/less/install.less');
+		const installSrc = path.join(__dirname, '../public/scss/install.scss');
 		const style = await fs.promises.readFile(installSrc);
-		const css = await less.render(String(style), { filename: path.resolve(installSrc) });
-		await fs.promises.writeFile(path.join(__dirname, '../public/installer.css'), css.css);
+		const scssOutput = sass.compileString(String(style), {
+			loadPaths: [
+				path.join(__dirname, '../public/scss'),
+			],
+		});
+
+		await fs.promises.writeFile(path.join(__dirname, '../public/installer.css'), scssOutput.css.toString());
 	} catch (err) {
-		winston.error(`Unable to compile LESS: \n${err.stack}`);
+		winston.error(`Unable to compile SASS: \n${err.stack}`);
 		throw err;
 	}
 }
 
 async function copyCSS() {
-	const src = await fs.promises.readFile(
-		path.join(__dirname, '../node_modules/bootstrap/dist/css/bootstrap.min.css'), 'utf8'
+	await fs.promises.copyFile(
+		path.join(__dirname, '../node_modules/bootstrap/dist/css/bootstrap.min.css'),
+		path.join(__dirname, '../public/bootstrap.min.css'),
 	);
-	await fs.promises.writeFile(path.join(__dirname, '../public/bootstrap.min.css'), src);
 }
 
 async function loadDefaults() {

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

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

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

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

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -51,6 +51,7 @@
 	"signature.disable": "Disable signatures",
 	"signature.no-links": "Disable links in signatures",
 	"signature.no-images": "Disable images in signatures",
+	"signature.hide-duplicates": "Hide duplicate signatures in topics",
 	"signature.max-length": "Maximum Signature Length",
 	"composer": "Composer Settings",
 	"composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.",

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

@@ -23,5 +23,9 @@
 	"flags.limit-per-target-placeholder": "Default: 0",
 	"flags.limit-per-target-help": "When a post or user is flagged multiple times, each additional flag is considered a "report" and added to the original flag. Set this option to a number other than zero to limit the number of reports an item can receive.",
   	"flags.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (Set to 0 to disable, default: 0)",
-	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned"
+	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned",
+	"flags.action-on-resolve": "Do the following when a flag is resolved",
+	"flags.action-on-reject": "Do the following when a flag is rejected",
+	"flags.action.nothing": "Do nothing",
+	"flags.action.rescind": "Rescind the notification send to moderators/administrators"
 }

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "المصادقة",
 	"email-confirm-interval": "لا يمكن للمستخدم إعادة إرسال رسالة تأكيد البريد الالكتروني حتى مرور",
-	"email-confirm-email2": "دقائق",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "السماح بتسجيل الدخول باستخدام",
 	"allow-login-with.username-email": "اسم المستخدم أو البريد الالكتروني",
 	"allow-login-with.username": "اسم المستخدم فقط",

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

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

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "Когато форумът е в режим на профилактика, всички заявки ще бъдат пренасочвани към статична страница за изчакване, с изключение на администраторите, които ще могат да използват уеб сайта нормално.",
 	"maintenance-mode.status": "Код на състоянието за режима на профилактика",
 	"maintenance-mode.message": "Съобщение за профилактиката",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Изберете групи, които да бъдат изключени от режима на профилактика",
 	"headers": "Заглавни части",
 	"headers.allow-from": "Задайте „ALLOW-FROM“, за да поставите NodeBB в „iFrame“",
 	"headers.csp-frame-ancestors": "Задайте заглавката „Content-Security-Policy frame-ancestors“ за да поставите NodeBB „iFrame“",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "Когато е включено (по подразбиране), стойността на заглавката ще бъде <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Стриктна транспортна сигурност",
 	"hsts.enabled": "Включване на HSTS (препоръчително)",
 	"hsts.maxAge": "Максимална възраст на HSTS",

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

@@ -5,6 +5,9 @@
 	"from": "Име за полето „От“",
 	"from-help": "Името на изпращача, което да бъде показано в е-писмото.",
 
+	"confirmation-settings": "Потвърждение",
+	"confirmation.expiry": "Продължителност на давността на връзката за потвърждаване, в часове",
+
 	"smtp-transport": "Транспорт чрез SMTP",
 	"smtp-transport.enabled": "Включване на транспорта чрез SMTP",
 	"smtp-transport-help": "Можете да изберете от списък от познати услуги, или да въведете такава ръчно.",

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

@@ -51,6 +51,7 @@
 	"signature.disable": "Забраняване на подписите",
 	"signature.no-links": "Забраняване на поставянето на връзки в подписите",
 	"signature.no-images": "Забраняване на поставянето на изображения в подписите",
+	"signature.hide-duplicates": "Скриване на дублираните подписи в темите",
 	"signature.max-length": "Максимална дължина на подписите",
 	"composer": "Настройки за съставянето",
 	"composer-help": "Следващите настройки определят функционалностите и/или вида на елемента за съставяне на\n\\t\\t\\t\\tпубликация, който се използва от потребителите, когато те създават нови теми или отговорят в съществуващи.",

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

@@ -23,5 +23,9 @@
 	"flags.limit-per-target-placeholder": "По подразбиране: 0",
 	"flags.limit-per-target-help": "Когато публикация или потребител бъде докладван няколко пъти, това се добавя към един общ доклад. Задайте на тази настройка стойност по-голяма от нула, за да ограничите броя на докладванията, които могат да бъдат натрупани към една публикация или потребител.",
   	"flags.auto-flag-on-downvote-threshold": "Брой отрицателни гласове, при които публикациите да бъдат докладвани автоматично (0 = изключено, по подразбиране: 0)",
-	"flags.auto-resolve-on-ban": "Автоматично премахване на всички доклади за потребител, когато той бъде блокиран"
+	"flags.auto-resolve-on-ban": "Автоматично премахване на всички доклади за потребител, когато той бъде блокиран",
+	"flags.action-on-resolve": "Когато докладване бъде разрешено, да се направи следното",
+	"flags.action-on-reject": "Когато докладване бъде отхвърлено, да се направи следното",
+	"flags.action.nothing": "Да не се прави нищо",
+	"flags.action.rescind": "Да се отмени известието, изпратено до модераторите/администраторите"
 }

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Удостоверяване",
 	"email-confirm-interval": "Потребителят не може да изпраща повторно е-писмото за потвърждение, преди да са минали",
-	"email-confirm-email2": "минути",
+	"email-confirm-interval2": "минути са изминали",
 	"allow-login-with": "Позволяване на вписването чрез",
 	"allow-login-with.username-email": "Потребителско име или е-поща",
 	"allow-login-with.username": "Само потребителско име",

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

@@ -1,5 +1,8 @@
 {
 	"post-cache": "Post Cache",
+	"group-cache": "Group Cache",
+	"local-cache": "Local Cache",
+	"object-cache": "Object Cache",
 	"percent-full": "%1% Full",
 	"post-cache-size": "Post Cache Size",
 	"items-in-cache": "Items in Cache"

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

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

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -51,6 +51,7 @@
 	"signature.disable": "Disable signatures",
 	"signature.no-links": "Disable links in signatures",
 	"signature.no-images": "Disable images in signatures",
+	"signature.hide-duplicates": "Hide duplicate signatures in topics",
 	"signature.max-length": "Maximum Signature Length",
 	"composer": "Composer Settings",
 	"composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.",

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

@@ -23,5 +23,9 @@
 	"flags.limit-per-target-placeholder": "Default: 0",
 	"flags.limit-per-target-help": "When a post or user is flagged multiple times, each additional flag is considered a "report" and added to the original flag. Set this option to a number other than zero to limit the number of reports an item can receive.",
   	"flags.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (Set to 0 to disable, default: 0)",
-	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned"
+	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned",
+	"flags.action-on-resolve": "Do the following when a flag is resolved",
+	"flags.action-on-reject": "Do the following when a flag is rejected",
+	"flags.action.nothing": "Do nothing",
+	"flags.action.rescind": "Rescind the notification send to moderators/administrators"
 }

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

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

@@ -1,5 +1,8 @@
 {
 	"post-cache": "Mezipaměť příspěvku",
+	"group-cache": "Group Cache",
+	"local-cache": "Local Cache",
+	"object-cache": "Object Cache",
 	"percent-full": "%1% plný",
 	"post-cache-size": "Velikost mezipaměti příspěvku",
 	"items-in-cache": "Položek v mezipaměti"

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "Je-li fórum v režimu údržby, všechny požadavky budou přesměrovány na statickou stránku. Správci jsou vyloučeni z tohoto přesměrování a budou mít normálně zobrazené stránky.",
 	"maintenance-mode.status": "Stavový kód režimu údržby",
 	"maintenance-mode.message": "Zpráva údržby",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode",
 	"headers": "Hlavičky",
 	"headers.allow-from": "Nastavte ALLOW-FROM pro umístění NodeBB do iFrame",
 	"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "When enabled (default), will set the header to <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Přísné zabezpečení přenosu",
 	"hsts.enabled": "Povolit HSTS (doporučeno)",
 	"hsts.maxAge": "HSTS Max Age",

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

@@ -5,6 +5,9 @@
 	"from": "Jméno – od",
 	"from-help": "Zobrazené jméno v e-mailu v – Od",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "Přenos SMTP",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "Ze seznamu můžete vybrat známé služby nebo zadat vlastní.",

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

@@ -51,6 +51,7 @@
 	"signature.disable": "Zakázat podpisy",
 	"signature.no-links": "Zakázat odkazy v podpisech",
 	"signature.no-images": "Zakázat obrázky v podpisech",
+	"signature.hide-duplicates": "Hide duplicate signatures in topics",
 	"signature.max-length": "Maximální délka podpisu",
 	"composer": "Nastavení kompozice",
 	"composer-help": "Následující nastavení kontroluje funkčnost a/nebo vzhled zobrazených příspěvků\n\t\t\t\tpro uživatele, kteří vytvoří nové téma nebo odpovídají na existující téma.",

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

@@ -23,5 +23,9 @@
 	"flags.limit-per-target-placeholder": "Default: 0",
 	"flags.limit-per-target-help": "When a post or user is flagged multiple times, each additional flag is considered a "report" and added to the original flag. Set this option to a number other than zero to limit the number of reports an item can receive.",
   	"flags.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (Set to 0 to disable, default: 0)",
-	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned"
+	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned",
+	"flags.action-on-resolve": "Do the following when a flag is resolved",
+	"flags.action-on-reject": "Do the following when a flag is rejected",
+	"flags.action.nothing": "Do nothing",
+	"flags.action.rescind": "Rescind the notification send to moderators/administrators"
 }

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Ověření",
 	"email-confirm-interval": "Uživatel nesmí požádat o znovu zaslání potvrzujícího e-mailu do",
-	"email-confirm-email2": "minut uplynulo",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Povolit přihlášení pomocí",
 	"allow-login-with.username-email": "Uživatelské jméno nebo e-mail",
 	"allow-login-with.username": "Pouze uživatelské jméno",

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

@@ -1,5 +1,8 @@
 {
 	"post-cache": "Indlægs Cache",
+	"group-cache": "Group Cache",
+	"local-cache": "Local Cache",
+	"object-cache": "Object Cache",
 	"percent-full": "%1% Fuld",
 	"post-cache-size": "Indlægs Cache Størrelse",
 	"items-in-cache": "Ting i Cache"

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

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

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -51,6 +51,7 @@
 	"signature.disable": "Disable signatures",
 	"signature.no-links": "Disable links in signatures",
 	"signature.no-images": "Disable images in signatures",
+	"signature.hide-duplicates": "Hide duplicate signatures in topics",
 	"signature.max-length": "Maximum Signature Length",
 	"composer": "Composer Settings",
 	"composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.",

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

@@ -23,5 +23,9 @@
 	"flags.limit-per-target-placeholder": "Default: 0",
 	"flags.limit-per-target-help": "When a post or user is flagged multiple times, each additional flag is considered a "report" and added to the original flag. Set this option to a number other than zero to limit the number of reports an item can receive.",
   	"flags.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (Set to 0 to disable, default: 0)",
-	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned"
+	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned",
+	"flags.action-on-resolve": "Do the following when a flag is resolved",
+	"flags.action-on-reject": "Do the following when a flag is rejected",
+	"flags.action.nothing": "Do nothing",
+	"flags.action.rescind": "Rescind the notification send to moderators/administrators"
 }

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

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

@@ -1,5 +1,8 @@
 {
 	"post-cache": "Post-Cache",
+	"group-cache": "Gruppen-Cache",
+	"local-cache": "Lokaler Cache",
+	"object-cache": "Objekt-Cache",
 	"percent-full": "%1% Voll",
 	"post-cache-size": "Post-Cache-Größe",
 	"items-in-cache": "Elemente im Cache"

public/language/de/admin/menu.json

@@ -76,7 +76,7 @@
 	"logout": "Abmelden",
 	"view-forum": "Forum anzeigen",
 
-	"search.placeholder": "Search settings",
+	"search.placeholder": "Nach Einstellungen suchen",
 	"search.no-results": "Keine Ergebnisse...",
 	"search.search-forum": "Suche im Forum nach <strong></strong>",
 	"search.keep-typing": "Gib mehr ein, um die Ergebnisse zu sehen...",

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "Wenn sich das Forum im Wartungsmodus befindet, werden alle Anfragen auf eine statische Warteseite umgeleitet. Administratoren sind von dieser Umleitung ausgenommen und können normal auf die Site zugreifen.",
 	"maintenance-mode.status": "Statuscode für Wartungsmodus",
 	"maintenance-mode.message": "Wartungsnachricht",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode",
 	"headers": "Headers",
 	"headers.allow-from": "ALLOW-FROM setzen um NodeBB in einem iFrame zu platzieren",
 	"headers.csp-frame-ancestors": "Content-Security-Policy frame-ancestors header setzen, um NodeBB in einem iFrame zu platzieren",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "Wenn aktiviert (Standard), wird der Header auf <code>require-corp</code> gesetzt",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "HSTS Aktivieren (empfohlen)",
 	"hsts.maxAge": "HSTS Maximales Alter",

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

@@ -5,6 +5,9 @@
 	"from": "Name des Absenders",
 	"from-help": "Der Name des Absenders, welcher in der E-Mail angezeigt werden soll.",
 
+	"confirmation-settings": "Konfirmation",
+	"confirmation.expiry": "Stunden, um den E-Mail-Bestätigungslink gültig zu halten",
+
 	"smtp-transport": "SMTP Konfiguration",
 	"smtp-transport.enabled": "SMTP-Transport aktivieren",
 	"smtp-transport-help": "Du kannst aus einer Liste bekannter Email-Provider auswählen, oder einen benutzerdefinierten eingeben.",

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

@@ -51,6 +51,7 @@
 	"signature.disable": "Signaturen deaktivieren",
 	"signature.no-links": "Links in signaturen deaktivieren",
 	"signature.no-images": "Bilder in Signaturen deaktivieren",
+	"signature.hide-duplicates": "Doppelte Signaturen in Themen ausblenden",
 	"signature.max-length": "Maximale Signaturlänge",
 	"composer": "Editor Einstellungen",
 	"composer-help": "Die folgenden Einstellungen bestimmen die funktionalität und/oder das Aussehen des Beitragseditors, der Nutzern angezeigt wird, webb sie neue Themen erstellen, oder bereits existierenden Antworten.",

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

@@ -23,5 +23,9 @@
 	"flags.limit-per-target-placeholder": "Standardwert: 0",
 	"flags.limit-per-target-help": "Wenn ein Beitrag oder ein Benutzer mehrfach markiert wird, wird jede zusätzliche Markierung als "Nachricht" betrachtet und zur ursprünglichen Markierung hinzugezählt. Setzen Sie diese Option auf eine andere Zahl als Null, um die Anzahl der Nachricht, die ein Artikel erhalten kann, zu begrenzen.",
   	"flags.auto-flag-on-downvote-threshold": "Anzahl der Downvotes für Posts mit automatischer Markierung (zum Deaktivieren auf 0 setzen, Standard: 0)",
-	"flags.auto-resolve-on-ban": "Automatisches Beenden aller Tickets eines Benutzers, wenn dieser gesperrt wird"
+	"flags.auto-resolve-on-ban": "Automatisches Beenden aller Tickets eines Benutzers, wenn dieser gesperrt wird",
+	"flags.action-on-resolve": "Führe Folgendes aus, wenn eine Flagge aufgelöst wird",
+	"flags.action-on-reject": "Gehe folgendermaßen vor, wenn eine Flagge abgelehnt wird",
+	"flags.action.nothing": "Nichts tun",
+	"flags.action.rescind": "Aufhebung der Benachrichtigung an Moderatoren/Administratoren"
 }

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentifizierung",
 	"email-confirm-interval": "Der Benutzer kann für ",
-	"email-confirm-email2": "  Minuten keine Bestätigungsmail erneut senden.",
+	"email-confirm-interval2": "Minuten sind verstrichen",
 	"allow-login-with": "Erlaube Login mit",
 	"allow-login-with.username-email": "Benutzername oder E-Mail",
 	"allow-login-with.username": "Nur Benutzername",

public/language/de/error.json

@@ -205,8 +205,8 @@
     "no-connection": "Es scheint als gäbe es ein Problem mit deiner Internetverbindung",
     "socket-reconnect-failed": "Der Server kann zurzeit nicht erreicht werden. Klicken Sie hier, um es erneut zu versuchen, oder versuchen Sie es später erneut",
     "plugin-not-whitelisted": "Plugin kann nicht installiert werden – nur Plugins, die vom NodeBB Package Manager in die Whitelist aufgenommen wurden, können über den ACP installiert werden",
-    "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",
+    "plugins-set-in-configuration": "Du darfst den Status der Plugins nicht ändern, da sie zur Laufzeit definiert werden (config.json, Umgebungsvariablen oder Terminalargumente). Bitte ändere stattdessen die Konfiguration.",
+    "theme-not-set-in-configuration": "Wenn in der Konfiguration aktive Plugins definiert werden, muss bei einem Themenwechsel das neue Thema zur Liste der aktiven Plugins hinzugefügt werden, bevor es im ACP aktualisiert wird.",
     "topic-event-unrecognized": "Themenereignis „%1“ nicht erkannt",
     "cant-set-child-as-parent": "Untergeordnete Kategorie kann nicht als übergeordnete Kategorie festgelegt werden",
     "cant-set-self-as-parent": "Die aktuelle Kategorie kann nicht als übergeordnete Kategorie festgelegt werden",

public/language/de/global.json

@@ -18,7 +18,7 @@
     "posting_restriction_info": "Nur registrierte Mitglieder dürfen Beiträge verfassen. Hier klicken zum Anmelden.",
     "welcome_back": "Willkommen zurück",
     "you_have_successfully_logged_in": "Du hast dich erfolgreich angemeldet",
-    "save_changes": "Speichere Änderungen",
+    "save_changes": "Änderungen speichern",
     "save": "Speichern",
     "close": "Schließen",
     "pagination": "Seitennummerierung",

public/language/de/modules.json

@@ -1,5 +1,5 @@
 {
-    "chat.chatting_with": "Chat mit",
+    "chat.chatting_with": "Chatte mit",
     "chat.placeholder": "Gebe hier eine Chatnachricht ein, ziehe Bilder per Drag & Drop und drücke die Eingabetaste, um sie zu senden",
     "chat.scroll-up-alert": "Diese Nachrichten sind möglicherweise veraltet, klicke hier um neuere Nachrichten anzuzeigen.",
     "chat.send": "Senden",

public/language/de/user.json

@@ -195,5 +195,5 @@
     "emailUpdate.optional": "<strong>Dieses Feld ist optional</strong>. Du bist nicht verpflichtet, deine E-Mail-Adresse anzugeben, doch ohne eine validierte E-Mail-Adresse kannst du dein Konto nicht wiederherstellen oder dich mit deiner E-Mail-Adresse anmelden.",
     "emailUpdate.required": "<strong>Dieses Feld ist erforderlich</strong>.",
     "emailUpdate.change-instructions": "An die eingegebene E-Mail-Adresse wird eine Bestätigungs-E-Mail mit einem eindeutigen Link gesendet. Durch den Zugriff auf diesen Link wird dein Eigentum an der E-Mail-Adresse bestätigt und diese wird in deinem Konto aktiv. Du kannst deine E-Mail-Adresse jederzeit auf deiner Kontoseite aktualisieren.",
-    "emailUpdate.password-challenge": "Please enter your password in order to verify account ownership."
+    "emailUpdate.password-challenge": "Bitte gib dein Passwort ein, um dein Konto zu verifizieren."
 }

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

@@ -1,5 +1,8 @@
 {
 	"post-cache": "Προσωρινή μνήμη ανάρτησης",
+	"group-cache": "Group Cache",
+	"local-cache": "Local Cache",
+	"object-cache": "Object Cache",
 	"percent-full": "%1% Πλήρες",
 	"post-cache-size": "Μέγεθος προσωρινής μνήμης ανάρτησης",
 	"items-in-cache": "Αντικείμενα στην προσωρινή μνήμη"

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

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

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -51,6 +51,7 @@
 	"signature.disable": "Disable signatures",
 	"signature.no-links": "Disable links in signatures",
 	"signature.no-images": "Disable images in signatures",
+	"signature.hide-duplicates": "Hide duplicate signatures in topics",
 	"signature.max-length": "Maximum Signature Length",
 	"composer": "Composer Settings",
 	"composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.",

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

@@ -23,5 +23,9 @@
 	"flags.limit-per-target-placeholder": "Default: 0",
 	"flags.limit-per-target-help": "When a post or user is flagged multiple times, each additional flag is considered a "report" and added to the original flag. Set this option to a number other than zero to limit the number of reports an item can receive.",
   	"flags.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (Set to 0 to disable, default: 0)",
-	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned"
+	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned",
+	"flags.action-on-resolve": "Do the following when a flag is resolved",
+	"flags.action-on-reject": "Do the following when a flag is rejected",
+	"flags.action.nothing": "Do nothing",
+	"flags.action.rescind": "Rescind the notification send to moderators/administrators"
 }

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

public/language/en-GB/admin/admin.json

@@ -4,8 +4,6 @@
 
 	"acp-title": "%1 | NodeBB Admin Control Panel",
 	"settings-header-contents": "Contents",
-	"changes-saved": "Changes Saved",
-	"changes-saved-message": "Your changes to the NodeBB configuration have been saved.",
 	"changes-not-saved": "Changes Not Saved",
 	"changes-not-saved-message": "NodeBB encountered a problem saving your changes. (%1)"
 }

public/language/en-GB/admin/advanced/cache.json

@@ -1,5 +1,8 @@
 {
 	"post-cache": "Post Cache",
+	"group-cache": "Group Cache",
+	"local-cache": "Local Cache",
+	"object-cache": "Object Cache",
 	"percent-full": "%1% Full",
 	"post-cache-size": "Post Cache Size",
 	"items-in-cache": "Items in Cache"

public/language/en-GB/admin/appearance/customise.json

@@ -1,7 +1,7 @@
 {
-	"custom-css": "Custom CSS/LESS",
-	"custom-css.description": "Enter your own CSS/LESS declarations here, which will be applied after all other styles.",
-	"custom-css.enable": "Enable Custom CSS/LESS",
+	"custom-css": "Custom CSS/SASS",
+	"custom-css.description": "Enter your own CSS/SASS declarations here, which will be applied after all other styles.",
+	"custom-css.enable": "Enable Custom CSS/SASS",
 
 	"custom-js": "Custom Javascript",
 	"custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.",

public/language/en-GB/admin/extend/widgets.json

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

public/language/en-GB/admin/manage/groups.json

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

public/language/en-GB/admin/manage/privileges.json

@@ -49,7 +49,6 @@
 	"alert.confirm-moderate": "<strong>Are you sure you wish to grant the moderation privilege to this user group?</strong> This group is public, and any users can join at will.",
 	"alert.confirm-admins-mods": "<strong>Are you sure you wish to grant the &quot;Admins &amp; Mods&quot; privilege to this user/group?</strong> Users with this privilege are able to promote and demote other users into privileged positions, <em>including super administrator</em>",
 	"alert.confirm-save": "Please confirm your intention to save these privileges",
-	"alert.saved": "Privilege changes saved and applied",
 	"alert.confirm-discard": "Are you sure you wish to discard your privilege changes?",
 	"alert.discarded": "Privilege changes discarded",
 	"alert.confirm-copyToAll": "Are you sure you wish to apply this set of <strong>%1</strong> to <strong>all categories</strong>?",

public/language/en-GB/admin/settings/advanced.json

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

public/language/en-GB/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/en-GB/admin/settings/navigation.json

@@ -12,7 +12,7 @@
 	"groups": "Groups:",
 	"open-new-window": "Open in a new window",
 	"dropdown": "Dropdown",
-	"dropdown-placeholder": "Place your dropdown menu items below, ie: <br/>&lt;li&gt;&lt;a href&#x3D;&quot;https://myforum.com&quot;&gt;Link 1&lt;/a&gt;&lt;/li&gt;",
+	"dropdown-placeholder": "Place your dropdown menu items below, ie: <br/>&lt;li&gt;&lt;a class=&quot;dropdown-item&quot; href&#x3D;&quot;https://myforum.com&quot;&gt;Link 1&lt;/a&gt;&lt;/li&gt;",
 
 	"btn.delete": "Delete",
 	"btn.disable": "Disable",

public/language/en-GB/admin/settings/post.json

@@ -51,6 +51,7 @@
 	"signature.disable": "Disable signatures",
 	"signature.no-links": "Disable links in signatures",
 	"signature.no-images": "Disable images in signatures",
+	"signature.hide-duplicates": "Hide duplicate signatures in topics",
 	"signature.max-length": "Maximum Signature Length",
 	"composer": "Composer Settings",
 	"composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.",

public/language/en-GB/admin/settings/reputation.json

@@ -23,5 +23,9 @@
 	"flags.limit-per-target-placeholder": "Default: 0",
 	"flags.limit-per-target-help": "When a post or user is flagged multiple times, each additional flag is considered a "report" and added to the original flag. Set this option to a number other than zero to limit the number of reports an item can receive.",
   	"flags.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (Set to 0 to disable, default: 0)",
-	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned"
+	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned",
+	"flags.action-on-resolve": "Do the following when a flag is resolved",
+	"flags.action-on-reject": "Do the following when a flag is rejected",
+	"flags.action.nothing": "Do nothing",
+	"flags.action.rescind": "Rescind the notification send to moderators/administrators"
 }

public/language/en-GB/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

public/language/en-GB/global.json

@@ -43,7 +43,9 @@
 	"header.notifications": "Notifications",
 	"header.search": "Search",
 	"header.profile": "Profile",
+	"header.account": "Account",
 	"header.navigation": "Navigation",
+	"header.manage": "Manage",
 
 	"notifications.loading": "Loading Notifications",
 	"chats.loading": "Loading Chats",
@@ -108,6 +110,7 @@
 
 	"moderator_tools": "Moderator Tools",
 
+	"status": "Status",
 	"online": "Online",
 	"away": "Away",
 	"dnd": "Do not disturb",

public/language/en-GB/topic.json

@@ -107,7 +107,7 @@
 	"thread_tools.purge": "Purge Topic",
 	"thread_tools.purge_confirm" : "Are you sure you want to purge this topic?",
 	"thread_tools.merge_topics": "Merge Topics",
-	"thread_tools.merge": "Merge",
+	"thread_tools.merge": "Merge Topic",
 
 	"topic_move_success": "This topic will be moved to \"%1\" shortly. Click here to undo.",
 	"topic_move_multiple_success": "These topics will be moved to \"%1\" shortly. Click here to undo.",
@@ -140,7 +140,7 @@
 	"post_moved": "Post moved!",
 	"fork_topic": "Fork Topic",
 	"enter-new-topic-title": "Enter new topic title",
-	"fork_topic_instruction": "Click the posts you want to fork",
+	"fork_topic_instruction": "Click the posts you want to fork, enter a title for the new topic and click fork topic",
 	"fork_no_pids": "No posts selected!",
 	"no-posts-selected": "No posts selected!",
 	"x-posts-selected": "%1 post(s) selected",
@@ -155,6 +155,7 @@
 	"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": "Enter your topic title here...",

public/language/en-GB/user.json

@@ -71,6 +71,7 @@
 	"upload_new_picture": "Upload New Picture",
 	"upload_new_picture_from_url": "Upload New Picture From URL",
 	"current_password": "Current Password",
+	"new_password": "New Password",
 	"change_password": "Change Password",
 	"change_password_error": "Invalid Password!",
 	"change_password_error_wrong_current": "Your current password is not correct!",

public/language/en-US/admin/advanced/cache.json

@@ -1,5 +1,8 @@
 {
 	"post-cache": "Post Cache",
+	"group-cache": "Group Cache",
+	"local-cache": "Local Cache",
+	"object-cache": "Object Cache",
 	"percent-full": "%1% Full",
 	"post-cache-size": "Post Cache Size",
 	"items-in-cache": "Items in Cache"

public/language/en-US/admin/settings/advanced.json

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

public/language/en-US/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/en-US/admin/settings/post.json

@@ -51,6 +51,7 @@
 	"signature.disable": "Disable signatures",
 	"signature.no-links": "Disable links in signatures",
 	"signature.no-images": "Disable images in signatures",
+	"signature.hide-duplicates": "Hide duplicate signatures in topics",
 	"signature.max-length": "Maximum Signature Length",
 	"composer": "Composer Settings",
 	"composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\\t\\t\\t\\tto users when they create new topics, or reply to existing topics.",

public/language/en-US/admin/settings/reputation.json

@@ -23,5 +23,9 @@
 	"flags.limit-per-target-placeholder": "Default: 0",
 	"flags.limit-per-target-help": "When a post or user is flagged multiple times, each additional flag is considered a "report" and added to the original flag. Set this option to a number other than zero to limit the number of reports an item can receive.",
   	"flags.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (Set to 0 to disable, default: 0)",
-	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned"
+	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned",
+	"flags.action-on-resolve": "Do the following when a flag is resolved",
+	"flags.action-on-reject": "Do the following when a flag is rejected",
+	"flags.action.nothing": "Do nothing",
+	"flags.action.rescind": "Rescind the notification send to moderators/administrators"
 }

public/language/en-US/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

public/language/en-x-pirate/admin/advanced/cache.json

@@ -1,5 +1,8 @@
 {
 	"post-cache": "Post Cache",
+	"group-cache": "Group Cache",
+	"local-cache": "Local Cache",
+	"object-cache": "Object Cache",
 	"percent-full": "%1% Full",
 	"post-cache-size": "Post Cache Size",
 	"items-in-cache": "Items in Cache"

public/language/en-x-pirate/admin/settings/advanced.json

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

public/language/en-x-pirate/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/en-x-pirate/admin/settings/post.json

@@ -51,6 +51,7 @@
 	"signature.disable": "Disable signatures",
 	"signature.no-links": "Disable links in signatures",
 	"signature.no-images": "Disable images in signatures",
+	"signature.hide-duplicates": "Hide duplicate signatures in topics",
 	"signature.max-length": "Maximum Signature Length",
 	"composer": "Composer Settings",
 	"composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.",

public/language/en-x-pirate/admin/settings/reputation.json

@@ -23,5 +23,9 @@
 	"flags.limit-per-target-placeholder": "Default: 0",
 	"flags.limit-per-target-help": "When a post or user is flagged multiple times, each additional flag is considered a "report" and added to the original flag. Set this option to a number other than zero to limit the number of reports an item can receive.",
   	"flags.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (Set to 0 to disable, default: 0)",
-	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned"
+	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned",
+	"flags.action-on-resolve": "Do the following when a flag is resolved",
+	"flags.action-on-reject": "Do the following when a flag is rejected",
+	"flags.action.nothing": "Do nothing",
+	"flags.action.rescind": "Rescind the notification send to moderators/administrators"
 }

public/language/en-x-pirate/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

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

@@ -1,5 +1,8 @@
 {
 	"post-cache": "Publicar Cache",
+	"group-cache": "Group Cache",
+	"local-cache": "Local Cache",
+	"object-cache": "Object Cache",
 	"percent-full": "%1% Completo",
 	"post-cache-size": "Tamaño de cache del post",
 	"items-in-cache": "Artículos en cache"

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

@@ -3,6 +3,7 @@
 	"maintenance-mode.help": "Cuando este foro están en Modo de Mantenimiento, todas las peticiones serán redirigidas a una página estática de mantenimiento. Los administradores están exentos de esta redirección, y pueden acceder al sitio normalmente.",
 	"maintenance-mode.status": "Maintenance Mode Status Code",
 	"maintenance-mode.message": "Mensaje de Mantenimiento",
+	"maintenance-mode.groups-exempt-from-maintenance-mode": "Select groups that should be exempt from maintenance mode",
 	"headers": "Cabeceras",
 	"headers.allow-from": "Establecer ALLOW-FROM para poner NodeBB en un iFrame",
 	"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
@@ -19,6 +20,8 @@
 	"headers.coep-help": "When enabled (default), will set the header to <code>require-corp</code>",
 	"headers.coop": "Cross-Origin-Opener-Policy",
 	"headers.corp": "Cross-Origin-Resource-Policy",
+	"headers.permissions-policy": "Permissions-Policy",
+	"headers.permissions-policy-help": "Allows setting permissions policy header, for example \"geolocation=*, camera=()\", see <a href=\"https://github.com/w3c/webappsec-permissions-policy/blob/main/permissions-policy-explainer.md\">this</a> for more info.",
 	"hsts": "Seguridad estricta del transporte",
 	"hsts.enabled": "Enabled HSTS (recommended)",
 	"hsts.maxAge": "HSTS Max Age",

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -51,6 +51,7 @@
 	"signature.disable": "Desactivar firmas",
 	"signature.no-links": "Desactivar enlaces en firmas",
 	"signature.no-images": "Desactivar imágenes en firmas",
+	"signature.hide-duplicates": "Hide duplicate signatures in topics",
 	"signature.max-length": "Longitud Máxima de Firma",
 	"composer": "Configuración del Editor de Texto",
 	"composer-help": "LAs configuraciones siguientes gobiernan la funcionalidad y/o apariencia del editor de entradas mostrado\n\t\t\t\ta los usuarios cuando crean nuevos temas, o responden a temas existentes.",

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

@@ -23,5 +23,9 @@
 	"flags.limit-per-target-placeholder": "Default: 0",
 	"flags.limit-per-target-help": "When a post or user is flagged multiple times, each additional flag is considered a "report" and added to the original flag. Set this option to a number other than zero to limit the number of reports an item can receive.",
   	"flags.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (Set to 0 to disable, default: 0)",
-	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned"
+	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned",
+	"flags.action-on-resolve": "Do the following when a flag is resolved",
+	"flags.action-on-reject": "Do the following when a flag is rejected",
+	"flags.action.nothing": "Do nothing",
+	"flags.action.rescind": "Rescind the notification send to moderators/administrators"
 }

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Autenticación",
 	"email-confirm-interval": "El usuario no puede re-enviar una confirmación por email hasta",
-	"email-confirm-email2": "minutos han pasado",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Permitir login con",
 	"allow-login-with.username-email": "Nombre de usuario o Email",
 	"allow-login-with.username": "Solo Nombre de Usuario",

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

@@ -1,5 +1,8 @@
 {
 	"post-cache": "Postituste vahemälu",
+	"group-cache": "Group Cache",
+	"local-cache": "Local Cache",
+	"object-cache": "Object Cache",
 	"percent-full": "%1% Täis",
 	"post-cache-size": "Postituse vahemälu suurus",
 	"items-in-cache": "Esemed vahemälus"

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

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

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -51,6 +51,7 @@
 	"signature.disable": "Disable signatures",
 	"signature.no-links": "Disable links in signatures",
 	"signature.no-images": "Disable images in signatures",
+	"signature.hide-duplicates": "Hide duplicate signatures in topics",
 	"signature.max-length": "Maximum Signature Length",
 	"composer": "Composer Settings",
 	"composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.",

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

@@ -23,5 +23,9 @@
 	"flags.limit-per-target-placeholder": "Default: 0",
 	"flags.limit-per-target-help": "When a post or user is flagged multiple times, each additional flag is considered a "report" and added to the original flag. Set this option to a number other than zero to limit the number of reports an item can receive.",
   	"flags.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (Set to 0 to disable, default: 0)",
-	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned"
+	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned",
+	"flags.action-on-resolve": "Do the following when a flag is resolved",
+	"flags.action-on-reject": "Do the following when a flag is rejected",
+	"flags.action.nothing": "Do nothing",
+	"flags.action.rescind": "Rescind the notification send to moderators/administrators"
 }

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

public/language/fa-IR/admin/advanced/cache.json

@@ -1,5 +1,8 @@
 {
 	"post-cache": "کش دیدگاه ",
+	"group-cache": "Group Cache",
+	"local-cache": "Local Cache",
+	"object-cache": "Object Cache",
 	"percent-full": "%1% تمام شده",
 	"post-cache-size": "سایز کش دیدگاه",
 	"items-in-cache": "موارد موجود در کش"

public/language/fa-IR/admin/settings/advanced.json

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

public/language/fa-IR/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/fa-IR/admin/settings/post.json

@@ -51,6 +51,7 @@
 	"signature.disable": "Disable signatures",
 	"signature.no-links": "Disable links in signatures",
 	"signature.no-images": "Disable images in signatures",
+	"signature.hide-duplicates": "Hide duplicate signatures in topics",
 	"signature.max-length": "Maximum Signature Length",
 	"composer": "Composer Settings",
 	"composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.",