chore: incrementing version number - v1.18.2

Previous logic seemed to match the logic used in privileges.users.canEdit, except
the latter allows plugins to modify the value.

.eslintrc

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

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: npm
+    directory: "/install"
+    schedule:
+      interval: daily

CHANGELOG.md

@@ -1,3 +1,215 @@
+#### v1.18.1 (2021-09-03)
+
+##### Chores
+
+*  found some hooks that don't play well docgen (ae793b4a)
+*  incrementing version number - v1.18.0 (1e436ae7)
+*  update changelog for v1.18.0 (2fd9c095)
+* **deps:**  update dependency mocha to v9.1.1 (64bac178)
+
+##### New Features
+
+*  create folders in ACP uploads #9638 (#9750) (3df79683)
+*  column based view on wide priv. tables (#9699) (61f02f17)
+*  als (#9749) (e59d3575)
+*  add quick reply key (e9314842)
+*  add new lang key for no best posts (6e73d8c9)
+
+##### Bug Fixes
+
+* **deps:**
+  *  update dependency autoprefixer to v10.3.4 (67b932f4)
+  *  update dependency nodebb-theme-persona to v11.2.4 (fe18e100)
+  *  update dependency mongodb to v3.7.0 (31a35d7f)
+  *  update socket.io packages to v4.2.0 (f2028d70)
+  *  update dependency ioredis to v4.27.9 (6052eb16)
+  *  update dependency mongodb to v3.6.12 (#9761) (5fa982c1)
+  *  update dependency nodebb-plugin-composer-default to v7.0.2 (33d51201)
+  *  update dependency nodebb-theme-slick to v1.4.12 (1b416d7e)
+  *  update dependency nodebb-theme-slick to v1.4.11 (65b32fa1)
+  *  update dependency nodebb-theme-persona to v11.2.3 (6ce321e4)
+  *  update dependency autoprefixer to v10.3.3 (91ba7cdf)
+  *  update dependency nodebb-theme-slick to v1.4.9 (d80b378f)
+  *  update dependency jquery-deserialize to v2.0.0 (#9744) (7f9451ce)
+*  determine indeterminate checkboxes (760ea9df)
+*  move app.alert back into the conditionals (ca9bae3a)
+*  only show email confirmation warning toast on pages that it applies (1bd1cc74)
+*  updated email confirm warning to be more positive (2d1380dd)
+*  automated tests are a good thing to have (6afeac37)
+
+##### Refactors
+
+*  consistent jquery element var naming (fc0e655e)
+*  var to const (1272da65)
+
+#### v1.18.0 (2021-08-25)
+
+##### Breaking Changes
+
+* **emails:**  restore ability for admins to edit a user's email address [breaking] (c4e3362b)
+*  #9670 return 4xx errors instead of 5xx on flag routes, when unauthenticated or not privileged [breaking] (d1959a25)
+*  made TopicList.onTopicsLoaded private [breaking] (07f25d8c)
+*  return proper API-style response if exception caught by error handler on v3 routes [breaking] (a54a3ee1)
+
+##### Chores
+
+* **deps:**
+  *  update dependency husky to v7.0.2 (324c7d48)
+  *  update dependency eslint-plugin-import to v2.24.2 (9a34fe18)
+  *  update dependency eslint-config-nodebb to v0.0.2 (cd85a55d)
+  *  update dependency mocha to v9.1.0 (c5a42273)
+  *  update dependency eslint-plugin-import to v2.24.1 (daca09d4)
+  *  update dependency @apidevtools/swagger-parser to v10.0.3 (ffdf61b8)
+  *  update dependency jsdom to v17 (#9700) (41855375)
+  *  update dependency eslint-plugin-import to v2.24.0 (23dafa20)
+  *  update dependency lint-staged to v11.1.2 (d47bdde2)
+  *  update dependency jsdom to v16.7.0 (9db28b4b)
+  *  update dependency eslint to v7.32.0 (03a98f4d)
+  *  update dependency mocha to v9.0.3 (40384fcb)
+  *  update dependency lint-staged to v11.1.1 (7588aae1)
+  *  update dependency lint-staged to v11.1.0 (cb5fe271)
+  *  update dependency mocha to v9 (f43291f5)
+  *  update dependency husky to v7 (702290c4)
+  *  update dependency eslint to v7.31.0 (f5a53b7f)
+  *  update dependency lint-staged to v11.0.1 (02101315)
+*  up markdown/composer-default, fixes: #9708 (b74eefac)
+*  incrementing version number - v1.17.2 (46be2046)
+*  update changelog for v1.17.2 (5c9c0605)
+
+##### Documentation Changes
+
+*  some hook deprecation notices (6bc090f8)
+
+##### New Features
+
+*  add confirmation modal to topic event deletion (e803737a)
+*  allow changing default search in (794bf01b)
+*  #9705, use radio buttons for flag reasons (382a4c27)
+*  Client-side hooks - replace window.trigger (#9679) (342503e0)
+*  closes #9684, allow event deletion (358ad740)
+*  replace eslint configs on server and client side to inherit rules from eslint-config-nodebb (f653a6ff)
+*  re-add FontAwesome font for compatibility (a370c26f)
+*  update to FontAwesome 5.15, resolve #6976 (41762e66)
+*  removed registerAndLoginUserCallback local helper, added handling if a bad interstitial doesn't go away nor throw errors (70a04bc1)
+*  updated email confirmation alert to more closely reflect email usage, remembering dismissal (bbbacd86)
+*  allow requirejs modules to be awaited (58adb762)
+*  show instructional modal after email change request (0e05cbe1)
+*  return back to profile after editing email (324a12b6)
+*  allow registration interstitial abort to also follow returnTo (b3c91641)
+*  plumb current session id into email removal/confirmation flow, so all other sessions are revoked except for the current session (96398faa)
+*  allow revokeAllSessions method to revoke all sessions except that which is passed in (new arg) (b0a4a1d3)
+*  return generic 404 on invalid confirm code (f53fc1ad)
+*  invites no longer require email (a917210c)
+*  show different registration intersitial lead text on new account vs. existing (74aaa0a9)
+*  removal of emailExists socket listener (12b2a979)
+*  add loggedin/guest class to body (04b1f702)
+*  convert _fireStaticHook to async function (auto-refactor by vscode) (21359eab)
+*  store topic tags in topic hash (#9656) (4a56388e)
+*  new hook `action:topics.loading` (in the same format as `action:posts.loading`) (e0db904b)
+*  schedule deprecation for `action:category.loaded` and `action:category.loading`. Use `action:topics.loaded/ing` instead (8ae4c300)
+*  internationalize API error messages (7036c375)
+*  #9651, change category desc to multiline (5fd190f7)
+* **emails:**
+  *  pass req in to filter:registration.interstitial (afd2d8da)
+  *  display current email in interstitial form (f5291999)
+  *  upgrade script for includeUnverifiedEmails (50517020)
+  *  +includeUnverifiedEmails ACP setting (be97aa6f)
+
+##### Bug Fixes
+
+*  lint (55693ec1)
+*  topic event deletion (1ee92c28)
+*  pluginPaths (0743554d)
+*  #9730, show warning if plugin is active but not installed (13878e9f)
+*  #9729, insert new posts after topic events (60bf5643)
+*  #9719, only apply to non https (c354cde3)
+*  #9727, addHandlers after hooks (77c3085a)
+*  allow smaller than 5mins for admin relogin duration (a288f51f)
+*  taskbar icon not pushed via composer/persona (3a81c8fd)
+*  #9698, pass along query params in redirect (9de64bf5)
+*  lint (8bf2896d)
+*  remove unnecessary quote (093ac1c0)
+*  parseInt tids (162ebacf)
+*  #9681, update posts in queue if target tid is merged (0c816429)
+*  email update interstitial to not error on empty email field (on new registration) (4a521ea2)
+*  updated ACP > Manage > Users to handle users with no email address (824a72b2)
+*  allowed reset and reset_notify emails to go out to unconfirmed email addresses (d5b5b7d5)
+*  bug where confirmation email was sent to the old email address, not the new one (414d733d)
+*  email validation flow, so that it actually works, fixed event logging bug, new email verification template (3bcd1f14)
+*  accidental early return in confirmByCode, tests, race condition (caf89687)
+*  test :shipit: (2c06ac9a)
+*  failing test from d1959a2 (f71f2951)
+*  #9668, add raw info to psql database page (6c47a060)
+*  use hooks module instead of window trigger (acb11cc7)
+*  tests (0960a814)
+*  translate language keys if passed in to formatApiResponse (415416d2)
+*  lint (ff78969c)
+*  tests (55d7e558)
+*  keep query string on redirects (47c8c692)
+* **deps:**
+  *  bump persona (12e7f8d5)
+  *  update dependency nodebb-theme-persona to v11.2.1 (#9734) (2e1562b8)
+  *  update dependency nodebb-theme-vanilla to v12.1.2 (#9735) (4bd66a7c)
+  *  update dependency nodebb-theme-slick to v1.4.8 (#9732) (096c5a58)
+  *  update dependency autoprefixer to v10.3.2 (d44e3a8e)
+  *  update dependency nodebb-theme-persona to v11.2.0 (116f9cb5)
+  *  update dependency ioredis to v4.27.8 (8461791a)
+  *  update dependency nodebb-theme-persona to v11.1.3 (ec103ce8)
+  *  update dependency sharp to v0.29.0 (626d5565)
+  *  update dependency connect-mongo to v4.5.0 (ce6039f2)
+  *  update dependency nodebb-theme-vanilla to v12.1.1 (de83f82e)
+  *  update dependency nodebb-theme-persona to v11.1.2 (ee10ae04)
+  *  update dependency yargs to v17.1.1 (38e38580)
+  *  update dependency nodebb-theme-persona to v11.1.1 (47941418)
+  *  update dependency mongodb to v3.6.11 (a0fd0268)
+  *  update dependency yargs to v17.1.0 (181c20ba)
+  *  update dependency ioredis to v4.27.7 (4c9d6b62)
+  *  update theme versions for #9607 (3b34571d)
+  *  update dependency postcss to v8.3.6 (ebdba8f1)
+  *  update dependency html-to-text to v8 (3f24746c)
+  *  update dependency yargs to v17 (1b6b1fe5)
+  *  bump composer-default to v7 (51458c75)
+  *  update dependency autoprefixer to v10.3.1 (0d3f74b7)
+  *  update dependency nodebb-plugin-markdown to v8.14.2 (b6a84712)
+  *  update dependency autoprefixer to v10.3.0 (72c9650f)
+  *  update socket.io packages to v4.1.3 (f14df0d4)
+  *  update dependency nodebb-plugin-composer-default to v6.5.34 (31dae04f)
+  *  update dependency nodebb-theme-persona to v11.0.26 (ae14016e)
+  *  update dependency nodebb-plugin-markdown to v8.14.1 (8b41684e)
+* **emails:**
+  *  broken test for api/user/email/:email (81611ae1)
+  *  dont allow retrieving user data if showemail is false @julianlam (7d115c8e)
+  *  registration tests, email no longer passed-in, API tests (confirm email for test accounts) (6694bdd5)
+  *  don't automatically associate email during user creation if passed in at registration (e726048e)
+  *  remove debug log (b4b65ecd)
+  *  broken test due to sticky registration interstitial (ab9b6716)
+
+##### Refactors
+
+*  remove promisify from redis, ioredis supports promises nati… (#9728) (6659e95a)
+*  get rid of async.waterfall/each (8fb53252)
+*  remove unused async (42dbd402)
+*  remove waterfall (6b6a7d4b)
+*  move interstitials into its own file in `src/user/` (e95df2f0)
+*  added user.email.remove method, updated email interstitial to handle email removal (ccf004f1)
+*  client-side to use flag notes API (ef4e74bf)
+*  fix wording (6ed7e937)
+* **email:**  validation checking methods, +tests fix (087e6020)
+* **emails:**
+  *  more work in update email interstitial, interstitial skipping, email change on confirmation, deprecation of requireEmailConfirmation (69c96dd2)
+  *  interstitial for adding/updating email (f365bc46)
+  *  remove email validation on client and server side (7c1d1c77)
+
+##### Code Style Changes
+
+*  eslint (d2492ef4)
+*  lint fix (340ccb24)
+*  lint (52229172)
+
+##### Tests
+
+* **emails:**  fixing broken tests introduced by e5ff68acd (a3a3b10f)
+
 #### v1.17.2 (2021-07-07)
 
 ##### Chores

install/data/defaults.json

@@ -65,7 +65,6 @@
     "profileImageDimension": 200,
     "profile:convertProfileImageToPNG": 0,
     "profile:keepAllUserImages": 0,
-    "requireEmailConfirmation": 0,
     "gdpr_enabled": 1,
     "allowProfileImageUploads": 1,
     "teaserPost": "last-reply",
@@ -108,6 +107,9 @@
     "postsPerPage": 20,
     "categoriesPerPage": 50,
     "userSearchResultsPerPage": 50,
+    "searchDefaultSortBy": "relevance",
+    "searchDefaultIn": "titlesposts",
+    "searchDefaultInQuick": "titles",
     "maximumGroupNameLength": 255,
     "maximumGroupTitleLength": 40,
     "preventTopicDeleteAfterReplies": 0,
@@ -134,6 +136,7 @@
     "disableEmailSubscriptions": 0,
     "emailConfirmInterval": 10,
     "removeEmailNotificationImages": 0,
+    "includeUnverifiedEmails": 0,
     "inviteExpiration": 7,
     "dailyDigestFreq": "off",
     "digestHour": 17,

install/package.json

@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "1.17.2",
+    "version": "1.18.2",
     "homepage": "http://www.nodebb.org",
     "repository": {
         "type": "git",
@@ -32,7 +32,7 @@
         "ace-builds": "^1.4.12",
         "archiver": "^5.2.0",
         "async": "^3.2.0",
-        "autoprefixer": "10.3.1",
+        "autoprefixer": "10.3.4",
         "bcryptjs": "2.4.3",
         "benchpressjs": "2.4.3",
         "body-parser": "^1.19.0",
@@ -46,7 +46,7 @@
         "compare-versions": "3.6.0",
         "compression": "^1.7.4",
         "connect-flash": "^0.1.1",
-        "connect-mongo": "4.4.1",
+        "connect-mongo": "4.5.0",
         "connect-multiparty": "^2.2.0",
         "connect-pg-simple": "^6.2.1",
         "connect-redis": "6.0.0",
@@ -61,10 +61,10 @@
         "express-useragent": "^1.0.15",
         "graceful-fs": "^4.2.6",
         "helmet": "^4.4.1",
-        "html-to-text": "7.1.1",
+        "html-to-text": "8.0.0",
         "ipaddr.js": "^2.0.0",
         "jquery": "3.6.0",
-        "jquery-deserialize": "2.0.0-rc1",
+        "jquery-deserialize": "2.0.0",
         "jquery-form": "4.3.0",
         "jquery-serializeobject": "1.0.0",
         "jquery-ui": "1.12.1",
@@ -78,36 +78,36 @@
         "material-design-lite": "^1.3.0",
         "mime": "^2.5.2",
         "mkdirp": "^1.0.4",
-        "mongodb": "3.6.10",
+        "mongodb": "3.7.0",
         "morgan": "^1.10.0",
         "mousetrap": "^1.6.5",
         "multiparty": "4.2.2",
         "@nodebb/bootswatch": "3.4.2",
         "nconf": "^0.11.2",
-        "nodebb-plugin-composer-default": "6.5.34",
-        "nodebb-plugin-dbsearch": "5.0.2",
+        "nodebb-plugin-composer-default": "7.0.2",
+        "nodebb-plugin-dbsearch": "5.0.3",
         "nodebb-plugin-emoji": "^3.5.0",
         "nodebb-plugin-emoji-android": "2.0.5",
-        "nodebb-plugin-markdown": "8.14.2",
+        "nodebb-plugin-markdown": "8.14.3",
         "nodebb-plugin-mentions": "2.13.11",
         "nodebb-plugin-spam-be-gone": "0.7.9",
         "nodebb-rewards-essentials": "0.1.5",
         "nodebb-theme-lavender": "5.2.1",
-        "nodebb-theme-persona": "11.0.26",
-        "nodebb-theme-slick": "1.4.7",
-        "nodebb-theme-vanilla": "12.0.8",
+        "nodebb-theme-persona": "11.2.5",
+        "nodebb-theme-slick": "1.4.12",
+        "nodebb-theme-vanilla": "12.1.3",
         "nodebb-widget-essentials": "5.0.4",
         "nodemailer": "^6.5.0",
         "nprogress": "0.2.0",
         "passport": "^0.4.1",
         "passport-http-bearer": "^1.0.1",
         "passport-local": "1.0.0",
-        "pg": "^8.5.1",
-        "pg-cursor": "^2.5.2",
-        "postcss": "8.3.5",
+        "pg": "^8.7.1",
+        "pg-cursor": "^2.7.1",
+        "postcss": "8.3.6",
         "postcss-clean": "1.2.0",
         "prompt": "^1.1.0",
-        "ioredis": "4.27.6",
+        "ioredis": "4.27.9",
         "request": "2.88.2",
         "request-promise-native": "^1.0.9",
         "requirejs": "2.3.6",
@@ -116,12 +116,12 @@
         "sanitize-html": "^2.3.2",
         "semver": "^7.3.4",
         "serve-favicon": "^2.5.0",
-        "sharp": "0.28.3",
+        "sharp": "0.29.1",
         "sitemap": "^7.0.0",
         "slideout": "1.0.1",
-        "socket.io": "4.1.3",
+        "socket.io": "4.2.0",
         "socket.io-adapter-cluster": "^1.0.1",
-        "socket.io-client": "4.1.3",
+        "socket.io-client": "4.2.0",
         "@socket.io/redis-adapter": "7.0.0",
         "sortablejs": "1.14.0",
         "spdx-license-list": "^6.4.0",
@@ -137,23 +137,23 @@
         "winston": "3.3.3",
         "xml": "^1.0.1",
         "xregexp": "^5.0.1",
-        "yargs": "16.2.0",
+        "yargs": "17.1.1",
         "zxcvbn": "^4.4.2"
     },
     "devDependencies": {
-        "@apidevtools/swagger-parser": "10.0.2",
-        "@commitlint/cli": "12.1.4",
-        "@commitlint/config-angular": "12.1.4",
+        "@apidevtools/swagger-parser": "10.0.3",
+        "@commitlint/cli": "13.1.0",
+        "@commitlint/config-angular": "13.1.0",
         "coveralls": "3.1.1",
-        "eslint": "7.30.0",
-        "eslint-config-airbnb-base": "14.2.1",
-        "eslint-plugin-import": "2.23.4",
+        "eslint": "7.32.0",
+        "eslint-config-nodebb": "0.0.2",
+        "eslint-plugin-import": "2.24.2",
         "grunt": "1.4.1",
         "grunt-contrib-watch": "1.1.0",
-        "husky": "6.0.0",
-        "jsdom": "16.6.0",
-        "lint-staged": "11.0.1",
-        "mocha": "8.4.0",
+        "husky": "7.0.2",
+        "jsdom": "17.0.0",
+        "lint-staged": "11.1.2",
+        "mocha": "9.1.1",
         "mocha-lcov-reporter": "1.3.0",
         "mockdate": "3.0.5",
         "nyc": "15.1.0",
@@ -182,4 +182,4 @@
             "url": "https://github.com/barisusakli"
         }
     ]
-}
+}

public/.eslintrc

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

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

@@ -8,8 +8,6 @@
 	"delete": "Delete",
 	"enable": "Enable",
 	"disable": "Disable",
-	"control-panel": "Rewards Control",
-	"new-reward": "New Reward",
 
 	"alert.delete-success": "Successfully deleted reward",
 	"alert.no-inputs-found": "Illegal reward - no inputs found!",

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

@@ -51,10 +51,13 @@
 	"alert.saved": "Privilege changes saved and applied",
 	"alert.confirm-discard": "Are you sure you wish to discard your privilege changes?",
 	"alert.discarded": "Privilege changes discarded",
-	"alert.confirm-copyToAll": "Are you sure you wish to apply this privilege set to <strong>all categories</strong>?",
-	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's privilege set to <strong>all categories</strong>?",
-	"alert.confirm-copyToChildren": "Are you sure you wish to apply this privilege set to <strong>all descendant (child) categories</strong>?",
-	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToAll": "Are you sure you wish to apply this set of <strong>%1</strong> to <strong>all categories</strong>?",
+	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's set of <strong>%1</strong> to <strong>all categories</strong>?",
+	"alert.confirm-copyToChildren": "Are you sure you wish to apply this set of <strong>%1</strong> to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's set of <strong>%1</strong> to <strong>all descendant (child) categories</strong>?",
 	"alert.no-undo": "<em>This action cannot be undone.</em>",
-	"alert.admin-warning": "Administrators implicitly get all privileges"
+	"alert.admin-warning": "Administrators implicitly get all privileges",
+  	"alert.copyPrivilegesFrom-title": "Select a category to copy from",
+  	"alert.copyPrivilegesFrom-warning": "This will copy <strong>%1</strong> from the selected category.",
+  	"alert.copyPrivilegesFromGroup-warning": "This will copy this group's set of <strong>%1</strong> from the selected category."
 }

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

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

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

@@ -36,6 +36,7 @@
 	"subscriptions.disable": "Disable email digests",
 	"subscriptions.hour": "Digest Hour",
 	"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>",
-	"notifications.settings": "Email notification settings",
-	"notifications.remove-images": "Remove images from email notifications"
+	"notifications.remove-images": "Remove images from email notifications",
+	"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
+	"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). <strong>Enable this setting at your own risk</strong> &ndash; sending emails to unverified addresses may be a violation of regional anti-spam laws."
 }

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

@@ -35,7 +35,10 @@
 	"maskable-icon.help": "Recommended size and format: 512x512, PNG format only. If no maskable icon is specified, NodeBB will fall back to the Touch Icon.",
 	"outgoing-links": "Outgoing Links",
 	"outgoing-links.warning-page": "Use Outgoing Links Warning Page",
-	"search-default-sort-by": "الترتيب الافتراضي للبحث",
+	"search": "Search",
+	"search-default-in": "Search In",
+	"search-default-in-quick": "Quick Search In",
+	"search-default-sort-by": "Sort by",
 	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page",
 	"site-colors": "Site Color Metadata",
 	"theme-color": "لون الثيم",

public/language/ar/email.json

@@ -6,7 +6,9 @@
     "greeting_no_name": "مرحبًا",
     "greeting_with_name": "مرحبًا بك يا %1",
     "email.verify-your-email.subject": "Please verify your email",
-    "email.verify.text1": "Your email address has changed!",
+    "email.verify.text1": "You've requested that we change or confirm your email address",
+    "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. <strong>If you did not request this, no action is required on your part.</strong>",
+    "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).",
     "welcome.text1": "شكرًا على تسجيلك في %1!",
     "welcome.text2": "لتفعيل حسابك، نحتاج إلى التأكد من صحة عنوان البريد الإلكتروني الذي سجلت به.",
     "welcome.text3": "تم قبول نتسجيلك ، يمكنك الدخول باتسخدام اسم المستخدم و كلمة المرور.",

public/language/ar/error.json

@@ -25,14 +25,17 @@
     "invalid-event": "Invalid event: %1",
     "local-login-disabled": "Local login system has been disabled for non-privileged accounts.",
     "csrf-invalid": "لم تتمكن من تسجيل الدخول. هنالك أحتمال ان جلستك انتهت. رجاءًا حاول مرة اخرى.",
+    "invalid-path": "Invalid path",
+    "folder-exists": "Folder exists",
     "invalid-pagination-value": "رقم الصفحة غير صحيح ، يجب أن يكون بين %1 و %2 .",
     "username-taken": "اسم المستخدم مأخوذ",
     "email-taken": "البريد الالكتروني مأخوذ",
+    "email-nochange": "The email entered is the same as the email already on file.",
     "email-invited": "Email was already invited",
-    "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.",
+    "email-not-confirmed": "Posting in some categories or topics is enabled once your email is confirmed, please click here to send a confirmation email.",
     "email-not-confirmed-chat": "لا يمكنك الدردشة حتى تقوم بتأكيد بريدك الإلكتروني، الرجاء إضغط هنا لتأكيد بريدك اﻹلكتروني.",
     "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.",
-    "no-email-to-confirm": "هذا المنتدى يستلزم تفعيل بريدك الإلكتروني، انقر هنا من فضلك لإدخاله.",
+    "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.",
     "email-confirm-failed": "لم نستطع تفعيل بريدك الإلكتروني، المرجو المحاولة لاحقًا.",
     "confirm-email-already-sent": "لقد تم ارسال بريد التأكيد، الرجاء اﻹنتظار 1% دقائق لإعادة اﻹرسال",
     "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",

public/language/ar/flags.json

@@ -77,9 +77,6 @@
 	"modal-reason-custom": "Reason for reporting this content...",
 	"modal-submit": "Submit Report",
 	"modal-submit-success": "Content has been flagged for moderation.",
-	"modal-submit-confirm": "Confirm Submission",
-	"modal-submit-confirm-text": "You have a custom reason specified already. Are you sure you wish to submit via quick-report?",
-	"modal-submit-confirm-text-help": "Submitting a quick report will overwrite any custom reasons defined.",
 
 	"bulk-actions": "Bulk Actions",
 	"bulk-resolve": "Resolve Flag(s)",

public/language/ar/global.json

@@ -70,6 +70,7 @@
     "firstpost": "First post",
     "read_more": "اقرأ المزيد",
     "more": "المزيد",
+    "none": "None",
     "posted_ago_by_guest": "كتب %1 بواسطة زائر",
     "posted_ago_by": "كتب %1 بواسطة %2",
     "posted_ago": "كتب %1",

public/language/ar/register.json

@@ -20,8 +20,9 @@
     "registration-added-to-queue": "تمت إضافتك في قائمة الإنتضار. ستتلقى رسالة إلكترونية عند الموافقة على تسجيلك من قبل الإدارة.",
     "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.",
     "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.",
-    "interstitial.intro": "نحتاج إلى بعض المعلومات الإضافية قبل أن نتمكن من إنشاء حسابك.",
-    "interstitial.errors-found": "تعذر علينا إتمام عملية التسجيل:",
+    "interstitial.intro": "We'd like some additional information in order to update your account…",
+    "interstitial.intro-new": "We'd like some additional information before we can create your account…",
+    "interstitial.errors-found": "Please review the entered information:",
     "gdpr_agree_data": "I consent to the collection and processing of my personal information on this website.",
     "gdpr_agree_email": "I consent to receive digest and notification emails from this website.",
     "gdpr_consent_denied": "You must give consent to this site to collect/process your information, and to send you emails.",

public/language/ar/topic.json

@@ -20,6 +20,8 @@
     "login-to-view": "🔒 Log in to view",
     "edit": "تعديل",
     "delete": "حذف",
+    "delete-event": "Delete Event",
+    "delete-event-confirm": "Are you sure you want to delete this event?",
     "purge": "تطهير",
     "restore": "استعادة",
     "move": "نقل",
@@ -43,6 +45,7 @@
     "unpinned-by": "Unpinned by",
     "deleted-by": "Deleted by",
     "restored-by": "Restored by",
+    "moved-from-by": "Moved from %1 by",
     "queued-by": "Post queued for approval →",
     "bookmark_instructions": "اضغط هنا للعودة لأخر مشاركة مقروءة في الموضوع",
     "flag-post": "Flag this post",
@@ -173,5 +176,6 @@
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier",
     "first-post": "First post",
-    "last-post": "Last post"
+    "last-post": "Last post",
+    "post-quick-reply": "Post quick reply"
 }

public/language/ar/user.json

@@ -98,6 +98,7 @@
     "has_no_follower": "هذا المستخدم ليس لديه أية متابعين :(",
     "follows_no_one": "هذا المستخدم لا يتابع أحد :(",
     "has_no_posts": "هذا المستخدم لم يشارك حتى الآن.",
+    "has_no_best_posts": "This user does not have any upvoted posts yet.",
     "has_no_topics": "هذا المستخدم لم يكتب أي موضوع حتى الآن.",
     "has_no_watched_topics": "هذا المستخدم لم يقم بمراقبة اية مواضيع حتى الآن.",
     "has_no_ignored_topics": "هذا المستخدم لم يقم بتجاهل اية مواضيع حتى الآن.",
@@ -180,5 +181,8 @@
     "consent.export_uploads": "Export Uploaded Content (.zip)",
     "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.",
     "consent.export_posts": "Export Posts (.csv)",
-    "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete."
+    "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.",
+    "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.",
+    "emailUpdate.optional": "<strong>This field is optional</strong>. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.",
+    "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page."
 }

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

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

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

@@ -51,10 +51,13 @@
 	"alert.saved": "Промените по правомощията са запазени и приложени",
 	"alert.confirm-discard": "Наистина ли искате да отхвърлите промените по правомощията?",
 	"alert.discarded": "Промените по правомощията са отхвърлени",
-	"alert.confirm-copyToAll": "Наистина ли искате да приложите този набор от правомощия към <strong>всички категории</strong>?",
-	"alert.confirm-copyToAllGroup": "Наистина ли искате да приложите набора от правомощия на таи група към <strong>всички категории</strong>?",
-	"alert.confirm-copyToChildren": "Наистина ли искате да приложите този набор от правомощия към <strong>всички по-долни (дъщерни) категории</strong>?",
-	"alert.confirm-copyToChildrenGroup": "Наистина ли искате да приложите набора от правомощия на таи група към <strong>всички по-долни (дъщерни) категории</strong>?",
+	"alert.confirm-copyToAll": "Наистина ли искате да приложите този набор от <strong>%1</strong> към <strong>всички категории</strong>?",
+	"alert.confirm-copyToAllGroup": "Наистина ли искате да приложите набора от <strong>%1</strong> на тази група към <strong>всички категории</strong>?",
+	"alert.confirm-copyToChildren": "Наистина ли искате да приложите този набор от <strong>%1</strong> към <strong>всички по-долни (дъщерни) категории</strong>?",
+	"alert.confirm-copyToChildrenGroup": "Наистина ли искате да приложите набора от <strong>%1</strong> на тази група към <strong>всички по-долни (дъщерни) категории</strong>?",
 	"alert.no-undo": "<em>Това действие е необратимо.</em>",
-	"alert.admin-warning": "Администраторите имат всички правомощия по подразбиране"
+	"alert.admin-warning": "Администраторите имат всички правомощия по подразбиране",
+  	"alert.copyPrivilegesFrom-title": "Изберете категория, от която да се копира",
+  	"alert.copyPrivilegesFrom-warning": "Това ще копира <strong>%1</strong> от избраната категория.",
+  	"alert.copyPrivilegesFromGroup-warning": "Това ще копира набора от <strong>%1</strong> на тези група от избраната категория."
 }

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

@@ -5,5 +5,7 @@
     "orphaned": "Без ползвания",
     "size/filecount": "Размер / брой файлове",
     "confirm-delete": "Наистина ли искате да изтриете този файл?",
-    "filecount": "%1 файла"
+    "filecount": "%1 файла",
+    "new-folder": "Нова папка",
+    "name-new-folder": "Въведете име за новата папка"
 }

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

@@ -36,6 +36,7 @@
 	"subscriptions.disable": "Изключване на резюметата по е-пощата",
 	"subscriptions.hour": "Време за разпращане",
 	"subscriptions.hour-help": "Моля, въведете число, представляващо часа, в който да се разпращат е-писма с подготвеното резюме (напр.. <code>0</code> за полунощ, <code>17</code> за 5 следобед). Имайте предвид, че този час е според часовата зона на сървъра и може да не съвпада с часовника на системата Ви.<br /> Приблизителното време на сървъра е: <span id=\"serverTime\"></span><br /> Изпращането на следващия ежедневен бюлетин е планирано за   <span id=\"nextDigestTime\"></span>",
-	"notifications.settings": "Настройки за известията по е-поща",
-	"notifications.remove-images": "Премахване на изображенията от известията по е-поща"
+	"notifications.remove-images": "Премахване на изображенията от известията по е-поща",
+	"include-unverified-emails": "Изпращане на е-писма към получатели, които не са потвърдили изрично е-пощата си",
+	"include-unverified-warning": "За потребителите, които имат свързана е-поща с регистрацията си, тя се смята за потвърдена. Но има ситуации, в които това не е така (например при ползване на регистрация от друга система, но и в други случаи), <strong>Включете тази настройка на собствен риск</strong> &ndash; изпращането на е-писма към непотвърдени адреси може да нарушава определени местни закони против нежеланата поща."
 }

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

@@ -35,7 +35,10 @@
 	"maskable-icon.help": "Препоръчителен размер и формат: 512x512, само във формат „PNG“. Ако не е посочена маскируема иконка, NodeBB ще използва иконката за сензорен екран.",
 	"outgoing-links": "Изходящи връзки",
 	"outgoing-links.warning-page": "Показване на предупредителна страница при щракване върху външни връзки",
-	"search-default-sort-by": "Подредба по подразбиране при търсене",
+	"search": "Търсене",
+	"search-default-in": "Търсене в",
+	"search-default-in-quick": "Бързо търсене в",
+	"search-default-sort-by": "Подреждане по",
 	"outgoing-links.whitelist": "Домейни, за които да не се показва предупредителната страница",
 	"site-colors": "Мета-данни за цвета на уеб сайта",
 	"theme-color": "Цвят на темата",

public/language/bg/email.json

@@ -6,7 +6,9 @@
     "greeting_no_name": "Здравейте",
     "greeting_with_name": "Здравейте, %1",
     "email.verify-your-email.subject": "Моля, потвърдете е-пощата си",
-    "email.verify.text1": "Адресът на е-пощата Ви е променен!",
+    "email.verify.text1": "Вие поискахте да променим или потвърдим адреса на е-пощата Ви",
+    "email.verify.text2": "Поради причини, свързани със сигурността, можем да променим или потвърдим адреса на е-поща, само когато притежанието ѝ вече е било установено чрез е-писмо. <strong>Ако не сте поискали това, няма нужда да правите нищо.</strong>",
+    "email.verify.text3": "След като потвърдите адреса на тази е-поща, ще променим текущия Ви адрес с този (%1).",
     "welcome.text1": "Благодарим Ви, че се регистрирахте в %1",
     "welcome.text2": "За да активирате напълно акаунта си, трябва да потвърдите е-пощата, с която сте се регистрирали.",
     "welcome.text3": "Вашата заявка за регистрация беше приета от администратор. Вече можете да се впишете със своето потребителско име и парола.",

public/language/bg/error.json

@@ -25,14 +25,17 @@
     "invalid-event": "Грешно събитие: %1",
     "local-login-disabled": "Системата за местно вписване е изключена за непривилегированите акаунти.",
     "csrf-invalid": "Не успяхме да Ви впишем, най-вероятно защото сесията Ви е изтекла. Моля, опитайте отново",
+    "invalid-path": "Грешен път",
+    "folder-exists": "Вече има папка с това име",
     "invalid-pagination-value": "Грешен номер на странициране, трябва да бъде между %1 и %2",
     "username-taken": "Потребителското име е заето",
     "email-taken": "Е-пощата е заета",
+    "email-nochange": "Въведената е-поща е същата като съществуващата.",
     "email-invited": "На тази е-поща вече е била изпратена покана",
-    "email-not-confirmed": "Няма да можете да публикувате съобщения, докато е-пощата Ви не бъде потвърдена. Моля, натиснете тук, за да потвърдите е-пощата си.",
+    "email-not-confirmed": "Публикуването в някои категории и теми ще бъде възможно едва след като е-пощата Ви бъде потвърдена. Щръкнете тук, за да Ви изпратим е-писмо за потвърждение.",
     "email-not-confirmed-chat": "Няма да можете да пишете в разговори, докато е-пощата Ви не бъде потвърдена. Моля, натиснете тук, за да потвърдите е-пощата си.",
     "email-not-confirmed-email-sent": "Вашата е-поща все още не е потвърдена. Моля, проверете входящата си кутия за писмото за потвърждение. Няма да можете да публикувате съобщения или да пишете в разговори, докато е-пощата Ви не бъде потвърдена.",
-    "no-email-to-confirm": "Този форум изисква потвърдена е-поща. Моля, натиснете тук, за да въведете е-поща",
+    "no-email-to-confirm": "Нямате зададена е-поща. Тя е необходима за възстановяването на акаунта в случай на проблем. Натиснете тук, за да въведете е-поща.",
     "email-confirm-failed": "Не успяхме да потвърдим е-пощата Ви. Моля, опитайте отново по-късно.",
     "confirm-email-already-sent": "Е-писмото за потвърждение вече е изпратено. Моля, почакайте още %1 минута/и, преди да изпратите ново.",
     "sendmail-not-found": "Изпълнимият файл на „sendmail“ не може да бъде намерен. Моля, уверете се, че е инсталиран и изпълним за потребителя, чрез който е пуснат NodeBB.",

public/language/bg/flags.json

@@ -77,9 +77,6 @@
 	"modal-reason-custom": "Причина за докладването на това съдържание…",
 	"modal-submit": "Изпращане на доклада",
 	"modal-submit-success": "Съдържанието беше докладвано на модераторите.",
-	"modal-submit-confirm": "Потвърждаване на докладването",
-	"modal-submit-confirm-text": "Вече сте описали специалната си причина. Наистина ли искате да изпратите доклада си по бързата процедура?",
-	"modal-submit-confirm-text-help": "Изпращането на доклад по бързата процедура ще премахне описаната от Вас специалната причина.",
 
 	"bulk-actions": "Групови действия",
 	"bulk-resolve": "Разрешаване на доклад(и)",

public/language/bg/global.json

@@ -70,6 +70,7 @@
     "firstpost": "Първа публикация",
     "read_more": "още",
     "more": "Още",
+    "none": "Нищо",
     "posted_ago_by_guest": "публикувано %1 от гост",
     "posted_ago_by": "публикувано %1 от %2",
     "posted_ago": "публикувано %1",

public/language/bg/register.json

@@ -20,8 +20,9 @@
     "registration-added-to-queue": "Вашата регистрация беше добавена в опашката за одобрение. Ще получите е-писмо, когато тя бъде одобрена от администратор.",
     "registration-queue-average-time": "Средното време за одобрение на нови членове е %1 часа и %2 минути.",
     "registration-queue-auto-approve-time": "Членството Ви в този форум ще бъде напълно активирано след около %1 часа.",
-    "interstitial.intro": "Нуждаем се от малко допълнителна информация, преди да можем да създадем акаунта Ви.",
-    "interstitial.errors-found": "Не можем да завършим Вашата регистрация:",
+    "interstitial.intro": "Нуждаем се от малко допълнителна информация, преди да можем да актуализираме акаунта Ви…",
+    "interstitial.intro-new": "Нуждаем се от малко допълнителна информация, преди да можем да създадем акаунта Ви…",
+    "interstitial.errors-found": "Моля, прегледайте въведената информация:",
     "gdpr_agree_data": "Съгласявам се това личната ми информация да се съхранява и обработва от този уеб сайт.",
     "gdpr_agree_email": "Съгласявам се да получавам е-писма с резюмета и известия от този уеб сайт.",
     "gdpr_consent_denied": "Трябва да се съгласите с това уеб сайтът да събира/обработва информацията Ви, и да Ви изпраща е-писма.",

public/language/bg/topic.json

@@ -20,6 +20,8 @@
     "login-to-view": "🔒 Впишете се, за да видите това",
     "edit": "Редактиране",
     "delete": "Изтриване",
+    "delete-event": "Изтриване на събитието",
+    "delete-event-confirm": "Наистина ли искате да изтриете това събитие?",
     "purge": "Изчистване",
     "restore": "Възстановяване",
     "move": "Преместване",
@@ -43,6 +45,7 @@
     "unpinned-by": "Откачена от",
     "deleted-by": "Изтрита от",
     "restored-by": "Възстановена от",
+    "moved-from-by": "Преместена от %1 от",
     "queued-by": "Публикацията е добавена в опашката за одобрение →",
     "bookmark_instructions": "Щракнете тук, за да се върнете към последно прочетената публикация в тази тема.",
     "flag-post": "Докладване на тази публикация",
@@ -173,5 +176,6 @@
     "timeago_later": "%1 по-късно",
     "timeago_earlier": "%1 по-рано",
     "first-post": "Първа публикация",
-    "last-post": "Последна публикация"
+    "last-post": "Последна публикация",
+    "post-quick-reply": "Пускане на бърза публикация"
 }

public/language/bg/user.json

@@ -98,6 +98,7 @@
     "has_no_follower": "Този потребител няма последователи :(",
     "follows_no_one": "Този потребител не следва никого :(",
     "has_no_posts": "Този потребител не е публикувал нищо досега.",
+    "has_no_best_posts": "Този потребител не е получавал положителни гласове за публикациите си досега.",
     "has_no_topics": "Този потребител не е създавал теми досега.",
     "has_no_watched_topics": "Този потребител не е следил нито една тема досега.",
     "has_no_ignored_topics": "Този потребител не е пренебрегнал нито една тема досега.",
@@ -180,5 +181,8 @@
     "consent.export_uploads": "Изнасяне на каченото съдържание (.zip)",
     "consent.export-uploads-success": "Изнасяне на каченото съдържание… Ще получите известие, когато е готово.",
     "consent.export_posts": "Изнасяне на публикациите (.csv)",
-    "consent.export-posts-success": "Изнасяне на публикациите… Ще получите известие, когато е готово."
+    "consent.export-posts-success": "Изнасяне на публикациите… Ще получите известие, когато е готово.",
+    "emailUpdate.intro": "Въведете е-пощата си по-долу. Този форум използва е-пощата за планирани резюмета и известия, както и за възстановяване на акаунта, в случай на забравена парола.",
+    "emailUpdate.optional": "<strong>Това поле не е задължително</strong>. Не сте длъжен/на да ни давате адреса на е-пощата си, но ако нямате потвърдена е-поща, няма да можете да възстановите достъпа до акаунта си в случай на проблем.",
+    "emailUpdate.change-instructions": "Ще Ви изпратим е-писмо за потвърждение на посочената е-поща, което ще съдържа уникална връзка. Щом последвате тази връзка, притежанието Ви на тази е-поща ще бъде потвърдено и тя ще бъде свързана с акаунта Ви. Ще можете да промените тази е-поща по всяко време, от страницата на акаунта си."
 }

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

@@ -8,8 +8,6 @@
 	"delete": "Delete",
 	"enable": "Enable",
 	"disable": "Disable",
-	"control-panel": "Rewards Control",
-	"new-reward": "New Reward",
 
 	"alert.delete-success": "Successfully deleted reward",
 	"alert.no-inputs-found": "Illegal reward - no inputs found!",

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

@@ -51,10 +51,13 @@
 	"alert.saved": "Privilege changes saved and applied",
 	"alert.confirm-discard": "Are you sure you wish to discard your privilege changes?",
 	"alert.discarded": "Privilege changes discarded",
-	"alert.confirm-copyToAll": "Are you sure you wish to apply this privilege set to <strong>all categories</strong>?",
-	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's privilege set to <strong>all categories</strong>?",
-	"alert.confirm-copyToChildren": "Are you sure you wish to apply this privilege set to <strong>all descendant (child) categories</strong>?",
-	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToAll": "Are you sure you wish to apply this set of <strong>%1</strong> to <strong>all categories</strong>?",
+	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's set of <strong>%1</strong> to <strong>all categories</strong>?",
+	"alert.confirm-copyToChildren": "Are you sure you wish to apply this set of <strong>%1</strong> to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's set of <strong>%1</strong> to <strong>all descendant (child) categories</strong>?",
 	"alert.no-undo": "<em>This action cannot be undone.</em>",
-	"alert.admin-warning": "Administrators implicitly get all privileges"
+	"alert.admin-warning": "Administrators implicitly get all privileges",
+  	"alert.copyPrivilegesFrom-title": "Select a category to copy from",
+  	"alert.copyPrivilegesFrom-warning": "This will copy <strong>%1</strong> from the selected category.",
+  	"alert.copyPrivilegesFromGroup-warning": "This will copy this group's set of <strong>%1</strong> from the selected category."
 }

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

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

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

@@ -36,6 +36,7 @@
 	"subscriptions.disable": "ইমেইল ডাইজেস্ট নিষ্ক্রিয়",
 	"subscriptions.hour": "Digest Hour",
 	"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>",
-	"notifications.settings": "Email notification settings",
-	"notifications.remove-images": "Remove images from email notifications"
+	"notifications.remove-images": "Remove images from email notifications",
+	"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
+	"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). <strong>Enable this setting at your own risk</strong> &ndash; sending emails to unverified addresses may be a violation of regional anti-spam laws."
 }

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

@@ -35,7 +35,10 @@
 	"maskable-icon.help": "Recommended size and format: 512x512, PNG format only. If no maskable icon is specified, NodeBB will fall back to the Touch Icon.",
 	"outgoing-links": "Outgoing Links",
 	"outgoing-links.warning-page": "Use Outgoing Links Warning Page",
-	"search-default-sort-by": "Search default sort by",
+	"search": "Search",
+	"search-default-in": "Search In",
+	"search-default-in-quick": "Quick Search In",
+	"search-default-sort-by": "Sort by",
 	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page",
 	"site-colors": "Site Color Metadata",
 	"theme-color": "Theme Color",

public/language/bn/email.json

@@ -6,7 +6,9 @@
     "greeting_no_name": "স্বাগতম",
     "greeting_with_name": "স্বাগতম %1",
     "email.verify-your-email.subject": "দয়া করে ইমেইল যাচাই করুন",
-    "email.verify.text1": "আপনার ইমেইল পরিবর্তন হয়েছে!",
+    "email.verify.text1": "You've requested that we change or confirm your email address",
+    "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. <strong>If you did not request this, no action is required on your part.</strong>",
+    "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).",
     "welcome.text1": "%1 এ নিবন্ধন করার জন্য আপনাকে ধন্যবাদ!",
     "welcome.text2": "আপনার একাউন্ট এ্যাক্টিভেট করার জন্য, আপনি যে ইমেইল এড্রেস ব্যাবহার করে নিবন্ধন করেছেন তা যাচাই করতে হবে",
     "welcome.text3": "An administrator has accepted your registration application. You can login with your username/password now.",

public/language/bn/error.json

@@ -25,14 +25,17 @@
     "invalid-event": "Invalid event: %1",
     "local-login-disabled": "Local login system has been disabled for non-privileged accounts.",
     "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
+    "invalid-path": "Invalid path",
+    "folder-exists": "Folder exists",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "ইউজারনেম আগেই ব্যবহৃত",
     "email-taken": "ইমেইল আগেই ব্যবহৃত",
+    "email-nochange": "The email entered is the same as the email already on file.",
     "email-invited": "Email was already invited",
-    "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.",
+    "email-not-confirmed": "Posting in some categories or topics is enabled once your email is confirmed, please click here to send a confirmation email.",
     "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
     "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.",
-    "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
+    "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.",
     "email-confirm-failed": "We could not confirm your email, please try again later.",
     "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
     "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",

public/language/bn/flags.json

@@ -77,9 +77,6 @@
 	"modal-reason-custom": "Reason for reporting this content...",
 	"modal-submit": "Submit Report",
 	"modal-submit-success": "Content has been flagged for moderation.",
-	"modal-submit-confirm": "Confirm Submission",
-	"modal-submit-confirm-text": "You have a custom reason specified already. Are you sure you wish to submit via quick-report?",
-	"modal-submit-confirm-text-help": "Submitting a quick report will overwrite any custom reasons defined.",
 
 	"bulk-actions": "Bulk Actions",
 	"bulk-resolve": "Resolve Flag(s)",

public/language/bn/global.json

@@ -70,6 +70,7 @@
     "firstpost": "First post",
     "read_more": "আরো পড়ুন",
     "more": "আরো...",
+    "none": "None",
     "posted_ago_by_guest": "অতিথি পোস্ট করেছেন %1",
     "posted_ago_by": " %1 %2 দ্বারা পোস্টকৃত",
     "posted_ago": "পোস্ট করেছেন %1",

public/language/bn/register.json

@@ -20,8 +20,9 @@
     "registration-added-to-queue": "আপনার নিবন্ধনটি এ্যাপ্লুভাল তালিকায় যুক্ত হয়েছে। একজন এডমিনিস্ট্রেটর কর্তৃক নিবন্ধন গৃহীত হলে আপনি একটি মেইল পাবেন। ",
     "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.",
     "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.",
-    "interstitial.intro": "আপনার একাউন্ট তৈরীর পূর্বে আমাদের আরো কিছু বাড়তি তথ্য জানা প্রয়োজন।",
-    "interstitial.errors-found": "আপনার নিবন্ধনটি সম্পূর্ণ করা সম্ভব হয় নি।",
+    "interstitial.intro": "We'd like some additional information in order to update your account…",
+    "interstitial.intro-new": "We'd like some additional information before we can create your account…",
+    "interstitial.errors-found": "Please review the entered information:",
     "gdpr_agree_data": "I consent to the collection and processing of my personal information on this website.",
     "gdpr_agree_email": "I consent to receive digest and notification emails from this website.",
     "gdpr_consent_denied": "You must give consent to this site to collect/process your information, and to send you emails.",

public/language/bn/topic.json

@@ -20,6 +20,8 @@
     "login-to-view": "🔒 Log in to view",
     "edit": "সম্পাদণা",
     "delete": "মুছে ফেলুন",
+    "delete-event": "Delete Event",
+    "delete-event-confirm": "Are you sure you want to delete this event?",
     "purge": "পার্জ",
     "restore": "পুনরূদ্ধার",
     "move": "সরানো",
@@ -43,6 +45,7 @@
     "unpinned-by": "Unpinned by",
     "deleted-by": "Deleted by",
     "restored-by": "Restored by",
+    "moved-from-by": "Moved from %1 by",
     "queued-by": "Post queued for approval →",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag-post": "Flag this post",
@@ -173,5 +176,6 @@
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier",
     "first-post": "First post",
-    "last-post": "Last post"
+    "last-post": "Last post",
+    "post-quick-reply": "Post quick reply"
 }

public/language/bn/uploads.json

@@ -1,9 +1,9 @@
 {
     "uploading-file": "ফাইল পাঠানো হচ্ছে...",
     "select-file-to-upload": "পাঠানোর জন্য নথি নির্বাচন",
-    "upload-success": "File uploaded successfully!",
-    "maximum-file-size": "Maximum %1 kb",
-    "no-uploads-found": "No uploads found",
-    "public-uploads-info": "Uploads are public, all visitors can see them.",
-    "private-uploads-info": "Uploads are private, only logged in users can see them."
+    "upload-success": "সফলভাবে ফাইল দেওয়া হয়েছে!",
+    "maximum-file-size": "সর্বোচ্চ %1 কিবিট",
+    "no-uploads-found": "কোনো আপলোড নেই",
+    "public-uploads-info": "সব আপলোড গণ দৃশ্যমান, সব দর্শক তা দেখতে পারবে।",
+    "private-uploads-info": "সব আপলোড ব্যক্তিগত, কেবল প্রবেশরত ব্যবহারকারী তা দেখতে পারবে।"
 }

public/language/bn/user.json

@@ -98,6 +98,7 @@
     "has_no_follower": "এই সদস্যের কোন ফলোয়ার নেই :(",
     "follows_no_one": "এই সদস্য কাউকে ফলো করছেন না :(",
     "has_no_posts": "এই সদস্য এখন পর্যন্ত কোন পোস্ট করেন নি",
+    "has_no_best_posts": "This user does not have any upvoted posts yet.",
     "has_no_topics": "এই সদস্য এখনো কোন টপিক করেন নি",
     "has_no_watched_topics": "এই সদস্য এখনো কোন টপিক দেখেন  নি",
     "has_no_ignored_topics": "This user hasn't ignored any topics yet.",
@@ -180,5 +181,8 @@
     "consent.export_uploads": "Export Uploaded Content (.zip)",
     "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.",
     "consent.export_posts": "Export Posts (.csv)",
-    "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete."
+    "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.",
+    "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.",
+    "emailUpdate.optional": "<strong>This field is optional</strong>. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.",
+    "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page."
 }

public/language/bn/users.json

@@ -11,7 +11,7 @@
     "online-only": "শুধুমাত্র অনলাইন",
     "invite": "ইনভাইট",
     "prompt-email": "ইমেইল",
-    "groups-to-join": "Groups to be joined when invite is accepted:",
+    "groups-to-join": "সদস্য অনুরোধ স্বীকৃত হলে যেসব সম্প্রদায়ে যোগ দিতে হবে",
     "invitation-email-sent": "%1 কে একটি ইনভাইটেশন ইমেইল পাঠানো হয়েছে",
     "user_list": "সদস্য তালিকা",
     "recent_topics": "সাম্প্রতিক টপিক",

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

@@ -8,8 +8,6 @@
 	"delete": "Odstranit",
 	"enable": "Povolit",
 	"disable": "Zakázat",
-	"control-panel": "Ovládací panel odměn",
-	"new-reward": "Nová odměna",
 
 	"alert.delete-success": "Odměna byla úspěšně smazána",
 	"alert.no-inputs-found": "Nepovolená odměna – nebyl nalezen žádný záznam.",

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

@@ -51,10 +51,13 @@
 	"alert.saved": "Privilege changes saved and applied",
 	"alert.confirm-discard": "Are you sure you wish to discard your privilege changes?",
 	"alert.discarded": "Privilege changes discarded",
-	"alert.confirm-copyToAll": "Are you sure you wish to apply this privilege set to <strong>all categories</strong>?",
-	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's privilege set to <strong>all categories</strong>?",
-	"alert.confirm-copyToChildren": "Are you sure you wish to apply this privilege set to <strong>all descendant (child) categories</strong>?",
-	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToAll": "Are you sure you wish to apply this set of <strong>%1</strong> to <strong>all categories</strong>?",
+	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's set of <strong>%1</strong> to <strong>all categories</strong>?",
+	"alert.confirm-copyToChildren": "Are you sure you wish to apply this set of <strong>%1</strong> to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's set of <strong>%1</strong> to <strong>all descendant (child) categories</strong>?",
 	"alert.no-undo": "<em>This action cannot be undone.</em>",
-	"alert.admin-warning": "Administrators implicitly get all privileges"
+	"alert.admin-warning": "Administrators implicitly get all privileges",
+  	"alert.copyPrivilegesFrom-title": "Select a category to copy from",
+  	"alert.copyPrivilegesFrom-warning": "This will copy <strong>%1</strong> from the selected category.",
+  	"alert.copyPrivilegesFromGroup-warning": "This will copy this group's set of <strong>%1</strong> from the selected category."
 }

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

@@ -5,5 +5,7 @@
     "orphaned": "Nevyužito",
     "size/filecount": "Velikost / Počet souborů",
     "confirm-delete": "Opravdu chcete odstranit tento soubor?",
-    "filecount": "%1 souborů"
+    "filecount": "%1 souborů",
+    "new-folder": "New Folder",
+    "name-new-folder": "Enter a name for new the folder"
 }

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

@@ -36,6 +36,7 @@
 	"subscriptions.disable": "Zakázat e-mailové odběry",
 	"subscriptions.hour": "Hodina přehledu",
 	"subscriptions.hour-help": "Zadejte číslo odpovídající hodině, kdy mají být odeslány přehledové e-maily (tj. <code>0</code> pro půlnoc, <code>17</code> pro 5:00pm).  Mějte na paměti, že tato hodina závisí na hodinách samotného serveru a nemusí tak souhlasit se systémovými hodinami. <br />Přibližný čas serveru je: <span id=\"serverTime\"></span>.<br />Další odeslání přehledů je plánováno na <span id=\"nextDigestTime\"></span>.",
-	"notifications.settings": "Email notification settings",
-	"notifications.remove-images": "Remove images from email notifications"
+	"notifications.remove-images": "Remove images from email notifications",
+	"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
+	"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). <strong>Enable this setting at your own risk</strong> &ndash; sending emails to unverified addresses may be a violation of regional anti-spam laws."
 }

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

@@ -35,7 +35,10 @@
 	"maskable-icon.help": "Recommended size and format: 512x512, PNG format only. If no maskable icon is specified, NodeBB will fall back to the Touch Icon.",
 	"outgoing-links": "Odchozí odkazy",
 	"outgoing-links.warning-page": "Použít stránku s upozorněním při odchozích odkazech",
-	"search-default-sort-by": "Výchozí třídění při hledání",
+	"search": "Search",
+	"search-default-in": "Search In",
+	"search-default-in-quick": "Quick Search In",
+	"search-default-sort-by": "Sort by",
 	"outgoing-links.whitelist": "Domény u kterých bude přeskočena upozorňovací stránka",
 	"site-colors": "Site Color Metadata",
 	"theme-color": "Theme Color",

public/language/cs/email.json

@@ -6,7 +6,9 @@
     "greeting_no_name": "Dobrý den",
     "greeting_with_name": "Dobrý den %1",
     "email.verify-your-email.subject": "Ověřte prosím vaší e-mailovou adresu",
-    "email.verify.text1": "Vaše e-mailová adresa byla změněna.",
+    "email.verify.text1": "You've requested that we change or confirm your email address",
+    "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. <strong>If you did not request this, no action is required on your part.</strong>",
+    "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).",
     "welcome.text1": "Děkujeme vám za registraci na %1!",
     "welcome.text2": "Pro úplnou aktivaci vašeho účtu potřebujeme ověřit vaši e-mailovou adresu.",
     "welcome.text3": "Administrátor právě potvrdil vaší registraci. Nyní se můžete přihlásit jménem a heslem.",

public/language/cs/error.json

@@ -25,14 +25,17 @@
     "invalid-event": "Invalid event: %1",
     "local-login-disabled": "Systém přihlášení pro místní účty byl zakázán pro neoprávněné účty.",
     "csrf-invalid": "Není možné vás přihlásit, díky vypršení relace. Zkuste to prosím znovu.",
+    "invalid-path": "Invalid path",
+    "folder-exists": "Folder exists",
     "invalid-pagination-value": "Neplatná hodnota stránkování, musí být alespoň %1 a nejvýše %2",
     "username-taken": "Uživatelské jméno je již použito",
     "email-taken": "Tento e-mail je již použit",
+    "email-nochange": "The email entered is the same as the email already on file.",
     "email-invited": "Email was already invited",
-    "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.",
+    "email-not-confirmed": "Posting in some categories or topics is enabled once your email is confirmed, please click here to send a confirmation email.",
     "email-not-confirmed-chat": "Nebude schopen konverzovat, dokud nebude váš e-mail potvrzen. Pro jeho potvrzení klikněte zde.",
     "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.",
-    "no-email-to-confirm": "Toto fórum vyžaduje ověření e-mailové adresy. Pro zadání e-mailu, klikněte zde.",
+    "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.",
     "email-confirm-failed": "Nemohli jsme ověřit vaši e-mailovou adresu, zkuste to později.",
     "confirm-email-already-sent": "Potvrzovací e-mail byl již odeslán. Vyčkejte %1 minut/y, chcete-li odeslat další.",
     "sendmail-not-found": "Modul pro odeslání e-mailů nebyl nalezen. Zkontrolujte prosím, zda je nainstalován a spuštěn uživatelem, který spustil NodeBB.",

public/language/cs/flags.json

@@ -77,9 +77,6 @@
 	"modal-reason-custom": "Důvod ohlášení tohoto obsahu…",
 	"modal-submit": "Předat hlášení",
 	"modal-submit-success": "Obsah byl označen pro moderaci.",
-	"modal-submit-confirm": "Potvrdit hlášení",
-	"modal-submit-confirm-text": "Již jste zadal/a nějaký důvod. Jste si jist/a, že chcete nahlásit pomocí rychlé zprávy?",
-	"modal-submit-confirm-text-help": "Zaslání rychlé zprávy přepíše jiné zadané důvody.",
 
 	"bulk-actions": "Bulk Actions",
 	"bulk-resolve": "Resolve Flag(s)",

public/language/cs/global.json

@@ -70,6 +70,7 @@
     "firstpost": "První příspěvek",
     "read_more": "čtěte více",
     "more": "Více",
+    "none": "None",
     "posted_ago_by_guest": "přispěl %1 host",
     "posted_ago_by": "přispěl %1 od %2",
     "posted_ago": "přispěl %1",

public/language/cs/register.json

@@ -20,8 +20,9 @@
     "registration-added-to-queue": "Vaše registrace byla přidána do fronty. Obdržíte e-mail až ji správce schválí.",
     "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.",
     "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.",
-    "interstitial.intro": "Před vytvořením účtu vyžadujeme některé dodatečné informace.",
-    "interstitial.errors-found": "Nebylo možné dokončit vaší registraci:",
+    "interstitial.intro": "We'd like some additional information in order to update your account…",
+    "interstitial.intro-new": "We'd like some additional information before we can create your account…",
+    "interstitial.errors-found": "Please review the entered information:",
     "gdpr_agree_data": "Dávám souhlas se sběrem a zpracováním mých osobních údajů na této webové stránce.",
     "gdpr_agree_email": "Dávám souhlas k dostávání e-mailových přehledů a oznámení z týkající se této webové stránky.",
     "gdpr_consent_denied": "Musíte dát souhlas této stránce sbírat/zpracovávat informace o vaší činnosti a odesílat vám e-maily.",

public/language/cs/topic.json

@@ -20,6 +20,8 @@
     "login-to-view": "Přihlásit se pro zobrazení",
     "edit": "Upravit",
     "delete": "Odstranit",
+    "delete-event": "Delete Event",
+    "delete-event-confirm": "Are you sure you want to delete this event?",
     "purge": "Vypráznit",
     "restore": "Obnovit",
     "move": "Přesunout",
@@ -43,6 +45,7 @@
     "unpinned-by": "Unpinned by",
     "deleted-by": "Deleted by",
     "restored-by": "Restored by",
+    "moved-from-by": "Moved from %1 by",
     "queued-by": "Post queued for approval →",
     "bookmark_instructions": "Pro návrat k poslednímu čtenému příspěvku v tématu, klikněte zde.",
     "flag-post": "Flag this post",
@@ -173,5 +176,6 @@
     "timeago_later": "%1 později",
     "timeago_earlier": "%1 dříve",
     "first-post": "First post",
-    "last-post": "Last post"
+    "last-post": "Last post",
+    "post-quick-reply": "Post quick reply"
 }

public/language/cs/user.json

@@ -98,6 +98,7 @@
     "has_no_follower": "Tohoto uživatele nikdo nesleduje :(",
     "follows_no_one": "Tento uživatel nikoho nesleduje :(",
     "has_no_posts": "Tento uživatel ještě nic nenapsal.",
+    "has_no_best_posts": "This user does not have any upvoted posts yet.",
     "has_no_topics": "Tento uživatel ještě nezaložil žádné téma.",
     "has_no_watched_topics": "Tento uživatel zatím nesleduje žádná témata.",
     "has_no_ignored_topics": "Tento uživatel ještě neignoruje žádné témata.",
@@ -180,5 +181,8 @@
     "consent.export_uploads": "Exportovat nahraný obsah (*.zip)",
     "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.",
     "consent.export_posts": "Exportovat příspěvky (*.csv)",
-    "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete."
+    "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.",
+    "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.",
+    "emailUpdate.optional": "<strong>This field is optional</strong>. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.",
+    "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page."
 }

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

@@ -8,8 +8,6 @@
 	"delete": "Delete",
 	"enable": "Enable",
 	"disable": "Disable",
-	"control-panel": "Rewards Control",
-	"new-reward": "New Reward",
 
 	"alert.delete-success": "Successfully deleted reward",
 	"alert.no-inputs-found": "Illegal reward - no inputs found!",

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

@@ -51,10 +51,13 @@
 	"alert.saved": "Privilege changes saved and applied",
 	"alert.confirm-discard": "Are you sure you wish to discard your privilege changes?",
 	"alert.discarded": "Privilege changes discarded",
-	"alert.confirm-copyToAll": "Are you sure you wish to apply this privilege set to <strong>all categories</strong>?",
-	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's privilege set to <strong>all categories</strong>?",
-	"alert.confirm-copyToChildren": "Are you sure you wish to apply this privilege set to <strong>all descendant (child) categories</strong>?",
-	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToAll": "Are you sure you wish to apply this set of <strong>%1</strong> to <strong>all categories</strong>?",
+	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's set of <strong>%1</strong> to <strong>all categories</strong>?",
+	"alert.confirm-copyToChildren": "Are you sure you wish to apply this set of <strong>%1</strong> to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's set of <strong>%1</strong> to <strong>all descendant (child) categories</strong>?",
 	"alert.no-undo": "<em>This action cannot be undone.</em>",
-	"alert.admin-warning": "Administrators implicitly get all privileges"
+	"alert.admin-warning": "Administrators implicitly get all privileges",
+  	"alert.copyPrivilegesFrom-title": "Select a category to copy from",
+  	"alert.copyPrivilegesFrom-warning": "This will copy <strong>%1</strong> from the selected category.",
+  	"alert.copyPrivilegesFromGroup-warning": "This will copy this group's set of <strong>%1</strong> from the selected category."
 }

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

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

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

@@ -36,6 +36,7 @@
 	"subscriptions.disable": "Disable email digests",
 	"subscriptions.hour": "Digest Hour",
 	"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>",
-	"notifications.settings": "Email notification settings",
-	"notifications.remove-images": "Remove images from email notifications"
+	"notifications.remove-images": "Remove images from email notifications",
+	"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
+	"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). <strong>Enable this setting at your own risk</strong> &ndash; sending emails to unverified addresses may be a violation of regional anti-spam laws."
 }

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

@@ -35,7 +35,10 @@
 	"maskable-icon.help": "Recommended size and format: 512x512, PNG format only. If no maskable icon is specified, NodeBB will fall back to the Touch Icon.",
 	"outgoing-links": "Outgoing Links",
 	"outgoing-links.warning-page": "Use Outgoing Links Warning Page",
-	"search-default-sort-by": "Search default sort by",
+	"search": "Search",
+	"search-default-in": "Search In",
+	"search-default-in-quick": "Quick Search In",
+	"search-default-sort-by": "Sort by",
 	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page",
 	"site-colors": "Site Color Metadata",
 	"theme-color": "Theme Color",

public/language/da/email.json

@@ -6,7 +6,9 @@
     "greeting_no_name": "Hej",
     "greeting_with_name": "Hej %1",
     "email.verify-your-email.subject": "Please verify your email",
-    "email.verify.text1": "Your email address has changed!",
+    "email.verify.text1": "You've requested that we change or confirm your email address",
+    "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. <strong>If you did not request this, no action is required on your part.</strong>",
+    "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).",
     "welcome.text1": "Tak for at du registrerede dig hos %1!",
     "welcome.text2": "For at færdiggøre din konto, har vi brug for at verificere at du ejer den email adresse du registerede med.",
     "welcome.text3": "En administrator har accepteret din registreringsansøgning. Du kan logge ind med dit brugernavn og adgangskode nu.",

public/language/da/error.json

@@ -25,14 +25,17 @@
     "invalid-event": "Invalid event: %1",
     "local-login-disabled": "Local login system has been disabled for non-privileged accounts.",
     "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
+    "invalid-path": "Invalid path",
+    "folder-exists": "Folder exists",
     "invalid-pagination-value": "Ugyldig side værdi, skal mindst være %1 og maks. %2",
     "username-taken": "Brugernavn optaget",
     "email-taken": "Emailadresse allerede i brug",
+    "email-nochange": "The email entered is the same as the email already on file.",
     "email-invited": "Email was already invited",
-    "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.",
+    "email-not-confirmed": "Posting in some categories or topics is enabled once your email is confirmed, please click here to send a confirmation email.",
     "email-not-confirmed-chat": "Du kan ikke chatte før din email er bekræftet, klik her for at bekræfte din email.",
     "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.",
-    "no-email-to-confirm": "Dette forum kræver bekræftelse af din email, klik her for at indtaste en email",
+    "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.",
     "email-confirm-failed": "Vi kunne ikke bekræfte din email, prøv igen senere.",
     "confirm-email-already-sent": "Bekræftelses email er allerede afsendt, vent venligt %1 minut(ter) for at sende endnu en.",
     "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",

public/language/da/flags.json

@@ -77,9 +77,6 @@
 	"modal-reason-custom": "Reason for reporting this content...",
 	"modal-submit": "Submit Report",
 	"modal-submit-success": "Content has been flagged for moderation.",
-	"modal-submit-confirm": "Confirm Submission",
-	"modal-submit-confirm-text": "You have a custom reason specified already. Are you sure you wish to submit via quick-report?",
-	"modal-submit-confirm-text-help": "Submitting a quick report will overwrite any custom reasons defined.",
 
 	"bulk-actions": "Bulk Actions",
 	"bulk-resolve": "Resolve Flag(s)",

public/language/da/global.json

@@ -70,6 +70,7 @@
     "firstpost": "First post",
     "read_more": "læs mere",
     "more": "Mere",
+    "none": "None",
     "posted_ago_by_guest": "indsendt %1 af gæst",
     "posted_ago_by": "indsendt %1 siden af %2",
     "posted_ago": "Indsendt %1 siden",

public/language/da/register.json

@@ -20,8 +20,9 @@
     "registration-added-to-queue": "Din registrering er blevet tilføjet til godkendelses køen. Du vil mostage en email når du er blevet accepteret af en administrator.",
     "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.",
     "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.",
-    "interstitial.intro": "We require some additional information before we can create your account.",
-    "interstitial.errors-found": "We could not complete your registration:",
+    "interstitial.intro": "We'd like some additional information in order to update your account…",
+    "interstitial.intro-new": "We'd like some additional information before we can create your account…",
+    "interstitial.errors-found": "Please review the entered information:",
     "gdpr_agree_data": "I consent to the collection and processing of my personal information on this website.",
     "gdpr_agree_email": "I consent to receive digest and notification emails from this website.",
     "gdpr_consent_denied": "You must give consent to this site to collect/process your information, and to send you emails.",

public/language/da/topic.json

@@ -20,6 +20,8 @@
     "login-to-view": "🔒 Log in to view",
     "edit": "Rediger",
     "delete": "Slet",
+    "delete-event": "Delete Event",
+    "delete-event-confirm": "Are you sure you want to delete this event?",
     "purge": "Udrens",
     "restore": "Gendan",
     "move": "Flyt",
@@ -43,6 +45,7 @@
     "unpinned-by": "Unpinned by",
     "deleted-by": "Deleted by",
     "restored-by": "Restored by",
+    "moved-from-by": "Moved from %1 by",
     "queued-by": "Post queued for approval →",
     "bookmark_instructions": "Klik her for at vende tilbage til den sidst læste indlæg i denne tråd.",
     "flag-post": "Flag this post",
@@ -173,5 +176,6 @@
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier",
     "first-post": "First post",
-    "last-post": "Last post"
+    "last-post": "Last post",
+    "post-quick-reply": "Post quick reply"
 }

public/language/da/user.json

@@ -98,6 +98,7 @@
     "has_no_follower": "Denne bruger har ingen følgere :(",
     "follows_no_one": "Denne bruger følger ikke nogen :(",
     "has_no_posts": "Denne bruger har ikke skrevet noget endnu.",
+    "has_no_best_posts": "This user does not have any upvoted posts yet.",
     "has_no_topics": "Denne bruger har ikke skrævet nogle tråde endnu.",
     "has_no_watched_topics": "Denne bruger har ikke fulgt nogle tråde endnu.",
     "has_no_ignored_topics": "This user hasn't ignored any topics yet.",
@@ -180,5 +181,8 @@
     "consent.export_uploads": "Export Uploaded Content (.zip)",
     "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.",
     "consent.export_posts": "Export Posts (.csv)",
-    "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete."
+    "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.",
+    "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.",
+    "emailUpdate.optional": "<strong>This field is optional</strong>. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.",
+    "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page."
 }

public/language/de/admin/dashboard.json

@@ -29,8 +29,8 @@
 	"up-to-date": "<p>NodeBB Version ist <strong>aktuell</strong> <i class=\"fa fa-check\"></i></p>",
 	"upgrade-available": "<p>Eine neuere Version (v%1) ist erschienen. Erwäge <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">NodeBB zu upgraden</a>.</p>",
 	"prerelease-upgrade-available": "<p>Das ist eine veraltete NodeBB-Vorabversion. Eine neuere Version (v%1) ist erschienen. Erwäge <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">NodeBB zu upgraden</a>.</p>",
-	"prerelease-warning": "<p>Das ist eine <strong>pre-release</strong> Version von NodeBB. Es können ungewollte Fehler auftreten. <i class=\"fa fa-exclamation-triangle\"></i></p>",
-	"fallback-emailer-not-found": "Fallback emailer not found!",
+	"prerelease-warning": "<p>Das ist eine <strong>Vorabversion</strong> von NodeBB. Es können ungewollte Fehler auftreten. <i class=\"fa fa-exclamation-triangle\"></i></p>",
+	"fallback-emailer-not-found": "Fallback-Emailer nicht gefunden",
 	"running-in-development": "<span>Das Forum wurde im Entwicklermodus gestartet. Das Forum könnte potenziellen Gefahren ausgeliefert sein. Bitte kontaktiere den Systemadministrator.</span>",
 	"latest-lookup-failed": "<p>Beim nachschlagen der neuesten verfügbaren NodeBB Version ist ein Fehler aufgetreten</p>",
 

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

@@ -1,16 +1,16 @@
 {
-	"you-are-on": "You are on <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</strong>",
+	"you-are-on": "Sie verwenden <strong>%1:%2</strong>",
+	"ip": "IP<strong>%1</strong>",
 	"nodes-responded": "%1 Knoten antworteten innerhalb von %2ms",
 	"host": "Host",
-	"primary": "primary / run jobs",
+	"primary": "Primärer / Laufjob",
 	"pid": "PID",
 	"nodejs": "Node.js Version",
 	"online": "Online",
 	"git": "git",
 	"memory": "Speicher",
-	"load": "system load",
-	"cpu-usage": "cpu usage",
+	"load": "Systemlast",
+	"cpu-usage": "CPU Benutzung",
 	"uptime": "Uptime",
 
 	"registered": "Registriert",

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

@@ -1,5 +1,5 @@
 {
-	"trending": "Trending",
+	"trending": "Beliebt",
 	"installed": "Installiert",
 	"active": "Aktiv",
 	"inactive": "Inaktiv",
@@ -10,7 +10,7 @@
 
 	"plugin-search": "Plugin Suche",
 	"plugin-search-placeholder": "Nach Plugin suchen...",
-	"submit-anonymous-usage": "Submit anonymous plugin usage data.",
+	"submit-anonymous-usage": "Übermitteln Sie anonyme Plugin-Nutzungsdaten.",
 	"reorder-plugins": "Plugins neu sortieren",
 	"order-active": "Aktive Plugins sortieren",
 	"dev-interested": "Daran interessiert selbst Plugins für NodeBB zu schreiben?",
@@ -31,15 +31,15 @@
 	"plugin-item.more-info": "Für weitere Informationen:",
 	"plugin-item.unknown": "Unbekannt",
 	"plugin-item.unknown-explanation": "Der Status dieses Plugins konnte nicht bestimmt werden, möglicherweise aufgrund eines Konfigurationsfehlers.",
-	"plugin-item.compatible": "This plugin works on NodeBB %1",
-	"plugin-item.not-compatible": "This plugin has no compatibility data, make sure it works before installing on your production environment.",
+	"plugin-item.compatible": "Dieses Plugin funktioniert mit NodeBB %1",
+	"plugin-item.not-compatible": "Dieses Plugin hat keine Kompatibilitätsdaten. Stellen Sie sicher, dass es funktioniert, bevor Sie es in Ihrer Produktionsumgebung installieren.",
 
 	"alert.enabled": "Plugin aktiviert",
 	"alert.disabled": "Plugin deaktiviert",
 	"alert.upgraded": "Plugin aktualisiert",
 	"alert.installed": "Plugin installiert",
 	"alert.uninstalled": "Plugin deinstalliert",
-	"alert.activate-success": "Please rebuild and restart your NodeBB to fully activate this plugin",
+	"alert.activate-success": "Bitte bauen Sie Ihr NodeBB neu auf und starten Sie es neu, um dieses Plugin vollständig zu aktivieren",
 	"alert.deactivate-success": "Plugin erfolgreich deaktiviert",
 	"alert.upgrade-success": "Bitte Starte dein NodeBB neu um dieses Plugin völlständig zu upgraden.",
 	"alert.install-success": "Plugin erfolgreich installiert. Bitte aktiviere das Plugin",

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

@@ -8,8 +8,6 @@
 	"delete": "Entfernen",
 	"enable": "Aktivieren",
 	"disable": "Deaktivieren",
-	"control-panel": "Belohnungseinstellungen",
-	"new-reward": "Neue Belohnung",
 
 	"alert.delete-success": "Die Belohnung wurde erfolgreich gelöscht",
 	"alert.no-inputs-found": "Ungültige Belohnung - keine Eingaben gefunden!",

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

@@ -1,7 +1,7 @@
 {
 	"available": "Verfügbare Widgets",
 	"explanation": "Widget vom Dropdown-Menu auswählen und anschließend links in den Widget-Bereich einer Vorlage ziehen.",
-	"none-installed": "No widgets found! Activate the widget essentials plugin in the <a href=\"%1\">plugins</a> control panel.",
+	"none-installed": "Keine Widgets gefunden! Aktivieren Sie das Widget Essentials Plugin im <a href=\"%1\">Plugin-Kontrollzentrum</a>.",
 	"clone-from": "Klone Widget von",
 	"containers.available": "Verfügbare Container",
 	"containers.explanation": "Auf ein beliebiges aktives Widget ziehen",
@@ -20,11 +20,11 @@
 
 	"error.select-clone": "Bitte wähle eine Seite aus von der geklont werden soll",
 
-	"title": "Title",
-	"title.placeholder": "Title (only shown on some containers)",
+	"title": "Titel",
+	"title.placeholder": "Titel (nur in bestimmten Bereichen zusehen)",
 	"container": "Container",
-	"container.placeholder": "Drag and drop a container or enter HTML here.",
-	"show-to-groups": "Show to groups",
-	"hide-from-groups": "Hide from groups",
-	"hide-on-mobile": "Hide on mobile"
+	"container.placeholder": "Ziehen Sie einen Container per Drag & Drop oder geben Sie hier HTML ein.",
+	"show-to-groups": "Für Gruppen anzeigen",
+	"hide-from-groups": "Für Gruppen verbergen",
+	"hide-on-mobile": "Auf Mobile verbergen"
 }

public/language/de/admin/manage/categories.json

@@ -10,9 +10,9 @@
 	"custom-class": "Benutzderdefinierte Klasse",
 	"num-recent-replies": "Anzahl neuer Antworten",
 	"ext-link": "Externer Link",
-	"subcategories-per-page": "Subcategories per page",
+	"subcategories-per-page": "Subkategorien pro Seite",
 	"is-section": "Behandle diese Kategorie als Abschnitt",
-	"post-queue": "Post queue",
+	"post-queue": "Warteschlange",
 	"tag-whitelist": "Tag Whitelist",
 	"upload-image": "Bild hochladen",
 	"delete-image": "Entfernen",

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

@@ -51,10 +51,13 @@
 	"alert.saved": "Änderungen an Rechten gespeichert und angewendet",
 	"alert.confirm-discard": "Bist du sicher, dass du die Änderungen an den Rechten verwerfen möchtest?",
 	"alert.discarded": "Änderungen an Rechten verworfen",
-	"alert.confirm-copyToAll": "Bist Du sicher, dass Du diese Rechte auf <strong>alle Kategorien</strong> anwenden möchtest?",
-	"alert.confirm-copyToAllGroup": "Bist Du sicher, dass Du die Rechte dieser Gruppe auf <strong>alle Kategorien</strong> anwenden möchtest?",
-	"alert.confirm-copyToChildren": "Bist Du sicher, dass Du diese Rechte auf <strong>alle Unterkategorien</strong> anwenden möchtest?",
-	"alert.confirm-copyToChildrenGroup": "Bist Du sicher, dass Du die Rechte dieser Gruppe auf <strong>alle Unterkategorien</strong> anwenden möchtest?",
+	"alert.confirm-copyToAll": "Are you sure you wish to apply this set of <strong>%1</strong> to <strong>all categories</strong>?",
+	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's set of <strong>%1</strong> to <strong>all categories</strong>?",
+	"alert.confirm-copyToChildren": "Are you sure you wish to apply this set of <strong>%1</strong> to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's set of <strong>%1</strong> to <strong>all descendant (child) categories</strong>?",
 	"alert.no-undo": "<em>Dieser Vorgang kann nicht rückgängig gemacht werden.</em>",
-	"alert.admin-warning": "Administratoren erhalten implizit alle Berechtigungen"
+	"alert.admin-warning": "Administratoren erhalten implizit alle Berechtigungen",
+  	"alert.copyPrivilegesFrom-title": "Select a category to copy from",
+  	"alert.copyPrivilegesFrom-warning": "This will copy <strong>%1</strong> from the selected category.",
+  	"alert.copyPrivilegesFromGroup-warning": "This will copy this group's set of <strong>%1</strong> from the selected category."
 }

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

@@ -5,5 +5,7 @@
     "orphaned": "Verwaist",
     "size/filecount": "Größe / Dateianzahl",
     "confirm-delete": "Bist du sicher, dass du diese Datei löschen willst?",
-    "filecount": "%1 Dateien"
+    "filecount": "%1 Dateien",
+    "new-folder": "New Folder",
+    "name-new-folder": "Enter a name for new the folder"
 }

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

@@ -36,6 +36,7 @@
 	"subscriptions.disable": "Deaktivierung der Email Zusammenfassungen",
 	"subscriptions.hour": "Sende Zeit",
 	"subscriptions.hour-help": "Bitte geben Sie eine Nummer ein, welche die Stunde repräsentiert zu welcher geplante Emails versandt werden sollen (z.B. <code>0</code> für Mitternacht, <code>17</code> für 5 Uhr Nachmittags). Beachten Sie, dass die Zeit auf der Serverzeit basiert und daher nicht umbedingt mit ihrer Systemzeit übereinstimmen muss.<br>Die ungefähre Serverzeit ist: <span id=\"serverTime\"></span><br>Die nächste tägliche Sendung ist um <span id=\"nextDigestTime\"></span> geplant",
-	"notifications.settings": "Email notification settings",
-	"notifications.remove-images": "Remove images from email notifications"
+	"notifications.remove-images": "Remove images from email notifications",
+	"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
+	"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). <strong>Enable this setting at your own risk</strong> &ndash; sending emails to unverified addresses may be a violation of regional anti-spam laws."
 }

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

@@ -35,7 +35,10 @@
 	"maskable-icon.help": "Recommended size and format: 512x512, PNG format only. If no maskable icon is specified, NodeBB will fall back to the Touch Icon.",
 	"outgoing-links": "Ausgehende Links",
 	"outgoing-links.warning-page": "Warnseite für ausgehende links verwenden",
-	"search-default-sort-by": "Standardmäßige Such-Sortierung",
+	"search": "Search",
+	"search-default-in": "Search In",
+	"search-default-in-quick": "Quick Search In",
+	"search-default-sort-by": "Sort by",
 	"outgoing-links.whitelist": "Domains, für die keine Warnseite angezeigt werden soll",
 	"site-colors": "Site Color Metadata",
 	"theme-color": "Theme Color",

public/language/de/email.json

@@ -6,7 +6,9 @@
     "greeting_no_name": "Hallo",
     "greeting_with_name": "Hallo %1",
     "email.verify-your-email.subject": "Bitte bestätige deine Email-Adresse",
-    "email.verify.text1": "Deine Email-Adresse hat sich verändert!",
+    "email.verify.text1": "You've requested that we change or confirm your email address",
+    "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. <strong>If you did not request this, no action is required on your part.</strong>",
+    "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).",
     "welcome.text1": "Vielen Dank für die Registrierung bei %1!",
     "welcome.text2": "Um dein Konto vollständig zu aktivieren, müssen wir überprüfen, ob du Besitzer der E-Mail-Adresse bist, mit der du dich registriert hast.",
     "welcome.text3": "Ein Administrator hat deine Registrierung aktzeptiert. Du kannst dich jetzt mit deinem Benutzernamen/Passwort einloggen.",

public/language/de/error.json

@@ -25,14 +25,17 @@
     "invalid-event": "Invalid event: %1",
     "local-login-disabled": "Lokales Login System wurde für nicht-priviligierte Konten deaktiviert.",
     "csrf-invalid": "Dein Login war nicht erfolgreich da wahrscheinlich deine Sitzung abgelaufen ist. Bitte versuche es noch einmal",
+    "invalid-path": "Invalid path",
+    "folder-exists": "Folder exists",
     "invalid-pagination-value": "Ungültige Seitennummerierung, muss mindestens %1 und maximal %2 sein",
     "username-taken": "Der Benutzername ist bereits vergeben",
     "email-taken": "Die E-Mail-Adresse ist bereits vergeben",
+    "email-nochange": "The email entered is the same as the email already on file.",
     "email-invited": "Email was already invited",
-    "email-not-confirmed": "Du kannst keine Beiträge erstellen, solange deine Email-Adresse nicht bestätigt wurde. Bitte klicke hier um deine Email-Adresse zu bestätigen.",
+    "email-not-confirmed": "Posting in some categories or topics is enabled once your email is confirmed, please click here to send a confirmation email.",
     "email-not-confirmed-chat": "Du kannst den Chat erst nutzen wenn deine E-Mail bestätigt wurde, bitte klicke hier, um deine E-Mail zu bestätigen.",
     "email-not-confirmed-email-sent": "Deine Email-Adresse wurde noch nicht bestätigt, bitte kontrolliere dein Postfach nach einer Bestätigungsmail. Du kannst keine Beiträge erstellen oder chatten bis deine Email-Adresse bestätigt wurde.",
-    "no-email-to-confirm": "Dieses Forum setzt eine E-Mail-Bestätigung voraus, bitte klicke hier um eine E-Mail-Adresse einzugeben.",
+    "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.",
     "email-confirm-failed": "Wir konnten deine E-Mail-Adresse nicht bestätigen, bitte versuch es später noch einmal",
     "confirm-email-already-sent": "Die Bestätigungsmail wurde verschickt. Bitte warte %1 Minute(n), um eine weitere zu verschicken.",
     "sendmail-not-found": "Sendmail wurde nicht gefunden. Bitte stelle sicher, dass es installiert ist und durch den Benutzer unter dem NodeBB läuft ausgeführt werden kann.",

public/language/de/flags.json

@@ -77,9 +77,6 @@
 	"modal-reason-custom": "Grund für die Meldung dieses Inhalts...",
 	"modal-submit": "Meldung abschicken",
 	"modal-submit-success": "Der Inhalt wurde gemeldet.",
-	"modal-submit-confirm": "Einreichung bestätigen",
-	"modal-submit-confirm-text": "Du hast bereits einen benutzerdefinierten Grund angegeben. Bis du sicher, dass du per schnell-funktion abschicken willst?",
-	"modal-submit-confirm-text-help": "Das einreichen per schnell-funktion werden alle näher angegebenen Gründe ignoriert.",
 
 	"bulk-actions": "Massenaktionen",
 	"bulk-resolve": "Meldungen bereiningen",

public/language/de/global.json

@@ -70,6 +70,7 @@
     "firstpost": "Erster Beitrag",
     "read_more": "weiterlesen",
     "more": "Mehr",
+    "none": "None",
     "posted_ago_by_guest": "%1 von einem Gast geschrieben",
     "posted_ago_by": "%1 von %2 geschrieben",
     "posted_ago": "%1 geschrieben",

public/language/de/register.json

@@ -20,8 +20,9 @@
     "registration-added-to-queue": "Deine Registration wurde abgeschickt. Du wirst eine E-Mail erhalten, sobald sie von einem Administrator akzeptiert wird.",
     "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.",
     "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.",
-    "interstitial.intro": "Wir benötigen ein wenig mehr Informationen bevor wir dein Konto erstellen können.",
-    "interstitial.errors-found": "Wir konnten deinen Registrierungsvorgang nicht abschließen:",
+    "interstitial.intro": "We'd like some additional information in order to update your account…",
+    "interstitial.intro-new": "We'd like some additional information before we can create your account…",
+    "interstitial.errors-found": "Please review the entered information:",
     "gdpr_agree_data": "Ich stimme der Sammlung und Verarbeitung meiner Persönlichen Daten auf dieser Website zu.",
     "gdpr_agree_email": "Ich bin damit einverstanden, dass ich Informations und Benachrichtigungs-E-Mails von dieser Website erhalte.",
     "gdpr_consent_denied": "Du musst zustimmen, dass diese Seite deine Daten sammeln und verarbeiten darf, und dir Emails senden darf.",

public/language/de/topic.json

@@ -20,6 +20,8 @@
     "login-to-view": "🔒 Zum ansehen einloggen",
     "edit": "Bearbeiten",
     "delete": "Löschen",
+    "delete-event": "Delete Event",
+    "delete-event-confirm": "Are you sure you want to delete this event?",
     "purge": "Endgültig löschen",
     "restore": "Wiederherstellen",
     "move": "Verschieben",
@@ -43,6 +45,7 @@
     "unpinned-by": "Unpinned by",
     "deleted-by": "Deleted by",
     "restored-by": "Restored by",
+    "moved-from-by": "Moved from %1 by",
     "queued-by": "Post queued for approval →",
     "bookmark_instructions": "Klicke hier, um zum letzten gelesenen Beitrag des Themas zurückzukehren.",
     "flag-post": "Diesen Post melden",
@@ -173,5 +176,6 @@
     "timeago_later": "%1 später",
     "timeago_earlier": "%1 früher",
     "first-post": "First post",
-    "last-post": "Last post"
+    "last-post": "Last post",
+    "post-quick-reply": "Post quick reply"
 }

public/language/de/user.json

@@ -98,6 +98,7 @@
     "has_no_follower": "Diesem Benutzer folgt noch niemand. :(",
     "follows_no_one": "Dieser Benutzer folgt noch niemandem. :(",
     "has_no_posts": "Dieser Benutzer hat noch nichts geschrieben.",
+    "has_no_best_posts": "This user does not have any upvoted posts yet.",
     "has_no_topics": "Dieser Benutzer hat noch keine Themen erstellt.",
     "has_no_watched_topics": "Dieser Benutzer beobachtet keine Themen.",
     "has_no_ignored_topics": "Dieser Benutzer ignoriert bisher keine Themen.",
@@ -180,5 +181,8 @@
     "consent.export_uploads": "Hochgeladene Dateien exportieren (.zip)",
     "consent.export-uploads-success": "Uploads werden exportiert, du bekommst eine Benachrichtigung sobald der Vorgang abgeschlossen ist.",
     "consent.export_posts": "Beiträge exportieren (.csv)",
-    "consent.export-posts-success": "Beiträge werden exportiert, du bekommst eine Benachrichtigung sobald der Vorgang abgeschlossen ist."
+    "consent.export-posts-success": "Beiträge werden exportiert, du bekommst eine Benachrichtigung sobald der Vorgang abgeschlossen ist.",
+    "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.",
+    "emailUpdate.optional": "<strong>This field is optional</strong>. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.",
+    "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page."
 }

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

@@ -8,8 +8,6 @@
 	"delete": "Delete",
 	"enable": "Enable",
 	"disable": "Disable",
-	"control-panel": "Rewards Control",
-	"new-reward": "New Reward",
 
 	"alert.delete-success": "Successfully deleted reward",
 	"alert.no-inputs-found": "Illegal reward - no inputs found!",

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

@@ -51,10 +51,13 @@
 	"alert.saved": "Privilege changes saved and applied",
 	"alert.confirm-discard": "Are you sure you wish to discard your privilege changes?",
 	"alert.discarded": "Privilege changes discarded",
-	"alert.confirm-copyToAll": "Are you sure you wish to apply this privilege set to <strong>all categories</strong>?",
-	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's privilege set to <strong>all categories</strong>?",
-	"alert.confirm-copyToChildren": "Are you sure you wish to apply this privilege set to <strong>all descendant (child) categories</strong>?",
-	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToAll": "Are you sure you wish to apply this set of <strong>%1</strong> to <strong>all categories</strong>?",
+	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's set of <strong>%1</strong> to <strong>all categories</strong>?",
+	"alert.confirm-copyToChildren": "Are you sure you wish to apply this set of <strong>%1</strong> to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's set of <strong>%1</strong> to <strong>all descendant (child) categories</strong>?",
 	"alert.no-undo": "<em>This action cannot be undone.</em>",
-	"alert.admin-warning": "Administrators implicitly get all privileges"
+	"alert.admin-warning": "Administrators implicitly get all privileges",
+  	"alert.copyPrivilegesFrom-title": "Select a category to copy from",
+  	"alert.copyPrivilegesFrom-warning": "This will copy <strong>%1</strong> from the selected category.",
+  	"alert.copyPrivilegesFromGroup-warning": "This will copy this group's set of <strong>%1</strong> from the selected category."
 }

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

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

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

@@ -36,6 +36,7 @@
 	"subscriptions.disable": "Disable email digests",
 	"subscriptions.hour": "Digest Hour",
 	"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>",
-	"notifications.settings": "Email notification settings",
-	"notifications.remove-images": "Remove images from email notifications"
+	"notifications.remove-images": "Remove images from email notifications",
+	"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
+	"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). <strong>Enable this setting at your own risk</strong> &ndash; sending emails to unverified addresses may be a violation of regional anti-spam laws."
 }

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

@@ -35,7 +35,10 @@
 	"maskable-icon.help": "Recommended size and format: 512x512, PNG format only. If no maskable icon is specified, NodeBB will fall back to the Touch Icon.",
 	"outgoing-links": "Outgoing Links",
 	"outgoing-links.warning-page": "Use Outgoing Links Warning Page",
-	"search-default-sort-by": "Search default sort by",
+	"search": "Search",
+	"search-default-in": "Search In",
+	"search-default-in-quick": "Quick Search In",
+	"search-default-sort-by": "Sort by",
 	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page",
 	"site-colors": "Site Color Metadata",
 	"theme-color": "Theme Color",

public/language/el/email.json

@@ -6,7 +6,9 @@
     "greeting_no_name": "Γειά σου",
     "greeting_with_name": "Γειά σου %1",
     "email.verify-your-email.subject": "Please verify your email",
-    "email.verify.text1": "Your email address has changed!",
+    "email.verify.text1": "You've requested that we change or confirm your email address",
+    "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. <strong>If you did not request this, no action is required on your part.</strong>",
+    "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).",
     "welcome.text1": "Ευχαριστούμε που γράφτηκες στο %1!",
     "welcome.text2": "Για να ενεργοποιήσεις πλήρως τον λογαριασμό σου, πρέπει να επιβεβαιώσουμε πως η διεύθυνση email με την οποια γράφτηκες σου ανήκει.",
     "welcome.text3": "An administrator has accepted your registration application. You can login with your username/password now.",

public/language/el/error.json

@@ -25,14 +25,17 @@
     "invalid-event": "Invalid event: %1",
     "local-login-disabled": "Local login system has been disabled for non-privileged accounts.",
     "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
+    "invalid-path": "Invalid path",
+    "folder-exists": "Folder exists",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "Το όνομα χρήστη είναι πιασμένο",
     "email-taken": "Το email είναι πιασμένο",
+    "email-nochange": "The email entered is the same as the email already on file.",
     "email-invited": "Email was already invited",
-    "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.",
+    "email-not-confirmed": "Posting in some categories or topics is enabled once your email is confirmed, please click here to send a confirmation email.",
     "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
     "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.",
-    "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
+    "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.",
     "email-confirm-failed": "We could not confirm your email, please try again later.",
     "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
     "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",

public/language/el/flags.json

@@ -77,9 +77,6 @@
 	"modal-reason-custom": "Reason for reporting this content...",
 	"modal-submit": "Submit Report",
 	"modal-submit-success": "Content has been flagged for moderation.",
-	"modal-submit-confirm": "Confirm Submission",
-	"modal-submit-confirm-text": "You have a custom reason specified already. Are you sure you wish to submit via quick-report?",
-	"modal-submit-confirm-text-help": "Submitting a quick report will overwrite any custom reasons defined.",
 
 	"bulk-actions": "Bulk Actions",
 	"bulk-resolve": "Resolve Flag(s)",

public/language/el/global.json

@@ -70,6 +70,7 @@
     "firstpost": "First post",
     "read_more": "διάβασε περισσότερα",
     "more": "Περισσότερα",
+    "none": "None",
     "posted_ago_by_guest": "δημοσιεύτηκε πριν από %1 από Επισκέπτη",
     "posted_ago_by": "δημοσιεύτηκε πριν από %1 από τον/την %2",
     "posted_ago": "δημοσιεύτηκε πρίν από %1",

public/language/el/register.json

@@ -20,8 +20,9 @@
     "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator.",
     "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.",
     "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.",
-    "interstitial.intro": "We require some additional information before we can create your account.",
-    "interstitial.errors-found": "We could not complete your registration:",
+    "interstitial.intro": "We'd like some additional information in order to update your account…",
+    "interstitial.intro-new": "We'd like some additional information before we can create your account…",
+    "interstitial.errors-found": "Please review the entered information:",
     "gdpr_agree_data": "I consent to the collection and processing of my personal information on this website.",
     "gdpr_agree_email": "I consent to receive digest and notification emails from this website.",
     "gdpr_consent_denied": "You must give consent to this site to collect/process your information, and to send you emails.",

public/language/el/topic.json

@@ -20,6 +20,8 @@
     "login-to-view": "🔒 Log in to view",
     "edit": "Επεξεργασία",
     "delete": "Διαγραφή",
+    "delete-event": "Delete Event",
+    "delete-event-confirm": "Are you sure you want to delete this event?",
     "purge": "Εκκαθάριση",
     "restore": "Επαναφορά",
     "move": "Μετακίνηση",
@@ -43,6 +45,7 @@
     "unpinned-by": "Unpinned by",
     "deleted-by": "Deleted by",
     "restored-by": "Restored by",
+    "moved-from-by": "Moved from %1 by",
     "queued-by": "Post queued for approval →",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag-post": "Flag this post",
@@ -173,5 +176,6 @@
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier",
     "first-post": "First post",
-    "last-post": "Last post"
+    "last-post": "Last post",
+    "post-quick-reply": "Post quick reply"
 }

public/language/el/user.json

@@ -98,6 +98,7 @@
     "has_no_follower": "Αυτός ο χρήστης δεν έχει κανέναν ακόλουθο :(",
     "follows_no_one": "Αυτός ο χρήστης δεν ακολουθεί κανέναν :(",
     "has_no_posts": "This user hasn't posted anything yet.",
+    "has_no_best_posts": "This user does not have any upvoted posts yet.",
     "has_no_topics": "This user hasn't posted any topics yet.",
     "has_no_watched_topics": "This user hasn't watched any topics yet.",
     "has_no_ignored_topics": "This user hasn't ignored any topics yet.",
@@ -180,5 +181,8 @@
     "consent.export_uploads": "Export Uploaded Content (.zip)",
     "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.",
     "consent.export_posts": "Export Posts (.csv)",
-    "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete."
+    "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.",
+    "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.",
+    "emailUpdate.optional": "<strong>This field is optional</strong>. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.",
+    "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page."
 }

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

@@ -8,8 +8,6 @@
 	"delete": "Delete",
 	"enable": "Enable",
 	"disable": "Disable",
-	"control-panel": "Rewards Control",
-	"new-reward": "New Reward",
 
 	"alert.delete-success": "Successfully deleted reward",
 	"alert.no-inputs-found": "Illegal reward - no inputs found!",

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

@@ -51,10 +51,13 @@
 	"alert.saved": "Privilege changes saved and applied",
 	"alert.confirm-discard": "Are you sure you wish to discard your privilege changes?",
 	"alert.discarded": "Privilege changes discarded",
-	"alert.confirm-copyToAll": "Are you sure you wish to apply this privilege set to <strong>all categories</strong>?",
-	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's privilege set to <strong>all categories</strong>?",
-	"alert.confirm-copyToChildren": "Are you sure you wish to apply this privilege set to <strong>all descendant (child) categories</strong>?",
-	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToAll": "Are you sure you wish to apply this set of <strong>%1</strong> to <strong>all categories</strong>?",
+	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's set of <strong>%1</strong> to <strong>all categories</strong>?",
+	"alert.confirm-copyToChildren": "Are you sure you wish to apply this set of <strong>%1</strong> to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's set of <strong>%1</strong> to <strong>all descendant (child) categories</strong>?",
 	"alert.no-undo": "<em>This action cannot be undone.</em>",
-	"alert.admin-warning": "Administrators implicitly get all privileges"
+	"alert.admin-warning": "Administrators implicitly get all privileges",
+  	"alert.copyPrivilegesFrom-title": "Select a category to copy from",
+  	"alert.copyPrivilegesFrom-warning": "This will copy <strong>%1</strong> from the selected category.",
+  	"alert.copyPrivilegesFromGroup-warning": "This will copy this group's set of <strong>%1</strong> from the selected category."
 }

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

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