chore: incrementing version number - v1.14.0-5

allow selecting main topic to merge into
allow specifying a new title for merge topic
upon merge go to correct topic
new tests for merging with options

.eslintrc

@@ -24,7 +24,7 @@
 		"consistent-return": "off",
 		"func-names": "off",
 		"no-tabs": "off",
-		"indent": ["error", "tab"],
+		"indent": ["error", "tab", { "SwitchCase": 1 }],
 		"no-eq-null": "off",
 		"camelcase": "off",
 		"no-new": "off",

.gitignore

@@ -67,3 +67,4 @@ test/files/normalise.jpg.png
 test/files/normalise-resized.jpg
 package-lock.json
 /package.json
+*.mongodb

.tx/config

@@ -1850,304 +1850,304 @@ trans.zh_CN = public/language/zh-CN/admin/extend/widgets.json
 trans.zh_TW = public/language/zh-TW/admin/extend/widgets.json
 type = KEYVALUEJSON
 
-[nodebb.admin-general-dashboard]
-file_filter = public/language/<lang>/admin/general/dashboard.json
-source_file = public/language/en-GB/admin/general/dashboard.json
+[nodebb.admin-dashboard]
+file_filter = public/language/<lang>/admin/dashboard.json
+source_file = public/language/en-GB/admin/dashboard.json
 source_lang = en_GB
-trans.ar = public/language/ar/admin/general/dashboard.json
-trans.bg = public/language/bg/admin/general/dashboard.json
-trans.bn = public/language/bn/admin/general/dashboard.json
-trans.cs = public/language/cs/admin/general/dashboard.json
-trans.da = public/language/da/admin/general/dashboard.json
-trans.de = public/language/de/admin/general/dashboard.json
-trans.el = public/language/el/admin/general/dashboard.json
-trans.en@pirate = public/language/en-x-pirate/admin/general/dashboard.json
-trans.en_US = public/language/en-US/admin/general/dashboard.json
-trans.es = public/language/es/admin/general/dashboard.json
-trans.et = public/language/et/admin/general/dashboard.json
-trans.fa_IR = public/language/fa-IR/admin/general/dashboard.json
-trans.fi = public/language/fi/admin/general/dashboard.json
-trans.fr = public/language/fr/admin/general/dashboard.json
-trans.gl = public/language/gl/admin/general/dashboard.json
-trans.he = public/language/he/admin/general/dashboard.json
-trans.hr = public/language/hr/admin/general/dashboard.json
-trans.hu = public/language/hu/admin/general/dashboard.json
-trans.id = public/language/id/admin/general/dashboard.json
-trans.it = public/language/it/admin/general/dashboard.json
-trans.ja = public/language/ja/admin/general/dashboard.json
-trans.ko = public/language/ko/admin/general/dashboard.json
-trans.lt = public/language/lt/admin/general/dashboard.json
-trans.lv = public/language/lv/admin/general/dashboard.json
-trans.ms = public/language/ms/admin/general/dashboard.json
-trans.nb = public/language/nb/admin/general/dashboard.json
-trans.nl = public/language/nl/admin/general/dashboard.json
-trans.pl = public/language/pl/admin/general/dashboard.json
-trans.pt_BR = public/language/pt-BR/admin/general/dashboard.json
-trans.pt_PT = public/language/pt-PT/admin/general/dashboard.json
-trans.ro = public/language/ro/admin/general/dashboard.json
-trans.ru = public/language/ru/admin/general/dashboard.json
-trans.rw = public/language/rw/admin/general/dashboard.json
-trans.sc = public/language/sc/admin/general/dashboard.json
-trans.sk = public/language/sk/admin/general/dashboard.json
-trans.sl = public/language/sl/admin/general/dashboard.json
-trans.sr = public/language/sr/admin/general/dashboard.json
-trans.sv = public/language/sv/admin/general/dashboard.json
-trans.th = public/language/th/admin/general/dashboard.json
-trans.tr = public/language/tr/admin/general/dashboard.json
-trans.uk = public/language/uk/admin/general/dashboard.json
-trans.vi = public/language/vi/admin/general/dashboard.json
-trans.zh_CN = public/language/zh-CN/admin/general/dashboard.json
-trans.zh_TW = public/language/zh-TW/admin/general/dashboard.json
+trans.ar = public/language/ar/admin/dashboard.json
+trans.bg = public/language/bg/admin/dashboard.json
+trans.bn = public/language/bn/admin/dashboard.json
+trans.cs = public/language/cs/admin/dashboard.json
+trans.da = public/language/da/admin/dashboard.json
+trans.de = public/language/de/admin/dashboard.json
+trans.el = public/language/el/admin/dashboard.json
+trans.en@pirate = public/language/en-x-pirate/admin/dashboard.json
+trans.en_US = public/language/en-US/admin/dashboard.json
+trans.es = public/language/es/admin/dashboard.json
+trans.et = public/language/et/admin/dashboard.json
+trans.fa_IR = public/language/fa-IR/admin/dashboard.json
+trans.fi = public/language/fi/admin/dashboard.json
+trans.fr = public/language/fr/admin/dashboard.json
+trans.gl = public/language/gl/admin/dashboard.json
+trans.he = public/language/he/admin/dashboard.json
+trans.hr = public/language/hr/admin/dashboard.json
+trans.hu = public/language/hu/admin/dashboard.json
+trans.id = public/language/id/admin/dashboard.json
+trans.it = public/language/it/admin/dashboard.json
+trans.ja = public/language/ja/admin/dashboard.json
+trans.ko = public/language/ko/admin/dashboard.json
+trans.lt = public/language/lt/admin/dashboard.json
+trans.lv = public/language/lv/admin/dashboard.json
+trans.ms = public/language/ms/admin/dashboard.json
+trans.nb = public/language/nb/admin/dashboard.json
+trans.nl = public/language/nl/admin/dashboard.json
+trans.pl = public/language/pl/admin/dashboard.json
+trans.pt_BR = public/language/pt-BR/admin/dashboard.json
+trans.pt_PT = public/language/pt-PT/admin/dashboard.json
+trans.ro = public/language/ro/admin/dashboard.json
+trans.ru = public/language/ru/admin/dashboard.json
+trans.rw = public/language/rw/admin/dashboard.json
+trans.sc = public/language/sc/admin/dashboard.json
+trans.sk = public/language/sk/admin/dashboard.json
+trans.sl = public/language/sl/admin/dashboard.json
+trans.sr = public/language/sr/admin/dashboard.json
+trans.sv = public/language/sv/admin/dashboard.json
+trans.th = public/language/th/admin/dashboard.json
+trans.tr = public/language/tr/admin/dashboard.json
+trans.uk = public/language/uk/admin/dashboard.json
+trans.vi = public/language/vi/admin/dashboard.json
+trans.zh_CN = public/language/zh-CN/admin/dashboard.json
+trans.zh_TW = public/language/zh-TW/admin/dashboard.json
 type = KEYVALUEJSON
 
-[nodebb.admin-general-homepage]
-file_filter = public/language/<lang>/admin/general/homepage.json
-source_file = public/language/en-GB/admin/general/homepage.json
+[nodebb.admin-settings-homepage]
+file_filter = public/language/<lang>/admin/settings/homepage.json
+source_file = public/language/en-GB/admin/settings/homepage.json
 source_lang = en_GB
-trans.ar = public/language/ar/admin/general/homepage.json
-trans.bg = public/language/bg/admin/general/homepage.json
-trans.bn = public/language/bn/admin/general/homepage.json
-trans.cs = public/language/cs/admin/general/homepage.json
-trans.da = public/language/da/admin/general/homepage.json
-trans.de = public/language/de/admin/general/homepage.json
-trans.el = public/language/el/admin/general/homepage.json
-trans.en@pirate = public/language/en-x-pirate/admin/general/homepage.json
-trans.en_US = public/language/en-US/admin/general/homepage.json
-trans.es = public/language/es/admin/general/homepage.json
-trans.et = public/language/et/admin/general/homepage.json
-trans.fa_IR = public/language/fa-IR/admin/general/homepage.json
-trans.fi = public/language/fi/admin/general/homepage.json
-trans.fr = public/language/fr/admin/general/homepage.json
-trans.gl = public/language/gl/admin/general/homepage.json
-trans.he = public/language/he/admin/general/homepage.json
-trans.hr = public/language/hr/admin/general/homepage.json
-trans.hu = public/language/hu/admin/general/homepage.json
-trans.id = public/language/id/admin/general/homepage.json
-trans.it = public/language/it/admin/general/homepage.json
-trans.ja = public/language/ja/admin/general/homepage.json
-trans.ko = public/language/ko/admin/general/homepage.json
-trans.lt = public/language/lt/admin/general/homepage.json
-trans.lv = public/language/lv/admin/general/homepage.json
-trans.ms = public/language/ms/admin/general/homepage.json
-trans.nb = public/language/nb/admin/general/homepage.json
-trans.nl = public/language/nl/admin/general/homepage.json
-trans.pl = public/language/pl/admin/general/homepage.json
-trans.pt_BR = public/language/pt-BR/admin/general/homepage.json
-trans.pt_PT = public/language/pt-PT/admin/general/homepage.json
-trans.ro = public/language/ro/admin/general/homepage.json
-trans.ru = public/language/ru/admin/general/homepage.json
-trans.rw = public/language/rw/admin/general/homepage.json
-trans.sc = public/language/sc/admin/general/homepage.json
-trans.sk = public/language/sk/admin/general/homepage.json
-trans.sl = public/language/sl/admin/general/homepage.json
-trans.sr = public/language/sr/admin/general/homepage.json
-trans.sv = public/language/sv/admin/general/homepage.json
-trans.th = public/language/th/admin/general/homepage.json
-trans.tr = public/language/tr/admin/general/homepage.json
-trans.uk = public/language/uk/admin/general/homepage.json
-trans.vi = public/language/vi/admin/general/homepage.json
-trans.zh_CN = public/language/zh-CN/admin/general/homepage.json
-trans.zh_TW = public/language/zh-TW/admin/general/homepage.json
+trans.ar = public/language/ar/admin/settings/homepage.json
+trans.bg = public/language/bg/admin/settings/homepage.json
+trans.bn = public/language/bn/admin/settings/homepage.json
+trans.cs = public/language/cs/admin/settings/homepage.json
+trans.da = public/language/da/admin/settings/homepage.json
+trans.de = public/language/de/admin/settings/homepage.json
+trans.el = public/language/el/admin/settings/homepage.json
+trans.en@pirate = public/language/en-x-pirate/admin/settings/homepage.json
+trans.en_US = public/language/en-US/admin/settings/homepage.json
+trans.es = public/language/es/admin/settings/homepage.json
+trans.et = public/language/et/admin/settings/homepage.json
+trans.fa_IR = public/language/fa-IR/admin/settings/homepage.json
+trans.fi = public/language/fi/admin/settings/homepage.json
+trans.fr = public/language/fr/admin/settings/homepage.json
+trans.gl = public/language/gl/admin/settings/homepage.json
+trans.he = public/language/he/admin/settings/homepage.json
+trans.hr = public/language/hr/admin/settings/homepage.json
+trans.hu = public/language/hu/admin/settings/homepage.json
+trans.id = public/language/id/admin/settings/homepage.json
+trans.it = public/language/it/admin/settings/homepage.json
+trans.ja = public/language/ja/admin/settings/homepage.json
+trans.ko = public/language/ko/admin/settings/homepage.json
+trans.lt = public/language/lt/admin/settings/homepage.json
+trans.lv = public/language/lv/admin/settings/homepage.json
+trans.ms = public/language/ms/admin/settings/homepage.json
+trans.nb = public/language/nb/admin/settings/homepage.json
+trans.nl = public/language/nl/admin/settings/homepage.json
+trans.pl = public/language/pl/admin/settings/homepage.json
+trans.pt_BR = public/language/pt-BR/admin/settings/homepage.json
+trans.pt_PT = public/language/pt-PT/admin/settings/homepage.json
+trans.ro = public/language/ro/admin/settings/homepage.json
+trans.ru = public/language/ru/admin/settings/homepage.json
+trans.rw = public/language/rw/admin/settings/homepage.json
+trans.sc = public/language/sc/admin/settings/homepage.json
+trans.sk = public/language/sk/admin/settings/homepage.json
+trans.sl = public/language/sl/admin/settings/homepage.json
+trans.sr = public/language/sr/admin/settings/homepage.json
+trans.sv = public/language/sv/admin/settings/homepage.json
+trans.th = public/language/th/admin/settings/homepage.json
+trans.tr = public/language/tr/admin/settings/homepage.json
+trans.uk = public/language/uk/admin/settings/homepage.json
+trans.vi = public/language/vi/admin/settings/homepage.json
+trans.zh_CN = public/language/zh-CN/admin/settings/homepage.json
+trans.zh_TW = public/language/zh-TW/admin/settings/homepage.json
 type = KEYVALUEJSON
 
-[nodebb.admin-general-languages]
-file_filter = public/language/<lang>/admin/general/languages.json
-source_file = public/language/en-GB/admin/general/languages.json
+[nodebb.admin-settings-languages]
+file_filter = public/language/<lang>/admin/settings/languages.json
+source_file = public/language/en-GB/admin/settings/languages.json
 source_lang = en_GB
-trans.ar = public/language/ar/admin/general/languages.json
-trans.bg = public/language/bg/admin/general/languages.json
-trans.bn = public/language/bn/admin/general/languages.json
-trans.cs = public/language/cs/admin/general/languages.json
-trans.da = public/language/da/admin/general/languages.json
-trans.de = public/language/de/admin/general/languages.json
-trans.el = public/language/el/admin/general/languages.json
-trans.en@pirate = public/language/en-x-pirate/admin/general/languages.json
-trans.en_US = public/language/en-US/admin/general/languages.json
-trans.es = public/language/es/admin/general/languages.json
-trans.et = public/language/et/admin/general/languages.json
-trans.fa_IR = public/language/fa-IR/admin/general/languages.json
-trans.fi = public/language/fi/admin/general/languages.json
-trans.fr = public/language/fr/admin/general/languages.json
-trans.gl = public/language/gl/admin/general/languages.json
-trans.he = public/language/he/admin/general/languages.json
-trans.hr = public/language/hr/admin/general/languages.json
-trans.hu = public/language/hu/admin/general/languages.json
-trans.id = public/language/id/admin/general/languages.json
-trans.it = public/language/it/admin/general/languages.json
-trans.ja = public/language/ja/admin/general/languages.json
-trans.ko = public/language/ko/admin/general/languages.json
-trans.lt = public/language/lt/admin/general/languages.json
-trans.lv = public/language/lv/admin/general/languages.json
-trans.ms = public/language/ms/admin/general/languages.json
-trans.nb = public/language/nb/admin/general/languages.json
-trans.nl = public/language/nl/admin/general/languages.json
-trans.pl = public/language/pl/admin/general/languages.json
-trans.pt_BR = public/language/pt-BR/admin/general/languages.json
-trans.pt_PT = public/language/pt-PT/admin/general/languages.json
-trans.ro = public/language/ro/admin/general/languages.json
-trans.ru = public/language/ru/admin/general/languages.json
-trans.rw = public/language/rw/admin/general/languages.json
-trans.sc = public/language/sc/admin/general/languages.json
-trans.sk = public/language/sk/admin/general/languages.json
-trans.sl = public/language/sl/admin/general/languages.json
-trans.sr = public/language/sr/admin/general/languages.json
-trans.sv = public/language/sv/admin/general/languages.json
-trans.th = public/language/th/admin/general/languages.json
-trans.tr = public/language/tr/admin/general/languages.json
-trans.uk = public/language/uk/admin/general/languages.json
-trans.vi = public/language/vi/admin/general/languages.json
-trans.zh_CN = public/language/zh-CN/admin/general/languages.json
-trans.zh_TW = public/language/zh-TW/admin/general/languages.json
+trans.ar = public/language/ar/admin/settings/languages.json
+trans.bg = public/language/bg/admin/settings/languages.json
+trans.bn = public/language/bn/admin/settings/languages.json
+trans.cs = public/language/cs/admin/settings/languages.json
+trans.da = public/language/da/admin/settings/languages.json
+trans.de = public/language/de/admin/settings/languages.json
+trans.el = public/language/el/admin/settings/languages.json
+trans.en@pirate = public/language/en-x-pirate/admin/settings/languages.json
+trans.en_US = public/language/en-US/admin/settings/languages.json
+trans.es = public/language/es/admin/settings/languages.json
+trans.et = public/language/et/admin/settings/languages.json
+trans.fa_IR = public/language/fa-IR/admin/settings/languages.json
+trans.fi = public/language/fi/admin/settings/languages.json
+trans.fr = public/language/fr/admin/settings/languages.json
+trans.gl = public/language/gl/admin/settings/languages.json
+trans.he = public/language/he/admin/settings/languages.json
+trans.hr = public/language/hr/admin/settings/languages.json
+trans.hu = public/language/hu/admin/settings/languages.json
+trans.id = public/language/id/admin/settings/languages.json
+trans.it = public/language/it/admin/settings/languages.json
+trans.ja = public/language/ja/admin/settings/languages.json
+trans.ko = public/language/ko/admin/settings/languages.json
+trans.lt = public/language/lt/admin/settings/languages.json
+trans.lv = public/language/lv/admin/settings/languages.json
+trans.ms = public/language/ms/admin/settings/languages.json
+trans.nb = public/language/nb/admin/settings/languages.json
+trans.nl = public/language/nl/admin/settings/languages.json
+trans.pl = public/language/pl/admin/settings/languages.json
+trans.pt_BR = public/language/pt-BR/admin/settings/languages.json
+trans.pt_PT = public/language/pt-PT/admin/settings/languages.json
+trans.ro = public/language/ro/admin/settings/languages.json
+trans.ru = public/language/ru/admin/settings/languages.json
+trans.rw = public/language/rw/admin/settings/languages.json
+trans.sc = public/language/sc/admin/settings/languages.json
+trans.sk = public/language/sk/admin/settings/languages.json
+trans.sl = public/language/sl/admin/settings/languages.json
+trans.sr = public/language/sr/admin/settings/languages.json
+trans.sv = public/language/sv/admin/settings/languages.json
+trans.th = public/language/th/admin/settings/languages.json
+trans.tr = public/language/tr/admin/settings/languages.json
+trans.uk = public/language/uk/admin/settings/languages.json
+trans.vi = public/language/vi/admin/settings/languages.json
+trans.zh_CN = public/language/zh-CN/admin/settings/languages.json
+trans.zh_TW = public/language/zh-TW/admin/settings/languages.json
 type = KEYVALUEJSON
 
-[nodebb.admin-general-navigation]
-file_filter = public/language/<lang>/admin/general/navigation.json
-source_file = public/language/en-GB/admin/general/navigation.json
+[nodebb.admin-settings-navigation]
+file_filter = public/language/<lang>/admin/settings/navigation.json
+source_file = public/language/en-GB/admin/settings/navigation.json
 source_lang = en_GB
-trans.ar = public/language/ar/admin/general/navigation.json
-trans.bg = public/language/bg/admin/general/navigation.json
-trans.bn = public/language/bn/admin/general/navigation.json
-trans.cs = public/language/cs/admin/general/navigation.json
-trans.da = public/language/da/admin/general/navigation.json
-trans.de = public/language/de/admin/general/navigation.json
-trans.el = public/language/el/admin/general/navigation.json
-trans.en@pirate = public/language/en-x-pirate/admin/general/navigation.json
-trans.en_US = public/language/en-US/admin/general/navigation.json
-trans.es = public/language/es/admin/general/navigation.json
-trans.et = public/language/et/admin/general/navigation.json
-trans.fa_IR = public/language/fa-IR/admin/general/navigation.json
-trans.fi = public/language/fi/admin/general/navigation.json
-trans.fr = public/language/fr/admin/general/navigation.json
-trans.gl = public/language/gl/admin/general/navigation.json
-trans.he = public/language/he/admin/general/navigation.json
-trans.hr = public/language/hr/admin/general/navigation.json
-trans.hu = public/language/hu/admin/general/navigation.json
-trans.id = public/language/id/admin/general/navigation.json
-trans.it = public/language/it/admin/general/navigation.json
-trans.ja = public/language/ja/admin/general/navigation.json
-trans.ko = public/language/ko/admin/general/navigation.json
-trans.lt = public/language/lt/admin/general/navigation.json
-trans.lv = public/language/lv/admin/general/navigation.json
-trans.ms = public/language/ms/admin/general/navigation.json
-trans.nb = public/language/nb/admin/general/navigation.json
-trans.nl = public/language/nl/admin/general/navigation.json
-trans.pl = public/language/pl/admin/general/navigation.json
-trans.pt_BR = public/language/pt-BR/admin/general/navigation.json
-trans.pt_PT = public/language/pt-PT/admin/general/navigation.json
-trans.ro = public/language/ro/admin/general/navigation.json
-trans.ru = public/language/ru/admin/general/navigation.json
-trans.rw = public/language/rw/admin/general/navigation.json
-trans.sc = public/language/sc/admin/general/navigation.json
-trans.sk = public/language/sk/admin/general/navigation.json
-trans.sl = public/language/sl/admin/general/navigation.json
-trans.sr = public/language/sr/admin/general/navigation.json
-trans.sv = public/language/sv/admin/general/navigation.json
-trans.th = public/language/th/admin/general/navigation.json
-trans.tr = public/language/tr/admin/general/navigation.json
-trans.uk = public/language/uk/admin/general/navigation.json
-trans.vi = public/language/vi/admin/general/navigation.json
-trans.zh_CN = public/language/zh-CN/admin/general/navigation.json
-trans.zh_TW = public/language/zh-TW/admin/general/navigation.json
+trans.ar = public/language/ar/admin/settings/navigation.json
+trans.bg = public/language/bg/admin/settings/navigation.json
+trans.bn = public/language/bn/admin/settings/navigation.json
+trans.cs = public/language/cs/admin/settings/navigation.json
+trans.da = public/language/da/admin/settings/navigation.json
+trans.de = public/language/de/admin/settings/navigation.json
+trans.el = public/language/el/admin/settings/navigation.json
+trans.en@pirate = public/language/en-x-pirate/admin/settings/navigation.json
+trans.en_US = public/language/en-US/admin/settings/navigation.json
+trans.es = public/language/es/admin/settings/navigation.json
+trans.et = public/language/et/admin/settings/navigation.json
+trans.fa_IR = public/language/fa-IR/admin/settings/navigation.json
+trans.fi = public/language/fi/admin/settings/navigation.json
+trans.fr = public/language/fr/admin/settings/navigation.json
+trans.gl = public/language/gl/admin/settings/navigation.json
+trans.he = public/language/he/admin/settings/navigation.json
+trans.hr = public/language/hr/admin/settings/navigation.json
+trans.hu = public/language/hu/admin/settings/navigation.json
+trans.id = public/language/id/admin/settings/navigation.json
+trans.it = public/language/it/admin/settings/navigation.json
+trans.ja = public/language/ja/admin/settings/navigation.json
+trans.ko = public/language/ko/admin/settings/navigation.json
+trans.lt = public/language/lt/admin/settings/navigation.json
+trans.lv = public/language/lv/admin/settings/navigation.json
+trans.ms = public/language/ms/admin/settings/navigation.json
+trans.nb = public/language/nb/admin/settings/navigation.json
+trans.nl = public/language/nl/admin/settings/navigation.json
+trans.pl = public/language/pl/admin/settings/navigation.json
+trans.pt_BR = public/language/pt-BR/admin/settings/navigation.json
+trans.pt_PT = public/language/pt-PT/admin/settings/navigation.json
+trans.ro = public/language/ro/admin/settings/navigation.json
+trans.ru = public/language/ru/admin/settings/navigation.json
+trans.rw = public/language/rw/admin/settings/navigation.json
+trans.sc = public/language/sc/admin/settings/navigation.json
+trans.sk = public/language/sk/admin/settings/navigation.json
+trans.sl = public/language/sl/admin/settings/navigation.json
+trans.sr = public/language/sr/admin/settings/navigation.json
+trans.sv = public/language/sv/admin/settings/navigation.json
+trans.th = public/language/th/admin/settings/navigation.json
+trans.tr = public/language/tr/admin/settings/navigation.json
+trans.uk = public/language/uk/admin/settings/navigation.json
+trans.vi = public/language/vi/admin/settings/navigation.json
+trans.zh_CN = public/language/zh-CN/admin/settings/navigation.json
+trans.zh_TW = public/language/zh-TW/admin/settings/navigation.json
 type = KEYVALUEJSON
 
-[nodebb.admin-general-social]
-file_filter = public/language/<lang>/admin/general/social.json
-source_file = public/language/en-GB/admin/general/social.json
+[nodebb.admin-settings-social]
+file_filter = public/language/<lang>/admin/settings/social.json
+source_file = public/language/en-GB/admin/settings/social.json
 source_lang = en_GB
-trans.ar = public/language/ar/admin/general/social.json
-trans.bg = public/language/bg/admin/general/social.json
-trans.bn = public/language/bn/admin/general/social.json
-trans.cs = public/language/cs/admin/general/social.json
-trans.da = public/language/da/admin/general/social.json
-trans.de = public/language/de/admin/general/social.json
-trans.el = public/language/el/admin/general/social.json
-trans.en@pirate = public/language/en-x-pirate/admin/general/social.json
-trans.en_US = public/language/en-US/admin/general/social.json
-trans.es = public/language/es/admin/general/social.json
-trans.et = public/language/et/admin/general/social.json
-trans.fa_IR = public/language/fa-IR/admin/general/social.json
-trans.fi = public/language/fi/admin/general/social.json
-trans.fr = public/language/fr/admin/general/social.json
-trans.gl = public/language/gl/admin/general/social.json
-trans.he = public/language/he/admin/general/social.json
-trans.hr = public/language/hr/admin/general/social.json
-trans.hu = public/language/hu/admin/general/social.json
-trans.id = public/language/id/admin/general/social.json
-trans.it = public/language/it/admin/general/social.json
-trans.ja = public/language/ja/admin/general/social.json
-trans.ko = public/language/ko/admin/general/social.json
-trans.lt = public/language/lt/admin/general/social.json
-trans.lv = public/language/lv/admin/general/social.json
-trans.ms = public/language/ms/admin/general/social.json
-trans.nb = public/language/nb/admin/general/social.json
-trans.nl = public/language/nl/admin/general/social.json
-trans.pl = public/language/pl/admin/general/social.json
-trans.pt_BR = public/language/pt-BR/admin/general/social.json
-trans.pt_PT = public/language/pt-PT/admin/general/social.json
-trans.ro = public/language/ro/admin/general/social.json
-trans.ru = public/language/ru/admin/general/social.json
-trans.rw = public/language/rw/admin/general/social.json
-trans.sc = public/language/sc/admin/general/social.json
-trans.sk = public/language/sk/admin/general/social.json
-trans.sl = public/language/sl/admin/general/social.json
-trans.sr = public/language/sr/admin/general/social.json
-trans.sv = public/language/sv/admin/general/social.json
-trans.th = public/language/th/admin/general/social.json
-trans.tr = public/language/tr/admin/general/social.json
-trans.uk = public/language/uk/admin/general/social.json
-trans.vi = public/language/vi/admin/general/social.json
-trans.zh_CN = public/language/zh-CN/admin/general/social.json
-trans.zh_TW = public/language/zh-TW/admin/general/social.json
+trans.ar = public/language/ar/admin/settings/social.json
+trans.bg = public/language/bg/admin/settings/social.json
+trans.bn = public/language/bn/admin/settings/social.json
+trans.cs = public/language/cs/admin/settings/social.json
+trans.da = public/language/da/admin/settings/social.json
+trans.de = public/language/de/admin/settings/social.json
+trans.el = public/language/el/admin/settings/social.json
+trans.en@pirate = public/language/en-x-pirate/admin/settings/social.json
+trans.en_US = public/language/en-US/admin/settings/social.json
+trans.es = public/language/es/admin/settings/social.json
+trans.et = public/language/et/admin/settings/social.json
+trans.fa_IR = public/language/fa-IR/admin/settings/social.json
+trans.fi = public/language/fi/admin/settings/social.json
+trans.fr = public/language/fr/admin/settings/social.json
+trans.gl = public/language/gl/admin/settings/social.json
+trans.he = public/language/he/admin/settings/social.json
+trans.hr = public/language/hr/admin/settings/social.json
+trans.hu = public/language/hu/admin/settings/social.json
+trans.id = public/language/id/admin/settings/social.json
+trans.it = public/language/it/admin/settings/social.json
+trans.ja = public/language/ja/admin/settings/social.json
+trans.ko = public/language/ko/admin/settings/social.json
+trans.lt = public/language/lt/admin/settings/social.json
+trans.lv = public/language/lv/admin/settings/social.json
+trans.ms = public/language/ms/admin/settings/social.json
+trans.nb = public/language/nb/admin/settings/social.json
+trans.nl = public/language/nl/admin/settings/social.json
+trans.pl = public/language/pl/admin/settings/social.json
+trans.pt_BR = public/language/pt-BR/admin/settings/social.json
+trans.pt_PT = public/language/pt-PT/admin/settings/social.json
+trans.ro = public/language/ro/admin/settings/social.json
+trans.ru = public/language/ru/admin/settings/social.json
+trans.rw = public/language/rw/admin/settings/social.json
+trans.sc = public/language/sc/admin/settings/social.json
+trans.sk = public/language/sk/admin/settings/social.json
+trans.sl = public/language/sl/admin/settings/social.json
+trans.sr = public/language/sr/admin/settings/social.json
+trans.sv = public/language/sv/admin/settings/social.json
+trans.th = public/language/th/admin/settings/social.json
+trans.tr = public/language/tr/admin/settings/social.json
+trans.uk = public/language/uk/admin/settings/social.json
+trans.vi = public/language/vi/admin/settings/social.json
+trans.zh_CN = public/language/zh-CN/admin/settings/social.json
+trans.zh_TW = public/language/zh-TW/admin/settings/social.json
 type = KEYVALUEJSON
 
-[nodebb.admin-general-sounds]
-file_filter = public/language/<lang>/admin/general/sounds.json
-source_file = public/language/en-GB/admin/general/sounds.json
+[nodebb.admin-settings-sounds]
+file_filter = public/language/<lang>/admin/settings/sounds.json
+source_file = public/language/en-GB/admin/settings/sounds.json
 source_lang = en_GB
-trans.ar = public/language/ar/admin/general/sounds.json
-trans.bg = public/language/bg/admin/general/sounds.json
-trans.bn = public/language/bn/admin/general/sounds.json
-trans.cs = public/language/cs/admin/general/sounds.json
-trans.da = public/language/da/admin/general/sounds.json
-trans.de = public/language/de/admin/general/sounds.json
-trans.el = public/language/el/admin/general/sounds.json
-trans.en@pirate = public/language/en-x-pirate/admin/general/sounds.json
-trans.en_US = public/language/en-US/admin/general/sounds.json
-trans.es = public/language/es/admin/general/sounds.json
-trans.et = public/language/et/admin/general/sounds.json
-trans.fa_IR = public/language/fa-IR/admin/general/sounds.json
-trans.fi = public/language/fi/admin/general/sounds.json
-trans.fr = public/language/fr/admin/general/sounds.json
-trans.gl = public/language/gl/admin/general/sounds.json
-trans.he = public/language/he/admin/general/sounds.json
-trans.hr = public/language/hr/admin/general/sounds.json
-trans.hu = public/language/hu/admin/general/sounds.json
-trans.id = public/language/id/admin/general/sounds.json
-trans.it = public/language/it/admin/general/sounds.json
-trans.ja = public/language/ja/admin/general/sounds.json
-trans.ko = public/language/ko/admin/general/sounds.json
-trans.lt = public/language/lt/admin/general/sounds.json
-trans.lv = public/language/lv/admin/general/sounds.json
-trans.ms = public/language/ms/admin/general/sounds.json
-trans.nb = public/language/nb/admin/general/sounds.json
-trans.nl = public/language/nl/admin/general/sounds.json
-trans.pl = public/language/pl/admin/general/sounds.json
-trans.pt_BR = public/language/pt-BR/admin/general/sounds.json
-trans.pt_PT = public/language/pt-PT/admin/general/sounds.json
-trans.ro = public/language/ro/admin/general/sounds.json
-trans.ru = public/language/ru/admin/general/sounds.json
-trans.rw = public/language/rw/admin/general/sounds.json
-trans.sc = public/language/sc/admin/general/sounds.json
-trans.sk = public/language/sk/admin/general/sounds.json
-trans.sl = public/language/sl/admin/general/sounds.json
-trans.sr = public/language/sr/admin/general/sounds.json
-trans.sv = public/language/sv/admin/general/sounds.json
-trans.th = public/language/th/admin/general/sounds.json
-trans.tr = public/language/tr/admin/general/sounds.json
-trans.uk = public/language/uk/admin/general/sounds.json
-trans.vi = public/language/vi/admin/general/sounds.json
-trans.zh_CN = public/language/zh-CN/admin/general/sounds.json
-trans.zh_TW = public/language/zh-TW/admin/general/sounds.json
+trans.ar = public/language/ar/admin/settings/sounds.json
+trans.bg = public/language/bg/admin/settings/sounds.json
+trans.bn = public/language/bn/admin/settings/sounds.json
+trans.cs = public/language/cs/admin/settings/sounds.json
+trans.da = public/language/da/admin/settings/sounds.json
+trans.de = public/language/de/admin/settings/sounds.json
+trans.el = public/language/el/admin/settings/sounds.json
+trans.en@pirate = public/language/en-x-pirate/admin/settings/sounds.json
+trans.en_US = public/language/en-US/admin/settings/sounds.json
+trans.es = public/language/es/admin/settings/sounds.json
+trans.et = public/language/et/admin/settings/sounds.json
+trans.fa_IR = public/language/fa-IR/admin/settings/sounds.json
+trans.fi = public/language/fi/admin/settings/sounds.json
+trans.fr = public/language/fr/admin/settings/sounds.json
+trans.gl = public/language/gl/admin/settings/sounds.json
+trans.he = public/language/he/admin/settings/sounds.json
+trans.hr = public/language/hr/admin/settings/sounds.json
+trans.hu = public/language/hu/admin/settings/sounds.json
+trans.id = public/language/id/admin/settings/sounds.json
+trans.it = public/language/it/admin/settings/sounds.json
+trans.ja = public/language/ja/admin/settings/sounds.json
+trans.ko = public/language/ko/admin/settings/sounds.json
+trans.lt = public/language/lt/admin/settings/sounds.json
+trans.lv = public/language/lv/admin/settings/sounds.json
+trans.ms = public/language/ms/admin/settings/sounds.json
+trans.nb = public/language/nb/admin/settings/sounds.json
+trans.nl = public/language/nl/admin/settings/sounds.json
+trans.pl = public/language/pl/admin/settings/sounds.json
+trans.pt_BR = public/language/pt-BR/admin/settings/sounds.json
+trans.pt_PT = public/language/pt-PT/admin/settings/sounds.json
+trans.ro = public/language/ro/admin/settings/sounds.json
+trans.ru = public/language/ru/admin/settings/sounds.json
+trans.rw = public/language/rw/admin/settings/sounds.json
+trans.sc = public/language/sc/admin/settings/sounds.json
+trans.sk = public/language/sk/admin/settings/sounds.json
+trans.sl = public/language/sl/admin/settings/sounds.json
+trans.sr = public/language/sr/admin/settings/sounds.json
+trans.sv = public/language/sv/admin/settings/sounds.json
+trans.th = public/language/th/admin/settings/sounds.json
+trans.tr = public/language/tr/admin/settings/sounds.json
+trans.uk = public/language/uk/admin/settings/sounds.json
+trans.vi = public/language/vi/admin/settings/sounds.json
+trans.zh_CN = public/language/zh-CN/admin/settings/sounds.json
+trans.zh_TW = public/language/zh-TW/admin/settings/sounds.json
 type = KEYVALUEJSON
 
 [nodebb.admin-manage-admins-mods]

CHANGELOG.md

@@ -1,3 +1,236 @@
+#### 1.13.3 (2020-05-08)
+
+##### Chores
+
+*  incrementing version number - v1.13.3 (ee583e80)
+*  bump persona (d2bd746c)
+*  incrementing version number - v1.13.2 (beafd613)
+* **deps:**
+  *  update dependency coveralls to v3.1.0 (5ed4a108)
+  *  pin dependency @apidevtools/swagger-parser to 9.0.1 (51eccef5)
+  *  update dependency husky to v4.2.5 (30a25983)
+  *  update dependency husky to v4.2.4 (0a650118)
+  *  update dependency lint-staged to v10.1.3 (a9e68639)
+  *  update dependency nyc to v15.0.1 (#8231) (a3789e28)
+  *  update dependency lint-staged to v10.1.2 (#8235) (e1919c90)
+  *  update dependency lint-staged to v10.1.1 (944a6f58)
+  *  update dependency lint-staged to v10.1.0 (30bd233b)
+  *  update dependency eslint-config-airbnb-base to v14.1.0 (811c3aee)
+  *  update dependency jsdom to v16.2.2 (c5a7242d)
+  *  update dependency eslint-plugin-import to v2.20.2 (b92c1600)
+  *  update dependency lint-staged to v10.0.10 (0ad4b556)
+  *  update dependency coveralls to v3.0.11 (14458087)
+  *  update dependency smtp-server to v3.6.0 (22681945)
+  *  update dependency mocha to v7.1.1 (#8215) (c5356541)
+  *  update dependency grunt to v1.1.0 (#8214) (b0864e7c)
+  *  update dependency husky to v4.2.3 (#8162) (776fe9d2)
+  *  update dependency lint-staged to v10.0.8 (#8180) (13d8f6f1)
+  *  update dependency eslint-plugin-import to v2.20.1 (#8081) (4cdb3131)
+  *  update dependency jsdom to v16.2.1 (#8165) (fbd95a50)
+  *  update dependency husky to v4.2.2 (#8160) (f4ed35c9)
+  *  update dependency jsdom to v16 (#8114) (1037de02)
+
+##### Documentation Changes
+
+*  updated changelog (146388aa)
+
+##### New Features
+
+*  allow activating additional plugins for testing via config.json (a969c5ce)
+*  move plugin tests to separate file (3a23ddab)
+*  remove node14 for now (a72e4429)
+*  reduce infinite scroll area (3fcbd691)
+*  manifest.json improvements from #8126 (#8264) (6e5ebb61)
+*  show error if json is invalid (15345627)
+*  moved component specs into separate files (cd506557)
+*  added UserObject, UserObjectFull, Breadcrumb, Pagination component (64d79fe5)
+*  added some summary and descriptions (ae3e90d6)
+*  add some descriptions (442c018e)
+*  common schema (eade13f9)
+*  openapi component (1af5507a)
+*  add page query param to docs (9987813f)
+*  tag route doc (bbddaadf)
+*  local redoc view on development mode only (1136a369)
+*  added auto-generated, slimmed-down openapi 3.0 file for read api (7b155dab)
+*  add parent cids to body class (23571224)
+*  add 2 hooks for modifying privileges (d080c7b0)
+*  add user ip to admin/dev/info (5e91a67e)
+*  change option name (cba5b23e)
+*  add no-build to ./nodebb setup (476f6717)
+*  add awaitable socket.emit (4083a6e3)
+*  settings sorted list (#8170) (3c9689a5)
+*  guard against accidental ommision (79737c53)
+* **openapi:**
+  *  merging openapi-test branch into master (8387178b)
+  *  move all commonprops out for commonprops component (65c78de6)
+  *  added template to commonprops (2425f453)
+
+##### Bug Fixes
+
+*  #8302, send string to writeFileSync (d09bd2cf)
+*  winston showing json object (7d081843)
+*  sortable topics even if only 1 pinned topic (6765de3d)
+*  #8298, use class name added by jQueryUI instead (dd2bc189)
+*  topic search shortcut for macs (f2c725c6)
+*  #8297, uids.length is different than topics.length (0431d75f)
+*  #8297 guest handles shown in category.tpl (fcb81cb8)
+*  only add to set if numRecentReplies>0 (16a98eaf)
+*  #8293, don't show error if there are no self messages (be305410)
+*  failing tests @julianlam (ecd622fd)
+*  #3321, run plugin tests for installed plugins (a6bb9f43)
+*  remove deprecated mocha.opts (3d0db963)
+*  spec (84383d39)
+*  #8290, if there are no filters go to ?reset=1 (9839346e)
+*  #8283, update gdpr link again (2d076344)
+*  add missing await (4f1128fd)
+*  #8287, dont readd user after deletion (9d153fd3)
+*  missing await (4d6b2ec3)
+*  #8286, rescind notif when its resolved/rejected (0391856d)
+*  #8284, parse ToS on register (0ca84bd9)
+*  #8283, point to official site (17d664e0)
+*  jquery xhtml violations (275e837b)
+* #8274 Don't escape HTML in manage users (#8275) (4855f1de)
+*  crash in topic controller (0c7c70ed)
+*  crash when res.locals.linkTags is undefined (7cab2b0f)
+*  #8272 user link in digest email (e80b8101)
+*  tag of /api/unread/total (9ffdab02)
+*  response hook logic (5a1c6ee7)
+*  remove upload picture test (avatars) (6edf02d4)
+*  remove tests related to group covers, as route is gone (442fe65f)
+*  #8269, return array of topics from hook (4eafe0f0)
+*  remove dead picture upload code #8260 (ef52461f)
+*  path.resolve to logs file (5bcaf715)
+*  only trigger infinitescroll on scroll end (ba6d3fd3)
+*  wrong data returned in available.groups (c7ea84a2)
+*  no focus on find user modal (1b425ef1)
+*  accidental fp precision on flag and acp dash graphs (bcbf98aa)
+*  #8232, unresolvable session mismatch on register cancel (f2f6fbf1)
+*  pin jquery to 3.4.1, #8252 (e440d617)
+*  #8249, don't send move notifications for deleted posts/topics (d77036db)
+*  missing descriptions for common properties (7b31fb34)
+*  some definitions in read API spec (03739b6f)
+*  tagged all routes in read api spec (455d42bc)
+*  override ACAO header for read API spec file (240d9091)
+*  throw error if topic does not exist (59cf0e80)
+*  hookname (e93578b8)
+*  #8230, add hook getUserDataByUserSlug (0d1b5a7f)
+*  ignore case for group details route (15d6975e)
+*  lint (740e598a)
+*  lint (8e23dec8)
+*  #8221, fix parent selection (08031730)
+*  invite properly (071506eb)
+*  admins not seeing invite button (8f4b99a4)
+*  #8217, add missing lang key (0b5fac75)
+*  #8206 first message in chat has false `newSet` (93acd139)
+*  #8203, fix user invites refreshing page (2f9c7c62)
+*  #8202, filter non-existing users in search by uid (f07f4f8e)
+*  notification bodyShort truncated if there is a comma in topic title (266061c3)
+*  hsts max-age missing translation (b67af70d)
+*  call next (80f1bcad)
+*  try travis fix again (05bee629)
+*  try fixing psql on travis (bc9e92a1)
+*  dont let regular users see other users watched categories (cf6eadb9)
+*  also fix updating bookmark if sorting is newest_to_oldest (6e5de39b)
+*  #8188, fix bookmark if sorting is newest_to_oldest (32ada7c4)
+*  duplicate ID + label (ac241fb8)
+*  #8184 global mods unable to revoke other user sessions (f0db240a)
+*  return null if field does not exist (e72a29b3)
+*  #8179, limit length of location/website/fullname, check grouptitle (14e78667)
+*  tag key (32636755)
+*  #8175 (bc93b567)
+*  #8168 re-allowing slashes in homePageRoute (667608a0)
+*  tweak to session validation in addHeaders (eddbd868)
+*  only call clearCookie for logged in users (630f5d5b)
+*  #6422, update deleted/restored messages (06703408)
+*  #8163, prevent account deletion (4d0636f8)
+*  register (5a0c7c14)
+*  #8157, update recent tid when post is moved (e7495440)
+*  tests (b73aa84d)
+*  move start/stop every iteration (dd3893b1)
+*  #8154, move start/stop every iteration (300c04ce)
+*  #8154, respect stop (690bb69d)
+*  #8156 dont allow loading members from hidden groups (f23bc347)
+*  #8155, don't validate name on update if groupName didn't change (03a02e5d)
+*  return correct number of suggested topics (236e1e68)
+*  #8151, don't crash if taskbar doesn't have element (2e794801)
+*  logic for determining dailyStats hour vars (398f0120)
+*  fix daily analytics being one day off (9ecdb92f)
+*  remove debug line (0b9ad416)
+*  no decimal places for category analytics (14655f87)
+*  #8142, broken site if no server-side session (#8148) (d6e3f3f0)
+*  #8144 pluginHooks in maintenance mode middleware (0885ec68)
+* **deps:**
+  *  #8298 bump persona (158d9231)
+  *  update dependency nodebb-plugin-composer-default to v6.3.25 (89d17647)
+  *  update dependency jquery to v3.5.1 [security] (#8281) (a69f0b29)
+  *  update dependency nodebb-rewards-essentials to v0.1.3 (#8289) (919034a7)
+  *  update dependency mongodb to v3.5.7 (#8279) (25d509c4)
+  *  actually, swagger-parser is a dev dependency (d09c6ae0)
+  *  missing @apidevtools/swagger-parser (f1720735)
+  *  update dependency nodebb-theme-persona to v10.1.37 (#8258) (b0c30ceb)
+  *  update dependency archiver to v4 (28777f67)
+  *  update dependency mongodb to v3.5.6 (#8256) (49236067)
+  *  bump dependencies (#8239) (e68156e1)
+  *  update dependency jsesc to v3.0.1 (#8243) (92b55ef5)
+  *  update dependency jsesc to v3 (bb70cebb)
+  *  update dependency pg to v8 (#8227) (ac98775f)
+  *  update dependency validator to v13 (f497ee62)
+  *  update dependency sharp to v0.25.2 (#8220) (dd660c87)
+  *  bump markdown (ee6cb412)
+  *  update dependency mongodb to v3.5.5 (#8205) (5535c50c)
+  *  update dependency sitemap to v6 (#8198) (2052f14c)
+  *  update dependency nodebb-plugin-composer-default to v6.3.23 (6d98d5a1)
+  *  update dependency sharp to v0.25.1 (#8199) (21e91c91)
+  *  update dependency nodebb-plugin-composer-default to v6.3.22 (#8193) (e01f05e3)
+  *  update dependency nodebb-theme-slick to v1.2.29 (#8177) (9daa21ff)
+  *  update dependency nodebb-theme-vanilla to v11.1.16 (#8178) (7d6a983b)
+  *  update dependency nodebb-theme-persona to v10.1.35 (#8176) (3acc24b0)
+  *  update dependency sharp to v0.24.1 (#8164) (7cc63f7d)
+  *  update dependency mongodb to v3.5.3 (#8161) (4b907137)
+  *  update dependency nodebb-widget-essentials to v4.1.0 (#8159) (a5f3c2a2)
+  *  update dependency request to v2.88.2 (#8158) (7fde180a)
+  *  update dependency redis to v3 (#8152) (ef964b11)
+  *  update dependency rimraf to v3.0.2 (#8153) (d8efc6b6)
+* **openapi:**
+  *  v14 test fix (23a0b8c5)
+  *  remove account and group upload routes (d342a28c)
+  *  more fleshing out (058a15db)
+  *  fleshed out admin routes (bae88e08)
+  *  added some descriptions (ab4bd7e1)
+  *  added PostsObject component (2395d2be)
+  *  finished moving all category objects out (23dd2727)
+  *  changed some descriptions (c939f8c6)
+  *  added CategoryObject component (55d0a9ff)
+  *  removed repeated breadcrumb blocks in favour of $ref (646fac1e)
+  *  remove all repeated pagination blocks in favour of (ac579f9d)
+  *  removed warning for category mods route (1cf62095)
+  *  normalising the file for programmatic updates (3a5c6e07)
+
+##### Other Changes
+
+*  #8298 (2e57d8ac)
+* post.updatePostVoteCount (b25b51bd)
+* //github.com/NodeBB/NodeBB (5e140454)
+* categories.updateRecentTid (6c59683b)
+* categories.updateRecentTid (51933c1f)
+* router.page, dep. filter variant (0053e779)
+* flags as well (5ebcdb18)
+*  crash when res.locals.linkTags is undefined" (fe03effe)
+* //github.com/NodeBB/NodeBB (87a6ff0d)
+*  cnpm and pnpm (#8222) (e6a1741c)
+* //github.com/NodeBB/NodeBB (7ae76477)
+*  openapi component" (683e5851)
+*  override ACAO header for read API spec file" (c82a2637)
+* password.change (00e299e9)
+* topic.tools.load (5aa76cdf)
+*  #8154, move start/stop every iteration" (4abe5eb7)
+
+##### Refactors
+
+*  match core field name pinned (478ed6c1)
+*  getUsersCSV to use batch lib (1efb238a)
+*  reorganized socket.io admin modules (e1c6c3b2)
+
 #### 1.13.2 (2020-02-05)
 
 ##### Chores

Gruntfile.js

@@ -1,95 +1,31 @@
 'use strict';
 
-
-var async = require('async');
-var fork = require('child_process').fork;
-var env = process.env;
+const path = require('path');
+const nconf = require('nconf');
+nconf.argv().env({
+	separator: '__',
+});
+const winston = require('winston');
+const fork = require('child_process').fork;
+const env = process.env;
 var worker;
-var updateWorker;
-var initWorker;
-var incomplete = [];
-var running = 0;
 
 env.NODE_ENV = env.NODE_ENV || 'development';
 
+const configFile = path.resolve(__dirname, nconf.any(['config', 'CONFIG']) || 'config.json');
+const prestart = require('./src/prestart');
+prestart.loadConfig(configFile);
 
-var nconf = require('nconf');
-nconf.file({
-	file: 'config.json',
-});
-
-nconf.defaults({
-	base_dir: __dirname,
-	views_dir: './build/public/templates',
-});
-var winston = require('winston');
-winston.configure({
-	transports: [
-		new winston.transports.Console({
-			handleExceptions: true,
-		}),
-	],
-});
 var db = require('./src/database');
 
 module.exports = function (grunt) {
 	var args = [];
-	var initArgs = ['--build'];
+
 	if (!grunt.option('verbose')) {
 		args.push('--log-level=info');
-		initArgs.push('--log-level=info');
-	}
-
-	function update(action, filepath, target) {
-		var updateArgs = args.slice();
-		var compiling;
-		var time = Date.now();
-
-		if (target === 'lessUpdated_Client') {
-			compiling = 'clientCSS';
-		} else if (target === 'lessUpdated_Admin') {
-			compiling = 'acpCSS';
-		} else if (target === 'clientUpdated') {
-			compiling = 'js';
-		} else if (target === 'templatesUpdated') {
-			compiling = 'tpl';
-		} else if (target === 'langUpdated') {
-			compiling = 'lang';
-		} else if (target === 'serverUpdated') {
-			// Do nothing, just restart
-		}
-
-		if (compiling && !incomplete.includes(compiling)) {
-			incomplete.push(compiling);
-		}
-
-		updateArgs.push('--build');
-		updateArgs.push(incomplete.join(','));
-
-		worker.kill();
-		if (updateWorker) {
-			updateWorker.kill('SIGKILL');
-		}
-		updateWorker = fork('app.js', updateArgs, { env: env });
-		running += 1;
-		updateWorker.on('exit', function () {
-			running -= 1;
-			if (running === 0) {
-				worker = fork('app.js', args, {
-					env: env,
-				});
-				worker.on('message', function () {
-					if (incomplete.length) {
-						incomplete = [];
-
-						if (grunt.option('verbose')) {
-							grunt.log.writeln('NodeBB restarted in ' + (Date.now() - time) + ' ms');
-						}
-					}
-				});
-			}
-		});
+		nconf.set('log-level', 'info');
 	}
+	prestart.setupWinston();
 
 	grunt.initConfig({
 		watch: {},
@@ -99,148 +35,169 @@ module.exports = function (grunt) {
 
 	grunt.registerTask('default', ['watch']);
 
-	grunt.registerTask('init', function () {
+	grunt.registerTask('init', async function () {
 		var done = this.async();
-		async.waterfall([
-			function (next) {
-				db.init(next);
-			},
-			function (next) {
-				db.getSortedSetRange('plugins:active', 0, -1, next);
-			},
-			function (plugins, next) {
-				addBaseThemes(plugins, next);
-			},
-			function (plugins, next) {
-				if (!plugins.includes('nodebb-plugin-composer-default')) {
-					plugins.push('nodebb-plugin-composer-default');
-				}
+		let plugins = [];
+		if (!process.argv.includes('--core')) {
+			await db.init();
+			plugins = await db.getSortedSetRange('plugins:active', 0, -1);
+			addBaseThemes(plugins);
+			if (!plugins.includes('nodebb-plugin-composer-default')) {
+				plugins.push('nodebb-plugin-composer-default');
+			}
+			if (!plugins.includes('nodebb-theme-persona')) {
+				plugins.push('nodebb-theme-persona');
+			}
+		}
 
-				if (process.argv.includes('--core')) {
-					plugins = [];
-				}
+		const styleUpdated_Client = plugins.map(p => 'node_modules/' + p + '/*.less')
+			.concat(plugins.map(p => 'node_modules/' + p + '/*.css'))
+			.concat(plugins.map(p => 'node_modules/' + p + '/+(public|static|less)/**/*.less'))
+			.concat(plugins.map(p => 'node_modules/' + p + '/+(public|static)/**/*.css'));
 
-				const lessUpdated_Client = plugins.map(p => 'node_modules/' + p + '/**/*.less');
-				const lessUpdated_Admin = plugins.map(p => 'node_modules/' + p + '/**/*.less');
-				const clientUpdated = plugins.map(p => 'node_modules/' + p + '/**/*.js');
-				const templatesUpdated = plugins.map(p => 'node_modules/' + p + '/**/*.tpl');
-				const langUpdated = plugins.map(p => 'node_modules/' + p + '/**/*.json');
+		const styleUpdated_Admin = plugins.map(p => 'node_modules/' + p + '/*.less')
+			.concat(plugins.map(p => 'node_modules/' + p + '/*.css'))
+			.concat(plugins.map(p => 'node_modules/' + p + '/+(public|static|less)/**/*.less'))
+			.concat(plugins.map(p => 'node_modules/' + p + '/+(public|static)/**/*.css'));
 
-				grunt.config(['watch'], {
-					lessUpdated_Client: {
-						files: [
-							'public/less/*.less',
-							'!public/less/admin/**/*.less',
-							...lessUpdated_Client,
-							'!node_modules/nodebb-*/node_modules/**',
-							'!node_modules/nodebb-*/.git/**',
-						],
-						options: {
-							interval: 1000,
-						},
-					},
-					lessUpdated_Admin: {
-						files: [
-							'public/less/admin/**/*.less',
-							...lessUpdated_Admin,
-							'!node_modules/nodebb-*/node_modules/**',
-							'!node_modules/nodebb-*/.git/**',
-						],
-						options: {
-							interval: 1000,
-						},
-					},
-					clientUpdated: {
-						files: [
-							'public/src/**/*.js',
-							...clientUpdated,
-							'!node_modules/nodebb-*/node_modules/**',
-							'node_modules/benchpressjs/build/benchpress.js',
-							'!node_modules/nodebb-*/.git/**',
-						],
-						options: {
-							interval: 1000,
-						},
-					},
-					serverUpdated: {
-						files: ['*.js', 'install/*.js', 'src/**/*.js', '!src/upgrades/**'],
-						options: {
-							interval: 1000,
-						},
-					},
-					templatesUpdated: {
-						files: [
-							'src/views/**/*.tpl',
-							...templatesUpdated,
-							'!node_modules/nodebb-*/node_modules/**',
-							'!node_modules/nodebb-*/.git/**',
-						],
-						options: {
-							interval: 1000,
-						},
-					},
-					langUpdated: {
-						files: [
-							'public/language/en-GB/*.json',
-							'public/language/en-GB/**/*.json',
-							...langUpdated,
-							'!node_modules/nodebb-*/node_modules/**',
-							'!node_modules/nodebb-*/.git/**',
-							'!node_modules/nodebb-*/plugin.json',
-							'!node_modules/nodebb-*/package.json',
-							'!node_modules/nodebb-*/theme.json',
-						],
-						options: {
-							interval: 1000,
-						},
-					},
-				});
-				next();
+		const clientUpdated = plugins.map(p => 'node_modules/' + p + '/+(public|static)/**/*.js');
+		const serverUpdated = plugins.map(p => 'node_modules/' + p + '/*.js')
+			.concat(plugins.map(p => 'node_modules/' + p + '/+(lib|src)/**/*.js'));
+
+		const templatesUpdated = plugins.map(p => 'node_modules/' + p + '/+(public|static|templates)/**/*.tpl');
+		const langUpdated = plugins.map(p => 'node_modules/' + p + '/+(public|static|languages)/**/*.json');
+
+		grunt.config(['watch'], {
+			styleUpdated_Client: {
+				files: [
+					'public/less/**/*.less',
+					...styleUpdated_Client,
+				],
+				options: {
+					interval: 1000,
+				},
 			},
-		], done);
+			styleUpdated_Admin: {
+				files: [
+					'public/less/**/*.less',
+					...styleUpdated_Admin,
+				],
+				options: {
+					interval: 1000,
+				},
+			},
+			clientUpdated: {
+				files: [
+					'public/src/**/*.js',
+					...clientUpdated,
+					'node_modules/benchpressjs/build/benchpress.js',
+				],
+				options: {
+					interval: 1000,
+				},
+			},
+			serverUpdated: {
+				files: [
+					'app.js',
+					'install/*.js',
+					'src/**/*.js',
+					'public/src/modules/translator.js',
+					'public/src/modules/helpers.js',
+					'public/src/utils.js',
+					serverUpdated,
+					'!src/upgrades/**',
+				],
+				options: {
+					interval: 1000,
+				},
+			},
+			templatesUpdated: {
+				files: [
+					'src/views/**/*.tpl',
+					...templatesUpdated,
+				],
+				options: {
+					interval: 1000,
+				},
+			},
+			langUpdated: {
+				files: [
+					'public/language/en-GB/*.json',
+					'public/language/en-GB/**/*.json',
+					...langUpdated,
+				],
+				options: {
+					interval: 1000,
+				},
+			},
+		});
+		const build = require('./src/meta/build');
+		if (!grunt.option('skip')) {
+			await build.build(true);
+		}
+		run();
+		done();
 	});
 
-	grunt.task.run('init');
-
-	env.NODE_ENV = 'development';
-
-	if (grunt.option('skip')) {
+	function run() {
+		if (worker) {
+			worker.kill();
+		}
 		worker = fork('app.js', args, {
 			env: env,
 		});
-	} else {
-		initWorker = fork('app.js', initArgs, {
-			env: env,
-		});
-
-		initWorker.on('exit', function () {
-			worker = fork('app.js', args, {
-				env: env,
-			});
-		});
 	}
 
-	grunt.event.on('watch', update);
+	grunt.task.run('init');
+
+	grunt.event.removeAllListeners('watch');
+	grunt.event.on('watch', function update(action, filepath, target) {
+		var compiling;
+		if (target === 'styleUpdated_Client') {
+			compiling = 'clientCSS';
+		} else if (target === 'styleUpdated_Admin') {
+			compiling = 'acpCSS';
+		} else if (target === 'clientUpdated') {
+			compiling = 'js';
+		} else if (target === 'templatesUpdated') {
+			compiling = 'tpl';
+		} else if (target === 'langUpdated') {
+			compiling = 'lang';
+		} else if (target === 'serverUpdated') {
+			// empty require cache
+			const paths = ['./src/meta/build.js', './src/meta/index.js'];
+			paths.forEach(p => delete require.cache[require.resolve(p)]);
+			return run();
+		}
+
+		require('./src/meta/build').build([compiling], function (err) {
+			if (err) {
+				winston.error(err.stack);
+			}
+			if (worker) {
+				worker.send({ compiling: compiling });
+			}
+		});
+	});
 };
 
-function addBaseThemes(plugins, callback) {
-	const themeId = plugins.find(p => p.startsWith('nodebb-theme-'));
+function addBaseThemes(plugins) {
+	let themeId = plugins.find(p => p.includes('nodebb-theme-'));
 	if (!themeId) {
-		return setImmediate(callback, null, plugins);
+		return plugins;
 	}
-	function getBaseRecursive(themeId) {
+	let baseTheme;
+	do {
 		try {
-			const baseTheme = require(themeId + '/theme').baseTheme;
-
-			if (baseTheme) {
-				plugins.push(baseTheme);
-				getBaseRecursive(baseTheme);
-			}
+			baseTheme = require(themeId + '/theme').baseTheme;
 		} catch (err) {
 			console.log(err);
 		}
-	}
 
-	getBaseRecursive(themeId);
-	callback(null, plugins);
+		if (baseTheme) {
+			plugins.push(baseTheme);
+			themeId = baseTheme;
+		}
+	} while (baseTheme);
+	return plugins;
 }

app.js

@@ -31,6 +31,7 @@ const path = require('path');
 
 const file = require('./src/file');
 
+process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 global.env = process.env.NODE_ENV || 'production';
 
 // Alternate configuration file support

install/data/defaults.json

@@ -32,9 +32,8 @@
     "registrationType": "normal",
     "registrationApprovalType": "normal",
     "allowAccountDelete": 1,
-    "allowFileUploads": 0,
     "privateUploads": 0,
-    "allowedFileExtensions": "png,jpg,bmp",
+    "allowedFileExtensions": "png,jpg,bmp,txt",
     "allowUserHomePage": 1,
     "allowMultipleBadges": 0,
     "maximumFileSize": 2048,
@@ -81,9 +80,11 @@
     "notificationType_upvote": "notification",
     "notificationType_new-topic": "notification",
     "notificationType_new-reply": "notification",
+    "notificationType_post-edit": "notification",
     "notificationType_follow": "notification",
     "notificationType_new-chat": "notification",
     "notificationType_group-invite": "notification",
+    "notificationType_group-request-membership": "notification",
     "notificationType_mention": "notification",
     "notificationType_new-register": "notification",
     "notificationType_post-queue": "notification",

install/package.json

@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "1.13.3",
+    "version": "1.14.0-5",
     "homepage": "http://www.nodebb.org",
     "repository": {
         "type": "git",
@@ -65,7 +65,7 @@
         "ipaddr.js": "^1.9.1",
         "jquery": "3.5.1",
         "jsesc": "3.0.1",
-        "json-2-csv": "^3.6.2",
+        "json2csv": "5.0.1",
         "jsonwebtoken": "^8.5.1",
         "less": "^3.11.1",
         "lodash": "^4.17.15",
@@ -74,31 +74,31 @@
         "material-design-lite": "^1.3.0",
         "mime": "^2.4.4",
         "mkdirp": "^1.0.4",
-        "mongodb": "3.5.7",
+        "mongodb": "3.5.8",
         "morgan": "^1.10.0",
         "mousetrap": "^1.6.5",
         "@nodebb/mubsub": "^1.6.0",
         "nconf": "^0.10.0",
-        "nodebb-plugin-composer-default": "6.3.25",
+        "nodebb-plugin-composer-default": "6.3.41",
         "nodebb-plugin-dbsearch": "4.0.7",
         "nodebb-plugin-emoji": "^3.3.0",
         "nodebb-plugin-emoji-android": "2.0.0",
         "nodebb-plugin-markdown": "8.11.2",
         "nodebb-plugin-mentions": "2.7.4",
         "nodebb-plugin-soundpack-default": "1.0.0",
-        "nodebb-plugin-spam-be-gone": "0.6.7",
+        "nodebb-plugin-spam-be-gone": "0.7.1",
         "nodebb-rewards-essentials": "0.1.3",
         "nodebb-theme-lavender": "5.0.11",
-        "nodebb-theme-persona": "10.1.39",
+        "nodebb-theme-persona": "10.1.48",
         "nodebb-theme-slick": "1.2.29",
-        "nodebb-theme-vanilla": "11.1.16",
+        "nodebb-theme-vanilla": "11.1.23",
         "nodebb-widget-essentials": "4.1.0",
         "nodemailer": "^6.4.6",
         "passport": "^0.4.1",
         "passport-local": "1.0.0",
         "pg": "^8.0.2",
         "pg-cursor": "^2.1.9",
-        "postcss": "7.0.27",
+        "postcss": "7.0.32",
         "postcss-clean": "1.1.0",
         "promise-polyfill": "^8.1.3",
         "prompt": "^1.0.0",
@@ -110,14 +110,14 @@
         "sanitize-html": "^1.23.0",
         "semver": "^7.2.1",
         "serve-favicon": "^2.5.0",
-        "sharp": "0.25.2",
+        "sharp": "0.25.3",
         "sitemap": "^6.1.0",
         "socket.io": "2.3.0",
         "socket.io-adapter-cluster": "^1.0.1",
         "socket.io-adapter-mongo": "^2.0.5",
         "socket.io-adapter-postgres": "^1.2.1",
         "socket.io-client": "2.3.0",
-        "socket.io-redis": "5.2.0",
+        "socket.io-redis": "5.3.0",
         "socketio-wildcard": "2.0.0",
         "spdx-license-list": "^6.1.0",
         "spider-detector": "2.0.0",
@@ -136,15 +136,15 @@
         "@commitlint/cli": "8.3.5",
         "@commitlint/config-angular": "8.3.4",
         "coveralls": "3.1.0",
-        "eslint": "6.8.0",
+        "eslint": "7.2.0",
         "eslint-config-airbnb-base": "14.1.0",
-        "eslint-plugin-import": "2.20.2",
+        "eslint-plugin-import": "2.21.1",
         "grunt": "1.1.0",
         "grunt-contrib-watch": "1.1.0",
         "husky": "4.2.5",
         "jsdom": "16.2.2",
-        "lint-staged": "10.2.0",
-        "mocha": "7.1.2",
+        "lint-staged": "10.2.9",
+        "mocha": "7.2.0",
         "mocha-lcov-reporter": "1.3.0",
         "nyc": "15.0.1",
         "smtp-server": "3.6.0"

loader.js

@@ -87,22 +87,22 @@ Loader.addWorkerEvents = function (worker) {
 	worker.on('message', function (message) {
 		if (message && typeof message === 'object' && message.action) {
 			switch (message.action) {
-			case 'restart':
-				console.log('[cluster] Restarting...');
-				Loader.restart();
-				break;
-			case 'pubsub':
-				workers.forEach(function (w) {
-					w.send(message);
-				});
-				break;
-			case 'socket.io':
-				workers.forEach(function (w) {
-					if (w !== worker) {
+				case 'restart':
+					console.log('[cluster] Restarting...');
+					Loader.restart();
+					break;
+				case 'pubsub':
+					workers.forEach(function (w) {
 						w.send(message);
-					}
-				});
-				break;
+					});
+					break;
+				case 'socket.io':
+					workers.forEach(function (w) {
+						if (w !== worker) {
+							w.send(message);
+						}
+					});
+					break;
 			}
 		}
 	});

public/503.html

@@ -1,13 +1,13 @@
 <html>
 <head>
 	<title>Excessive Load Warning</title>
-	<link href='https://fonts.googleapis.com/css?family=Ubuntu:400,500,700' rel='stylesheet' type='text/css'>
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<style type="text/css">
 	body {
 		background: #00A9EA;
 		color: white;
-		font-family: 'Ubuntu', sans-serif;
+		/* see public/less/admin/vars.less for documentation on system font family */
+		font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
 		text-align: center;
 		-webkit-transform-style: preserve-3d;
 		-moz-transform-style: preserve-3d;

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

@@ -2,6 +2,7 @@
 	"events": "أحداث",
 	"no-events": "لا توجد أحداث",
 	"control-panel": "لوحة تحكم الأحداث",
+	"delete-events": "Delete Events",
 	"filters": "Filters",
 	"filters-apply": "Apply Filters",
 	"filter-type": "Event Type",

public/language/ar/admin/dashboard.json

@@ -0,0 +1,79 @@
+{
+	"forum-traffic": "Forum Traffic",
+	"page-views": "مشاهدات الصفحات",
+	"unique-visitors": "زائرين فريدين",
+	"new-users": "New Users",
+	"posts": "مشاركات",
+	"topics": "مواضيع",
+	"page-views-seven": "آخر 7 ايام",
+	"page-views-thirty": "آخر 30 يوماً",
+	"page-views-last-day": "آخر 24 ساعة",
+	"page-views-custom": "مدة زمنية مخصصة",
+	"page-views-custom-start": "بداية المدة",
+	"page-views-custom-end": "نهاية المده",
+	"page-views-custom-help": "أدخل نطاقا زمنيا لمرات مشاهدة الصفحات التي ترغب في عرضها. إذا لم يظهر منتقي التاريخ، فإن التنسيق المقبول هو <code>YYYY-MM-DD</code>",
+	"page-views-custom-error": "الرجاء إدخال نطاق تاريخ صالح بالتنسيق <code>YYYY-MM-DD</code>",
+
+	"stats.yesterday": "Yesterday",
+	"stats.today": "Today",
+	"stats.last-week": "Last Week",
+	"stats.this-week": "This Week",
+	"stats.last-month": "Last Month",
+	"stats.this-month": "This Month",
+	"stats.all": "كل الوقت",
+
+	"updates": "تحديثات",
+	"running-version": "المنتدى يعمل حاليا على <strong>NodeBB الإصدار<span id=\"version\">%1</span></strong>.",
+	"keep-updated": "تأكد دائما من أن NodeBB يعمل على احدث إصدار للحصول على أحدث التصحيحات الأمنية وإصلاحات الأخطاء.",
+	"up-to-date": "<p>المنتدى <strong>يعمل على أحدث إصدار</strong> <i class=\"fa fa-check\"></i></p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">upgrading your NodeBB</a>.</p>",
+	"prerelease-warning": "<p>هذه نسخة <strong>ماقبل الإصدار</strong> من NodeBB. قد تحدث أخطاء غير مقصودة. <i class=\"fa fa-exclamation-triangle\"></i></p>",
+	"running-in-development": "المنتدى قيد التشغيل في وضع \"المطورين\". وقد تكون هناك ثغرات أمنية مفتوحة؛ من فضلك تواصل مع مسؤول نظامك.",
+	"latest-lookup-failed": "<p>Failed to look up latest available version of NodeBB</p>",
+
+	"notices": "إشعارات",
+	"restart-not-required": "إعادة التشغيل غير مطلوب",
+	"restart-required": "إعادة التشغيل مطلوبة",
+	"search-plugin-installed": "إضافة البحث منصبة",
+	"search-plugin-not-installed": "إضافة البحث غير منصبة",
+	"search-plugin-tooltip": "نصب إضافة البحث من صفحة الإضافات البرمجية لتنشيط وظيفة البحث",
+
+	"control-panel": "التحكم بالنظام",
+	"rebuild-and-restart": "Rebuild &amp; Restart",
+	"restart": "Restart",
+	"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
+	"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
+	"maintenance-mode": "وضع الصيانة",
+	"maintenance-mode-title": "انقر هنا لإعداد وضع الصيانة لـNodeBB",
+	"realtime-chart-updates": "التحديث الفوري للرسم البياني",
+
+	"active-users": "المستخدمين النشطين",
+	"active-users.users": "الأعضاء",
+	"active-users.guests": "الزوار",
+	"active-users.total": "المجموع",
+	"active-users.connections": "Connections",
+
+	"anonymous-registered-users": "المجهولين مقابل المستخدمين المسجلين",
+	"anonymous": "مجهول",
+	"registered": "مسجل",
+
+	"user-presence": "تواجد المستخدمين",
+	"on-categories": "في قائمة الأقسام",
+	"reading-posts": "قراءة المشاركات",
+	"browsing-topics": "تصفح المواضيع",
+	"recent": "الأخيرة",
+	"unread": "غير مقروء",
+
+	"high-presence-topics": "مواضيع ذات حضور قوي",
+
+	"graphs.page-views": "مشاهدات الصفحة",
+	"graphs.page-views-registered": "Page Views Registered",
+	"graphs.page-views-guest": "Page Views Guest",
+	"graphs.page-views-bot": "Page Views Bot",
+	"graphs.unique-visitors": "زوار فريدين",
+	"graphs.registered-users": "مستخدمين مسجلين",
+	"graphs.anonymous-users": "مستخدمين مجهولين",
+	"last-restarted-by": "Last restarted by",
+	"no-users-browsing": "No users browsing"
+}

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

@@ -9,7 +9,7 @@
 	"default": "System default",
 	"default-help": "<em>System default</em> means the user has not explicitly overridden the global forum setting for digests, which is currently: &quot;<strong>%1</strong>&quot;",
 	"resend": "Resend Digest",
-	"resend-all-confirm": "Are you sure you wish to mnually execute this digest run?",
+	"resend-all-confirm": "Are you sure you wish to manually execute this digest run?",
 	"resent-single": "Manual digest resend completed",
 	"resent-day": "Daily digest resent",
 	"resent-week": "Weekly digest resent",
@@ -18,4 +18,4 @@
 	"manual-run": "Manual digest run:",
 
 	"no-delivery-data": "No delivery data found"
-}
+}

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

@@ -1,6 +1,7 @@
 {
 	"global": "Global",
 	"global.no-users": "No user-specific global privileges.",
+	"admin": "Admin",
 	"group-privileges": "Group Privileges",
 	"user-privileges": "User Privileges",
 	"chat": "Chat",
@@ -31,5 +32,11 @@
 	"downvote-posts": "Downvote Posts",
 	"delete-topics": "Delete Topics",
 	"purge": "Purge",
-	"moderate": "Moderate"
+	"moderate": "Moderate",
+
+	"admin-dashboard": "Dashboard",
+	"admin-categories": "Categories",
+	"admin-privileges": "Privileges",
+	"admin-users": "Users",
+	"admin-settings": "Settings"
 }

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

@@ -3,13 +3,13 @@
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",
 
 	"alerts.editing": "Editing tag(s)",

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

@@ -12,8 +12,9 @@
 	"unban": "Unban User(s)",
 	"reset-lockout": "Reset Lockout",
 	"reset-flags": "Reset Flags",
-	"delete": "Delete User(s)",
-	"purge": "Delete User(s) and Content",
+	"delete": "Delete <strong>User(s)</strong>",
+	"delete-content": "Delete User(s) <strong>Content</strong>",
+	"purge": "Delete <strong>User(s)</strong> and <strong>Content</strong>",
 	"download-csv": "Download CSV",
 	"manage-groups": "Manage Groups",
 	"add-group": "Add Group",
@@ -93,9 +94,11 @@
 	"alerts.validate-email-success": "Emails validated",
 	"alerts.validate-force-password-reset-success": "User(s) passwords have been reset and their existing sessions have been revoked.",
 	"alerts.password-reset-confirm": "Do you want to send password reset email(s) to these user(s)?",
-	"alerts.confirm-delete": "<b>Warning!</b><br/>Do you really want to delete user(s)?<br/> This action is not reversable! Only the user account will be deleted, their posts and topics will remain.",
+	"alerts.confirm-delete": "<strong>Warning!</strong><p>Do you really want to delete <strong>user(s)</strong>?</p><p>This action is not reversible! Only the user account will be deleted, their posts and topics will remain.</p>",
 	"alerts.delete-success": "User(s) Deleted!",
-	"alerts.confirm-purge": "<b>Warning!</b><br/>Do you really want to delete user(s) and their content?<br/> This action is not reversable! All user data and content will be erased!",
+	"alerts.confirm-delete-content": "<strong>Warning!</strong><p>Do you really want to delete these user(s) <strong>content</strong>?</p><p>This action is not reversible! The users' accounts will remain, but their posts and topics will be deleted.</p>",
+	"alerts.delete-content-success": "User(s) Content Deleted!",
+	"alerts.confirm-purge": "<strong>Warning!</strong><p>Do you really want to delete <strong>user(s) and their content</strong>?</p><p>This action is not reversible! All user data and content will be erased!</p>",
 	"alerts.create": "Create User",
 	"alerts.button-create": "Create",
 	"alerts.button-cancel": "Cancel",

public/language/ar/admin/menu.json

@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "عام",
-	"general/dashboard": "اللوحة الرئيسية",
-	"general/homepage": "الصفحة الرئيسية",
-	"general/navigation": "التصفح",
-	"general/languages": "اللغات",
-	"general/sounds": "الأصوات",
-	"general/social": "شبكات التواصل",
 
 	"section-manage": "إدارة",
 	"manage/categories": "الأقسام",
@@ -22,17 +17,22 @@
 
 	"section-settings": "إعدادات",
 	"settings/general": "عامة",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "السمعة",
 	"settings/email": "البريد الإلكتروني",
-	"settings/user": "الأعضاء",
-	"settings/group": "المجموعات",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "الزوار",
 	"settings/uploads": "الرفع",
-	"settings/post": "المشاركة",
-	"settings/chat": "الدردشة",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "ترقيم الصفحات",
 	"settings/tags": "الكلمات المفتاحية",
 	"settings/notifications": "التنبيهات",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",

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

@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }

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

@@ -1,41 +1,41 @@
 {
-	"site-settings": "Site Settings",
-	"title": "Site Title",
-	"title.short": "Short Title",
-	"title.short-placeholder": "If no short title is specified, the site title will be used",
-	"title.url": "URL",
+	"site-settings": "اعدادات الموقع",
+	"title": "عنوان الموقع",
+	"title.short": "عنوان قصير",
+	"title.short-placeholder": "ان لم تقم بكتابة عنوان مختصر, سيتم استخدام عنوان الموقع الكلي",
+	"title.url": "الرابط",
 	"title.url-placeholder": "The URL of the site title",
 	"title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.",
-	"title.name": "Your Community Name",
+	"title.name": "اسم المنتدي",
 	"title.show-in-header": "Show Site Title in Header",
-	"browser-title": "Browser Title",
+	"browser-title": "عنوان المتصفح",
 	"browser-title-help": "If no browser title is specified, the site title will be used",
 	"title-layout": "Title Layout",
 	"title-layout-help": "Define how the browser title will be structured ie. {pageTitle} | {browserTitle}",
 	"description.placeholder": "A short description about your community",
-	"description": "Site Description",
-	"keywords": "Site Keywords",
+	"description": "وصف الموقع",
+	"keywords": "الكلمات الدليله للموقع",
 	"keywords-placeholder": "Keywords describing your community, comma-separated",
-	"logo": "Site Logo",
-	"logo.image": "Image",
+	"logo": "شعار الموقع",
+	"logo.image": "صورة",
 	"logo.image-placeholder": "Path to a logo to display on forum header",
-	"logo.upload": "Upload",
-	"logo.url": "URL",
+	"logo.upload": "رفع",
+	"logo.url": "الرابط",
 	"logo.url-placeholder": "The URL of the site logo",
 	"logo.url-help": "When the logo is clicked, send users to this address. If left blank, user will be sent to the forum index.",
-	"logo.alt-text": "Alt Text",
+	"logo.alt-text": "نص بديل",
 	"log.alt-text-placeholder": "Alternative text for accessibility",
-	"favicon": "Favicon",
-	"favicon.upload": "Upload",
+	"favicon": "صورة المفضله",
+	"favicon.upload": "رفع",
 	"touch-icon": "Homescreen/Touch Icon",
-	"touch-icon.upload": "Upload",
+	"touch-icon.upload": "رفع",
 	"touch-icon.help": "Recommended size and format: 192x192, PNG format only. If no touch icon is specified, NodeBB will fall back to using the favicon.",
 	"outgoing-links": "Outgoing Links",
 	"outgoing-links.warning-page": "Use Outgoing Links Warning Page",
-	"search-default-sort-by": "Search default sort by",
+	"search-default-sort-by": "الترتيب الافتراضي للبحث",
 	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page",
 	"site-colors": "Site Color Metadata",
-	"theme-color": "Theme Color",
-	"background-color": "Background Color",
+	"theme-color": "لون الثيم",
+	"background-color": "لون الخلفية",
 	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
 }

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

@@ -0,0 +1,6 @@
+{
+	"language-settings": "اعدادات اللغة",
+	"description": "تُحدد اللغة الافتراضية إعدادات اللغة لجميع المستخدمين الذين يزورون المنتدى. <br />يمكن للأعضاء تجاوز اللغة الافتراضية من خلال صفحة إعدادات الحساب الخاصة بهم.",
+	"default-language": "اللغة الافتراضية",
+	"auto-detect": "الكشف عن إعدادات اللغة للزوار بشكل آلي"
+}

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

@@ -0,0 +1,9 @@
+{
+	"notifications": "التنبيهات",
+	"chat-messages": "Chat Messages",
+	"play-sound": "Play",
+	"incoming-message": "Incoming Message",
+	"outgoing-message": "Outgoing Message",
+	"upload-new-sound": "Upload New Sound",
+	"saved": "Settings Saved"
+}

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

@@ -1,10 +1,10 @@
 {
     "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
     "min-per-topic": "Minimum Tags per Topic",
     "max-per-topic": "Maximum Tags per Topic",
     "min-length": "Minimum Tag Length",
     "max-length": "Maximum Tag Length",
-    "goto-manage": "Click here to visit the tag management page.",
     "related-topics": "Related Topics",
     "max-related-topics": "Maximum related topics to display (if supported by theme)"
 }

public/language/ar/flags.json

@@ -1,54 +1,57 @@
 {
-	"state": "State",
-	"reporter": "Reporter",
-	"reported-at": "Reported At",
-	"description": "Description",
+	"state": "الحالة",
+	"reporter": "المُبلغ",
+	"reported-at": "وقت التبليغ",
+	"description": "الوصف",
 	"no-flags": "Hooray! No flags found.",
-	"assignee": "Assignee",
-	"update": "Update",
-	"updated": "Updated",
+	"assignee": "المحال إليه",
+	"update": "تحديث",
+	"updated": "تم التحديث",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
 
 	"graph-label": "Daily Flags",
 	"quick-filters": "Quick Filters",
 	"filter-active": "There are one or more filters active in this list of flags",
-	"filter-reset": "Remove Filters",
-	"filters": "Filter Options",
+	"filter-reset": "ازالة الفلاتر",
+	"filters": "خيارات الفلتر",
 	"filter-reporterId": "Reporter UID",
 	"filter-targetUid": "Flagged UID",
-	"filter-type": "Flag Type",
-	"filter-type-all": "All Content",
-	"filter-type-post": "Post",
-	"filter-type-user": "User",
-	"filter-state": "State",
+	"filter-type": "عنوان العلامة",
+	"filter-type-all": "كل المحتوي",
+	"filter-type-post": "مشاركة",
+	"filter-type-user": "مستخدم",
+	"filter-state": "الحالة",
 	"filter-assignee": "Assignee UID",
 	"filter-cid": "Category",
 	"filter-quick-mine": "Assigned to me",
 	"filter-cid-all": "All categories",
 	"apply-filters": "Apply Filters",
 
-	"quick-links": "Quick Links",
+	"quick-actions": "اجراءات سريعه",
 	"flagged-user": "Flagged User",
-	"view-profile": "View Profile",
-	"start-new-chat": "Start New Chat",
+	"view-profile": "مشاهدة الملف الشخصي",
+	"start-new-chat": "بدء محادثه جديده",
 	"go-to-target": "View Flag Target",
+	"delete-post": "حذف المشاركة",
+	"purge-post": "Purge Post",
+	"restore-post": "استرجاع المشاركة",
 
-	"user-view": "View Profile",
-	"user-edit": "Edit Profile",
+	"user-view": "مشاهدة الملف الشخصي",
+	"user-edit": "تعديل الملف الشخصي",
 
 	"notes": "Flag Notes",
-	"add-note": "Add Note",
+	"add-note": "اضافة ملاحظة",
 	"no-notes": "No shared notes.",
 
-	"history": "Flag History",
+	"history": "Account & Flag History",
 	"back": "Back to Flags List",
 	"no-history": "No flag history.",
 
 	"state-all": "All states",
 	"state-open": "New/Open",
 	"state-wip": "Work in Progress",
-	"state-resolved": "Resolved",
-	"state-rejected": "Rejected",
+	"state-resolved": "تم حلها",
+	"state-rejected": "تم رفضها",
 	"no-assignee": "Not Assigned",
 	"note-added": "Note Added",
 

public/language/ar/global.json

@@ -53,6 +53,7 @@
     "posts": "المشاركات",
     "best": "الأفضل",
     "votes": "Votes",
+    "voters": "Voters",
     "upvoters": "الموافقين",
     "upvoted": "مصوت بالموجب",
     "downvoters": "مصوتين بالسالب",

public/language/ar/notifications.json

@@ -35,6 +35,7 @@
     "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
     "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> أنشأ موضوعًا جديدًا: <strong>%2</strong>",
+    "user_edited_post": "<strong>%1</strong> has edited a post in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> صار يتابعك.",
     "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
     "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
@@ -53,6 +54,7 @@
     "notificationType_upvote": "عندما يوافقك احدهم على منشورك",
     "notificationType_new-topic": "When someone you follow posts a topic",
     "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_post-edit": "When a post is edited in a topic you are watching",
     "notificationType_follow": "When someone starts following you",
     "notificationType_new-chat": "When you receive a chat message",
     "notificationType_group-invite": "When you receive a group invite",

public/language/ar/tags.json

@@ -3,5 +3,6 @@
     "tags": "الكلمات الدلالية",
     "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "أدخل الكلمات الدلالية...",
-    "no_tags": "لا يوجد كلمات دلالية بعد."
+    "no_tags": "لا يوجد كلمات دلالية بعد.",
+    "select_tags": "Select Tags"
 }

public/language/ar/user.json

@@ -8,13 +8,20 @@
     "email": "البريد الإلكتروني",
     "confirm_email": "تأكيد عنوان البريد الإلكتروني",
     "account_info": "معلومات الحساب",
+    "admin_actions_label": "Administrative Actions",
     "ban_account": "حظر الحساب",
     "ban_account_confirm": "هل تريد حقاً حظر هاذا العضو؟",
     "unban_account": "إزالة حظر الحساب",
     "delete_account": "حذف الحساب",
-    "delete_account_confirm": "Are you sure you want to delete your account? <br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your password to confirm that you wish to destroy this account.",
-    "delete_this_account_confirm": "هل انت متأكد من رغبتك بحذف هذا الحساب؟ <br /> <strong>هذا الإجراء لا رجعة فيه ولن تتمكن من استرداد أي بيانات</strong><br /><br />",
+    "delete_account_as_admin": "Delete <strong>Account</strong>",
+    "delete_content": "Delete Account <strong>Content</strong>",
+    "delete_all": "Delete <strong>Account</strong> and <strong>Content</strong>",
+    "delete_account_confirm": "Are you sure you want to anonymize your posts and delete your account?<br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your password to confirm that you wish to destroy this account.",
+    "delete_this_account_confirm": "Are you sure you want to delete this account while leaving its contents behind?<br /><strong>This action is irreversible, posts will be anonymized, and you will not be able to restore post associations with the deleted account</strong><br /><br />",
+    "delete_account_content_confirm": "Are you sure you want to delete this account's content (posts/topics/uploads)? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
+    "delete_all_confirm": "Are you sure you want to delete this account and all of its content (posts/topics/uploads)? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
     "account-deleted": "تم حذف الحساب",
+    "account-content-deleted": "Account content deleted",
     "fullname": "الاسم الكامل",
     "website": "الموقع الإلكتروني",
     "location": "الموقع",
@@ -144,6 +151,7 @@
     "info.ban-history": "سجل الحظر الأحدث",
     "info.no-ban-history": "هذا المستخدم لم يتم حظره مطلقا",
     "info.banned-until": "محظور حتى %1",
+    "info.banned-expiry": "Expiry",
     "info.banned-permanently": "محظور بشكل دائم",
     "info.banned-reason-label": "سبب",
     "info.banned-no-reason": "لم يتم إعطاء سبب.",
@@ -170,7 +178,7 @@
     "consent.right_to_erasure_description": "At any time, you are able to revoke your consent to data collection and/or processing by deleting your account. Your individual profile can be deleted, although your posted content will remain. If you wish to delete both your account <strong>and</strong> your content, please contact the administrative team for this website.",
     "consent.right_to_data_portability": "You have the Right to Data Portability",
     "consent.right_to_data_portability_description": "You may request from us a machine-readable export of any collected data about you and your account. You can do so by clicking the appropriate button below.",
-    "consent.export_profile": "Export Profile (.csv)",
+    "consent.export_profile": "Export Profile (.json)",
     "consent.export_uploads": "Export Uploaded Content (.zip)",
     "consent.export_posts": "Export Posts (.csv)"
 }

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

@@ -2,6 +2,7 @@
 	"events": "Събития",
 	"no-events": "Няма събития",
 	"control-panel": "Контролен панел за събитията",
+	"delete-events": "Изтриване на събитията",
 	"filters": "Филтри",
 	"filters-apply": "Прилагане на филтрите",
 	"filter-type": "Вид събитие",

public/language/bg/admin/dashboard.json

@@ -0,0 +1,79 @@
+{
+	"forum-traffic": "Трафик на форума",
+	"page-views": "Преглеждания на страниците",
+	"unique-visitors": "Уникални посетители",
+	"new-users": "Нови потребители",
+	"posts": "Публикации",
+	"topics": "Теми",
+	"page-views-seven": "Последните 7 дни",
+	"page-views-thirty": "Последните 30 дни",
+	"page-views-last-day": "Последните 24 часа",
+	"page-views-custom": "Интервал по избор",
+	"page-views-custom-start": "Начална дата",
+	"page-views-custom-end": "Крайна дата",
+	"page-views-custom-help": "Въведете интервал от дати, за които искате да видите преглежданията на страниците. Ако не се появи календар за избор, можете да въведете датите във формат: <code>ГГГГ-ММ-ДД</code>",
+	"page-views-custom-error": "Моля, въведете правилен интервал от дати във формата: <code>ГГГГ-ММ-ДД</code>",
+
+	"stats.yesterday": "Вчера",
+	"stats.today": "Днес",
+	"stats.last-week": "Миналата седмица",
+	"stats.this-week": "Тази седмица",
+	"stats.last-month": "Миналия месец",
+	"stats.this-month": "Този месец",
+	"stats.all": "От началото",
+
+	"updates": "Обновления",
+	"running-version": "Вие използвате <strong>NodeBB версия <span id=\"version\">%1</span></strong>.",
+	"keep-updated": "Стремете се винаги да използвате най-новата версия на NodeBB, за да се възползвате от последните подобрения на сигурността и поправки на проблеми.",
+	"up-to-date": "<p>Вие използвате <strong>най-новата версия</strong> <i class=\"fa fa-check\"></i></p>",
+	"upgrade-available": "<p>Има нова версия (версия %1). Ако имате възможност, <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">обновете NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>Това е остаряла предварителна версия на NodeBB. Има нова версия (версия %1). Ако имате възможност, <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">обновете NodeBB</a>.</p>",
+	"prerelease-warning": "<p>Това е версия за <strong>предварителен преглед</strong> на NodeBB. Възможно е да има неочаквани неизправности. <i class=\"fa fa-exclamation-triangle\"></i></p>",
+	"running-in-development": "<span>Форумът работи в режим за разработчици, така че може да бъде уязвим. Моля, свържете се със системния си администратор.</span>",
+	"latest-lookup-failed": "<p>Не може да бъде извършена проверка за последната налична версия на NodeBB</p>",
+
+	"notices": "Забележки",
+	"restart-not-required": "Не се изисква рестартиране",
+	"restart-required": "Изисква се рестартиране",
+	"search-plugin-installed": "Добавката за търсене е инсталирана",
+	"search-plugin-not-installed": "Добавката за търсене не е инсталирана",
+	"search-plugin-tooltip": "Инсталирайте добавка за търсене от страницата с добавките, за да включите функционалността за търсене",
+
+	"control-panel": "Системен контрол",
+	"rebuild-and-restart": "Повторно изграждане и рестартиране",
+	"restart": "Рестартиране",
+	"restart-warning": "Повторното изграждане и рестартирането на NodeBB ще прекъснат всички връзки за няколко секунди.",
+	"restart-disabled": "Възможностите за повторно изграждане и рестартиране на NodeBB са изключени, тъй като изглежда, че NodeBB не се изпълнява чрез подходящия демон.",
+	"maintenance-mode": "Режим на профилактика",
+	"maintenance-mode-title": "Щракнете тук, за да зададете режим на профилактика на NodeBB",
+	"realtime-chart-updates": "Актуализации на таблиците в реално време",
+
+	"active-users": "Дейни потребители",
+	"active-users.users": "Потребители",
+	"active-users.guests": "Гости",
+	"active-users.total": "Общо",
+	"active-users.connections": "Връзки",
+
+	"anonymous-registered-users": "Анонимни към регистрирани потребители",
+	"anonymous": "Анонимни",
+	"registered": "Регистрирани",
+
+	"user-presence": "Присъствие на потребителите ",
+	"on-categories": "В списъка с категории",
+	"reading-posts": "Четящи публикации",
+	"browsing-topics": "Разглеждащи теми",
+	"recent": "Скорошни",
+	"unread": "Непрочетени",
+
+	"high-presence-topics": "Теми с най-голяма присъственост",
+
+	"graphs.page-views": "Преглеждания на страниците",
+	"graphs.page-views-registered": "Преглеждания на страниците от регистрирани потребители",
+	"graphs.page-views-guest": "Преглеждания на страниците от гости",
+	"graphs.page-views-bot": "Преглеждания на страниците от ботове",
+	"graphs.unique-visitors": "Уникални посетители",
+	"graphs.registered-users": "Регистрирани потребители",
+	"graphs.anonymous-users": "Анонимни потребители",
+	"last-restarted-by": "Последно рестартиране от",
+	"no-users-browsing": "Няма разглеждащи потребители"
+}

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

@@ -18,4 +18,4 @@
 	"manual-run": "Ръчно разпращане на резюмето:",
 
 	"no-delivery-data": "Няма данни за доставката"
-}
+}

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

@@ -1,6 +1,7 @@
 {
 	"global": "Глобални",
 	"global.no-users": "Няма глобални правомощия за отделни потребители.",
+	"admin": "Администратор",
 	"group-privileges": "Правомощия за групите",
 	"user-privileges": "Правомощия за потребителите",
 	"chat": "Разговор",
@@ -31,5 +32,11 @@
 	"downvote-posts": "Отрицателно гласуване за публикации",
 	"delete-topics": "Изтриване на теми",
 	"purge": "Изчистване",
-	"moderate": "Модериране"
+	"moderate": "Модериране",
+
+	"admin-dashboard": "Табло",
+	"admin-categories": "Категории",
+	"admin-privileges": "Правомощия",
+	"admin-users": "Потребители",
+	"admin-settings": "Настройки"
 }

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

@@ -3,13 +3,13 @@
 	"bg-color": "Цвят на фона",
 	"text-color": "Цвят на текста",
 	"create-modify": "Създаване и редактиране на етикети",
-	"description": "Изберете етикетите чрез щракване и/или влачене. Използвайте „Shift“, за да изберете няколко етикета.",
+	"description": "Изберете етикетите чрез щракване или влачене. Използвайте <code>CTRL</code>, за да изберете няколко етикета.",
 	"create": "Създаване на етикет",
 	"modify": "Редактиране на етикети",
 	"rename": "Преименуване на етикети",
 	"delete": "Изтриване на избраните етикети",
 	"search": "Търсене на етикети…",
-	"settings": "Натиснете <a href=\"%1\">тук</a>, за да отворите страницата с настройки на етикета.",
+	"settings": "Настройки за етикетите",
 	"name": "Име на етикета",
 
 	"alerts.editing": "Редактиране на етикет(и)",

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

@@ -12,8 +12,9 @@
 	"unban": "Деблокиране на потребителя/ите",
 	"reset-lockout": "Нулиране на заключването",
 	"reset-flags": "Анулиране на докладите",
-	"delete": "Изтриване на потребителя/ите",
-	"purge": "Изтриване на потребителя/ите и съдържанието",
+	"delete": "Изтриване на <strong>потребителя/ите</strong>",
+	"delete-content": "Изтриване на <strong>съдържанието</strong> на потребителя/ите",
+	"purge": "Изтриване на <strong>потребителя/ите</strong> и <strong>съдържанието</strong>",
 	"download-csv": "Сваляне във формат „CSV“",
 	"manage-groups": "Управление на групите",
 	"add-group": "Добавяне на група",
@@ -93,9 +94,11 @@
 	"alerts.validate-email-success": "Е-пощите са проверени",
 	"alerts.validate-force-password-reset-success": "Паролата на потребителя (или паролите на потребителите) беше подновена и сесията му беше прекратена.",
 	"alerts.password-reset-confirm": "Искате ли да изпратите е-писмо/а за възстановяване на паролата на този/тези потребител(и)?",
-	"alerts.confirm-delete": "<b>ВНИМАНИЕ!</b><br/>Наистина ли искате да изтриете потребителя/ите?<br/> Това действие е необратимо! Ще бъде изтрит само профилът на потребителя/ите, неговите/техните публикациите и теми ще останат.",
+	"alerts.confirm-delete": "<strong>ВНИМАНИЕ!</strong><p>Наистина ли искате да изтриете <strong>потребителя/ите</strong>?</p> <p>Това действие е необратимо! Ще бъде изтрит само профилът на потребителя/ите, неговите/техните публикациите и теми ще останат.</p>",
 	"alerts.delete-success": "Потребителят/ите е/са изтрит(и)!",
-	"alerts.confirm-purge": "<b>ВНИМАНИЕ!</b><br/>Наистина ли искате да изтриете потребителя/ите?<br/> Това действие е необратимо! Всички потребителски данни и съдържание ще бъдат заличени!",
+	"alerts.confirm-delete-content": "<strong>ВНИМАНИЕ!</strong><p>Наистина ли искате да изтриете <strong>съдържанието</strong> на този потребител или тези потребители?</p> <p>Това действие е необратимо! Профилите на потребителите ще останат, но всички техни публикации и теми ще бъдат изтрити.</p>",
+	"alerts.delete-content-success": "Съдържанието на потребителя/ите е изтрито!",
+	"alerts.confirm-purge": "<strong>ВНИМАНИЕ!</strong><p>Наистина ли искате да изтриете <strong>потребителя/ите и неговото/тяхното съдържание</strong>?</p> <p>Това действие е необратимо! Всички потребителски данни и съдържание ще бъдат заличени!</p>",
 	"alerts.create": "Създаване на потребител",
 	"alerts.button-create": "Създаване",
 	"alerts.button-cancel": "Отказ",

public/language/bg/admin/menu.json

@@ -1,11 +1,6 @@
 {
+	"dashboard": "Табло",
 	"section-general": "Общи",
-	"general/dashboard": "Табло",
-	"general/homepage": "Начало",
-	"general/navigation": "Навигация",
-	"general/languages": "Езици",
-	"general/sounds": "Звуци",
-	"general/social": "Обществени",
 
 	"section-manage": "Управление",
 	"manage/categories": "Категории",
@@ -22,17 +17,22 @@
 
 	"section-settings": "Настройки",
 	"settings/general": "Общи",
+	"settings/homepage": "Начална страница",
+	"settings/navigation": "Навигация",
 	"settings/reputation": "Репутация",
 	"settings/email": "Е-поща",
-	"settings/user": "Потребител",
-	"settings/group": "Група",
+	"settings/user": "Потребители",
+	"settings/group": "Групи",
 	"settings/guest": "Гости",
 	"settings/uploads": "Качвания",
-	"settings/post": "Публикация",
-	"settings/chat": "Разговор",
+	"settings/languages": "Езици",
+	"settings/post": "Публикации",
+	"settings/chat": "Разговори",
 	"settings/pagination": "Странициране",
 	"settings/tags": "Етикети",
 	"settings/notifications": "Известия",
+	"settings/sounds": "Звуци",
+	"settings/social": "Обществени",
 	"settings/cookies": "Бисквитки",
 	"settings/web-crawler": "Обхождач на уеб страници",
 	"settings/sockets": "Сокети",

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

@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Граница на забавяне в цикъла на събитията (в милисекунди)",
 	"traffic.event-lag-help": "Намаляването на тази стойност ще намали времето за изчакване при зареждане на страници, но също така ще предизвика по-често показване на съобщението „прекомерно натоварване“ на повече потребители. (Нужно е рестартиране.)",
 	"traffic.lag-check-interval": "Интервал на проверка (в милисекунди)",
-	"traffic.lag-check-interval-help": "Намаляването на тази стойност ще направи NodeBB по-чувствителен към скоковете в натовареността, но може и да направи проверката твърде чувствителна. (Нужно е рестартиране.)"
+	"traffic.lag-check-interval-help": "Намаляването на тази стойност ще направи NodeBB по-чувствителен към скоковете в натовареността, но може и да направи проверката твърде чувствителна. (Нужно е рестартиране.)",
+
+	"sockets.settings": "Настройки за WebSocket",
+	"sockets.max-attempts": "Максимален брой опити за повторно свързване",
+	"sockets.default-placeholder": "По подразбиране: %1",
+	"sockets.delay": "Забавяне при повторно свързване"
 }

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

@@ -0,0 +1,8 @@
+{
+	"home-page": "Начална страница",
+	"description": "Изберете коя страница да бъде показана, когато потребителите отидат на главния адрес на форума.",
+	"home-page-route": "Път на началната страница",
+	"custom-route": "Персонализиран път",
+	"allow-user-home-pages": "Разрешаване на потребителските начални страници",
+	"home-page-title": "Заглавие на началната страница (по подразбиране: „Начало“)"
+}

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

@@ -0,0 +1,6 @@
+{
+	"language-settings": "Езикови настройки",
+	"description": "Езикът по подразбиране определя езиковите настройки за всички потребители, които посещават Вашия форум. <br />Отделните потребители могат да сменят езика си от страницата с настройки на профила си.",
+	"default-language": "Език по подразбиране",
+	"auto-detect": "Автоматично разпознаване на езика за гостите"
+}

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

@@ -0,0 +1,23 @@
+{
+	"icon": "Иконка:",
+	"change-icon": "промяна",
+	"route": "Маршрут:",
+	"tooltip": "Подсказка:",
+	"text": "Текст:",
+	"text-class": "Текстов клас: <small>незадължително</small>",
+	"class": "Клас: <small>незадължително</small>",
+	"id": "Идентификатор: <small>незадължително</small>",
+
+	"properties": "Свойства:",
+	"groups": "Групи:",
+	"open-new-window": "Отваряне в нов прозорец",
+
+	"btn.delete": "Изтриване",
+	"btn.disable": "Изключване",
+	"btn.enable": "Включване",
+
+	"available-menu-items": "Налични елементи за менюто",
+	"custom-route": "Персонализиран маршрут",
+	"core": "ядро",
+	"plugin": "добавка"
+}

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

@@ -0,0 +1,5 @@
+{
+	"post-sharing": "Споделяне на публикации",
+	"info-plugins-additional": "Добавките могат да добавят допълнителни мрежи за споделяне на публикации.",
+	"save-success": "Мрежите за споделяне на публикации са запазени успешно!"
+}

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

@@ -0,0 +1,9 @@
+{
+	"notifications": "Известия",
+	"chat-messages": "Съобщения в разговори",
+	"play-sound": "Пускане",
+	"incoming-message": "Входящо съобщение",
+	"outgoing-message": "Изходящо съобщение",
+	"upload-new-sound": "Качване на нов звук",
+	"saved": "Настройките са запазени"
+}

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

@@ -1,10 +1,10 @@
 {
     "tag": "Настройки за етикетите",
+    "link-to-manage": "Управление на етикетите",
     "min-per-topic": "Минимален брой етикети за тема",
     "max-per-topic": "Максимален брой етикети за тема",
     "min-length": "Минимална дължина на етикетите",
     "max-length": "Максимална дължина на етикетите",
-    "goto-manage": "Щракнете тук, за да отворите страницата за управление на етикетите.",
     "related-topics": "Свързани теми",
     "max-related-topics": "Максимален брой свързани теми, които да бъдат показвани (ако това се поддържа от темата)"
 }

public/language/bg/flags.json

@@ -27,11 +27,14 @@
 	"filter-cid-all": "Всички категории",
 	"apply-filters": "Прилагане на филтрите",
 
-	"quick-links": "Бързи връзки",
+	"quick-actions": "Бързи действия",
 	"flagged-user": "Докладван потребител",
 	"view-profile": "Преглед на профила",
 	"start-new-chat": "Започване на нов разговор",
 	"go-to-target": "Преглед на целта на доклада",
+	"delete-post": "Изтриване на публикацията",
+	"purge-post": "Изчистване на публикацията",
+	"restore-post": "Възстановяване на публикацията",
 
 	"user-view": "Преглед на профила",
 	"user-edit": "Редактиране на профила",
@@ -40,7 +43,7 @@
 	"add-note": "Добавяне на бележка",
 	"no-notes": "Няма споделени бележки.",
 
-	"history": "История на доклада",
+	"history": "Акаунт и история на докладванията",
 	"back": "Обратно към списъка с доклади",
 	"no-history": "Няма история на доклада.",
 

public/language/bg/global.json

@@ -53,6 +53,7 @@
     "posts": "Публ.",
     "best": "Най-добри",
     "votes": "Гласове",
+    "voters": "Гласували",
     "upvoters": "Гласували положително",
     "upvoted": "С положителни гласове",
     "downvoters": "Гласували отрицателно",

public/language/bg/notifications.json

@@ -35,6 +35,7 @@
     "user_posted_to_dual": "<strong>%1</strong> и <strong>%2</strong> публикуваха отговори на: <strong>%3</strong>",
     "user_posted_to_multiple": "<strong>%1</strong> и %2 други публикуваха отговори на: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> публикува нова тема: <strong>%2</strong>",
+    "user_edited_post": "<strong>%1</strong> редактира публикация в <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> започна да Ви следва.",
     "user_started_following_you_dual": "<strong>%1</strong> и <strong>%2</strong> започнаха да Ви следват.",
     "user_started_following_you_multiple": "<strong>%1</strong> и %2 започнаха да Ви следват.",
@@ -53,6 +54,7 @@
     "notificationType_upvote": "Когато някой гласува положително за Ваша публикация",
     "notificationType_new-topic": "Когато някой, когото следвате, публикува тема",
     "notificationType_new-reply": "Когато бъде публикуван нов отговор в тема, която следвате",
+    "notificationType_post-edit": "Когато бъде редактирана публикация в тема, която следите",
     "notificationType_follow": "Когато някой започне да Ви следва",
     "notificationType_new-chat": "Когато получите съобщение в разговор",
     "notificationType_group-invite": "Когато получите покана за група",

public/language/bg/tags.json

@@ -3,5 +3,6 @@
     "tags": "Етикети",
     "enter_tags_here": "Тук въведете етикети, всеки между %1 и %2 знака.",
     "enter_tags_here_short": "Въведете етикети...",
-    "no_tags": "Все още няма етикети."
+    "no_tags": "Все още няма етикети.",
+    "select_tags": "Изберете етикети"
 }

public/language/bg/user.json

@@ -8,13 +8,20 @@
     "email": "Е-поща",
     "confirm_email": "Потвърдете е-пощата",
     "account_info": "Информация за акаунта",
+    "admin_actions_label": "Административни действия",
     "ban_account": "Блокиране на акаунта",
     "ban_account_confirm": "Наистина ли искате да блокирате този потребител?",
     "unban_account": "Деблокиране на акаунта",
     "delete_account": "Изтриване на акаунта",
-    "delete_account_confirm": "Наистина ли искате да изтриете акаунта си? <br /><strong>Това действие е необратимо и няма да можете да възстановите нищо от данните си.</strong><br /><br />Въведете паролата си, за да потвърдите, че искате да унищожите този акаунт.",
-    "delete_this_account_confirm": "Наистина ли искате да изтриете този акаунт? <br /><strong>Това действие е необратимо и няма да можете да възстановите нищо от данните си.</strong><br /><br />",
+    "delete_account_as_admin": "Изтриване на <strong>акаунта</strong>",
+    "delete_content": "Изтриване на <strong>съдържанието</strong> на акаунта",
+    "delete_all": "Изтриване на <strong>акаунта</strong> и <strong>съдържанието</strong>",
+    "delete_account_confirm": "Наистина ли искате да направите публикациите си анонимни и да изтриете акаунта си? <br /><strong>Това действие е необратимо и няма да можете да възстановите нищо от данните си.</strong><br /><br />Въведете паролата си, за да потвърдите, че искате да унищожите този акаунт.",
+    "delete_this_account_confirm": "Наистина ли искате да изтриете този акаунт, но да оставите съдържанието му?<br /><strong>Това действие е необратимо. Публикациите ще бъдат превърнати в анонимни и вече няма да можете да възстановите връзката между публикациите и изтрития акаунт</strong><br /><br />",
+    "delete_account_content_confirm": "Наистина ли искате да изтриете съдържанието (публикации/теми/качвания) на този акаунт? <br /><strong>Това действие е необратимо и няма да можете да възстановите нищо от данните.</strong><br /><br />",
+    "delete_all_confirm": "Наистина ли искате да изтриете този акаунт и цялото му съдържание (публикации/теми/качвания)? <br /><strong>Това действие е необратимо и няма да можете да възстановите нищо от данните.</strong><br /><br />",
     "account-deleted": "Акаунтът е изтрит",
+    "account-content-deleted": "Съдържанието на акаунта е изтрито",
     "fullname": "Пълно име",
     "website": "Уеб сайт",
     "location": "Местоположение",
@@ -144,6 +151,7 @@
     "info.ban-history": "Скорошна история на блокиранията",
     "info.no-ban-history": "Този потребител никога не е бил блокиран",
     "info.banned-until": "Блокиран до %1",
+    "info.banned-expiry": "Давност",
     "info.banned-permanently": "Блокиран за постоянно",
     "info.banned-reason-label": "Причина",
     "info.banned-no-reason": "Няма посочена причина.",
@@ -170,7 +178,7 @@
     "consent.right_to_erasure_description": "Във всеки един момент можете да оттеглите съгласието си за събиране и/или обработка на данни, като изтриете акаунта си. Вашият профил може да бъде изтрит, но публикуваното от Вас съдържание ще остане. Ако искате да изтриете както акаунта, така <strong>и</strong> съдържанието, публикувано от Вас, моля, свържете се с администрационния екип на уеб сайта.",
     "consent.right_to_data_portability": "Имате право на пренос на данни",
     "consent.right_to_data_portability_description": "Можете да изискате от нас всички събрани за Вас и акаунта Ви данни в машинен формат. Можете да направите това като натиснете съответния бутон по-долу.",
-    "consent.export_profile": "Изнасяне на профила (.csv)",
+    "consent.export_profile": "Изнасяне на профила (.json)",
     "consent.export_uploads": "Изнасяне на каченото съдържание (.zip)",
     "consent.export_posts": "Изнасяне на публикациите (.csv)"
 }

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

@@ -2,6 +2,7 @@
 	"events": "Events",
 	"no-events": "There are no events",
 	"control-panel": "Events Control Panel",
+	"delete-events": "Delete Events",
 	"filters": "Filters",
 	"filters-apply": "Apply Filters",
 	"filter-type": "Event Type",

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

@@ -9,7 +9,7 @@
 	"default": "System default",
 	"default-help": "<em>System default</em> means the user has not explicitly overridden the global forum setting for digests, which is currently: &quot;<strong>%1</strong>&quot;",
 	"resend": "Resend Digest",
-	"resend-all-confirm": "Are you sure you wish to mnually execute this digest run?",
+	"resend-all-confirm": "Are you sure you wish to manually execute this digest run?",
 	"resent-single": "Manual digest resend completed",
 	"resent-day": "Daily digest resent",
 	"resent-week": "Weekly digest resent",
@@ -18,4 +18,4 @@
 	"manual-run": "Manual digest run:",
 
 	"no-delivery-data": "No delivery data found"
-}
+}

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

@@ -1,6 +1,7 @@
 {
 	"global": "Global",
 	"global.no-users": "No user-specific global privileges.",
+	"admin": "Admin",
 	"group-privileges": "Group Privileges",
 	"user-privileges": "User Privileges",
 	"chat": "Chat",
@@ -31,5 +32,11 @@
 	"downvote-posts": "Downvote Posts",
 	"delete-topics": "Delete Topics",
 	"purge": "Purge",
-	"moderate": "Moderate"
+	"moderate": "Moderate",
+
+	"admin-dashboard": "Dashboard",
+	"admin-categories": "Categories",
+	"admin-privileges": "Privileges",
+	"admin-users": "Users",
+	"admin-settings": "Settings"
 }

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

@@ -3,13 +3,13 @@
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",
 
 	"alerts.editing": "Editing tag(s)",

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

@@ -12,8 +12,9 @@
 	"unban": "Unban User(s)",
 	"reset-lockout": "Reset Lockout",
 	"reset-flags": "Reset Flags",
-	"delete": "Delete User(s)",
-	"purge": "Delete User(s) and Content",
+	"delete": "Delete <strong>User(s)</strong>",
+	"delete-content": "Delete User(s) <strong>Content</strong>",
+	"purge": "Delete <strong>User(s)</strong> and <strong>Content</strong>",
 	"download-csv": "Download CSV",
 	"manage-groups": "Manage Groups",
 	"add-group": "Add Group",
@@ -93,9 +94,11 @@
 	"alerts.validate-email-success": "Emails validated",
 	"alerts.validate-force-password-reset-success": "User(s) passwords have been reset and their existing sessions have been revoked.",
 	"alerts.password-reset-confirm": "Do you want to send password reset email(s) to these user(s)?",
-	"alerts.confirm-delete": "<b>Warning!</b><br/>Do you really want to delete user(s)?<br/> This action is not reversable! Only the user account will be deleted, their posts and topics will remain.",
+	"alerts.confirm-delete": "<strong>Warning!</strong><p>Do you really want to delete <strong>user(s)</strong>?</p><p>This action is not reversible! Only the user account will be deleted, their posts and topics will remain.</p>",
 	"alerts.delete-success": "User(s) Deleted!",
-	"alerts.confirm-purge": "<b>Warning!</b><br/>Do you really want to delete user(s) and their content?<br/> This action is not reversable! All user data and content will be erased!",
+	"alerts.confirm-delete-content": "<strong>Warning!</strong><p>Do you really want to delete these user(s) <strong>content</strong>?</p><p>This action is not reversible! The users' accounts will remain, but their posts and topics will be deleted.</p>",
+	"alerts.delete-content-success": "User(s) Content Deleted!",
+	"alerts.confirm-purge": "<strong>Warning!</strong><p>Do you really want to delete <strong>user(s) and their content</strong>?</p><p>This action is not reversible! All user data and content will be erased!</p>",
 	"alerts.create": "Create User",
 	"alerts.button-create": "Create",
 	"alerts.button-cancel": "Cancel",

public/language/bn/admin/menu.json

@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "General",
-	"general/dashboard": "Dashboard",
-	"general/homepage": "Home Page",
-	"general/navigation": "Navigation",
-	"general/languages": "Languages",
-	"general/sounds": "Sounds",
-	"general/social": "Social",
 
 	"section-manage": "Manage",
 	"manage/categories": "Categories",
@@ -22,17 +17,22 @@
 
 	"section-settings": "Settings",
 	"settings/general": "General",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputation",
 	"settings/email": "Email",
-	"settings/user": "User",
-	"settings/group": "Group",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Guests",
 	"settings/uploads": "Uploads",
-	"settings/post": "Post",
-	"settings/chat": "Chat",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Pagination",
 	"settings/tags": "Tags",
 	"settings/notifications": "Notifications",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",

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

@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }

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

@@ -0,0 +1,8 @@
+{
+	"home-page": "Home Page",
+	"description": "Choose what page is shown when users navigate to the root URL of your forum.",
+	"home-page-route": "Home Page Route",
+	"custom-route": "Custom Route",
+	"allow-user-home-pages": "Allow User Home Pages",
+	"home-page-title": "Title of the home page (default \"Home\")"
+}

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

@@ -0,0 +1,23 @@
+{
+	"icon": "Icon:",
+	"change-icon": "change",
+	"route": "Route:",
+	"tooltip": "Tooltip:",
+	"text": "Text:",
+	"text-class": "Text Class: <small>optional</small>",
+	"class": "Class: <small>optional</small>",
+	"id": "ID: <small>optional</small>",
+
+	"properties": "Properties:",
+	"groups": "Groups:",
+	"open-new-window": "Open in a new window",
+
+	"btn.delete": "Delete",
+	"btn.disable": "Disable",
+	"btn.enable": "Enable",
+
+	"available-menu-items": "Available Menu Items",
+	"custom-route": "Custom Route",
+	"core": "core",
+	"plugin": "plugin"
+}

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

@@ -0,0 +1,5 @@
+{
+	"post-sharing": "Post Sharing",
+	"info-plugins-additional": "Plugins can add additional networks for sharing posts.",
+	"save-success": "Successfully saved Post Sharing Networks!"
+}

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

@@ -1,10 +1,10 @@
 {
     "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
     "min-per-topic": "Minimum Tags per Topic",
     "max-per-topic": "Maximum Tags per Topic",
     "min-length": "Minimum Tag Length",
     "max-length": "Maximum Tag Length",
-    "goto-manage": "Click here to visit the tag management page.",
     "related-topics": "Related Topics",
     "max-related-topics": "Maximum related topics to display (if supported by theme)"
 }

public/language/bn/flags.json

@@ -27,11 +27,14 @@
 	"filter-cid-all": "All categories",
 	"apply-filters": "Apply Filters",
 
-	"quick-links": "Quick Links",
+	"quick-actions": "Quick Actions",
 	"flagged-user": "Flagged User",
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"delete-post": "Delete Post",
+	"purge-post": "Purge Post",
+	"restore-post": "Restore Post",
 
 	"user-view": "View Profile",
 	"user-edit": "Edit Profile",
@@ -40,7 +43,7 @@
 	"add-note": "Add Note",
 	"no-notes": "No shared notes.",
 
-	"history": "Flag History",
+	"history": "Account & Flag History",
 	"back": "Back to Flags List",
 	"no-history": "No flag history.",
 

public/language/bn/global.json

@@ -53,6 +53,7 @@
     "posts": "পোস্টগুলি",
     "best": "Best",
     "votes": "Votes",
+    "voters": "Voters",
     "upvoters": "Upvoters",
     "upvoted": "Upvoted",
     "downvoters": "Downvoters",

public/language/bn/notifications.json

@@ -35,6 +35,7 @@
     "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
     "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
+    "user_edited_post": "<strong>%1</strong> has edited a post in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> আপনাকে অনুসরন করা শুরু করেছেন।",
     "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
     "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
@@ -53,6 +54,7 @@
     "notificationType_upvote": "When someone upvotes your post",
     "notificationType_new-topic": "When someone you follow posts a topic",
     "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_post-edit": "When a post is edited in a topic you are watching",
     "notificationType_follow": "When someone starts following you",
     "notificationType_new-chat": "When you receive a chat message",
     "notificationType_group-invite": "When you receive a group invite",

public/language/bn/tags.json

@@ -3,5 +3,6 @@
     "tags": "ট্যাগসমূহ",
     "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "ট্যাগ বসান",
-    "no_tags": "এখন পর্যন্ত কোন ট্যাগ নেই"
+    "no_tags": "এখন পর্যন্ত কোন ট্যাগ নেই",
+    "select_tags": "Select Tags"
 }

public/language/bn/user.json

@@ -8,13 +8,20 @@
     "email": "ইমেইল",
     "confirm_email": "ইমেইল নিশ্চিত করুন",
     "account_info": "Account Info",
+    "admin_actions_label": "Administrative Actions",
     "ban_account": "একাউন্ট নিষিদ্ধ করুন",
     "ban_account_confirm": "আপনি কি নিশ্চিত যে এই সদস্যকে নিষিদ্ধ করতে চান ?",
     "unban_account": "নিষেদ্ধাজ্ঞা তুলে নিন",
     "delete_account": "একাউন্ট মুছে ফেলুন",
-    "delete_account_confirm": "Are you sure you want to delete your account? <br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your password to confirm that you wish to destroy this account.",
-    "delete_this_account_confirm": "Are you sure you want to delete this account? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
+    "delete_account_as_admin": "Delete <strong>Account</strong>",
+    "delete_content": "Delete Account <strong>Content</strong>",
+    "delete_all": "Delete <strong>Account</strong> and <strong>Content</strong>",
+    "delete_account_confirm": "Are you sure you want to anonymize your posts and delete your account?<br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your password to confirm that you wish to destroy this account.",
+    "delete_this_account_confirm": "Are you sure you want to delete this account while leaving its contents behind?<br /><strong>This action is irreversible, posts will be anonymized, and you will not be able to restore post associations with the deleted account</strong><br /><br />",
+    "delete_account_content_confirm": "Are you sure you want to delete this account's content (posts/topics/uploads)? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
+    "delete_all_confirm": "Are you sure you want to delete this account and all of its content (posts/topics/uploads)? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
     "account-deleted": "একাউন্ট মুছে ফেলা হয়েছে",
+    "account-content-deleted": "Account content deleted",
     "fullname": "পুর্ণ নাম",
     "website": "ওয়েবসাইট",
     "location": "স্থান",
@@ -144,6 +151,7 @@
     "info.ban-history": "Recent Ban History",
     "info.no-ban-history": "This user has never been banned",
     "info.banned-until": "Banned until %1",
+    "info.banned-expiry": "Expiry",
     "info.banned-permanently": "Banned permanently",
     "info.banned-reason-label": "Reason",
     "info.banned-no-reason": "No reason given.",
@@ -170,7 +178,7 @@
     "consent.right_to_erasure_description": "At any time, you are able to revoke your consent to data collection and/or processing by deleting your account. Your individual profile can be deleted, although your posted content will remain. If you wish to delete both your account <strong>and</strong> your content, please contact the administrative team for this website.",
     "consent.right_to_data_portability": "You have the Right to Data Portability",
     "consent.right_to_data_portability_description": "You may request from us a machine-readable export of any collected data about you and your account. You can do so by clicking the appropriate button below.",
-    "consent.export_profile": "Export Profile (.csv)",
+    "consent.export_profile": "Export Profile (.json)",
     "consent.export_uploads": "Export Uploaded Content (.zip)",
     "consent.export_posts": "Export Posts (.csv)"
 }

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

@@ -2,6 +2,7 @@
 	"events": "Události",
 	"no-events": "Žádné nové události",
 	"control-panel": "Ovládací panel událostí",
+	"delete-events": "Delete Events",
 	"filters": "Filtry",
 	"filters-apply": "Použít filtry",
 	"filter-type": "Typ události",

public/language/cs/admin/dashboard.json

@@ -0,0 +1,79 @@
+{
+	"forum-traffic": "Provoz fóra",
+	"page-views": "Zobrazení stránky",
+	"unique-visitors": "Jedineční návštěvníci",
+	"new-users": "Nový uživatelé",
+	"posts": "Příspěvky",
+	"topics": "Témata",
+	"page-views-seven": "Posledních 7 dnů",
+	"page-views-thirty": "Posledních 30 dní",
+	"page-views-last-day": "Posledních 24 hodin",
+	"page-views-custom": "Dle rozsahu data",
+	"page-views-custom-start": "Začátek rozsahu",
+	"page-views-custom-end": "Konec rozsahu",
+	"page-views-custom-help": "Zadejte rozsah data zobrazení stránek, které chcete vidět. Není-li datum nastaveno, výchozí formát je <code>YYYY-MM-DD</code>",
+	"page-views-custom-error": "Zadejte správný rozsah ve formátu <code>YYYY-MM-DD</code>",
+
+	"stats.yesterday": "Včera",
+	"stats.today": "Dnes",
+	"stats.last-week": "Poslední týden",
+	"stats.this-week": "Tento víkend",
+	"stats.last-month": "Poslední měsíc",
+	"stats.this-month": "Tento měsíc",
+	"stats.all": "Všechny časy",
+
+	"updates": "Aktualizace",
+	"running-version": "Fungujete na <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
+	"keep-updated": "Vždy udržujte NodeBB aktuální kvůli bezpečnostním záplatám a opravám.",
+	"up-to-date": "<p>Máte <strong>aktuální verzi</strong><i class=\"fa fa-check\"></i></p>",
+	"upgrade-available": "<p>Nová verze (v%1) byla zveřejněna. Zvažte <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">aktualizaci vašeho NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>Toto je zastaralá testovací verze NodeBB. Nová verze (v%1) byla zveřejněna. Zvažte <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">aktualizaci vaší verze NodeBB</a>.</p>",
+	"prerelease-warning": "<p>Toto je <strong>zkušební</strong> verze NodeBB. Mohou se vyskytnout různé chyby.<i class=\"fa fa-exclamation-triangle\"></i></p>",
+	"running-in-development": "<span>Fórum běží ve vývojářském režimu a může být potencionálně zranitelné . Kontaktujte správce systému.</span>",
+	"latest-lookup-failed": "<p>Náhled na poslední dostupnou verzi NodeBB</p>",
+
+	"notices": "Oznámení",
+	"restart-not-required": "Restart není potřeba",
+	"restart-required": "Je potřeba restartovat",
+	"search-plugin-installed": "Rozšíření pro hledání je nainstalováno",
+	"search-plugin-not-installed": "Rozšíření pro hledání není nainstalováno",
+	"search-plugin-tooltip": "Pro aktivování funkce vyhledávání, nainstalujte rozšíření pro hledání ze stránky rozšíření.",
+
+	"control-panel": "Ovládání systému",
+	"rebuild-and-restart": "Znovu sestavit a restartovat",
+	"restart": "Restartovat",
+	"restart-warning": "Znovu sestavení nebo restartování NodeBB odpojí všechna existující připojení na několik vteřin.",
+	"restart-disabled": "Znovu sestavení a restartování vašeho NodeBB bylo zakázáno, protože se nezdá, že byste byl/a připojena přes příslušného „daemona”.",
+	"maintenance-mode": "Režim údržby",
+	"maintenance-mode-title": "Pro nastavení režimu údržby NodeBB, klikněte zde",
+	"realtime-chart-updates": "Aktualizace grafů v reálném čase",
+
+	"active-users": "Aktivní uživatelé",
+	"active-users.users": "Uživatelé",
+	"active-users.guests": "Hosté",
+	"active-users.total": "Celkově",
+	"active-users.connections": "Připojení",
+
+	"anonymous-registered-users": "Anonymní × registrovaní uživatelé",
+	"anonymous": "Anonymní",
+	"registered": "Registrovaní",
+
+	"user-presence": "Výskyt uživatele",
+	"on-categories": "V seznamu kategorii",
+	"reading-posts": "Čtení příspěvku",
+	"browsing-topics": "Prohlížení témat",
+	"recent": "Poslední",
+	"unread": "Nepřečtené",
+
+	"high-presence-topics": "Témata s vysokou účastí",
+
+	"graphs.page-views": "Zobrazení stránky",
+	"graphs.page-views-registered": "Zobrazených stránek/registrovaní",
+	"graphs.page-views-guest": "Zobrazených stránek/hosté",
+	"graphs.page-views-bot": "Zobrazených stránek/bot",
+	"graphs.unique-visitors": "Jedineční návštěvníci",
+	"graphs.registered-users": "Registrovaní uživatelé",
+	"graphs.anonymous-users": "Anonymní uživatelé",
+	"last-restarted-by": "Poslední restart od",
+	"no-users-browsing": "Nikdo si nic neprohlíží"
+}

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

@@ -9,7 +9,7 @@
 	"default": "Výchozí systémové",
 	"default-help": "Výchozí systémové znamená, že uživatel nemůže přenastavit celkové nastavení pravidel na fóru pro odesílání přehledů, které je momentálně<strong>%1</strong>",
 	"resend": "Znovu odeslat přehled",
-	"resend-all-confirm": "Jste si jist/a, že chcete ručně spustit odeslání přehledu",
+	"resend-all-confirm": "Are you sure you wish to manually execute this digest run?",
 	"resent-single": "Manuální znovu poslání přehledu bylo dokončeno",
 	"resent-day": "Znovu odeslat denní přehled",
 	"resent-week": "Znovu odeslat týdenní přehled",
@@ -18,4 +18,4 @@
 	"manual-run": "Spustit manuálně přehled:",
 
 	"no-delivery-data": "Žádná data odeslání nebyla nalezena"
-}
+}

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

@@ -1,6 +1,7 @@
 {
 	"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",
 	"chat": "Konverzace",
@@ -31,5 +32,11 @@
 	"downvote-posts": "Nesouhlasné příspěvky",
 	"delete-topics": "Odstranit témata",
 	"purge": "Vyčistit",
-	"moderate": "Moderace"
+	"moderate": "Moderace",
+
+	"admin-dashboard": "Dashboard",
+	"admin-categories": "Categories",
+	"admin-privileges": "Privileges",
+	"admin-users": "Users",
+	"admin-settings": "Settings"
 }

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

@@ -3,13 +3,13 @@
 	"bg-color": "Barva pozadí",
 	"text-color": "Barva textu",
 	"create-modify": "Vytvořit a upravit značky",
-	"description": "Vyberte značky pomocí kliknutí a/nebo přetažením, pro vícenásobný výběr, použijte klávesu Shift.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Vytvořit značku",
 	"modify": "Upravit značky",
 	"rename": "Přejmenovat značky",
 	"delete": "Odstranit vybrané značky",
 	"search": "Hledat značky...",
-	"settings": "Pro přejití na stránku s nastavením značek, klikněte <a href=\"%1\">zde</a>.",
+	"settings": "Tags Settings",
 	"name": "Název značky",
 
 	"alerts.editing": "Editing tag(s)",

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

@@ -12,8 +12,9 @@
 	"unban": "Zrušit zákaz uživatele",
 	"reset-lockout": "Obnovit uzamčení",
 	"reset-flags": "Obnovit označení",
-	"delete": "Odstranit uživatele",
-	"purge": "Odstranit uživatele a obsah",
+	"delete": "Delete <strong>User(s)</strong>",
+	"delete-content": "Delete User(s) <strong>Content</strong>",
+	"purge": "Delete <strong>User(s)</strong> and <strong>Content</strong>",
 	"download-csv": "Stáhnout jako CSV",
 	"manage-groups": "Manage Groups",
 	"add-group": "Add Group",
@@ -93,9 +94,11 @@
 	"alerts.validate-email-success": "E-maily byly ověřeny",
 	"alerts.validate-force-password-reset-success": "Uživatelské heslo bylo resetováno a přihlašovací relace byla ukončena.",
 	"alerts.password-reset-confirm": "Chcete poslat těmto uživatelům e-mail pro resetování hesla?",
-	"alerts.confirm-delete": "<b>Upozornění</b><br/>Opravdu chcete odstranit uživatele?<br/>Tento úkon se nedá vrátit. Budou odstraněni jen uživatelé jako takový, jejich příspěvky a témata zůstanou.",
+	"alerts.confirm-delete": "<strong>Warning!</strong><p>Do you really want to delete <strong>user(s)</strong>?</p><p>This action is not reversible! Only the user account will be deleted, their posts and topics will remain.</p>",
 	"alerts.delete-success": "Uživatel byl odstraněn.",
-	"alerts.confirm-purge": "<b>Upozornění</b><br/>Opravdu chcete odstranit uživatele a jeho obsah?<br/>Tento úkon je nevratný. Všechna uživatelská data a obsah bude smazán.",
+	"alerts.confirm-delete-content": "<strong>Warning!</strong><p>Do you really want to delete these user(s) <strong>content</strong>?</p><p>This action is not reversible! The users' accounts will remain, but their posts and topics will be deleted.</p>",
+	"alerts.delete-content-success": "User(s) Content Deleted!",
+	"alerts.confirm-purge": "<strong>Warning!</strong><p>Do you really want to delete <strong>user(s) and their content</strong>?</p><p>This action is not reversible! All user data and content will be erased!</p>",
 	"alerts.create": "Vytvořit uživatele",
 	"alerts.button-create": "Vytvořit",
 	"alerts.button-cancel": "Zrušit",

public/language/cs/admin/menu.json

@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "Všeobecné",
-	"general/dashboard": "Nástěnka",
-	"general/homepage": "Domovská stránka",
-	"general/navigation": "Navigace",
-	"general/languages": "Jazyky",
-	"general/sounds": "Zvuky",
-	"general/social": "Sociální",
 
 	"section-manage": "Spravovat",
 	"manage/categories": "Kategorie",
@@ -22,17 +17,22 @@
 
 	"section-settings": "Nastavení",
 	"settings/general": "Všeobecné",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputace",
 	"settings/email": "E-mail",
-	"settings/user": "Uživatel",
-	"settings/group": "Skupina",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Hosté",
 	"settings/uploads": "Nahrané",
-	"settings/post": "Příspěvěk",
-	"settings/chat": "Konverzace",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Stránkování",
 	"settings/tags": "Značky",
 	"settings/notifications": "Oznámení",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Webový prohledávač",
 	"settings/sockets": "Sockety",

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

@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Hranice prodlevy smyčky události (v milisekundách)",
 	"traffic.event-lag-help": "Snížení této hodnoty sníží čas pro načtení stránky, ale taky zobrazí více uživatelům zprávu o „přetížení stránek”. (je vyžadován restart)",
 	"traffic.lag-check-interval": "Kontrola intervalů (v milisekundách)",
-	"traffic.lag-check-interval-help": "Snížení této hodnoty způsobí, že NodeBB bude citlivější na zatížení načítání stránek a na kontrolu tohoto zatížení. (je vyžadován restart)"
+	"traffic.lag-check-interval-help": "Snížení této hodnoty způsobí, že NodeBB bude citlivější na zatížení načítání stránek a na kontrolu tohoto zatížení. (je vyžadován restart)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }

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

@@ -0,0 +1,8 @@
+{
+	"home-page": "Domovská stránka",
+	"description": "Vyberte, kterou stránku chcete zobrazit, jakmile uživatel přejde na výchozí URL vašeho fóra.",
+	"home-page-route": "Cesta k domovské stránce",
+	"custom-route": "Upravit cestu",
+	"allow-user-home-pages": "Povolit uživatelům domovské stránky",
+	"home-page-title": "Titulka domovské stránky (výchozí „Domů”)"
+}

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

@@ -0,0 +1,6 @@
+{
+	"language-settings": "Nastavení jazyka",
+	"description": "Výchozí jazyk určuje nastavení jazyka pro všechny uživatele navštěvující vaše fórum. <br />Každý uživatel si může pak nastavit výchozí jazyk na stránce nastavení účtu.",
+	"default-language": "Výchozí jazyk",
+	"auto-detect": "Automaticky detekovat nastavení jazyka pro hosty"
+}

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

@@ -0,0 +1,23 @@
+{
+	"icon": "Ikona:",
+	"change-icon": "změnit",
+	"route": "Cesta:",
+	"tooltip": "Tip:",
+	"text": "Text:",
+	"text-class": "Textová třída: <small>doporučené</small>",
+	"class": "Třída: <small>doporučené</small>",
+	"id": "ID: <small>doporučené</small>",
+
+	"properties": "Vlastnosti:",
+	"groups": "Skupiny:",
+	"open-new-window": "Otevřít v novém okně",
+
+	"btn.delete": "Odstranit",
+	"btn.disable": "Zakázat",
+	"btn.enable": "Povolit",
+
+	"available-menu-items": "Dostupné položky nabídky",
+	"custom-route": "Upravit cestu",
+	"core": "jádro",
+	"plugin": "rozšíření"
+}

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

@@ -0,0 +1,5 @@
+{
+	"post-sharing": "Sdílení příspěvku",
+	"info-plugins-additional": "Rozšíření mohou přidat další dodatečné sítě pro sdílení příspěvků.",
+	"save-success": "Úspěšně uložené sítě sdílející příspěvky."
+}

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

@@ -0,0 +1,9 @@
+{
+	"notifications": "Upozornění",
+	"chat-messages": "Zprávy konverzace",
+	"play-sound": "Přehrát",
+	"incoming-message": "Příchozí zpráva",
+	"outgoing-message": "Odchozí zpráva",
+	"upload-new-sound": "Nahrát nový zvuk",
+	"saved": "Nastavení bylo uloženo"
+}

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

@@ -1,10 +1,10 @@
 {
     "tag": "Nastavení značky",
+    "link-to-manage": "Manage Tags",
     "min-per-topic": "Minimální počet značek/téma",
     "max-per-topic": "maximální počet značek/téma",
     "min-length": "Minimální délka značky",
     "max-length": "Maximální délka značky",
-    "goto-manage": "Pro přejití na stránku správy značek, klikněte zde.",
     "related-topics": "Související témata",
     "max-related-topics": "Maximální počet zobrazených souvisejících témat (je-li podporováno motivem)"
 }

public/language/cs/flags.json

@@ -27,11 +27,14 @@
 	"filter-cid-all": "Všechny kategorie",
 	"apply-filters": "Použít filtry",
 
-	"quick-links": "Rychlé odkazy",
+	"quick-actions": "Quick Actions",
 	"flagged-user": "Označený uživatel",
 	"view-profile": "Zobrazit profil",
 	"start-new-chat": "Začít novou konverzaci",
 	"go-to-target": "Zobrazit cílové označení",
+	"delete-post": "Delete Post",
+	"purge-post": "Purge Post",
+	"restore-post": "Restore Post",
 
 	"user-view": "Zobrazit profil",
 	"user-edit": "Upravit profil",
@@ -40,7 +43,7 @@
 	"add-note": "Přidat poznámku",
 	"no-notes": "Žádné sdílené poznámky.",
 
-	"history": "Historie označení",
+	"history": "Account & Flag History",
 	"back": "Zpět k seznamu označení",
 	"no-history": "Žádná historie označení.",
 

public/language/cs/global.json

@@ -53,6 +53,7 @@
     "posts": "Příspěvky",
     "best": "Nejlepší",
     "votes": "Počet hlasů",
+    "voters": "Voters",
     "upvoters": "Souhlasník",
     "upvoted": "Souhlasů",
     "downvoters": "Nesouhlasník",

public/language/cs/notifications.json

@@ -35,6 +35,7 @@
     "user_posted_to_dual": "<strong>%1</strong> a <strong>%2</strong> odpověděli na: <strong>%3</strong>",
     "user_posted_to_multiple": "<strong>%1</strong> a %2 další/ch odpověděli na <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> založil nové téma: <strong>%2</strong>",
+    "user_edited_post": "<strong>%1</strong> has edited a post in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> vás začal sledovat.",
     "user_started_following_you_dual": "<strong>%1</strong> a <strong>%2</strong> vás začali sledovat.",
     "user_started_following_you_multiple": "<strong>%1</strong> a %2 další/ch vás začali sledovat.",
@@ -53,6 +54,7 @@
     "notificationType_upvote": "Vyjádří-li někdo souhlas s vaším příspěvkem",
     "notificationType_new-topic": "Začne-li někdo sledovat příspěvky a téma",
     "notificationType_new-reply": "Bude-li přidán nový příspěvek v tématu, které sledujete",
+    "notificationType_post-edit": "When a post is edited in a topic you are watching",
     "notificationType_follow": "Začne-li vás někdo sledovat",
     "notificationType_new-chat": "Obdržíte-li novou konverzační zprávu",
     "notificationType_group-invite": "Obdržíte-li pozvání ke skupině",

public/language/cs/tags.json

@@ -3,5 +3,6 @@
     "tags": "Označení",
     "enter_tags_here": "Zde vložte označení, každé o délce %1 až %2 znaků.",
     "enter_tags_here_short": "Zadejte označení…",
-    "no_tags": "Zatím tu není žádné označení."
+    "no_tags": "Zatím tu není žádné označení.",
+    "select_tags": "Select Tags"
 }

public/language/cs/user.json

@@ -8,13 +8,20 @@
     "email": "E-mail",
     "confirm_email": "Potvrdit e-mail",
     "account_info": "Informace o účtu",
+    "admin_actions_label": "Administrative Actions",
     "ban_account": "Zablokovat účet",
     "ban_account_confirm": "Opravdu chcete zablokovat tohoto uživatele?",
     "unban_account": "Odblokovat účet",
     "delete_account": "Odstranit účet",
-    "delete_account_confirm": "Jste si jist/a, že chcete odstranit Váš účet?<br /><strong> Tento úkon je nevratný a již nebudete schopen/a obnovit vaše data</strong><br /><br />Pro smazání účtu, potvrďte vaším heslem.",
-    "delete_this_account_confirm": "Opravdu chcete odstranit tento účet? <br /><strong>Tato akce je nevratná a již nebude žádná možnost obnovení vašich dat</strong><br /><br />",
+    "delete_account_as_admin": "Delete <strong>Account</strong>",
+    "delete_content": "Delete Account <strong>Content</strong>",
+    "delete_all": "Delete <strong>Account</strong> and <strong>Content</strong>",
+    "delete_account_confirm": "Are you sure you want to anonymize your posts and delete your account?<br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your password to confirm that you wish to destroy this account.",
+    "delete_this_account_confirm": "Are you sure you want to delete this account while leaving its contents behind?<br /><strong>This action is irreversible, posts will be anonymized, and you will not be able to restore post associations with the deleted account</strong><br /><br />",
+    "delete_account_content_confirm": "Are you sure you want to delete this account's content (posts/topics/uploads)? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
+    "delete_all_confirm": "Are you sure you want to delete this account and all of its content (posts/topics/uploads)? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
     "account-deleted": "Účet odstraněn",
+    "account-content-deleted": "Account content deleted",
     "fullname": "Jméno a příjmení",
     "website": "Webové stránky",
     "location": "Poloha",
@@ -144,6 +151,7 @@
     "info.ban-history": "Poslední historie blokovaných",
     "info.no-ban-history": "Tento uživatel nebyl nikdy zablokován",
     "info.banned-until": "Zablokován do %1",
+    "info.banned-expiry": "Expiry",
     "info.banned-permanently": "Trvale zablokován",
     "info.banned-reason-label": "Důvod",
     "info.banned-no-reason": "Bez důvodu",
@@ -170,7 +178,7 @@
     "consent.right_to_erasure_description": "Kdykoliv můžete změnit svůj souhlas se shromažďováním dat a/nebo zpracování odstraněním vašeho účtu. Váš profil bude odstraněn, ačkoliv vaše příspěvky budou zachovány. Pokud si přejete odstranění <strong>jak účtu tak i obsahu</strong>, prosím kontaktujte správce této stránky.",
     "consent.right_to_data_portability": "Máte právo na přenositelnost dat",
     "consent.right_to_data_portability_description": "Můžete od nás požadovat strojně čitelné data, která byla sesbírána o Vás a vašem účtu. Učiníte tak kliknutím na tlačítka zobrazená níže.",
-    "consent.export_profile": "Exportovat profil (*.csv)",
+    "consent.export_profile": "Export Profile (.json)",
     "consent.export_uploads": "Exportovat nahraný obsah (*.zip)",
     "consent.export_posts": "Exportovat příspěvky (*.csv)"
 }

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

@@ -2,6 +2,7 @@
 	"events": "Events",
 	"no-events": "There are no events",
 	"control-panel": "Kontrol Panel for Begivenheder",
+	"delete-events": "Delete Events",
 	"filters": "Filters",
 	"filters-apply": "Apply Filters",
 	"filter-type": "Event Type",

public/language/da/admin/dashboard.json

@@ -0,0 +1,79 @@
+{
+	"forum-traffic": "Forum Traffik",
+	"page-views": "Side Visninger",
+	"unique-visitors": "Unikke Besøgere",
+	"new-users": "New Users",
+	"posts": "Posts",
+	"topics": "Topics",
+	"page-views-seven": "Last 7 Days",
+	"page-views-thirty": "Last 30 Days",
+	"page-views-last-day": "Last 24 hours",
+	"page-views-custom": "Custom Date Range",
+	"page-views-custom-start": "Range Start",
+	"page-views-custom-end": "Range End",
+	"page-views-custom-help": "Enter a date range of page views you would like to view. If no date picker is available, the accepted format is <code>YYYY-MM-DD</code>",
+	"page-views-custom-error": "Please enter a valid date range in the format <code>YYYY-MM-DD</code>",
+
+	"stats.yesterday": "Yesterday",
+	"stats.today": "Today",
+	"stats.last-week": "Last Week",
+	"stats.this-week": "This Week",
+	"stats.last-month": "Last Month",
+	"stats.this-month": "This Month",
+	"stats.all": "All Time",
+
+	"updates": "Opdateringer",
+	"running-version": "Du kører <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
+	"keep-updated": "Altid sikrer dig at din NodeBB er opdateret for de seneste sikkerheds og bug rettelser.",
+	"up-to-date": "<p>Du er <strong>opdateret</strong> <i class=\"fa fa-check\"></i></p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">upgrading your NodeBB</a>.</p>",
+	"prerelease-warning": "<p>Dette er en <strong>pre-release</strong> udgave af NodeBB. Uforventede bugs kan forekomme.<i class=\"fa fa-exclamation-triangle\"></i></p>",
+	"running-in-development": "<span>Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.</span>",
+	"latest-lookup-failed": "<p>Failed to look up latest available version of NodeBB</p>",
+
+	"notices": "Varsler",
+	"restart-not-required": "Restart not required",
+	"restart-required": "Restart required",
+	"search-plugin-installed": "Search Plugin installed",
+	"search-plugin-not-installed": "Search Plugin not installed",
+	"search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality",
+
+	"control-panel": "System Kontrol",
+	"rebuild-and-restart": "Rebuild &amp; Restart",
+	"restart": "Restart",
+	"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
+	"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
+	"maintenance-mode": "Maintenance Mode",
+	"maintenance-mode-title": "Click here to set up maintenance mode for NodeBB",
+	"realtime-chart-updates": "Realtime Chart Updates",
+
+	"active-users": "Active Users",
+	"active-users.users": "Users",
+	"active-users.guests": "Guests",
+	"active-users.total": "Total",
+	"active-users.connections": "Connections",
+
+	"anonymous-registered-users": "Anonymous vs Registered Users",
+	"anonymous": "Anonymous",
+	"registered": "Registered",
+
+	"user-presence": "User Presence",
+	"on-categories": "On categories list",
+	"reading-posts": "Reading posts",
+	"browsing-topics": "Browsing topics",
+	"recent": "Recent",
+	"unread": "Unread",
+
+	"high-presence-topics": "High Presence Topics",
+
+	"graphs.page-views": "Page Views",
+	"graphs.page-views-registered": "Page Views Registered",
+	"graphs.page-views-guest": "Page Views Guest",
+	"graphs.page-views-bot": "Page Views Bot",
+	"graphs.unique-visitors": "Unique Visitors",
+	"graphs.registered-users": "Registered Users",
+	"graphs.anonymous-users": "Anonymous Users",
+	"last-restarted-by": "Last restarted by",
+	"no-users-browsing": "No users browsing"
+}

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

@@ -9,7 +9,7 @@
 	"default": "System default",
 	"default-help": "<em>System default</em> means the user has not explicitly overridden the global forum setting for digests, which is currently: &quot;<strong>%1</strong>&quot;",
 	"resend": "Resend Digest",
-	"resend-all-confirm": "Are you sure you wish to mnually execute this digest run?",
+	"resend-all-confirm": "Are you sure you wish to manually execute this digest run?",
 	"resent-single": "Manual digest resend completed",
 	"resent-day": "Daily digest resent",
 	"resent-week": "Weekly digest resent",
@@ -18,4 +18,4 @@
 	"manual-run": "Manual digest run:",
 
 	"no-delivery-data": "No delivery data found"
-}
+}

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

@@ -1,6 +1,7 @@
 {
 	"global": "Global",
 	"global.no-users": "No user-specific global privileges.",
+	"admin": "Admin",
 	"group-privileges": "Group Privileges",
 	"user-privileges": "User Privileges",
 	"chat": "Chat",
@@ -31,5 +32,11 @@
 	"downvote-posts": "Downvote Posts",
 	"delete-topics": "Delete Topics",
 	"purge": "Purge",
-	"moderate": "Moderate"
+	"moderate": "Moderate",
+
+	"admin-dashboard": "Dashboard",
+	"admin-categories": "Categories",
+	"admin-privileges": "Privileges",
+	"admin-users": "Users",
+	"admin-settings": "Settings"
 }

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

@@ -3,13 +3,13 @@
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",
 
 	"alerts.editing": "Editing tag(s)",

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

@@ -12,8 +12,9 @@
 	"unban": "Unban User(s)",
 	"reset-lockout": "Reset Lockout",
 	"reset-flags": "Reset Flags",
-	"delete": "Delete User(s)",
-	"purge": "Delete User(s) and Content",
+	"delete": "Delete <strong>User(s)</strong>",
+	"delete-content": "Delete User(s) <strong>Content</strong>",
+	"purge": "Delete <strong>User(s)</strong> and <strong>Content</strong>",
 	"download-csv": "Download CSV",
 	"manage-groups": "Manage Groups",
 	"add-group": "Add Group",
@@ -93,9 +94,11 @@
 	"alerts.validate-email-success": "Emails validated",
 	"alerts.validate-force-password-reset-success": "User(s) passwords have been reset and their existing sessions have been revoked.",
 	"alerts.password-reset-confirm": "Do you want to send password reset email(s) to these user(s)?",
-	"alerts.confirm-delete": "<b>Warning!</b><br/>Do you really want to delete user(s)?<br/> This action is not reversable! Only the user account will be deleted, their posts and topics will remain.",
+	"alerts.confirm-delete": "<strong>Warning!</strong><p>Do you really want to delete <strong>user(s)</strong>?</p><p>This action is not reversible! Only the user account will be deleted, their posts and topics will remain.</p>",
 	"alerts.delete-success": "User(s) Deleted!",
-	"alerts.confirm-purge": "<b>Warning!</b><br/>Do you really want to delete user(s) and their content?<br/> This action is not reversable! All user data and content will be erased!",
+	"alerts.confirm-delete-content": "<strong>Warning!</strong><p>Do you really want to delete these user(s) <strong>content</strong>?</p><p>This action is not reversible! The users' accounts will remain, but their posts and topics will be deleted.</p>",
+	"alerts.delete-content-success": "User(s) Content Deleted!",
+	"alerts.confirm-purge": "<strong>Warning!</strong><p>Do you really want to delete <strong>user(s) and their content</strong>?</p><p>This action is not reversible! All user data and content will be erased!</p>",
 	"alerts.create": "Create User",
 	"alerts.button-create": "Create",
 	"alerts.button-cancel": "Cancel",

public/language/da/admin/menu.json

@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "General",
-	"general/dashboard": "Dashboard",
-	"general/homepage": "Home Page",
-	"general/navigation": "Navigation",
-	"general/languages": "Languages",
-	"general/sounds": "Sounds",
-	"general/social": "Social",
 
 	"section-manage": "Manage",
 	"manage/categories": "Categories",
@@ -22,17 +17,22 @@
 
 	"section-settings": "Settings",
 	"settings/general": "General",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputation",
 	"settings/email": "Email",
-	"settings/user": "User",
-	"settings/group": "Group",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Guests",
 	"settings/uploads": "Uploads",
-	"settings/post": "Post",
-	"settings/chat": "Chat",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Pagination",
 	"settings/tags": "Tags",
 	"settings/notifications": "Notifications",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",

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

@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }

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

@@ -0,0 +1,8 @@
+{
+	"home-page": "Home Page",
+	"description": "Choose what page is shown when users navigate to the root URL of your forum.",
+	"home-page-route": "Home Page Route",
+	"custom-route": "Custom Route",
+	"allow-user-home-pages": "Allow User Home Pages",
+	"home-page-title": "Title of the home page (default \"Home\")"
+}

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

@@ -0,0 +1,6 @@
+{
+	"language-settings": "Language Settings",
+	"description": "The default language determines the language settings for all users who are visiting your forum. <br />Individual users can override the default language on their account settings page.",
+	"default-language": "Default Language",
+	"auto-detect": "Auto Detect Language Setting for Guests"
+}

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

@@ -0,0 +1,23 @@
+{
+	"icon": "Icon:",
+	"change-icon": "change",
+	"route": "Route:",
+	"tooltip": "Tooltip:",
+	"text": "Text:",
+	"text-class": "Text Class: <small>optional</small>",
+	"class": "Class: <small>optional</small>",
+	"id": "ID: <small>optional</small>",
+
+	"properties": "Properties:",
+	"groups": "Groups:",
+	"open-new-window": "Open in a new window",
+
+	"btn.delete": "Delete",
+	"btn.disable": "Disable",
+	"btn.enable": "Enable",
+
+	"available-menu-items": "Available Menu Items",
+	"custom-route": "Custom Route",
+	"core": "core",
+	"plugin": "plugin"
+}

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

@@ -0,0 +1,5 @@
+{
+	"post-sharing": "Post Sharing",
+	"info-plugins-additional": "Plugins can add additional networks for sharing posts.",
+	"save-success": "Successfully saved Post Sharing Networks!"
+}

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

@@ -0,0 +1,9 @@
+{
+	"notifications": "Notifications",
+	"chat-messages": "Chat Messages",
+	"play-sound": "Play",
+	"incoming-message": "Incoming Message",
+	"outgoing-message": "Outgoing Message",
+	"upload-new-sound": "Upload New Sound",
+	"saved": "Settings Saved"
+}