chore: incrementing version number - v1.15.0-beta.9

filter:post.queue

.eslintrc

@@ -121,7 +121,7 @@
 		// "comma-spacing": "off",
 		// "no-trailing-spaces": "off",
 		// "key-spacing": "off",
-		// "no-multiple-empty-lines": "off",
+		"no-multiple-empty-lines": "off"
 		// "spaced-comment": "off",
 		// "space-in-parens": "off",
 		// "block-spacing": "off",

.github/SECURITY.md

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

.gitignore

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

.travis.yml

@@ -39,6 +39,7 @@ addons:
       - g++-4.8
       - mongodb-org-server
 node_js:
+  - "14"
   - "12"
   - "10"
 branches:

.tx/config

@@ -251,6 +251,106 @@ trans.zh_CN = public/language/zh-CN/modules.json
 trans.zh_TW = public/language/zh-TW/modules.json
 type = KEYVALUEJSON
 
+[nodebb.post-queue]
+file_filter = public/language/<lang>/post-queue.json
+source_file = public/language/en-GB/post-queue.json
+source_lang = en_GB
+trans.ar = public/language/ar/post-queue.json
+trans.bg = public/language/bg/post-queue.json
+trans.bn = public/language/bn/post-queue.json
+trans.cs = public/language/cs/post-queue.json
+trans.da = public/language/da/post-queue.json
+trans.de = public/language/de/post-queue.json
+trans.el = public/language/el/post-queue.json
+trans.en@pirate = public/language/en-x-pirate/post-queue.json
+trans.en_US = public/language/en-US/post-queue.json
+trans.es = public/language/es/post-queue.json
+trans.et = public/language/et/post-queue.json
+trans.fa_IR = public/language/fa-IR/post-queue.json
+trans.fi = public/language/fi/post-queue.json
+trans.fr = public/language/fr/post-queue.json
+trans.gl = public/language/gl/post-queue.json
+trans.he = public/language/he/post-queue.json
+trans.hr = public/language/hr/post-queue.json
+trans.hu = public/language/hu/post-queue.json
+trans.id = public/language/id/post-queue.json
+trans.it = public/language/it/post-queue.json
+trans.ja = public/language/ja/post-queue.json
+trans.ko = public/language/ko/post-queue.json
+trans.lt = public/language/lt/post-queue.json
+trans.lv = public/language/lv/post-queue.json
+trans.ms = public/language/ms/post-queue.json
+trans.nb = public/language/nb/post-queue.json
+trans.nl = public/language/nl/post-queue.json
+trans.pl = public/language/pl/post-queue.json
+trans.pt_BR = public/language/pt-BR/post-queue.json
+trans.pt_PT = public/language/pt-PT/post-queue.json
+trans.ro = public/language/ro/post-queue.json
+trans.ru = public/language/ru/post-queue.json
+trans.rw = public/language/rw/post-queue.json
+trans.sc = public/language/sc/post-queue.json
+trans.sk = public/language/sk/post-queue.json
+trans.sl = public/language/sl/post-queue.json
+trans.sr = public/language/sr/post-queue.json
+trans.sv = public/language/sv/post-queue.json
+trans.th = public/language/th/post-queue.json
+trans.tr = public/language/tr/post-queue.json
+trans.uk = public/language/uk/post-queue.json
+trans.vi = public/language/vi/post-queue.json
+trans.zh_CN = public/language/zh-CN/post-queue.json
+trans.zh_TW = public/language/zh-TW/post-queue.json
+type = KEYVALUEJSON
+
+[nodebb.ip-blacklist]
+file_filter = public/language/<lang>/ip-blacklist.json
+source_file = public/language/en-GB/ip-blacklist.json
+source_lang = en_GB
+trans.ar = public/language/ar/ip-blacklist.json
+trans.bg = public/language/bg/ip-blacklist.json
+trans.bn = public/language/bn/ip-blacklist.json
+trans.cs = public/language/cs/ip-blacklist.json
+trans.da = public/language/da/ip-blacklist.json
+trans.de = public/language/de/ip-blacklist.json
+trans.el = public/language/el/ip-blacklist.json
+trans.en@pirate = public/language/en-x-pirate/ip-blacklist.json
+trans.en_US = public/language/en-US/ip-blacklist.json
+trans.es = public/language/es/ip-blacklist.json
+trans.et = public/language/et/ip-blacklist.json
+trans.fa_IR = public/language/fa-IR/ip-blacklist.json
+trans.fi = public/language/fi/ip-blacklist.json
+trans.fr = public/language/fr/ip-blacklist.json
+trans.gl = public/language/gl/ip-blacklist.json
+trans.he = public/language/he/ip-blacklist.json
+trans.hr = public/language/hr/ip-blacklist.json
+trans.hu = public/language/hu/ip-blacklist.json
+trans.id = public/language/id/ip-blacklist.json
+trans.it = public/language/it/ip-blacklist.json
+trans.ja = public/language/ja/ip-blacklist.json
+trans.ko = public/language/ko/ip-blacklist.json
+trans.lt = public/language/lt/ip-blacklist.json
+trans.lv = public/language/lv/ip-blacklist.json
+trans.ms = public/language/ms/ip-blacklist.json
+trans.nb = public/language/nb/ip-blacklist.json
+trans.nl = public/language/nl/ip-blacklist.json
+trans.pl = public/language/pl/ip-blacklist.json
+trans.pt_BR = public/language/pt-BR/ip-blacklist.json
+trans.pt_PT = public/language/pt-PT/ip-blacklist.json
+trans.ro = public/language/ro/ip-blacklist.json
+trans.ru = public/language/ru/ip-blacklist.json
+trans.rw = public/language/rw/ip-blacklist.json
+trans.sc = public/language/sc/ip-blacklist.json
+trans.sk = public/language/sk/ip-blacklist.json
+trans.sl = public/language/sl/ip-blacklist.json
+trans.sr = public/language/sr/ip-blacklist.json
+trans.sv = public/language/sv/ip-blacklist.json
+trans.th = public/language/th/ip-blacklist.json
+trans.tr = public/language/tr/ip-blacklist.json
+trans.uk = public/language/uk/ip-blacklist.json
+trans.vi = public/language/vi/ip-blacklist.json
+trans.zh_CN = public/language/zh-CN/ip-blacklist.json
+trans.zh_TW = public/language/zh-TW/ip-blacklist.json
+type = KEYVALUEJSON
+
 [nodebb.register]
 file_filter = public/language/<lang>/register.json
 source_file = public/language/en-GB/register.json
@@ -2300,56 +2400,6 @@ trans.zh_CN = public/language/zh-CN/admin/manage/groups.json
 trans.zh_TW = public/language/zh-TW/admin/manage/groups.json
 type = KEYVALUEJSON
 
-[nodebb.admin-manage-ip-blacklist]
-file_filter = public/language/<lang>/admin/manage/ip-blacklist.json
-source_file = public/language/en-GB/admin/manage/ip-blacklist.json
-source_lang = en_GB
-trans.ar = public/language/ar/admin/manage/ip-blacklist.json
-trans.bg = public/language/bg/admin/manage/ip-blacklist.json
-trans.bn = public/language/bn/admin/manage/ip-blacklist.json
-trans.cs = public/language/cs/admin/manage/ip-blacklist.json
-trans.da = public/language/da/admin/manage/ip-blacklist.json
-trans.de = public/language/de/admin/manage/ip-blacklist.json
-trans.el = public/language/el/admin/manage/ip-blacklist.json
-trans.en@pirate = public/language/en-x-pirate/admin/manage/ip-blacklist.json
-trans.en_US = public/language/en-US/admin/manage/ip-blacklist.json
-trans.es = public/language/es/admin/manage/ip-blacklist.json
-trans.et = public/language/et/admin/manage/ip-blacklist.json
-trans.fa_IR = public/language/fa-IR/admin/manage/ip-blacklist.json
-trans.fi = public/language/fi/admin/manage/ip-blacklist.json
-trans.fr = public/language/fr/admin/manage/ip-blacklist.json
-trans.gl = public/language/gl/admin/manage/ip-blacklist.json
-trans.he = public/language/he/admin/manage/ip-blacklist.json
-trans.hr = public/language/hr/admin/manage/ip-blacklist.json
-trans.hu = public/language/hu/admin/manage/ip-blacklist.json
-trans.id = public/language/id/admin/manage/ip-blacklist.json
-trans.it = public/language/it/admin/manage/ip-blacklist.json
-trans.ja = public/language/ja/admin/manage/ip-blacklist.json
-trans.ko = public/language/ko/admin/manage/ip-blacklist.json
-trans.lt = public/language/lt/admin/manage/ip-blacklist.json
-trans.lv = public/language/lv/admin/manage/ip-blacklist.json
-trans.ms = public/language/ms/admin/manage/ip-blacklist.json
-trans.nb = public/language/nb/admin/manage/ip-blacklist.json
-trans.nl = public/language/nl/admin/manage/ip-blacklist.json
-trans.pl = public/language/pl/admin/manage/ip-blacklist.json
-trans.pt_BR = public/language/pt-BR/admin/manage/ip-blacklist.json
-trans.pt_PT = public/language/pt-PT/admin/manage/ip-blacklist.json
-trans.ro = public/language/ro/admin/manage/ip-blacklist.json
-trans.ru = public/language/ru/admin/manage/ip-blacklist.json
-trans.rw = public/language/rw/admin/manage/ip-blacklist.json
-trans.sc = public/language/sc/admin/manage/ip-blacklist.json
-trans.sk = public/language/sk/admin/manage/ip-blacklist.json
-trans.sl = public/language/sl/admin/manage/ip-blacklist.json
-trans.sr = public/language/sr/admin/manage/ip-blacklist.json
-trans.sv = public/language/sv/admin/manage/ip-blacklist.json
-trans.th = public/language/th/admin/manage/ip-blacklist.json
-trans.tr = public/language/tr/admin/manage/ip-blacklist.json
-trans.uk = public/language/uk/admin/manage/ip-blacklist.json
-trans.vi = public/language/vi/admin/manage/ip-blacklist.json
-trans.zh_CN = public/language/zh-CN/admin/manage/ip-blacklist.json
-trans.zh_TW = public/language/zh-TW/admin/manage/ip-blacklist.json
-type = KEYVALUEJSON
-
 [nodebb.admin-manage-privileges]
 file_filter = public/language/<lang>/admin/manage/privileges.json
 source_file = public/language/en-GB/admin/manage/privileges.json
@@ -2400,56 +2450,6 @@ trans.zh_CN = public/language/zh-CN/admin/manage/privileges.json
 trans.zh_TW = public/language/zh-TW/admin/manage/privileges.json
 type = KEYVALUEJSON
 
-[nodebb.admin-manage-post-queue]
-file_filter = public/language/<lang>/admin/manage/post-queue.json
-source_file = public/language/en-GB/admin/manage/post-queue.json
-source_lang = en_GB
-trans.ar = public/language/ar/admin/manage/post-queue.json
-trans.bg = public/language/bg/admin/manage/post-queue.json
-trans.bn = public/language/bn/admin/manage/post-queue.json
-trans.cs = public/language/cs/admin/manage/post-queue.json
-trans.da = public/language/da/admin/manage/post-queue.json
-trans.de = public/language/de/admin/manage/post-queue.json
-trans.el = public/language/el/admin/manage/post-queue.json
-trans.en@pirate = public/language/en-x-pirate/admin/manage/post-queue.json
-trans.en_US = public/language/en-US/admin/manage/post-queue.json
-trans.es = public/language/es/admin/manage/post-queue.json
-trans.et = public/language/et/admin/manage/post-queue.json
-trans.fa_IR = public/language/fa-IR/admin/manage/post-queue.json
-trans.fi = public/language/fi/admin/manage/post-queue.json
-trans.fr = public/language/fr/admin/manage/post-queue.json
-trans.gl = public/language/gl/admin/manage/post-queue.json
-trans.he = public/language/he/admin/manage/post-queue.json
-trans.hr = public/language/hr/admin/manage/post-queue.json
-trans.hu = public/language/hu/admin/manage/post-queue.json
-trans.id = public/language/id/admin/manage/post-queue.json
-trans.it = public/language/it/admin/manage/post-queue.json
-trans.ja = public/language/ja/admin/manage/post-queue.json
-trans.ko = public/language/ko/admin/manage/post-queue.json
-trans.lt = public/language/lt/admin/manage/post-queue.json
-trans.lv = public/language/lv/admin/manage/post-queue.json
-trans.ms = public/language/ms/admin/manage/post-queue.json
-trans.nb = public/language/nb/admin/manage/post-queue.json
-trans.nl = public/language/nl/admin/manage/post-queue.json
-trans.pl = public/language/pl/admin/manage/post-queue.json
-trans.pt_BR = public/language/pt-BR/admin/manage/post-queue.json
-trans.pt_PT = public/language/pt-PT/admin/manage/post-queue.json
-trans.ro = public/language/ro/admin/manage/post-queue.json
-trans.ru = public/language/ru/admin/manage/post-queue.json
-trans.rw = public/language/rw/admin/manage/post-queue.json
-trans.sc = public/language/sc/admin/manage/post-queue.json
-trans.sk = public/language/sk/admin/manage/post-queue.json
-trans.sl = public/language/sl/admin/manage/post-queue.json
-trans.sr = public/language/sr/admin/manage/post-queue.json
-trans.sv = public/language/sv/admin/manage/post-queue.json
-trans.th = public/language/th/admin/manage/post-queue.json
-trans.tr = public/language/tr/admin/manage/post-queue.json
-trans.uk = public/language/uk/admin/manage/post-queue.json
-trans.vi = public/language/vi/admin/manage/post-queue.json
-trans.zh_CN = public/language/zh-CN/admin/manage/post-queue.json
-trans.zh_TW = public/language/zh-TW/admin/manage/post-queue.json
-type = KEYVALUEJSON
-
 [nodebb.admin-manage-registration]
 file_filter = public/language/<lang>/admin/manage/registration.json
 source_file = public/language/en-GB/admin/manage/registration.json

CHANGELOG.md

@@ -1,3 +1,216 @@
+#### v1.15.0-beta.8 (2020-08-28)
+
+##### Chores
+
+*  incrementing version number - v1.15.0-beta.8 (34bb869c)
+*  update changelog for v1.15.0-beta.7 (e449ff9a)
+
+##### Bug Fixes
+
+*  accept/reject in post-queue instead of accept/delete (694f4b2b)
+
+#### v1.15.0-beta.7 (2020-08-28)
+
+##### Chores
+
+*  incrementing version number - v1.15.0-beta.7 (fd917b8e)
+*  update changelog for v1.15.0-beta.6 (a7f03b64)
+
+##### New Features
+
+*  new filter hook prior to post queue addition (8cc36de2)
+*  add replies to getPostSummaryByPids (a9dfc9a7)
+*  add reply count to getPostSummaryByPids (de0f4aad)
+
+##### Bug Fixes
+
+* **deps:**
+  *  update dependency nodebb-theme-vanilla to v11.2.5 (64f4179a)
+  *  update dependency nodebb-theme-persona to v10.2.10 (777419b2)
+*  new openapi def for replies addition (b5871275)
+
+#### v1.15.0-beta.6 (2020-08-27)
+
+##### Chores
+
+*  incrementing version number - v1.15.0-beta.6 (a9019cbe)
+*  update changelog for v1.15.0-beta.5 (0e90064e)
+* **deps:**  update dependency lint-staged to v10.2.13 (efc30e97)
+
+##### New Features
+
+*  theme work for #8580, closes #8580 (6e805c1b)
+
+##### Bug Fixes
+
+*  #8582 (9f9164a9)
+*  debug logging :dog: (fb3b4a02)
+*  ip-blacklist not working after #8580 (56101ae5)
+*  ip-blacklist not working after #8580 (c681b4b2)
+*  post-queue not working after #8580 (dc5bd760)
+*  #8411 missing language sources for ip-blacklist/post-queue (a93e1955)
+*  removed invalid options for the sendmail transport (#8576) (2b785628)
+
+##### Refactors
+
+*  ip-blacklist and post-queue language files (4dc6e64a)
+*  moved ip-blacklist and post-queue styles/tpls to themes (b6b94a56)
+
+#### v1.15.0-beta.5 (2020-08-26)
+
+##### Chores
+
+*  incrementing version number - v1.15.0-beta.5 (81e4c4df)
+*  update changelog for v1.15.0-beta.4 (6c4aed8c)
+* **deps:**  update dependency mocha to v8.1.2 (#8579) (c722b0e5)
+
+##### New Features
+
+*  allow undo of topic move (abb5e81d)
+*  added alert.timeoutfn (cd8e7963)
+*  sort dependencies alphabetically (a4dbbc37)
+
+##### Bug Fixes
+
+*  missing localisation for topic move error (bacee6b4)
+*  select all checkbox does not re-enable bulk actions button (5d60dce3)
+* **deps:**  update dependency sharp to v0.26.0 (#8578) (7ca967ee)
+
+#### v1.15.0-beta.4 (2020-08-25)
+
+##### Chores
+
+*  incrementing version number - v1.15.0-beta.4 (f2726a6d)
+*  update changelog for v1.15.0-beta.3 (11e2ccab)
+
+##### New Features
+
+*  up persona (af9f328c)
+
+##### Bug Fixes
+
+*  dupes in unread followed topics (55533b11)
+*  wrong data passed to getCategories (39f4bbaa)
+
+#### v1.15.0-beta.3 (2020-08-22)
+
+##### Chores
+
+*  incrementing version number - v1.15.0-beta.3 (39178c2d)
+*  update changelog for v1.15.0-beta.2 (d8a9f1c3)
+
+##### New Features
+
+*  banning a user will resolve their post flags (354e6ccc)
+
+##### Bug Fixes
+
+*  openapi spec (4f7cfd53)
+*  api spec (c4ad14cb)
+*  username, email history disappering if content was deleted (91d9333a)
+*  up composer (9fd37753)
+*  package-install clobbering scoped nodebb plugins (840cb510)
+
+#### v1.15.0-beta.2 (2020-08-21)
+
+##### Chores
+
+*  incrementing version number - v1.15.0-beta.2 (59b50d0a)
+*  update changelog for v1.15.0-beta.1 (aeca19d5)
+
+##### Bug Fixes
+
+*  empty "manage" menu showing in ACP (4b0cb26b)
+*  hide nodebb version in ACP for non-superadmins (cc268605)
+*  change how admin middlewares are exported (f00595b3)
+*  one less return, to appease codeclimate (ae68a254)
+*  inability to access /admin if not superadmin (03bd76de)
+*  #8560, fix old upgrade script (29e3ab24)
+*  use promises in privilege save (9cbe9389)
+*  overzealous click handler on flag list row (7a5daff4)
+*  +comment, -debug log (9608b44f)
+
+##### Refactors
+
+*  changed way middleware was exported (cf2f1e95)
+
+#### v1.15.0-beta.1 (2020-08-20)
+
+##### Chores
+
+*  incrementing version number - v1.15.0-beta.1 (4fa57fbb)
+
+##### New Features
+
+*  theme changes for #8571 (5415c01c)
+*  logic for bulk actions in flags list, #8571 (a3a22793)
+*  expose global/admin privileges to all routes (4737f937)
+
+##### Bug Fixes
+
+*  multiple alerts in the same millisecond overwrite each other (589216e7)
+*  reintroduce 20s delay for api tests (56393795)
+*  client-side error in flags/detail (b2271eb6)
+*  #8570 (7daba7dd)
+
+##### Tests
+
+* **openapi:**  missing commonprops addition (0dc55bbc)
+
+#### 1.14.3 (2020-07-08)
+
+##### Bug Fixes
+
+*  improper targetUid check during password change (c2477d9d)
+
+#### 1.14.2 (2020-07-15)
+
+##### Chores
+
+*  incrementing version number - v1.14.2 (1e4d683f)
+*  update changelog for v1.14.2 (488e69fd)
+*  up theme (63fb2ad7)
+*  incrementing version number - v1.14.2-beta.1 (9d1465d0)
+*  up theme (15aabfd3)
+*  up theme (599c5015)
+*  incrementing version number - v1.14.2-beta.0 (fca4ee31)
+*  incrementing version number - v1.14.1 (31203b16)
+*  update changelog for v1.14.1 (d4c16086)
+* **deps:**  update commitlint monorepo to v9.1.1 (0ca7e28a)
+
+##### New Features
+
+*  logic for flag note editing, #8499 (14417209)
+*  logic for flag note deletion, #8499 (f85a45c7)
+*  #8460, export groups members as csv (00d39fb3)
+*  pass connection options to socket.io-adapter-mongo (393f19b4)
+*  #8023, allow wildcard search for uid/email (3dcf5387)
+*  up composer (6235b31c)
+*  #8427, daily downvote limits (c513b88d)
+*  warn user if whitelisted tags are less than minTags (4adbf87c)
+
+##### Bug Fixes
+
+* **deps:**
+  *  update dependency nodebb-plugin-mentions to v2.9.1 (c54287fe)
+  *  update dependency nodebb-plugin-mentions to v2.9.0 (7730e7da)
+  *  update dependency nodebb-theme-persona to v10.1.62 (#8485) (4e9743ab)
+  *  update dependency nodebb-plugin-composer-default to v6.3.49 (#8479) (ab244ca6)
+*  #8499 (65240a17)
+*  #8500 (5e984d10)
+*  invalid session error modal during logout (2286ee2a)
+*  #8488 (b3a88331)
+*  category search in selector (46a66863)
+*  groups.updateCover (73ddf1cb)
+* **docs:**  bad changelog (60bf488f)
+
+##### Other Changes
+
+*  update changelog for v1.14.2" (e085c846)
+* flag.showModal on flag modal appearance (3379d65f)
+* NodeBB/NodeBB (2fba0a14)
+*  update changelog for v1.14.1" (26c74409)
+
 #### 1.14.1 (2020-07-08)
 
 ##### Chores

README.md

@@ -48,7 +48,7 @@ Our minimalist "Persona" theme gets you going right away, no coding experience r
 
 NodeBB requires the following software to be installed:
 
-* A version of Node.js at least 8 or greater ([installation/upgrade instructions](https://github.com/nodesource/distributions))
+* A version of Node.js at least 10 or greater ([installation/upgrade instructions](https://github.com/nodesource/distributions))
 * Redis, version 2.8.9 or greater **or** MongoDB, version 2.6 or greater
 * nginx, version 1.3.13 or greater (**only if** intending to use nginx to proxy requests to a NodeBB)
 

install/data/defaults.json

@@ -79,6 +79,7 @@
     "min:rep:website": 0,
     "min:rep:aboutme": 0,
     "min:rep:signature": 0,
+    "flags:limitPerTarget": 0,
     "notificationType_upvote": "notification",
     "notificationType_new-topic": "notification",
     "notificationType_new-reply": "notification",
@@ -109,8 +110,7 @@
     "maximumInvites": 0,
     "username:disableEdit": 0,
     "email:disableEdit": 0,
-    "email:sendmail:rateLimit": 2,
-    "email:sendmail:rateDelta": 1000,
+    "email:smtpTransport:pool": false,
     "hideFullname": 0,
     "hideEmail": 0,
     "allowGuestHandles": 0,

install/databases.js

@@ -1,58 +1,51 @@
 'use strict';
 
-var async = require('async');
-var prompt = require('prompt');
-var winston = require('winston');
+const prompt = require('prompt');
+const winston = require('winston');
 
-var questions = {
+const util = require('util');
+
+const promptGet = util.promisify((schema, callback) => prompt.get(schema, callback));
+
+const questions = {
 	redis: require('../src/database/redis').questions,
 	mongo: require('../src/database/mongo').questions,
 	postgres: require('../src/database/postgres').questions,
 };
 
-module.exports = function (config, callback) {
-	async.waterfall([
-		function (next) {
-			winston.info('\nNow configuring ' + config.database + ' database:');
-			getDatabaseConfig(config, next);
-		},
-		function (databaseConfig, next) {
-			saveDatabaseConfig(config, databaseConfig, next);
-		},
-	], callback);
+module.exports = async function (config) {
+	winston.info('\nNow configuring ' + config.database + ' database:');
+	const databaseConfig = await getDatabaseConfig(config);
+	return saveDatabaseConfig(config, databaseConfig);
 };
 
-function getDatabaseConfig(config, callback) {
+async function getDatabaseConfig(config) {
 	if (!config) {
-		return callback(new Error('aborted'));
+		throw new Error('invalid config, aborted');
 	}
 
 	if (config.database === 'redis') {
 		if (config['redis:host'] && config['redis:port']) {
-			callback(null, config);
-		} else {
-			prompt.get(questions.redis, callback);
+			return config;
 		}
+		return await promptGet(questions.redis);
 	} else if (config.database === 'mongo') {
 		if ((config['mongo:host'] && config['mongo:port']) || config['mongo:uri']) {
-			callback(null, config);
-		} else {
-			prompt.get(questions.mongo, callback);
+			return config;
 		}
+		return await promptGet(questions.mongo);
 	} else if (config.database === 'postgres') {
 		if (config['postgres:host'] && config['postgres:port']) {
-			callback(null, config);
-		} else {
-			prompt.get(questions.postgres, callback);
+			return config;
 		}
-	} else {
-		return callback(new Error('unknown database : ' + config.database));
+		return await promptGet(questions.postgres);
 	}
+	throw new Error('unknown database : ' + config.database);
 }
 
-function saveDatabaseConfig(config, databaseConfig, callback) {
+function saveDatabaseConfig(config, databaseConfig) {
 	if (!databaseConfig) {
-		return callback(new Error('aborted'));
+		throw new Error('invalid config, aborted');
 	}
 
 	// Translate redis properties into redis object
@@ -86,13 +79,13 @@ function saveDatabaseConfig(config, databaseConfig, callback) {
 			ssl: databaseConfig['postgres:ssl'],
 		};
 	} else {
-		return callback(new Error('unknown database : ' + config.database));
+		throw new Error('unknown database : ' + config.database);
 	}
 
-	var allQuestions = questions.redis.concat(questions.mongo).concat(questions.postgres);
+	const allQuestions = questions.redis.concat(questions.mongo).concat(questions.postgres);
 	for (var x = 0; x < allQuestions.length; x += 1) {
 		delete config[allQuestions[x].name];
 	}
 
-	callback(null, config);
+	return config;
 }

install/package.json

@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "1.14.3",
+    "version": "1.15.0-beta.9",
     "homepage": "http://www.nodebb.org",
     "repository": {
         "type": "git",
@@ -18,8 +18,8 @@
     },
     "husky": {
         "hooks": {
-            "pre-commit": "lint-staged",
-            "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
+            "pre-commit": "npx lint-staged",
+            "commit-msg": "npx commitlint -E HUSKY_GIT_PARAMS"
         }
     },
     "lint-staged": {
@@ -30,26 +30,25 @@
     },
     "dependencies": {
         "ace-builds": "^1.4.9",
-        "archiver": "^4.0.0",
+        "archiver": "^5.0.0",
         "async": "^3.2.0",
         "autoprefixer": "^9.7.6",
         "bcryptjs": "2.4.3",
         "benchpressjs": "^2.0.2",
         "body-parser": "^1.19.0",
         "bootstrap": "^3.4.1",
-        "bootswatch": "git://github.com/thomaspark/bootswatch.git#c41a8f066feb8950c6f9c6bcf5a3c37d1085404e",
         "chart.js": "^2.9.3",
         "cli-graph": "^3.2.2",
         "clipboard": "^2.0.6",
         "colors": "^1.4.0",
-        "commander": "^5.0.0",
+        "commander": "^6.0.0",
         "compression": "^1.7.4",
         "connect-ensure-login": "^0.1.1",
         "connect-flash": "^0.1.1",
         "connect-mongo": "3.2.0",
         "connect-multiparty": "^2.2.0",
         "connect-pg-simple": "^6.1.0",
-        "connect-redis": "4.0.4",
+        "connect-redis": "5.0.0",
         "cookie-parser": "^1.4.5",
         "cron": "^1.8.2",
         "cropperjs": "^1.5.6",
@@ -60,9 +59,9 @@
         "express-session": "^1.17.0",
         "express-useragent": "^1.0.13",
         "graceful-fs": "^4.2.3",
-        "helmet": "^3.22.0",
+        "helmet": "^4.0.0",
         "html-to-text": "^5.1.1",
-        "ipaddr.js": "^1.9.1",
+        "ipaddr.js": "^2.0.0",
         "jquery": "3.5.1",
         "jsesc": "3.0.1",
         "json2csv": "5.0.1",
@@ -70,29 +69,30 @@
         "less": "^3.11.1",
         "lodash": "^4.17.15",
         "logrotate-stream": "^0.2.6",
-        "lru-cache": "5.1.1",
+        "lru-cache": "6.0.0",
         "material-design-lite": "^1.3.0",
         "mime": "^2.4.4",
         "mkdirp": "^1.0.4",
-        "mongodb": "3.5.9",
+        "mongodb": "3.6.0",
         "morgan": "^1.10.0",
         "mousetrap": "^1.6.5",
-        "@nodebb/mubsub": "^1.6.0",
-        "@nodebb/socket.io-adapter-mongo": "3.0.1",
+        "@nodebb/bootswatch": "3.4.2",
+        "@nodebb/mubsub": "1.7.0",
+        "@nodebb/socket.io-adapter-mongo": "3.1.0",
         "nconf": "^0.10.0",
-        "nodebb-plugin-composer-default": "6.3.50",
-        "nodebb-plugin-dbsearch": "4.1.1",
+        "nodebb-plugin-composer-default": "6.3.54",
+        "nodebb-plugin-dbsearch": "4.1.2",
         "nodebb-plugin-emoji": "^3.3.0",
         "nodebb-plugin-emoji-android": "2.0.0",
         "nodebb-plugin-markdown": "8.11.2",
-        "nodebb-plugin-mentions": "2.9.1",
+        "nodebb-plugin-mentions": "2.9.3",
         "nodebb-plugin-soundpack-default": "1.0.0",
         "nodebb-plugin-spam-be-gone": "0.7.2",
         "nodebb-rewards-essentials": "0.1.3",
         "nodebb-theme-lavender": "5.1.0",
-        "nodebb-theme-persona": "10.1.65",
+        "nodebb-theme-persona": "10.2.10",
         "nodebb-theme-slick": "1.2.29",
-        "nodebb-theme-vanilla": "11.1.33",
+        "nodebb-theme-vanilla": "11.2.5",
         "nodebb-widget-essentials": "4.1.1",
         "nodemailer": "^6.4.6",
         "passport": "^0.4.1",
@@ -111,7 +111,7 @@
         "sanitize-html": "^1.23.0",
         "semver": "^7.2.1",
         "serve-favicon": "^2.5.0",
-        "sharp": "0.25.4",
+        "sharp": "0.26.0",
         "sitemap": "^6.1.0",
         "socket.io": "2.3.0",
         "socket.io-adapter-cluster": "^1.0.1",
@@ -132,28 +132,28 @@
         "zxcvbn": "^4.4.2"
     },
     "devDependencies": {
-        "@apidevtools/swagger-parser": "9.0.1",
-        "@commitlint/cli": "9.1.1",
-        "@commitlint/config-angular": "9.1.1",
+        "@apidevtools/swagger-parser": "10.0.1",
+        "@commitlint/cli": "9.1.2",
+        "@commitlint/config-angular": "9.1.2",
         "coveralls": "3.1.0",
-        "eslint": "7.3.1",
-        "eslint-config-airbnb-base": "14.1.0",
-        "eslint-plugin-import": "2.21.1",
-        "grunt": "1.1.0",
+        "eslint": "7.7.0",
+        "eslint-config-airbnb-base": "14.2.0",
+        "eslint-plugin-import": "2.22.0",
+        "grunt": "1.3.0",
         "grunt-contrib-watch": "1.1.0",
         "husky": "4.2.5",
-        "jsdom": "16.2.2",
-        "lint-staged": "10.2.11",
-        "mocha": "8.0.1",
+        "jsdom": "16.4.0",
+        "lint-staged": "10.2.13",
+        "mocha": "8.1.2",
         "mocha-lcov-reporter": "1.3.0",
-        "nyc": "15.0.1",
+        "nyc": "15.1.0",
         "smtp-server": "3.7.0"
     },
     "bugs": {
         "url": "https://github.com/NodeBB/NodeBB/issues"
     },
     "engines": {
-        "node": ">=8"
+        "node": ">=10"
     },
     "maintainers": [
         {
@@ -172,4 +172,4 @@
             "url": "https://github.com/barisusakli"
         }
     ]
-}
+}

public/.eslintrc

@@ -27,6 +27,7 @@
 		"object-shorthand": "off",
 		"prefer-arrow-callback": "off",
 		"prefer-spread": "off",
+		"prefer-object-spread": "off",
 		"prefer-reflect": "off",
 		"prefer-template": "off"
 	},

public/js-enabled.css

@@ -1,3 +0,0 @@
-/*
-    The following stylesheet is only included on pages that can execute javascript
-*/

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

@@ -3,6 +3,7 @@
 	"ip": "IP <strong>%1</strong>",
 	"nodes-responded": "%1 nodes responded within %2ms!",
 	"host": "host",
+	"primary": "primary / run jobs",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "online",

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

@@ -1,7 +1,7 @@
 {
 	"available": "Available Widgets",
 	"explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.",
-	"none-installed": "No widgets found! Activate the essential widgets plugin in the <a href=\"%1\">plugins</a> control panel.",
+	"none-installed": "No widgets found! Activate the widget essentials plugin in the <a href=\"%1\">plugins</a> control panel.",
 	"clone-from": "Clone widgets from",
 	"containers.available": "Available Containers",
 	"containers.explanation": "Drag and drop on top of any active widget",

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

@@ -27,6 +27,8 @@
 	"enable": "Enable",
 	"disable": "Disable",
 	"edit": "Edit",
+	"analytics": "Analytics",
+	"view-category": "View category",
 
 	"select-category": "Select Category",
 	"set-parent-category": "Set Parent Category",
@@ -64,7 +66,6 @@
 	"alert.create-success": "Category successfully created!",
 	"alert.none-active": "You have no active categories.",
 	"alert.create": "Create a Category",
-	"alert.confirm-moderate": "<strong>Are you sure you wish to grant the moderation privilege to this user group?</strong> This group is public, and any users can join at will.",
 	"alert.confirm-purge": "<p class=\"lead\">Do you really want to purge this category \"%1\"?</p><h5><strong class=\"text-danger\">Warning!</strong> All topics and posts in this category will be purged!</h5> <p class=\"help-block\">Purging a category will remove all topics and posts, and delete the category from the database. If you want to remove a category <em>temporarily</em>, you'll want to \"disable\" the category instead.</p>",
 	"alert.purge-success": "Category purged!",
 	"alert.copy-success": "Settings Copied!",
@@ -76,7 +77,9 @@
 	"alert.user-search": "Search for a user here...",
 	"alert.find-group": "Find a Group",
 	"alert.group-search": "Search for a group here...",
+	"alert.not-enough-whitelisted-tags": "Whitelisted tags are less than minimum tags, you need to create more whitelisted tags!",
 	"collapse-all": "Collapse All",
 	"expand-all": "Expand All",
-	"disable-on-create": "Disable on create"
+	"disable-on-create": "Disable on create",
+	"no-matches": "No matches"
 }

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

@@ -8,6 +8,9 @@
 	"hidden": "Hidden",
 	"private": "Private",
 	"edit": "Edit",
+	"delete": "Delete",
+	"privileges": "Privileges",
+	"download-csv": "CSV",
 	"search-placeholder": "Search",
 	"create": "Create Group",
 	"description-placeholder": "A short description about your group",

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

@@ -1,9 +1,9 @@
 {
 	"global": "Global",
-	"global.no-users": "No user-specific global privileges.",
 	"admin": "Admin",
 	"group-privileges": "Group Privileges",
 	"user-privileges": "User Privileges",
+	"edit-privileges": "Edit Privileges",
 	"chat": "Chat",
 	"upload-images": "Upload Images",
 	"upload-files": "Upload Files",
@@ -33,10 +33,20 @@
 	"delete-topics": "Delete Topics",
 	"purge": "Purge",
 	"moderate": "Moderate",
-
 	"admin-dashboard": "Dashboard",
 	"admin-categories": "Categories",
 	"admin-privileges": "Privileges",
 	"admin-users": "Users",
-	"admin-settings": "Settings"
+	"admin-settings": "Settings",
+
+	"alert.confirm-moderate": "<strong>Are you sure you wish to grant the moderation privilege to this user group?</strong> This group is public, and any users can join at will.",
+	"alert.confirm-save": "Please confirm your intention to save these privileges",
+	"alert.saved": "Privilege changes saved and applied",
+	"alert.confirm-discard": "Are you sure you wish to discard your privilege changes?",
+	"alert.discarded": "Privilege changes discarded",
+	"alert.confirm-copyToAll": "Are you sure you wish to apply this privilege set to <strong>all categories</strong>?",
+	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's privilege set to <strong>all categories</strong>?",
+	"alert.confirm-copyToChildren": "Are you sure you wish to apply this privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.no-undo": "<em>This action cannot be undone.</em>"
 }

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

@@ -108,5 +108,5 @@
 
 	"alerts.prompt-email": "Emails: ",
 	"alerts.email-sent-to": "An invitation email has been sent to %1",
-	"alerts.x-users-found": "%1 user(s) found! Search took %2 ms."
+	"alerts.x-users-found": "%1 user(s) found, (%2 seconds)"
 }

public/language/ar/admin/menu.json

@@ -19,7 +19,7 @@
 	"settings/general": "عامة",
 	"settings/homepage": "Home Page",
 	"settings/navigation": "Navigation",
-	"settings/reputation": "السمعة",
+	"settings/reputation": "Reputation & Flags",
 	"settings/email": "البريد الإلكتروني",
 	"settings/user": "Users",
 	"settings/group": "Groups",

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

@@ -4,10 +4,7 @@
 	"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
-	"sendmail-rate-limit": "Send <em>X</em> emails...",
-	"sendmail-rate-delta": "... every <em>X</em> milliseconds",
-	"sendmail-rate-help": "Instructs the NodeBB mailer to limit the number of messages sent at once in order to not overwhelm email receiving services. These options do not apply if SMTP Transport is enabled (below).",
-
+	
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Use an external email server to send emails",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -25,6 +22,8 @@
 	"smtp-transport.username": "Username",
 	"smtp-transport.username-help": "<b>For the Gmail service,</b> enter the full email address here, especially if you are using a Google Apps managed domain.",
 	"smtp-transport.password": "Password",
+	"smtp-transport.pool": "Enable pooled connections",
+	"smtp-transport.pool-help": "Pooling connections prevents NodeBB from creating a new connection for every email. This option only applies if SMTP Transport is enabled.",
 
 	"template": "Edit Email Template",
 	"template.select": "Select Email Template",

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

@@ -2,6 +2,5 @@
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
 	"welcome-notification-link": "Welcome Notification Link",
-	"welcome-notification-uid": "Welcome Notification User (UID)",
-	"notification-alert-timeout": "Notification Alert Timeout"
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }

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

@@ -5,10 +5,16 @@
 	"votes-are-public": "All Votes Are Public",
 	"thresholds": "Activity Thresholds",
 	"min-rep-downvote": "Minimum reputation to downvote posts",
+	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
+	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
 	"min-rep-flag": "Minimum reputation to flag posts",
 	"min-rep-website": "Minimum reputation to add \"Website\" to user profile",
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",
 	"min-rep-signature": "Minimum reputation to add \"Signature\" to user profile",
 	"min-rep-profile-picture": "Minimum reputation to add \"Profile Picture\" to user profile",
-	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile"
+	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile",
+
+	"flags": "Flag Settings",
+	"flags.limit-per-target": "Maximum number of times something can be flagged",
+	"flags.limit-per-target-placeholder": "Default: 0"
 }

public/language/ar/error.json

@@ -138,8 +138,13 @@
     "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature",
     "not-enough-reputation-min-rep-profile-picture": "You do not have enough reputation to add a profile picture",
     "not-enough-reputation-min-rep-cover-picture": "You do not have enough reputation to add a cover picture",
-    "already-flagged": "لقد بلغت عن هذه المشاركة من قبل.",
+    "post-already-flagged": "You have already flagged this post",
+    "user-already-flagged": "You have already flagged this user",
+    "post-flagged-too-many-times": "This post has been flagged by others already",
+    "user-flagged-too-many-times": "This user has been flagged by others already",
     "self-vote": "You cannot vote on your own post",
+    "too-many-downvotes-today": "You can only downvote %1 times a day",
+    "too-many-downvotes-today-user": "You can only downvote a user %1 times a day",
     "reload-failed": "المنتدى واجه مشكلة أثناء إعادة التحميل: \"%1\".  سيواصل المنتدى خدمة العملاء السابقين لكن يجب عليك إلغاء أي تغيير قمت به قبل إعادة التحميل.",
     "registration-error": "حدث خطأ أثناء التسجيل",
     "parse-error": "حدث خطأ ما أثناء تحليل استجابة الخادم",
@@ -157,6 +162,7 @@
     "invalid-session-text": "يبدو أن فترة التسجيل لم تعد قائمة او هي غير مطابقة مع الخادم. يرجى إعادة تحميل هذه الصفحة.",
     "no-topics-selected": "No topics selected!",
     "cant-move-to-same-topic": "Can't move post to same topic!",
+    "cant-move-topic-to-same-category": "Can't move topic to the same category!",
     "cannot-block-self": "You cannot block yourself!",
     "cannot-block-privileged": "You cannot block administrators or global moderators",
     "cannot-block-guest": "Guest are not able to block other users",

public/language/ar/flags.json

@@ -1,8 +1,7 @@
 {
 	"state": "الحالة",
-	"reporter": "المُبلغ",
-	"reported-at": "وقت التبليغ",
-	"description": "الوصف",
+	"reports": "Reports",
+	"first-reported": "First Reported",
 	"no-flags": "Hooray! No flags found.",
 	"assignee": "المحال إليه",
 	"update": "تحديث",
@@ -26,6 +25,7 @@
 	"filter-quick-mine": "Assigned to me",
 	"filter-cid-all": "All categories",
 	"apply-filters": "Apply Filters",
+	"more-filters": "More Filters",
 
 	"quick-actions": "اجراءات سريعه",
 	"flagged-user": "Flagged User",
@@ -43,6 +43,9 @@
 	"notes": "Flag Notes",
 	"add-note": "اضافة ملاحظة",
 	"no-notes": "No shared notes.",
+	"delete-note-confirm": "Are you sure you want to delete this flag note?",
+	"note-added": "Note Added",
+	"note-deleted": "Note Deleted",
 
 	"history": "Account & Flag History",
 	"no-history": "No flag history.",
@@ -53,7 +56,11 @@
 	"state-resolved": "تم حلها",
 	"state-rejected": "تم رفضها",
 	"no-assignee": "Not Assigned",
-	"note-added": "Note Added",
+
+	"sort": "Sort by",
+	"sort-newest": "Newest first",
+	"sort-oldest": "Oldest first",
+	"sort-reports": "Most reports",
 
 	"modal-title": "Report Inappropriate Content",
 	"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
@@ -65,5 +72,9 @@
 	"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."
+	"modal-submit-confirm-text-help": "Submitting a quick report will overwrite any custom reasons defined.",
+
+	"bulk-actions": "Bulk Actions",
+	"bulk-resolve": "Resolve Flag(s)",
+	"bulk-success": "%1 flags updated"
 }

public/language/ar/modules.json

@@ -1,6 +1,7 @@
 {
     "chat.chatting_with": "Chat with",
     "chat.placeholder": "أكتب رسالة دردشة هنا، اضغط ENTER للإرسال",
+    "chat.scroll-up-alert": "You are looking at older messages, click here to go to most recent message.",
     "chat.send": "أرسل",
     "chat.no_active": "لا يوجد لديك دردشات نشطة.",
     "chat.user_typing": "%1 يكتب رسالة...",
@@ -58,6 +59,7 @@
     "composer.upload-file": "Upload File",
     "composer.zen_mode": "Zen Mode",
     "composer.select_category": "Select a category",
+    "composer.textarea.placeholder": "Enter your post content here, drag and drop images",
     "bootbox.ok": "OK",
     "bootbox.cancel": "إلغاء",
     "bootbox.confirm": "تأكيد",

public/language/ar/topic.json

@@ -36,9 +36,11 @@
     "ban-ip": "Ban IP",
     "view-history": "Edit History",
     "bookmark_instructions": "اضغط هنا للعودة لأخر مشاركة مقروءة في الموضوع",
-    "flag_post": "Flag this post",
-    "flag_user": "Flag this user",
-    "merged_message": "This topic has been merged into <a href=\"/topic/%1\">%2</a>",
+    "flag-post": "Flag this post",
+    "flag-user": "Flag this user",
+    "already-flagged": "Already Flagged",
+    "view-flag-report": "View Flag Report",
+    "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "هذه المشاركة محذوفة. فقط من لهم صلاحية الإشراف على ا لمشاركات يمكنهم معاينتها.",
     "following_topic.message": "ستستلم تنبيها عند كل مشاركة جديدة في هذا الموضوع.",
     "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
@@ -79,7 +81,8 @@
     "thread_tools.purge_confirm": "هل أنت متأكد أنك تريد تطهير هذا الموضوع؟",
     "thread_tools.merge_topics": "Merge Topics",
     "thread_tools.merge": "Merge",
-    "topic_move_success": "تم نقل هذا الموضوع إلى %1 بنجاح",
+    "topic_move_success": "This topic has been successfully moved to %1. Click here to undo.",
+    "topic_move_undone": "Topic move undone",
     "post_delete_confirm": "هل أنت متأكد أنك تريد حذف هذه المشاركة؟",
     "post_restore_confirm": "هل أنت متأكد أنك تريد استعادة هذه المشاركة؟",
     "post_purge_confirm": "هل أنت متأكد أنك تريد تطهير هذه المشاركة؟",

public/language/ar/user.json

@@ -1,7 +1,7 @@
 {
     "banned": "محظور",
     "offline": "غير متصل",
-    "deleted": "Deleted",
+    "deleted": "محذوف",
     "username": "إسم المستخدم",
     "joindate": "تاريخ الإنضمام",
     "postcount": "عدد المشاركات",

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

@@ -3,6 +3,7 @@
 	"ip": "IP <strong>%1</strong>",
 	"nodes-responded": "%1 възела отговориха в рамките на %2мсек!",
 	"host": "сървър",
+	"primary": "основен / изпълнение на задачите",
 	"pid": "ид. на процеса",
 	"nodejs": "nodejs",
 	"online": "на линия",

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

@@ -27,6 +27,8 @@
 	"enable": "Включване",
 	"disable": "Изключване",
 	"edit": "Редактиране",
+	"analytics": "Анализи",
+	"view-category": "Преглед на категорията",
 
 	"select-category": "Изберете категория",
 	"set-parent-category": "Задайте базова категория",
@@ -64,7 +66,6 @@
 	"alert.create-success": "Категорията е създадена успешно!",
 	"alert.none-active": "Нямате активни категории.",
 	"alert.create": "Създаване на категория",
-	"alert.confirm-moderate": "<strong>Наистина ли искате да дадете правомощието за модериране на тази потребителска група?</strong> Тази група е публична и всеки може свободно да се присъедини към нея.",
 	"alert.confirm-purge": "<p class=\"lead\">Наистина ли искате да изтриете категорията „%1“?</p><h5><strong class=\"text-danger\">Внимание!</strong> Всички теми и публикации в тази категория ще бъдат изтрити!</h5> <p class=\"help-block\">Изтриването на категорията ще премахне всички теми и публикации, и ще изтрие категорията от базата данни. Ако искате да премахнете категорията <em>временно</em>, можете просто да я „изключите“.</p>",
 	"alert.purge-success": "Категорията е изтрита!",
 	"alert.copy-success": "Настройките са копирани!",
@@ -76,7 +77,9 @@
 	"alert.user-search": "Потърсете потребител тук…",
 	"alert.find-group": "Търсене на група",
 	"alert.group-search": "Потърсете група тук…",
+	"alert.not-enough-whitelisted-tags": "Разрешените етикети са по-малко от минимума. Трябва да създадете още разрешени етикети!",
 	"collapse-all": "Свиване на всички",
 	"expand-all": "Разгъване на всички",
-	"disable-on-create": "Изключване при създаване"
+	"disable-on-create": "Изключване при създаване",
+	"no-matches": "Няма съвпадения"
 }

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

@@ -8,6 +8,9 @@
 	"hidden": "Скрита",
 	"private": "Частна",
 	"edit": "Редактиране",
+	"delete": "Изтриване",
+	"privileges": "Правомощия",
+	"download-csv": "CSV",
 	"search-placeholder": "Търсене",
 	"create": "Създаване на група",
 	"description-placeholder": "Кратко описание на групата",

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

@@ -1,9 +1,9 @@
 {
 	"global": "Глобални",
-	"global.no-users": "Няма глобални правомощия за отделни потребители.",
 	"admin": "Администратор",
 	"group-privileges": "Правомощия за групите",
 	"user-privileges": "Правомощия за потребителите",
+	"edit-privileges": "Редактиране на правомощията",
 	"chat": "Разговор",
 	"upload-images": "Качване на изображения",
 	"upload-files": "Качване на файлове",
@@ -33,10 +33,20 @@
 	"delete-topics": "Изтриване на теми",
 	"purge": "Изчистване",
 	"moderate": "Модериране",
-
 	"admin-dashboard": "Табло",
 	"admin-categories": "Категории",
 	"admin-privileges": "Правомощия",
 	"admin-users": "Потребители",
-	"admin-settings": "Настройки"
+	"admin-settings": "Настройки",
+
+	"alert.confirm-moderate": "<strong>Наистина ли искате да дадете правомощието за модериране на тази потребителска група?</strong> Тази група е публична и всеки може свободно да се присъедини към нея.",
+	"alert.confirm-save": "Моля, потвърдете желанието си да запазите тези правомощия",
+	"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.no-undo": "<em>Това действие е необратимо.</em>"
 }

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

@@ -108,5 +108,5 @@
 
 	"alerts.prompt-email": "Е-пощи: ",
 	"alerts.email-sent-to": "Беше изпратено е-писмо за потвърждение до %1",
-	"alerts.x-users-found": "Намерени потребители: %1! Търсенето отне %2 милисекунди."
+	"alerts.x-users-found": "Намерени потребители: %1 (%2 секунди)"
 }

public/language/bg/admin/menu.json

@@ -19,7 +19,7 @@
 	"settings/general": "Общи",
 	"settings/homepage": "Начална страница",
 	"settings/navigation": "Навигация",
-	"settings/reputation": "Репутация",
+	"settings/reputation": "Репутация и доклади",
 	"settings/email": "Е-поща",
 	"settings/user": "Потребители",
 	"settings/group": "Групи",

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

@@ -4,10 +4,7 @@
 	"address-help": "Следният адрес на е-поща е този, който получателят ще види в полетата „От“ и “Отговор до“.",
 	"from": "Име за полето „От“",
 	"from-help": "Името на изпращача, което да бъде показано в е-писмото.",
-	"sendmail-rate-limit": "Изпращане на <em>X</em> е-писма…",
-	"sendmail-rate-delta": "…на всеки <em>X</em> милисекунди",
-	"sendmail-rate-help": "Задава на програмата за изпращане на е-писма на NodeBB да ограничи броя едновременно изпращани съобщения, за да не се претоварват пощенските сървъри. Тези настройки не се вземат предвид, ако е включена настройката „Транспорт чрез SMTP“ (по-долу).",
-
+	
 	"smtp-transport": "Транспорт чрез SMTP",
 	"smtp-transport.enabled": "Използване на външен сървър за е-поща за изпращане на е-писма",
 	"smtp-transport-help": "Можете да изберете от списък от познати услуги, или да въведете такава ръчно.",
@@ -25,6 +22,8 @@
 	"smtp-transport.username": "Потребителско име",
 	"smtp-transport.username-help": "<b>За услугата на Gmail</b>, въведете пълния адрес на е-пощата тук, особено ако използвате управляван домейн на „Google Apps“.",
 	"smtp-transport.password": "Парола",
+	"smtp-transport.pool": "Включване на групираните връзки",
+	"smtp-transport.pool-help": "Групирането на връзките предотвратява създаването на нова връзка за всяко е-писмо. Тази настройка има ефект, само ако е включено „Транспорт чрез SMTP“.",
 
 	"template": "Редактирана не шаблона за е-писма",
 	"template.select": "Изберете шаблон за е-писма",

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

@@ -2,6 +2,5 @@
 	"notifications": "Известия",
 	"welcome-notification": "Приветствено известие",
 	"welcome-notification-link": "Връзка за приветственото известие",
-	"welcome-notification-uid": "Потр. ид. за приветственото известие",
-	"notification-alert-timeout": "Време за изчакване преди премахване на уведомяването за известие"
+	"welcome-notification-uid": "Потр. ид. за приветственото известие"
 }

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

@@ -5,10 +5,16 @@
 	"votes-are-public": "Всички гласувания са публични",
 	"thresholds": "Ограничения на дейността",
 	"min-rep-downvote": "Минимална репутация, необходима за отрицателно гласуване за публикации",
+	"downvotes-per-day": "Отрицателни гласувания за ден (задайте 0 за неограничен брой)",
+	"downvotes-per-user-per-day": "Отрицателни гласувания за потребител за ден (задайте 0 за неограничен брой)",
 	"min-rep-flag": "Минимална репутация, необходима за докладване на публикации",
 	"min-rep-website": "Минимална репутация, необходима за добавяне на полето „Уебсайт“ към профила на потребителя",
 	"min-rep-aboutme": "Минимална репутация, необходима за добавяне на полето „За мен“ към профила на потребителя",
 	"min-rep-signature": "Минимална репутация, необходима за добавяне на полето „Подпис“ към профила на потребителя",
 	"min-rep-profile-picture": "Минимална репутация, необходима за добавяне на профилна снимка към профила на потребителя",
-	"min-rep-cover-picture": "Минимална репутация, необходима за добавяне на снимка на корицата към профила на потребителя"
+	"min-rep-cover-picture": "Минимална репутация, необходима за добавяне на снимка на корицата към профила на потребителя",
+
+	"flags": "Настройки за докладите",
+	"flags.limit-per-target": "Максимален брой докладвания на едно и също нещо",
+	"flags.limit-per-target-placeholder": "По подразбиране: 0"
 }

public/language/bg/error.json

@@ -138,8 +138,13 @@
     "not-enough-reputation-min-rep-signature": "Нямате достатъчно репутация, за да добавите подпис",
     "not-enough-reputation-min-rep-profile-picture": "Нямате достатъчно репутация, за да добавите снимка на профила си",
     "not-enough-reputation-min-rep-cover-picture": "Нямате достатъчно репутация, за да добавите снимка на корицата",
-    "already-flagged": "Вече сте докладвали тази публикация",
+    "post-already-flagged": "Вече сте докладвали тази публикация",
+    "user-already-flagged": "Вече сте докладвали този потребител",
+    "post-flagged-too-many-times": "Тази публикация вече е докладвана от други хора",
+    "user-flagged-too-many-times": "Този потребител вече е докладван от други хора",
     "self-vote": "Не можете да гласувате за собствената си публикация",
+    "too-many-downvotes-today": "Можете да гласувате отрицателно не повече от %1 пъти на ден",
+    "too-many-downvotes-today-user": "Можете да гласувате отрицателно за потребител не повече от %1 пъти на ден",
     "reload-failed": "NodeBB срещна проблем при презареждането: „%1“. NodeBB ще продължи да поддържа съществуващите клиентски ресурси, но Вие трябва да отмените последните си действия преди презареждането.",
     "registration-error": "Грешка при регистрацията",
     "parse-error": "Нещо се обърка при прочитането на отговора на сървъра",
@@ -157,6 +162,7 @@
     "invalid-session-text": "Изглежда сесията Ви на вписване вече е изтекла или не съответства на сървъра. Моля, опреснете страницата.",
     "no-topics-selected": "Няма избрани теми!",
     "cant-move-to-same-topic": "Публикацията не може да бъде преместена в същата тема!",
+    "cant-move-topic-to-same-category": "Темата не може да бъде преместена в същата категория!",
     "cannot-block-self": "Не можете да блокирате себе си!",
     "cannot-block-privileged": "Не можете да блокирате администратори и глобални модератори",
     "cannot-block-guest": "Гостите не могат да блокират други потребители",

public/language/bg/flags.json

@@ -1,8 +1,7 @@
 {
 	"state": "Състояние",
-	"reporter": "Докладвал",
-	"reported-at": "Докладвано на",
-	"description": "Описание",
+	"reports": "Доклади",
+	"first-reported": "Първо докладване",
 	"no-flags": "Ура! Няма намерени доклади.",
 	"assignee": "Назначен",
 	"update": "Обновяване",
@@ -26,6 +25,7 @@
 	"filter-quick-mine": "Назначени на мен",
 	"filter-cid-all": "Всички категории",
 	"apply-filters": "Прилагане на филтрите",
+	"more-filters": "Още филтри",
 
 	"quick-actions": "Бързи действия",
 	"flagged-user": "Докладван потребител",
@@ -43,6 +43,9 @@
 	"notes": "Бележки към доклада",
 	"add-note": "Добавяне на бележка",
 	"no-notes": "Няма споделени бележки.",
+	"delete-note-confirm": "Наистина ли искате да изтриете тази бележка към доклада?",
+	"note-added": "Бележката е добавена",
+	"note-deleted": "Бележката е изтрита",
 
 	"history": "Акаунт и история на докладванията",
 	"no-history": "Няма история на доклада.",
@@ -53,7 +56,11 @@
 	"state-resolved": "Разрешен",
 	"state-rejected": "Отхвърлен",
 	"no-assignee": "Без назначение",
-	"note-added": "Бележката е добавена",
+
+	"sort": "Подреждане по",
+	"sort-newest": "Първо най-новите",
+	"sort-oldest": "Първо най-старите",
+	"sort-reports": "Първо тези с най-много доклади",
 
 	"modal-title": "Докладване на неуместно съдържание",
 	"modal-body": "Моля, посочете причината за докладването на %1 %2 за преглед. Или използвайте някой от бутоните за бързо докладване, ако са приложими.",
@@ -65,5 +72,9 @@
 	"modal-submit-success": "Съдържанието беше докладвано на модераторите.",
 	"modal-submit-confirm": "Потвърждаване на докладването",
 	"modal-submit-confirm-text": "Вече сте описали специалната си причина. Наистина ли искате да изпратите доклада си по бързата процедура?",
-	"modal-submit-confirm-text-help": "Изпращането на доклад по бързата процедура ще премахне описаната от Вас специалната причина."
+	"modal-submit-confirm-text-help": "Изпращането на доклад по бързата процедура ще премахне описаната от Вас специалната причина.",
+
+	"bulk-actions": "Групови действия",
+	"bulk-resolve": "Разрешаване на доклад(и)",
+	"bulk-success": "%1 доклада са обновени"
 }

public/language/bg/modules.json

@@ -1,6 +1,7 @@
 {
     "chat.chatting_with": "Разговор с",
     "chat.placeholder": "Въведете съобщението тук и натиснете Ентер за изпращане",
+    "chat.scroll-up-alert": "В момента разглеждате по-стари съобщения. Щракнете тук, за да се прехвърлите към най-новото съобщение.",
     "chat.send": "Изпращане",
     "chat.no_active": "Нямате текущи разговори.",
     "chat.user_typing": "%1 пише...",
@@ -58,6 +59,7 @@
     "composer.upload-file": "Качване на файл",
     "composer.zen_mode": "Режим Дзен",
     "composer.select_category": "Изберете категория",
+    "composer.textarea.placeholder": "Въведете съдържанието на публикацията си тук. Можете също да влачите и пускате снимки.",
     "bootbox.ok": "Добре",
     "bootbox.cancel": "Отказ",
     "bootbox.confirm": "Потвърждаване",

public/language/bg/topic.json

@@ -36,9 +36,11 @@
     "ban-ip": "Блокиране на IP адреса",
     "view-history": "История на редакциите",
     "bookmark_instructions": "Щракнете тук, за да се върнете към последно прочетената публикация в тази тема.",
-    "flag_post": "Докладване на тази публикация",
-    "flag_user": "Докладване на този потребител",
-    "merged_message": "Тази тема беше слята в <a href=\"/topic/%1\">%2</a>",
+    "flag-post": "Докладване на тази публикация",
+    "flag-user": "Докладване на този потребител",
+    "already-flagged": "Вече е докладвано",
+    "view-flag-report": "Преглед на доклада",
+    "merged_message": "Тази тема беше слята в <a href=\"%1\">%2</a>",
     "deleted_message": "Темата е изтрита. Само потребители с права за управление на темите могат да я видят.",
     "following_topic.message": "Вече ще получавате известия когато някой публикува коментар в тази тема.",
     "not_following_topic.message": "Ще виждате тази тема в списъка с непрочетени теми, но няма да получавате известия, когато хората публикуват нещо в нея.",
@@ -79,7 +81,8 @@
     "thread_tools.purge_confirm": "Наистина ли искате да изчистите тази тема?",
     "thread_tools.merge_topics": "Сливане на темите",
     "thread_tools.merge": "Сливане",
-    "topic_move_success": "Темата беше преместена успешно в %1",
+    "topic_move_success": "Темата беше преместена успешно в %1. Щракнете тук за отмяна.",
+    "topic_move_undone": "Преместването на темата беше отменено",
     "post_delete_confirm": "Наистина ли искате да изтриете тази публикация?",
     "post_restore_confirm": "Наистина ли искате да възстановите тази публикация?",
     "post_purge_confirm": "Наистина ли искате да изчистите тази публикация?",

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

@@ -3,6 +3,7 @@
 	"ip": "IP <strong>%1</strong>",
 	"nodes-responded": "%1 nodes responded within %2ms!",
 	"host": "host",
+	"primary": "primary / run jobs",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "online",

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

@@ -1,7 +1,7 @@
 {
 	"available": "Available Widgets",
 	"explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.",
-	"none-installed": "No widgets found! Activate the essential widgets plugin in the <a href=\"%1\">plugins</a> control panel.",
+	"none-installed": "No widgets found! Activate the widget essentials plugin in the <a href=\"%1\">plugins</a> control panel.",
 	"clone-from": "Clone widgets from",
 	"containers.available": "Available Containers",
 	"containers.explanation": "Drag and drop on top of any active widget",

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

@@ -27,6 +27,8 @@
 	"enable": "Enable",
 	"disable": "Disable",
 	"edit": "Edit",
+	"analytics": "Analytics",
+	"view-category": "View category",
 
 	"select-category": "Select Category",
 	"set-parent-category": "Set Parent Category",
@@ -64,7 +66,6 @@
 	"alert.create-success": "Category successfully created!",
 	"alert.none-active": "You have no active categories.",
 	"alert.create": "Create a Category",
-	"alert.confirm-moderate": "<strong>Are you sure you wish to grant the moderation privilege to this user group?</strong> This group is public, and any users can join at will.",
 	"alert.confirm-purge": "<p class=\"lead\">Do you really want to purge this category \"%1\"?</p><h5><strong class=\"text-danger\">Warning!</strong> All topics and posts in this category will be purged!</h5> <p class=\"help-block\">Purging a category will remove all topics and posts, and delete the category from the database. If you want to remove a category <em>temporarily</em>, you'll want to \"disable\" the category instead.</p>",
 	"alert.purge-success": "Category purged!",
 	"alert.copy-success": "Settings Copied!",
@@ -76,7 +77,9 @@
 	"alert.user-search": "Search for a user here...",
 	"alert.find-group": "Find a Group",
 	"alert.group-search": "Search for a group here...",
+	"alert.not-enough-whitelisted-tags": "Whitelisted tags are less than minimum tags, you need to create more whitelisted tags!",
 	"collapse-all": "Collapse All",
 	"expand-all": "Expand All",
-	"disable-on-create": "Disable on create"
+	"disable-on-create": "Disable on create",
+	"no-matches": "No matches"
 }

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

@@ -8,6 +8,9 @@
 	"hidden": "Hidden",
 	"private": "Private",
 	"edit": "Edit",
+	"delete": "Delete",
+	"privileges": "Privileges",
+	"download-csv": "CSV",
 	"search-placeholder": "Search",
 	"create": "Create Group",
 	"description-placeholder": "A short description about your group",

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

@@ -1,9 +1,9 @@
 {
 	"global": "Global",
-	"global.no-users": "No user-specific global privileges.",
 	"admin": "Admin",
 	"group-privileges": "Group Privileges",
 	"user-privileges": "User Privileges",
+	"edit-privileges": "Edit Privileges",
 	"chat": "Chat",
 	"upload-images": "Upload Images",
 	"upload-files": "Upload Files",
@@ -33,10 +33,20 @@
 	"delete-topics": "Delete Topics",
 	"purge": "Purge",
 	"moderate": "Moderate",
-
 	"admin-dashboard": "Dashboard",
 	"admin-categories": "Categories",
 	"admin-privileges": "Privileges",
 	"admin-users": "Users",
-	"admin-settings": "Settings"
+	"admin-settings": "Settings",
+
+	"alert.confirm-moderate": "<strong>Are you sure you wish to grant the moderation privilege to this user group?</strong> This group is public, and any users can join at will.",
+	"alert.confirm-save": "Please confirm your intention to save these privileges",
+	"alert.saved": "Privilege changes saved and applied",
+	"alert.confirm-discard": "Are you sure you wish to discard your privilege changes?",
+	"alert.discarded": "Privilege changes discarded",
+	"alert.confirm-copyToAll": "Are you sure you wish to apply this privilege set to <strong>all categories</strong>?",
+	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's privilege set to <strong>all categories</strong>?",
+	"alert.confirm-copyToChildren": "Are you sure you wish to apply this privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.no-undo": "<em>This action cannot be undone.</em>"
 }

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

@@ -108,5 +108,5 @@
 
 	"alerts.prompt-email": "Emails: ",
 	"alerts.email-sent-to": "An invitation email has been sent to %1",
-	"alerts.x-users-found": "%1 user(s) found! Search took %2 ms."
+	"alerts.x-users-found": "%1 user(s) found, (%2 seconds)"
 }

public/language/bn/admin/menu.json

@@ -19,7 +19,7 @@
 	"settings/general": "General",
 	"settings/homepage": "Home Page",
 	"settings/navigation": "Navigation",
-	"settings/reputation": "Reputation",
+	"settings/reputation": "Reputation & Flags",
 	"settings/email": "Email",
 	"settings/user": "Users",
 	"settings/group": "Groups",

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

@@ -4,10 +4,7 @@
 	"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
-	"sendmail-rate-limit": "<em>X</em> ইমেইল পাঠাও... ",
-	"sendmail-rate-delta": "... প্রতি<em>X</em> মিলিসেকেন্ডে",
-	"sendmail-rate-help": "NodeBB মেইলার কে নির্দেশ দিন যে একবারে পাঠানো মেইলের সংখ্যা সিমিত রাখতে যাতে ইমেইল গ্রাহক সার্ভিস ওভারলোডেড না হয়ে যায়। এই অপশন কার্যকর হবে না যদি SMTP Transport চালু থাকে (নিচে দেখুন)। ",
-
+	
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Use an external email server to send emails",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -25,6 +22,8 @@
 	"smtp-transport.username": "Username",
 	"smtp-transport.username-help": "<b>For the Gmail service,</b> enter the full email address here, especially if you are using a Google Apps managed domain.",
 	"smtp-transport.password": "Password",
+	"smtp-transport.pool": "Enable pooled connections",
+	"smtp-transport.pool-help": "Pooling connections prevents NodeBB from creating a new connection for every email. This option only applies if SMTP Transport is enabled.",
 
 	"template": "Edit Email Template",
 	"template.select": "Select Email Template",

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

@@ -2,6 +2,5 @@
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
 	"welcome-notification-link": "Welcome Notification Link",
-	"welcome-notification-uid": "Welcome Notification User (UID)",
-	"notification-alert-timeout": "Notification Alert Timeout"
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }

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

@@ -5,10 +5,16 @@
 	"votes-are-public": "All Votes Are Public",
 	"thresholds": "Activity Thresholds",
 	"min-rep-downvote": "Minimum reputation to downvote posts",
+	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
+	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
 	"min-rep-flag": "Minimum reputation to flag posts",
 	"min-rep-website": "Minimum reputation to add \"Website\" to user profile",
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",
 	"min-rep-signature": "Minimum reputation to add \"Signature\" to user profile",
 	"min-rep-profile-picture": "Minimum reputation to add \"Profile Picture\" to user profile",
-	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile"
+	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile",
+
+	"flags": "Flag Settings",
+	"flags.limit-per-target": "Maximum number of times something can be flagged",
+	"flags.limit-per-target-placeholder": "Default: 0"
 }

public/language/bn/error.json

@@ -138,8 +138,13 @@
     "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature",
     "not-enough-reputation-min-rep-profile-picture": "You do not have enough reputation to add a profile picture",
     "not-enough-reputation-min-rep-cover-picture": "You do not have enough reputation to add a cover picture",
-    "already-flagged": "You have already flagged this post",
+    "post-already-flagged": "You have already flagged this post",
+    "user-already-flagged": "You have already flagged this user",
+    "post-flagged-too-many-times": "This post has been flagged by others already",
+    "user-flagged-too-many-times": "This user has been flagged by others already",
     "self-vote": "You cannot vote on your own post",
+    "too-many-downvotes-today": "You can only downvote %1 times a day",
+    "too-many-downvotes-today-user": "You can only downvote a user %1 times a day",
     "reload-failed": "\"%1\" রিলোড করতে সমস্যা হয়েছে। রিলোডের পূর্বে যা করা হয়েছিল সেটি আনডু করা সমীচীন। ",
     "registration-error": "নিবন্ধন এরর!",
     "parse-error": "Something went wrong while parsing server response",
@@ -157,6 +162,7 @@
     "invalid-session-text": "It looks like your login session is no longer active, or no longer matches with the server. Please refresh this page.",
     "no-topics-selected": "No topics selected!",
     "cant-move-to-same-topic": "Can't move post to same topic!",
+    "cant-move-topic-to-same-category": "Can't move topic to the same category!",
     "cannot-block-self": "You cannot block yourself!",
     "cannot-block-privileged": "You cannot block administrators or global moderators",
     "cannot-block-guest": "Guest are not able to block other users",

public/language/bn/flags.json

@@ -1,8 +1,7 @@
 {
 	"state": "State",
-	"reporter": "Reporter",
-	"reported-at": "Reported At",
-	"description": "Description",
+	"reports": "Reports",
+	"first-reported": "First Reported",
 	"no-flags": "Hooray! No flags found.",
 	"assignee": "Assignee",
 	"update": "Update",
@@ -26,6 +25,7 @@
 	"filter-quick-mine": "Assigned to me",
 	"filter-cid-all": "All categories",
 	"apply-filters": "Apply Filters",
+	"more-filters": "More Filters",
 
 	"quick-actions": "Quick Actions",
 	"flagged-user": "Flagged User",
@@ -43,6 +43,9 @@
 	"notes": "Flag Notes",
 	"add-note": "Add Note",
 	"no-notes": "No shared notes.",
+	"delete-note-confirm": "Are you sure you want to delete this flag note?",
+	"note-added": "Note Added",
+	"note-deleted": "Note Deleted",
 
 	"history": "Account & Flag History",
 	"no-history": "No flag history.",
@@ -53,7 +56,11 @@
 	"state-resolved": "Resolved",
 	"state-rejected": "Rejected",
 	"no-assignee": "Not Assigned",
-	"note-added": "Note Added",
+
+	"sort": "Sort by",
+	"sort-newest": "Newest first",
+	"sort-oldest": "Oldest first",
+	"sort-reports": "Most reports",
 
 	"modal-title": "Report Inappropriate Content",
 	"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
@@ -65,5 +72,9 @@
 	"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."
+	"modal-submit-confirm-text-help": "Submitting a quick report will overwrite any custom reasons defined.",
+
+	"bulk-actions": "Bulk Actions",
+	"bulk-resolve": "Resolve Flag(s)",
+	"bulk-success": "%1 flags updated"
 }

public/language/bn/modules.json

@@ -1,6 +1,7 @@
 {
     "chat.chatting_with": "Chat with",
     "chat.placeholder": "এখানে আপনার বার্তা লিখুন। পাঠানোর জন্য Enter চাপুন",
+    "chat.scroll-up-alert": "You are looking at older messages, click here to go to most recent message.",
     "chat.send": "প্রেরন করুন",
     "chat.no_active": "আপনার কোন সচল কথোপকথন নেই",
     "chat.user_typing": "%1 লিখছেন",
@@ -58,6 +59,7 @@
     "composer.upload-file": "Upload File",
     "composer.zen_mode": "Zen Mode",
     "composer.select_category": "Select a category",
+    "composer.textarea.placeholder": "Enter your post content here, drag and drop images",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",

public/language/bn/topic.json

@@ -36,9 +36,11 @@
     "ban-ip": "Ban IP",
     "view-history": "Edit History",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
-    "flag_post": "Flag this post",
-    "flag_user": "Flag this user",
-    "merged_message": "This topic has been merged into <a href=\"/topic/%1\">%2</a>",
+    "flag-post": "Flag this post",
+    "flag-user": "Flag this user",
+    "already-flagged": "Already Flagged",
+    "view-flag-report": "View Flag Report",
+    "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "এই টপিকটি মুছে ফেলা হয়েছে। শুধুমাত্র টপিক ব্যবস্থাপনার ক্ষমতাপ্রাপ্ত সদস্যগণ এটি দেখতে পারবেন।",
     "following_topic.message": "এখন থেকে এই টপিকে অন্যকেউ পোস্ট করলে আপনি নোটিফিকেশন পাবেন।",
     "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
@@ -79,7 +81,8 @@
     "thread_tools.purge_confirm": "আপনি নিশ্চিত যে আপনি টপিকটি পার্জ করতে চাচ্ছেন ? ",
     "thread_tools.merge_topics": "Merge Topics",
     "thread_tools.merge": "Merge",
-    "topic_move_success": "টপিকটি %1  এ সরিয়ে নেয়া হয়েছে",
+    "topic_move_success": "This topic has been successfully moved to %1. Click here to undo.",
+    "topic_move_undone": "Topic move undone",
     "post_delete_confirm": "আপনি নিশ্চিত যে আপনি এই পোষ্টটি মুছে ফেলতে চান ?",
     "post_restore_confirm": "আপনি নিশ্চিত যে আপনি এই পোষ্টটি পুনরূূদ্ধার করতে চান ? ",
     "post_purge_confirm": "আপনি নিশ্চিত যে আপনি এই পোষ্টটি পার্জ করতে চান ? ",

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

@@ -3,6 +3,7 @@
 	"ip": "IP <strong>%1</strong>",
 	"nodes-responded": "%1 vazeb odpovědělo během %2ms.",
 	"host": "host",
+	"primary": "primary / run jobs",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "připojen",

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

@@ -1,7 +1,7 @@
 {
 	"available": "Dostupné miniaplikace",
 	"explanation": "Vyberte si miniaplikaci z vysouvací nabídky a přetáhněte ji do oblasti šablony miniaplikace nalevo.",
-	"none-installed": "Nebyly nalezeny žádné miniaplikace. Aktivujte rozšíření základních miniaplikací v ovládacím panelu <a href=\"%1\">Rozšíření</a>.",
+	"none-installed": "No widgets found! Activate the widget essentials plugin in the <a href=\"%1\">plugins</a> control panel.",
 	"clone-from": "Klonovat miniaplikaci z",
 	"containers.available": "Dostupné moduly",
 	"containers.explanation": "Přetáhněte na jakoukoliv aktivní miniaplikaci",

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

@@ -27,6 +27,8 @@
 	"enable": "Povolit",
 	"disable": "Zakázat",
 	"edit": "Upravit",
+	"analytics": "Analytics",
+	"view-category": "View category",
 
 	"select-category": "Vyberte kategorii",
 	"set-parent-category": "Nastavit nadřazenou kategorii",
@@ -64,7 +66,6 @@
 	"alert.create-success": "Kategorie byla úspěšně vytvořena.",
 	"alert.none-active": "Nemáte žádné aktivní kategorie.",
 	"alert.create": "Vytvořit kategorii",
-	"alert.confirm-moderate": "<strong>Jste si jist/a, že chcete umožnit oprávnění moderovat této skupině uživatelů?</strong> Tato skupina je veřejná a uživatelé se k ní mohou připojit dle libosti.",
 	"alert.confirm-purge": "<p class=\"lead\">Opravdu chcete vyčistit tuto kategorii \"%1\"?</p><h5><strong class=\"text-danger\">Upozornění</strong>Všechny témata a příspěvky v této kategorii budou smazána.</h5><p class=\"help-block\">Smazání kategorie vyjme všechny témata a příspěvky a odstraní kategorii z databáze. Pokud chcete vyjmout kategorii <em>dočasně</em>, raději místo toho kategorii „zakažte”.</p>",
 	"alert.purge-success": "Kategorie byla vyčištěna.",
 	"alert.copy-success": "Nastavení bylo zkopírováno.",
@@ -76,7 +77,9 @@
 	"alert.user-search": "Najít uživatele…",
 	"alert.find-group": "Najít skupinu",
 	"alert.group-search": "Hledat skupinu…",
+	"alert.not-enough-whitelisted-tags": "Whitelisted tags are less than minimum tags, you need to create more whitelisted tags!",
 	"collapse-all": "Sbalit vše",
 	"expand-all": "Rozbalit vše",
-	"disable-on-create": "Zakázat při vytvoření"
+	"disable-on-create": "Zakázat při vytvoření",
+	"no-matches": "No matches"
 }

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

@@ -8,6 +8,9 @@
 	"hidden": "Skrytý",
 	"private": "Soukromí",
 	"edit": "Upravit",
+	"delete": "Delete",
+	"privileges": "Privileges",
+	"download-csv": "CSV",
 	"search-placeholder": "Hledat",
 	"create": "Vytvořit skupinu",
 	"description-placeholder": "Krátký popis skupiny",

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

@@ -1,9 +1,9 @@
 {
 	"global": "Všeobecné",
-	"global.no-users": "Žádné všeobecné uživatelské nastavení.",
 	"admin": "Admin",
 	"group-privileges": "Oprávnění skupiny",
 	"user-privileges": "Oprávnění uživatele",
+	"edit-privileges": "Edit Privileges",
 	"chat": "Konverzace",
 	"upload-images": "Nahrát obrázky",
 	"upload-files": "Náhrát soubory",
@@ -33,10 +33,20 @@
 	"delete-topics": "Odstranit témata",
 	"purge": "Vyčistit",
 	"moderate": "Moderace",
-
 	"admin-dashboard": "Dashboard",
 	"admin-categories": "Categories",
 	"admin-privileges": "Privileges",
 	"admin-users": "Users",
-	"admin-settings": "Settings"
+	"admin-settings": "Settings",
+
+	"alert.confirm-moderate": "<strong>Are you sure you wish to grant the moderation privilege to this user group?</strong> This group is public, and any users can join at will.",
+	"alert.confirm-save": "Please confirm your intention to save these privileges",
+	"alert.saved": "Privilege changes saved and applied",
+	"alert.confirm-discard": "Are you sure you wish to discard your privilege changes?",
+	"alert.discarded": "Privilege changes discarded",
+	"alert.confirm-copyToAll": "Are you sure you wish to apply this privilege set to <strong>all categories</strong>?",
+	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's privilege set to <strong>all categories</strong>?",
+	"alert.confirm-copyToChildren": "Are you sure you wish to apply this privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.no-undo": "<em>This action cannot be undone.</em>"
 }

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

@@ -108,5 +108,5 @@
 
 	"alerts.prompt-email": "E-maily:",
 	"alerts.email-sent-to": "E-mail s pozvánkou byl odeslán na %1",
-	"alerts.x-users-found": "Počet nalezených uživatelů: %1 (hledání trvalo %2 ms)"
+	"alerts.x-users-found": "%1 user(s) found, (%2 seconds)"
 }

public/language/cs/admin/menu.json

@@ -19,7 +19,7 @@
 	"settings/general": "Všeobecné",
 	"settings/homepage": "Home Page",
 	"settings/navigation": "Navigation",
-	"settings/reputation": "Reputace",
+	"settings/reputation": "Reputation & Flags",
 	"settings/email": "E-mail",
 	"settings/user": "Users",
 	"settings/group": "Groups",

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

@@ -4,10 +4,7 @@
 	"address-help": "Následující e-mailové adresy budou zobrazeny  příjemci v políčkách „Od” a „Odpovědět”.",
 	"from": "Jméno – od",
 	"from-help": "Zobrazené jméno v e-mailu v – Od",
-	"sendmail-rate-limit": "Odeslat <em>X</em> e-mailů...",
-	"sendmail-rate-delta": "... každých <em>X</em> milisekund",
-	"sendmail-rate-help": "Instruuje poštovní server NodeBB, aby omezil počet zpráv odeslaných najednou, aby nezahltil službu přijímání e-mailů. Tyto možnosti neplatí, je-li povolena funkce přenosu SMTP (níže).",
-
+	
 	"smtp-transport": "Přenos SMTP",
 	"smtp-transport.enabled": "Pro odesílání e-mailů použít externí e-mailový server ",
 	"smtp-transport-help": "Ze seznamu můžete vybrat známé služby nebo zadat vlastní.",
@@ -25,6 +22,8 @@
 	"smtp-transport.username": "Uživatelské jméno",
 	"smtp-transport.username-help": "<b>Pro službu Gmail,</b> zadejte plnou e-mailovou adresu, zvláště, používáte-li spravovanou doménu Google Apps.",
 	"smtp-transport.password": "Heslo",
+	"smtp-transport.pool": "Enable pooled connections",
+	"smtp-transport.pool-help": "Pooling connections prevents NodeBB from creating a new connection for every email. This option only applies if SMTP Transport is enabled.",
 
 	"template": "Upravit šablonu e-mailu",
 	"template.select": "Vybrat šablonu e-mailu",

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

@@ -2,6 +2,5 @@
 	"notifications": "Oznámení",
 	"welcome-notification": "Uvítání",
 	"welcome-notification-link": "Odkaz na uvítání",
-	"welcome-notification-uid": "Uvítání uživatele (UID)",
-	"notification-alert-timeout": "Čas pro zobrazení oznámení"
+	"welcome-notification-uid": "Uvítání uživatele (UID)"
 }

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

@@ -5,10 +5,16 @@
 	"votes-are-public": "Všechna hlasování jsou veřejná",
 	"thresholds": "Omezení aktivity",
 	"min-rep-downvote": "Minimální reputace pro vyjádření nesouhlasu s příspěvkem",
+	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
+	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
 	"min-rep-flag": "Minimální reputace pro označení příspěvků",
 	"min-rep-website": "Minimální reputace pro přidání „Webové stránky” do uživatelského profilu",
 	"min-rep-aboutme": "Minimální reputace pro přidání „O mně” do uživatelského profilu",
 	"min-rep-signature": "Minimální reputace pro přidání „Podpisu” do uživatelského profilu",
 	"min-rep-profile-picture": "Minimální reputace pro přidání „Profilového obrázku” do uživatelského profilu",
-	"min-rep-cover-picture": "Minimální reputace pro přidání „Obrázku uživatele” do uživatelského profilu"
+	"min-rep-cover-picture": "Minimální reputace pro přidání „Obrázku uživatele” do uživatelského profilu",
+
+	"flags": "Flag Settings",
+	"flags.limit-per-target": "Maximum number of times something can be flagged",
+	"flags.limit-per-target-placeholder": "Default: 0"
 }

public/language/cs/error.json

@@ -138,8 +138,13 @@
     "not-enough-reputation-min-rep-signature": "Pro přidání podpisu nemáte dostatek reputace",
     "not-enough-reputation-min-rep-profile-picture": "Pro přidání profilového obrázku nemáte dostatek reputace",
     "not-enough-reputation-min-rep-cover-picture": "Pro přidání obrázku nemáte dostatek reputace",
-    "already-flagged": "Tento příspěvek jste již označil",
+    "post-already-flagged": "You have already flagged this post",
+    "user-already-flagged": "You have already flagged this user",
+    "post-flagged-too-many-times": "This post has been flagged by others already",
+    "user-flagged-too-many-times": "This user has been flagged by others already",
     "self-vote": "U svého vlastního příspěvku nemůžete hlasovat",
+    "too-many-downvotes-today": "You can only downvote %1 times a day",
+    "too-many-downvotes-today-user": "You can only downvote a user %1 times a day",
     "reload-failed": "Vyskytla se chyba v NodeBB při znovu načtení: \"%1\". NodeBB bude pokračovat v běhu na straně klienta,  nicméně byste měl/a přenastavit zpět to, co jste udělal/a před opětovným načtením.",
     "registration-error": "Chyba při registraci",
     "parse-error": "Při analýze odpovědi serveru nastala chyba",
@@ -157,6 +162,7 @@
     "invalid-session-text": "Zdá se, že vše relace s přihlášením již není aktivní nebo již neodpovídá s relací na serveru. Obnovte prosím tuto stránku.",
     "no-topics-selected": "Žádná vybraná témata.",
     "cant-move-to-same-topic": "Není možné přesunout příspěvek do stejného tématu!",
+    "cant-move-topic-to-same-category": "Can't move topic to the same category!",
     "cannot-block-self": "Nemůžete zablokovat sebe sama!",
     "cannot-block-privileged": "Nemůžete zablokovat správce nebo hlavní moderátory",
     "cannot-block-guest": "Hosté nemohou blokovat ostatní uživatele.",

public/language/cs/flags.json

@@ -1,8 +1,7 @@
 {
 	"state": "Stav",
-	"reporter": "Nahlásil",
-	"reported-at": "Nahlásil v",
-	"description": "Popis",
+	"reports": "Reports",
+	"first-reported": "First Reported",
 	"no-flags": "Hurá, žádné označení.",
 	"assignee": "Nabyvatel",
 	"update": "Aktualizovat",
@@ -26,6 +25,7 @@
 	"filter-quick-mine": "Přiřazeno mě",
 	"filter-cid-all": "Všechny kategorie",
 	"apply-filters": "Použít filtry",
+	"more-filters": "More Filters",
 
 	"quick-actions": "Quick Actions",
 	"flagged-user": "Označený uživatel",
@@ -43,6 +43,9 @@
 	"notes": "Poznámky označení",
 	"add-note": "Přidat poznámku",
 	"no-notes": "Žádné sdílené poznámky.",
+	"delete-note-confirm": "Are you sure you want to delete this flag note?",
+	"note-added": "Poznámka přidána",
+	"note-deleted": "Note Deleted",
 
 	"history": "Account & Flag History",
 	"no-history": "Žádná historie označení.",
@@ -53,7 +56,11 @@
 	"state-resolved": "Vyřešeno",
 	"state-rejected": "Zamítnuto",
 	"no-assignee": "Nepřiřazeno",
-	"note-added": "Poznámka přidána",
+
+	"sort": "Sort by",
+	"sort-newest": "Newest first",
+	"sort-oldest": "Oldest first",
+	"sort-reports": "Most reports",
 
 	"modal-title": "Nahlásit nevhodný obsah",
 	"modal-body": "Zadejte váš důvod k označení %1 %2 pro kontrolu. Nebo použijte tlačítko je-li dostupné.",
@@ -65,5 +72,9 @@
 	"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."
+	"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)",
+	"bulk-success": "%1 flags updated"
 }

public/language/cs/modules.json

@@ -1,6 +1,7 @@
 {
     "chat.chatting_with": "Konverzace s",
     "chat.placeholder": "Konverzační zprávu napište zde, pro odeslání stiskněte klávesu Enter",
+    "chat.scroll-up-alert": "You are looking at older messages, click here to go to most recent message.",
     "chat.send": "Odeslat",
     "chat.no_active": "Nemáte žádné aktivní konverzace.",
     "chat.user_typing": "%1 píše…",
@@ -58,6 +59,7 @@
     "composer.upload-file": "Nahrát soubor",
     "composer.zen_mode": "Režim Zem",
     "composer.select_category": "Vyberte kategorii",
+    "composer.textarea.placeholder": "Enter your post content here, drag and drop images",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Zrušit",
     "bootbox.confirm": "Potvrdit",

public/language/cs/topic.json

@@ -36,9 +36,11 @@
     "ban-ip": "Zakázat IP",
     "view-history": "Upravit historii",
     "bookmark_instructions": "Pro návrat k poslednímu čtenému příspěvku v tématu, klikněte zde.",
-    "flag_post": "Flag this post",
-    "flag_user": "Flag this user",
-    "merged_message": "Toto téma bylo sloučeno do <a href=\"/topic/%1\">%2</a>",
+    "flag-post": "Flag this post",
+    "flag-user": "Flag this user",
+    "already-flagged": "Already Flagged",
+    "view-flag-report": "View Flag Report",
+    "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Toto téma bylo odstraněno. Jen uživatelé s oprávněním správy témat ho mohou vidět.",
     "following_topic.message": "Nyní budete dostávat upozornění, jakmile někdo přidá příspěvek do tohoto tématu.",
     "not_following_topic.message": " Toto téma uvidíte v seznamu nepřečtených témat, ale neobdržíte upozornění, přidá-li někdo nový příspěvek.",
@@ -79,7 +81,8 @@
     "thread_tools.purge_confirm": "Jste si jist/a, že chcete vyčistit toto téma?",
     "thread_tools.merge_topics": "Sloučit témata",
     "thread_tools.merge": "Sloučit",
-    "topic_move_success": "Toto téma bylo úspěšně přesunuto do %1",
+    "topic_move_success": "This topic has been successfully moved to %1. Click here to undo.",
+    "topic_move_undone": "Topic move undone",
     "post_delete_confirm": "Jste si jist/a, že chcete odstranit tento příspěvek?",
     "post_restore_confirm": "Jste si jist/a, že chcete obnovit tento příspěvek?",
     "post_purge_confirm": "Jste si jist/a, že chcete tento příspěvek vyčistit?",

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

@@ -3,6 +3,7 @@
 	"ip": "IP <strong>%1</strong>",
 	"nodes-responded": "%1 nodes responded within %2ms!",
 	"host": "host",
+	"primary": "primary / run jobs",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "online",

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

@@ -1,7 +1,7 @@
 {
 	"available": "Available Widgets",
 	"explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.",
-	"none-installed": "No widgets found! Activate the essential widgets plugin in the <a href=\"%1\">plugins</a> control panel.",
+	"none-installed": "No widgets found! Activate the widget essentials plugin in the <a href=\"%1\">plugins</a> control panel.",
 	"clone-from": "Clone widgets from",
 	"containers.available": "Available Containers",
 	"containers.explanation": "Drag and drop on top of any active widget",

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

@@ -27,6 +27,8 @@
 	"enable": "Enable",
 	"disable": "Disable",
 	"edit": "Edit",
+	"analytics": "Analytics",
+	"view-category": "View category",
 
 	"select-category": "Select Category",
 	"set-parent-category": "Set Parent Category",
@@ -64,7 +66,6 @@
 	"alert.create-success": "Category successfully created!",
 	"alert.none-active": "You have no active categories.",
 	"alert.create": "Create a Category",
-	"alert.confirm-moderate": "<strong>Are you sure you wish to grant the moderation privilege to this user group?</strong> This group is public, and any users can join at will.",
 	"alert.confirm-purge": "<p class=\"lead\">Do you really want to purge this category \"%1\"?</p><h5><strong class=\"text-danger\">Warning!</strong> All topics and posts in this category will be purged!</h5> <p class=\"help-block\">Purging a category will remove all topics and posts, and delete the category from the database. If you want to remove a category <em>temporarily</em>, you'll want to \"disable\" the category instead.</p>",
 	"alert.purge-success": "Category purged!",
 	"alert.copy-success": "Settings Copied!",
@@ -76,7 +77,9 @@
 	"alert.user-search": "Search for a user here...",
 	"alert.find-group": "Find a Group",
 	"alert.group-search": "Search for a group here...",
+	"alert.not-enough-whitelisted-tags": "Whitelisted tags are less than minimum tags, you need to create more whitelisted tags!",
 	"collapse-all": "Collapse All",
 	"expand-all": "Expand All",
-	"disable-on-create": "Disable on create"
+	"disable-on-create": "Disable on create",
+	"no-matches": "No matches"
 }

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

@@ -8,6 +8,9 @@
 	"hidden": "Hidden",
 	"private": "Private",
 	"edit": "Edit",
+	"delete": "Delete",
+	"privileges": "Privileges",
+	"download-csv": "CSV",
 	"search-placeholder": "Search",
 	"create": "Create Group",
 	"description-placeholder": "A short description about your group",

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

@@ -1,9 +1,9 @@
 {
 	"global": "Global",
-	"global.no-users": "No user-specific global privileges.",
 	"admin": "Admin",
 	"group-privileges": "Group Privileges",
 	"user-privileges": "User Privileges",
+	"edit-privileges": "Edit Privileges",
 	"chat": "Chat",
 	"upload-images": "Upload Images",
 	"upload-files": "Upload Files",
@@ -33,10 +33,20 @@
 	"delete-topics": "Delete Topics",
 	"purge": "Purge",
 	"moderate": "Moderate",
-
 	"admin-dashboard": "Dashboard",
 	"admin-categories": "Categories",
 	"admin-privileges": "Privileges",
 	"admin-users": "Users",
-	"admin-settings": "Settings"
+	"admin-settings": "Settings",
+
+	"alert.confirm-moderate": "<strong>Are you sure you wish to grant the moderation privilege to this user group?</strong> This group is public, and any users can join at will.",
+	"alert.confirm-save": "Please confirm your intention to save these privileges",
+	"alert.saved": "Privilege changes saved and applied",
+	"alert.confirm-discard": "Are you sure you wish to discard your privilege changes?",
+	"alert.discarded": "Privilege changes discarded",
+	"alert.confirm-copyToAll": "Are you sure you wish to apply this privilege set to <strong>all categories</strong>?",
+	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's privilege set to <strong>all categories</strong>?",
+	"alert.confirm-copyToChildren": "Are you sure you wish to apply this privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.no-undo": "<em>This action cannot be undone.</em>"
 }

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

@@ -108,5 +108,5 @@
 
 	"alerts.prompt-email": "Emails: ",
 	"alerts.email-sent-to": "An invitation email has been sent to %1",
-	"alerts.x-users-found": "%1 user(s) found! Search took %2 ms."
+	"alerts.x-users-found": "%1 user(s) found, (%2 seconds)"
 }

public/language/da/admin/menu.json

@@ -19,7 +19,7 @@
 	"settings/general": "General",
 	"settings/homepage": "Home Page",
 	"settings/navigation": "Navigation",
-	"settings/reputation": "Reputation",
+	"settings/reputation": "Reputation & Flags",
 	"settings/email": "Email",
 	"settings/user": "Users",
 	"settings/group": "Groups",

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

@@ -4,10 +4,7 @@
 	"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
-	"sendmail-rate-limit": "Send <em>X</em> emails...",
-	"sendmail-rate-delta": "... every <em>X</em> milliseconds",
-	"sendmail-rate-help": "Instructs the NodeBB mailer to limit the number of messages sent at once in order to not overwhelm email receiving services. These options do not apply if SMTP Transport is enabled (below).",
-
+	
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Use an external email server to send emails",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -25,6 +22,8 @@
 	"smtp-transport.username": "Username",
 	"smtp-transport.username-help": "<b>For the Gmail service,</b> enter the full email address here, especially if you are using a Google Apps managed domain.",
 	"smtp-transport.password": "Password",
+	"smtp-transport.pool": "Enable pooled connections",
+	"smtp-transport.pool-help": "Pooling connections prevents NodeBB from creating a new connection for every email. This option only applies if SMTP Transport is enabled.",
 
 	"template": "Edit Email Template",
 	"template.select": "Select Email Template",

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

@@ -2,6 +2,5 @@
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
 	"welcome-notification-link": "Welcome Notification Link",
-	"welcome-notification-uid": "Welcome Notification User (UID)",
-	"notification-alert-timeout": "Notification Alert Timeout"
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }

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

@@ -5,10 +5,16 @@
 	"votes-are-public": "All Votes Are Public",
 	"thresholds": "Activity Thresholds",
 	"min-rep-downvote": "Minimum reputation to downvote posts",
+	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
+	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
 	"min-rep-flag": "Minimum reputation to flag posts",
 	"min-rep-website": "Minimum reputation to add \"Website\" to user profile",
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",
 	"min-rep-signature": "Minimum reputation to add \"Signature\" to user profile",
 	"min-rep-profile-picture": "Minimum reputation to add \"Profile Picture\" to user profile",
-	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile"
+	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile",
+
+	"flags": "Flag Settings",
+	"flags.limit-per-target": "Maximum number of times something can be flagged",
+	"flags.limit-per-target-placeholder": "Default: 0"
 }

public/language/da/error.json

@@ -138,8 +138,13 @@
     "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature",
     "not-enough-reputation-min-rep-profile-picture": "You do not have enough reputation to add a profile picture",
     "not-enough-reputation-min-rep-cover-picture": "You do not have enough reputation to add a cover picture",
-    "already-flagged": "Du har allerede vurderet dette indlæg",
+    "post-already-flagged": "You have already flagged this post",
+    "user-already-flagged": "You have already flagged this user",
+    "post-flagged-too-many-times": "This post has been flagged by others already",
+    "user-flagged-too-many-times": "This user has been flagged by others already",
     "self-vote": "You cannot vote on your own post",
+    "too-many-downvotes-today": "You can only downvote %1 times a day",
+    "too-many-downvotes-today-user": "You can only downvote a user %1 times a day",
     "reload-failed": "NodeBB stødte på et problem under genindlæsningen : \"%1\". NodeBB vil fortsætte med en ældre version, og det er nok god ide at genoptage fra lige før du genindlæste siden.",
     "registration-error": "Registeringsfejl",
     "parse-error": "Noget gik galt under fortolknings er serverens respons",
@@ -157,6 +162,7 @@
     "invalid-session-text": "It looks like your login session is no longer active, or no longer matches with the server. Please refresh this page.",
     "no-topics-selected": "No topics selected!",
     "cant-move-to-same-topic": "Can't move post to same topic!",
+    "cant-move-topic-to-same-category": "Can't move topic to the same category!",
     "cannot-block-self": "You cannot block yourself!",
     "cannot-block-privileged": "You cannot block administrators or global moderators",
     "cannot-block-guest": "Guest are not able to block other users",

public/language/da/flags.json

@@ -1,8 +1,7 @@
 {
 	"state": "State",
-	"reporter": "Reporter",
-	"reported-at": "Reported At",
-	"description": "Description",
+	"reports": "Reports",
+	"first-reported": "First Reported",
 	"no-flags": "Hooray! No flags found.",
 	"assignee": "Assignee",
 	"update": "Update",
@@ -26,6 +25,7 @@
 	"filter-quick-mine": "Assigned to me",
 	"filter-cid-all": "All categories",
 	"apply-filters": "Apply Filters",
+	"more-filters": "More Filters",
 
 	"quick-actions": "Quick Actions",
 	"flagged-user": "Flagged User",
@@ -43,6 +43,9 @@
 	"notes": "Flag Notes",
 	"add-note": "Add Note",
 	"no-notes": "No shared notes.",
+	"delete-note-confirm": "Are you sure you want to delete this flag note?",
+	"note-added": "Note Added",
+	"note-deleted": "Note Deleted",
 
 	"history": "Account & Flag History",
 	"no-history": "No flag history.",
@@ -53,7 +56,11 @@
 	"state-resolved": "Resolved",
 	"state-rejected": "Rejected",
 	"no-assignee": "Not Assigned",
-	"note-added": "Note Added",
+
+	"sort": "Sort by",
+	"sort-newest": "Newest first",
+	"sort-oldest": "Oldest first",
+	"sort-reports": "Most reports",
 
 	"modal-title": "Report Inappropriate Content",
 	"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
@@ -65,5 +72,9 @@
 	"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."
+	"modal-submit-confirm-text-help": "Submitting a quick report will overwrite any custom reasons defined.",
+
+	"bulk-actions": "Bulk Actions",
+	"bulk-resolve": "Resolve Flag(s)",
+	"bulk-success": "%1 flags updated"
 }

public/language/da/modules.json

@@ -1,6 +1,7 @@
 {
     "chat.chatting_with": "Chat with",
     "chat.placeholder": "Skriv din chatbesked her, tryk enter for at sende",
+    "chat.scroll-up-alert": "You are looking at older messages, click here to go to most recent message.",
     "chat.send": "Send",
     "chat.no_active": "Du har ingen aktive chats.",
     "chat.user_typing": "%1 skriver ...",
@@ -58,6 +59,7 @@
     "composer.upload-file": "Upload File",
     "composer.zen_mode": "Zen Mode",
     "composer.select_category": "Select a category",
+    "composer.textarea.placeholder": "Enter your post content here, drag and drop images",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Annuller",
     "bootbox.confirm": "Bekræft",

public/language/da/topic.json

@@ -36,9 +36,11 @@
     "ban-ip": "Ban IP",
     "view-history": "Edit History",
     "bookmark_instructions": "Klik her for at vende tilbage til den sidst læste indlæg i denne tråd.",
-    "flag_post": "Flag this post",
-    "flag_user": "Flag this user",
-    "merged_message": "This topic has been merged into <a href=\"/topic/%1\">%2</a>",
+    "flag-post": "Flag this post",
+    "flag-user": "Flag this user",
+    "already-flagged": "Already Flagged",
+    "view-flag-report": "View Flag Report",
+    "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Denne tråd er blevet slettet. Kun brugere med emne behandlings privilegier kan se den.",
     "following_topic.message": "Du vil nu modtage notifikationer når nogle skriver et indlæg i dette emne.",
     "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
@@ -79,7 +81,8 @@
     "thread_tools.purge_confirm": "Er du sikker på at du vil udrense denne tråd?",
     "thread_tools.merge_topics": "Merge Topics",
     "thread_tools.merge": "Merge",
-    "topic_move_success": "Denne tråd blev flyttet til %1",
+    "topic_move_success": "This topic has been successfully moved to %1. Click here to undo.",
+    "topic_move_undone": "Topic move undone",
     "post_delete_confirm": "Er du sikker på at du vil slette dette indlæg?",
     "post_restore_confirm": "Er du sikker på at du vil gendanne dette indlæg?",
     "post_purge_confirm": "Er du sikker på at du vil udradere dette indlæg?",

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

@@ -3,6 +3,7 @@
 	"ip": "IP <strong>%1</strong>",
 	"nodes-responded": "%1 Knoten antworteten innerhalb von %2ms",
 	"host": "Host",
+	"primary": "primary / run jobs",
 	"pid": "PID",
 	"nodejs": "Node.js Version",
 	"online": "Online",

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": "Keine Widgets gefunden! Aktiviere das \"Essential Widgets\"-Plugin in den <a href=\"%1\">Plugin-Einstellungen</a>.",
+	"none-installed": "No widgets found! Activate the widget essentials plugin in the <a href=\"%1\">plugins</a> control panel.",
 	"clone-from": "Klone Widget von",
 	"containers.available": "Verfügbare Container",
 	"containers.explanation": "Auf ein beliebiges aktives Widget ziehen",

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

@@ -27,6 +27,8 @@
 	"enable": "Aktivieren",
 	"disable": "Deaktivieren",
 	"edit": "Bearbeiten",
+	"analytics": "Analytics",
+	"view-category": "View category",
 
 	"select-category": "Kategorie auswählen",
 	"set-parent-category": "Übergeordnete Kategorie festlegen",
@@ -64,7 +66,6 @@
 	"alert.create-success": "Kategorie erfolgreich erstellt!",
 	"alert.none-active": "Du hast keine aktiven Kategorien.",
 	"alert.create": "Erstelle eine Kategorie",
-	"alert.confirm-moderate": "<strong>Bist du sicher, dass du dieser Gruppe das Moderationsrecht gewähren möchtest?</strong> Diese Gruppe ist öffentlich, und alle Benutzer können nach Belieben beitreten.",
 	"alert.confirm-purge": "<p class=\"lead\">Möchtest du die Kategorie \"%1\" wirklich löschen?</p><h5><strong class=\"text-danger\">Warnung!</strong> Alle Themen und Beiträge in dieser Kategorie werden gelöscht!</h5> <p class=\"help-block\">Löschen einer Kategorie wird alle Themen und Beiträge zu entfernen, und die Kategorie aus der Datenbank löschen. Falls du eine Kategorie <em>temporär</em> entfernen möchstest, dann kannst du sie stattdessen \"deaktivieren\".",
 	"alert.purge-success": "Kategorie gelöscht!",
 	"alert.copy-success": "Einstellungen kopiert!",
@@ -76,7 +77,9 @@
 	"alert.user-search": "Hier nach einem Benutzer suchen...",
 	"alert.find-group": "Gruppe finden",
 	"alert.group-search": "Hier nach einer Gruppe suchen...",
+	"alert.not-enough-whitelisted-tags": "Whitelisted tags are less than minimum tags, you need to create more whitelisted tags!",
 	"collapse-all": "Alle einklappen",
 	"expand-all": "Alle ausklappen",
-	"disable-on-create": "Deaktiviere beim erstellen"
+	"disable-on-create": "Deaktiviere beim erstellen",
+	"no-matches": "No matches"
 }

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

@@ -8,6 +8,9 @@
 	"hidden": "Hidden",
 	"private": "Private",
 	"edit": "Ändern",
+	"delete": "Delete",
+	"privileges": "Privileges",
+	"download-csv": "CSV",
 	"search-placeholder": "Suchen",
 	"create": "Gruppe erstellen",
 	"description-placeholder": "Eine kurze Beschreibung deiner Gruppe",

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

@@ -1,9 +1,9 @@
 {
 	"global": "Global",
-	"global.no-users": "Keine benutzerspezifischen globalen Berechtigungen",
 	"admin": "Admin",
 	"group-privileges": "Group Privileges",
 	"user-privileges": "User Privileges",
+	"edit-privileges": "Edit Privileges",
 	"chat": "Chat",
 	"upload-images": "Bilder hochladen",
 	"upload-files": "Dateien hochladen",
@@ -33,10 +33,20 @@
 	"delete-topics": "Themen entfernen",
 	"purge": "Endgültig löschen",
 	"moderate": "Moderieren",
-
 	"admin-dashboard": "Dashboard",
 	"admin-categories": "Categories",
 	"admin-privileges": "Privileges",
 	"admin-users": "Users",
-	"admin-settings": "Settings"
+	"admin-settings": "Settings",
+
+	"alert.confirm-moderate": "<strong>Are you sure you wish to grant the moderation privilege to this user group?</strong> This group is public, and any users can join at will.",
+	"alert.confirm-save": "Please confirm your intention to save these privileges",
+	"alert.saved": "Privilege changes saved and applied",
+	"alert.confirm-discard": "Are you sure you wish to discard your privilege changes?",
+	"alert.discarded": "Privilege changes discarded",
+	"alert.confirm-copyToAll": "Are you sure you wish to apply this privilege set to <strong>all categories</strong>?",
+	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's privilege set to <strong>all categories</strong>?",
+	"alert.confirm-copyToChildren": "Are you sure you wish to apply this privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's privilege set to <strong>all descendant (child) categories</strong>?",
+	"alert.no-undo": "<em>This action cannot be undone.</em>"
 }

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

@@ -108,5 +108,5 @@
 
 	"alerts.prompt-email": "E-Mails:",
 	"alerts.email-sent-to": "Eine Einladungsemail wurde an %1 gesendet",
-	"alerts.x-users-found": "%1 Nutzer gefunden! Die Suche dauerte %2ms."
+	"alerts.x-users-found": "%1 user(s) found, (%2 seconds)"
 }

public/language/de/admin/menu.json

@@ -19,7 +19,7 @@
 	"settings/general": "Allgemein",
 	"settings/homepage": "Home Page",
 	"settings/navigation": "Navigation",
-	"settings/reputation": "Reputation",
+	"settings/reputation": "Reputation & Flags",
 	"settings/email": "E-Mail",
 	"settings/user": "Users",
 	"settings/group": "Groups",

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

@@ -4,10 +4,7 @@
 	"address-help": "Die folgende E-Mail Adresse ist die E-Mail Adresse, welche dem Empfänger im \"Von\" und \"Antworten\" Bereich sehen wird.",
 	"from": "Name des Absenders",
 	"from-help": "Der Name des Absenders, welcher in der E-Mail angezeigt werden soll.",
-	"sendmail-rate-limit": "Send <em>X</em> emails...",
-	"sendmail-rate-delta": "... every <em>X</em> milliseconds",
-	"sendmail-rate-help": "Instructs the NodeBB mailer to limit the number of messages sent at once in order to not overwhelm email receiving services. These options do not apply if SMTP Transport is enabled (below).",
-
+	
 	"smtp-transport": "SMTP Konfiguration",
 	"smtp-transport.enabled": "Benutze einen externen Email-Server",
 	"smtp-transport-help": "Du kannst aus einer Liste bekannter Email-Provider auswählen, oder einen benutzerdefinierten eingeben.",
@@ -25,6 +22,8 @@
 	"smtp-transport.username": "Benutzername",
 	"smtp-transport.username-help": "Bitte füge die komplette Email-Adresse <b>für Gmail</b> hier ein, insbesondere wenn du eine von Google Apps gemanagete domain verwendest.",
 	"smtp-transport.password": "Passwort",
+	"smtp-transport.pool": "Enable pooled connections",
+	"smtp-transport.pool-help": "Pooling connections prevents NodeBB from creating a new connection for every email. This option only applies if SMTP Transport is enabled.",
 
 	"template": "E-Mail Vorlage bearbeiten",
 	"template.select": "E-Mail Vorlage auswählen",