chore: v3.0.0-alpha.1 🎉

see https://github.com/twbs/bootstrap/issues/32372

.github/workflows/docker.yml

@@ -21,13 +21,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 +43,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

@@ -42,7 +42,7 @@ jobs:
 
     services:
       postgres:
-        image: 'postgres:10-alpine'
+        image: 'postgres:14-alpine'
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
@@ -57,7 +57,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 +69,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

CHANGELOG.md

@@ -1,13 +1,178 @@
+#### 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)
+*  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
+
+*  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)
-*  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)
 
 ##### Bug Fixes
 
@@ -19,9 +184,6 @@
 
 *  incrementing version number - v2.4.1 (60cbd148)
 *  update changelog for v2.4.1 (4b6baabb)
-*  incrementing version number - v2.4.0 (4834cde3)
-*  incrementing version number - v2.3.1 (d2425942)
-*  incrementing version number - v2.3.0 (046ea120)
 
 ##### Documentation Changes
 
@@ -46,8 +208,6 @@
   *  update docker/setup-buildx-action action to v2 (371ac032)
 *  incrementing version number - v2.4.0 (4834cde3)
 *  update changelog for v2.4.0 (c4714ff7)
-*  incrementing version number - v2.3.1 (d2425942)
-*  incrementing version number - v2.3.0 (046ea120)
 
 ##### Bug Fixes
 
@@ -65,7 +225,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',
@@ -168,16 +154,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 +169,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);
 			}

install/data/defaults.json

@@ -78,6 +78,7 @@
     "reputation:disabled": 0,
     "downvote:disabled": 0,
     "disableSignatures": 0,
+    "signatures:hideDuplicates": 0,
     "upvotesPerDay": 20,
     "upvotesPerUserPerDay": 6,
     "downvotesPerDay": 10,
@@ -93,6 +94,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",

install/package.json

@@ -2,8 +2,8 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "2.4.4",
-    "homepage": "http://www.nodebb.org",
+    "version": "3.0.0-alpha.1",
+    "homepage": "https://www.nodebb.org",
     "repository": {
         "type": "git",
         "url": "https://github.com/NodeBB/NodeBB/"
@@ -29,23 +29,24 @@
     },
     "dependencies": {
         "@adactive/bootstrap-tagsinput": "0.8.2",
-        "@isaacs/ttlcache": "^1.2.0",
-        "ace-builds": "1.8.1",
+        "@isaacs/ttlcache": "1.2.0",
+        "ace-builds": "1.11.0",
         "archiver": "5.3.1",
         "async": "3.2.4",
-        "autoprefixer": "10.4.8",
+        "autoprefixer": "10.4.12",
         "bcryptjs": "2.4.3",
         "benchpressjs": "2.4.3",
         "body-parser": "1.20.0",
-        "bootbox": "5.5.3",
-        "bootstrap": "3.4.1",
+        "bootbox": "https://github.com/makeusabrew/bootbox.git#v6-wip",
+        "bootstrap": "5.2.1",
+        "bootswatch": "5.2.1",
         "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",
+        "compare-versions": "5.0.1",
         "compression": "1.7.4",
         "connect-flash": "0.1.1",
         "connect-mongo": "4.6.0",
@@ -67,7 +68,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,49 +79,48 @@
         "less": "4.1.3",
         "lodash": "4.17.21",
         "logrotate-stream": "0.2.8",
-        "lru-cache": "7.13.1",
+        "lru-cache": "7.14.0",
         "material-design-lite": "1.3.0",
         "mime": "3.0.0",
         "mkdirp": "1.0.4",
-        "mongodb": "4.8.1",
+        "mongodb": "4.10.0",
         "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.2",
+        "nodebb-plugin-composer-default": "10.0.5",
+        "nodebb-plugin-dbsearch": "6.0.0",
+        "nodebb-plugin-emoji": "5.0.2",
+        "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.0",
         "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-peace": "2.0.1",
+        "nodebb-theme-persona": "13.0.3",
+        "nodebb-widget-essentials": "7.0.1",
+        "nodemailer": "6.7.8",
         "nprogress": "0.2.0",
         "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.16",
         "postcss-clean": "1.2.0",
         "prompt": "1.3.0",
-        "ioredis": "5.2.2",
+        "ioredis": "5.2.3",
         "request": "2.88.2",
         "request-promise-native": "1.0.9",
         "rimraf": "3.0.2",
         "rss": "1.2.2",
-        "sanitize-html": "2.7.1",
+        "rtlcss": "4.0.0",
+        "sanitize-html": "2.7.2",
+        "sass": "1.54.9",
         "semver": "7.3.7",
         "serve-favicon": "2.5.0",
-        "sharp": "0.30.7",
+        "sharp": "0.31.0",
         "sitemap": "7.1.1",
         "slideout": "1.0.1",
         "socket.io": "4.5.1",
@@ -136,10 +136,9 @@
         "toobusy-js": "0.5.1",
         "uglify-es": "3.3.9",
         "validator": "13.7.0",
-        "visibilityjs": "2.0.2",
         "webpack": "5.74.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",
@@ -147,10 +146,10 @@
     },
     "devDependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@commitlint/cli": "17.0.3",
-        "@commitlint/config-angular": "17.0.3",
+        "@commitlint/cli": "17.1.2",
+        "@commitlint/config-angular": "17.1.0",
         "coveralls": "3.1.1",
-        "eslint": "8.21.0",
+        "eslint": "8.23.1",
         "eslint-config-nodebb": "0.1.1",
         "eslint-plugin-import": "2.26.0",
         "grunt": "1.5.3",
@@ -171,11 +170,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 +181,4 @@
             "url": "https://github.com/barisusakli"
         }
     ]
-}
+}

install/web.js

@@ -6,7 +6,7 @@ const bodyParser = require('body-parser');
 const fs = require('fs');
 const path = require('path');
 const childProcess = require('child_process');
-const less = require('less');
+const sass = require('sass');
 
 const webpack = require('webpack');
 const nconf = require('nconf');
@@ -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/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/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/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/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/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/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/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/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/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/de/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% Voll",
 	"post-cache-size": "Post-Cache-Größe",
 	"items-in-cache": "Elemente im Cache"

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": "Hide duplicate signatures in topics",
 	"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": "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/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/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/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/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/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/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-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/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/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/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/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/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/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/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/fa-IR/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/fi/admin/advanced/cache.json

@@ -1,5 +1,8 @@
 {
 	"post-cache": "Viestivälimuisti",
+	"group-cache": "Group Cache",
+	"local-cache": "Local Cache",
+	"object-cache": "Object Cache",
 	"percent-full": "%1% Täynnä",
 	"post-cache-size": "Viestivälimuistin koko",
 	"items-in-cache": "Asioita välimuistissa"

public/language/fi/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/fi/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/fr/admin/advanced/cache.json

@@ -1,5 +1,8 @@
 {
 	"post-cache": "Cache des messages",
+	"group-cache": "Cache de groupe",
+	"local-cache": "Cache Local",
+	"object-cache": "Cache d'objets",
 	"percent-full": "Plein à %1%",
 	"post-cache-size": "Taille du cache des messages",
 	"items-in-cache": "Objets en cache"

public/language/fr/admin/menu.json

@@ -76,7 +76,7 @@
 	"logout": "Déconnexion ",
 	"view-forum": "Voir le forum",
 
-	"search.placeholder": "Search settings",
+	"search.placeholder": "Paramètres de recherche",
 	"search.no-results": "Aucun résultat…",
 	"search.search-forum": "Rechercher <strong></strong> dans le forum",
 	"search.keep-typing": "Continuez de taper pour afficher les résultats…",

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

@@ -10,10 +10,10 @@
 	"smtp-transport-help": "Vous pouvez sélectionner depuis une liste de services ou entrer un service personnalisé.",
 	"smtp-transport.service": "Sélectionner un service",
 	"smtp-transport.service-custom": "Service personnalisé",
-	"smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select "Custom Service" and enter the details below.",
-	"smtp-transport.gmail-warning1": "If you are using GMail as your email provider, you will have to generate an &quot;App Password&quot; in order for NodeBB to authenticate successfully. You can generate one at the <a href=\"https://myaccount.google.com/apppasswords\">App Passwords <i class=\"fa fa-external-link\"></i></a> page.",
-	"smtp-transport.gmail-warning2": "For more information about this workaround, <a href=\"https://nodemailer.com/usage/using-gmail/\">please consult this NodeMailer article <i class=\"fa fa-external-link\"></i></a> on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. <a href=\"../extend/plugins\">Browse available plugins here</a>.",
-	"smtp-transport.auto-enable-toast": "It looks like you&apos;re configuring an SMTP transport. We enabled the \"SMTP Transport\" option for you.",
+	"smtp-transport.service-help": "Sélectionnez un nom de service ci-dessus afin d'utiliser les informations connues à son sujet. Vous pouvez également sélectionner &quot;Service personnalisé&quot; et entrez les détails ci-dessous.",
+	"smtp-transport.gmail-warning1": "Si vous utilisez GMail comme fournisseur de messagerie, vous devrez générer un &quot;mot de passe d'application&quot; afin que NodeBB s'authentifie avec succès. Vous pouvez en générer un sur la <a href=\"https://myaccount.google.com/apppasswords\">page Mots de passe <i class=\"fa fa-external-link\"></i>.",
+	"smtp-transport.gmail-warning2": "Pour plus d'informations sur cette solution de contournement, <a href=\"https://nodemailer.com/usage/using-gmail/\">veuillez consulter cet article de NodeMailer <i class=\"fa fa-external-link\"></i></a>sur le problème. Une alternative serait d'utiliser un plug-in tiers d'e-mail tel que SendGrid, Mailgun, etc. <a href=\"../extend/plugins\">Parcourez les plug-ins disponibles ici</a>.",
+	"smtp-transport.auto-enable-toast": "Il semble que vous configuriez un serveur SMTP. Nous avons activé l'option \" SMTP\" pour vous.",
 	"smtp-transport.host": "Host SMTP",
 	"smtp-transport.port": "Port SMTP",
 	"smtp-transport.security": "Accès sécurisé",

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

@@ -51,6 +51,7 @@
 	"signature.disable": "Désactiver les signatures",
 	"signature.no-links": "Désactiver les liens en signature",
 	"signature.no-images": "Désactiver les images en signature ",
+	"signature.hide-duplicates": "Masquer les signatures en double dans les sujets",
 	"signature.max-length": "Longueur maximum des signatures",
 	"composer": "Paramètres Composer",
 	"composer-help": "Les réglages suivants permettent de choisir les fonctionnalités et/ou l'apparence du composeur de message affiché\n\t\t\t\ttaux utilisateurs quand ils créent de nouveaux sujets ou répondent à des sujets existants.",

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

@@ -23,5 +23,9 @@
 	"flags.limit-per-target-placeholder": "Défaut: 0",
 	"flags.limit-per-target-help": "Lorsqu'un message ou un utilisateur a été signalé plusieurs fois, chaque indicateur supplémentaire est considéré comme un \"rapport\". et ajouté au signalement d'origine. Définissez cette option sur un nombre autre que zéro pour limiter le nombre de rapports qu'un signalement peut admettre.",
   	"flags.auto-flag-on-downvote-threshold": "Nombre de votes négatifs pour les signalements (0 pour désactiver, par défaut : 0)",
-	"flags.auto-resolve-on-ban": "Résoudre automatiquement tous les tickets d'un utilisateur lorsqu'il est banni"
+	"flags.auto-resolve-on-ban": "Résoudre automatiquement tous les tickets d'un utilisateur lorsqu'il est banni",
+	"flags.action-on-resolve": "Procédez comme suit lorsqu'un signalement est résolu",
+	"flags.action-on-reject": "Procédez comme suit lorsqu'un signalement est rejeté",
+	"flags.action.nothing": "Ne rien faire",
+	"flags.action.rescind": "Annuler la notification envoyée aux modérateurs/administrateurs"
 }

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

@@ -5,7 +5,7 @@
 	"strip-exif-data": "Supprimer les données EXIF",
 	"preserve-orphaned-uploads": "Conserver les fichiers téléchargés après la suppression d'une publication.",
 	"orphanExpiryDays": "Jours pour garder les fichiers orphelins",
-	"orphanExpiryDays-help": "After this many days, orphaned uploads will be deleted from the file system.<br />Set 0 or leave blank to disable.",
+	"orphanExpiryDays-help": "Les téléchargements orphelins seront supprimés du système de fichiers après ce délai : <br /> Changer 0 Laissez vide pour désactiver.",
 	"private-extensions": "Rendre privé des extensions de fichier.",
 	"private-uploads-extensions-help": "Renseignez ici une liste d'extensions de fichiers séparées par des virgules pour les rendre privées (par exemple : <code>pdf, xls, doc</code>). Une liste vide signifie que tous les fichiers sont privés.",
 	"resize-image-width-threshold": "Redimensionner les images si elles sont plus larges que la largeur spécifiée",

public/language/fr/error.json

@@ -205,8 +205,8 @@
     "no-connection": "Il semble y avoir un problème avec votre connexion Internet",
     "socket-reconnect-failed": "Serveur inaccessible pour le moment. Cliquez ici pour réessayer ou réessayez plus tard",
     "plugin-not-whitelisted": "Impossible d'installer le plug-in – seuls les plugins mis en liste blanche dans le gestionnaire de packages NodeBB peuvent être installés via l'ACP",
-    "plugins-set-in-configuration": "You are not allowed to change plugin state as they are defined at runtime (config.json, environmental variables or terminal arguments), please modify the configuration instead.",
-    "theme-not-set-in-configuration": "When defining active plugins in configuration, changing themes requires adding the new theme to the list of active plugins before updating it in the ACP",
+    "plugins-set-in-configuration": "Vous n'êtes pas autorisé à modifier l'état des plugins car ils sont définis au moment de l'exécution (config.json, variables d'environnement ou arguments de terminal), veuillez plutôt modifier la configuration.",
+    "theme-not-set-in-configuration": "Lors de la définition des plugins actifs, le changement de thèmes nécessite d'ajouter le nouveau thème à la liste des plugins actifs avant de le mettre à jour dans l'ACP",
     "topic-event-unrecognized": "Événement du sujet '%1' non reconnu",
     "cant-set-child-as-parent": "Cette catégorie ne peut être une catégorie principale",
     "cant-set-self-as-parent": "Ne peut être définie comme catégorie principale",

public/language/fr/user.json

@@ -195,5 +195,5 @@
     "emailUpdate.optional": "<strong>Ce champ est facultatif</strong>. Vous n'êtes pas obligé de fournir votre adresse e-mail, mais sans e-mail validé, vous ne pourrez pas récupérer votre compte ou vous connecter avec votre e-mail.",
     "emailUpdate.required": "<strong>Ce champ est requis</strong>.",
     "emailUpdate.change-instructions": "Un mail de confirmation sera envoyé à l'adresse mail saisie avec un lien unique. L'accès à ce lien confirmera votre propriété de mail et elle deviendra active sur votre compte. À tout moment, vous pouvez mettre à jour votre mail enregistré depuis la page de votre compte.",
-    "emailUpdate.password-challenge": "Please enter your password in order to verify account ownership."
+    "emailUpdate.password-challenge": "Veuillez entrer votre mot de passe pour confirmer la propriété du compte."
 }

public/language/gl/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/gl/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/gl/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/he/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% Full",
 	"post-cache-size": "גודל מטמון פוסטים",
 	"items-in-cache": "פריטים במטמון"

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

@@ -51,6 +51,7 @@
 	"signature.disable": "השבת חתימות",
 	"signature.no-links": "השבת קישורים בחתימות",
 	"signature.no-images": "השבת תמונות בחתימות",
+	"signature.hide-duplicates": "Hide duplicate signatures in topics",
 	"signature.max-length": "אורך חתימה מרבי",
 	"composer": "הגדרות יצירת פוסט",
 	"composer-help": "ההגדרות הבאות חלות על הפונקציונליות ו/או המראה של יוצר הפוסט המוצג\n\t\t\t\tלמשתמשים בעת יצירת נושאים חדשים, או מענה לנושאים קיימים.",

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

@@ -23,5 +23,9 @@
 	"flags.limit-per-target-placeholder": "ברירת מחדל: 0",
 	"flags.limit-per-target-help": "כשפוסט או משתמש מסומן כמה פעמים, כל דיווח נוסף נחשב ל "דיווח" ונוסף לדיווח הראשון. הגדר את האופציה הזאת לכל מספר שהוא לא 0 כדי להגביל את כמות הדיווחים שפוסט או משתמש יכול לקבל.",
   	"flags.auto-flag-on-downvote-threshold": "מספר הצבעות למטה כדי ליצור דיווח אטומטי (הגדר ל-0 כדי להשבית; ברירת מחדל: 0)",
-	"flags.auto-resolve-on-ban": "פתור אוטומטי כל כרטיסי משתמש כאשר הוא מוחרם"
+	"flags.auto-resolve-on-ban": "פתור אוטומטי כל כרטיסי משתמש כאשר הוא מוחרם",
+	"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/he/language.json

@@ -1,5 +1,5 @@
 {
-    "name": "אנגלית (בריטניה/קנדה)",
+    "name": "עברית (ישראל)",
     "code": "he",
     "dir": "rtl"
 }

public/language/he/modules.json

@@ -1,6 +1,6 @@
 {
     "chat.chatting_with": "שוחחו בצ'אט עם",
-    "chat.placeholder": "כתבו את תוכן הודעת הצ'אט כאן, ניתן גם לגרור ולשחרר כאן תמונות, הקישו אנטר לשליחה.",
+    "chat.placeholder": "כתבו תוכן הודעת הצ'אט כאן, ניתן לגרור ולשחרר כאן תמונות, הקישו אנטר לשליחה.",
     "chat.scroll-up-alert": "הנכם צופים כעת בהודעות ישנות. לחצו כאן למעבר להודעה האחרונה.",
     "chat.send": "שליחה",
     "chat.no_active": "אין לכם צ'אטים פעילים",

public/language/he/topic.json

@@ -113,7 +113,7 @@
     "bookmark": "הוספה למועדפים",
     "bookmarks": "מועדפים",
     "bookmarks.has_no_bookmarks": "לא צירפתם פוסט למועדפים עדיין",
-    "copy-permalink": "העתקת קישור-קבוע",
+    "copy-permalink": "העתקת קישור פוסט",
     "loading_more_posts": "טוען פוסטים נוספים",
     "move_topic": "העברת נושא",
     "move_topics": "העברת נושאים",

public/language/he/user.json

@@ -92,8 +92,8 @@
     "show_email": "הצג את כתובת האימייל שלי",
     "show_fullname": "הצג את שמי המלא",
     "restrict_chats": "אשר הודעות צ'אט ממשתמשים שאני עוקב אחריהם בלבד",
-    "digest_label": "הרשם לקבלת תקציר",
-    "digest_description": "הירשם לקבלת עדכונים בדואר אלקטרוני מפורום זה (הודעות ונושאים חדשים) בהתאם ללוח זמנים מוגדר מראש",
+    "digest_label": "הרשמה לקבלת תקציר",
+    "digest_description": "הרשמה לקבלת עדכונים בדואר אלקטרוני מפורום זה (הודעות ונושאים חדשים) בהתאם ללוח זמנים מוגדר מראש",
     "digest_off": "כבוי",
     "digest_daily": "יומי",
     "digest_weekly": "שבועי",
@@ -109,10 +109,10 @@
     "has_no_upvoted_posts": "המשתמש טרם הצביע בעד פוסטים כלשהם.",
     "has_no_downvoted_posts": "המשתמש טרם הצביע נגד פוסטים כלשהם.",
     "has_no_controversial_posts": "למשתמש זה אין עדיין פוסטים עם הצבעה למטה.",
-    "has_no_blocks": "לא חסמת אף משתמש.",
+    "has_no_blocks": "לא חסמתם אף משתמש.",
     "email_hidden": "כתובת אימייל מוסתרת",
     "hidden": "מוסתר",
-    "paginate_description": "הצג נושאים ופוסטים בעמודים במקום כרשימת גלילה אין-סופית",
+    "paginate_description": "הצגת נושאים ופוסטים בעמודים במקום כרשימת גלילה אין-סופית",
     "topics_per_page": "כמות נושאים בעמוד",
     "posts_per_page": "כמות פוסטים בעמוד",
     "max_items_per_page": "מקסימום %1",

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

@@ -1,5 +1,8 @@
 {
 	"post-cache": "Objava predmemorija",
+	"group-cache": "Group Cache",
+	"local-cache": "Local Cache",
+	"object-cache": "Object Cache",
 	"percent-full": "%1% Puno",
 	"post-cache-size": "Veličina predmemorije objave",
 	"items-in-cache": "Artikli u predmemoriji"

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

@@ -51,6 +51,7 @@
 	"signature.disable": "Onemogući potpise",
 	"signature.no-links": "Onemogući odlazne poveznice u potpisima ",
 	"signature.no-images": "Onemogući slike u potpisima",
+	"signature.hide-duplicates": "Hide duplicate signatures in topics",
 	"signature.max-length": "Minimalna dužina potpisa",
 	"composer": "Postavke Composer-a",
 	"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/hr/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/hu/admin/advanced/cache.json

@@ -1,5 +1,8 @@
 {
 	"post-cache": "Hozzászólás gyorsítótár",
+	"group-cache": "Group Cache",
+	"local-cache": "Local Cache",
+	"object-cache": "Object Cache",
 	"percent-full": "%1% Tele",
 	"post-cache-size": "Hozzászólás gyorsítótáras mérete",
 	"items-in-cache": "Elemek a gyorsítótárban"

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

@@ -51,6 +51,7 @@
 	"signature.disable": "Aláírások kikapcsolása",
 	"signature.no-links": "Linkek letiltása az aláírásokban",
 	"signature.no-images": "Képek letiltása az aláírásokban",
+	"signature.hide-duplicates": "Hide duplicate signatures in topics",
 	"signature.max-length": "Aláírás maximális hossza",
 	"composer": "Szövegszerkesztő beállításai",
 	"composer-help": "Az alábbi beállítások a felhasználóknak megjelenített szövegszerkesztő (témakör, hozzászólás vagy válasz írásánál)\n\t\t\t\tfunkcióit és/vagy megjelenését szabályozzák.",

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

@@ -23,5 +23,9 @@
 	"flags.limit-per-target-placeholder": "Alapértelmezett: 0",
 	"flags.limit-per-target-help": "Amikor egy hozzászólás vagy felhasználó több megjelölést kap, akkor minden megjelölés "jelentésnek" számít és hozzáadódik az eredeti megjelöléshez. Adj meg 0-tól eltérő értéket egy maximális jelölési szám beállításához.",
   	"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": "A felhasználó összes megjelölésének feloldása, amikor kitiltásra kerül"
+	"flags.auto-resolve-on-ban": "A felhasználó összes megjelölésének feloldása, amikor kitiltásra kerül",
+	"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/id/admin/advanced/cache.json

@@ -1,5 +1,8 @@
 {
 	"post-cache": "Cache Kiriman",
+	"group-cache": "Group Cache",
+	"local-cache": "Local Cache",
+	"object-cache": "Object Cache",
 	"percent-full": "%1% Penuh",
 	"post-cache-size": "Ukuran Cache Kiriman",
 	"items-in-cache": "Item di Cache"

public/language/id/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/id/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/it/admin/advanced/cache.json

@@ -1,5 +1,8 @@
 {
 	"post-cache": "Cache Post",
+	"group-cache": "Cache di gruppo",
+	"local-cache": "Cache locale",
+	"object-cache": "Cache oggetti",
 	"percent-full": "%1% Pieno",
 	"post-cache-size": "Dimensione Cache dei Post",
 	"items-in-cache": "Elementi nella Cache"

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

@@ -10,10 +10,10 @@
 	"smtp-transport-help": "Puoi selezionare da un elenco di servizi noti o inserirne uno personalizzato.",
 	"smtp-transport.service": "Seleziona un servizio",
 	"smtp-transport.service-custom": "Servizio personalizzato",
-	"smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select "Custom Service" and enter the details below.",
-	"smtp-transport.gmail-warning1": "If you are using GMail as your email provider, you will have to generate an &quot;App Password&quot; in order for NodeBB to authenticate successfully. You can generate one at the <a href=\"https://myaccount.google.com/apppasswords\">App Passwords <i class=\"fa fa-external-link\"></i></a> page.",
-	"smtp-transport.gmail-warning2": "For more information about this workaround, <a href=\"https://nodemailer.com/usage/using-gmail/\">please consult this NodeMailer article <i class=\"fa fa-external-link\"></i></a> on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. <a href=\"../extend/plugins\">Browse available plugins here</a>.",
-	"smtp-transport.auto-enable-toast": "It looks like you&apos;re configuring an SMTP transport. We enabled the \"SMTP Transport\" option for you.",
+	"smtp-transport.service-help": "Selezionare il nome di un servizio per utilizzare le informazioni note su di esso. In alternativa, selezionare &quot;Servizio personalizzato&quot; e inserire i dettagli qui sotto.",
+	"smtp-transport.gmail-warning1": "Se si utilizza GMail come provider di posta elettronica, è necessario generare una &quot;Password dell'app&quot; affinché NodeBB possa autenticarsi con successo. Puoi generarne una alla pagina <a href=\"https://myaccount.google.com/apppasswords\">Password dell'app <i class=\"fa fa-external-link\"></i></a>.",
+	"smtp-transport.gmail-warning2": "Per ulteriori informazioni su questa soluzione alternativa, <a href=\"https://nodemailer.com/usage/using-gmail/\">si prega di consultare questo articolo NodeMailer <i class=\"fa fa-external-link\"></i></a> sulla questione. Un'alternativa sarebbe utilizzare un plug-in di posta elettronica di terze parti come SendGrid, Mailgun, ecc. <a href=\"../extend/plugins\">Sfoglia i plugin disponibili qui</a>.",
+	"smtp-transport.auto-enable-toast": "Sembra che tu stia configurando un trasporto SMTP. Abbiamo abilitato l'opzione \"Trasporto SMTP\" per te.",
 	"smtp-transport.host": "Host SMTP",
 	"smtp-transport.port": "Porta SMTP",
 	"smtp-transport.security": "Sicurezza connessione",

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

@@ -51,6 +51,7 @@
 	"signature.disable": "Disabilita le firme",
 	"signature.no-links": "Disabilita i collegamenti nelle firme",
 	"signature.no-images": "Disabilita le immagini nelle firme",
+	"signature.hide-duplicates": "Nascondi firme duplicate nelle discussioni",
 	"signature.max-length": "Lunghezza massima della firma",
 	"composer": "Impostazioni del compositore",
 	"composer-help": "Le seguenti impostazioni regolano la funzionalità e/o l'aspetto del post compositore mostrato\n\t\t\t\tagli utenti quando creano nuove discussioni o rispondono a discussioni esistenti.",

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

@@ -23,5 +23,9 @@
 	"flags.limit-per-target-placeholder": "Predefinito: 0",
 	"flags.limit-per-target-help": "Quando un post o un utente viene segnalato più volte, ogni segnalazione aggiuntiva è considerata una "report" e aggiunto alla segnalazione originale. Imposta questa opzione su un numero diverso da zero per limitare il numero di rapporti che un elemento può ricevere.",
   	"flags.auto-flag-on-downvote-threshold": "Numero di voti negativi per contrassegnare automaticamente i post (impostare a 0 per disabilitare, predefinito: 0)",
-	"flags.auto-resolve-on-ban": "Risolvi automaticamente tutti i ticket di un utente quando vengono bannati"
+	"flags.auto-resolve-on-ban": "Risolvi automaticamente tutti i ticket di un utente quando vengono bannati",
+	"flags.action-on-resolve": "Esegui le seguenti operazioni quando una segnalazione viene risolta",
+	"flags.action-on-reject": "Esegui le seguenti operazioni quando una segnalazione viene rifiutata",
+	"flags.action.nothing": "Non fare nulla",
+	"flags.action.rescind": "Annulla l'invio della notifica ai moderatori/amministratori"
 }

public/language/it/user.json

@@ -195,5 +195,5 @@
     "emailUpdate.optional": "<strong>Questo campo è facoltativo</strong>. Non sei obbligato a fornire il tuo indirizzo email, ma senza un'email convalidata non sarai in grado di recuperare il tuo account o di accedere con la tua email.",
     "emailUpdate.required": "<strong>Questo campo è obbligatorio</strong>.",
     "emailUpdate.change-instructions": "Un'email di conferma sarà inviata all'indirizzo email inserito con un link unico. Accedendo a quel link confermerai la tua proprietà dell'indirizzo email e questo diventerà attivo sul tuo account. In qualsiasi momento, sei in grado di aggiornare la tua email in archivio dalla pagina del tuo account.",
-    "emailUpdate.password-challenge": "Please enter your password in order to verify account ownership."
+    "emailUpdate.password-challenge": "Inserisci la tua password per verificare la proprietà dell'account."
 }

public/language/ja/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/ja/admin/settings/post.json

@@ -51,6 +51,7 @@
 	"signature.disable": "署名を無効にする",
 	"signature.no-links": "署名内のリンクを無効にする",
 	"signature.no-images": "署名内の画像を無効にする",
+	"signature.hide-duplicates": "Hide duplicate signatures in topics",
 	"signature.max-length": "署名の最大文字数",
 	"composer": "Composerの設定",
 	"composer-help": "次の設定は、投稿者の機能や外観を制御します。\n\\t\\t\\t\\tユーザーに新しいスレッドを作成したり、既存のトピックに返信したりできます。",

public/language/ja/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/ko/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/ko/admin/settings/post.json

@@ -51,6 +51,7 @@
 	"signature.disable": "서명 비활성화",
 	"signature.no-links": "서명에 포함된 바로가기 비활성화",
 	"signature.no-images": "서명에 포함된 이미지 비활성화",
+	"signature.hide-duplicates": "Hide duplicate signatures in topics",
 	"signature.max-length": "최대 서명 길이",
 	"composer": "에디터 설정",
 	"composer-help": "아래의 설정들은 사용자가 새로운 화제나 답글을 작성할 때 나타나는 에디터 화면의 기능과 외형에 영향을 끼칩니다.",

public/language/ko/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": "Number of downvotes to auto flag posts (Set to 0 to disable, default: 0)",
-	"flags.auto-resolve-on-ban": "차단될 경우 사용자의 모든 기회 박탈"
+	"flags.auto-resolve-on-ban": "차단될 경우 사용자의 모든 기회 박탈",
+	"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/ko/error.json

@@ -160,8 +160,8 @@
     "downvoting-disabled": "비추천 기능이 비활성 상태입니다.",
     "not-enough-reputation-to-chat": "You need %1 reputation to chat",
     "not-enough-reputation-to-upvote": "You need %1 reputation to upvote",
-    "not-enough-reputation-to-downvote": "You need %1 reputation to downvote",
-    "not-enough-reputation-to-flag": "You need %1 reputation to flag this post",
+    "not-enough-reputation-to-downvote": "오직 1%",
+    "not-enough-reputation-to-flag": "이 포스트를 플래그하려면 1%가 더 필요합니다.",
     "not-enough-reputation-min-rep-website": "You need %1 reputation to add a website",
     "not-enough-reputation-min-rep-aboutme": "You need %1 reputation to add an about me",
     "not-enough-reputation-min-rep-signature": "You need %1 reputation to add a signature",

public/language/ko/global.json

@@ -23,7 +23,7 @@
     "close": "닫기",
     "pagination": "페이지",
     "pagination.out_of": "현재: %1 / 전체: %2",
-    "pagination.enter_index": "Go to post index",
+    "pagination.enter_index": "포스트 인덱스로",
     "header.admin": "관리자",
     "header.categories": "카테고리",
     "header.recent": "최근",

public/language/ko/modules.json

@@ -1,12 +1,12 @@
 {
     "chat.chatting_with": "채팅",
-    "chat.placeholder": "Type chat message here, drag & drop images, press enter to send",
+    "chat.placeholder": "여기에 메시지를 쓰고, 이미지를 드래그 앤 드롭하고, Enter를 눌러 보내세요!",
     "chat.scroll-up-alert": "오래된 메시지를 보고 있습니다. 여기를 눌러 최신 메시지로 이동하세요.",
     "chat.send": "전송",
     "chat.no_active": "활성화된 채팅이 없습니다.",
     "chat.user_typing": "%1님이 입력 중...",
     "chat.user_has_messaged_you": "%1님이 메시지를 보냈습니다.",
-    "chat.see_all": "All chats",
+    "chat.see_all": "모든 채팅",
     "chat.mark_all_read": "Mark all read",
     "chat.no-messages": "채팅 기록을 보려면 채팅 상대를 선택하세요.",
     "chat.no-users-in-room": "채팅방에 사용자 없음",

public/language/ko/notifications.json

@@ -1,8 +1,8 @@
 {
     "title": "알림",
     "no_notifs": "새로운 알림이 없습니다.",
-    "see_all": "All notifications",
-    "mark_all_read": "Mark all read",
+    "see_all": "모든 알림",
+    "mark_all_read": "모두 읽음으로 표시",
     "back_to_home": "%1(으)로 돌아가기",
     "outgoing_link": "외부 링크",
     "outgoing_link_message": "%1(을)를 떠납니다.",

public/language/lt/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/lt/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/lt/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"
 }