0.8.1

updated shrinkwrap file
Merge branch 'master' into v0.8.x
2025-12-17 22:10:23 +01:00 · 2015-09-02 16:16:30 -04:00 · 2015-09-02 16:14:55 -04:00 · 2015-09-02 16:11:16 -04:00 · 2015-09-02 16:10:57 -04:00 · 2015-09-02 16:07:20 -04:00
838 changed files with 32662 additions and 11058 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,13 @@
+# These files are text and should be normalized (convert crlf => lf)
+*.json		text
+*.css		text
+*.less		text
+*.tpl		text
+*.html		text
+*.js		text
+*.md		text
+
+# Images should be treated as binary
+# (binary is a macro for -text -diff)
+*.png		binary
+*.jpg		binary
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@ public/css/*.css
 *.sublime-project
 *.sublime-workspace
 .project
-.idea
 *.swp
 Vagrantfile
 .vagrant
@@ -31,4 +30,14 @@ pidfile
 /public/stylesheet.css
 /public/admin.css
 /public/nodebb.min.js
-/public/nodebb.min.js.map
+/public/nodebb.min.js.map
+
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
+*.iml
+
+## Directory-based project format:
+.idea/
+
+## File-based project format:
+*.ipr
+*.iws
--- a/.tx/config
+++ b/.tx/config
@@ -9,6 +9,7 @@ trans.ar = public/language/ar/category.json
 trans.bn = public/language/bn/category.json
 trans.bg = public/language/bg/category.json
 trans.cs = public/language/cs/category.json
+trans.da = public/language/da/category.json
 trans.de = public/language/de/category.json
 trans.el = public/language/el/category.json
 trans.en_US = public/language/en_US/category.json
@@ -32,8 +33,10 @@ trans.pl = public/language/pl/category.json
 trans.pt_BR = public/language/pt_BR/category.json
 trans.ru = public/language/ru/category.json
 trans.ro = public/language/ro/category.json
+trans.rw = public/language/rw/category.json
 trans.sc = public/language/sc/category.json
 trans.sk = public/language/sk/category.json
+trans.sr = public/language/sr/category.json
 trans.sv = public/language/sv/category.json
 trans.th = public/language/th/category.json
 trans.tr = public/language/tr/category.json
@@ -50,6 +53,7 @@ trans.ar = public/language/ar/login.json
 trans.bn = public/language/bn/login.json
 trans.bg = public/language/bg/login.json
 trans.cs = public/language/cs/login.json
+trans.da = public/language/da/login.json
 trans.de = public/language/de/login.json
 trans.el = public/language/el/login.json
 trans.en_US = public/language/en_US/login.json
@@ -73,8 +77,10 @@ trans.pl = public/language/pl/login.json
 trans.pt_BR = public/language/pt_BR/login.json
 trans.ru = public/language/ru/login.json
 trans.ro = public/language/ro/login.json
+trans.rw = public/language/rw/login.json
 trans.sc = public/language/sc/login.json
 trans.sk = public/language/sk/login.json
+trans.sr = public/language/sr/login.json
 trans.sv = public/language/sv/login.json
 trans.th = public/language/th/login.json
 trans.tr = public/language/tr/login.json
@@ -84,12 +90,14 @@ trans.zh_TW = public/language/zh_TW/login.json
 type = KEYVALUEJSON

 [nodebb.recent]
+file_filter = public/language/<lang>/recent.json
 source_file = public/language/en_GB/recent.json
 source_lang = en_GB
 trans.ar = public/language/ar/recent.json
 trans.bn = public/language/bn/recent.json
 trans.bg = public/language/bg/recent.json
 trans.cs = public/language/cs/recent.json
+trans.da = public/language/da/recent.json
 trans.de = public/language/de/recent.json
 trans.el = public/language/el/recent.json
 trans.en_US = public/language/en_US/recent.json
@@ -113,8 +121,10 @@ trans.pl = public/language/pl/recent.json
 trans.pt_BR = public/language/pt_BR/recent.json
 trans.ru = public/language/ru/recent.json
 trans.ro = public/language/ro/recent.json
+trans.rw = public/language/rw/recent.json
 trans.sc = public/language/sc/recent.json
 trans.sk = public/language/sk/recent.json
+trans.sr = public/language/sr/recent.json
 trans.sv = public/language/sv/recent.json
 trans.th = public/language/th/recent.json
 trans.tr = public/language/tr/recent.json
@@ -124,12 +134,14 @@ trans.zh_TW = public/language/zh_TW/recent.json
 type = KEYVALUEJSON

 [nodebb.unread]
+file_filter = public/language/<lang>/unread.json
 source_file = public/language/en_GB/unread.json
 source_lang = en_GB
 trans.ar = public/language/ar/unread.json
 trans.bn = public/language/bn/unread.json
 trans.bg = public/language/bg/unread.json
 trans.cs = public/language/cs/unread.json
+trans.da = public/language/da/unread.json
 trans.de = public/language/de/unread.json
 trans.el = public/language/el/unread.json
 trans.en_US = public/language/en_US/unread.json
@@ -153,8 +165,10 @@ trans.pl = public/language/pl/unread.json
 trans.pt_BR = public/language/pt_BR/unread.json
 trans.ru = public/language/ru/unread.json
 trans.ro = public/language/ro/unread.json
+trans.rw = public/language/rw/unread.json
 trans.sc = public/language/sc/unread.json
 trans.sk = public/language/sk/unread.json
+trans.sr = public/language/sr/unread.json
 trans.sv = public/language/sv/unread.json
 trans.th = public/language/th/unread.json
 trans.tr = public/language/tr/unread.json
@@ -164,12 +178,14 @@ trans.zh_TW = public/language/zh_TW/unread.json
 type = KEYVALUEJSON

 [nodebb.modules]
+file_filter = public/language/<lang>/modules.json
 source_file = public/language/en_GB/modules.json
 source_lang = en_GB
 trans.ar = public/language/ar/modules.json
 trans.bn = public/language/bn/modules.json
 trans.bg = public/language/bg/modules.json
 trans.cs = public/language/cs/modules.json
+trans.da = public/language/da/modules.json
 trans.de = public/language/de/modules.json
 trans.el = public/language/el/modules.json
 trans.en_US = public/language/en_US/modules.json
@@ -193,8 +209,10 @@ trans.pl = public/language/pl/modules.json
 trans.pt_BR = public/language/pt_BR/modules.json
 trans.ru = public/language/ru/modules.json
 trans.ro = public/language/ro/modules.json
+trans.rw = public/language/rw/modules.json
 trans.sc = public/language/sc/modules.json
 trans.sk = public/language/sk/modules.json
+trans.sr = public/language/sr/modules.json
 trans.sv = public/language/sv/modules.json
 trans.th = public/language/th/modules.json
 trans.tr = public/language/tr/modules.json
@@ -204,12 +222,14 @@ trans.zh_TW = public/language/zh_TW/modules.json
 type = KEYVALUEJSON

 [nodebb.register]
+file_filter = public/language/<lang>/register.json
 source_file = public/language/en_GB/register.json
 source_lang = en_GB
 trans.ar = public/language/ar/register.json
 trans.bn = public/language/bn/register.json
 trans.bg = public/language/bg/register.json
 trans.cs = public/language/cs/register.json
+trans.da = public/language/da/register.json
 trans.de = public/language/de/register.json
 trans.el = public/language/el/register.json
 trans.en_US = public/language/en_US/register.json
@@ -233,8 +253,10 @@ trans.pl = public/language/pl/register.json
 trans.pt_BR = public/language/pt_BR/register.json
 trans.ru = public/language/ru/register.json
 trans.ro = public/language/ro/register.json
+trans.rw = public/language/rw/register.json
 trans.sc = public/language/sc/register.json
 trans.sk = public/language/sk/register.json
+trans.sr = public/language/sr/register.json
 trans.sv = public/language/sv/register.json
 trans.th = public/language/th/register.json
 trans.tr = public/language/tr/register.json
@@ -244,12 +266,14 @@ trans.zh_TW = public/language/zh_TW/register.json
 type = KEYVALUEJSON

 [nodebb.user]
+file_filter = public/language/<lang>/user.json
 source_file = public/language/en_GB/user.json
 source_lang = en_GB
 trans.ar = public/language/ar/user.json
 trans.bn = public/language/bn/user.json
 trans.bg = public/language/bg/user.json
 trans.cs = public/language/cs/user.json
+trans.da = public/language/da/user.json
 trans.de = public/language/de/user.json
 trans.el = public/language/el/user.json
 trans.en_US = public/language/en_US/user.json
@@ -273,8 +297,10 @@ trans.pl = public/language/pl/user.json
 trans.pt_BR = public/language/pt_BR/user.json
 trans.ru = public/language/ru/user.json
 trans.ro = public/language/ro/user.json
+trans.rw = public/language/rw/user.json
 trans.sc = public/language/sc/user.json
 trans.sk = public/language/sk/user.json
+trans.sr = public/language/sr/user.json
 trans.sv = public/language/sv/user.json
 trans.th = public/language/th/user.json
 trans.tr = public/language/tr/user.json
@@ -284,12 +310,14 @@ trans.zh_TW = public/language/zh_TW/user.json
 type = KEYVALUEJSON

 [nodebb.global]
+file_filter = public/language/<lang>/global.json
 source_file = public/language/en_GB/global.json
 source_lang = en_GB
 trans.ar = public/language/ar/global.json
 trans.bn = public/language/bn/global.json
 trans.bg = public/language/bg/global.json
 trans.cs = public/language/cs/global.json
+trans.da = public/language/da/global.json
 trans.de = public/language/de/global.json
 trans.el = public/language/el/global.json
 trans.en_US = public/language/en_US/global.json
@@ -313,8 +341,10 @@ trans.pl = public/language/pl/global.json
 trans.pt_BR = public/language/pt_BR/global.json
 trans.ru = public/language/ru/global.json
 trans.ro = public/language/ro/global.json
+trans.rw = public/language/rw/global.json
 trans.sc = public/language/sc/global.json
 trans.sk = public/language/sk/global.json
+trans.sr = public/language/sr/global.json
 trans.sv = public/language/sv/global.json
 trans.th = public/language/th/global.json
 trans.tr = public/language/tr/global.json
@@ -324,12 +354,14 @@ trans.zh_TW = public/language/zh_TW/global.json
 type = KEYVALUEJSON

 [nodebb.notifications]
+file_filter = public/language/<lang>/notifications.json
 source_file = public/language/en_GB/notifications.json
 source_lang = en_GB
 trans.ar = public/language/ar/notifications.json
 trans.bn = public/language/bn/notifications.json
 trans.bg = public/language/bg/notifications.json
 trans.cs = public/language/cs/notifications.json
+trans.da = public/language/da/notifications.json
 trans.de = public/language/de/notifications.json
 trans.el = public/language/el/notifications.json
 trans.en_US = public/language/en_US/notifications.json
@@ -353,8 +385,10 @@ trans.pl = public/language/pl/notifications.json
 trans.pt_BR = public/language/pt_BR/notifications.json
 trans.ru = public/language/ru/notifications.json
 trans.ro = public/language/ro/notifications.json
+trans.rw = public/language/rw/notifications.json
 trans.sc = public/language/sc/notifications.json
 trans.sk = public/language/sk/notifications.json
+trans.sr = public/language/sr/notifications.json
 trans.sv = public/language/sv/notifications.json
 trans.th = public/language/th/notifications.json
 trans.tr = public/language/tr/notifications.json
@@ -364,12 +398,14 @@ trans.zh_TW = public/language/zh_TW/notifications.json
 type = KEYVALUEJSON

 [nodebb.reset_password]
+file_filter = public/language/<lang>/reset_password.json
 source_file = public/language/en_GB/reset_password.json
 source_lang = en_GB
 trans.ar = public/language/ar/reset_password.json
 trans.bn = public/language/bn/reset_password.json
 trans.bg = public/language/bg/reset_password.json
 trans.cs = public/language/cs/reset_password.json
+trans.da = public/language/da/reset_password.json
 trans.de = public/language/de/reset_password.json
 trans.el = public/language/el/reset_password.json
 trans.en_US = public/language/en_US/reset_password.json
@@ -393,8 +429,10 @@ trans.pl = public/language/pl/reset_password.json
 trans.pt_BR = public/language/pt_BR/reset_password.json
 trans.ru = public/language/ru/reset_password.json
 trans.ro = public/language/ro/reset_password.json
+trans.rw = public/language/rw/reset_password.json
 trans.sc = public/language/sc/reset_password.json
 trans.sk = public/language/sk/reset_password.json
+trans.sr = public/language/sr/reset_password.json
 trans.sv = public/language/sv/reset_password.json
 trans.th = public/language/th/reset_password.json
 trans.tr = public/language/tr/reset_password.json
@@ -404,12 +442,14 @@ trans.zh_TW = public/language/zh_TW/reset_password.json
 type = KEYVALUEJSON

 [nodebb.users]
+file_filter = public/language/<lang>/users.json
 source_file = public/language/en_GB/users.json
 source_lang = en_GB
 trans.ar = public/language/ar/users.json
 trans.bn = public/language/bn/users.json
 trans.bg = public/language/bg/users.json
 trans.cs = public/language/cs/users.json
+trans.da = public/language/da/users.json
 trans.de = public/language/de/users.json
 trans.el = public/language/el/users.json
 trans.en_US = public/language/en_US/users.json
@@ -433,8 +473,10 @@ trans.pl = public/language/pl/users.json
 trans.pt_BR = public/language/pt_BR/users.json
 trans.ru = public/language/ru/users.json
 trans.ro = public/language/ro/users.json
+trans.rw = public/language/rw/users.json
 trans.sc = public/language/sc/users.json
 trans.sk = public/language/sk/users.json
+trans.sr = public/language/sr/users.json
 trans.sv = public/language/sv/users.json
 trans.th = public/language/th/users.json
 trans.tr = public/language/tr/users.json
@@ -443,13 +485,15 @@ trans.zh_CN = public/language/zh_CN/users.json
 trans.zh_TW = public/language/zh_TW/users.json
 type = KEYVALUEJSON

-[nodebb.language]
+[nodebb.language-1]
+file_filter = public/language/<lang>/language.json
 source_file = public/language/en_GB/language.json
 source_lang = en_GB
 trans.ar = public/language/ar/language.json
 trans.bn = public/language/bn/language.json
 trans.bg = public/language/bg/language.json
 trans.cs = public/language/cs/language.json
+trans.da = public/language/da/language.json
 trans.de = public/language/de/language.json
 trans.el = public/language/el/language.json
 trans.en_US = public/language/en_US/language.json
@@ -473,8 +517,10 @@ trans.pl = public/language/pl/language.json
 trans.pt_BR = public/language/pt_BR/language.json
 trans.ru = public/language/ru/language.json
 trans.ro = public/language/ro/language.json
+trans.rw = public/language/rw/language.json
 trans.sc = public/language/sc/language.json
 trans.sk = public/language/sk/language.json
+trans.sr = public/language/sr/language.json
 trans.sv = public/language/sv/language.json
 trans.th = public/language/th/language.json
 trans.tr = public/language/tr/language.json
@@ -484,12 +530,14 @@ trans.zh_TW = public/language/zh_TW/language.json
 type = KEYVALUEJSON

 [nodebb.pages]
+file_filter = public/language/<lang>/pages.json
 source_file = public/language/en_GB/pages.json
 source_lang = en_GB
 trans.ar = public/language/ar/pages.json
 trans.bn = public/language/bn/pages.json
 trans.bg = public/language/bg/pages.json
 trans.cs = public/language/cs/pages.json
+trans.da = public/language/da/pages.json
 trans.de = public/language/de/pages.json
 trans.el = public/language/el/pages.json
 trans.en_US = public/language/en_US/pages.json
@@ -513,8 +561,10 @@ trans.pl = public/language/pl/pages.json
 trans.pt_BR = public/language/pt_BR/pages.json
 trans.ru = public/language/ru/pages.json
 trans.ro = public/language/ro/pages.json
+trans.rw = public/language/rw/pages.json
 trans.sc = public/language/sc/pages.json
 trans.sk = public/language/sk/pages.json
+trans.sr = public/language/sr/pages.json
 trans.sv = public/language/sv/pages.json
 trans.th = public/language/th/pages.json
 trans.tr = public/language/tr/pages.json
@@ -524,12 +574,14 @@ trans.zh_TW = public/language/zh_TW/pages.json
 type = KEYVALUEJSON

 [nodebb.topic]
+file_filter = public/language/<lang>/topic.json
 source_file = public/language/en_GB/topic.json
 source_lang = en_GB
 trans.ar = public/language/ar/topic.json
 trans.bn = public/language/bn/topic.json
 trans.bg = public/language/bg/topic.json
 trans.cs = public/language/cs/topic.json
+trans.da = public/language/da/topic.json
 trans.de = public/language/de/topic.json
 trans.el = public/language/el/topic.json
 trans.en_US = public/language/en_US/topic.json
@@ -553,8 +605,10 @@ trans.pl = public/language/pl/topic.json
 trans.pt_BR = public/language/pt_BR/topic.json
 trans.ru = public/language/ru/topic.json
 trans.ro = public/language/ro/topic.json
+trans.rw = public/language/rw/topic.json
 trans.sc = public/language/sc/topic.json
 trans.sk = public/language/sk/topic.json
+trans.sr = public/language/sr/topic.json
 trans.sv = public/language/sv/topic.json
 trans.th = public/language/th/topic.json
 trans.tr = public/language/tr/topic.json
@@ -564,12 +618,14 @@ trans.zh_TW = public/language/zh_TW/topic.json
 type = KEYVALUEJSON

 [nodebb.success]
+file_filter = public/language/<lang>/success.json
 source_file = public/language/en_GB/success.json
 source_lang = en_GB
 trans.ar = public/language/ar/success.json
 trans.bn = public/language/bn/success.json
 trans.bg = public/language/bg/success.json
 trans.cs = public/language/cs/success.json
+trans.da = public/language/da/success.json
 trans.de = public/language/de/success.json
 trans.el = public/language/el/success.json
 trans.en_US = public/language/en_US/success.json
@@ -593,8 +649,10 @@ trans.pl = public/language/pl/success.json
 trans.pt_BR = public/language/pt_BR/success.json
 trans.ru = public/language/ru/success.json
 trans.ro = public/language/ro/success.json
+trans.rw = public/language/rw/success.json
 trans.sc = public/language/sc/success.json
 trans.sk = public/language/sk/success.json
+trans.sr = public/language/sr/success.json
 trans.sv = public/language/sv/success.json
 trans.th = public/language/th/success.json
 trans.tr = public/language/tr/success.json
@@ -604,12 +662,14 @@ trans.zh_TW = public/language/zh_TW/success.json
 type = KEYVALUEJSON

 [nodebb.error]
+file_filter = public/language/<lang>/error.json
 source_file = public/language/en_GB/error.json
 source_lang = en_GB
 trans.ar = public/language/ar/error.json
 trans.bn = public/language/bn/error.json
 trans.bg = public/language/bg/error.json
 trans.cs = public/language/cs/error.json
+trans.da = public/language/da/error.json
 trans.de = public/language/de/error.json
 trans.el = public/language/el/error.json
 trans.en_US = public/language/en_US/error.json
@@ -633,8 +693,10 @@ trans.pl = public/language/pl/error.json
 trans.pt_BR = public/language/pt_BR/error.json
 trans.ru = public/language/ru/error.json
 trans.ro = public/language/ro/error.json
+trans.rw = public/language/rw/error.json
 trans.sc = public/language/sc/error.json
 trans.sk = public/language/sk/error.json
+trans.sr = public/language/sr/error.json
 trans.sv = public/language/sv/error.json
 trans.th = public/language/th/error.json
 trans.tr = public/language/tr/error.json
@@ -644,12 +706,14 @@ trans.zh_TW = public/language/zh_TW/error.json
 type = KEYVALUEJSON

 [nodebb.tags]
+file_filter = public/language/<lang>/tags.json
 source_file = public/language/en_GB/tags.json
 source_lang = en_GB
 trans.ar = public/language/ar/tags.json
 trans.bn = public/language/bn/tags.json
 trans.bg = public/language/bg/tags.json
 trans.cs = public/language/cs/tags.json
+trans.da = public/language/da/tags.json
 trans.de = public/language/de/tags.json
 trans.el = public/language/el/tags.json
 trans.en_US = public/language/en_US/tags.json
@@ -673,8 +737,10 @@ trans.pl = public/language/pl/tags.json
 trans.pt_BR = public/language/pt_BR/tags.json
 trans.ru = public/language/ru/tags.json
 trans.ro = public/language/ro/tags.json
+trans.rw = public/language/rw/tags.json
 trans.sc = public/language/sc/tags.json
 trans.sk = public/language/sk/tags.json
+trans.sr = public/language/sr/tags.json
 trans.sv = public/language/sv/tags.json
 trans.th = public/language/th/tags.json
 trans.tr = public/language/tr/tags.json
@@ -684,12 +750,14 @@ trans.zh_TW = public/language/zh_TW/tags.json
 type = KEYVALUEJSON

 [nodebb.email]
+file_filter = public/language/<lang>/email.json
 source_file = public/language/en_GB/email.json
 source_lang = en_GB
 trans.ar = public/language/ar/email.json
 trans.bn = public/language/bn/email.json
 trans.bg = public/language/bg/email.json
 trans.cs = public/language/cs/email.json
+trans.da = public/language/da/email.json
 trans.de = public/language/de/email.json
 trans.el = public/language/el/email.json
 trans.en_US = public/language/en_US/email.json
@@ -713,8 +781,10 @@ trans.pl = public/language/pl/email.json
 trans.pt_BR = public/language/pt_BR/email.json
 trans.ru = public/language/ru/email.json
 trans.ro = public/language/ro/email.json
+trans.rw = public/language/rw/email.json
 trans.sc = public/language/sc/email.json
 trans.sk = public/language/sk/email.json
+trans.sr = public/language/sr/email.json
 trans.sv = public/language/sv/email.json
 trans.th = public/language/th/email.json
 trans.tr = public/language/tr/email.json
@@ -724,12 +794,14 @@ trans.zh_TW = public/language/zh_TW/email.json
 type = KEYVALUEJSON

 [nodebb.search]
+file_filter = public/language/<lang>/search.json
 source_file = public/language/en_GB/search.json
 source_lang = en_GB
 trans.ar = public/language/ar/search.json
 trans.bn = public/language/bn/search.json
 trans.bg = public/language/bg/search.json
 trans.cs = public/language/cs/search.json
+trans.da = public/language/da/search.json
 trans.de = public/language/de/search.json
 trans.el = public/language/el/search.json
 trans.en_US = public/language/en_US/search.json
@@ -753,8 +825,10 @@ trans.pl = public/language/pl/search.json
 trans.pt_BR = public/language/pt_BR/search.json
 trans.ru = public/language/ru/search.json
 trans.ro = public/language/ro/search.json
+trans.rw = public/language/rw/search.json
 trans.sc = public/language/sc/search.json
 trans.sk = public/language/sk/search.json
+trans.sr = public/language/sr/search.json
 trans.sv = public/language/sv/search.json
 trans.th = public/language/th/search.json
 trans.tr = public/language/tr/search.json
@@ -764,12 +838,14 @@ trans.zh_TW = public/language/zh_TW/search.json
 type = KEYVALUEJSON

 [nodebb.groups]
+file_filter = public/language/<lang>/groups.json
 source_file = public/language/en_GB/groups.json
 source_lang = en_GB
 trans.ar = public/language/ar/groups.json
 trans.bn = public/language/bn/groups.json
 trans.bg = public/language/bg/groups.json
 trans.cs = public/language/cs/groups.json
+trans.da = public/language/da/groups.json
 trans.de = public/language/de/groups.json
 trans.el = public/language/el/groups.json
 trans.en_US = public/language/en_US/groups.json
@@ -793,8 +869,10 @@ trans.pl = public/language/pl/groups.json
 trans.pt_BR = public/language/pt_BR/groups.json
 trans.ru = public/language/ru/groups.json
 trans.ro = public/language/ro/groups.json
+trans.rw = public/language/rw/groups.json
 trans.sc = public/language/sc/groups.json
 trans.sk = public/language/sk/groups.json
+trans.sr = public/language/sr/groups.json
 trans.sv = public/language/sv/groups.json
 trans.th = public/language/th/groups.json
 trans.tr = public/language/tr/groups.json
--- a/8
+++ b/8
@@ -0,0 +1,8 @@
+FROM node:0.10-onbuild
+
+ENV NODE_ENV=production \
+    daemon=false \
+    silent=false
+
+CMD node app --setup && npm start
+EXPOSE 4567
--- a/README.md
+++ b/README.md
@@ -1,65 +1,75 @@
-# <img alt="NodeBB" src="http://i.imgur.com/mYxPPtB.png" />
-
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/NodeBB/NodeBB?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://travis-ci.org/NodeBB/NodeBB.svg?branch=master)](https://travis-ci.org/NodeBB/NodeBB)
-[![Dependency Status](https://david-dm.org/nodebb/nodebb.svg)](https://david-dm.org/nodebb/nodebb)
-[![Code Climate](https://codeclimate.com/github/NodeBB/NodeBB/badges/gpa.svg)](https://codeclimate.com/github/NodeBB/NodeBB)
-[![Documentation Status](https://readthedocs.org/projects/nodebb/badge/?version=latest)](https://readthedocs.org/projects/nodebb/?badge=latest)
-
-**NodeBB Forum Software** is powered by Node.js and built on either a Redis or MongoDB database. It utilizes web sockets for instant interactions and real-time notifications. NodeBB is compatible down to IE8 and has many modern features out of the box such as social network integration and streaming discussions.
-
-Additional functionality is enabled through the use of third-party plugins.
-
-* [Get NodeBB](http://www.nodebb.org/ "NodeBB")
-* [Demo & Meta Discussion](http://community.nodebb.org)
-* [NodeBB Blog](http://blog.nodebb.org)
-* [Documentation & Installation Instructions](http://docs.nodebb.org)
-* [Join us on IRC](https://kiwiirc.com/client/irc.freenode.net/nodebb) - #nodebb on Freenode
-* [Follow us on Twitter](http://www.twitter.com/NodeBB/ "NodeBB Twitter")
-* [Like us on Facebook](http://www.facebook.com/NodeBB/ "NodeBB Facebook")
-* [Get Plugins](http://community.nodebb.org/category/7/nodebb-plugins "NodeBB Plugins")
-* [Get Themes](http://community.nodebb.org/category/10/nodebb-themes "NodeBB Themes")
-* [Help translate NodeBB](https://www.transifex.com/projects/p/nodebb/)
-
-## Screenshots
-
-[<img src="http://i.imgur.com/FLOUuIqb.png" />](http://i.imgur.com/FLOUuIq.png)&nbsp;[<img src="http://i.imgur.com/Ud1LrfIb.png" />](http://i.imgur.com/Ud1LrfI.png)&nbsp;[<img src="http://i.imgur.com/ZC8W39ab.png" />](http://i.imgur.com/ZC8W39a.png)&nbsp;[<img src="http://i.imgur.com/o90kVPib.png" />](http://i.imgur.com/o90kVPi.png)&nbsp;[<img src="http://i.imgur.com/AaRRrU2b.png" />](http://i.imgur.com/AaRRrU2.png)&nbsp;[<img src="http://i.imgur.com/LmHtPhob.png" />](http://i.imgur.com/LmHtPho.png)&nbsp;[<img src="http://i.imgur.com/paiJPJkb.jpg" />](http://i.imgur.com/paiJPJk.jpg)&nbsp;[<img src="http://i.imgur.com/ZfavPHDb.png" />](http://i.imgur.com/ZfavPHD.png)&nbsp;[<img src="http://i.imgur.com/8OLssij.png" />](http://i.imgur.com/8OLssij.png)&nbsp;[<img src="http://i.imgur.com/JKOc0LZ.png"/>](http://i.imgur.com/JKOc0LZ.png)
-
-## How can I follow along/contribute?
-
-* Our feature roadmap is hosted on the project wiki's [Version History / Roadmap](https://github.com/NodeBB/NodeBB/wiki/Version-History-%26-Roadmap)
-* If you are a developer, feel free to check out the source and submit pull requests. We also have a wide array of [plugins](http://community.nodebb.org/category/7/nodebb-plugins) which would be a great starting point for learning the codebase.
-* If you are a designer, [NodeBB needs themes](http://community.nodebb.org/category/10/nodebb-themes)! NodeBB's theming system allows extention of the base templates as well as styling via LESS or CSS. NodeBB's base theme utilizes [Bootstrap 3](http://getbootstrap.com/) but themes can choose to use a different framework altogether.
-* If you know languages other than English you can help us translate NodeBB. We use [Transifex](https://www.transifex.com/projects/p/nodebb/) for internationalization.
-* Please don't forget to **like**, **follow**, and **star our repo**! Join our growing [community](http://community.nodebb.org) to keep up to date with the latest NodeBB development.
-
-## Requirements
-
-NodeBB requires the following software to be installed:
-
-* A version of Node.js at least 0.10 or greater
-* Redis, version 2.8.9 or greater **or** MongoDB, version 2.6 or greater
-* nginx, version 1.3.13 or greater (**only if** intending to use nginx to proxy requests to a NodeBB)
-
-## Installation
-
-[Please refer to platform-specific installation documentation](http://docs.nodebb.org/en/latest/installing/os.html)
-
-## Securing NodeBB
-
-It is important to ensure that your NodeBB and database servers are secured. Bear these points in mind:
-
-1. While some distributions set up Redis with a more restrictive configuration, Redis by default listens to all interfaces, which is especially dangerous when a server is open to the public. Some suggestions:
-    * Set `bind_address` to `127.0.0.1` so as to restrict access  to the local machine only
-    * Use `requirepass` to secure Redis behind a password (preferably a long one)
-    * Familiarise yourself with [Redis Security](http://redis.io/topics/security)
-2. Use `iptables` to secure your server from unintended open ports. In Ubuntu, `ufw` provides a friendlier interface to working with `iptables`.
-    * e.g. If your NodeBB is proxied, no ports should be open except 80 (and possibly 22, for SSH access)
-
-## Upgrading NodeBB
-
-Detailed upgrade instructions are listed in [Upgrading NodeBB](https://docs.nodebb.org/en/latest/upgrading/index.html)
-
-## License
-
-NodeBB is licensed under the **GNU General Public License v3 (GPL-3)** (http://www.gnu.org/copyleft/gpl.html)
+# <img alt="NodeBB" src="http://i.imgur.com/mYxPPtB.png" />
+
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/NodeBB/NodeBB?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status](https://travis-ci.org/NodeBB/NodeBB.svg?branch=master)](https://travis-ci.org/NodeBB/NodeBB)
+[![Dependency Status](https://david-dm.org/nodebb/nodebb.svg)](https://david-dm.org/nodebb/nodebb)
+[![Code Climate](https://codeclimate.com/github/NodeBB/NodeBB/badges/gpa.svg)](https://codeclimate.com/github/NodeBB/NodeBB)
+[![Documentation Status](https://readthedocs.org/projects/nodebb/badge/?version=latest)](https://readthedocs.org/projects/nodebb/?badge=latest)
+
+**NodeBB Forum Software** is powered by Node.js and built on either a Redis or MongoDB database. It utilizes web sockets for instant interactions and real-time notifications. NodeBB is compatible down to IE8 and has many modern features out of the box such as social network integration and streaming discussions.
+
+Additional functionality is enabled through the use of third-party plugins.
+
+* [Get NodeBB](http://www.nodebb.org/ "NodeBB")
+* [Demo & Meta Discussion](http://community.nodebb.org)
+* [Documentation & Installation Instructions](http://docs.nodebb.org)
+* [Help translate NodeBB](https://www.transifex.com/projects/p/nodebb/)
+* [NodeBB Blog](http://blog.nodebb.org)
+* [Join us on IRC](https://kiwiirc.com/client/irc.freenode.net/nodebb) - #nodebb on Freenode
+* [Follow us on Twitter](http://www.twitter.com/NodeBB/ "NodeBB Twitter")
+* [Like us on Facebook](http://www.facebook.com/NodeBB/ "NodeBB Facebook")
+
+## Screenshots
+
+[![](http://i.imgur.com/VCoOFyqb.png)](http://i.imgur.com/VCoOFyq.png)
+[![](http://i.imgur.com/FLOUuIqb.png)](http://i.imgur.com/FLOUuIq.png)
+[![](http://i.imgur.com/Ud1LrfIb.png)](http://i.imgur.com/Ud1LrfI.png)
+[![](http://i.imgur.com/h6yZ66sb.png)](http://i.imgur.com/h6yZ66s.png)
+[![](http://i.imgur.com/o90kVPib.png)](http://i.imgur.com/o90kVPi.png)
+[![](http://i.imgur.com/AaRRrU2b.png)](http://i.imgur.com/AaRRrU2.png)
+[![](http://i.imgur.com/LmHtPhob.png)](http://i.imgur.com/LmHtPho.png)
+[![](http://i.imgur.com/paiJPJkb.jpg)](http://i.imgur.com/paiJPJk.jpg)
+
+[![](http://i.imgur.com/8OLssij.png)](http://i.imgur.com/8OLssij.png)
+[![](http://i.imgur.com/JKOc0LZ.png)](http://i.imgur.com/JKOc0LZ.png)
+
+## How can I follow along/contribute?
+
+* Our feature roadmap is hosted on the project wiki's [Version History / Roadmap](https://github.com/NodeBB/NodeBB/wiki/Version-History-%26-Roadmap)
+* If you are a developer, feel free to check out the source and submit pull requests. We also have a wide array of [plugins](http://community.nodebb.org/category/7/nodebb-plugins) which would be a great starting point for learning the codebase.
+* If you are a designer, [NodeBB needs themes](http://community.nodebb.org/category/10/nodebb-themes)! NodeBB's theming system allows extention of the base templates as well as styling via LESS or CSS. NodeBB's base theme utilizes [Bootstrap 3](http://getbootstrap.com/) but themes can choose to use a different framework altogether.
+* If you know languages other than English you can help us translate NodeBB. We use [Transifex](https://www.transifex.com/projects/p/nodebb/) for internationalization.
+* Please don't forget to **like**, **follow**, and **star our repo**! Join our growing [community](http://community.nodebb.org) to keep up to date with the latest NodeBB development.
+
+## Requirements
+
+NodeBB requires the following software to be installed:
+
+* A version of Node.js at least 0.10 or greater
+* Redis, version 2.8.9 or greater **or** MongoDB, version 2.6 or greater
+* nginx, version 1.3.13 or greater (**only if** intending to use nginx to proxy requests to a NodeBB)
+
+## Installation
+
+[Please refer to platform-specific installation documentation](http://docs.nodebb.org/en/latest/installing/os.html)
+
+## Securing NodeBB
+
+It is important to ensure that your NodeBB and database servers are secured. Bear these points in mind:
+
+1. While some distributions set up Redis with a more restrictive configuration, Redis by default listens to all interfaces, which is especially dangerous when a server is open to the public. Some suggestions:
+    * Set `bind_address` to `127.0.0.1` so as to restrict access  to the local machine only
+    * Use `requirepass` to secure Redis behind a password (preferably a long one)
+    * Familiarise yourself with [Redis Security](http://redis.io/topics/security)
+2. Use `iptables` to secure your server from unintended open ports. In Ubuntu, `ufw` provides a friendlier interface to working with `iptables`.
+    * e.g. If your NodeBB is proxied, no ports should be open except 80 (and possibly 22, for SSH access)
+
+## Upgrading NodeBB
+
+Detailed upgrade instructions are listed in [Upgrading NodeBB](https://docs.nodebb.org/en/latest/upgrading/index.html)
+
+## License
+
+NodeBB is licensed under the **GNU General Public License v3 (GPL-3)** (http://www.gnu.org/copyleft/gpl.html).
+
+Interested in a sublicense agreement for use of NodeBB in a non-free/restrictive environment? Contact us at sales@nodebb.org.
--- a/app.js
+++ b/app.js
@@ -1,391 +1,417 @@
-/*
-	NodeBB - A better forum platform for the modern web
-	https://github.com/NodeBB/NodeBB/
-	Copyright (C) 2013-2014  NodeBB Inc.
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-"use strict";
-/*global require, global, process*/
-
-var nconf = require('nconf');
-nconf.argv().env('__');
-
-var fs = require('fs'),
-	os = require('os'),
-	url = require('url'),
-	async = require('async'),
-	semver = require('semver'),
-	winston = require('winston'),
-	path = require('path'),
-	pkg = require('./package.json'),
-	utils = require('./public/src/utils.js');
-
-
-global.env = process.env.NODE_ENV || 'production';
-
-winston.remove(winston.transports.Console);
-winston.add(winston.transports.Console, {
-	colorize: true,
-	timestamp: function() {
-		var date = new Date();
-		return date.getDate() + '/' + (date.getMonth() + 1) + ' ' + date.toTimeString().substr(0,5) + ' [' + global.process.pid + ']';
-	},
-	level: (global.env === 'production' || nconf.get('log-level') === 'info') ? 'info' : 'verbose'
-});
-
-if(os.platform() === 'linux') {
-	require('child_process').exec('/usr/bin/which convert', function(err, stdout, stderr) {
-		if(err || !stdout) {
-			winston.warn('Couldn\'t find convert. Did you install imagemagick?');
-		}
-	});
-}
-
-// Alternate configuration file support
-var	configFile = path.join(__dirname, '/config.json'),
-	configExists;
-
-if (nconf.get('config')) {
-	configFile = path.resolve(__dirname, nconf.get('config'));
-}
-configExists = fs.existsSync(configFile);
-
-if (!nconf.get('setup') && !nconf.get('install') && !nconf.get('upgrade') && !nconf.get('reset') && configExists) {
-	start();
-} else if (nconf.get('setup') || nconf.get('install')) {
-	setup();
-} else if (!configExists) {
-	require('./install/web').install(nconf.get('port'));
-} else if (nconf.get('upgrade')) {
-	upgrade();
-} else if (nconf.get('reset')) {
-	reset();
-}
-
-function loadConfig() {
-	nconf.file({
-		file: configFile
-	});
-
-	nconf.defaults({
-		base_dir: __dirname,
-		themes_path: path.join(__dirname, 'node_modules'),
-		views_dir: path.join(__dirname, 'public/templates'),
-		version: pkg.version
-	});
-
-	if (!nconf.get('isCluster')) {
-		nconf.set('isPrimary', 'true');
-		nconf.set('isCluster', 'false');
-	}
-
-	// Ensure themes_path is a full filepath
-	nconf.set('themes_path', path.resolve(__dirname, nconf.get('themes_path')));
-	nconf.set('core_templates_path', path.join(__dirname, 'src/views'));
-	nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-vanilla/templates'));
-
-	if (!process.send) {
-		// If run using `node app`, log GNU copyright info along with server info
-		winston.info('NodeBB v' + nconf.get('version') + ' Copyright (C) 2013-2014 NodeBB Inc.');
-		winston.info('This program comes with ABSOLUTELY NO WARRANTY.');
-		winston.info('This is free software, and you are welcome to redistribute it under certain conditions.');
-		winston.info('');
-	}
-}
-
-function start() {
-	loadConfig();
-
-	// nconf defaults, if not set in config
-	if (!nconf.get('upload_path')) {
-		nconf.set('upload_path', '/public/uploads');
-	}
-	// Parse out the relative_url and other goodies from the configured URL
-	var urlObject = url.parse(nconf.get('url'));
-	var relativePath = urlObject.pathname !== '/' ? urlObject.pathname : '';
-	nconf.set('use_port', !!urlObject.port);
-	nconf.set('relative_path', relativePath);
-	nconf.set('port', urlObject.port || nconf.get('port') || nconf.get('PORT') || 4567);
-	nconf.set('upload_url', '/uploads/');
-
-	if (nconf.get('isPrimary') === 'true') {
-		winston.info('Time: %s', (new Date()).toString());
-		winston.info('Initializing NodeBB v%s', nconf.get('version'));
-		winston.verbose('* using configuration stored in: %s', configFile);
-
-		var host = nconf.get(nconf.get('database') + ':host'),
-			storeLocation = host ? 'at ' + host + (host.indexOf('/') === -1 ? ':' + nconf.get(nconf.get('database') + ':port') : '') : '';
-
-		winston.verbose('* using %s store %s', nconf.get('database'), storeLocation);
-		winston.verbose('* using themes stored in: %s', nconf.get('themes_path'));
-	}
-
-	process.on('SIGTERM', shutdown);
-	process.on('SIGINT', shutdown);
-	process.on('SIGHUP', restart);
-	process.on('message', function(message) {
-		if (typeof message !== 'object') {
-			return;
-		}
-		var meta = require('./src/meta');
-		var emitter = require('./src/emitter');
-		switch (message.action) {
-			case 'reload':
-				meta.reload();
-			break;
-			case 'js-propagate':
-				meta.js.cache = message.cache;
-				meta.js.map = message.map;
-				meta.js.hash = message.hash;
-				emitter.emit('meta:js.compiled');
-				winston.verbose('[cluster] Client-side javascript and mapping propagated to worker %s', process.pid);
-			break;
-			case 'css-propagate':
-				meta.css.cache = message.cache;
-				meta.css.acpCache = message.acpCache;
-				meta.css.hash = message.hash;
-				emitter.emit('meta:css.compiled');
-				winston.verbose('[cluster] Stylesheets propagated to worker %s', process.pid);
-			break;
-			case 'templates:compiled':
-				emitter.emit('templates:compiled');
-			break;
-		}
-	});
-
-	process.on('uncaughtException', function(err) {
-		winston.error(err.stack);
-		console.log(err.stack);
-
-		require('./src/meta').js.killMinifier();
-		shutdown(1);
-	});
-
-	async.waterfall([
-		function(next) {
-			require('./src/database').init(next);
-		},
-		function(next) {
-			require('./src/meta').configs.init(next);
-		},
-		function(next) {
-			require('./src/upgrade').check(next);
-		},
-		function(schema_ok, next) {
-			if (!schema_ok && nconf.get('check-schema') !== false) {
-				winston.warn('Your NodeBB schema is out-of-date. Please run the following command to bring your dataset up to spec:');
-				winston.warn('    ./nodebb upgrade');
-				process.exit();
-				return;
-			}
-			var webserver = require('./src/webserver');
-			require('./src/socket.io').init(webserver.server);
-
-			if (nconf.get('isPrimary') === 'true' && !nconf.get('jobsDisabled')) {
-				require('./src/notifications').init();
-				require('./src/user').startJobs();
-			}
-
-			webserver.listen();
-		}
-	], function(err) {
-		if (err) {
-			winston.error(err.stack);
-			process.exit();
-		}
-	});
-}
-
-function setup() {
-	loadConfig();
-
-	winston.info('NodeBB Setup Triggered via Command Line');
-
-	var install = require('./src/install');
-
-	process.stdout.write('\nWelcome to NodeBB!\n');
-	process.stdout.write('\nThis looks like a new installation, so you\'ll have to answer a few questions about your environment before we can proceed.\n');
-	process.stdout.write('Press enter to accept the default setting (shown in brackets).\n');
-
-	install.setup(function (err, data) {
-		var separator = '     ';
-		if (process.stdout.columns > 10) {
-			for(var x=0,cols=process.stdout.columns-10;x<cols;x++) {
-				separator += '=';
-			}
-		}
-		process.stdout.write('\n' + separator + '\n\n');
-
-		if (err) {
-			winston.error('There was a problem completing NodeBB setup: ', err.message);
-		} else {
-			if (data.hasOwnProperty('password')) {
-				process.stdout.write('An administrative user was automatically created for you:\n');
-				process.stdout.write('    Username: ' + data.username + '\n');
-				process.stdout.write('    Password: ' + data.password + '\n');
-				process.stdout.write('\n');
-			}
-			process.stdout.write('NodeBB Setup Completed. Run \'./nodebb start\' to manually start your NodeBB server.\n');
-
-			// If I am a child process, notify the parent of the returned data before exiting (useful for notifying
-			// hosts of auto-generated username/password during headless setups)
-			if (process.send) {
-				process.send(data);
-			}
-		}
-
-		process.exit();
-	});
-}
-
-function upgrade() {
-	loadConfig();
-
-	require('./src/database').init(function(err) {
-		if (err) {
-			winston.error(err.stack);
-			process.exit();
-		}
-		require('./src/meta').configs.init(function () {
-			require('./src/upgrade').upgrade();
-		});
-	});
-}
-
-function reset() {
-	loadConfig();
-
-	require('./src/database').init(function(err) {
-		if (err) {
-			winston.error(err.message);
-			process.exit();
-		}
-
-		if (nconf.get('theme')) {
-			resetThemes();
-		} else if (nconf.get('plugin')) {
-			resetPlugin(nconf.get('plugin'));
-		} else if (nconf.get('plugins')) {
-			resetPlugins();
-		} else if (nconf.get('widgets')) {
-			resetWidgets();
-		} else if (nconf.get('settings')) {
-			resetSettings();
-		} else if (nconf.get('all')) {
-			require('async').series([resetWidgets, resetThemes, resetPlugins, resetSettings], function(err) {
-				if (!err) {
-					winston.info('[reset] Reset complete.');
-				} else {
-					winston.error('[reset] Errors were encountered while resetting your forum settings: %s', err.message);
-				}
-				process.exit();
-			});
-		} else {
-			winston.warn('[reset] Nothing reset.');
-			winston.info('Use ./nodebb reset {theme|plugins|widgets|settings|all}');
-			winston.info(' or');
-			winston.info('Use ./nodebb reset plugin="nodebb-plugin-pluginName"');
-			process.exit();
-		}
-	});
-}
-
-function resetSettings(callback) {
-	var meta = require('./src/meta');
-	meta.configs.set('allowLocalLogin', 1, function(err) {
-		winston.info('[reset] Settings reset to default');
-		if (typeof callback === 'function') {
-			callback(err);
-		} else {
-			process.exit();
-		}
-	});
-}
-
-function resetThemes(callback) {
-	var meta = require('./src/meta');
-
-	meta.themes.set({
-		type: 'local',
-		id: 'nodebb-theme-vanilla'
-	}, function(err) {
-		winston.info('[reset] Theme reset to Vanilla');
-		if (typeof callback === 'function') {
-			callback(err);
-		} else {
-			process.exit();
-		}
-	});
-}
-
-function resetPlugin(pluginId) {
-	var db = require('./src/database');
-	db.sortedSetRemove('plugins:active', pluginId, function(err) {
-		if (err) {
-			winston.error('[reset] Could not disable plugin: %s encountered error %s', pluginId, err.message);
-		} else {
-			winston.info('[reset] Plugin `%s` disabled', pluginId);
-		}
-
-		process.exit();
-	});
-}
-
-function resetPlugins(callback) {
-	var db = require('./src/database');
-	db.delete('plugins:active', function(err) {
-		winston.info('[reset] All Plugins De-activated');
-		if (typeof callback === 'function') {
-			callback(err);
-		} else {
-			process.exit();
-		}
-	});
-}
-
-function resetWidgets(callback) {
-	require('./src/widgets').reset(function(err) {
-		winston.info('[reset] All Widgets moved to Draft Zone');
-		if (typeof callback === 'function') {
-			callback(err);
-		} else {
-			process.exit();
-		}
-	});
-}
-
-function shutdown(code) {
-	winston.info('[app] Shutdown (SIGTERM/SIGINT) Initialised.');
-	require('./src/database').close();
-	winston.info('[app] Database connection closed.');
-	require('./src/webserver').server.close();
-	winston.info('[app] Web server closed to connections.');
-
-	winston.info('[app] Shutdown complete.');
-	process.exit(code || 0);
-}
-
-function restart() {
-	if (process.send) {
-		winston.info('[app] Restarting...');
-		process.send({
-			action: 'restart'
-		});
-	} else {
-		winston.error('[app] Could not restart server. Shutting down.');
-		shutdown(1);
-	}
-}
+/*
+	NodeBB - A better forum platform for the modern web
+	https://github.com/NodeBB/NodeBB/
+	Copyright (C) 2013-2014  NodeBB Inc.
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+"use strict";
+/*global require, global, process*/
+
+var nconf = require('nconf');
+nconf.argv().env('__');
+
+var fs = require('fs'),
+	os = require('os'),
+	url = require('url'),
+	async = require('async'),
+	semver = require('semver'),
+	winston = require('winston'),
+	colors = require('colors'),
+	path = require('path'),
+	pkg = require('./package.json'),
+	utils = require('./public/src/utils.js');
+
+global.env = process.env.NODE_ENV || 'production';
+
+winston.remove(winston.transports.Console);
+winston.add(winston.transports.Console, {
+	colorize: true,
+	timestamp: function() {
+		var date = new Date();
+		return date.getDate() + '/' + (date.getMonth() + 1) + ' ' + date.toTimeString().substr(0,5) + ' [' + global.process.pid + ']';
+	},
+	level: nconf.get('log-level') || (global.env === 'production' ? 'info' : 'verbose')
+});
+
+if(os.platform() === 'linux') {
+	require('child_process').exec('/usr/bin/which convert', function(err, stdout, stderr) {
+		if(err || !stdout) {
+			winston.warn('Couldn\'t find convert. Did you install imagemagick?');
+		}
+	});
+}
+
+// Alternate configuration file support
+var	configFile = path.join(__dirname, '/config.json'),
+	configExists;
+
+if (nconf.get('config')) {
+	configFile = path.resolve(__dirname, nconf.get('config'));
+}
+configExists = fs.existsSync(configFile);
+
+if (!nconf.get('setup') && !nconf.get('install') && !nconf.get('upgrade') && !nconf.get('reset') && configExists) {
+	start();
+} else if (nconf.get('setup') || nconf.get('install')) {
+	setup();
+} else if (!configExists) {
+	require('./install/web').install(nconf.get('port'));
+} else if (nconf.get('upgrade')) {
+	upgrade();
+} else if (nconf.get('reset')) {
+	reset();
+}
+
+function loadConfig() {
+	nconf.file({
+		file: configFile
+	});
+
+	nconf.defaults({
+		base_dir: __dirname,
+		themes_path: path.join(__dirname, 'node_modules'),
+		views_dir: path.join(__dirname, 'public/templates'),
+		version: pkg.version
+	});
+
+	if (!nconf.get('isCluster')) {
+		nconf.set('isPrimary', 'true');
+		nconf.set('isCluster', 'false');
+	}
+
+	// Ensure themes_path is a full filepath
+	nconf.set('themes_path', path.resolve(__dirname, nconf.get('themes_path')));
+	nconf.set('core_templates_path', path.join(__dirname, 'src/views'));
+	nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-persona/templates'));
+
+	if (!process.send) {
+		// If run using `node app`, log GNU copyright info along with server info
+		winston.info('NodeBB v' + nconf.get('version') + ' Copyright (C) 2013-2014 NodeBB Inc.');
+		winston.info('This program comes with ABSOLUTELY NO WARRANTY.');
+		winston.info('This is free software, and you are welcome to redistribute it under certain conditions.');
+		winston.info('');
+	}
+}
+
+function start() {
+	loadConfig();
+	var db = require('./src/database');
+
+	// nconf defaults, if not set in config
+	if (!nconf.get('upload_path')) {
+		nconf.set('upload_path', '/public/uploads');
+	}
+	// Parse out the relative_url and other goodies from the configured URL
+	var urlObject = url.parse(nconf.get('url'));
+	var relativePath = urlObject.pathname !== '/' ? urlObject.pathname : '';
+	nconf.set('base_url', urlObject.protocol + '//' + urlObject.host);
+	nconf.set('secure', urlObject.protocol === 'https');
+	nconf.set('use_port', !!urlObject.port);
+	nconf.set('relative_path', relativePath);
+	nconf.set('port', urlObject.port || nconf.get('port') || nconf.get('PORT') || 4567);
+	nconf.set('upload_url', '/uploads/');
+
+	if (nconf.get('isPrimary') === 'true') {
+		winston.info('Time: %s', (new Date()).toString());
+		winston.info('Initializing NodeBB v%s', nconf.get('version'));
+		winston.verbose('* using configuration stored in: %s', configFile);
+
+		var host = nconf.get(nconf.get('database') + ':host'),
+			storeLocation = host ? 'at ' + host + (host.indexOf('/') === -1 ? ':' + nconf.get(nconf.get('database') + ':port') : '') : '';
+
+		winston.verbose('* using %s store %s', nconf.get('database'), storeLocation);
+		winston.verbose('* using themes stored in: %s', nconf.get('themes_path'));
+	}
+
+	process.on('SIGTERM', shutdown);
+	process.on('SIGINT', shutdown);
+	process.on('SIGHUP', restart);
+	process.on('message', function(message) {
+		if (typeof message !== 'object') {
+			return;
+		}
+		var meta = require('./src/meta');
+		var emitter = require('./src/emitter');
+		switch (message.action) {
+			case 'reload':
+				meta.reload();
+			break;
+			case 'js-propagate':
+				meta.js.cache = message.cache;
+				meta.js.map = message.map;
+				meta.js.hash = message.hash;
+				emitter.emit('meta:js.compiled');
+				winston.verbose('[cluster] Client-side javascript and mapping propagated to worker %s', process.pid);
+			break;
+			case 'css-propagate':
+				meta.css.cache = message.cache;
+				meta.css.acpCache = message.acpCache;
+				meta.css.hash = message.hash;
+				emitter.emit('meta:css.compiled');
+				winston.verbose('[cluster] Stylesheets propagated to worker %s', process.pid);
+			break;
+			case 'templates:compiled':
+				emitter.emit('templates:compiled');
+			break;
+		}
+	});
+
+	process.on('uncaughtException', function(err) {
+		winston.error(err.stack);
+		console.log(err.stack);
+
+		require('./src/meta').js.killMinifier();
+		shutdown(1);
+	});
+
+	async.waterfall([
+		async.apply(db.init),
+		async.apply(db.checkCompatibility),
+		function(next) {
+			require('./src/meta').configs.init(next);
+		},
+		function(next) {
+			require('./src/meta').dependencies.check(next);
+		},
+		function(next) {
+			require('./src/upgrade').check(next);
+		},
+		function(next) {
+			var webserver = require('./src/webserver');
+			require('./src/socket.io').init(webserver.server);
+
+			if (nconf.get('isPrimary') === 'true' && !nconf.get('jobsDisabled')) {
+				require('./src/notifications').init();
+				require('./src/user').startJobs();
+			}
+
+			webserver.listen();
+		}
+	], function(err) {
+		if (err) {
+			switch(err.message) {
+				case 'schema-out-of-date':
+					winston.warn('Your NodeBB schema is out-of-date. Please run the following command to bring your dataset up to spec:');
+					winston.warn('    ./nodebb upgrade');
+					break;
+				case 'dependencies-out-of-date':
+					winston.warn('One or more of NodeBB\'s dependent packages are out-of-date. Please run the following command to update them:');
+					winston.warn('    ./nodebb upgrade');
+					break;
+				default:
+					if (err.stacktrace !== false) {
+						winston.error(err.stack);
+					} else {
+						winston.error(err.message);
+					}
+					break;
+			}
+
+			// Either way, bad stuff happened. Abort start.
+			process.exit();
+		}
+	});
+}
+
+function setup() {
+	loadConfig();
+
+	winston.info('NodeBB Setup Triggered via Command Line');
+
+	var install = require('./src/install');
+
+	process.stdout.write('\nWelcome to NodeBB!\n');
+	process.stdout.write('\nThis looks like a new installation, so you\'ll have to answer a few questions about your environment before we can proceed.\n');
+	process.stdout.write('Press enter to accept the default setting (shown in brackets).\n');
+
+	install.setup(function (err, data) {
+		var separator = '     ';
+		if (process.stdout.columns > 10) {
+			for(var x=0,cols=process.stdout.columns-10;x<cols;x++) {
+				separator += '=';
+			}
+		}
+		process.stdout.write('\n' + separator + '\n\n');
+
+		if (err) {
+			winston.error('There was a problem completing NodeBB setup: ', err.message);
+		} else {
+			if (data.hasOwnProperty('password')) {
+				process.stdout.write('An administrative user was automatically created for you:\n');
+				process.stdout.write('    Username: ' + data.username + '\n');
+				process.stdout.write('    Password: ' + data.password + '\n');
+				process.stdout.write('\n');
+			}
+			process.stdout.write('NodeBB Setup Completed. Run \'./nodebb start\' to manually start your NodeBB server.\n');
+
+			// If I am a child process, notify the parent of the returned data before exiting (useful for notifying
+			// hosts of auto-generated username/password during headless setups)
+			if (process.send) {
+				process.send(data);
+			}
+		}
+
+		process.exit();
+	});
+}
+
+function upgrade() {
+	loadConfig();
+
+	require('./src/database').init(function(err) {
+		if (err) {
+			winston.error(err.stack);
+			process.exit();
+		}
+		require('./src/meta').configs.init(function () {
+			require('./src/upgrade').upgrade();
+		});
+	});
+}
+
+function reset() {
+	loadConfig();
+
+	require('./src/database').init(function(err) {
+		if (err) {
+			winston.error(err.message);
+			process.exit();
+		}
+
+		if (nconf.get('t')) {
+			resetThemes();
+		} else if (nconf.get('p')) {
+			if (nconf.get('p') === true) {
+				resetPlugins();
+			} else {
+				resetPlugin(nconf.get('p'));
+			}
+		} else if (nconf.get('w')) {
+			resetWidgets();
+		} else if (nconf.get('s')) {
+			resetSettings();
+		} else if (nconf.get('a')) {
+			require('async').series([resetWidgets, resetThemes, resetPlugins, resetSettings], function(err) {
+				if (!err) {
+					winston.info('[reset] Reset complete.');
+				} else {
+					winston.error('[reset] Errors were encountered while resetting your forum settings: %s', err.message);
+				}
+				process.exit();
+			});
+		} else {
+			process.stdout.write('\nNodeBB Reset\n'.bold);
+			process.stdout.write('No arguments passed in, so nothing was reset.\n\n'.yellow);
+			process.stdout.write('Use ./nodebb reset ' + '{-t|-p|-w|-s|-a}\n'.red);
+			process.stdout.write('    -t\tthemes\n');
+			process.stdout.write('    -p\tplugins\n');
+			process.stdout.write('    -w\twidgets\n');
+			process.stdout.write('    -s\tsettings\n');
+			process.stdout.write('    -a\tall of the above\n');
+
+			process.stdout.write('\nPlugin reset flag (-p) can take a single argument\n');
+			process.stdout.write('    e.g. ./nodebb reset -p nodebb-plugin-mentions\n');
+			process.exit();
+		}
+	});
+}
+
+function resetSettings(callback) {
+	var meta = require('./src/meta');
+	meta.configs.set('allowLocalLogin', 1, function(err) {
+		winston.info('[reset] Settings reset to default');
+		if (typeof callback === 'function') {
+			callback(err);
+		} else {
+			process.exit();
+		}
+	});
+}
+
+function resetThemes(callback) {
+	var meta = require('./src/meta');
+
+	meta.themes.set({
+		type: 'local',
+		id: 'nodebb-theme-persona'
+	}, function(err) {
+		winston.info('[reset] Theme reset to Persona');
+		if (typeof callback === 'function') {
+			callback(err);
+		} else {
+			process.exit();
+		}
+	});
+}
+
+function resetPlugin(pluginId) {
+	var db = require('./src/database');
+	db.sortedSetRemove('plugins:active', pluginId, function(err) {
+		if (err) {
+			winston.error('[reset] Could not disable plugin: %s encountered error %s', pluginId, err.message);
+		} else {
+			winston.info('[reset] Plugin `%s` disabled', pluginId);
+		}
+
+		process.exit();
+	});
+}
+
+function resetPlugins(callback) {
+	var db = require('./src/database');
+	db.delete('plugins:active', function(err) {
+		winston.info('[reset] All Plugins De-activated');
+		if (typeof callback === 'function') {
+			callback(err);
+		} else {
+			process.exit();
+		}
+	});
+}
+
+function resetWidgets(callback) {
+	require('./src/widgets').reset(function(err) {
+		winston.info('[reset] All Widgets moved to Draft Zone');
+		if (typeof callback === 'function') {
+			callback(err);
+		} else {
+			process.exit();
+		}
+	});
+}
+
+function shutdown(code) {
+	winston.info('[app] Shutdown (SIGTERM/SIGINT) Initialised.');
+	require('./src/database').close();
+	winston.info('[app] Database connection closed.');
+	require('./src/webserver').server.close();
+	winston.info('[app] Web server closed to connections.');
+
+	winston.info('[app] Shutdown complete.');
+	process.exit(code || 0);
+}
+
+function restart() {
+	if (process.send) {
+		winston.info('[app] Restarting...');
+		process.send({
+			action: 'restart'
+		});
+	} else {
+		winston.error('[app] Could not restart server. Shutting down.');
+		shutdown(1);
+	}
+}
--- a/install/data/categories.json
+++ b/install/data/categories.json
@@ -1,34 +1,34 @@
-[
-    {
-        "name": "Announcements",
-        "description": "Announcements regarding our community",
-        "bgColor": "#fda34b",
-        "color": "#fff",
-        "icon" : "fa-bullhorn",
-        "order": 1
-    },
-    {
-        "name": "General Discussion",
-        "description": "A place to talk about whatever you want",
-        "bgColor": "#59b3d0",
-        "color": "#fff",
-        "icon" : "fa-comments-o",
-        "order": 2
-    },
-    {
-        "name": "Blogs",
-        "description": "Blog posts from individual members",
-        "bgColor": "#86ba4b",
-        "color": "#fff",
-        "icon" : "fa-newspaper-o",
-        "order": 4
-    },
-    {
-        "name": "Comments & Feedback",
-        "description": "Got a question? Ask away!",
-        "bgColor": "#e95c5a",
-        "color": "#fff",
-        "icon" : "fa-question",
-        "order": 3
-    }
+[
+    {
+        "name": "Announcements",
+        "description": "Announcements regarding our community",
+        "bgColor": "#fda34b",
+        "color": "#fff",
+        "icon" : "fa-bullhorn",
+        "order": 1
+    },
+    {
+        "name": "General Discussion",
+        "description": "A place to talk about whatever you want",
+        "bgColor": "#59b3d0",
+        "color": "#fff",
+        "icon" : "fa-comments-o",
+        "order": 2
+    },
+    {
+        "name": "Blogs",
+        "description": "Blog posts from individual members",
+        "bgColor": "#86ba4b",
+        "color": "#fff",
+        "icon" : "fa-newspaper-o",
+        "order": 4
+    },
+    {
+        "name": "Comments & Feedback",
+        "description": "Got a question? Ask away!",
+        "bgColor": "#e95c5a",
+        "color": "#fff",
+        "icon" : "fa-question",
+        "order": 3
+    }
 ]
--- a/install/data/defaults.json
+++ b/install/data/defaults.json
@@ -1,106 +1,31 @@
-[
-    {
-        "field": "title",
-        "value": "NodeBB"
-    },
-    {
-        "field": "showSiteTitle",
-        "value": "1"
-    },
-    {
-        "field": "postDelay",
-        "value": 10
-    },
-    {
-        "field": "initialPostDelay",
-        "value": 10
-    },
-    {
-        "field": "newbiePostDelay",
-        "value": 120
-    },
-    {
-        "field": "newbiePostDelayThreshold",
-        "value": 3
-    },
-    {
-        "field": "minimumPostLength",
-        "value": 8
-    },
-    {
-        "field": "maximumPostLength",
-        "value": 32767
-    },
-    {
-        "field": "allowGuestSearching",
-        "value": 0
-    },
-    {
-        "field": "allowTopicsThumbnail",
-        "value": 0
-    },
-    {
-        "field": "allowRegistration",
-        "value": 1
-    },
-    {
-        "field": "allowLocalLogin",
-        "value": 1
-    },
-    {
-        "field": "allowAccountDelete",
-        "value": 1
-    },
-    {
-        "field": "allowFileUploads",
-        "value": 0
-    },
-    {
-        "field": "maximumFileSize",
-        "value": 2048
-    },
-    {
-        "field": "minimumTitleLength",
-        "value": 3
-    },
-    {
-        "field": "maximumTitleLength",
-        "value": 255
-    },
-    {
-        "field": "minimumUsernameLength",
-        "value": 2
-    },
-    {
-        "field": "maximumUsernameLength",
-        "value": 16
-    },
-    {
-        "field": "minimumPasswordLength",
-        "value": 6
-    },
-    {
-        "field": "maximumSignatureLength",
-        "value": 255
-    },
-    {
-        "field": "maximumAboutMeLength",
-        "value": 1000
-    },
-    {
-        "field": "maximumProfileImageSize",
-        "value": 256
-    },
-    {
-        "field": "profileImageDimension",
-        "value": 128
-    },
-    {
-        "field": "requireEmailConfirmation",
-        "value": 0
-    },
-    {
-        "field": "profile:allowProfileImageUploads",
-        "value": 1
-    }
-]
+{
+    "title": "NodeBB",
+    "showSiteTitle": 1,
+    "postDelay": 10,
+    "initialPostDelay": 10,
+    "newbiePostDelay": 120,
+    "newbiePostDelayThreshold": 3,
+    "minimumPostLength": 8,
+    "maximumPostLength": 32767,
+    "minimumTagsPerTopic": 0,
+    "maximumTagsPerTopic": 5,
+    "allowGuestSearching": 0,
+    "allowTopicsThumbnail": 0,
+    "registrationType": "normal",
+    "allowLocalLogin": 1,
+    "allowAccountDelete": 1,
+    "allowFileUploads": 0,
+    "maximumFileSize": 2048,
+    "minimumTitleLength": 3,
+    "maximumTitleLength": 255,
+    "minimumUsernameLength": 2,
+    "maximumUsernameLength": 16,
+    "minimumPasswordLength": 6,
+    "maximumSignatureLength": 255,
+    "maximumAboutMeLength": 1000,
+    "maximumProfileImageSize": 256,
+    "profileImageDimension": 128,
+    "requireEmailConfirmation": 0,
+    "profile:allowProfileImageUploads": 1,
+    "teaserPost": "last"
+}
--- a/install/data/navigation.json
+++ b/install/data/navigation.json
@@ -1,4 +1,12 @@
 [
+	{
+		"route": "/categories",
+		"title": "\\[\\[global:header.categories\\]\\]",
+		"enabled": true,
+		"iconClass": "fa-list",
+		"textClass": "visible-xs-inline",
+		"text": "\\[\\[global:header.categories\\]\\]"
+	},
 	{
 		"id": "unread-count",
 		"route": "/unread",
@@ -59,7 +67,7 @@
 		"textClass": "visible-xs-inline",
 		"text": "\\[\\[global:header.admin\\]\\]",
 		"properties": {
-			"target": "_top",
+			"targetBlank": false,
 			"adminOnly": true
 		}
 	},
--- a/install/web.js
+++ b/install/web.js
@@ -41,8 +41,7 @@ web.install = function(port) {

 function launchExpress(port) {
 	server = app.listen(port, function() {
-		var host = server.address().address;
-		winston.info('Web installer listening on http://%s:%s', host, port);
+		winston.info('Web installer listening on http://%s:%s', '0.0.0.0', port);
 	});
 }

@@ -104,6 +103,10 @@ function launch(req, res) {
 		stdio: ['ignore', 'ignore', 'ignore']
 	});

+	process.stdout.write('\nStarting NodeBB\n');
+	process.stdout.write('    "./nodebb stop" to stop the NodeBB server\n');
+	process.stdout.write('    "./nodebb log" to view server output\n');
+	process.stdout.write('    "./nodebb restart" to restart NodeBB\n');
 	
 	child.unref();
 	process.exit(0);
--- a/minifier.js
+++ b/minifier.js
@@ -4,10 +4,9 @@ var uglifyjs = require('uglify-js'),
 	less = require('less'),
 	async = require('async'),
 	fs = require('fs'),
-	path = require('path'),
 	crypto = require('crypto'),
 	utils = require('./public/src/utils'),
-
+ 
 	Minifier = {
 		js: {}
 	};
@@ -30,9 +29,10 @@ Minifier.js.minify = function (scripts, minify, callback) {
 process.on('message', function(payload) {
 	switch(payload.action) {
 	case 'js':
-		Minifier.js.minify(payload.scripts, payload.minify, function(minified) {
+		Minifier.js.minify(payload.scripts, payload.minify, function(minified/*, sourceMap*/) {
 			process.send({
 				type: 'end',
+				// sourceMap: sourceMap,
 				minified: minified
 			});
 		});
@@ -41,8 +41,11 @@ process.on('message', function(payload) {
 });

 function minifyScripts(scripts, callback) {
+	// The portions of code involving the source map are commented out as they're broken in UglifyJS2
+	// Follow along here: https://github.com/mishoo/UglifyJS2/issues/700
 	try {
 		var minified = uglifyjs.minify(scripts, {
+				// outSourceMap: "nodebb.min.js.map",
 				compress: false
 			}),
 			hasher = crypto.createHash('md5'),
@@ -56,7 +59,7 @@ function minifyScripts(scripts, callback) {
 			payload: hash.slice(0, 8)
 		});

-		callback(minified.code);
+		callback(minified.code/*, minified.map*/);
 	} catch(err) {
 		process.send({
 			type: 'error',
--- a/295
+++ b/295
@@ -1,137 +1,166 @@
-#!/bin/bash
+#!/usr/bin/env node

-# $0 script path
-# $1 action
-# $2 subaction
+var colors = require('colors'),
+	cproc = require('child_process'),
+	argv = require('minimist')(process.argv.slice(2)),
+	fs = require('fs'),
+	async = require('async'),
+	touch = require('touch');

-node="$(which nodejs 2>/dev/null)";
-if [ $? -gt 0 ];
-	then node="$(which node)";
-fi
+var getRunningPid = function(callback) {
+		fs.readFile(__dirname + '/pidfile', {
+			encoding: 'utf-8'
+		}, function(err, pid) {
+			if (err) {
+				return callback(err);
+			}

-function pidExists() {
-	if [ -e "pidfile" ];
-		then
-			if ps -p $(cat pidfile) > /dev/null
-				then return 1;
-				else
-					rm ./pidfile;
-					return 0;
-			fi
-		else
-			return 0;
-	fi
+			try {
+				process.kill(parseInt(pid, 10), 0);
+				callback(null, parseInt(pid, 10));
+			} catch(e) {
+				callback(e);
+			}
+		});
+	};
+
+switch(process.argv[2]) {
+	case 'status':
+		getRunningPid(function(err, pid) {
+			if (!err) {
+				process.stdout.write('\nNodeBB Running '.bold + '(pid '.cyan + pid.toString().cyan + ')\n'.cyan);
+				process.stdout.write('\t"' + './nodebb stop'.yellow + '" to stop the NodeBB server\n');
+				process.stdout.write('\t"' + './nodebb log'.yellow + '" to view server output\n');
+				process.stdout.write('\t"' + './nodebb restart'.yellow + '" to restart NodeBB\n\n');
+			} else {
+				process.stdout.write('\nNodeBB is not running\n'.bold);
+				process.stdout.write('\t"' + './nodebb start'.yellow + '" to launch the NodeBB server\n\n'.reset);
+			}
+		})
+		break;
+
+	case 'start':
+		process.stdout.write('\nStarting NodeBB\n'.bold);
+		process.stdout.write('  "' + './nodebb stop'.yellow + '" to stop the NodeBB server\n');
+		process.stdout.write('  "' + './nodebb log'.yellow + '" to view server output\n');
+		process.stdout.write('  "' + './nodebb restart'.yellow + '" to restart NodeBB\n\n'.reset);
+
+		// Spawn a new NodeBB process
+		cproc.fork(__dirname + '/loader.js', {
+			env: process.env
+		});
+		break;
+
+	case 'stop':
+		getRunningPid(function(err, pid) {
+			if (!err) {
+				process.kill(pid, 'SIGTERM');
+				process.stdout.write('Stopping NodeBB. Goodbye!\n')
+			} else {
+				process.stdout.write('NodeBB is already stopped.\n');
+			}
+		});
+		break;
+
+	case 'restart':
+		getRunningPid(function(err, pid) {
+			if (!err) {
+				process.kill(pid, 'SIGHUP');
+			} else {
+				process.stdout.write('NodeBB could not be restarted, as a running instance could not be found.');
+			}
+		});
+		break;
+
+	case 'reload':
+		getRunningPid(function(err, pid) {
+			if (!err) {
+				process.kill(pid, 'SIGUSR2');
+			} else {
+				process.stdout.write('NodeBB could not be reloaded, as a running instance could not be found.');
+			}
+		});
+		break;
+
+	case 'dev':
+		process.env.NODE_ENV = 'development';
+		cproc.fork(__dirname + '/loader.js', ['--no-daemon', '--no-silent'], {
+			env: process.env
+		});
+		break;
+
+	case 'log':
+		process.stdout.write('\nType '.red + 'Ctrl-C '.bold + 'to exit'.red);
+		process.stdout.write('\n\n'.reset);
+		cproc.spawn('tail', ['-F', './logs/output.log'], {
+			cwd: __dirname,
+			stdio: 'inherit'
+		});
+		break;
+
+	case 'setup':
+		cproc.fork('app.js', ['--setup'], {
+			cwd: __dirname,
+			silent: false
+		});
+		break;
+
+	case 'reset':
+		var args = process.argv.slice(0);
+		args.unshift('--reset');
+
+		cproc.fork('app.js', args, {
+			cwd: __dirname,
+			silent: false
+		});
+		break;
+
+	case 'upgrade':
+		async.series([
+			function(next) {
+				process.stdout.write('1. '.bold + 'Bringing base dependencies up to date... '.yellow);
+				require('child_process').execFile('/usr/bin/env', ['npm', 'i', '--production'], next);
+			},
+			function(next) {
+				process.stdout.write('OK\n'.green);
+				process.stdout.write('2. '.bold + 'Updating NodeBB data store schema.\n'.yellow);
+				var upgradeProc = cproc.fork('app.js', ['--upgrade'], {
+					cwd: __dirname,
+					silent: false
+				});
+
+				upgradeProc.on('close', next)
+			},
+			function(next) {
+				process.stdout.write('3. '.bold + 'Storing upgrade date in "package.json"... '.yellow);
+				touch(__dirname + '/package.json', {}, next);
+			}
+		], function(err) {
+			if (err) {
+				process.stdout.write('\nError'.red + ': ' + err.message + '\n');
+			} else {
+				var message = 'NodeBB Upgrade Complete!',
+					spaces = new Array(Math.floor(process.stdout.columns / 2) - (message.length / 2) + 1).join(' ');
+
+				process.stdout.write('OK\n'.green);
+				process.stdout.write('\n' + spaces + message.green.bold + '\n\n'.reset);
+			}
+		});
+		break;
+
+	default:
+		process.stdout.write('\nWelcome to NodeBB\n\n'.bold);
+		process.stdout.write('Usage: ./nodebb {start|stop|reload|restart|log|setup|reset|upgrade|dev}\n\n');
+		process.stdout.write('\t' + 'start'.yellow + '\tStart the NodeBB server\n');
+		process.stdout.write('\t' + 'stop'.yellow + '\tStops the NodeBB server\n');
+		process.stdout.write('\t' + 'reload'.yellow + '\tRestarts NodeBB\n');
+		process.stdout.write('\t' + 'restart'.yellow + '\tRestarts NodeBB\n');
+		process.stdout.write('\t' + 'log'.yellow + '\tOpens the logging interface (useful for debugging)\n');
+		process.stdout.write('\t' + 'setup'.yellow + '\tRuns the NodeBB setup script\n');
+		process.stdout.write('\t' + 'reset'.yellow + '\tDisables all plugins, restores the default theme.\n');
+		process.stdout.write('\t' + 'upgrade'.yellow + '\tRun NodeBB upgrade scripts, ensure packages are up-to-date\n');
+		process.stdout.write('\t' + 'dev'.yellow + '\tStart NodeBB in interactive development mode\n');
+		process.stdout.write('\t' + 'watch'.yellow + '\tStart NodeBB in development mode and watch for changes\n');
+		process.stdout.write('\n'.reset);
+		break;
 }
-
-case "$1" in
-	start)
-		echo "Starting NodeBB";
-		echo "  \"./nodebb stop\" to stop the NodeBB server";
-		echo "  \"./nodebb log\" to view server output";
-
-		# Start the loader daemon
-		"$node" loader "$@"
-		;;
-
-	stop)
-		pidExists;
-		if [ 0 -eq $? ];
-			then
-				echo "NodeBB is already stopped.";
-			else
-				echo "Stopping NodeBB. Goodbye!";
-				kill $(cat pidfile);
-		fi
-		;;
-
-	restart)
-		pidExists;
-		if [ 0 -eq $? ];
-			then
-				echo "NodeBB could not be restarted, as a running instance could not be found.";
-			else
-				echo "Restarting NodeBB.";
-				kill -1 $(cat pidfile);
-		fi
-		;;
-
-	reload)
-		pidExists;
-		if [ 0 -eq $? ];
-			then
-				echo "NodeBB could not be reloaded, as a running instance could not be found.";
-			else
-				echo "Reloading NodeBB.";
-				kill -12 $(cat pidfile);
-		fi
-		;;
-
-	status)
-		pidExists;
-		if [ 0 -eq $? ];
-			then
-				echo "NodeBB is not running";
-				echo "  \"./nodebb start\" to launch the NodeBB server";
-			else
-				echo "NodeBB Running (pid $(cat pidfile))";
-				echo "  \"./nodebb stop\" to stop the NodeBB server";
-				echo "  \"./nodebb log\" to view server output";
-				echo "  \"./nodebb restart\" to restart NodeBB";
-		fi
-		;;
-
-	log)
-		clear;
-		tail -F ./logs/output.log;
-		;;
-
-	upgrade)
-		npm install
-		# ls -d node_modules/nodebb* | xargs -n1 basename | xargs npm install
-		# ls -d node_modules/nodebb* | xargs -n1 basename | xargs npm update
-		npm i nodebb-theme-vanilla nodebb-theme-lavender nodebb-widget-essentials
-		"$node" app --upgrade
-		touch package.json
-		;;
-
-	setup)
-		"$node" app --setup "$@"
-		;;
-
-	reset)
-		"$node" app --reset --$2
-		;;
-
-	dev)
-		echo "Launching NodeBB in \"development\" mode."
-		echo "To run the production build of NodeBB, please use \"forever\"."
-		echo "More Information: https://docs.nodebb.org/en/latest/running/index.html"
-		NODE_ENV=development "$node" loader --no-daemon --no-silent "$@"
-		;;
-
-	watch)
-		echo "***************************************************************************"
-		echo "WARNING: ./nodebb watch will be deprecated soon. Please use grunt: "
-		echo "https://docs.nodebb.org/en/latest/running/index.html#grunt-development"
-		echo "***************************************************************************"
-		NODE_ENV=development supervisor -q --ignore public/templates,public/nodebb.min.js,public/nodebb.min.js.map --extensions 'node|js|tpl|less' -- app "$@"
-		;;
-
-	*)
-		echo "Welcome to NodeBB"
-		echo $"Usage: $0 {start|stop|reload|restart|log|setup|reset|upgrade|dev|watch}"
-		echo ''
-		column -s '	' -t <<< '
-		start	Start the NodeBB server
-		stop	Stops the NodeBB server
-		reload	Restarts NodeBB
-		restart	Restarts NodeBB
-		log	Opens the logging interface (useful for debugging)
-		setup	Runs the NodeBB setup script
-		reset	Disables all plugins, restores the default theme.
-		upgrade	Run NodeBB upgrade scripts, ensure packages are up-to-date
-		dev	Start NodeBB in interactive development mode
-		watch	Start NodeBB in development mode and watch for changes
-		'
-		exit 1
-esac
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
  "name": "nodebb",
-  "license": "GPLv3 or later",
+  "license": "GPL-3.0",
  "description": "NodeBB Forum",
-  "version": "0.7.0-dev",
+  "version": "0.8.1",
  "homepage": "http://www.nodebb.org",
  "repository": {
    "type": "git",
@@ -14,61 +14,66 @@
    "test": "mocha ./tests -t 10000"
  },
  "dependencies": {
-    "async": "~0.9.0",
-    "bcryptjs": "~2.1.0",
+    "async": "~1.4.2",
+    "bcryptjs": "~2.2.1",
    "body-parser": "^1.9.0",
+    "colors": "^1.1.0",
    "compression": "^1.1.0",
    "connect-ensure-login": "^0.1.1",
    "connect-flash": "^0.1.1",
-    "connect-multiparty": "^1.2.4",
+    "connect-multiparty": "^2.0.0",
    "cookie-parser": "^1.3.3",
    "cron": "^1.0.5",
    "csurf": "^1.6.1",
    "daemon": "~1.1.0",
    "express": "^4.9.5",
    "express-session": "^1.8.2",
-    "gm": "1.17.0",
    "gravatar": "^1.1.0",
    "heapdump": "^0.3.0",
    "less": "^2.0.0",
    "logrotate-stream": "^0.2.3",
    "lru-cache": "^2.6.1",
+    "lwip": "0.0.7",
    "mime": "^1.3.4",
+    "minimist": "^1.1.1",
    "mkdirp": "~0.5.0",
    "mmmagic": "^0.3.13",
    "morgan": "^1.3.2",
    "nconf": "~0.7.1",
-    "nodebb-plugin-dbsearch": "^0.2.12",
-    "nodebb-plugin-emoji-extended": "^0.4.8",
-    "nodebb-plugin-markdown": "^2.1.7",
-    "nodebb-plugin-mentions": "^0.11.2",
-    "nodebb-plugin-soundpack-default": "^0.1.1",
-    "nodebb-plugin-spam-be-gone": "^0.4.0",
-    "nodebb-theme-lavender": "^1.0.42",
-    "nodebb-theme-vanilla": "^1.0.130",
-    "nodebb-theme-persona": "^0.1.55",
-    "nodebb-widget-essentials": "^1.0.2",
-    "nodebb-rewards-essentials": "^0.0.1",
+    "nodebb-plugin-composer-default": "1.0.13",
+    "nodebb-plugin-dbsearch": "0.2.16",
+    "nodebb-plugin-emoji-extended": "0.4.9",
+    "nodebb-plugin-markdown": "4.0.5",
+    "nodebb-plugin-mentions": "1.0.1",
+    "nodebb-plugin-soundpack-default": "0.1.4",
+    "nodebb-plugin-spam-be-gone": "0.4.1",
+    "nodebb-rewards-essentials": "0.0.5",
+    "nodebb-theme-lavender": "1.0.54",
+    "nodebb-theme-persona": "2.1.25",
+    "nodebb-theme-vanilla": "3.1.7",
+    "nodebb-widget-essentials": "2.0.0",
    "npm": "^2.1.4",
-    "passport": "^0.2.1",
+    "passport": "^0.3.0",
    "passport-local": "1.0.0",
    "prompt": "^0.2.14",
    "request": "^2.44.0",
-    "rimraf": "~2.3.2",
+    "rimraf": "~2.4.2",
    "rss": "^1.0.0",
-    "semver": "^4.3.3",
+    "semver": "^5.0.1",
    "serve-favicon": "^2.1.5",
-    "sitemap": "^0.8.1",
+    "sitemap": "^1.0.0",
    "socket.io": "^1.2.1",
    "socket.io-client": "^1.2.1",
    "socket.io-redis": "^0.1.3",
    "socketio-wildcard": "~0.1.1",
    "string": "^3.0.0",
-    "templates.js": "^0.2.3",
-    "uglify-js": "git+https://github.com/julianlam/UglifyJS2.git",
+    "templates.js": "0.2.10",
+    "touch": "1.0.0",
+    "uglify-js": "^2.4.24",
    "underscore": "~1.8.3",
-    "validator": "^3.30.0",
-    "winston": "^0.9.0",
+    "underscore.deep": "^0.5.1",
+    "validator": "^4.0.5",
+    "winston": "^1.0.1",
    "xregexp": "~2.0.0"
  },
  "devDependencies": {
@@ -85,17 +90,17 @@
  "maintainers": [
    {
      "name": "Andrew Rodrigues",
-      "email": "andrew@designcreateplay.com",
+      "email": "andrew@nodebb.org",
      "url": "https://github.com/psychobunny"
    },
    {
      "name": "Julian Lam",
-      "email": "julian@designcreateplay.com",
+      "email": "julian@nodebb.org",
      "url": "https://github.com/julianlam"
    },
    {
      "name": "Barış Soner Uşaklı",
-      "email": "baris@designcreateplay.com",
+      "email": "baris@nodebb.org",
      "url": "https://github.com/barisusakli"
    }
  ]
--- a/public/language/ar/category.json
+++ b/public/language/ar/category.json
@@ -1,12 +1,15 @@
 {
+    "category": "فئة",
+    "subcategories": "فئة فرعية",
    "new_topic_button": "موضوع جديد",
-    "guest-login-post": "المرجو تسجيل الدخول أوَّلا",
+    "guest-login-post": "يجب عليك تسجيل الدخول للرد",
    "no_topics": "<strong>لا توجد مواضيع في هذه الفئة</strong>لم لا تحاول إنشاء موضوع؟<br />",
    "browsing": "تصفح",
-    "no_replies": "لم يرد أحد",
+    "no_replies": "لا توجد ردود.",
+    "no_new_posts": "لا يوجد مشاركات جديدة.",
    "share_this_category": "انشر هذه الفئة",
-    "watch": "Watch",
+    "watch": "متابعة",
    "ignore": "تجاهل",
-    "watch.message": "You are now watching updates from this category",
-    "ignore.message": "You are now ignoring updates from this category"
+    "watch.message": "أنت اﻷن متابع لتحديثات هذه الفئة",
+    "ignore.message": "أنت اﻷن تتجاهل تحديثات هذه الفئة"
 }
--- a/public/language/ar/email.json
+++ b/public/language/ar/email.json
@@ -1,13 +1,17 @@
 {
-    "password-reset-requested": "تم طلب إعادة تعيين كلمة السر - %1!",
+    "password-reset-requested": "تم طلب إعادة تعيين كلمة المرور - %1!",
    "welcome-to": "مرحبًا بك في %1",
+    "invite": "دعوة من %1",
    "greeting_no_name": "مرحبًا",
    "greeting_with_name": "مرحبًا بك يا %1",
    "welcome.text1": "شكرًا على تسجيلك في %1!",
-    "welcome.text2": "لتفعيل حسابك، نحتاج إلى التأكد من صحة عنوان البريد الإلكتروني الذي تسجلت به.",
+    "welcome.text2": "لتفعيل حسابك، نحتاج إلى التأكد من صحة عنوان البريد الإلكتروني الذي سجلت به.",
+    "welcome.text3": "تم قبول نتسجيلك ، يمكنك الدخول باتسخدام اسم المستخدم و كلمة المرور.",
    "welcome.cta": "انقر هنا لتفعيل عنوان بريدك الإلكتروني",
-    "reset.text1": "لقد توصلنا بطلب إعادة تعيين كلمة السرالخاصة بك، ربما لكونك قد نسيتها, إن لم يكن الأمر كذلك، المرجو تجاهل هذه الرسالة.",
-    "reset.text2": "لمواصلة طلب إعاة تعيين كلمة السر، المرجو تتبع هذا الرابط.",
+    "invitation.text1": "%1 قام بدعوتك للانضمام لـ %2",
+    "invitation.ctr": "إضغط هنا لإنشاء حسابك",
+    "reset.text1": "لقد توصلنا بطلب إعادة تعيين كلمة المرور الخاصة بك، ربما لكونك قد نسيتها, إن لم يكن الأمر كذلك، المرجو تجاهل هذه الرسالة.",
+    "reset.text2": "لمواصلة طلب إعاة تعيين كلمة المرور، الرجاء تتبع هذا الرابط.",
    "reset.cta": "انقر هنا لإعادة تعيين كلمة السر الخاصة بك.",
    "reset.notify.subject": "تم تغيير كلمة المرور بنجاح",
    "reset.notify.text1": "نحيطك علما أن كلمة مرورك قد تم تغييرها في %1",
--- a/public/language/ar/error.json
+++ b/public/language/ar/error.json
@@ -1,8 +1,8 @@
 {
    "invalid-data": "بيانات غير صالحة",
    "not-logged-in": "لم تقم بتسجيل الدخول",
-    "account-locked": "تم إقفال حسابكم مؤقتًا.",
-    "search-requires-login": "Searching requires an account - please login or register.",
+    "account-locked": "تم حظر حسابك مؤقتًا.",
+    "search-requires-login": "البحث في المنتدى يتطلب حساب - الرجاء تسجيل الدخول أو التسجيل",
    "invalid-cid": "قائمة غير موجودة",
    "invalid-tid": "موضوع غير متواجد",
    "invalid-pid": "رد غير موجود",
@@ -18,10 +18,10 @@
    "username-taken": "اسم المستخدم مأخوذ",
    "email-taken": "البريد الالكتروني مأخوذ",
    "email-not-confirmed": "عنوان بريدك الإلكتروني غير مفعل بعد. انقر هنا لتفعيله من فضلك.",
-    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
+    "email-not-confirmed-chat": "لا يمكنك الدردشة حتى تقوم بتأكيد بريدك الإلكتروني، الرجاء إضغط هنا لتأكيد بريدك اﻹلكتروني.",
    "no-email-to-confirm": "هذا المنتدى يستلزم تفعيل بريدك الإلكتروني، انقر هنا من فضلك لإدخاله.",
    "email-confirm-failed": "لم نستطع تفعيل بريدك الإلكتروني، المرجو المحاولة لاحقًا.",
-    "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
+    "confirm-email-already-sent": "لقد تم ارسال بريد التأكيد، الرجاء اﻹنتظار 1% دقائق لإعادة اﻹرسال",
    "username-too-short": "اسم المستخدم قصير.",
    "username-too-long": "اسم المستخدم طويل",
    "user-banned": "المستخدم محظور",
@@ -46,19 +46,24 @@
    "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
    "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",
    "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 character(s)",
+    "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
+    "too-many-tags": "Too many tags. Topics can't have more than %1 tag(s)",
    "file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
    "cant-vote-self-post": "لايمكنك التصويت لردك",
    "already-favourited": "لقد سبق وأضفت هذا الرد إلى المفضلة",
    "already-unfavourited": "لقد سبق وحذفت هذا الرد من المفضلة",
    "cant-ban-other-admins": "لايمكن حظر مدبر نظام آخر.",
+    "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
    "invalid-image-type": "Invalid image type. Allowed types are: %1",
    "invalid-image-extension": "Invalid image extension",
    "invalid-file-type": "Invalid file type. Allowed types are: %1",
    "group-name-too-short": "اسم المجموعة قصير",
    "group-already-exists": "المجموعة موجودة مسبقا",
    "group-name-change-not-allowed": "لايسمح بتغيير أسماء المجموعات",
-    "group-already-member": "You are already part of this group",
-    "group-needs-owner": "This group requires at least one owner",
+    "group-already-member": "أنت بالفعل عضو في هذه المجموعة ",
+    "group-needs-owner": "هذه المجموعة تتطلب مالك واحد على اﻷقل",
+    "group-already-invited": "This user has already been invited",
+    "group-already-requested": "Your membership request has already been submitted",
    "post-already-deleted": "سبق وتم حذف هذا الرد",
    "post-already-restored": "سبق وتم إلغاء حذف هذا الرد",
    "topic-already-deleted": "سبق وتم حذف هذا الموضوع",
@@ -67,18 +72,19 @@
    "topic-thumbnails-are-disabled": "الصور المصغرة غير مفعلة.",
    "invalid-file": "ملف غير مقبول",
    "uploads-are-disabled": "رفع الملفات غير مفعل",
-    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+    "signature-too-long": "عذرا، توقيعك يجب ألا يتجاوز %1 حرفًا.",
    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
    "cant-chat-with-yourself": "لايمكنك فتح محادثة مع نفسك",
    "chat-restricted": "هذا المستخدم عطل المحادثات الواردة عليه. يجب أن يتبعك حتى تتمكن من فتح محادثة معه.",
-    "too-many-messages": "You have sent too many messages, please wait awhile.",
+    "too-many-messages": "لقد أرسلت الكثير من الرسائل، الرجاء اﻹنتظار قليلاً",
    "reputation-system-disabled": "نظام السمعة معطل",
    "downvoting-disabled": "التصويتات السلبية معطلة",
    "not-enough-reputation-to-downvote": "ليس لديك سمعة تكفي لإضافة صوت سلبي لهذا الموضوع",
    "not-enough-reputation-to-flag": "ليس لديك سمعة تكفي للإشعار بموضوع مخل",
+    "already-flagged": "You have already flagged this post",
    "reload-failed": "المنتدى واجه مشكلة أثناء إعادة التحميل: \"%1\".  سيواصل المنتدى خدمة العملاء السابقين لكن يجب عليك إلغاء أي تغيير قمت به قبل إعادة التحميل.",
    "registration-error": "حدث خطأ أثناء التسجيل",
-    "parse-error": "Something went wrong while parsing server response",
+    "parse-error": "حدث خطأ ما أثناء تحليل استجابة الخادم",
    "wrong-login-type-email": "الرجاء استعمال بريدك اﻹلكتروني للدخول",
    "wrong-login-type-username": "الرجاء استعمال اسم المستخدم الخاص بك للدخول"
 }
--- a/public/language/ar/global.json
+++ b/public/language/ar/global.json
@@ -3,7 +3,7 @@
    "search": "بحث",
    "buttons.close": "أغلق",
    "403.title": "غير مسموح بالدخول",
-    "403.message": "You seem to have stumbled upon a page that you do not have access to.",
+    "403.message": "يبدو أنك قد تعثرت على صفحة لا تمتلك الصلاحية للدخول إليها",
    "403.login": "Perhaps you should <a href='%1/login'>try logging in</a>?",
    "404.title": "لم يتم العثور",
    "404.message": "You seem to have stumbled upon a page that does not exist. Return to the <a href='%1/'>home page</a>.",
@@ -22,6 +22,7 @@
    "pagination.out_of": "%1 من %2",
    "pagination.enter_index": "أدخل الرقم التسلسلي",
    "header.admin": "مدبر نظام",
+    "header.categories": "الفئات",
    "header.recent": "حديث",
    "header.unread": "غير مقروء",
    "header.tags": "وسم",
@@ -32,6 +33,7 @@
    "header.notifications": "التنبيهات",
    "header.search": "بحث",
    "header.profile": "ملف",
+    "header.navigation": "Navigation",
    "notifications.loading": "تحميل التبليغات",
    "chats.loading": "تحميل الدردشات",
    "motd.welcome": "مرحبا بكم  NodeBB، منصة مناقشة المستقبل",
@@ -50,6 +52,7 @@
    "views": "المشاهدات",
    "reputation": "السمعة",
    "read_more": "اقرأ المزيد",
+    "more": "المزيد",
    "posted_ago_by_guest": "كتب %1 من طرف زائر",
    "posted_ago_by": "كتب %1 من طرف %2",
    "posted_ago": "كتب %1",
@@ -65,7 +68,7 @@
    "recentposts": "آخر المشاركات",
    "recentips": "آخر عناوين ال IP التي سجلت الدخول",
    "away": "غير متواجد",
-    "dnd": "المرجو عدم الإزعاج",
+    "dnd": "Do not disturb",
    "invisible": "مخفي",
    "offline": "غير متصل",
    "email": "عنوان البريد الإلكتروني",
--- a/public/language/ar/groups.json
+++ b/public/language/ar/groups.json
@@ -6,6 +6,12 @@
    "no_groups_found": "لاوجدود لمجموعات يمكن معاينتها",
    "pending.accept": "موافق",
    "pending.reject": "رفض",
+    "pending.accept_all": "قبول الكل",
+    "pending.reject_all": "رفض الكل",
+    "pending.none": "لايوجد أعضاء ينتظرون التفعيل حالياً",
+    "invited.none": "لايوجد أعضاء مدعوون في  حالياً",
+    "invited.uninvite": "إلغ الدعوة",
+    "invited.search": "ابحث عن أعضاء لدعوتهم للمجموعة",
    "cover-instructions": "اسحب وأسقِط صورة، اسحبها للموضع المرغوب، وانقر على <strong>حفظ</strong>",
    "cover-change": "تغيير",
    "cover-save": "حفظ",
@@ -13,6 +19,7 @@
    "details.title": "تفاصيل المجموعة",
    "details.members": "لائحة الأعضاء",
    "details.pending": "المستخدمون في الانتظار",
+    "details.invited": "اﻷعضار المدعوون",
    "details.has_no_posts": "أعضاء هذه المجموعة لم يضيفوا أية مشاركة",
    "details.latest_posts": "آخر المشاركات",
    "details.private": "خاص",
@@ -30,7 +37,14 @@
    "details.userTitleEnabled": "إظهار الوسام",
    "details.private_help": "في حالة تفعيل الخيار، الانضمام إلى المجموعة يستلزم قبول مالكها",
    "details.hidden": "مخفي",
-    "details.hidden_help": "في حالة تفعيل الخيار، لن تظهر المجموعة للعموم والإنضمام إليها سيتلزم دعوة يدوية.",
+    "details.hidden_help": "في حالة تفعيل الخيار، لن تظهر المجموعة للعموم والإنضمام إليها سيتلزم دعوة.",
+    "details.delete_group": "حذف المجموعة",
    "event.updated": "تم تحديث بيانات المجموعة",
-    "event.deleted": "تم حذف المجموعة %1"
+    "event.deleted": "تم حذف المجموعة %1",
+    "membership.accept-invitation": "اقبل الدعوة",
+    "membership.invitation-pending": "الدعوة بانتظار القبول",
+    "membership.join-group": "انظم للمجموعة",
+    "membership.leave-group": "غادر المجموعة",
+    "membership.reject": "رفض",
+    "new-group.group_name": "اسم المجموعة"
 }
--- a/public/language/ar/login.json
+++ b/public/language/ar/login.json
@@ -7,5 +7,5 @@
    "alternative_logins": "تسجيلات الدخول البديلة",
    "failed_login_attempt": "فشلت محاولة تسجيل الدخول، يرجى المحاولة مرة أخرى.",
    "login_successful": "قمت بتسجيل الدخول بنجاح!",
-    "dont_have_account": "لم تفتح حسابك بعد؟"
+    "dont_have_account": "لا تملك حساب؟"
 }
--- a/public/language/ar/modules.json
+++ b/public/language/ar/modules.json
@@ -5,7 +5,7 @@
    "chat.no_active": "لا يوجد لديك دردشات نشطة.",
    "chat.user_typing": "%1 يكتب رسالة...",
    "chat.user_has_messaged_you": "%1 أرسل لك رسالة.",
-    "chat.see_all": "معاينة كل الدردشات",
+    "chat.see_all": "See all chats",
    "chat.no-messages": "المرجو اختيار مرسل إليه لمعاينة تاريخ الدردشات",
    "chat.recent-chats": "آخر الدردشات",
    "chat.contacts": "الأصدقاء",
@@ -15,12 +15,15 @@
    "chat.seven_days": "7 أيام",
    "chat.thirty_days": "30 يومًا",
    "chat.three_months": "3 أشهر",
-    "composer.compose": "Compose",
+    "composer.compose": "اكتب",
    "composer.show_preview": "عرض المعاينة",
    "composer.hide_preview": "إخفاء المعاينة",
    "composer.user_said_in": "%1 كتب في  %2",
    "composer.user_said": "%1 كتب:",
    "composer.discard": "هل أنت متأكد أنك تريد التخلي عن التغييرات؟",
    "composer.submit_and_lock": "Submit and Lock",
-    "composer.toggle_dropdown": "Toggle Dropdown"
+    "composer.toggle_dropdown": "Toggle Dropdown",
+    "bootbox.ok": "OK",
+    "bootbox.cancel": "Cancel",
+    "bootbox.confirm": "Confirm"
 }
--- a/public/language/ar/notifications.json
+++ b/public/language/ar/notifications.json
@@ -1,7 +1,7 @@
 {
    "title": "التنبيهات",
    "no_notifs": "ليس لديك أية تنبيهات جديدة",
-    "see_all": "معاينة كل التنبيهات",
+    "see_all": "See all notifications",
    "mark_all_read": "اجعل كل التنبيهات مقروءة",
    "back_to_home": "عودة إلى %1",
    "outgoing_link": "رابط خارجي",
@@ -20,6 +20,7 @@
    "user_posted_topic": "<strong>%1</strong> أنشأ موضوعًا جديدًا: <strong>%2</strong>",
    "user_mentioned_you_in": "<strong>%1</strong> ذكرَ اسمك في <strong>%2</strong>",
    "user_started_following_you": "<strong>%1</strong> صار يتابعك.",
+    "new_register": "<strong>%1</strong> sent a registration request.",
    "email-confirmed": "تم التحقق من عنوان البريد الإلكتروني",
    "email-confirmed-message": "شكرًا على إثبات صحة عنوان بريدك الإلكتروني. صار حسابك مفعلًا بالكامل.",
    "email-confirm-error-message": "حدث خطأ أثناء التحقق من عنوان بريدك الإلكتروني. ربما رمز التفعيل خاطئ أو انتهت صلاحيته.",
--- a/public/language/ar/pages.json
+++ b/public/language/ar/pages.json
@@ -1,21 +1,37 @@
 {
    "home": "الصفحة الرئيسية",
    "unread": "المواضيع الغير مقروءة",
-    "popular": "المواضيع الأكثر شهرة",
+    "popular-day": "Popular topics today",
+    "popular-week": "Popular topics this week",
+    "popular-month": "Popular topics this month",
+    "popular-alltime": "All time popular topics",
    "recent": "المواضيع الحديثة",
-    "users": "اﻷعضاء المسجلون",
+    "users/online": "Online Users",
+    "users/latest": "Latest Users",
+    "users/sort-posts": "Users with the most posts",
+    "users/sort-reputation": "Users with the most reputation",
+    "users/map": "User Map",
+    "users/search": "User Search",
    "notifications": "التنبيهات",
-    "tags": "Tags",
+    "tags": "الكلمات الدلالية",
    "tag": "Topics tagged under \"%1\"",
-    "user.edit": "تعديل \"%1\"",
-    "user.following": "المستخدمون الذين يتبعهم %1",
-    "user.followers": "المستخدمون الذين يتبعون %1",
-    "user.posts": "ردود  %1",
-    "user.topics": "مواضيع %1",
-    "user.groups": "%1's Groups",
-    "user.favourites": "مفضلات %1",
-    "user.settings": "خيارات المستخدم",
-    "user.watched": "Topics watched by %1",
+    "register": "Register an account",
+    "login": "Login to your account",
+    "reset": "Reset your account password",
+    "categories": "Categories",
+    "groups": "Groups",
+    "group": "%1 group",
+    "chats": "Chats",
+    "chat": "Chatting with %1",
+    "account/edit": "Editing \"%1\"",
+    "account/following": "People %1 follows",
+    "account/followers": "People who follow %1",
+    "account/posts": "Posts made by %1",
+    "account/topics": "Topics created by %1",
+    "account/groups": "%1's Groups",
+    "account/favourites": "%1's Favourite Posts",
+    "account/settings": "User Settings",
+    "account/watched": "Topics watched by %1",
    "maintenance.text": "جاري صيانة %1. المرجو العودة لاحقًا.",
    "maintenance.messageIntro": "بالإضافة إلى ذلك، قام مدبر النظام بترك هذه الرسالة:"
 }
--- a/public/language/ar/register.json
+++ b/public/language/ar/register.json
@@ -1,18 +1,19 @@
 {
    "register": "تسجيل",
-    "help.email": "افتراضيا، سيتم إخفاء بريدك الإلكتروني من الجمهور.",
+    "help.email": "افتراضيا، سيتم إخفاء بريدك الإلكتروني من العامة.",
    "help.username_restrictions": "اسم مستخدم فريدة من نوعها بين1% و2% حرفا. يمكن للآخرين ذكرك @ <'span id='your-username> اسم المستخدم </span>.",
-    "help.minimum_password_length": "كلمتك السر يجب أن تكون على الأقل متألفة من 1% أحرف",
+    "help.minimum_password_length": "كلمة المرور يجب أن تكون على الأقل بها 1% أحرف",
    "email_address": "عنوان البريد الإلكتروني",
    "email_address_placeholder": "ادخل عنوان البريد الإلكتروني",
    "username": "اسم المستخدم",
    "username_placeholder": "أدخل اسم المستخدم",
-    "password": "كلمة السر",
-    "password_placeholder": "أدخل كلمة السر",
-    "confirm_password": "تأكيد كلمة السر",
-    "confirm_password_placeholder": "تأكيد كلمة السر",
+    "password": "كلمة المرور",
+    "password_placeholder": "أدخل كلمة المرور",
+    "confirm_password": "تأكيد كلمة المرور",
+    "confirm_password_placeholder": "تأكيد كلمة المرور",
    "register_now_button": "قم بالتسجيل الآن",
    "alternative_registration": "طريقة تسجيل بديلة",
    "terms_of_use": "شروط الاستخدام",
-    "agree_to_terms_of_use": "أوافق على شروط الاستخدام"
+    "agree_to_terms_of_use": "أوافق على شروط الاستخدام",
+    "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator."
 }
--- a/public/language/ar/reset_password.json
+++ b/public/language/ar/reset_password.json
@@ -1,17 +1,17 @@
 {
-    "reset_password": "إعادة تعيين كلمة السر",
-    "update_password": "تحديث كلمة السر",
-    "password_changed.title": "تم تغير كلمة السر",
-    "password_changed.message": "<p>تم تغير كلمة السر بنجاح. يرجى <a href='/login'>إعادة الدخول</a></p>",
+    "reset_password": "إعادة تعيين كلمة المرور",
+    "update_password": "تحديث كلمة المرور",
+    "password_changed.title": "تم تغير كلمة المرور",
+    "password_changed.message": "<p>تم تغير كلمة المرور بنجاح، الرجاء <a href='/login'>إعادة الدخول</a></p>",
    "wrong_reset_code.title": "رمز إعادة التعيين غير صحيح",
    "wrong_reset_code.message": "رمز إعادة التعين غير صحيح، يرجى المحاولة مرة أخرى أو <a href='/reset'>اطلب رمزا جديدا</a>",
-    "new_password": "كلمة السر الجديدة",
-    "repeat_password": "تأكيد كلمة السر",
+    "new_password": "كلمة المرور الجديدة",
+    "repeat_password": "تأكيد كلمة المرور",
    "enter_email": "يرجى إدخال <strong>عنوان البريد الإلكتروني</strong> الخاص بك وسوف نرسل لك رسالة بالبريد الالكتروني مع تعليمات حول كيفية إستعادة حسابك.",
    "enter_email_address": "ادخل عنوان البريد الإلكتروني",
    "password_reset_sent": "إعادة تعيين كلمة السر أرسلت",
    "invalid_email": "بريد إلكتروني غير صالح أو غير موجود",
-    "password_too_short": "The password entered is too short, please pick a different password.",
-    "passwords_do_not_match": "The two passwords you've entered do not match.",
-    "password_expired": "Your password has expired, please choose a new password"
+    "password_too_short": "كلمة المرور التي أدخلتها قصيرة، الرجاء اختر  كلمة مرور مختلفة",
+    "passwords_do_not_match": "كلمتا السر التي أدخلتهما غير متطابقتان",
+    "password_expired": "لقد انتهت صلاحية كلمة المرور الخاصة بك، الرجاء اختيار كلمة مرور جديدة"
 }
--- a/public/language/ar/search.json
+++ b/public/language/ar/search.json
@@ -1,17 +1,17 @@
 {
-    "results_matching": "%1 نتيجة (نتائج) موافقة ل \"%2\", (%3 ثواني)",
-    "no-matches": "No matches found",
+    "results_matching": "%1 نتيجة (نتائج) موافقة لـ \"%2\", (%3 ثواني)",
+    "no-matches": "لم يتم العثور على نتائج.",
    "advanced-search": "بحث متقدم",
    "in": "في",
    "titles": "العناوين",
    "titles-posts": "العناوين والمشاركات",
-    "posted-by": "Posted by",
-    "in-categories": "In Categories",
-    "search-child-categories": "Search child categories",
-    "reply-count": "Reply Count",
-    "at-least": "At least",
-    "at-most": "At most",
-    "post-time": "Post time",
+    "posted-by": "مشاركة من طرف",
+    "in-categories": "في الفئات",
+    "search-child-categories": "بحث في الفئات الفرعية",
+    "reply-count": "عدد المشاركات",
+    "at-least": "على اﻷقل",
+    "at-most": "على اﻷكثر",
+    "post-time": "تاريخ المشاركة",
    "newer-than": "أحدث من",
    "older-than": "أقدم من",
    "any-date": "أي وقت",
@@ -22,19 +22,19 @@
    "three-months": "ثلاثة أشهر",
    "six-months": "ستة أشهر",
    "one-year": "عام",
-    "sort-by": "Sort by",
+    "sort-by": "عرض حسب",
    "last-reply-time": "تاريخ آخر رد",
    "topic-title": "عنوان الموضوع",
    "number-of-replies": "عدد الردود",
    "number-of-views": "عدد المشاهدات",
    "topic-start-date": "تاريخ بدأ الموضوع",
    "username": "اسم المستخدم",
-    "category": "Category",
-    "descending": "In descending order",
-    "ascending": "In ascending order",
+    "category": "فئة",
+    "descending": "في ترتيب تنازلي",
+    "ascending": "في ترتيب تصاعدي",
    "save-preferences": "حفظ التفضيلات",
-    "clear-preferences": "Clear preferences",
+    "clear-preferences": "ازالة التفضيلات",
    "search-preferences-saved": "تم حفظ تفضيلات البحث",
-    "search-preferences-cleared": "Search preferences cleared",
+    "search-preferences-cleared": "تم ازالة تفضيلات البحث",
    "show-results-as": "عرض النتائج كـ"
 }
--- a/public/language/ar/tags.json
+++ b/public/language/ar/tags.json
@@ -1,7 +1,7 @@
 {
-    "no_tag_topics": "لاوجود لمواضيع تحمل هذا الوسم.",
-    "tags": "بطاقات",
+    "no_tag_topics": "لا يوجد مواضيع بهذه الكلمة الدلالية.",
+    "tags": "الكلمات الدلالية",
    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
-    "enter_tags_here_short": "أدخل البطاقات...",
-    "no_tags": "لاتوجد هناك بطاقات بعد."
+    "enter_tags_here_short": "أدخل الكلمات الدلالية...",
+    "no_tags": "لا يوجد كلمات دلالية بعد."
 }
--- a/public/language/ar/topic.json
+++ b/public/language/ar/topic.json
@@ -5,7 +5,7 @@
    "no_topics_found": "لا توجد مواضيع !",
    "no_posts_found": "لا  توجد مشاركات!",
    "post_is_deleted": "هذه المشاركة محذوفة!",
-    "topic_is_deleted": "This topic is deleted!",
+    "topic_is_deleted": "هذا الموضوع محذوف",
    "profile": "الملف الشخصي",
    "posted_by": "كتب من طرف %1",
    "posted_by_guest": "كتب من طرف زائر",
@@ -76,7 +76,7 @@
    "fork_no_pids": "لم تختر أي مشاركة",
    "fork_success": "تم إنشاء فرع للموضوع بنجاح! إضغط هنا لمعاينة الفرع.",
    "composer.title_placeholder": "أدخل عنوان موضوعك هنا...",
-    "composer.handle_placeholder": "Name",
+    "composer.handle_placeholder": "اﻹسم",
    "composer.discard": "نبذ التغييرات",
    "composer.submit": "حفظ",
    "composer.replying_to": "الرد على %1",
@@ -96,5 +96,5 @@
    "oldest_to_newest": "من الأقدم إلى الأحدث",
    "newest_to_oldest": "من الأحدث إلى الأقدم",
    "most_votes": "الأكثر تصويتًا",
-    "most_posts": "Most posts"
+    "most_posts": "اﻷكثر رداً"
 }
--- a/public/language/ar/unread.json
+++ b/public/language/ar/unread.json
@@ -5,5 +5,6 @@
    "mark_as_read": "حدد غير مقروء",
    "selected": "المحددة",
    "all": "الكل",
+    "all_categories": "كل الفئات",
    "topics_marked_as_read.success": "تم تحديد المواضيع على أنها مقروءة!"
 }
--- a/public/language/ar/user.json
+++ b/public/language/ar/user.json
@@ -6,8 +6,12 @@
    "postcount": "عدد المشاركات",
    "email": "البريد الإلكتروني",
    "confirm_email": "تأكيد عنوان البريد الإلكتروني",
+    "ban_account": "Ban Account",
+    "ban_account_confirm": "هل تريد حقاً حظر هاذا العضو؟",
+    "unban_account": "Unban Account",
    "delete_account": "حذف الحساب",
    "delete_account_confirm": "هل أن متأكد أنك تريد حذف حسابك؟<br /><strong> هذه العملية غير قابلة للإلغاء ولن يكون بالإمكان استعادة بياناتك</strong><br /><br />أدخل اسم المستخدم الخاص بك لتأكيد عملية الحذف",
+    "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 />",
    "fullname": "الاسم الكامل",
    "website": "الموقع الإلكتروني",
    "location": "الموقع",
@@ -21,7 +25,7 @@
    "watched": "متابع",
    "followers": "المتابعون",
    "following": "يتابع",
-    "aboutme": "About me",
+    "aboutme": "معلومة عنك او السيرة الذاتية",
    "signature": "توقيع",
    "gravatar": "Gravatar",
    "birthday": "عيد ميلاد",
@@ -64,9 +68,9 @@
    "settings-require-reload": "تغيير بعض اﻹعدادات يتطلب تحديث الصفحة. إضغط هنا لتحديث الصفحة",
    "has_no_follower": "هذا المستخدم ليس لديه أي متابع :(",
    "follows_no_one": "هذا المستخدم لا يتابع أحد :(",
-    "has_no_posts": "هذا المستخدم لم يكتب أي شيء بعد.",
-    "has_no_topics": "هذا المستخدم لم ينشئ أي موضوع بعد.",
-    "has_no_watched_topics": "This user didn't watch any topics yet.",
+    "has_no_posts": "This user hasn't posted anything yet.",
+    "has_no_topics": "This user hasn't posted any topics yet.",
+    "has_no_watched_topics": "This user hasn't watched any topics yet.",
    "email_hidden": "البريد الإلكتروني مخفي",
    "hidden": "مخفي",
    "paginate_description": "Paginate topics and posts instead of using infinite scroll",
@@ -79,6 +83,7 @@
    "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
    "follow_topics_you_reply_to": "متابعة المواضيع التي تقوم بالرد فيها",
    "follow_topics_you_create": "متابعة المواضيع التي تنشئها",
-    "grouptitle": "Select the group title you would like to display",
-    "no-group-title": "No group title"
+    "grouptitle": "حدد عنوان المجموعة الذي تريد عرضه",
+    "no-group-title": "لا يوجد عنوان للمجموعة",
+    "select-skin": "Select a Skin"
 }
--- a/public/language/ar/users.json
+++ b/public/language/ar/users.json
@@ -5,8 +5,17 @@
    "search": "بحث",
    "enter_username": "أدخل اسم مستخدم للبحث",
    "load_more": "حمل المزيد",
-    "users-found-search-took": "%1 user(s) found! Search took %2 seconds.",
+    "users-found-search-took": "تم إيجاد %1 مستخدمـ(ين)! استغرق البحث %2 ثانية.",
    "filter-by": "Filter By",
    "online-only": "المتصلون فقط",
-    "picture-only": "Picture only"
+    "picture-only": "صورة فقط",
+    "invite": "Invite",
+    "invitation-email-sent": "An invitation email has been sent to %1",
+    "user_list": "قائمة اﻷعضاء",
+    "recent_topics": "أحدث المواضيع",
+    "popular_topics": "Popular Topics",
+    "unread_topics": "المواضيع الغير مقروءة",
+    "categories": "الفئات",
+    "tags": "الكلمات الدلالية",
+    "map": "Map"
 }
--- a/public/language/bg/category.json
+++ b/public/language/bg/category.json
@@ -1,9 +1,12 @@
 {
+    "category": "Категория",
+    "subcategories": "Подкатегории",
    "new_topic_button": "Нова тема",
    "guest-login-post": "Влезте, за да можете да публикувате",
    "no_topics": "<strong>Все още няма теми в тази категория.</strong><br />Защо не създадеш една?",
    "browsing": "Разглежда",
    "no_replies": "Все още никой не е отговорил",
+    "no_new_posts": "Няма нови публикации.",
    "share_this_category": "Споделяне на тази категория",
    "watch": "Следене",
    "ignore": "Игнориране",
--- a/public/language/bg/email.json
+++ b/public/language/bg/email.json
@@ -1,11 +1,15 @@
 {
    "password-reset-requested": "Изпратена е заявка за подновяване на паролата – %1!",
    "welcome-to": "Добре дошли в %1",
+    "invite": "Покана от %1",
    "greeting_no_name": "Здравейте",
    "greeting_with_name": "Здравейте, %1",
    "welcome.text1": "Благодарим Ви, че се регистрирахте с %1",
    "welcome.text2": "За да активирате напълно Вашия акаунт, трябва да потвърдите е-пощата, с която сте се регистрирали.",
+    "welcome.text3": "Вашата заявка за регистрация беше приета от администратор. Вече можете да се впишете с Вашето потребителско име и парола.",
    "welcome.cta": "Натиснете тук, за да потвърдите Вашата е-поща.",
+    "invitation.text1": "%1 Ви покани да се присъедините към %2",
+    "invitation.ctr": "Натиснете тук, за да си създадете акаунт.",
    "reset.text1": "Получихме заявка за подновяване на Вашата парола, най-вероятно защото сте я забравили. Ако това не е така, моля не обръщайте внимание на това е-писмо.",
    "reset.text2": "За да продължите с процедурата по подновяване на паролата, моля последвайте следната връзка:",
    "reset.cta": "Натиснете тук, за да подновите  паролата си",
@@ -17,9 +21,9 @@
    "digest.cta": "Натиснете тук, за да посетите %1",
    "digest.unsub.info": "Това резюме беше изпратено до Вас поради настройките Ви за абонаментите.",
    "digest.no_topics": "Не е имало дейност по темите в последните %1",
-    "notif.chat.subject": "Получено е ново чат съобщение от %1",
+    "notif.chat.subject": "Получено е ново съобщение от %1",
    "notif.chat.cta": "Натиснете тук, за да продължите разговора",
-    "notif.chat.unsub.info": "Това известие за чата беше изпратено до Вас поради настройките Ви за абонаментите.",
+    "notif.chat.unsub.info": "Това известие за разговор беше изпратено до Вас поради настройките Ви за абонаментите.",
    "notif.post.cta": "Натиснете тук, за да прочетете цялата тема",
    "notif.post.unsub.info": "Това известие за публикация беше изпратено до Вас поради настройките Ви за абонаментите.",
    "test.text1": "Това е пробно е-писмо, за да потвърдим, че изпращачът на е-поща е правилно настроен за Вашия NodeBB.",
--- a/public/language/bg/error.json
+++ b/public/language/bg/error.json
@@ -18,7 +18,7 @@
    "username-taken": "Потребителското име е заето",
    "email-taken": "Е-пощата е заета",
    "email-not-confirmed": "Вашата е-поща все още не е потвърдена. Моля, натиснете тук, за да потвърдите е-пощата си.",
-    "email-not-confirmed-chat": "Няма да можете да пишете в чата, докато е-пощата Ви не бъде потвърдена. Моля, натиснете тук, за да потвърдите е-пощата си.",
+    "email-not-confirmed-chat": "Няма да можете да пишете в разговори, докато е-пощата Ви не бъде потвърдена. Моля, натиснете тук, за да потвърдите е-пощата си.",
    "no-email-to-confirm": "Този форум изисква потвърдена е-поща. Моля, натиснете тук, за да въведете е-поща",
    "email-confirm-failed": "Не успяхме да потвърдим е-пощата Ви. Моля, опитайте отново по-късно.",
    "confirm-email-already-sent": "Е-писмото за потвърждение вече е изпратено. Моля, почакайте още %1 минута/и, преди да изпратите ново.",
@@ -46,11 +46,14 @@
    "too-many-posts-newbie": "Като нов потребител, Вие можете да публикувате веднъж на %1 секунда/и, докато не натрупате %2 репутация – моля, изчакайте малко, преди да опитате да публикувате отново",
    "tag-too-short": "Моля, въведете по-дълъг етикет. Етикетите трябва да съдържат поне %1 символ(а)",
    "tag-too-long": "Моля, въведете по-кратък етикет. Етикетите трябва да съдържат не повече от %1 символ(а)",
+    "not-enough-tags": "Недостатъчно етикети. Темите трябва да имат поне %1 етикет(а)",
+    "too-many-tags": "Твърде много етикети. Темите не могат да имат повече от %1 етикет(а)",
    "file-too-big": "Максималният разрешен размер на файл е %1 КБ – моля, качете по-малък файл",
    "cant-vote-self-post": "Не можете да гласувате за собствената си публикация",
    "already-favourited": "Вече сте отбелязали тази публикация като любима",
    "already-unfavourited": "Вече сте премахнали тази публикация от любимите си",
    "cant-ban-other-admins": "Не можете да блокирате другите администратори!",
+    "cant-remove-last-admin": "Вие сте единственият администратор. Добавете друг потребител като администратор, преди да премахнете себе си като администратор",
    "invalid-image-type": "Грешен тип на изображение. Позволените типове са: %1",
    "invalid-image-extension": "Грешно разширение на изображението",
    "invalid-file-type": "Грешен тип на файл. Позволените типове са: %1",
@@ -59,6 +62,8 @@
    "group-name-change-not-allowed": "Промяната на името на групата не е разрешено",
    "group-already-member": "Вече сте част от тази група",
    "group-needs-owner": "Тази група се нуждае от поне един собственик",
+    "group-already-invited": "Този потребител вече е бил поканен",
+    "group-already-requested": "Вашата заявка за членство вече е била изпратена",
    "post-already-deleted": "Тази публикация вече е изтрита",
    "post-already-restored": "Тази публикация вече е възстановена",
    "topic-already-deleted": "Тази тема вече е изтрита",
@@ -67,15 +72,16 @@
    "topic-thumbnails-are-disabled": "Иконките на темите са изключени.",
    "invalid-file": "Грешен файл",
    "uploads-are-disabled": "Качването не е разрешено",
-    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
-    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
-    "cant-chat-with-yourself": "Не можете да пишете чат съобщение на себе си!",
-    "chat-restricted": "Този потребител е ограничил чат съобщенията до себе си. Той трябва първо да Ви последва, преди да можете да си пишете с него.",
+    "signature-too-long": "Съжаляваме, но подписът Ви трябва да съдържа не повече от %1 символ(а).",
+    "about-me-too-long": "Съжаляваме, но информацията за Вас трябва да съдържа не повече от %1 символ(а).",
+    "cant-chat-with-yourself": "Не можете да пишете съобщение на себе си!",
+    "chat-restricted": "Този потребител е ограничил съобщенията до себе си. Той трябва първо да Ви последва, преди да можете да си пишете с него.",
    "too-many-messages": "Изпратили сте твърде много съобщения. Моля, изчакайте малко.",
    "reputation-system-disabled": "Системата за репутация е изключена.",
    "downvoting-disabled": "Отрицателното гласуване е изключено",
    "not-enough-reputation-to-downvote": "Нямате достатъчно репутация, за да гласувате отрицателно за тази публикация",
    "not-enough-reputation-to-flag": "Нямате достатъчно репутация, за да докладвате тази публикация",
+    "already-flagged": "Вече сте докладвали тази публикация",
    "reload-failed": "NodeBB срещна проблем при презареждането: „%1“. NodeBB ще продължи да поддържа съществуващите клиентски ресурси, но Вие трябва да отмените последните си действия преди презареждането.",
    "registration-error": "Грешка при регистрацията",
    "parse-error": "Нещо се обърка при прочитането на отговора на сървъра",
--- a/public/language/bg/global.json
+++ b/public/language/bg/global.json
@@ -9,8 +9,8 @@
    "404.message": "Изглежда сте се опитали да посетите страница, която не съществува. Върнете се към <a href='%1/'>началната страница</a>.",
    "500.title": "Вътрешна грешка.",
    "500.message": "Опа! Изглежда нещо се обърка!",
-    "register": "Регистриране",
-    "login": "Влизане",
+    "register": "Регистрация",
+    "login": "Вход",
    "please_log_in": "Моля, влезте",
    "logout": "Изход",
    "posting_restriction_info": "Публикуването в момента е позволено само за регистрираните потребители. Натиснете тук, за да влезете.",
@@ -22,18 +22,20 @@
    "pagination.out_of": "%1 от %2",
    "pagination.enter_index": "Въведете номер",
    "header.admin": "Администратор",
+    "header.categories": "Категории",
    "header.recent": "Скорошни",
    "header.unread": "Непрочетени",
    "header.tags": "Етикети",
    "header.popular": "Популярни",
    "header.users": "Потребители",
    "header.groups": "Групи",
-    "header.chats": "Чатове",
+    "header.chats": "Разговори",
    "header.notifications": "Известия",
    "header.search": "Търсене",
    "header.profile": "Профил",
+    "header.navigation": "Навигация",
    "notifications.loading": "Зареждане на известията",
-    "chats.loading": "Зареждане на чатовете",
+    "chats.loading": "Зареждане на разговорите",
    "motd.welcome": "Добре дошли в NodeBB, системата за дискусии на бъдещето.",
    "previouspage": "Предишна страница",
    "nextpage": "Следваща страница",
@@ -46,10 +48,11 @@
    "online": "На линия",
    "users": "Потребители",
    "topics": "Теми",
-    "posts": "Публикации",
-    "views": "Преглеждания",
+    "posts": "Публ.",
+    "views": "Прегл.",
    "reputation": "Репутация",
    "read_more": "още",
+    "more": "Още",
    "posted_ago_by_guest": "публикувано %1 от гост",
    "posted_ago_by": "публикувано %1 от %2",
    "posted_ago": "публикувано %1",
--- a/public/language/bg/groups.json
+++ b/public/language/bg/groups.json
@@ -6,6 +6,12 @@
    "no_groups_found": "Няма групи",
    "pending.accept": "Приемане",
    "pending.reject": "Отхвърляне",
+    "pending.accept_all": "Приемане на всички",
+    "pending.reject_all": "Отхвърляне на всички",
+    "pending.none": "В момента няма чакащи членове",
+    "invited.none": "В момента няма поканени членове",
+    "invited.uninvite": "Отмяна на поканата",
+    "invited.search": "Потърсете потребител, когото да поканите в тази група",
    "cover-instructions": "Плъзнете снимка, наместете я в предпочитаната позиция и натистнете <strong>Запазване</strong>",
    "cover-change": "Промяна",
    "cover-save": "Запазване",
@@ -13,6 +19,7 @@
    "details.title": "Подробности за групата",
    "details.members": "Списък на членовете",
    "details.pending": "Кандидатстващи членове",
+    "details.invited": "Поканени членове",
    "details.has_no_posts": "Членовете на тази група не са публикували нищо.",
    "details.latest_posts": "Скорошни публикации",
    "details.private": "Частна",
@@ -31,6 +38,13 @@
    "details.private_help": "Ако е включено, присъединяването към група изисква одобрението на собственика ѝ",
    "details.hidden": "Скрита",
    "details.hidden_help": "Ако е включено, тази група няма да бъде извеждана в списъка от групи и потребителите ще трябва да бъдат поканени лично",
+    "details.delete_group": "Изтриване на групата",
    "event.updated": "Подробностите за групата бяха обновени",
-    "event.deleted": "Групата „%1“ беше изтрита"
+    "event.deleted": "Групата „%1“ беше изтрита",
+    "membership.accept-invitation": "Приемане на поканата",
+    "membership.invitation-pending": "Чакаща покана",
+    "membership.join-group": "Присъединяване към групата",
+    "membership.leave-group": "Напускане на групата",
+    "membership.reject": "Отхвърляне",
+    "new-group.group_name": "Име на групата:"
 }
--- a/public/language/bg/modules.json
+++ b/public/language/bg/modules.json
@@ -1,16 +1,16 @@
 {
-    "chat.chatting_with": "Чат с <span id=\"chat-with-name\"></span>",
-    "chat.placeholder": "Въведете чат съобщението тук и натиснете Ентер за изпращане",
+    "chat.chatting_with": "Разговор с <span id=\"chat-with-name\"></span>",
+    "chat.placeholder": "Въведете съобщението тук и натиснете Ентер за изпращане",
    "chat.send": "Изпращане",
-    "chat.no_active": "Нямате текущи чатове.",
+    "chat.no_active": "Нямате текущи разговори.",
    "chat.user_typing": "%1 пише...",
    "chat.user_has_messaged_you": "%1 Ви написа съобщение.",
-    "chat.see_all": "Вижте всички чатове",
-    "chat.no-messages": "Моля, изберете получател, за да видите историята на чат съобщенията",
-    "chat.recent-chats": "Скорошни чатове",
+    "chat.see_all": "Вижте всички разговори",
+    "chat.no-messages": "Моля, изберете получател, за да видите историята на съобщенията",
+    "chat.recent-chats": "Скорошни разговори",
    "chat.contacts": "Контакти",
    "chat.message-history": "История на съобщенията",
-    "chat.pop-out": "Отделяне на чата в прозорец",
+    "chat.pop-out": "Отделяне на разговора в прозорец",
    "chat.maximize": "Уголемяване",
    "chat.seven_days": "7 дни",
    "chat.thirty_days": "30 дни",
@@ -22,5 +22,8 @@
    "composer.user_said": "%1 каза:",
    "composer.discard": "Сигурни ли сте, че искате да отхвърлите тази публикация?",
    "composer.submit_and_lock": "Публикуване и заключване",
-    "composer.toggle_dropdown": "Превключване на падащото меню"
+    "composer.toggle_dropdown": "Превключване на падащото меню",
+    "bootbox.ok": "Добре",
+    "bootbox.cancel": "Отказ",
+    "bootbox.confirm": "Потвърждаване"
 }
--- a/public/language/bg/notifications.json
+++ b/public/language/bg/notifications.json
@@ -20,6 +20,7 @@
    "user_posted_topic": "<strong>%1</strong> публикува нова тема: <strong>%2</strong>",
    "user_mentioned_you_in": "<strong>%1</strong> Ви спомена в <strong>%2</strong>",
    "user_started_following_you": "<strong>%1</strong> започна да Ви следва.",
+    "new_register": "<strong>%1</strong> изпрати заявка за регистрация.",
    "email-confirmed": "Е-пощата беше потвърдена",
    "email-confirmed-message": "Благодарим Ви, че потвърдихте е-пощата си. Акаунтът Ви е вече напълно активиран.",
    "email-confirm-error-message": "Възникна проблем при потвърждаването на е-пощата Ви. Може кодът да е грешен или давността му да е изтекла.",
--- a/public/language/bg/pages.json
+++ b/public/language/bg/pages.json
@@ -1,21 +1,37 @@
 {
    "home": "Начало",
    "unread": "Непрочетени теми",
-    "popular": "Популярни теми",
+    "popular-day": "Популярните теми днес",
+    "popular-week": "Популярните теми тази седмица",
+    "popular-month": "Популярните теми този месец",
+    "popular-alltime": "Популярните теми за всички времена",
    "recent": "Скорошни теми",
-    "users": "Регистрирани потребители",
+    "users/online": "Потребители на линия",
+    "users/latest": "Последни потребители",
+    "users/sort-posts": "Потребители с най-много публикации",
+    "users/sort-reputation": "Потребители с най-висока репутация",
+    "users/map": "Карта на потребителите",
+    "users/search": "Търсене на потребители",
    "notifications": "Известия",
    "tags": "Етикети",
    "tag": "Теми, отбелязани като „%1“",
-    "user.edit": "Редактиране на „%1“",
-    "user.following": "Хора, които %1 следва",
-    "user.followers": "Хора, които следват %1",
-    "user.posts": "Публикации от %1",
-    "user.topics": "Теми, създадени от %1",
-    "user.groups": "Групите на %1",
-    "user.favourites": "Любимите публикации на %1",
-    "user.settings": "Настройки на потребителя",
-    "user.watched": "Теми, следени от %1",
+    "register": "Регистрирайте акаунт",
+    "login": "Влезте в акаунта си",
+    "reset": "Подновете паролата за акаунта си",
+    "categories": "Категории",
+    "groups": "Групи",
+    "group": "Група %1",
+    "chats": "Разговори",
+    "chat": "Разговаря с %1",
+    "account/edit": "Редактиране на „%1“",
+    "account/following": "Хора, които %1 следва",
+    "account/followers": "Хора, които следват %1",
+    "account/posts": "Публикации от %1",
+    "account/topics": "Теми, създадени от %1",
+    "account/groups": "Групите на %1",
+    "account/favourites": "Любимите публикации на %1",
+    "account/settings": "Потребителски настройки",
+    "account/watched": "Теми, следени от %1",
    "maintenance.text": "%1 в момента е в профилактика. Моля, върнете се по-късно.",
    "maintenance.messageIntro": "В допълнение, администраторът е оставил това съобщение:"
 }
--- a/public/language/bg/register.json
+++ b/public/language/bg/register.json
@@ -14,5 +14,6 @@
    "register_now_button": "Регистриране",
    "alternative_registration": "Друг начин за регистриране",
    "terms_of_use": "Условия за ползване",
-    "agree_to_terms_of_use": "Съгласен съм с условията за ползване"
+    "agree_to_terms_of_use": "Съгласен съм с условията за ползване",
+    "registration-added-to-queue": "Вашата регистрация беше добавена в опашката за одобрение. Ще получите е-писмо, когато тя бъде одобрена от администратор."
 }
--- a/public/language/bg/topic.json
+++ b/public/language/bg/topic.json
@@ -9,7 +9,7 @@
    "profile": "Профил",
    "posted_by": "Публикувано от %1",
    "posted_by_guest": "Публикувано от гост",
-    "chat": "Чат",
+    "chat": "Разговор",
    "notify_me": "Получавайте известия за новите отговори в тази тема",
    "quote": "Цитат",
    "reply": "Отговор",
--- a/public/language/bg/unread.json
+++ b/public/language/bg/unread.json
@@ -5,5 +5,6 @@
    "mark_as_read": "Отбелязване като прочетени",
    "selected": "Избраните",
    "all": "Всички",
+    "all_categories": "Всички категории",
    "topics_marked_as_read.success": "Темите бяха отбелязани като прочетени!"
 }
--- a/public/language/bg/user.json
+++ b/public/language/bg/user.json
@@ -6,8 +6,12 @@
    "postcount": "Брой публикации",
    "email": "Е-поща",
    "confirm_email": "Потвърдете е-пощата",
+    "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 />",
    "fullname": "Цяло име",
    "website": "Уеб сайт",
    "location": "Местоположение",
@@ -25,7 +29,7 @@
    "signature": "Подпис",
    "gravatar": "Граватар",
    "birthday": "Рождена дата",
-    "chat": "Чат",
+    "chat": "Разговор",
    "follow": "Следване",
    "unfollow": "Спиране на следването",
    "more": "Още",
@@ -45,28 +49,28 @@
    "change_password_success": "Паролата ви е обновена!",
    "confirm_password": "Потвърдете паролата",
    "password": "Парола",
-    "username_taken_workaround": "Потребителското име, което искате, е заето и затова ние го променихме леко. Вие ще се наричате <strong>%1</strong>",
+    "username_taken_workaround": "Потребителското име, което искате, е заето и затова ние го променихме малко. Вие ще се наричате <strong>%1</strong>",
    "upload_picture": "Качване на снимка",
    "upload_a_picture": "Качване на снимка",
    "image_spec": "Можете да качвате само PNG, JPG, или GIF файлове",
    "settings": "Настройки",
    "show_email": "Да се показва е-пощата ми",
    "show_fullname": "Да се показва цялото ми име",
-    "restrict_chats": "Разрешаване на чат съобщенията само от потребители, които следвам",
+    "restrict_chats": "Разрешаване на съобщенията само от потребители, които следвам",
    "digest_label": "Абониране за резюмета",
    "digest_description": "Абониране за новини по е-пощата относно този форум (нови известия и теми) според избрания график",
    "digest_off": "Изключено",
    "digest_daily": "Ежедневно",
    "digest_weekly": "Ежеседмично",
    "digest_monthly": "Ежемесечно",
-    "send_chat_notifications": "Изпращане на е-писмо, ако получа ново чат съобщения, а не съм на линия",
+    "send_chat_notifications": "Изпращане на е-писмо, ако получа ново съобщение в разговор, а не съм на линия",
    "send_post_notifications": "Изпращане на е-писмо, когато се появи отговор в темите, за които съм абониран/а.",
    "settings-require-reload": "Някои промени в настройките изискват презареждане. Натиснете тук, за да презаредите страницата.",
    "has_no_follower": "Този потребител няма последователи :(",
    "follows_no_one": "Този потребител не следва никого :(",
-    "has_no_posts": "Този потребител не е публикувал нищо все още.",
+    "has_no_posts": "Този потребител не е публикувал нищо досега.",
    "has_no_topics": "Този потребител не е създавал теми досега.",
-    "has_no_watched_topics": "Този потребител не е наблюдавал нито една тема все още.",
+    "has_no_watched_topics": "Този потребител не е следил нито една тема досега.",
    "email_hidden": "Е-пощата е скрита",
    "hidden": "скрито",
    "paginate_description": "Разделяне на темите и публикациите на страници, вместо да се превърта безкрайно",
@@ -80,5 +84,6 @@
    "follow_topics_you_reply_to": "Следване на темите, на които отговаряте",
    "follow_topics_you_create": "Следване на темите, които създавате",
    "grouptitle": "Изберете заглавието на групата, което искате да се показва",
-    "no-group-title": "Няма заглавие на група"
+    "no-group-title": "Няма заглавие на група",
+    "select-skin": "Изберете облик"
 }
--- a/public/language/bg/users.json
+++ b/public/language/bg/users.json
@@ -8,5 +8,14 @@
    "users-found-search-took": "Намерени са %1 потребител(и)! Търсенето отне %2 секунди.",
    "filter-by": "Филтриране",
    "online-only": "Само тези на линия",
-    "picture-only": "Само със снимка"
+    "picture-only": "Само със снимка",
+    "invite": "Канене",
+    "invitation-email-sent": "Беше изпратено е-писмо за потвърждение до %1",
+    "user_list": "Списък от потребители",
+    "recent_topics": "Скорошни теми",
+    "popular_topics": "Популярни теми",
+    "unread_topics": "Непрочетени теми",
+    "categories": "Категории",
+    "tags": "Етикети",
+    "map": "Карта"
 }
--- a/public/language/bn/category.json
+++ b/public/language/bn/category.json
@@ -1,9 +1,12 @@
 {
+    "category": "Category",
+    "subcategories": "Subcategories",
    "new_topic_button": "নতুন টপিক",
    "guest-login-post": "Log in to post",
    "no_topics": "<strong>এই বিভাগে কোন টপিক নেই! </strong><br /> আপনি চাইলে একটি পোষ্ট করতে পারেন।",
    "browsing": "ব্রাউজিং",
    "no_replies": "কোন রিপ্লাই নেই",
+    "no_new_posts": "No new posts.",
    "share_this_category": "এই বিভাগটি অন্যের সাথে ভাগাভাগি করুন",
    "watch": "Watch",
    "ignore": "উপেক্ষা করুন",
--- a/public/language/bn/email.json
+++ b/public/language/bn/email.json
@@ -1,11 +1,15 @@
 {
    "password-reset-requested": "পাসওয়ার্ড রিসেটের জন্য অনুরোধ করা হয়েছে - %1!",
    "welcome-to": "%1 এ স্বাগতম",
+    "invite": "Invitation from %1",
    "greeting_no_name": "স্বাগতম",
    "greeting_with_name": "স্বাগতম %1",
    "welcome.text1": "%1 এ নিবন্ধন করার জন্য আপনাকে ধন্যবাদ!",
    "welcome.text2": "আপনার একাউন্ট এ্যাক্টিভেট করার জন্য, আপনি যে ইমেইল এড্রেস ব্যাবহার করে নিবন্ধন করেছেন তা যাচাই করতে হবে",
+    "welcome.text3": "An administrator has accepted your registration application. You can login with your username/password now.",
    "welcome.cta": "আপনার ইমেইল এড্রেস নিশ্চিত করার জন্য এখানে ক্লিক করুন",
+    "invitation.text1": "%1 has invited you to join %2",
+    "invitation.ctr": "Click here to create your account.",
    "reset.text1": "আমরা আপনার পাসওয়ার্ড রিসেট করার অনুরোধ পেয়েছি, সম্ভবত আপনি আপনার পাসওয়ার্ড ভুলে গিয়েছেন বলেই। তবে যদি তা না হয়ে থাকে, তাহলে এই মেইলকে উপেক্ষা করতে পারেন।",
    "reset.text2": "পাসওয়ার্ড রিসেট করতে নিচের লিংকে ক্লিক করুন",
    "reset.cta": "পাসওয়ার্ড রিসেট করতে এখানে ক্লিক করুন",
--- a/public/language/bn/error.json
+++ b/public/language/bn/error.json
@@ -46,11 +46,14 @@
    "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
    "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",
    "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 character(s)",
+    "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
+    "too-many-tags": "Too many tags. Topics can't have more than %1 tag(s)",
    "file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
    "cant-vote-self-post": "আপনি নিজের পোস্টে ভোট দিতে পারবেন না।",
    "already-favourited": "আপনি ইতিমধ্যে এই পোষ্টটি পছন্দের তালিকায় যোগ করেছেন",
    "already-unfavourited": "আপনি ইতিমধ্যে এই পোষ্টটি আপনার পছন্দের তালিকা থেকে সরিয়ে ফেলেছেন",
    "cant-ban-other-admins": "আপনি অন্য এ্যাডমিনদের নিষিদ্ধ করতে পারেন না!",
+    "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
    "invalid-image-type": "Invalid image type. Allowed types are: %1",
    "invalid-image-extension": "Invalid image extension",
    "invalid-file-type": "Invalid file type. Allowed types are: %1",
@@ -59,6 +62,8 @@
    "group-name-change-not-allowed": "গ্রুপের নাম পরিবর্তনের অনুমতি নেই",
    "group-already-member": "You are already part of this group",
    "group-needs-owner": "This group requires at least one owner",
+    "group-already-invited": "This user has already been invited",
+    "group-already-requested": "Your membership request has already been submitted",
    "post-already-deleted": "এই পোস্টটি ইতিমধ্যে ডিলিট করা হয়ে গিয়েছে",
    "post-already-restored": "এই পোষ্টটি ইতিমধ্যে পুনরোদ্ধার করা হয়েছে",
    "topic-already-deleted": "এই টপিকটি ইতিমধ্যে ডিলিট করা হয়েছে",
@@ -76,6 +81,7 @@
    "downvoting-disabled": "ঋণাত্মক ভোট নিস্ক্রীয় রাখা হয়েছে।",
    "not-enough-reputation-to-downvote": "আপনার এই পোস্ট downvote করার জন্য পর্যাপ্ত সম্মাননা নেই",
    "not-enough-reputation-to-flag": "এই পোষ্টকে ফ্লাগ করার জন্য আপনার পর্যাপ্ত সম্মাননা নেই",
+    "already-flagged": "You have already flagged this post",
    "reload-failed": "\"%1\" রিলোড করতে সমস্যা হয়েছে। রিলোডের পূর্বে যা করা হয়েছিল সেটি আনডু করা সমীচীন। ",
    "registration-error": "নিবন্ধন এরর!",
    "parse-error": "Something went wrong while parsing server response",
--- a/public/language/bn/global.json
+++ b/public/language/bn/global.json
@@ -22,6 +22,7 @@
    "pagination.out_of": "%2 এর মাঝে %1",
    "pagination.enter_index": "সূচক লিখুন",
    "header.admin": "অ্যাডমিন",
+    "header.categories": "Categories",
    "header.recent": "সাম্প্রতিক",
    "header.unread": "অপঠিত",
    "header.tags": "ট্যাগ",
@@ -32,6 +33,7 @@
    "header.notifications": "বিজ্ঞপ্তি",
    "header.search": "অনুসন্ধান",
    "header.profile": "প্রোফাইল",
+    "header.navigation": "Navigation",
    "notifications.loading": "বিজ্ঞপ্তিগুলি লোড হচ্ছে",
    "chats.loading": "কথোপকথনগুলি লোড হচ্ছে ",
    "motd.welcome": "ভবিষ্যতের আলোচনার প্লাটফর্ম, NodeBB তে স্বাগতম।",
@@ -50,6 +52,7 @@
    "views": "দেখেছেন",
    "reputation": "সন্মাননা",
    "read_more": "আরো পড়ুন",
+    "more": "More",
    "posted_ago_by_guest": "অতিথি পোস্ট করেছেন %1",
    "posted_ago_by": " %1 %2 দ্বারা পোস্টকৃত",
    "posted_ago": "পোস্ট করেছেন %1",
@@ -65,7 +68,7 @@
    "recentposts": "সাম্প্রতিক পোস্ট",
    "recentips": "সাম্প্রতিক প্রবেশকৃত আইপি সমুহ",
    "away": "দূরে",
-    "dnd": "বিরক্ত করবেন না",
+    "dnd": "Do not disturb",
    "invisible": "অদৃশ্য",
    "offline": "অফলাইন",
    "email": "ইমেইল",
--- a/public/language/bn/groups.json
+++ b/public/language/bn/groups.json
@@ -6,6 +6,12 @@
    "no_groups_found": "There are no groups to see",
    "pending.accept": "Accept",
    "pending.reject": "Reject",
+    "pending.accept_all": "Accept All",
+    "pending.reject_all": "Reject All",
+    "pending.none": "There are no pending members at this time",
+    "invited.none": "There are no invited members at this time",
+    "invited.uninvite": "Rescind Invitation",
+    "invited.search": "Search for a user to invite to this group",
    "cover-instructions": "Drag and Drop a photo, drag to position, and hit <strong>Save</strong>",
    "cover-change": "Change",
    "cover-save": "Save",
@@ -13,6 +19,7 @@
    "details.title": "গ্রুপের বিস্তারিত",
    "details.members": "সদস্য তালিকা",
    "details.pending": "Pending Members",
+    "details.invited": "Invited Members",
    "details.has_no_posts": "এই গ্রুপের সদস্যরা এখনো কোন পোষ্ট করেন নি",
    "details.latest_posts": "সর্বশেষ পোষ্টসমূহ",
    "details.private": "Private",
@@ -31,6 +38,13 @@
    "details.private_help": "If enabled, joining of groups requires approval from a group owner",
    "details.hidden": "Hidden",
    "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
+    "details.delete_group": "Delete Group",
    "event.updated": "Group details have been updated",
-    "event.deleted": "The group \"%1\" has been deleted"
+    "event.deleted": "The group \"%1\" has been deleted",
+    "membership.accept-invitation": "Accept Invitation",
+    "membership.invitation-pending": "Invitation Pending",
+    "membership.join-group": "Join Group",
+    "membership.leave-group": "Leave Group",
+    "membership.reject": "Reject",
+    "new-group.group_name": "Group Name:"
 }
--- a/public/language/bn/modules.json
+++ b/public/language/bn/modules.json
@@ -5,7 +5,7 @@
    "chat.no_active": "আপনার কোন সচল কথোপকথন নেই",
    "chat.user_typing": "%1 লিখছেন",
    "chat.user_has_messaged_you": "%1 আপনাকে বার্তা পাঠিয়েছেন",
-    "chat.see_all": "সকল কথোপকথন দেখুন",
+    "chat.see_all": "See all chats",
    "chat.no-messages": "মেসেজ হিস্টোরী দেখতে প্রাপক নির্বাচন করুন",
    "chat.recent-chats": "সাম্প্রতিক চ্যাটসমূহ",
    "chat.contacts": "কন্টাক্টস",
@@ -22,5 +22,8 @@
    "composer.user_said": "%1 বলেছেনঃ",
    "composer.discard": "আপনি কি নিশ্চিত যে আপনি এই পোস্ট বাতিল করতে ইচ্ছুক?",
    "composer.submit_and_lock": "Submit and Lock",
-    "composer.toggle_dropdown": "Toggle Dropdown"
+    "composer.toggle_dropdown": "Toggle Dropdown",
+    "bootbox.ok": "OK",
+    "bootbox.cancel": "Cancel",
+    "bootbox.confirm": "Confirm"
 }
--- a/public/language/bn/notifications.json
+++ b/public/language/bn/notifications.json
@@ -1,7 +1,7 @@
 {
    "title": "বিজ্ঞপ্তিগুলো",
    "no_notifs": "আপনার নতুন কোন বিজ্ঞপ্তি নেই",
-    "see_all": "সকল বিজ্ঞপ্তিগুলো দেখুন",
+    "see_all": "See all notifications",
    "mark_all_read": "Mark all notifications read",
    "back_to_home": "ফিরুন %1",
    "outgoing_link": "বহির্গামী লিঙ্ক",
@@ -20,6 +20,7 @@
    "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
    "user_mentioned_you_in": "<strong>%1</strong>, <strong>%2</strong> এ আপনার নাম উল্লেখ করেছেন",
    "user_started_following_you": "<strong>%1</strong> আপনাকে অনুসরন করা শুরু করেছেন।",
+    "new_register": "<strong>%1</strong> sent a registration request.",
    "email-confirmed": "ইমেইল নিশ্চিত করা হয়েছে",
    "email-confirmed-message": "আপনার ইমেইল যাচাই করার জন্য আপনাকে ধন্যবাদ। আপনার অ্যাকাউন্টটি এখন সম্পূর্ণরূপে সক্রিয়।",
    "email-confirm-error-message": "আপনার ইমেল ঠিকানার বৈধতা যাচাইয়ে একটি সমস্যা হয়েছে। সম্ভবত কোডটি ভুল ছিল অথবা কোডের মেয়াদ শেষ হয়ে গিয়েছে।",
--- a/public/language/bn/pages.json
+++ b/public/language/bn/pages.json
@@ -1,21 +1,37 @@
 {
    "home": "নীড়পাতা",
    "unread": "অপঠিত টপিক",
-    "popular": "জনপ্রিয় টপিক",
+    "popular-day": "Popular topics today",
+    "popular-week": "Popular topics this week",
+    "popular-month": "Popular topics this month",
+    "popular-alltime": "All time popular topics",
    "recent": "সাম্প্রতিক টপিক",
-    "users": "নিবন্ধিত সদস্যগণ",
+    "users/online": "Online Users",
+    "users/latest": "Latest Users",
+    "users/sort-posts": "Users with the most posts",
+    "users/sort-reputation": "Users with the most reputation",
+    "users/map": "User Map",
+    "users/search": "User Search",
    "notifications": "বিজ্ঞপ্তি",
    "tags": "Tags",
    "tag": "Topics tagged under \"%1\"",
-    "user.edit": "সম্পাদনা \"%1\"",
-    "user.following": "%1 যাদের অনুসরণ করেন",
-    "user.followers": "যারা %1 কে অনুসরণ করেন",
-    "user.posts": "%1 এর পোস্ট সমুহ",
-    "user.topics": "%1 এর টপিক সমুহ",
-    "user.groups": "%1's Groups",
-    "user.favourites": "%1'র প্রিয় পোস্টগুলো",
-    "user.settings": "সদস্য সেটিংস",
-    "user.watched": "Topics watched by %1",
+    "register": "Register an account",
+    "login": "Login to your account",
+    "reset": "Reset your account password",
+    "categories": "Categories",
+    "groups": "Groups",
+    "group": "%1 group",
+    "chats": "Chats",
+    "chat": "Chatting with %1",
+    "account/edit": "Editing \"%1\"",
+    "account/following": "People %1 follows",
+    "account/followers": "People who follow %1",
+    "account/posts": "Posts made by %1",
+    "account/topics": "Topics created by %1",
+    "account/groups": "%1's Groups",
+    "account/favourites": "%1's Favourite Posts",
+    "account/settings": "User Settings",
+    "account/watched": "Topics watched by %1",
    "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
    "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }
--- a/public/language/bn/register.json
+++ b/public/language/bn/register.json
@@ -14,5 +14,6 @@
    "register_now_button": "নিবন্ধন করুন",
    "alternative_registration": "বিকল্প নিবন্ধন",
    "terms_of_use": "নিয়মাবলী",
-    "agree_to_terms_of_use": "আমি নিয়মাবলী মেনে চলতে সম্মতি জানালাম"
+    "agree_to_terms_of_use": "আমি নিয়মাবলী মেনে চলতে সম্মতি জানালাম",
+    "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator."
 }
--- a/public/language/bn/unread.json
+++ b/public/language/bn/unread.json
@@ -5,5 +5,6 @@
    "mark_as_read": "পঠিত হিসেবে চিহ্নিত করুন",
    "selected": "নির্বাচিত",
    "all": "সবগুলো",
+    "all_categories": "All categories",
    "topics_marked_as_read.success": "পঠিত হিসেবে চিহ্নিত টপিকসমূহ"
 }
--- a/public/language/bn/user.json
+++ b/public/language/bn/user.json
@@ -6,8 +6,12 @@
    "postcount": "Post Count",
    "email": "ইমেইল",
    "confirm_email": "ইমেইল নিশ্চিত করুন",
+    "ban_account": "Ban Account",
+    "ban_account_confirm": "Do you really want to ban this user?",
+    "unban_account": "Unban Account",
    "delete_account": "একাউন্ট মুছে ফেলুন",
    "delete_account_confirm": "আপনি কি নিশ্চিত যে আপনি আপনার একাউন্ট মুছে ফেলতে চান ?  <br /><strong>এই কাজটির ফলে আপনার কোন তথ্য পুনরূদ্ধার করা সম্ভব নয়  </strong><br /><br /> নিশ্চিত করতে আপনার ইউজারনেম প্রবেশ করান। ",
+    "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 />",
    "fullname": "পুর্ণ নাম",
    "website": "ওয়েবসাইট",
    "location": "স্থান",
@@ -64,9 +68,9 @@
    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
    "has_no_follower": "এই সদস্যের কোন ফলোয়ার নেই :(",
    "follows_no_one": "এই সদস্য কাউকে ফলো করছেন না :(",
-    "has_no_posts": "এই সদস্য এখনো কোন পোষ্ট করেন নি",
-    "has_no_topics": "এই সদস্য এখনো কোন টপিক পোষ্ট করেন নি",
-    "has_no_watched_topics": "This user didn't watch any topics yet.",
+    "has_no_posts": "This user hasn't posted anything yet.",
+    "has_no_topics": "This user hasn't posted any topics yet.",
+    "has_no_watched_topics": "This user hasn't watched any topics yet.",
    "email_hidden": "ইমেইল গোপন রাখা হয়েছে",
    "hidden": "গোপন করা হয়েছে",
    "paginate_description": "Paginate topics and posts instead of using infinite scroll",
@@ -80,5 +84,6 @@
    "follow_topics_you_reply_to": "Follow topics that you reply to",
    "follow_topics_you_create": "Follow topics you create",
    "grouptitle": "Select the group title you would like to display",
-    "no-group-title": "No group title"
+    "no-group-title": "No group title",
+    "select-skin": "Select a Skin"
 }
--- a/public/language/bn/users.json
+++ b/public/language/bn/users.json
@@ -8,5 +8,14 @@
    "users-found-search-took": "%1 user(s) found! Search took %2 seconds.",
    "filter-by": "Filter By",
    "online-only": "Online only",
-    "picture-only": "Picture only"
+    "picture-only": "Picture only",
+    "invite": "Invite",
+    "invitation-email-sent": "An invitation email has been sent to %1",
+    "user_list": "User List",
+    "recent_topics": "Recent Topics",
+    "popular_topics": "Popular Topics",
+    "unread_topics": "Unread Topics",
+    "categories": "Categories",
+    "tags": "Tags",
+    "map": "Map"
 }
--- a/public/language/cs/category.json
+++ b/public/language/cs/category.json
@@ -1,9 +1,12 @@
 {
+    "category": "Category",
+    "subcategories": "Subcategories",
    "new_topic_button": "Nové téma",
    "guest-login-post": "Log in to post",
    "no_topics": "<strong>V této kategorii zatím nejsou žádné příspěvky.</strong><br />Můžeš být první!",
    "browsing": "prohlíží",
    "no_replies": "Nikdo ještě neodpověděl",
+    "no_new_posts": "No new posts.",
    "share_this_category": "Share this category",
    "watch": "Watch",
    "ignore": "Ignorovat",
--- a/public/language/cs/email.json
+++ b/public/language/cs/email.json
@@ -1,11 +1,15 @@
 {
    "password-reset-requested": "Požadována obnova hesla - %1!",
    "welcome-to": "Vítejte v %1",
+    "invite": "Invitation from %1",
    "greeting_no_name": "Dobrý den",
    "greeting_with_name": "Dobrý den %1",
    "welcome.text1": "Děkujeme vám za registraci s %1!",
    "welcome.text2": "Pro úplnou aktivaci vašeho účtu potřebujeme ověřit vaší emailovou adresu.",
+    "welcome.text3": "An administrator has accepted your registration application. You can login with your username/password now.",
    "welcome.cta": "Klikněte zde pro potvrzení vaší emailové adresy",
+    "invitation.text1": "%1 has invited you to join %2",
+    "invitation.ctr": "Click here to create your account.",
    "reset.text1": "Obdrželi jsme požadavek na obnovu hesla, pravděpodobně kvůli tomu, že jste ho zapomněli. Pokud to není tento případ, ignorujte, prosím, tento email.",
    "reset.text2": "Přejete-li si pokračovat v obnově vašeho hesla, klikněte, prosím, na následující odkaz:",
    "reset.cta": "Klikněte zde, chcete-li obnovit vaše heslo",
--- a/public/language/cs/error.json
+++ b/public/language/cs/error.json
@@ -46,11 +46,14 @@
    "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
    "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",
    "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 character(s)",
+    "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
+    "too-many-tags": "Too many tags. Topics can't have more than %1 tag(s)",
    "file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
    "cant-vote-self-post": "Nemůžete hlasovat pro svůj vlastní příspěvek",
    "already-favourited": "You have already favourited this post",
    "already-unfavourited": "You have already unfavourited this post",
    "cant-ban-other-admins": "Nemůžete zakazovat ostatní administrátory!",
+    "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
    "invalid-image-type": "Invalid image type. Allowed types are: %1",
    "invalid-image-extension": "Invalid image extension",
    "invalid-file-type": "Invalid file type. Allowed types are: %1",
@@ -59,6 +62,8 @@
    "group-name-change-not-allowed": "Změna názvu skupiny není povolena",
    "group-already-member": "You are already part of this group",
    "group-needs-owner": "This group requires at least one owner",
+    "group-already-invited": "This user has already been invited",
+    "group-already-requested": "Your membership request has already been submitted",
    "post-already-deleted": "Tento příspěvek byl již vymazán",
    "post-already-restored": "Tento příspěvek byl již obnoven",
    "topic-already-deleted": "Toto téma bylo již vymazáno",
@@ -76,6 +81,7 @@
    "downvoting-disabled": "Downvoting is disabled",
    "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",
    "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post",
+    "already-flagged": "You have already flagged this post",
    "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.",
    "registration-error": "Chyba při registraci",
    "parse-error": "Something went wrong while parsing server response",
--- a/public/language/cs/global.json
+++ b/public/language/cs/global.json
@@ -22,6 +22,7 @@
    "pagination.out_of": "%1 z %2",
    "pagination.enter_index": "Enter index",
    "header.admin": "Administrace",
+    "header.categories": "Categories",
    "header.recent": "Aktuality",
    "header.unread": "Nepřečtené",
    "header.tags": "Tagy",
@@ -32,6 +33,7 @@
    "header.notifications": "Oznámení",
    "header.search": "Hledat",
    "header.profile": "Můj profil",
+    "header.navigation": "Navigation",
    "notifications.loading": "Načítání upozornění",
    "chats.loading": "Načítání grafů",
    "motd.welcome": "Vítejte na NodeBB, diskusní platforma buducnosti.",
@@ -50,6 +52,7 @@
    "views": "Zobrazení",
    "reputation": "Reputation",
    "read_more": "read more",
+    "more": "More",
    "posted_ago_by_guest": "posted %1 by Guest",
    "posted_ago_by": "posted %1 by %2",
    "posted_ago": "posted %1",
@@ -65,7 +68,7 @@
    "recentposts": "Nedávné příspěvky",
    "recentips": "Recently Logged In IPs",
    "away": "Pryč",
-    "dnd": "Nerušit",
+    "dnd": "Do not disturb",
    "invisible": "Neviditelný",
    "offline": "Offline",
    "email": "Email",
--- a/public/language/cs/groups.json
+++ b/public/language/cs/groups.json
@@ -6,6 +6,12 @@
    "no_groups_found": "There are no groups to see",
    "pending.accept": "Accept",
    "pending.reject": "Reject",
+    "pending.accept_all": "Accept All",
+    "pending.reject_all": "Reject All",
+    "pending.none": "There are no pending members at this time",
+    "invited.none": "There are no invited members at this time",
+    "invited.uninvite": "Rescind Invitation",
+    "invited.search": "Search for a user to invite to this group",
    "cover-instructions": "Drag and Drop a photo, drag to position, and hit <strong>Save</strong>",
    "cover-change": "Change",
    "cover-save": "Save",
@@ -13,6 +19,7 @@
    "details.title": "podrobnosti skupiny",
    "details.members": "Seznam členů",
    "details.pending": "Pending Members",
+    "details.invited": "Invited Members",
    "details.has_no_posts": "Členové této skupiny dosud neodeslali ani jeden příspěvek.",
    "details.latest_posts": "Nejnovější příspěvky",
    "details.private": "Private",
@@ -31,6 +38,13 @@
    "details.private_help": "If enabled, joining of groups requires approval from a group owner",
    "details.hidden": "Hidden",
    "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
+    "details.delete_group": "Delete Group",
    "event.updated": "Group details have been updated",
-    "event.deleted": "The group \"%1\" has been deleted"
+    "event.deleted": "The group \"%1\" has been deleted",
+    "membership.accept-invitation": "Accept Invitation",
+    "membership.invitation-pending": "Invitation Pending",
+    "membership.join-group": "Join Group",
+    "membership.leave-group": "Leave Group",
+    "membership.reject": "Reject",
+    "new-group.group_name": "Group Name:"
 }
--- a/public/language/cs/modules.json
+++ b/public/language/cs/modules.json
@@ -5,7 +5,7 @@
    "chat.no_active": "Nemáte žádné aktivní konverzace.",
    "chat.user_typing": "%1 píše ...",
    "chat.user_has_messaged_you": "%1 has messaged you.",
-    "chat.see_all": "See all Chats",
+    "chat.see_all": "See all chats",
    "chat.no-messages": "Please select a recipient to view chat message history",
    "chat.recent-chats": "Recent Chats",
    "chat.contacts": "Kontakty",
@@ -22,5 +22,8 @@
    "composer.user_said": "%1 said:",
    "composer.discard": "Are you sure you wish to discard this post?",
    "composer.submit_and_lock": "Submit and Lock",
-    "composer.toggle_dropdown": "Toggle Dropdown"
+    "composer.toggle_dropdown": "Toggle Dropdown",
+    "bootbox.ok": "OK",
+    "bootbox.cancel": "Cancel",
+    "bootbox.confirm": "Confirm"
 }
--- a/public/language/cs/notifications.json
+++ b/public/language/cs/notifications.json
@@ -1,7 +1,7 @@
 {
    "title": "Upozornění",
    "no_notifs": "You have no new notifications",
-    "see_all": "See all Notifications",
+    "see_all": "See all notifications",
    "mark_all_read": "Mark all notifications read",
    "back_to_home": "Back to %1",
    "outgoing_link": "Odkaz mimo fórum",
@@ -20,6 +20,7 @@
    "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
    "user_mentioned_you_in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
    "user_started_following_you": "<strong>%1</strong> started following you.",
+    "new_register": "<strong>%1</strong> sent a registration request.",
    "email-confirmed": "Email Confirmed",
    "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
    "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.",
--- a/public/language/cs/pages.json
+++ b/public/language/cs/pages.json
@@ -1,21 +1,37 @@
 {
    "home": "Home",
    "unread": "Unread Topics",
-    "popular": "Popular Topics",
+    "popular-day": "Popular topics today",
+    "popular-week": "Popular topics this week",
+    "popular-month": "Popular topics this month",
+    "popular-alltime": "All time popular topics",
    "recent": "Recent Topics",
-    "users": "Registered Users",
+    "users/online": "Online Users",
+    "users/latest": "Latest Users",
+    "users/sort-posts": "Users with the most posts",
+    "users/sort-reputation": "Users with the most reputation",
+    "users/map": "User Map",
+    "users/search": "User Search",
    "notifications": "Notifications",
    "tags": "Tags",
    "tag": "Topics tagged under \"%1\"",
-    "user.edit": "Editing \"%1\"",
-    "user.following": "People %1 Follows",
-    "user.followers": "People who Follow %1",
-    "user.posts": "Posts made by %1",
-    "user.topics": "Topics created by %1",
-    "user.groups": "%1's Groups",
-    "user.favourites": "%1's Favourite Posts",
-    "user.settings": "User Settings",
-    "user.watched": "Topics watched by %1",
+    "register": "Register an account",
+    "login": "Login to your account",
+    "reset": "Reset your account password",
+    "categories": "Categories",
+    "groups": "Groups",
+    "group": "%1 group",
+    "chats": "Chats",
+    "chat": "Chatting with %1",
+    "account/edit": "Editing \"%1\"",
+    "account/following": "People %1 follows",
+    "account/followers": "People who follow %1",
+    "account/posts": "Posts made by %1",
+    "account/topics": "Topics created by %1",
+    "account/groups": "%1's Groups",
+    "account/favourites": "%1's Favourite Posts",
+    "account/settings": "User Settings",
+    "account/watched": "Topics watched by %1",
    "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
    "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }
--- a/public/language/cs/register.json
+++ b/public/language/cs/register.json
@@ -14,5 +14,6 @@
    "register_now_button": "Zaregistrovat se",
    "alternative_registration": "Jiný způsob registrace",
    "terms_of_use": "Podmínky",
-    "agree_to_terms_of_use": "Souhlasím s Podmínkami"
+    "agree_to_terms_of_use": "Souhlasím s Podmínkami",
+    "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator."
 }
--- a/public/language/cs/unread.json
+++ b/public/language/cs/unread.json
@@ -5,5 +5,6 @@
    "mark_as_read": "Označit jako přeštené",
    "selected": "Vybrané",
    "all": "Vše",
+    "all_categories": "All categories",
    "topics_marked_as_read.success": "Téma bylo označeno jako přečtené!"
 }
--- a/public/language/cs/user.json
+++ b/public/language/cs/user.json
@@ -2,12 +2,16 @@
    "banned": "Banned",
    "offline": "Offline",
    "username": "Uživatelské jméno",
-    "joindate": "Join Date",
-    "postcount": "Post Count",
+    "joindate": "Datum ragistrace",
+    "postcount": "Počet příspěvků",
    "email": "Email",
    "confirm_email": "Potvrdit email",
+    "ban_account": "Zablokovat účet",
+    "ban_account_confirm": "Opravdu chcete zablokovat tohoto uživatele?",
+    "unban_account": "Odblokovat účet",
    "delete_account": "Vymazat účet",
-    "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 username to confirm that you wish to destroy this account.",
+    "delete_account_confirm": "Opravdu chcete smazat váš účet? <br /><strong>Tato akce je nevratná a nebude možné obnovit žádné vaše data.</strong><br /><br /> Pro potvrzení smazání účtu napište vaše uživatelské jméno.",
+    "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 />",
    "fullname": "Jméno a příjmení",
    "website": "Webové stránky",
    "location": "Poloha",
@@ -18,40 +22,40 @@
    "profile_views": "Zobrazení profilu",
    "reputation": "Reputace",
    "favourites": "Oblíbené",
-    "watched": "Watched",
+    "watched": "Sledován",
    "followers": "Sledují ho",
    "following": "Sleduje",
-    "aboutme": "About me",
+    "aboutme": "O mně",
    "signature": "Podpis",
    "gravatar": "Gravatar",
    "birthday": "Datum narození",
    "chat": "Chat",
-    "follow": "Follow",
-    "unfollow": "Unfollow",
-    "more": "More",
+    "follow": "Sledovat",
+    "unfollow": "Nesledovat",
+    "more": "Více",
    "profile_update_success": "Profil byl úspěšně aktualizován!",
    "change_picture": "Změnit obrázek",
    "edit": "Upravit",
    "uploaded_picture": "Nahraný obrázek",
    "upload_new_picture": "Nahrát nový obrázek",
-    "upload_new_picture_from_url": "Upload New Picture From URL",
+    "upload_new_picture_from_url": "Nahrát nový obrázek z URL",
    "current_password": "Současné heslo",
    "change_password": "Změnit heslo",
    "change_password_error": "Neplatné heslo",
-    "change_password_error_wrong_current": "Your current password is not correct!",
-    "change_password_error_length": "Password too short!",
-    "change_password_error_match": "Passwords must match!",
-    "change_password_error_privileges": "You do not have the rights to change this password.",
-    "change_password_success": "Your password is updated!",
+    "change_password_error_wrong_current": "Současné heslo není správné!",
+    "change_password_error_length": "Heslo je příliš krátké!",
+    "change_password_error_match": "Hesla se neshodují!",
+    "change_password_error_privileges": "Nemáte práva změnit toto heslo.",
+    "change_password_success": "Heslo je aktualizované!",
    "confirm_password": "Potvrzení hesla",
    "password": "Heslo",
    "username_taken_workaround": "The username you requested was already taken, so we have altered it slightly. You are now known as <strong>%1</strong>",
    "upload_picture": "Nahrát obrázek",
    "upload_a_picture": "Nahrát obrázek",
-    "image_spec": "You may only upload PNG, JPG, or GIF files",
+    "image_spec": "Nahrávat lze pouze soubory PNG, JPG a GIF",
    "settings": "Nastavení",
    "show_email": "Zobrazovat můj email v profilu",
-    "show_fullname": "Show My Full Name",
+    "show_fullname": "Zobrazovat celé jméno",
    "restrict_chats": "Only allow chat messages from users I follow",
    "digest_label": "Subscribe to Digest",
    "digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule",
@@ -64,9 +68,9 @@
    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
    "has_no_follower": "Tohoto uživatele nikdo nesleduje :(",
    "follows_no_one": "Tento uživatel nikoho nesleduje :(",
-    "has_no_posts": "This user didn't post anything yet.",
-    "has_no_topics": "This user didn't post any topics yet.",
-    "has_no_watched_topics": "This user didn't watch any topics yet.",
+    "has_no_posts": "This user hasn't posted anything yet.",
+    "has_no_topics": "This user hasn't posted any topics yet.",
+    "has_no_watched_topics": "This user hasn't watched any topics yet.",
    "email_hidden": "Skrytý email",
    "hidden": "skrytý",
    "paginate_description": "Paginate topics and posts instead of using infinite scroll",
@@ -80,5 +84,6 @@
    "follow_topics_you_reply_to": "Follow topics that you reply to",
    "follow_topics_you_create": "Follow topics you create",
    "grouptitle": "Select the group title you would like to display",
-    "no-group-title": "No group title"
+    "no-group-title": "No group title",
+    "select-skin": "Select a Skin"
 }
--- a/public/language/cs/users.json
+++ b/public/language/cs/users.json
@@ -8,5 +8,14 @@
    "users-found-search-took": "%1 user(s) found! Search took %2 seconds.",
    "filter-by": "Filter By",
    "online-only": "Online only",
-    "picture-only": "Picture only"
+    "picture-only": "Picture only",
+    "invite": "Invite",
+    "invitation-email-sent": "An invitation email has been sent to %1",
+    "user_list": "User List",
+    "recent_topics": "Recent Topics",
+    "popular_topics": "Popular Topics",
+    "unread_topics": "Unread Topics",
+    "categories": "Categories",
+    "tags": "Tags",
+    "map": "Map"
 }
--- a/public/language/da/category.json
+++ b/public/language/da/category.json
@@ -0,0 +1,15 @@
+{
+    "category": "Kategori",
+    "subcategories": "Underkategorier",
+    "new_topic_button": "Nyt emne",
+    "guest-login-post": "Log ind",
+    "no_topics": "<strong>Der er ikke nogen nye emner i denne kategori.</strong><br /> Hvorfor  prøver du ikke at lave et?",
+    "browsing": "browse",
+    "no_replies": "Ingen har svaret",
+    "no_new_posts": "Ingen nye indlæg",
+    "share_this_category": "Del denne kategori",
+    "watch": "Overvåg",
+    "ignore": "Ignorer",
+    "watch.message": "Du overvåger nu opdateringer fra denne kategori",
+    "ignore.message": "Du ignorere nu opdateringer fra denne kategori"
+}
--- a/public/language/da/email.json
+++ b/public/language/da/email.json
@@ -0,0 +1,32 @@
+{
+    "password-reset-requested": "Vi skal anmode dig om at nulstille dit kodeord - %1!",
+    "welcome-to": "Velkommen til %1",
+    "invite": "Invitation fra %1",
+    "greeting_no_name": "Hej",
+    "greeting_with_name": "Hej %1",
+    "welcome.text1": "Tak for at du registrerede dig hos %1!",
+    "welcome.text2": "For at færdiggøre din konto, har vi brug for at verificere at du ejer den email adresse du registerede med.",
+    "welcome.text3": "En administrator har accepteret din registreringsansøgning. Du kan logge ind med dit brugernavn og adgangskode nu.",
+    "welcome.cta": "Klik her for at bekræfte din email adresse.",
+    "invitation.text1": "%1 har inviteret dig til at deltage i %2",
+    "invitation.ctr": "Klik her for at oprette din konto.",
+    "reset.text1": "Vi har modtaget en anmodning om at nulstille dit kodeord, måske fordi du har glemt det. Hvis det ikke er tilfældet, venligst ignorer denne email.",
+    "reset.text2": "For at fortsætte med at nulstille kodeordet, venligst klik på dette link:",
+    "reset.cta": "Klik her for at nulstille dit kodeord. ",
+    "reset.notify.subject": "Dit kodeord er nu ændret",
+    "reset.notify.text1": "Bemærk:  %1 gang blev dit kodeord ændret.",
+    "reset.notify.text2": "Hvis du ikke godkendte dette, kontakt straks en administrator.",
+    "digest.notifications": "Du har ulæste notifikationer fra %1:",
+    "digest.latest_topics": "Nyeste emne fra %1",
+    "digest.cta": "Klik her for at gå til %1",
+    "digest.unsub.info": "Du har fået tilsendt dette sammendrag pga. indstillingerne i dit abonnement.",
+    "digest.no_topics": "Der har ikke været nogen aktive emner de/den sidste %1",
+    "notif.chat.subject": "Ny chat besked modtaget fra %1",
+    "notif.chat.cta": "Klik her for at forsætte med samtalen",
+    "notif.chat.unsub.info": "Denne chat notifikation blev sendt til dig pga. indstillingerne i dit abonnement.",
+    "notif.post.cta": "Klik her for a læse hele emnet",
+    "notif.post.unsub.info": "Denne indlægs notifikation var sendt pga. dine abonnering indstillinger.",
+    "test.text1": "Dette er en test email for at kontrollere, at den udgående email server er opsat korrekt i forhold til din NodeBB installation.",
+    "unsub.cta": "Klik her for at ændre disse indstillinger",
+    "closing": "Tak!"
+}
--- a/public/language/da/error.json
+++ b/public/language/da/error.json
@@ -0,0 +1,90 @@
+{
+    "invalid-data": "Ugyldig Data",
+    "not-logged-in": "Det ser ikke ud til at du er logget ind.",
+    "account-locked": "Din konto er blevet blokeret midlertidigt.",
+    "search-requires-login": "Du skal have en konto for at søge - log venligst ind eller registrer dig.",
+    "invalid-cid": "Ugyldig Kategori ID",
+    "invalid-tid": "Ugyldig Tråd ID",
+    "invalid-pid": "Ugyldig Indlæg ID",
+    "invalid-uid": "Ugyldig Bruger ID",
+    "invalid-username": "Ugyldig Brugernavn",
+    "invalid-email": "Ugyldig Email",
+    "invalid-title": "Ugylidt titel",
+    "invalid-user-data": "Ugyldig Bruger Data",
+    "invalid-password": "Ugyldig Adgangskode",
+    "invalid-username-or-password": "Venligst angiv både brugernavn og adgangskode",
+    "invalid-search-term": "Ugyldig søgeterm",
+    "invalid-pagination-value": "Ugyldig sidetalsværdi",
+    "username-taken": "Brugernavn optaget",
+    "email-taken": "Emailadresse allerede i brug",
+    "email-not-confirmed": "Din email adresse er ikke blevet bekræftet endnu, venligst klik her for at bekrætige den.",
+    "email-not-confirmed-chat": "Du kan ikke chatte før din email er bekræftet, klik her for at bekræfte din email.",
+    "no-email-to-confirm": "Dette forum kræver bekræftelse af din email, klik her for at indtaste en email",
+    "email-confirm-failed": "Vi kunne ikke bekræfte din email, prøv igen senere.",
+    "confirm-email-already-sent": "Bekræftelses email er allerede afsendt, vent venligt %1 minut(ter) for at sende endnu en.",
+    "username-too-short": "Brugernavn er for kort",
+    "username-too-long": "Brugernavn er for langt",
+    "user-banned": "Bruger er bortvist",
+    "user-too-new": "Beklager, du er nødt til at vente %1 sekund(er) før du opretter dit indlæg",
+    "no-category": "Kategorien eksisterer ikke",
+    "no-topic": "Tråden eksisterer ikke",
+    "no-post": "Indlægget eksisterer ikke",
+    "no-group": "Gruppen eksisterer ikke",
+    "no-user": "Brugeren eksisterer ikke",
+    "no-teaser": "Teaser eksisterer ikke",
+    "no-privileges": "Du har ikke nok rettigheder til at udføre denne handling",
+    "no-emailers-configured": "Ingen email plugin er blevet indlæst, så en test email kunne ikke sendes",
+    "category-disabled": "Kategorien er deaktiveret",
+    "topic-locked": "Tråden er låst",
+    "post-edit-duration-expired": "Du kan kun redigere indlæg i %1 sekund(er) efter indlæg",
+    "still-uploading": "Venligst vent til overførslen er færdig",
+    "content-too-short": "Venligst indtast et længere indlæg. Indlægget skal mindst indeholde %1 karakter(er).",
+    "content-too-long": "Venligt indtast et kortere indlæg. Indlæg kan ikke være længere end %1 karakter(er).",
+    "title-too-short": "Venligst indtast en længere titel. Titlen skal mindst indeholde %1 karakter(er).",
+    "title-too-long": "Venligst indtast en kortere titel. Titlen kan ikke indeholde flere end %1 karakter(er).",
+    "too-many-posts": "Du kan højest skrive et indlæg hver %1 sekund(er) - venligst vent et øjeblik før næste indlæg",
+    "too-many-posts-newbie": "Som ny bruger kan du kun skrive et indlæg engang hvert %1. sekund() indtil du har optjent %2 omdømme point - venligst vent et øjeblik før næste indlæg.",
+    "tag-too-short": "Indtast et længere tag. Tags skal indeholde mindst %1 karakter(er).",
+    "tag-too-long": "Indtast et længere tag. Tags kan ikke være længere end %1 karakter(er).",
+    "not-enough-tags": "Ikke nok tags. Tråde skal have mindst %1 tag(s)",
+    "too-many-tags": "For mange tags. Tråde kan ikke have mere end %1 tag(s)",
+    "file-too-big": "Maksimum filstørrelse er %1 kB - venligst overfør en mindre fil",
+    "cant-vote-self-post": "Du kan ikke stemme på dit eget indlæg",
+    "already-favourited": "Du har allerede føjet dette indlæg til dine favoritter",
+    "already-unfavourited": "Du har allerede fjernet dette indlæg fra dine favoritter",
+    "cant-ban-other-admins": "Du kan ikke udlukke andre administatrorer!",
+    "cant-remove-last-admin": "Du er den eneste administrator. Tilføj en anden bruger som administrator før du fjerner dig selv som administrator",
+    "invalid-image-type": "Invalid billed type. De tilladte typer er: %1",
+    "invalid-image-extension": "Forkert billede filnavnsendelse",
+    "invalid-file-type": "Invalid fil type. Tilladte typer er: %1",
+    "group-name-too-short": "Gruppe navn for kort",
+    "group-already-exists": "Gruppen eksisterer allerede",
+    "group-name-change-not-allowed": "Ændring af gruppe navn er ikke tilladt",
+    "group-already-member": "Du er allerede en del af denne gruppe",
+    "group-needs-owner": "Denne grupper kræver mindst én ejer",
+    "group-already-invited": "Denne bruger er allerede blevet inviteret",
+    "group-already-requested": "Din medlemskabs anmodning er allerede blevet afsendt",
+    "post-already-deleted": "Dette indlæg er allerede blevet slettet",
+    "post-already-restored": "Dette indlæg er allerede blevet genskabt",
+    "topic-already-deleted": "Denne tråd er allerede blevet slettet",
+    "topic-already-restored": "Denne tråd er allerede blevet genskabt",
+    "cant-purge-main-post": "Du kan ikke udradere hoved indlægget, fjern venligt tråden istedet",
+    "topic-thumbnails-are-disabled": "Tråd miniaturebilleder er slået fra.",
+    "invalid-file": "Ugyldig fil",
+    "uploads-are-disabled": "Overførsel er slået fra",
+    "signature-too-long": "Beklager, din signatur kan ikke være længere end %1 karakter(er).",
+    "about-me-too-long": "Beklager, men din om mig side kan ikke være længere end %1 karakter(er).",
+    "cant-chat-with-yourself": "Du kan ikke chatte med dig selv!",
+    "chat-restricted": "Denne bruger har spæret adgangen til chat beskeder. Brugeren må følge dig før du kan chatte med ham/hende",
+    "too-many-messages": "Du har sendt for mange beskeder, vent venligt lidt.",
+    "reputation-system-disabled": "Vurderingssystem er slået fra.",
+    "downvoting-disabled": "Nedvurdering er slået fra",
+    "not-enough-reputation-to-downvote": "Du har ikke nok omdømme til at nedstemme dette indlæg",
+    "not-enough-reputation-to-flag": "Du har ikke nok omdømme til at vurdere dette indlæg",
+    "already-flagged": "Du har allerede vurderet dette indlæg",
+    "reload-failed": "NodeBB stødte på et problem under genindlæsningen : \"%1\". NodeBB vil fortsætte med en ældre version, og det er nok god ide at genoptage fra lige før du genindlæste siden.",
+    "registration-error": "Registeringsfejl",
+    "parse-error": "Noget gik galt under fortolknings er serverens respons",
+    "wrong-login-type-email": "Brug venligt din email til login",
+    "wrong-login-type-username": "Brug venligt dit brugernavn til login"
+}
--- a/public/language/da/global.json
+++ b/public/language/da/global.json
@@ -0,0 +1,84 @@
+{
+    "home": "Forside",
+    "search": "Søg",
+    "buttons.close": "Luk",
+    "403.title": "Adgang nægtet",
+    "403.message": "Det ser ud til du er stødt på en side du ikke har adgang til.",
+    "403.login": "Måske du skulle <a href='%1/login'>prøve og logge ind</a>?",
+    "404.title": "Ikke fundet",
+    "404.message": "Det ser ud til du er stødt på en side der ikke finder. Retuner til <a href='%1/'> forsiden</a>.",
+    "500.title": "Intern fejl.",
+    "500.message": "Ups! Ser ud til at noget gik galt!",
+    "register": "Tilmeld",
+    "login": "Log ind",
+    "please_log_in": "Venligst log ind",
+    "logout": "Log ud",
+    "posting_restriction_info": "Det er i øjeblikket kun muligt at skrive indlæg som registeret medlem, klik her for at logge ind.",
+    "welcome_back": "Velkommen tilbage",
+    "you_have_successfully_logged_in": "Du er nu logget ind",
+    "save_changes": "Gem ændringer",
+    "close": "Luk",
+    "pagination": "Sidetal",
+    "pagination.out_of": "%1 ud af %2",
+    "pagination.enter_index": "Indtast indeks",
+    "header.admin": "Administrator",
+    "header.categories": "Kategorier",
+    "header.recent": "Seneste",
+    "header.unread": "Ulæst",
+    "header.tags": "Etiket",
+    "header.popular": "Populære",
+    "header.users": "Bruger",
+    "header.groups": "Grupper",
+    "header.chats": "Chats",
+    "header.notifications": "Notifikationer",
+    "header.search": "Søg",
+    "header.profile": "Profil",
+    "header.navigation": "Navigation",
+    "notifications.loading": "Indlæser notifikationer",
+    "chats.loading": "Indlæser chats",
+    "motd.welcome": "Velkommen til NodeBB, fremtidens diskussion platform. ",
+    "previouspage": "Forrige side",
+    "nextpage": "Næste side",
+    "alert.success": "Succes",
+    "alert.error": "Fejl",
+    "alert.banned": "Forment adgang",
+    "alert.banned.message": "Du er lige blevet udelukket, du vil nu blive logget ud.",
+    "alert.unfollow": "Du følger ikke længere %1!",
+    "alert.follow": "Du følger nu %1!",
+    "online": "Online",
+    "users": "Bruger",
+    "topics": "Emner",
+    "posts": "Indlæg",
+    "views": "Visninger",
+    "reputation": "Omdømme",
+    "read_more": "læs mere",
+    "more": "Mere",
+    "posted_ago_by_guest": "indsendt %1 af gæst",
+    "posted_ago_by": "indsendt %1 siden af %2",
+    "posted_ago": "Indsendt %1 siden",
+    "posted_in_ago_by_guest": "insendt i %1 %2 siden af gæst",
+    "posted_in_ago_by": "skrevet i %1 %2 af %3",
+    "posted_in_ago": "skrivet i %1 %2",
+    "replied_ago": "svaret for %1",
+    "user_posted_ago": "%1 skrev for %2",
+    "guest_posted_ago": "Gæst skrev for %1",
+    "last_edited_by_ago": "sidst redigeret af %1 for %2",
+    "norecentposts": "Ingen seneste indlæg",
+    "norecenttopics": "Ingen seneste tråde",
+    "recentposts": "Seneste indlæg",
+    "recentips": "Seneste loggede ind IPer",
+    "away": "Væk",
+    "dnd": "Do not disturb",
+    "invisible": "Usynlig",
+    "offline": "Offline",
+    "email": "Email",
+    "language": "Sprog",
+    "guest": "Gæst",
+    "guests": "Gæster",
+    "updated.title": "Forum opdateret",
+    "updated.message": "Dette form er lige blevet opdateret til den seneste version. Klik her for at genindlæse siden.",
+    "privacy": "Privatliv",
+    "follow": "Følg",
+    "unfollow": "Følg ikke længere",
+    "delete_all": "Slet alt"
+}
--- a/public/language/da/groups.json
+++ b/public/language/da/groups.json
@@ -0,0 +1,50 @@
+{
+    "groups": "grupper",
+    "view_group": "se gruppe",
+    "owner": "Gruppe ejer",
+    "new_group": "Opret ny gruppe",
+    "no_groups_found": "Der er ingen grupper at se",
+    "pending.accept": "Accepter",
+    "pending.reject": "Afvis",
+    "pending.accept_all": "Acceptér Alle",
+    "pending.reject_all": "Afvis Alle",
+    "pending.none": "Der er ikke nogen afventene medlemmer i øjeblikket",
+    "invited.none": "Der er ingen inviterede medlemmer i øjeblikket",
+    "invited.uninvite": "Tilbagetræk invitation",
+    "invited.search": "Søg efter en bruger at invitere til denne gruppe",
+    "cover-instructions": "Træk og slip et billede, træk til positionen og tryk <strong>Gem</strong>",
+    "cover-change": "Ændre",
+    "cover-save": "Gem",
+    "cover-saving": "Gemmer",
+    "details.title": "gruppe detaljer",
+    "details.members": "liste over medlemmer",
+    "details.pending": "Verserende medlemmer",
+    "details.invited": "Inviterede Medlemmer",
+    "details.has_no_posts": "Medlemmer af denne gruppe har ikke oprettet indlæg.",
+    "details.latest_posts": "seneste indlæg",
+    "details.private": "Privat",
+    "details.grant": "Giv/ophæv ejerskab",
+    "details.kick": "Spark",
+    "details.owner_options": "Gruppe administration",
+    "details.group_name": "Gruppe navn",
+    "details.member_count": "Medlemsantal",
+    "details.creation_date": "Oprettelsesdato",
+    "details.description": "Beskrivelse",
+    "details.badge_preview": "Mærke forhåndsvisning",
+    "details.change_icon": "Skift ikon",
+    "details.change_colour": "Skift farve",
+    "details.badge_text": "Mærke tekst",
+    "details.userTitleEnabled": "Vis mærke",
+    "details.private_help": "Hvis aktiveret, så vil det kræve godkendelse af gruppe ejeren for at tilslutte sig en gruppe",
+    "details.hidden": "Skjult",
+    "details.hidden_help": "Hvis aktiveret, så vil denne gruppe ikke kunne ses i gruppelisten og bruhere skal inviteres manuelt",
+    "details.delete_group": "Slet Gruppe",
+    "event.updated": "Gruppe detaljer er blevet opdateret",
+    "event.deleted": "Gruppen \"%1\" er blevet slettet",
+    "membership.accept-invitation": "Acceptér Invitation",
+    "membership.invitation-pending": "Afventende Invitationer",
+    "membership.join-group": "Bliv medlem af gruppe",
+    "membership.leave-group": "Forlad Gruppe",
+    "membership.reject": "Afvis",
+    "new-group.group_name": "Gruppe Navn:"
+}
--- a/public/language/da/language.json
+++ b/public/language/da/language.json
@@ -0,0 +1,5 @@
+{
+    "name": "Danish",
+    "code": "da",
+    "dir": "ltr"
+}
--- a/public/language/da/login.json
+++ b/public/language/da/login.json
@@ -0,0 +1,11 @@
+{
+    "username-email": "Brugernavn / Email",
+    "username": "Brugernavn",
+    "email": "Email",
+    "remember_me": "Husk mig?",
+    "forgot_password": "Glemt kodeord?",
+    "alternative_logins": "alternative logins",
+    "failed_login_attempt": "Login mislykkedes, venligt prøv igen.",
+    "login_successful": "Du har successfuldt logged in!",
+    "dont_have_account": "Har du ikke en konto?"
+}
--- a/public/language/da/modules.json
+++ b/public/language/da/modules.json
@@ -0,0 +1,29 @@
+{
+    "chat.chatting_with": "Chat med <span id=\"chat-with-name\"></span>",
+    "chat.placeholder": "Skriv din chatbesked her, tryk enter for at sende",
+    "chat.send": "Send",
+    "chat.no_active": "Du har ingen aktive chats.",
+    "chat.user_typing": "%1 skriver ...",
+    "chat.user_has_messaged_you": "1% har skrevet til dig.",
+    "chat.see_all": "See all chats",
+    "chat.no-messages": "Vælg en modtager for at se beskedhistorikken",
+    "chat.recent-chats": "Seneste chats",
+    "chat.contacts": "Kontakter",
+    "chat.message-history": "Beskedhistorik",
+    "chat.pop-out": "Pop ud chatten",
+    "chat.maximize": "Maximer",
+    "chat.seven_days": "7 dage",
+    "chat.thirty_days": "30 dage",
+    "chat.three_months": "3 måneder",
+    "composer.compose": "Skriv",
+    "composer.show_preview": "Vis forhåndsvisning",
+    "composer.hide_preview": "Fjern forhåndsvisning",
+    "composer.user_said_in": "%1 sagde i %2:",
+    "composer.user_said": "%1 sagde:",
+    "composer.discard": "Er du sikker på at du vil kassere dette indlæg?",
+    "composer.submit_and_lock": "Send og lås",
+    "composer.toggle_dropdown": "Skift mellem dropdown",
+    "bootbox.ok": "OK",
+    "bootbox.cancel": "Cancel",
+    "bootbox.confirm": "Confirm"
+}
--- a/public/language/da/notifications.json
+++ b/public/language/da/notifications.json
@@ -0,0 +1,28 @@
+{
+    "title": "Notifikationer",
+    "no_notifs": "Du har ingen nye notifkationer",
+    "see_all": "See all notifications",
+    "mark_all_read": "Marker alle notifikationer læst",
+    "back_to_home": "Tilbage til %1",
+    "outgoing_link": "Udgående link",
+    "outgoing_link_message": "Du forlader nu %1.",
+    "continue_to": "Fortsæt til %1",
+    "return_to": "Returnere til %t",
+    "new_notification": "Ny notifikation",
+    "you_have_unread_notifications": "Du har ulæste notifikationer.",
+    "new_message_from": "Ny besked fra <strong>%1</strong>",
+    "upvoted_your_post_in": "<strong>%1</strong> har upvotet dit indlæg i <strong>%2</strong>.",
+    "moved_your_post": "<strong>%1</strong> har flyttet dit indlæg.",
+    "moved_your_topic": "<strong>%1</strong> har flyttet din tråd.",
+    "favourited_your_post_in": "<strong>%1</strong> har favoriseret dit indlæg i <strong>%2</strong>.",
+    "user_flagged_post_in": "<strong>%1</strong> har anmeldt et indlæg i <strong>%2</strong>",
+    "user_posted_to": "<strong>%1</strong> har skrevet et svar til: <strong>%2</strong>",
+    "user_posted_topic": "<strong>%1</strong> har oprettet en ny tråd: <strong>%2</strong>",
+    "user_mentioned_you_in": "<strong>%1</strong> nævnte dig i <strong>%2</strong>",
+    "user_started_following_you": "<strong>%1</strong> har valgt at følge dig.",
+    "new_register": "<strong>%1</strong> har sendt en registrerings anmodning.",
+    "email-confirmed": "Email bekræftet",
+    "email-confirmed-message": "Tak fordi du validerede din email. Din konto er nu fuldt ud aktiveret.",
+    "email-confirm-error-message": "Der var et problem med valideringen af din emailadresse. Bekræftelses koden var muligvis forkert eller udløbet.",
+    "email-confirm-sent": "Bekræftelses email afsendt."
+}
--- a/public/language/da/pages.json
+++ b/public/language/da/pages.json
@@ -0,0 +1,37 @@
+{
+    "home": "Forside",
+    "unread": "Ulæste tråde",
+    "popular-day": "Popular topics today",
+    "popular-week": "Popular topics this week",
+    "popular-month": "Popular topics this month",
+    "popular-alltime": "All time popular topics",
+    "recent": "Seneste tråde",
+    "users/online": "Online Users",
+    "users/latest": "Latest Users",
+    "users/sort-posts": "Users with the most posts",
+    "users/sort-reputation": "Users with the most reputation",
+    "users/map": "User Map",
+    "users/search": "User Search",
+    "notifications": "Notifikationer",
+    "tags": "Tags",
+    "tag": "Tråde tagget under \"%1\"",
+    "register": "Register an account",
+    "login": "Login to your account",
+    "reset": "Reset your account password",
+    "categories": "Categories",
+    "groups": "Groups",
+    "group": "%1 group",
+    "chats": "Chats",
+    "chat": "Chatting with %1",
+    "account/edit": "Editing \"%1\"",
+    "account/following": "People %1 follows",
+    "account/followers": "People who follow %1",
+    "account/posts": "Posts made by %1",
+    "account/topics": "Topics created by %1",
+    "account/groups": "%1's Groups",
+    "account/favourites": "%1's Favourite Posts",
+    "account/settings": "User Settings",
+    "account/watched": "Topics watched by %1",
+    "maintenance.text": "%1 er under vedligeholdelse. Kom venligst tilbage senere.",
+    "maintenance.messageIntro": "Administratoren har yderligere vedlagt denne besked:"
+}
--- a/public/language/da/recent.json
+++ b/public/language/da/recent.json
@@ -0,0 +1,19 @@
+{
+    "title": "Seneste",
+    "day": "Dag",
+    "week": "Uge",
+    "month": "Måned",
+    "year": "År",
+    "alltime": "Al tid",
+    "no_recent_topics": "Der er ingen seneste tråde",
+    "no_popular_topics": "Der er ingen populære tråde.",
+    "there-is-a-new-topic": "Der er en ny tråd.",
+    "there-is-a-new-topic-and-a-new-post": "Der er en ny tråd og et nyt indlæg.",
+    "there-is-a-new-topic-and-new-posts": "Der er en tråd og %1 nye indlæg",
+    "there-are-new-topics": "Der er %1 nye indlæg.",
+    "there-are-new-topics-and-a-new-post": "Der er %1 nye indlæg og et nyt indlæg.",
+    "there-are-new-topics-and-new-posts": "Der er %1 nye tråde og %2 nye indlæg.",
+    "there-is-a-new-post": "Der er et nyt indlæg.",
+    "there-are-new-posts": "Der er %1 nye indlæg.",
+    "click-here-to-reload": "Klik her for at genindlæse."
+}
--- a/public/language/da/register.json
+++ b/public/language/da/register.json
@@ -0,0 +1,19 @@
+{
+    "register": "Tilmeld",
+    "help.email": "Den email er skjult som standard.",
+    "help.username_restrictions": "Et unikt brugernavn mellem %1 og %2 karakterer. Andre kan nævne dig med @<span id='yourUsername'>brugernavn</span>.",
+    "help.minimum_password_length": "Din adgangskode skal være på mindst %1 karakterer.",
+    "email_address": "Emailadresse",
+    "email_address_placeholder": "Indtast emailadresse",
+    "username": "Brugernavn",
+    "username_placeholder": "Indtast brugernavn",
+    "password": "Adgangskode",
+    "password_placeholder": "Indtast adgangskode",
+    "confirm_password": "Bekræft adgangskode",
+    "confirm_password_placeholder": "Bekræft adgangskode",
+    "register_now_button": "Registrer nu",
+    "alternative_registration": "Alternativ registrering",
+    "terms_of_use": "Betingelser for brug",
+    "agree_to_terms_of_use": "Jeg acceptere betingelserne for brug",
+    "registration-added-to-queue": "Din registrering er blevet tilføjet til godkendelses køen. Du vil mostage en email når du er blevet accepteret af en administrator."
+}
--- a/public/language/da/reset_password.json
+++ b/public/language/da/reset_password.json
@@ -0,0 +1,17 @@
+{
+    "reset_password": "Nulstil adgangskode",
+    "update_password": "Opdater adgangskode",
+    "password_changed.title": "Adgangskode ændret",
+    "password_changed.message": "<p>Adgangskode er blevet ændret, <a href=\"/login\">log venligt ind igen</a>.",
+    "wrong_reset_code.title": "Forkert nulstillingskode",
+    "wrong_reset_code.message": "Nulstillingskoden var forkert. Prøv venligst igen, eller <a href=\"/reset\">anmod om en ny nultillingskode</a>.",
+    "new_password": "Ny adgangskode",
+    "repeat_password": "Bekræft adgangskode",
+    "enter_email": "Indtast venligst din <strong>emailadresse</strong> så vi kan sende dig instrukser til at nulstille din konto.",
+    "enter_email_address": "Indtast emailadresse",
+    "password_reset_sent": "Adgangskode nulstilling afsendt",
+    "invalid_email": "Ugyldig emailadresse / Emailadresse findes ikke",
+    "password_too_short": "Den indtastede adgangskode er for kort, vælg venligt en anden adgangskode.",
+    "passwords_do_not_match": "De to indtastede adgangskoder er ikke ens.",
+    "password_expired": "Din adgangskode er udløbet, vælg venligst en ny adgangskode"
+}
--- a/public/language/da/search.json
+++ b/public/language/da/search.json
@@ -0,0 +1,40 @@
+{
+    "results_matching": "%1 resultat(er) matcher \"%2\", (%3 sekunder)",
+    "no-matches": "Ingen resultatet fundet",
+    "advanced-search": "Advanceret søgning",
+    "in": "I",
+    "titles": "Titler",
+    "titles-posts": "Titler og indlæg",
+    "posted-by": "Skrevet af",
+    "in-categories": "I katagorierne",
+    "search-child-categories": "Søg underkategorier",
+    "reply-count": "Svar antal",
+    "at-least": "Mindst",
+    "at-most": "Højst",
+    "post-time": "Skrevet",
+    "newer-than": "Nyere end",
+    "older-than": "Ældre end",
+    "any-date": "Enhver dato",
+    "yesterday": "Igår",
+    "one-week": "En uge",
+    "two-weeks": "To uger",
+    "one-month": "En måned",
+    "three-months": "Tre måneder",
+    "six-months": "Seks måneder",
+    "one-year": "Et år",
+    "sort-by": "Sorter efter",
+    "last-reply-time": "Sidste svar tid",
+    "topic-title": "Tråd titel",
+    "number-of-replies": "Antal svar",
+    "number-of-views": "Antal visninger",
+    "topic-start-date": "Tråd starts dato",
+    "username": "Brugernavn",
+    "category": "Kategori",
+    "descending": "I faldende rækkefølge",
+    "ascending": "I stigende rækkefølge",
+    "save-preferences": "Gem præferencer",
+    "clear-preferences": "Slet præferencer",
+    "search-preferences-saved": "Søgnings præferencer gemt",
+    "search-preferences-cleared": "Søgnings præferencer slettet",
+    "show-results-as": "Vis resultater som"
+}
--- a/public/language/da/success.json
+++ b/public/language/da/success.json
@@ -0,0 +1,6 @@
+{
+    "success": "Udført",
+    "topic-post": "Du har indsendt et indlæg.",
+    "authentication-successful": "Du blev autentificeret",
+    "settings-saved": "Indstillinger gemt!"
+}
--- a/public/language/da/tags.json
+++ b/public/language/da/tags.json
@@ -0,0 +1,7 @@
+{
+    "no_tag_topics": "Der er ikke indlæg med dette tag.",
+    "tags": "Tags",
+    "enter_tags_here": "Indsæt tags her, hver på mellem %1 og %2 karakterer.",
+    "enter_tags_here_short": "Skriv tags",
+    "no_tags": "Der er ingen tags endnu."
+}
--- a/public/language/da/topic.json
+++ b/public/language/da/topic.json
@@ -0,0 +1,100 @@
+{
+    "topic": "Tråd",
+    "topic_id": "Tråd-id",
+    "topic_id_placeholder": "Angiv tråd-id",
+    "no_topics_found": "Ingen tråde fundet",
+    "no_posts_found": "Ingen indlæg fundet!",
+    "post_is_deleted": "Dette indlæg er slettet!",
+    "topic_is_deleted": "Denne tråd er blevet slettet!",
+    "profile": "Profil",
+    "posted_by": "Skrevet af %1",
+    "posted_by_guest": "Skrevet af Gæst",
+    "chat": "Chat",
+    "notify_me": "Bliv notificeret ved nye svar i dette emne",
+    "quote": "Citer",
+    "reply": "Svar",
+    "guest-login-reply": "Login for at svare",
+    "edit": "Rediger",
+    "delete": "Slet",
+    "purge": "Udrader",
+    "restore": "Gendan",
+    "move": "Flyt",
+    "fork": "Fork",
+    "link": "Link",
+    "share": "Del",
+    "tools": "Værktøjer",
+    "flag": "Marker",
+    "locked": "Låst",
+    "bookmark_instructions": "Klik her for at returnere til den sidste position eller luk for at kassere.",
+    "flag_title": "Meld dette indlæg til moderation",
+    "flag_confirm": "Er du sikker på du ænsker at melde dette indlæg?",
+    "flag_success": "Dette indlæg er blevet meldt til moderation.",
+    "deleted_message": "Denne tråd er blevet slettet. Kun brugere med emne behandlings privilegier kan se den.",
+    "following_topic.message": "Du vil nu modtage notifikationer når nogle skriver et indlæg i dette emne.",
+    "not_following_topic.message": "Du vil ikke længere modtage notifikationer fra dette emne.",
+    "login_to_subscribe": "Venligt registrer eller login for at abbonere på dette emne.",
+    "markAsUnreadForAll.success": "Emnet er market ulæst for alle.",
+    "watch": "Overvåg",
+    "unwatch": "Fjern overvågning",
+    "watch.title": "Bliv notificeret ved nye indlæg i dette emne",
+    "unwatch.title": "Fjern overvågning af dette emne",
+    "share_this_post": "Del dette indlæg",
+    "thread_tools.title": "Emne værktøjer",
+    "thread_tools.markAsUnreadForAll": "Marker som ulæst",
+    "thread_tools.pin": "Fastgør tråd",
+    "thread_tools.unpin": "Frigør tråd",
+    "thread_tools.lock": "Lås tråd",
+    "thread_tools.unlock": "Lås tråd op",
+    "thread_tools.move": "Flyt tråd",
+    "thread_tools.move_all": "Flyt alt",
+    "thread_tools.fork": "Fraskil tråd",
+    "thread_tools.delete": "Slet tråd",
+    "thread_tools.delete_confirm": "Er du sikker på at du vil slette dette emne?",
+    "thread_tools.restore": "Gendan tråd",
+    "thread_tools.restore_confirm": "Er du sikker på at du ønsker at genoprette denne tråd?",
+    "thread_tools.purge": "Udrader tråd",
+    "thread_tools.purge_confirm": "Er du sikker på at du vil udrense denne tråd?",
+    "topic_move_success": "Denne tråd blev flyttet til %1",
+    "post_delete_confirm": "Er du sikker på at du vil slette dette indlæg?",
+    "post_restore_confirm": "Er du sikker på at du vil gendanne dette indlæg?",
+    "post_purge_confirm": "Er du sikker på at du vil udradere dette indlæg?",
+    "load_categories": "Indlæser kategorier",
+    "disabled_categories_note": "Deaktiverede kategorier er nedtonede",
+    "confirm_move": "Flyt",
+    "confirm_fork": "Fraskil",
+    "favourite": "Favoriser",
+    "favourites": "Favoritter",
+    "favourites.has_no_favourites": "Du har ingen favoritter, favoriser nogle indlæg for at se dem her!",
+    "loading_more_posts": "Indlæser flere indlæg",
+    "move_topic": "Flyt tråd",
+    "move_topics": "Flyt tråde",
+    "move_post": "Flyt indlæg",
+    "post_moved": "Indlæg flyttet!",
+    "fork_topic": "Fraskil tråd",
+    "topic_will_be_moved_to": "Denne tråd vil blive flyttet til katagorien",
+    "fork_topic_instruction": "Klik på indlæg du ønsker at fraskille",
+    "fork_no_pids": "Ingen indlæg valgt",
+    "fork_success": "Tråden blev fraskilt! Klik her for at gå til den fraskilte tråd.",
+    "composer.title_placeholder": "Angiv din trådtittel her ...",
+    "composer.handle_placeholder": "Navn",
+    "composer.discard": "Fortryd",
+    "composer.submit": "Send",
+    "composer.replying_to": "Svare til %1",
+    "composer.new_topic": "Ny tråd",
+    "composer.uploading": "uploader...",
+    "composer.thumb_url_label": "Indsæt en tråd miniature URL",
+    "composer.thumb_title": "Tilføj en miniature til denne tråd",
+    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
+    "composer.thumb_file_label": "Eller upload en fil",
+    "composer.thumb_remove": "Slet felter",
+    "composer.drag_and_drop_images": "Træk og slip billeder her",
+    "more_users_and_guests": "%1 flere bruger(e) og %2 gæst(er)",
+    "more_users": "%1 flere bruger(e)",
+    "more_guests": "%1 flere gæst(er)",
+    "users_and_others": "%1 og %2 andre",
+    "sort_by": "Sorter efter",
+    "oldest_to_newest": "Ældste til nyeste",
+    "newest_to_oldest": "Nyeste til ældste",
+    "most_votes": "Flest stemmer",
+    "most_posts": "Flest indlæg"
+}
--- a/public/language/da/unread.json
+++ b/public/language/da/unread.json
@@ -0,0 +1,10 @@
+{
+    "title": "Ulæst",
+    "no_unread_topics": "Der er ingen ulæste emner.",
+    "load_more": "Indlæs mere",
+    "mark_as_read": "Marker som læst",
+    "selected": "Valgte",
+    "all": "Alle",
+    "all_categories": "Alle kategorier",
+    "topics_marked_as_read.success": "Emner markeret som læst!"
+}
--- a/public/language/da/user.json
+++ b/public/language/da/user.json
@@ -0,0 +1,89 @@
+{
+    "banned": "Banlyst",
+    "offline": "Offline",
+    "username": "Brugernavn",
+    "joindate": "Oprettet",
+    "postcount": "Antal indlæg",
+    "email": "Email",
+    "confirm_email": "Bekræft email",
+    "ban_account": "Ban Konto",
+    "ban_account_confirm": "Ønsker du virkelig at banne denne konto?",
+    "unban_account": "Afban Konto",
+    "delete_account": "Slet konto",
+    "delete_account_confirm": "Er du sikker på du vil slette din konto? <br /><strong>Dette kan ikke fortrydes, og du vil ikke være istand til at genoprette dine data</strong><br /><br />Indtast dit brugernavn for at bekræfte at du ønsker at slette din konto.",
+    "delete_this_account_confirm": "Er du sikker på at du vil slette denne konto?<br /><strong>Denne handling kan ikke fortrydes, og du kan ikke genskabe nogen data.</strong><br /><br />",
+    "fullname": "Fulde navn",
+    "website": "Webside",
+    "location": "Lokation",
+    "age": "Alder",
+    "joined": "Oprettet",
+    "lastonline": "Sidst online",
+    "profile": "Profil",
+    "profile_views": "Profil visninger",
+    "reputation": "Omdømme",
+    "favourites": "Favoritter",
+    "watched": "Set",
+    "followers": "Followers",
+    "following": "Følger",
+    "aboutme": "Om mig",
+    "signature": "Signatur",
+    "gravatar": "Gravatar",
+    "birthday": "Fødselsdag",
+    "chat": "Chat",
+    "follow": "Følg",
+    "unfollow": "Følg ikke",
+    "more": "Mere",
+    "profile_update_success": "Din profil blev opdateret",
+    "change_picture": "Skift billede",
+    "edit": "Rediger",
+    "uploaded_picture": "Upload billede",
+    "upload_new_picture": "Upload nyt billede",
+    "upload_new_picture_from_url": "Upload nyt billede fra URL",
+    "current_password": "Nuværende kodeord",
+    "change_password": "Skift kodeord",
+    "change_password_error": "Ukorrekt kodeord",
+    "change_password_error_wrong_current": "Nuværende kodeord er ikke korrekt",
+    "change_password_error_length": "Kodeord er for kort!",
+    "change_password_error_match": "Passwords matcher ikke!",
+    "change_password_error_privileges": "Du har ikke rettigheder til at ændre dette password.",
+    "change_password_success": "Dit password er opdateret!",
+    "confirm_password": "Bekræft kodeord",
+    "password": "Kodeord",
+    "username_taken_workaround": "Det valgte brugernavn er allerede taget, så vi har ændret det en smule. Du hedder nu <strong>%1</strong>",
+    "upload_picture": "Upload billede",
+    "upload_a_picture": "Upload et billede",
+    "image_spec": "Du kan kun uploade PNG, JPG eller GIF billeder",
+    "settings": "Indstillinger",
+    "show_email": "Vis min emailaddresse",
+    "show_fullname": "Vis mit fulde navn",
+    "restrict_chats": "Tillad kun chat beskeder fra brugere jeg følger",
+    "digest_label": "Abonner på sammendrag",
+    "digest_description": "Abonner på email opdateringer for detta forum (nye notifikationer og indlæg) efter en bestemt køreplan",
+    "digest_off": "Slukket",
+    "digest_daily": "Daglig",
+    "digest_weekly": "Ugentlig",
+    "digest_monthly": "Månedlig",
+    "send_chat_notifications": "Send en email hvis en ny chat besked er modtaget og jeg ikke er online",
+    "send_post_notifications": "Send en email når der er skrevet svar til indlæg jeg abonnere på",
+    "settings-require-reload": "Nogle indstillinger kræver en genindlæsning. Klik her for at genindlæse siden.",
+    "has_no_follower": "Denne bruger har ingen følgere :(",
+    "follows_no_one": "Denne bruger følger ikke nogen :(",
+    "has_no_posts": "Denne bruger har ikke skrevet noget endnu.",
+    "has_no_topics": "Denne bruger har ikke skrævet nogle tråde endnu.",
+    "has_no_watched_topics": "Denne bruger har ikke fulgt nogle tråde endnu.",
+    "email_hidden": "Email Skjult",
+    "hidden": "skjult",
+    "paginate_description": "Sideinddel emner og indlæg istedet for uendeligt rul",
+    "topics_per_page": "Emner per side",
+    "posts_per_page": "Indlæg per side",
+    "notification_sounds": "Afspil en lyd når du modtager en notifikation",
+    "browsing": "Gennemsenings indstillinger",
+    "open_links_in_new_tab": "Åben udgående link i en ny tab",
+    "enable_topic_searching": "Slå In-Topic søgning til",
+    "topic_search_help": "Hvis slået til, så vil in-topic søgning overskrive browserens almindelige søge function og tillade dig at søge hele emnet, istedet for kun det der er vist på skærmen",
+    "follow_topics_you_reply_to": "Følg emner du har skrevet indlæg i",
+    "follow_topics_you_create": "Følg emner du opretter",
+    "grouptitle": "Vælg gruppe titlen du gerne vil fremvise",
+    "no-group-title": "Ingen gruppe titel",
+    "select-skin": "Select a Skin"
+}
--- a/public/language/da/users.json
+++ b/public/language/da/users.json
@@ -0,0 +1,21 @@
+{
+    "latest_users": "Seneste brugere",
+    "top_posters": "Top Postere",
+    "most_reputation": "Mest Omdømme",
+    "search": "Søg",
+    "enter_username": "Indtast brugernavn for at søge",
+    "load_more": "Indlæs mere",
+    "users-found-search-took": "%1 bruger(e) fundet! Søgning tog %2 sekunder.",
+    "filter-by": "Filtre Efter",
+    "online-only": "Kun online",
+    "picture-only": "Kun billeder",
+    "invite": "Invitér",
+    "invitation-email-sent": "En invitations email er blevet sendt til %1",
+    "user_list": "Bruger Liste",
+    "recent_topics": "Seneste Tråde",
+    "popular_topics": "Populærer Tråde",
+    "unread_topics": "Ulæste Tråde",
+    "categories": "Kategorier",
+    "tags": "Tags",
+    "map": "Kort"
+}
--- a/public/language/de/category.json
+++ b/public/language/de/category.json
@@ -1,9 +1,12 @@
 {
+    "category": "Kategorie",
+    "subcategories": "Unterkategorien",
    "new_topic_button": "Neues Thema",
    "guest-login-post": "Anmelden um einen Beitrag zu erstellen",
    "no_topics": "<strong>Es gibt noch keine Themen in dieser Kategorie.</strong><br />Warum beginnst du nicht eins?",
    "browsing": "Aktiv",
    "no_replies": "Niemand hat geantwortet",
+    "no_new_posts": "Keine neue Beiträge.",
    "share_this_category": "Teile diese Kategorie",
    "watch": "Beobachten",
    "ignore": "Ignorieren",
--- a/public/language/de/email.json
+++ b/public/language/de/email.json
@@ -1,11 +1,15 @@
 {
    "password-reset-requested": "Zurücksetzung des Passworts beantragt - %1!",
    "welcome-to": "Willkommen bei %1",
+    "invite": "Einladung von %1",
    "greeting_no_name": "Hallo",
    "greeting_with_name": "Hallo %1",
    "welcome.text1": "Vielen Dank für die Registrierung bei %1!",
    "welcome.text2": "Um dein Konto vollständig zu aktivieren, müssen wir überprüfen, ob du Besitzer der E-Mail-Adresse bist, mit der du dich registriert hast.",
+    "welcome.text3": "Ein Administrator hat deine Registration aktzeptiert. Du kannst dich jetzt mit deinem Benutzernamen/Passwort einloggen.",
    "welcome.cta": "Klicke hier, um deine E-Mail-Adresse zu bestätigen.",
+    "invitation.text1": "%1 hat dich eingeladen %2 beizutreten",
+    "invitation.ctr": "Klicke hier, um ein Konto zu erstellen.",
    "reset.text1": "Wir haben eine Anfrage auf Zurücksetzung deines Passworts erhalten, wahrscheinlich, weil du es vergessen hast. Falls dies nicht der Fall ist, ignoriere bitte diese E-Mail.",
    "reset.text2": "Klicke bitte auf den folgenden Link, um mit der Zurücksetzung deines Passworts fortzufahren:",
    "reset.cta": "Klicke hier, um dein Passwort zurückzusetzen",
--- a/public/language/de/error.json
+++ b/public/language/de/error.json
@@ -2,7 +2,7 @@
    "invalid-data": "Daten ungültig",
    "not-logged-in": "Du bist nicht angemeldet.",
    "account-locked": "Dein Account wurde vorübergehend gesperrt.",
-    "search-requires-login": "Searching requires an account - please login or register.",
+    "search-requires-login": "Die Suche erfordert ein Konto, bitte einloggen oder registrieren.",
    "invalid-cid": "Ungültige Kategorie-ID",
    "invalid-tid": "Ungültige Themen-ID",
    "invalid-pid": "Ungültige Beitrags-ID",
@@ -21,11 +21,11 @@
    "email-not-confirmed-chat": "Deine E-Mail wurde noch nicht bestätigt. Bitte klicke hier, um deine E-Mail zu bestätigen.",
    "no-email-to-confirm": "Dieses Forum setzt E-Mail-Bestätigung voraus, bitte klick hier um eine E-Mail-Adresse einzugeben",
    "email-confirm-failed": "Wir konnten deine E-Mail-Adresse nicht bestätigen, bitte versuch es später noch einmal",
-    "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
+    "confirm-email-already-sent": "Bestätigungsmail wurde verschickt, bitte warten %1 Minute(n) warten um eine weitere zu verschicken.",
    "username-too-short": "Benutzername ist zu kurz",
    "username-too-long": "Der Benutzername ist zu lang",
    "user-banned": "Der Benutzer ist gesperrt",
-    "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
+    "user-too-new": "Entschuldigung, Sie müssen %1 Sekunde(n) warten, bevor Sie ihren ersten Beitrag schreiben können.",
    "no-category": "Die Kategorie existiert nicht",
    "no-topic": "Das Thema existiert nicht",
    "no-post": "Der Beitrag existiert nicht",
@@ -36,21 +36,24 @@
    "no-emailers-configured": "Es wurde keine E-Mail-Plugins geladen, weshalb eine Test-E-Mail nicht gesendet werden konnte.",
    "category-disabled": "Kategorie ist deaktiviert",
    "topic-locked": "Thema ist gesperrt",
-    "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
+    "post-edit-duration-expired": "Entschuldigung, Sie dürfen Beiträge nur %1 Sekunde(n) nach dem veröffentlichen editieren.",
    "still-uploading": "Bitte warte bis der Vorgang abgeschlossen ist.",
-    "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
-    "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
-    "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
-    "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 character(s).",
-    "too-many-posts": "You can only post once every %1 second(s) - please wait before posting again",
-    "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
-    "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",
-    "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 character(s)",
-    "file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
+    "content-too-short": "Bitte schreiben Sie einen längeren Beitrag. Beiträge sollten mindestens %1 Zeichen enthalten.",
+    "content-too-long": "Bitte schreiben Sie einen kürzeren Beitrag. Beiträge können nicht länger als %1 Zeichen sein.",
+    "title-too-short": "Bitte geben Sie einen längeren Titel ein. Ein Titel muss mindestens %1 Zeichen enthalten.",
+    "title-too-long": "Bitten geben Sie einen kürzeren Titel ein. Ein Titel darf nicht mehr als %1 Zeichen enthalten.",
+    "too-many-posts": "Sie können nur einen Beitrag innerhalb von %1 Sekunden erstellen - Bitte warten Sie bevor Sie erneut einen Beitrag erstellen.",
+    "too-many-posts-newbie": "Als neuer Benutzer können Sie nur einen Beitrag innerhalb von %1 Sekunden erstellen - Bitte warten Sie bevor Sie erneut einen Beitrag erstellen.",
+    "tag-too-short": "Bitte geben Sie ein längeres Schlagwort ein. Tags sollten mindestens %1 Zeichen enthalten.",
+    "tag-too-long": "Bitte geben Sie ein kürzeres Schlagwort ein. Tags können nicht länger als %1 Zeichen sein.",
+    "not-enough-tags": "Nicht genügend Tags. Themen müssen mindestens %1 Tag(s) enthalten",
+    "too-many-tags": "Zu viele Tags. Themen dürfen nicht mehr als %1 Tag(s) enthalten",
+    "file-too-big": "Die maximale Dateigröße ist %1 kB, bitte laden Sie eine kleinere Datei hoch.",
    "cant-vote-self-post": "Du kannst deinen eigenen Beitrag nicht bewerten",
    "already-favourited": "Dieser Beitrag ist bereits in deinen Favoriten enthalten",
    "already-unfavourited": "Du hast diesen Beitrag bereits aus deinen Favoriten entfernt",
    "cant-ban-other-admins": "Du kannst andere Administratoren nicht sperren!",
+    "cant-remove-last-admin": "Du bist der einzige Administrator. Füge zuerst einen anderen Administrator hinzu, bevor du dich selbst als Administrator entfernst",
    "invalid-image-type": "Falsche Bildart. Erlaubte Arten sind: %1",
    "invalid-image-extension": "Ungültige Dateinamenerweiterung",
    "invalid-file-type": "Ungültiger Dateityp. Erlaubte Typen sind: %1",
@@ -59,6 +62,8 @@
    "group-name-change-not-allowed": "Du kannst den Namen der Gruppe nicht ändern",
    "group-already-member": "Du bist bereits Teil dieser Gruppe",
    "group-needs-owner": "Diese Gruppe muss mindestens einen Besitzer vorweisen",
+    "group-already-invited": "Dieser Benutzer wurde bereits eingeladen",
+    "group-already-requested": "Deine Mitgliedsanfrage wurde bereits eingereicht",
    "post-already-deleted": "Dieser Beitrag ist bereits gelöscht worden",
    "post-already-restored": "Dieser Beitrag ist bereits wiederhergestellt worden",
    "topic-already-deleted": "Dieses Thema ist bereits gelöscht worden",
@@ -67,8 +72,8 @@
    "topic-thumbnails-are-disabled": "Vorschaubilder für Themen sind deaktiviert",
    "invalid-file": "Datei ungültig",
    "uploads-are-disabled": "Uploads sind deaktiviert",
-    "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
-    "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
+    "signature-too-long": "Entschuldigung, Ihre Signatur kann nicht länger als %1 Zeichen sein.",
+    "about-me-too-long": "Entschuldigung, Ihr \"über mich\" kann nicht länger als %1 Zeichen sein.",
    "cant-chat-with-yourself": "Du kannst nicht mit dir selber chatten!",
    "chat-restricted": "Dieser Benutzer hat seine Chatfunktion eingeschränkt. Du kannst nur mit diesem Benutzer chatten, wenn er dir folgt.",
    "too-many-messages": "Du hast zu viele Nachrichten versandt, bitte warte eine Weile.",
@@ -76,6 +81,7 @@
    "downvoting-disabled": "Downvotes sind deaktiviert.",
    "not-enough-reputation-to-downvote": "Deine Reputation ist zu niedrig, um diesen Beitrag negativ zu bewerten.",
    "not-enough-reputation-to-flag": "Deine Reputation ist nicht gut genug, um diesen Beitrag zu melden",
+    "already-flagged": "Du hast diesen Beitrag bereits gemeldet",
    "reload-failed": "Es ist ein Problem während des Reloads von NodeBB aufgetreten: \"%1\". NodeBB wird weiterhin clientseitige Assets bereitstellen, allerdings solltest du das, was du vor dem Reload gemacht hast, rückgängig machen.",
    "registration-error": "Registrierungsfehler",
    "parse-error": "Beim auswerten der Serverantwort ist etwas schiefgegangen",
--- a/public/language/de/global.json
+++ b/public/language/de/global.json
@@ -22,6 +22,7 @@
    "pagination.out_of": "%1 von %2",
    "pagination.enter_index": "Seitenzahl eingeben",
    "header.admin": "Admin",
+    "header.categories": "Kategorien",
    "header.recent": "Aktuell",
    "header.unread": "Ungelesen",
    "header.tags": "Tags",
@@ -32,6 +33,7 @@
    "header.notifications": "Benachrichtigungen",
    "header.search": "Suche",
    "header.profile": "Profil",
+    "header.navigation": "Navigation",
    "notifications.loading": "Benachrichtigungen werden geladen",
    "chats.loading": "Nachrichten werden geladen",
    "motd.welcome": "Willkommen auf NodeBB, der Diskussionsplattform der Zukunft.",
@@ -50,6 +52,7 @@
    "views": "Aufrufe",
    "reputation": "Reputation",
    "read_more": "weiterlesen",
+    "more": "Mehr",
    "posted_ago_by_guest": "%1 von einem Gast geschrieben",
    "posted_ago_by": "%1 von %2 geschrieben",
    "posted_ago": "%1 geschrieben",
@@ -65,7 +68,7 @@
    "recentposts": "Aktuelle Beiträge",
    "recentips": "Zuletzt eingeloggte IPs",
    "away": "Abwesend",
-    "dnd": "Nicht stören",
+    "dnd": "Do not disturb",
    "invisible": "Unsichtbar",
    "offline": "Offline",
    "email": "E-Mail",
--- a/public/language/de/groups.json
+++ b/public/language/de/groups.json
@@ -6,6 +6,12 @@
    "no_groups_found": "Es sind keine Gruppen vorhanden",
    "pending.accept": "Annehmen",
    "pending.reject": "Abweisen",
+    "pending.accept_all": "Alle annehmen",
+    "pending.reject_all": "Alle ablehnen",
+    "pending.none": "Es sind zur Zeit keine unvearbeiteten Mitglieder vorhanden",
+    "invited.none": "Es sind zur Zeit keine weiteren Mitglieder eingeladen",
+    "invited.uninvite": "Einladung zurücknehmen",
+    "invited.search": "Suche nach einem Benutzer um ihn in diese Gruppe aufzunehmen",
    "cover-instructions": "Foto auf eine Position bewegen, und <strong>Speichern</strong> drücken",
    "cover-change": "Ändern",
    "cover-save": "Speichern",
@@ -13,6 +19,7 @@
    "details.title": "Gruppendetails",
    "details.members": "Mitgliederliste",
    "details.pending": "Mitglieder in Schwebe",
+    "details.invited": "Eingeladene Mitglieder",
    "details.has_no_posts": "Die Mitglieder dieser Gruppe haben keine Beiträge verfasst.",
    "details.latest_posts": "Neueste Beiträge",
    "details.private": "Privat",
@@ -31,6 +38,13 @@
    "details.private_help": "Wenn aktiviert, setzt ein Gruppenbeitritt die Zustimmung eines Gruppenbesitzers voraus",
    "details.hidden": "Versteckt",
    "details.hidden_help": "Wenn aktiviert, wird diese Gruppe in der Gruppenliste nicht zu finden sein, und Benutzer werden manuell eingeladen werden müssen.",
+    "details.delete_group": "Gruppe löschen",
    "event.updated": "Gruppendetails wurden aktualisiert",
-    "event.deleted": "Die Gruppe \"%1\" wurde gelöscht."
+    "event.deleted": "Die Gruppe \"%1\" wurde gelöscht.",
+    "membership.accept-invitation": "Einladung akzeptieren",
+    "membership.invitation-pending": "Einladung ausstehend",
+    "membership.join-group": "Gruppe beitreten",
+    "membership.leave-group": "Gruppe verlassen",
+    "membership.reject": "Ablehnen",
+    "new-group.group_name": "Gruppenname:"
 }
--- a/public/language/de/modules.json
+++ b/public/language/de/modules.json
@@ -5,7 +5,7 @@
    "chat.no_active": "Du hast keine aktiven Chats.",
    "chat.user_typing": "%1 tippt gerade ...",
    "chat.user_has_messaged_you": "%1 hat dir geschrieben.",
-    "chat.see_all": "Alle Chats anzeigen",
+    "chat.see_all": "See all chats",
    "chat.no-messages": "Bitte wähle einen Empfänger, um den jeweiligen Nachrichtenverlauf anzuzeigen.",
    "chat.recent-chats": "Aktuelle Chats",
    "chat.contacts": "Kontakte",
@@ -22,5 +22,8 @@
    "composer.user_said": "%1 sagte:",
    "composer.discard": "Bist du sicher, dass du diesen Beitrag verwerfen möchtest?",
    "composer.submit_and_lock": "Einreichen und Sperren",
-    "composer.toggle_dropdown": "Menu aus-/einblenden"
+    "composer.toggle_dropdown": "Menu aus-/einblenden",
+    "bootbox.ok": "OK",
+    "bootbox.cancel": "Cancel",
+    "bootbox.confirm": "Confirm"
 }
--- a/public/language/de/notifications.json
+++ b/public/language/de/notifications.json
@@ -1,7 +1,7 @@
 {
    "title": "Benachrichtigungen",
    "no_notifs": "Du hast keine neuen Benachrichtigungen",
-    "see_all": "Alle Benachrichtigungen ansehen",
+    "see_all": "See all notifications",
    "mark_all_read": "Alle Benachrichtigungen als gelesen markieren",
    "back_to_home": "Zurück zu %1",
    "outgoing_link": "Externer Link",
@@ -20,6 +20,7 @@
    "user_posted_topic": "<strong>%1</strong> hat ein neues Thema erstellt: <strong>%2</strong>",
    "user_mentioned_you_in": "<strong>%1</strong> erwähnte dich in <strong>%2</strong>",
    "user_started_following_you": "<strong>%1</strong> folgt dir jetzt.",
+    "new_register": "<strong>%1</strong> hat eine Registrationsanfrage geschickt.",
    "email-confirmed": "E-Mail bestätigt",
    "email-confirmed-message": "Vielen Dank für Ihre E-Mail-Validierung. Ihr Konto ist nun vollständig aktiviert.",
    "email-confirm-error-message": "Es gab ein Problem bei der Validierung Ihrer E-Mail-Adresse. Möglicherweise ist der Code ungültig oder abgelaufen.",
--- a/public/language/de/pages.json
+++ b/public/language/de/pages.json
@@ -1,21 +1,37 @@
 {
    "home": "Home",
    "unread": "Ungelesene Themen",
-    "popular": "Beliebte Themen",
+    "popular-day": "Popular topics today",
+    "popular-week": "Popular topics this week",
+    "popular-month": "Popular topics this month",
+    "popular-alltime": "All time popular topics",
    "recent": "Neueste Themen",
-    "users": "Registrierte User",
+    "users/online": "Online Users",
+    "users/latest": "Latest Users",
+    "users/sort-posts": "Users with the most posts",
+    "users/sort-reputation": "Users with the most reputation",
+    "users/map": "User Map",
+    "users/search": "User Search",
    "notifications": "Benachrichtigungen",
    "tags": "Markierungen",
    "tag": "Themen markiert unter \"%1\"",
-    "user.edit": "Bearbeite \"%1\"",
-    "user.following": "Nutzer, die %1 folgt",
-    "user.followers": "Nutzer, die %1 folgen",
-    "user.posts": "Beiträge von %1",
-    "user.topics": "Themen von %1",
-    "user.groups": "%1's Gruppen",
-    "user.favourites": "Von %1 favorisierte Beiträge",
-    "user.settings": "Benutzer-Einstellungen",
-    "user.watched": "Themen angeschaut von %1",
+    "register": "Register an account",
+    "login": "Login to your account",
+    "reset": "Reset your account password",
+    "categories": "Categories",
+    "groups": "Groups",
+    "group": "%1 group",
+    "chats": "Chats",
+    "chat": "Chatting with %1",
+    "account/edit": "Editing \"%1\"",
+    "account/following": "People %1 follows",
+    "account/followers": "People who follow %1",
+    "account/posts": "Posts made by %1",
+    "account/topics": "Topics created by %1",
+    "account/groups": "%1's Groups",
+    "account/favourites": "%1's Favourite Posts",
+    "account/settings": "User Settings",
+    "account/watched": "Topics watched by %1",
    "maintenance.text": "%1 befindet sich derzeit in der Wartung. Bitte komm später wieder.",
    "maintenance.messageIntro": "Zusätzlich hat der Administrator diese Nachricht hinterlassen:"
 }
--- a/public/language/de/register.json
+++ b/public/language/de/register.json
@@ -14,5 +14,6 @@
    "register_now_button": "Jetzt registrieren",
    "alternative_registration": "Alternative Registrierung",
    "terms_of_use": "Nutzungsbedingungen",
-    "agree_to_terms_of_use": "Ich stimme den Nutzungsbedingungen zu"
+    "agree_to_terms_of_use": "Ich stimme den Nutzungsbedingungen zu",
+    "registration-added-to-queue": "Deine Registration wurde abgeschickt. Du wirst eine E-Mail erhalten, sobald sie von einem Administrator akzeptiert wird."
 }
--- a/public/language/de/topic.json
+++ b/public/language/de/topic.json
@@ -1,37 +1,37 @@
 {
    "topic": "Thema",
-    "topic_id": "Topic ID",
-    "topic_id_placeholder": "Topic ID eingeben",
-    "no_topics_found": "Keine passenden Themen gefunden.",
+    "topic_id": "Themen-ID",
+    "topic_id_placeholder": "Themen-ID eingeben",
+    "no_topics_found": "Keine passenden Themen gefunden!",
    "no_posts_found": "Keine Beiträge gefunden!",
    "post_is_deleted": "Dieser Beitrag wurde gelöscht!",
-    "topic_is_deleted": "This topic is deleted!",
+    "topic_is_deleted": "Dieses Thema wurde gelöscht!",
    "profile": "Profil",
-    "posted_by": "Geschrieben von %1",
+    "posted_by": "Verfasst von %1",
    "posted_by_guest": "Verfasst von einem Gast",
    "chat": "Chat",
    "notify_me": "Erhalte eine Benachrichtigung bei neuen Antworten zu diesem Thema.",
-    "quote": "zitieren",
-    "reply": "antworten",
+    "quote": "Zitieren",
+    "reply": "Antworten",
    "guest-login-reply": "Anmelden zum Antworten",
-    "edit": "bearbeiten",
-    "delete": "löschen",
-    "purge": "säubern",
+    "edit": "Bearbeiten",
+    "delete": "Löschen",
+    "purge": "Bereinigen",
    "restore": "Wiederherstellen",
-    "move": "verschieben",
+    "move": "Verschieben",
    "fork": "Aufspalten",
    "link": "Link",
    "share": "Teilen",
-    "tools": "Tools",
+    "tools": "Werkzeuge",
    "flag": "Markieren",
    "locked": "Gesperrt",
-    "bookmark_instructions": "Klicke hier um zur letzten Position zurückzukehren oder schließe zum Abbrechen.",
+    "bookmark_instructions": "Klicke hier, um zur letzten Position zurückzukehren oder schließe zum Abbrechen.",
    "flag_title": "Diesen Beitrag zur Moderation markieren",
    "flag_confirm": "Sind Sie sicher, dass Sie diesen Post markieren möchten?",
    "flag_success": "Dieser Beitrag wurde erfolgreich für die Moderation markiert.",
    "deleted_message": "Dieses Thema wurde gelöscht. Nur Nutzer mit entsprechenden Rechten können es sehen.",
    "following_topic.message": "Du erhälst nun eine Benachrichtigung, wenn jemand einen Beitrag zu diesem Thema verfasst.",
-    "not_following_topic.message": "Du erhälst keine weiteren Benachrichtigungen zu diesem Thema.",
+    "not_following_topic.message": "Du erhälst keine weiteren Benachrichtigungen zu diesem Thema mehr.",
    "login_to_subscribe": "Bitte registrieren oder einloggen um dieses Thema zu abonnieren",
    "markAsUnreadForAll.success": "Thema für Alle als ungelesen markiert.",
    "watch": "Beobachten",
@@ -39,10 +39,10 @@
    "watch.title": "Bei neuen Antworten benachrichtigen",
    "unwatch.title": "Dieses Thema nicht mehr beobachten",
    "share_this_post": "Diesen Beitrag teilen",
-    "thread_tools.title": "Themen-Tools",
+    "thread_tools.title": "Themen-Werkzeuge",
    "thread_tools.markAsUnreadForAll": "Als ungelesen markieren",
-    "thread_tools.pin": "Thema anpinnen",
-    "thread_tools.unpin": "Thema nicht mehr anpinnen",
+    "thread_tools.pin": "Thema anheften",
+    "thread_tools.unpin": "Thema nicht mehr anheften",
    "thread_tools.lock": "Thema schließen",
    "thread_tools.unlock": "Thema öffnen",
    "thread_tools.move": "Thema verschieben",
@@ -53,11 +53,11 @@
    "thread_tools.restore": "Thema wiederherstellen",
    "thread_tools.restore_confirm": "Bist du sicher, dass du dieses Thema wiederherstellen möchtest?",
    "thread_tools.purge": "Thema säubern",
-    "thread_tools.purge_confirm": "Bist du sicher, dass du dieses Thema säubern möchtest?",
-    "topic_move_success": "Thema wurde erfolgreich zu %1 verschoben.",
+    "thread_tools.purge_confirm": "Bist du sicher, dass du dieses Thema bereinigen möchtest?",
+    "topic_move_success": "Thema wurde erfolgreich nach %1 verschoben.",
    "post_delete_confirm": "Sind Sie sicher, dass Sie diesen Beitrag löschen möchten?",
    "post_restore_confirm": "Sind Sie sicher, dass Sie diesen Beitrag wiederherstellen möchten?",
-    "post_purge_confirm": "Sind Sie sicher, das Sie diesen Beitrag säubern möchten?",
+    "post_purge_confirm": "Sind Sie sicher, das Sie diesen Beitrag bereinigen möchten?",
    "load_categories": "Kategorien laden",
    "disabled_categories_note": "Deaktivierte Kategorien sind ausgegraut.",
    "confirm_move": "Verschieben",
@@ -72,29 +72,29 @@
    "post_moved": "Beitrag wurde verschoben!",
    "fork_topic": "Thema aufspalten",
    "topic_will_be_moved_to": "Dieses Thema wird verschoben nach",
-    "fork_topic_instruction": "Klicke auf die Beiträge, die du aufspalten willst",
+    "fork_topic_instruction": "Klicke auf die Beiträge, die aufgespaltet werden sollen",
    "fork_no_pids": "Keine Beiträge ausgewählt!",
-    "fork_success": "Thema erfolgreich abgespalten! Klicke hier, um zum abgespalteten Thema zu gelangen.",
+    "fork_success": "Thema erfolgreich aufgespalten! Klicke hier, um zum aufgespalteten Thema zu gelangen.",
    "composer.title_placeholder": "Hier den Titel des Themas eingeben...",
    "composer.handle_placeholder": "Name",
    "composer.discard": "Verwerfen",
    "composer.submit": "Absenden",
    "composer.replying_to": "Antworte auf %1",
    "composer.new_topic": "Neues Thema",
-    "composer.uploading": "Upload läuft...",
+    "composer.uploading": "Lade hoch...",
    "composer.thumb_url_label": "Vorschaubild-URL hier einfügen",
    "composer.thumb_title": "Vorschaubild zu diesem Thema hinzufügen",
    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
    "composer.thumb_file_label": "Oder eine Datei hochladen",
    "composer.thumb_remove": "Felder leeren",
-    "composer.drag_and_drop_images": "Bilder hier reinziehen",
+    "composer.drag_and_drop_images": "Bilder hierher ziehen",
    "more_users_and_guests": "%1 weitere(r) Nutzer und %2 Gäste",
    "more_users": "%1 weitere(r) Nutzer",
    "more_guests": "%1 weitere Gäste",
    "users_and_others": "%1 und %2 andere",
    "sort_by": "Sortieren nach",
    "oldest_to_newest": "Älteste zuerst",
-    "newest_to_oldest": "Neuster zuerst",
+    "newest_to_oldest": "Neuste zuerst",
    "most_votes": "Die meisten Stimmen",
    "most_posts": "Die meisten Beiträge"
 }
--- a/public/language/de/unread.json
+++ b/public/language/de/unread.json
@@ -5,5 +5,6 @@
    "mark_as_read": "Als gelesen markieren",
    "selected": "Ausgewählte",
    "all": "Alle",
+    "all_categories": "Alle Kategorien",
    "topics_marked_as_read.success": "Themen als gelesen markiert!"
 }
--- a/public/language/de/user.json
+++ b/public/language/de/user.json
@@ -6,8 +6,12 @@
    "postcount": "Beiträge",
    "email": "E-Mail",
    "confirm_email": "E-Mail bestätigen",
+    "ban_account": "Konto sperren",
+    "ban_account_confirm": "Sind Sie sicher, dass Sie diesen Benutzer sperren möchten?",
+    "unban_account": "Konto entsperren",
    "delete_account": "Konto löschen",
    "delete_account_confirm": "Bist du sicher, dass du dein Konto löschen möchtest? <br /><strong>Diese Aktion kann nicht rückgängig gemacht werden und du kannst deine Daten nicht wiederherstellen</strong><br /><br />Gebe deinen Benutzernamen ein, um zu bestätigen, dass du dieses Konto löschen möchtest.",
+    "delete_this_account_confirm": "Bist du sicher, dass du dieses Konto löschen möchtest?<br /><strong>Diese Aktion kann nicht rückgangig gemacht werden und du kannst die Daten nicht wiederherstellen</strong><br /><br />",
    "fullname": "Kompletter Name",
    "website": "Homepage",
    "location": "Wohnort",
@@ -21,7 +25,7 @@
    "watched": "Beobachtet",
    "followers": "Folger",
    "following": "Folgt",
-    "aboutme": "About me",
+    "aboutme": "Über mich",
    "signature": "Signatur",
    "gravatar": "Gravatar",
    "birthday": "Geburtstag",
@@ -66,7 +70,7 @@
    "follows_no_one": "Dieser User folgt noch niemandem :(",
    "has_no_posts": "Dieser Nutzer hat noch nichts gepostet.",
    "has_no_topics": "Dieser Nutzer hat noch keine Themen gepostet.",
-    "has_no_watched_topics": "Diese Person beobachtet keine Themen",
+    "has_no_watched_topics": "Dieser Nutzer beobachtet keine Themen.",
    "email_hidden": "E-Mail Adresse versteckt",
    "hidden": "versteckt",
    "paginate_description": "Themen und Beiträge in Seiten aufteilen, anstelle unendlich zu scrollen",
@@ -80,5 +84,6 @@
    "follow_topics_you_reply_to": "Themen folgen, in denen auf dich geantwortet wird",
    "follow_topics_you_create": "Themen folgen, die du erstellst",
    "grouptitle": "Wähle den anzuzeigenden Gruppen Titel aus",
-    "no-group-title": "Kein Gruppentitel"
+    "no-group-title": "Kein Gruppentitel",
+    "select-skin": "Select a Skin"
 }
--- a/Show More
+++ b/Show More