add taskbar to body

updated shrinkwrap file
Merge branch 'master' into v0.4.x
2025-12-17 05:50:25 +01:00 · 2014-04-03 17:30:46 -04:00 · 2014-04-02 09:15:11 -04:00 · 2014-04-02 09:05:46 -04:00 · 2014-04-02 08:56:13 -04:00 · 2014-04-02 08:54:10 -04:00
516 changed files with 19620 additions and 25572 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,8 @@ feeds/recent.rss
 # winston?
 error.log
 events.log
 pidfile
 # templates
 /public/templates
--- a/.tx/config
+++ b/.tx/config
@@ -8,17 +8,23 @@ source_lang = en_GB
 trans.ar = public/language/ar/category.json
 trans.cs = public/language/cs/category.json
 trans.de = public/language/de/category.json
 trans.en@pirate = public/language/en@pirate/category.json
 trans.es = public/language/es/category.json
 trans.fa_IR = public/language/fa_IR/category.json
 trans.fi = public/language/fi/category.json
 trans.fr = public/language/fr/category.json
 trans.he = public/language/he/category.json
 trans.hu = public/language/hu/category.json
 trans.it = public/language/it/category.json
 trans.nb = public/language/nb/category.json
 trans.nl = public/language/nl/category.json
 trans.pl = public/language/pl/category.json
 trans.pt_BR = public/language/pt_BR/category.json
 trans.ru = public/language/ru/category.json
 trans.sc = public/language/sc/category.json
 trans.sk = public/language/sk/category.json
 trans.sv = public/language/sv/category.json
 trans.th = public/language/th/category.json
 trans.tr = public/language/tr/category.json
 trans.zh_CN = public/language/zh_CN/category.json
 trans.zh_TW = public/language/zh_TW/category.json
@@ -31,17 +37,23 @@ source_lang = en_GB
 trans.ar = public/language/ar/login.json
 trans.cs = public/language/cs/login.json
 trans.de = public/language/de/login.json
 trans.en@pirate = public/language/en@pirate/login.json
 trans.es = public/language/es/login.json
 trans.fa_IR = public/language/fa_IR/login.json
 trans.fi = public/language/fi/login.json
 trans.fr = public/language/fr/login.json
 trans.he = public/language/he/login.json
 trans.hu = public/language/hu/login.json
 trans.it = public/language/it/login.json
 trans.nb = public/language/nb/login.json
 trans.nl = public/language/nl/login.json
 trans.pl = public/language/pl/login.json
 trans.pt_BR = public/language/pt_BR/login.json
 trans.ru = public/language/ru/login.json
 trans.sc = public/language/sc/login.json
 trans.sk = public/language/sk/login.json
 trans.sv = public/language/sv/login.json
 trans.th = public/language/th/login.json
 trans.tr = public/language/tr/login.json
 trans.zh_CN = public/language/zh_CN/login.json
 trans.zh_TW = public/language/zh_TW/login.json
@@ -53,17 +65,23 @@ source_lang = en_GB
 trans.ar = public/language/ar/recent.json
 trans.cs = public/language/cs/recent.json
 trans.de = public/language/de/recent.json
 trans.en@pirate = public/language/en@pirate/recent.json
 trans.es = public/language/es/recent.json
 trans.fa_IR = public/language/fa_IR/recent.json
 trans.fi = public/language/fi/recent.json
 trans.fr = public/language/fr/recent.json
 trans.he = public/language/he/recent.json
 trans.hu = public/language/hu/recent.json
 trans.it = public/language/it/recent.json
 trans.nb = public/language/nb/recent.json
 trans.nl = public/language/nl/recent.json
 trans.pl = public/language/pl/recent.json
 trans.pt_BR = public/language/pt_BR/recent.json
 trans.ru = public/language/ru/recent.json
 trans.sc = public/language/sc/recent.json
 trans.sk = public/language/sk/recent.json
 trans.sv = public/language/sv/recent.json
 trans.th = public/language/th/recent.json
 trans.tr = public/language/tr/recent.json
 trans.zh_CN = public/language/zh_CN/recent.json
 trans.zh_TW = public/language/zh_TW/recent.json
@@ -75,17 +93,23 @@ source_lang = en_GB
 trans.ar = public/language/ar/unread.json
 trans.cs = public/language/cs/unread.json
 trans.de = public/language/de/unread.json
 trans.en@pirate = public/language/en@pirate/unread.json
 trans.es = public/language/es/unread.json
 trans.fa_IR = public/language/fa_IR/unread.json
 trans.fi = public/language/fi/unread.json
 trans.fr = public/language/fr/unread.json
 trans.he = public/language/he/unread.json
 trans.hu = public/language/hu/unread.json
 trans.it = public/language/it/unread.json
 trans.nb = public/language/nb/unread.json
 trans.nl = public/language/nl/unread.json
 trans.pl = public/language/pl/unread.json
 trans.pt_BR = public/language/pt_BR/unread.json
 trans.ru = public/language/ru/unread.json
 trans.sc = public/language/sc/unread.json
 trans.sk = public/language/sk/unread.json
 trans.sv = public/language/sv/unread.json
 trans.th = public/language/th/unread.json
 trans.tr = public/language/tr/unread.json
 trans.zh_CN = public/language/zh_CN/unread.json
 trans.zh_TW = public/language/zh_TW/unread.json
@@ -97,17 +121,23 @@ source_lang = en_GB
 trans.ar = public/language/ar/footer.json
 trans.cs = public/language/cs/footer.json
 trans.de = public/language/de/footer.json
 trans.en@pirate = public/language/en@pirate/footer.json
 trans.es = public/language/es/footer.json
 trans.fa_IR = public/language/fa_IR/footer.json
 trans.fi = public/language/fi/footer.json
 trans.fr = public/language/fr/footer.json
 trans.he = public/language/he/footer.json
 trans.hu = public/language/hu/footer.json
 trans.it = public/language/it/footer.json
 trans.nb = public/language/nb/footer.json
 trans.nl = public/language/nl/footer.json
 trans.pl = public/language/pl/footer.json
 trans.pt_BR = public/language/pt_BR/footer.json
 trans.ru = public/language/ru/footer.json
 trans.sc = public/language/sc/footer.json
 trans.sk = public/language/sk/footer.json
 trans.sv = public/language/sv/footer.json
 trans.th = public/language/th/footer.json
 trans.tr = public/language/tr/footer.json
 trans.zh_CN = public/language/zh_CN/footer.json
 trans.zh_TW = public/language/zh_TW/footer.json
@@ -119,17 +149,23 @@ source_lang = en_GB
 trans.ar = public/language/ar/modules.json
 trans.cs = public/language/cs/modules.json
 trans.de = public/language/de/modules.json
 trans.en@pirate = public/language/en@pirate/modules.json
 trans.es = public/language/es/modules.json
 trans.fa_IR = public/language/fa_IR/modules.json
 trans.fi = public/language/fi/modules.json
 trans.fr = public/language/fr/modules.json
 trans.he = public/language/he/modules.json
 trans.hu = public/language/hu/modules.json
 trans.it = public/language/it/modules.json
 trans.nb = public/language/nb/modules.json
 trans.nl = public/language/nl/modules.json
 trans.pl = public/language/pl/modules.json
 trans.pt_BR = public/language/pt_BR/modules.json
 trans.ru = public/language/ru/modules.json
 trans.sc = public/language/sc/modules.json
 trans.sk = public/language/sk/modules.json
 trans.sv = public/language/sv/modules.json
 trans.th = public/language/th/modules.json
 trans.tr = public/language/tr/modules.json
 trans.zh_CN = public/language/zh_CN/modules.json
 trans.zh_TW = public/language/zh_TW/modules.json
@@ -141,17 +177,23 @@ source_lang = en_GB
 trans.ar = public/language/ar/register.json
 trans.cs = public/language/cs/register.json
 trans.de = public/language/de/register.json
 trans.en@pirate = public/language/en@pirate/register.json
 trans.es = public/language/es/register.json
 trans.fa_IR = public/language/fa_IR/register.json
 trans.fi = public/language/fi/register.json
 trans.fr = public/language/fr/register.json
 trans.he = public/language/he/register.json
 trans.hu = public/language/hu/register.json
 trans.it = public/language/it/register.json
 trans.nb = public/language/nb/register.json
 trans.nl = public/language/nl/register.json
 trans.pl = public/language/pl/register.json
 trans.pt_BR = public/language/pt_BR/register.json
 trans.ru = public/language/ru/register.json
 trans.sc = public/language/sc/register.json
 trans.sk = public/language/sk/register.json
 trans.sv = public/language/sv/register.json
 trans.th = public/language/th/register.json
 trans.tr = public/language/tr/register.json
 trans.zh_CN = public/language/zh_CN/register.json
 trans.zh_TW = public/language/zh_TW/register.json
@@ -163,17 +205,23 @@ source_lang = en_GB
 trans.ar = public/language/ar/user.json
 trans.cs = public/language/cs/user.json
 trans.de = public/language/de/user.json
 trans.en@pirate = public/language/en@pirate/user.json
 trans.es = public/language/es/user.json
 trans.fa_IR = public/language/fa_IR/user.json
 trans.fi = public/language/fi/user.json
 trans.fr = public/language/fr/user.json
 trans.he = public/language/he/user.json
 trans.hu = public/language/hu/user.json
 trans.it = public/language/it/user.json
 trans.nb = public/language/nb/user.json
 trans.nl = public/language/nl/user.json
 trans.pl = public/language/pl/user.json
 trans.pt_BR = public/language/pt_BR/user.json
 trans.ru = public/language/ru/user.json
 trans.sc = public/language/sc/user.json
 trans.sk = public/language/sk/user.json
 trans.sv = public/language/sv/user.json
 trans.th = public/language/th/user.json
 trans.tr = public/language/tr/user.json
 trans.zh_CN = public/language/zh_CN/user.json
 trans.zh_TW = public/language/zh_TW/user.json
@@ -185,17 +233,23 @@ source_lang = en_GB
 trans.ar = public/language/ar/global.json
 trans.cs = public/language/cs/global.json
 trans.de = public/language/de/global.json
 trans.en@pirate = public/language/en@pirate/global.json
 trans.es = public/language/es/global.json
 trans.fa_IR = public/language/fa_IR/global.json
 trans.fi = public/language/fi/global.json
 trans.fr = public/language/fr/global.json
 trans.he = public/language/he/global.json
 trans.hu = public/language/hu/global.json
 trans.it = public/language/it/global.json
 trans.nb = public/language/nb/global.json
 trans.nl = public/language/nl/global.json
 trans.pl = public/language/pl/global.json
 trans.pt_BR = public/language/pt_BR/global.json
 trans.ru = public/language/ru/global.json
 trans.sc = public/language/sc/global.json
 trans.sk = public/language/sk/global.json
 trans.sv = public/language/sv/global.json
 trans.th = public/language/th/global.json
 trans.tr = public/language/tr/global.json
 trans.zh_CN = public/language/zh_CN/global.json
 trans.zh_TW = public/language/zh_TW/global.json
@@ -207,17 +261,23 @@ source_lang = en_GB
 trans.ar = public/language/ar/notifications.json
 trans.cs = public/language/cs/notifications.json
 trans.de = public/language/de/notifications.json
 trans.en@pirate = public/language/en@pirate/notifications.json
 trans.es = public/language/es/notifications.json
 trans.fa_IR = public/language/fa_IR/notifications.json
 trans.fi = public/language/fi/notifications.json
 trans.fr = public/language/fr/notifications.json
 trans.he = public/language/he/notifications.json
 trans.hu = public/language/hu/notifications.json
 trans.it = public/language/it/notifications.json
 trans.nb = public/language/nb/notifications.json
 trans.nl = public/language/nl/notifications.json
 trans.pl = public/language/pl/notifications.json
 trans.pt_BR = public/language/pt_BR/notifications.json
 trans.ru = public/language/ru/notifications.json
 trans.sc = public/language/sc/notifications.json
 trans.sk = public/language/sk/notifications.json
 trans.sv = public/language/sv/notifications.json
 trans.th = public/language/th/notifications.json
 trans.tr = public/language/tr/notifications.json
 trans.zh_CN = public/language/zh_CN/notifications.json
 trans.zh_TW = public/language/zh_TW/notifications.json
@@ -229,17 +289,23 @@ source_lang = en_GB
 trans.ar = public/language/ar/reset_password.json
 trans.cs = public/language/cs/reset_password.json
 trans.de = public/language/de/reset_password.json
 trans.en@pirate = public/language/en@pirate/reset_password.json
 trans.es = public/language/es/reset_password.json
 trans.fa_IR = public/language/fa_IR/reset_password.json
 trans.fi = public/language/fi/reset_password.json
 trans.fr = public/language/fr/reset_password.json
 trans.he = public/language/he/reset_password.json
 trans.hu = public/language/hu/reset_password.json
 trans.it = public/language/it/reset_password.json
 trans.nb = public/language/nb/reset_password.json
 trans.nl = public/language/nl/reset_password.json
 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.sc = public/language/sc/reset_password.json
 trans.sk = public/language/sk/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
 trans.zh_CN = public/language/zh_CN/reset_password.json
 trans.zh_TW = public/language/zh_TW/reset_password.json
@@ -251,17 +317,23 @@ source_lang = en_GB
 trans.ar = public/language/ar/users.json
 trans.cs = public/language/cs/users.json
 trans.de = public/language/de/users.json
 trans.en@pirate = public/language/en@pirate/users.json
 trans.es = public/language/es/users.json
 trans.fa_IR = public/language/fa_IR/users.json
 trans.fi = public/language/fi/users.json
 trans.fr = public/language/fr/users.json
 trans.he = public/language/he/users.json
 trans.hu = public/language/hu/users.json
 trans.it = public/language/it/users.json
 trans.nb = public/language/nb/users.json
 trans.nl = public/language/nl/users.json
 trans.pl = public/language/pl/users.json
 trans.pt_BR = public/language/pt_BR/users.json
 trans.ru = public/language/ru/users.json
 trans.sc = public/language/sc/users.json
 trans.sk = public/language/sk/users.json
 trans.sv = public/language/sv/users.json
 trans.th = public/language/th/users.json
 trans.tr = public/language/tr/users.json
 trans.zh_CN = public/language/zh_CN/users.json
 trans.zh_TW = public/language/zh_TW/users.json
@@ -273,17 +345,23 @@ source_lang = en_GB
 trans.ar = public/language/ar/language.json
 trans.cs = public/language/cs/language.json
 trans.de = public/language/de/language.json
 trans.en@pirate = public/language/en@pirate/language.json
 trans.es = public/language/es/language.json
 trans.fa_IR = public/language/fa_IR/language.json
 trans.fi = public/language/fi/language.json
 trans.fr = public/language/fr/language.json
 trans.he = public/language/he/language.json
 trans.hu = public/language/hu/language.json
 trans.it = public/language/it/language.json
 trans.nb = public/language/nb/language.json
 trans.nl = public/language/nl/language.json
 trans.pl = public/language/pl/language.json
 trans.pt_BR = public/language/pt_BR/language.json
 trans.ru = public/language/ru/language.json
 trans.sc = public/language/sc/language.json
 trans.sk = public/language/sk/language.json
 trans.sv = public/language/sv/language.json
 trans.th = public/language/th/language.json
 trans.tr = public/language/tr/language.json
 trans.zh_CN = public/language/zh_CN/language.json
 trans.zh_TW = public/language/zh_TW/language.json
@@ -295,17 +373,23 @@ source_lang = en_GB
 trans.ar = public/language/ar/pages.json
 trans.cs = public/language/cs/pages.json
 trans.de = public/language/de/pages.json
 trans.en@pirate = public/language/en@pirate/pages.json
 trans.es = public/language/es/pages.json
 trans.fa_IR = public/language/fa_IR/pages.json
 trans.fi = public/language/fi/pages.json
 trans.fr = public/language/fr/pages.json
 trans.he = public/language/he/pages.json
 trans.hu = public/language/hu/pages.json
 trans.it = public/language/it/pages.json
 trans.nb = public/language/nb/pages.json
 trans.nl = public/language/nl/pages.json
 trans.pl = public/language/pl/pages.json
 trans.pt_BR = public/language/pt_BR/pages.json
 trans.ru = public/language/ru/pages.json
 trans.sc = public/language/sc/pages.json
 trans.sk = public/language/sk/pages.json
 trans.sv = public/language/sv/pages.json
 trans.th = public/language/th/pages.json
 trans.tr = public/language/tr/pages.json
 trans.zh_CN = public/language/zh_CN/pages.json
 trans.zh_TW = public/language/zh_TW/pages.json
@@ -317,17 +401,23 @@ source_lang = en_GB
 trans.ar = public/language/ar/topic.json
 trans.cs = public/language/cs/topic.json
 trans.de = public/language/de/topic.json
 trans.en@pirate = public/language/en@pirate/topic.json
 trans.es = public/language/es/topic.json
 trans.fa_IR = public/language/fa_IR/topic.json
 trans.fi = public/language/fi/topic.json
 trans.fr = public/language/fr/topic.json
 trans.he = public/language/he/topic.json
 trans.hu = public/language/hu/topic.json
 trans.it = public/language/it/topic.json
 trans.nb = public/language/nb/topic.json
 trans.nl = public/language/nl/topic.json
 trans.pl = public/language/pl/topic.json
 trans.pt_BR = public/language/pt_BR/topic.json
 trans.ru = public/language/ru/topic.json
 trans.sc = public/language/sc/topic.json
 trans.sk = public/language/sk/topic.json
 trans.sv = public/language/sv/topic.json
 trans.th = public/language/th/topic.json
 trans.tr = public/language/tr/topic.json
 trans.zh_CN = public/language/zh_CN/topic.json
 trans.zh_TW = public/language/zh_TW/topic.json
--- a/ATTRIBUTION.md
+++ b/ATTRIBUTION.md
@@ -0,0 +1,4 @@
 ## Sound Assets
 * "Waterdrop" by [Porphyr](freesound.org/people/Porphyr) / [CC BY 3.0](creativecommons.org/licenses/by/3.0)
 * "SweetAlertSound2.wav" by [KIZILSUNGUR](http://www.freesound.org/people/KIZILSUNGUR/) / [Public Domain / CC 0](http://creativecommons.org/publicdomain/zero/1.0/)
--- a/NOTES.md
+++ b/NOTES.md
@@ -0,0 +1,15 @@
 ## 0.4x Refactor Notes
 Please remove this file after 0.4x (or perhaps organize it so that we can see the history of breaking changes)
 ### Immediate Deprecation Notices
 * `action:ajaxifying` is no longer triggered on body but on window instead, in line with other similar hooks.
 * `filter:server.create_routes` and `filter:admin.create_routes` will have limited support (ajaxify works, but first-load will not). Please have a look at [this plugin](https://github.com/psychobunny/nodebb-plugin-kitchen-sink/blob/master/library.js#L16-L22) for an example on how to create routes in plugins from now on.
 ### Upcoming Deprecation Warnings
 * `filter:footer.build` will be deprecated for 0.4x in favour of the widget system (WIP)
 * templates.setGlobal (server-side only) deprecated in favour of using res.locals
 * `plugins/fireHook` route will be deprecated for 0.4x
 * synchronous hooks will be deprecated for 0.4x - we're reducing complexity by removing the `callbacked: true` property in `plugin.json` - just use callbacks.
--- a/README.md
+++ b/README.md
@@ -1,4 +1,7 @@
 # <img alt="NodeBB" src="http://i.imgur.com/3yj1n6N.png" />
 [![Dependency Status](https://david-dm.org/designcreateplay/nodebb.png)](https://david-dm.org/designcreateplay/nodebb)
 [![Code Climate](https://codeclimate.com/github/designcreateplay/NodeBB.png)](https://codeclimate.com/github/designcreateplay/NodeBB)
 **NodeBB Forum Software** is powered by Node.js and built on a Redis 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.
 * [Get NodeBB](http://www.nodebb.org/ "NodeBB")
@@ -11,9 +14,10 @@
 * [Get Plugins](http://community.nodebb.org/category/7/nodebb-plugins "NodeBB Plugins")
 * [Get Themes](http://community.nodebb.org/category/10/nodebb-themes "NodeBB Themes")
-## Screenshots 
+## 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/8vc1Ytc.png" />](http://i.imgur.com/8vc1Ytc.png)
 [<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)
 Credit: [Convoe](http://www.convoe.com), [Kano](http://www.kano.me), [Manchester United Forum](http://manutdforums.com/).
@@ -35,38 +39,7 @@ NodeBB requires the following software to be installed:
 ## Installation
-First, we install our base software stack:
+[Please refer to platform-specific installation documentation](https://github.com/designcreateplay/NodeBB/wiki#wiki-installing-nodebb)
 	# apt-get install git nodejs redis-server build-essential imagemagick
 If you want to use MongoDB instead of Redis install it from http://www.mongodb.org/downloads and remove 'redis-server' from the above command. [MongoDB-Setup](https://github.com/designcreateplay/NodeBB/wiki/Installing-NodeBB-With-MongoDB)
 **If your package manager only installed a version of Node.js that is less than 0.8 (e.g. Ubuntu 12.10, 13.04):**
 	# add-apt-repository ppa:chris-lea/node.js
 	# apt-get update && apt-get dist-upgrade
 Next, clone this repository:
 	$ cd /path/to/nodebb/install/location
 	$ git clone git://github.com/designcreateplay/NodeBB.git nodebb
 Obtain all of the dependencies required by NodeBB:
    $ cd nodebb
    $ npm install
 Initiate the setup script by running the app with the `--setup` flag:
    $ ./nodebb setup
 The default settings are for a local server running on the default port, with a redis store on the same machine/port.
 Lastly, we run the forum.
    $ ./nodebb start
 NodeBB can also be started with helper programs, such as `supervisor` and `forever`. [Take a look at the options here](https://github.com/designcreateplay/NodeBB/wiki/How-to-run-NodeBB).
 ## Securing NodeBB
--- a/app.js
+++ b/app.js
@@ -66,40 +66,48 @@ winston.info('');
 var	configFile = __dirname + '/config.json',
 	configExists;
 if (nconf.get('config')) {
-	configFile = path.join(__dirname, nconf.get('config'));
+	configFile = path.resolve(__dirname, nconf.get('config'));
 }
 configExists = fs.existsSync(configFile);
-if (!nconf.get('help') && !nconf.get('setup') && !nconf.get('install') && !nconf.get('upgrade') && configExists) {
+if (!nconf.get('help') && !nconf.get('setup') && !nconf.get('install') && !nconf.get('upgrade') && !nconf.get('reset') && configExists) {
 	start();
 } else if (nconf.get('setup') || nconf.get('install') || !configExists) {
 	setup();
 } else if (nconf.get('upgrade')) {
 	upgrade();
-} else/* if (nconf.get('help') */{
+} else if (nconf.get('reset')) {
 	reset();
 } else {
 	displayHelp();
-};
+}
-
+function loadConfig() {
 function start() {
 	nconf.file({
-		file: __dirname + '/config.json'
+		file: configFile
 	});
 	nconf.defaults({
 		themes_path: path.join(__dirname, 'node_modules')
 	});
 	nconf.set('url', nconf.get('base_url') + (nconf.get('use_port') ? ':' + nconf.get('port') : '') + nconf.get('relative_path'));
 	nconf.set('upload_url', path.join(path.sep, nconf.get('relative_path'), 'uploads', path.sep));
 	nconf.set('base_dir', __dirname);
 	// Ensure themes_path is a full filepath
 	nconf.set('themes_path', path.resolve(__dirname, nconf.get('themes_path')));
 }
 function start() {
 	loadConfig();
 	nconf.set('url', nconf.get('base_url') + (nconf.get('use_port') ? ':' + nconf.get('port') : '') + nconf.get('relative_path'));
 	nconf.set('upload_url', path.join(path.sep, 'uploads', path.sep));
 	nconf.set('base_dir', __dirname);
 	nconf.set('views_dir', path.join(__dirname, 'public/templates'));
 	winston.info('Time: ' + new Date());
 	winston.info('Initializing NodeBB v' + pkg.version);
-	winston.info('* using ' + nconf.get('database') +' store at ' + nconf.get(nconf.get('database') + ':host') + ':' + nconf.get(nconf.get('database') + ':port'));
+	winston.info('* using configuration stored in: ' + configFile);
 	var host = nconf.get(nconf.get('database') + ':host');
 	winston.info('* using ' + nconf.get('database') +' store at ' + host + (host.indexOf('/') === -1 ? ':' + nconf.get(nconf.get('database') + ':port') : ''));
 	winston.info('* using themes stored in: ' + nconf.get('themes_path'));
 	if (process.env.NODE_ENV === 'development') {
@@ -110,42 +118,41 @@ function start() {
 	require('./src/database').init(function(err) {
 		meta.configs.init(function () {
 			var templates = require('./public/src/templates'),
 				translator = require('./public/src/translator'),
 				webserver = require('./src/webserver'),
 				sockets = require('./src/socket.io'),
 				plugins = require('./src/plugins'),
 				notifications = require('./src/notifications'),
 				upgrade = require('./src/upgrade');
 			templates.setGlobal('relative_path', nconf.get('relative_path'));
 			upgrade.check(function(schema_ok) {
 				if (schema_ok || nconf.get('check-schema') === false) {
 					sockets.init(webserver.server);
 					plugins.init();
 					translator.loadServer();
-					var customTemplates = meta.config['theme:templates'] ? path.join(nconf.get('themes_path'), meta.config['theme:id'], meta.config['theme:templates']) : false;
+					nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-vanilla/templates'));
-
+					nconf.set('theme_templates_path', meta.config['theme:templates'] ? path.join(nconf.get('themes_path'), meta.config['theme:id'], meta.config['theme:templates']) : nconf.get('base_templates_path'));
 					utils.walk(path.join(__dirname, 'public/templates'), function (err, tplsToLoad) {
 						templates.init(tplsToLoad, customTemplates);
 					});
 					plugins.ready(function() {
-						templates.ready(webserver.init);
+						webserver.init();
 					});
-					notifications.init();
+					process.on('SIGTERM', shutdown);
 					process.on('SIGINT', shutdown);
 					process.on('SIGHUP', restart);
 					process.on('uncaughtException', function(err) {
 						winston.error('[app] Encountered Uncaught Exception: ' + err.message);
 						console.log(err.stack);
 						restart();
 					});
 				} else {
 					winston.warn('Your NodeBB schema is out-of-date. Please run the following command to bring your dataset up to spec:');
 					winston.warn('    node app --upgrade');
 					winston.warn('To ignore this error (not recommended):');
-					winston.warn('    node app --no-check-schema')
+					winston.warn('    node app --no-check-schema');
 					process.exit();
 				}
 			});
@@ -154,16 +161,14 @@ function start() {
 }
 function setup() {
 	loadConfig();
 	if (nconf.get('setup')) {
 		winston.info('NodeBB Setup Triggered via Command Line');
 	} else {
 		winston.warn('Configuration not found, starting NodeBB setup');
 	}
 	nconf.file({
 		file: __dirname + '/config.json'
 	});
 	var install = require('./src/install');
 	winston.info('Welcome to NodeBB!');
@@ -182,9 +187,7 @@ function setup() {
 }
 function upgrade() {
-	nconf.file({
+	loadConfig();
 		file: __dirname + '/config.json'
 	});
 	var meta = require('./src/meta');
@@ -195,6 +198,63 @@ function upgrade() {
 	});
 }
 function reset() {
 	loadConfig();
 	var meta = require('./src/meta'),
 		db = require('./src/database'),
 		async = require('async');
 	db.init(function(err) {
 		meta.configs.init(function () {
 			async.parallel([
 				function(next) {
 					db.delete('plugins:active', next);
 				},
 				function(next) {
 					meta.configs.set('theme:type', 'local', next);
 				},
 				function(next) {
 					meta.configs.set('theme:id', 'nodebb-theme-vanilla', next);
 				},
 				function(next) {
 					meta.configs.set('theme:staticDir', '', next);
 				},
 				function(next) {
 					meta.configs.set('theme:templates', '', next);
 				}
 			], function(err) {
 				if (err) {
 					winston.error(err);
 				} else {
 					winston.info("Successfully reset theme to Vanilla and disabled all plugins.");
 				}
 				process.exit();
 			});
 		});
 	});
 }
 function shutdown(code) {
 	winston.info('[app] Shutdown (SIGTERM/SIGINT) Initialised.');
 	require('./src/database').close();
 	winston.info('[app] Database connection closed.');
 	winston.info('[app] Shutdown complete.');
 	process.exit();
 }
 function restart() {
 	if (process.send) {
 		winston.info('[app] Restarting...');
 		process.send('nodebb:restart');
 	} else {
 		winston.error('[app] Could not restart server. Shutting down.');
 		shutdown();
 	}
 }
 function displayHelp() {
 	winston.info('Usage: node app [options] [arguments]');
 	winston.info('       [NODE_ENV=development | NODE_ENV=production] node app [--start] [arguments]');
@@ -203,5 +263,6 @@ function displayHelp() {
 	winston.info('  --help              displays this usage information');
 	winston.info('  --setup             configure your environment and setup NodeBB');
 	winston.info('  --upgrade           upgrade NodeBB, first read: github.com/designcreateplay/NodeBB/wiki/Upgrading-NodeBB');
 	winston.info('  --reset             soft resets NodeBB; disables all plugins and restores selected theme to Vanilla');
 	winston.info('  --start             manually start NodeBB (default when no options are given)');
 }
--- a/loader.js
+++ b/loader.js
@@ -0,0 +1,76 @@
 "use strict";
 var	nconf = require('nconf'),
 	fs = require('fs'),
 	pidFilePath = __dirname + '/pidfile',
 	start = function() {
 		var	fork = require('child_process').fork,
 			nbb_start = function() {
 				nbb = fork('./app', process.argv.slice(2), {
 						env: {
 							'NODE_ENV': process.env.NODE_ENV
 						}
 					});
 				nbb.on('message', function(cmd) {
 					if (cmd === 'nodebb:restart') {
 						nbb_restart();
 					}
 				});
 			},
 			nbb_stop = function() {
 				nbb.kill();
 				if (fs.existsSync(pidFilePath)) {
 					var	pid = parseInt(fs.readFileSync(pidFilePath, { encoding: 'utf-8' }), 10);
 					if (process.pid === pid) {
 						fs.unlinkSync(pidFilePath);
 					}
 				}
 			},
 			nbb_restart = function() {
 				nbb.on('exit', function() {
 					nbb_start();
 				});
 				nbb.kill();
 			};
 		process.on('SIGINT', nbb_stop);
 		process.on('SIGTERM', nbb_stop);
 		process.on('SIGHUP', nbb_restart);
 		nbb_start();
 	},
 	nbb;
 nconf.argv();
 // Start the daemon!
 if (nconf.get('d')) {
 	// Check for a still-active NodeBB process
 	if (fs.existsSync(pidFilePath)) {
 		try {
 			var	pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
 			process.kill(pid, 0);
 			console.log('\n  Error: Another NodeBB is already running!');
 			process.exit();
 		} catch (e) {
 			fs.unlinkSync(pidFilePath);
 		}
 	}
 	// Initialise logging streams
 	var	outputStream = fs.createWriteStream(__dirname + '/logs/output.log');
 	outputStream.on('open', function(fd) {
 		// Daemonize
 		require('daemon')({
 			stdout: fd
 		});
 		// Write its pid to a pidfile
 		fs.writeFile(__dirname + '/pidfile', process.pid);
 		start();
 	});
 } else {
 	start();
 }
--- a/logs/.gitignore
+++ b/logs/.gitignore
@@ -0,0 +1 @@
 *.log
--- a/mocks/databasemock.js
+++ b/mocks/databasemock.js
@@ -55,23 +55,29 @@
 	nconf.set(dbType, testDbConfig);
-	db = require('../src/database');
+	var db = require('../src/database'),
 		meta = require('../src/meta');
 	before(function(done) {
 		db.init(function(err) {
 			//Clean up
 			db.flushdb(function(err) {
-				if(err){
+				if(err) {
 					winston.error(err);
 					throw new Error(err);
 				} else {
 					winston.info('test_database flushed');
 					done();
 				}
-				//TODO: data seeding, if needed at all
+				winston.info('test_database flushed');
 				meta.configs.init(function () {
 					var	webserver = require('../src/webserver'),
 						sockets = require('../src/socket.io');
 						sockets.init(webserver.server);
 					done();
 				});
 			});
 		});
 	});
--- a/93
+++ b/93
@@ -4,64 +4,105 @@
 # $1 action
 # $2 subaction
 function pidExists() {
 	if [ -e "pidfile" ];
 		then
 			kill -s 0 $(cat pidfile);
 			if [ !$? ];
 				then return 1;
 				else return 0;
 			fi
 		else
 			return 0;
 	fi
 }
 case "$1" in
 	start)
-		node app "$@"
+		echo "Starting NodeBB";
 		echo "  \"./nodebb stop\" to stop the NodeBB server";
 		echo "  \"./nodebb log\" to view server output";
 		echo "" > ./logs/output.log;
 		node loader -d "$@"
 		;;
 	stop)
 		echo "Stopping NodeBB. Goodbye!";
 		kill $(cat pidfile);
 		;;
 	reload|restart)
 		echo "Restarting NodeBB.";
 		kill -1 $(cat pidfile);
 		;;
 	status)
 		pidExists;
 		if [ 0 -eq $? ];
 			then
 				echo "NodeBB is not running";
 				echo "  \"./nodebb start\" to launch the NodeBB server";
 				return 1;
 			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";
 				return 0;
 		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
-		node app --upgrade
+		node loader --upgrade
 		touch package.json
 		echo -e "\n\e[00;32mNodeBB Dependencies up-to-date!\e[00;00m";
 		;;
 	setup)
-		node app --setup
+		node loader --setup "$@"
 		;;
 	reset)
 		node loader --reset
 		;;
 	dev)
 		echo "Launching NodeBB in \"development\" mode."
 		echo "To run the production build of NodeBB, please use \"forever\"."
 		echo "More Information: https://github.com/designcreateplay/NodeBB/wiki/How-to-run-NodeBB"
-		NODE_ENV=development node app "$@"
+		NODE_ENV=development node loader "$@"
 		;;
 	watch)
 		echo "Launching NodeBB in \"development\" mode."
 		echo "To run the production build of NodeBB, please use \"forever\"."
 		echo "More Information: https://github.com/designcreateplay/NodeBB/wiki/How-to-run-NodeBB"
-		NODE_ENV=development supervisor -q --extensions 'node|js|tpl' -- app "$@"
+		NODE_ENV=development supervisor -q --ignore public/templates --extensions 'node|js|tpl' -- app "$@"
 		;;
 	# language)
 	# 	case "$2" in
 	# 		check)
 	# 			node app --language="check"
 	# 			;;
 	# 		*)
 	# 			echo "Language Settings"
 	# 			echo $"Usage: $0 language {check}"
 	# 			echo ''
 	# 			column -s '	' -t <<< '
 	# 			check	Compare language files against the /en directory
 	# 			'
 	# 			;;
 	# 	esac
 	# 	;;
 	*)
 		echo "Welcome to NodeBB"
-		echo $"Usage: $0 {start|dev|watch|language}"
+		echo $"Usage: $0 {start|stop|reload|restart|log|setup|reset|upgrade|dev|watch}"
 		echo ''
 		column -s '	' -t <<< '
-		start	Start NodeBB in production mode
+		start	Start the NodeBB server
-		dev	Start NodeBB in development mode
+		stop	Stops the NodeBB server
-		watch	Start NodeBB in development mode and watch for changes
+		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
@@ -0,0 +1,950 @@
 {
  "name": "nodebb",
  "version": "0.4.0",
  "dependencies": {
    "async": {
      "version": "0.2.10",
      "from": "async@~0.2.8"
    },
    "bcryptjs": {
      "version": "0.7.12",
      "from": "bcryptjs@~0.7.10"
    },
    "connect-mongo": {
      "version": "0.4.0",
      "from": "connect-mongo@0.4.0"
    },
    "connect-redis": {
      "version": "1.4.5",
      "from": "connect-redis@1.4.5",
      "dependencies": {
        "redis": {
          "version": "0.7.3",
          "from": "redis@0.7.x"
        },
        "debug": {
          "version": "0.8.0",
          "from": "debug@*"
        }
      }
    },
    "cron": {
      "version": "1.0.4",
      "from": "cron@~1.0.4"
    },
    "daemon": {
      "version": "1.1.0",
      "from": "daemon@~1.1.0"
    },
    "express": {
      "version": "3.2.0",
      "from": "express@3.2.0",
      "dependencies": {
        "connect": {
          "version": "2.7.6",
          "from": "connect@2.7.6",
          "dependencies": {
            "qs": {
              "version": "0.5.1",
              "from": "qs@0.5.1"
            },
            "formidable": {
              "version": "1.0.11",
              "from": "formidable@1.0.11"
            },
            "buffer-crc32": {
              "version": "0.1.1",
              "from": "buffer-crc32@0.1.1"
            },
            "bytes": {
              "version": "0.2.0",
              "from": "bytes@0.2.0"
            },
            "pause": {
              "version": "0.0.1",
              "from": "pause@0.0.1"
            }
          }
        },
        "commander": {
          "version": "0.6.1",
          "from": "commander@0.6.1"
        },
        "range-parser": {
          "version": "0.0.4",
          "from": "range-parser@0.0.4"
        },
        "cookie": {
          "version": "0.0.5",
          "from": "cookie@0.0.5"
        },
        "buffer-crc32": {
          "version": "0.2.1",
          "from": "buffer-crc32@~0.2.1"
        },
        "fresh": {
          "version": "0.1.0",
          "from": "fresh@0.1.0"
        },
        "methods": {
          "version": "0.0.1",
          "from": "methods@0.0.1"
        },
        "send": {
          "version": "0.1.0",
          "from": "send@0.1.0",
          "dependencies": {
            "mime": {
              "version": "1.2.6",
              "from": "mime@1.2.6"
            }
          }
        },
        "cookie-signature": {
          "version": "1.0.1",
          "from": "cookie-signature@1.0.1"
        },
        "debug": {
          "version": "0.8.0",
          "from": "debug@*"
        }
      }
    },
    "express-namespace": {
      "version": "0.1.1",
      "from": "express-namespace@~0.1.1",
      "dependencies": {
        "methods": {
          "version": "0.0.1",
          "from": "methods@0.0.1"
        }
      }
    },
    "gm": {
      "version": "1.14.2",
      "from": "gm@1.14.2",
      "dependencies": {
        "debug": {
          "version": "0.7.0",
          "from": "debug@0.7.0"
        },
        "array-series": {
          "version": "0.1.5",
          "from": "array-series@~0.1.0"
        },
        "array-parallel": {
          "version": "0.1.3",
          "from": "array-parallel@~0.1.0"
        },
        "stream-to-buffer": {
          "version": "0.0.1",
          "from": "stream-to-buffer@~0.0.1"
        },
        "through": {
          "version": "2.3.4",
          "from": "through@~2.3.1"
        }
      }
    },
    "gravatar": {
      "version": "1.0.6",
      "from": "gravatar@1.0.6"
    },
    "hiredis": {
      "version": "0.1.16",
      "from": "hiredis@~0.1.15",
      "dependencies": {
        "bindings": {
          "version": "1.1.1",
          "from": "bindings@*"
        }
      }
    },
    "less": {
      "version": "1.6.3",
      "from": "less@~1.6.3",
      "dependencies": {
        "mime": {
          "version": "1.2.11",
          "from": "mime@1.2.x"
        },
        "request": {
          "version": "2.34.0",
          "from": "request@>=2.12.0",
          "dependencies": {
            "qs": {
              "version": "0.6.6",
              "from": "qs@~0.6.0"
            },
            "json-stringify-safe": {
              "version": "5.0.0",
              "from": "json-stringify-safe@~5.0.0"
            },
            "forever-agent": {
              "version": "0.5.2",
              "from": "forever-agent@~0.5.0"
            },
            "node-uuid": {
              "version": "1.4.1",
              "from": "node-uuid@~1.4.0"
            },
            "tough-cookie": {
              "version": "0.12.1",
              "from": "tough-cookie@>=0.12.0",
              "dependencies": {
                "punycode": {
                  "version": "1.2.4",
                  "from": "punycode@>=0.2.0"
                }
              }
            },
            "form-data": {
              "version": "0.1.2",
              "from": "form-data@~0.1.0",
              "dependencies": {
                "combined-stream": {
                  "version": "0.0.4",
                  "from": "combined-stream@~0.0.4",
                  "dependencies": {
                    "delayed-stream": {
                      "version": "0.0.5",
                      "from": "delayed-stream@0.0.5"
                    }
                  }
                }
              }
            },
            "tunnel-agent": {
              "version": "0.3.0",
              "from": "tunnel-agent@~0.3.0"
            },
            "http-signature": {
              "version": "0.10.0",
              "from": "http-signature@~0.10.0",
              "dependencies": {
                "assert-plus": {
                  "version": "0.1.2",
                  "from": "assert-plus@0.1.2"
                },
                "asn1": {
                  "version": "0.1.11",
                  "from": "asn1@0.1.11"
                },
                "ctype": {
                  "version": "0.5.2",
                  "from": "ctype@0.5.2"
                }
              }
            },
            "oauth-sign": {
              "version": "0.3.0",
              "from": "oauth-sign@~0.3.0"
            },
            "hawk": {
              "version": "1.0.0",
              "from": "hawk@~1.0.0",
              "dependencies": {
                "hoek": {
                  "version": "0.9.1",
                  "from": "hoek@0.9.x"
                },
                "boom": {
                  "version": "0.4.2",
                  "from": "boom@0.4.x"
                },
                "cryptiles": {
                  "version": "0.2.2",
                  "from": "cryptiles@0.2.x"
                },
                "sntp": {
                  "version": "0.2.4",
                  "from": "sntp@0.2.x"
                }
              }
            },
            "aws-sign2": {
              "version": "0.5.0",
              "from": "aws-sign2@~0.5.0"
            }
          }
        },
        "clean-css": {
          "version": "2.0.8",
          "from": "clean-css@2.0.x",
          "dependencies": {
            "commander": {
              "version": "2.0.0",
              "from": "commander@2.0.x"
            }
          }
        },
        "source-map": {
          "version": "0.1.33",
          "from": "source-map@0.1.x",
          "dependencies": {
            "amdefine": {
              "version": "0.1.0",
              "from": "amdefine@>=0.0.4"
            }
          }
        }
      }
    },
    "less-middleware": {
      "version": "0.1.12",
      "from": "less-middleware@0.1.12",
      "dependencies": {
        "less": {
          "version": "1.4.2",
          "from": "less@~1.4",
          "dependencies": {
            "mime": {
              "version": "1.2.11",
              "from": "mime@1.2.x"
            },
            "request": {
              "version": "2.34.0",
              "from": "request@>=2.12.0",
              "dependencies": {
                "qs": {
                  "version": "0.6.6",
                  "from": "qs@~0.6.0"
                },
                "json-stringify-safe": {
                  "version": "5.0.0",
                  "from": "json-stringify-safe@~5.0.0"
                },
                "forever-agent": {
                  "version": "0.5.2",
                  "from": "forever-agent@~0.5.0"
                },
                "node-uuid": {
                  "version": "1.4.1",
                  "from": "node-uuid@~1.4.0"
                },
                "tough-cookie": {
                  "version": "0.12.1",
                  "from": "tough-cookie@>=0.12.0",
                  "dependencies": {
                    "punycode": {
                      "version": "1.2.4",
                      "from": "punycode@>=0.2.0"
                    }
                  }
                },
                "form-data": {
                  "version": "0.1.2",
                  "from": "form-data@~0.1.0",
                  "dependencies": {
                    "combined-stream": {
                      "version": "0.0.4",
                      "from": "combined-stream@~0.0.4",
                      "dependencies": {
                        "delayed-stream": {
                          "version": "0.0.5",
                          "from": "delayed-stream@0.0.5"
                        }
                      }
                    }
                  }
                },
                "tunnel-agent": {
                  "version": "0.3.0",
                  "from": "tunnel-agent@~0.3.0"
                },
                "http-signature": {
                  "version": "0.10.0",
                  "from": "http-signature@~0.10.0",
                  "dependencies": {
                    "assert-plus": {
                      "version": "0.1.2",
                      "from": "assert-plus@0.1.2"
                    },
                    "asn1": {
                      "version": "0.1.11",
                      "from": "asn1@0.1.11"
                    },
                    "ctype": {
                      "version": "0.5.2",
                      "from": "ctype@0.5.2"
                    }
                  }
                },
                "oauth-sign": {
                  "version": "0.3.0",
                  "from": "oauth-sign@~0.3.0"
                },
                "hawk": {
                  "version": "1.0.0",
                  "from": "hawk@~1.0.0",
                  "dependencies": {
                    "hoek": {
                      "version": "0.9.1",
                      "from": "hoek@0.9.x"
                    },
                    "boom": {
                      "version": "0.4.2",
                      "from": "boom@0.4.x"
                    },
                    "cryptiles": {
                      "version": "0.2.2",
                      "from": "cryptiles@0.2.x"
                    },
                    "sntp": {
                      "version": "0.2.4",
                      "from": "sntp@0.2.x"
                    }
                  }
                },
                "aws-sign2": {
                  "version": "0.5.0",
                  "from": "aws-sign2@~0.5.0"
                }
              }
            },
            "ycssmin": {
              "version": "1.0.1",
              "from": "ycssmin@>=1.0.1"
            }
          }
        }
      }
    },
    "marked": {
      "version": "0.2.8",
      "from": "marked@0.2.8"
    },
    "mkdirp": {
      "version": "0.3.5",
      "from": "mkdirp@~0.3.5"
    },
    "mongodb": {
      "version": "1.3.23",
      "from": "mongodb@~1.3.19",
      "dependencies": {
        "bson": {
          "version": "0.2.5",
          "from": "bson@0.2.5"
        },
        "kerberos": {
          "version": "0.0.3",
          "from": "kerberos@0.0.3"
        }
      }
    },
    "nconf": {
      "version": "0.6.9",
      "from": "nconf@~0.6.7",
      "dependencies": {
        "async": {
          "version": "0.2.9",
          "from": "async@0.2.9"
        },
        "ini": {
          "version": "1.1.0",
          "from": "ini@1.x.x"
        },
        "optimist": {
          "version": "0.6.0",
          "from": "optimist@0.6.0",
          "dependencies": {
            "wordwrap": {
              "version": "0.0.2",
              "from": "wordwrap@~0.0.2"
            },
            "minimist": {
              "version": "0.0.8",
              "from": "minimist@~0.0.1"
            }
          }
        }
      }
    },
    "nodebb-plugin-markdown": {
      "version": "0.4.1",
      "from": "nodebb-plugin-markdown@~0.4.1",
      "dependencies": {
        "marked": {
          "version": "0.2.10",
          "from": "marked@~0.2.9"
        },
        "pygmentize-bundled": {
          "version": "2.1.0",
          "from": "pygmentize-bundled@~2.1.0",
          "dependencies": {
            "readable-stream": {
              "version": "1.0.26-4",
              "from": "readable-stream@~1.0.17",
              "dependencies": {
                "core-util-is": {
                  "version": "1.0.1",
                  "from": "core-util-is@~1.0.0"
                },
                "isarray": {
                  "version": "0.0.1",
                  "from": "isarray@0.0.1"
                },
                "string_decoder": {
                  "version": "0.10.25-1",
                  "from": "string_decoder@~0.10.x"
                },
                "inherits": {
                  "version": "2.0.1",
                  "from": "inherits@^2.0.1"
                }
              }
            },
            "bl": {
              "version": "0.4.2",
              "from": "bl@~0.4.1"
            },
            "through2": {
              "version": "0.2.3",
              "from": "through2@~0.2.1",
              "dependencies": {
                "readable-stream": {
                  "version": "1.1.12",
                  "from": "readable-stream@~1.1.9",
                  "dependencies": {
                    "core-util-is": {
                      "version": "1.0.1",
                      "from": "core-util-is@~1.0.0"
                    },
                    "isarray": {
                      "version": "0.0.1",
                      "from": "isarray@0.0.1"
                    },
                    "string_decoder": {
                      "version": "0.10.25-1",
                      "from": "string_decoder@~0.10.x"
                    },
                    "inherits": {
                      "version": "2.0.1",
                      "from": "inherits@^2.0.1"
                    }
                  }
                },
                "xtend": {
                  "version": "2.1.2",
                  "from": "xtend@~2.1.1",
                  "dependencies": {
                    "object-keys": {
                      "version": "0.4.0",
                      "from": "object-keys@~0.4.0"
                    }
                  }
                }
              }
            }
          }
        }
      }
    },
    "nodebb-plugin-mentions": {
      "version": "0.4.1-1",
      "from": "nodebb-plugin-mentions@~0.4.0"
    },
    "nodebb-theme-lavender": {
      "version": "0.0.25-0",
      "from": "nodebb-theme-lavender@~0.0.25"
    },
    "nodebb-theme-vanilla": {
      "version": "0.0.19-0",
      "from": "nodebb-theme-vanilla@~0.0.19"
    },
    "nodebb-widget-essentials": {
      "version": "0.0.21-0",
      "from": "nodebb-widget-essentials@~0.0.21",
      "dependencies": {
        "marked": {
          "version": "0.3.2",
          "from": "marked@^0.3.2"
        }
      }
    },
    "passport": {
      "version": "0.2.0",
      "from": "passport@~0.2.0",
      "dependencies": {
        "passport-strategy": {
          "version": "1.0.0",
          "from": "passport-strategy@1.x.x"
        },
        "pause": {
          "version": "0.0.1",
          "from": "pause@0.0.1"
        }
      }
    },
    "passport-local": {
      "version": "0.1.6",
      "from": "passport-local@0.1.6",
      "dependencies": {
        "pkginfo": {
          "version": "0.2.3",
          "from": "pkginfo@0.2.x"
        },
        "passport": {
          "version": "0.1.18",
          "from": "passport@~0.1.1",
          "dependencies": {
            "pause": {
              "version": "0.0.1",
              "from": "pause@0.0.1"
            }
          }
        }
      }
    },
    "prompt": {
      "version": "0.2.12",
      "from": "prompt@~0.2.11",
      "dependencies": {
        "pkginfo": {
          "version": "0.3.0",
          "from": "pkginfo@0.x.x"
        },
        "read": {
          "version": "1.0.5",
          "from": "read@1.0.x",
          "dependencies": {
            "mute-stream": {
              "version": "0.0.4",
              "from": "mute-stream@~0.0.4"
            }
          }
        },
        "revalidator": {
          "version": "0.1.6",
          "from": "revalidator@0.1.x"
        },
        "utile": {
          "version": "0.2.1",
          "from": "utile@0.2.x",
          "dependencies": {
            "deep-equal": {
              "version": "0.2.1",
              "from": "deep-equal@*"
            },
            "i": {
              "version": "0.3.2",
              "from": "i@0.3.x"
            },
            "ncp": {
              "version": "0.4.2",
              "from": "ncp@0.4.x"
            }
          }
        },
        "winston": {
          "version": "0.6.2",
          "from": "winston@0.6.x",
          "dependencies": {
            "async": {
              "version": "0.1.22",
              "from": "async@0.1.x"
            },
            "colors": {
              "version": "0.6.2",
              "from": "colors@0.x.x"
            },
            "cycle": {
              "version": "1.0.3",
              "from": "cycle@1.0.x"
            },
            "eyes": {
              "version": "0.1.8",
              "from": "eyes@0.1.x"
            },
            "pkginfo": {
              "version": "0.2.3",
              "from": "pkginfo@0.2.x"
            },
            "request": {
              "version": "2.9.203",
              "from": "request@2.9.x"
            },
            "stack-trace": {
              "version": "0.0.9",
              "from": "stack-trace@0.0.x"
            }
          }
        }
      }
    },
    "redis": {
      "version": "0.8.3",
      "from": "redis@0.8.3"
    },
    "reds": {
      "version": "0.2.4",
      "from": "reds@~0.2.4",
      "dependencies": {
        "natural": {
          "version": "0.1.17",
          "from": "natural@0.1.17",
          "dependencies": {
            "sylvester": {
              "version": "0.0.21",
              "from": "sylvester@>= 0.0.12"
            },
            "apparatus": {
              "version": "0.0.8",
              "from": "apparatus@>= 0.0.6"
            }
          }
        },
        "redis": {
          "version": "0.7.2",
          "from": "redis@0.7.2"
        }
      }
    },
    "rimraf": {
      "version": "2.2.6",
      "from": "rimraf@~2.2.6"
    },
    "rss": {
      "version": "0.2.1",
      "from": "rss@~0.2.0",
      "dependencies": {
        "xml": {
          "version": "0.0.12",
          "from": "xml@~0.0.4"
        },
        "mime": {
          "version": "1.2.11",
          "from": "mime@~1.2.11"
        }
      }
    },
    "semver": {
      "version": "2.2.1",
      "from": "semver@~2.2.1"
    },
    "sitemap": {
      "version": "0.7.2",
      "from": "sitemap@~0.7.1"
    },
    "socket.io": {
      "version": "0.9.16",
      "from": "socket.io@~0.9.16",
      "dependencies": {
        "socket.io-client": {
          "version": "0.9.16",
          "from": "socket.io-client@0.9.16",
          "dependencies": {
            "uglify-js": {
              "version": "1.2.5",
              "from": "uglify-js@1.2.5"
            },
            "ws": {
              "version": "0.4.31",
              "from": "ws@0.4.x",
              "dependencies": {
                "commander": {
                  "version": "0.6.1",
                  "from": "commander@~0.6.1"
                },
                "nan": {
                  "version": "0.3.2",
                  "from": "nan@~0.3.0"
                },
                "tinycolor": {
                  "version": "0.0.1",
                  "from": "tinycolor@0.x"
                },
                "options": {
                  "version": "0.0.5",
                  "from": "options@>=0.0.5"
                }
              }
            },
            "xmlhttprequest": {
              "version": "1.4.2",
              "from": "xmlhttprequest@1.4.2"
            },
            "active-x-obfuscator": {
              "version": "0.0.1",
              "from": "active-x-obfuscator@0.0.1",
              "dependencies": {
                "zeparser": {
                  "version": "0.0.5",
                  "from": "zeparser@0.0.5"
                }
              }
            }
          }
        },
        "policyfile": {
          "version": "0.0.4",
          "from": "policyfile@0.0.4"
        },
        "base64id": {
          "version": "0.1.0",
          "from": "base64id@0.1.0"
        },
        "redis": {
          "version": "0.7.3",
          "from": "redis@0.7.3"
        }
      }
    },
    "socket.io-wildcard": {
      "version": "0.1.1",
      "from": "socket.io-wildcard@~0.1.1"
    },
    "string": {
      "version": "1.7.0",
      "from": "string@~1.7.0"
    },
    "uglify-js": {
      "version": "2.4.13",
      "from": "uglify-js@~2.4.0",
      "dependencies": {
        "source-map": {
          "version": "0.1.33",
          "from": "source-map@~0.1.33",
          "dependencies": {
            "amdefine": {
              "version": "0.1.0",
              "from": "amdefine@>=0.0.4"
            }
          }
        },
        "optimist": {
          "version": "0.3.7",
          "from": "optimist@~0.3.5",
          "dependencies": {
            "wordwrap": {
              "version": "0.0.2",
              "from": "wordwrap@~0.0.2"
            }
          }
        },
        "uglify-to-browserify": {
          "version": "1.0.2",
          "from": "uglify-to-browserify@~1.0.0"
        }
      }
    },
    "underscore": {
      "version": "1.6.0",
      "from": "underscore@^1.6.0"
    },
    "validator": {
      "version": "3.5.1",
      "from": "validator@^3.4.0"
    },
    "winston": {
      "version": "0.7.3",
      "from": "winston@~0.7.2",
      "dependencies": {
        "colors": {
          "version": "0.6.2",
          "from": "colors@0.6.x"
        },
        "cycle": {
          "version": "1.0.3",
          "from": "cycle@1.0.x"
        },
        "eyes": {
          "version": "0.1.8",
          "from": "eyes@0.1.x"
        },
        "pkginfo": {
          "version": "0.3.0",
          "from": "pkginfo@0.3.x"
        },
        "request": {
          "version": "2.16.6",
          "from": "request@2.16.x",
          "dependencies": {
            "form-data": {
              "version": "0.0.10",
              "from": "form-data@~0.0.3",
              "dependencies": {
                "combined-stream": {
                  "version": "0.0.4",
                  "from": "combined-stream@~0.0.4",
                  "dependencies": {
                    "delayed-stream": {
                      "version": "0.0.5",
                      "from": "delayed-stream@0.0.5"
                    }
                  }
                }
              }
            },
            "mime": {
              "version": "1.2.11",
              "from": "mime@~1.2.7"
            },
            "hawk": {
              "version": "0.10.2",
              "from": "hawk@~0.10.2",
              "dependencies": {
                "hoek": {
                  "version": "0.7.6",
                  "from": "hoek@0.7.x"
                },
                "boom": {
                  "version": "0.3.8",
                  "from": "boom@0.3.x"
                },
                "cryptiles": {
                  "version": "0.1.3",
                  "from": "cryptiles@0.1.x"
                },
                "sntp": {
                  "version": "0.1.4",
                  "from": "sntp@0.1.x"
                }
              }
            },
            "node-uuid": {
              "version": "1.4.1",
              "from": "node-uuid@~1.4.0"
            },
            "cookie-jar": {
              "version": "0.2.0",
              "from": "cookie-jar@~0.2.0"
            },
            "aws-sign": {
              "version": "0.2.0",
              "from": "aws-sign@~0.2.0"
            },
            "oauth-sign": {
              "version": "0.2.0",
              "from": "oauth-sign@~0.2.0"
            },
            "forever-agent": {
              "version": "0.2.0",
              "from": "forever-agent@~0.2.0"
            },
            "tunnel-agent": {
              "version": "0.2.0",
              "from": "tunnel-agent@~0.2.0"
            },
            "json-stringify-safe": {
              "version": "3.0.0",
              "from": "json-stringify-safe@~3.0.0"
            },
            "qs": {
              "version": "0.5.6",
              "from": "qs@~0.5.4"
            }
          }
        },
        "stack-trace": {
          "version": "0.0.9",
          "from": "stack-trace@0.0.x"
        }
      }
    },
    "xregexp": {
      "version": "2.0.0",
      "from": "xregexp@~2.0.0"
    }
  }
 }
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "nodebb",
  "license": "GPLv3 or later",
  "description": "NodeBB Forum",
-  "version": "0.3.1",
+  "version": "0.4.0",
  "homepage": "http://www.nodebb.org",
  "repository": {
    "type": "git",
@@ -10,54 +10,52 @@
  },
  "main": "app.js",
  "scripts": {
    "start": "./nodebb start",
    "stop": "./nodebb stop",
    "test": "mocha ./tests"
  },
  "dependencies": {
    "socket.io": "~0.9.16",
    "express": "3.2.0",
    "express-namespace": "~0.1.1",
-    "emailjs": "0.3.4",
+    "passport": "~0.2.0",
    "cookie": "0.0.6",
    "passport": "0.1.17",
    "passport-local": "0.1.6",
    "passport-twitter": "0.1.5",
    "passport-google-oauth": "0.1.5",
    "passport-facebook": "0.1.5",
    "less-middleware": "0.1.12",
    "marked": "0.2.8",
    "async": "~0.2.8",
-    "node-imagemagick": "0.1.8",
+    "gm": "1.14.2",
    "gravatar": "1.0.6",
    "nconf": "~0.6.7",
    "sitemap": "~0.7.1",
    "request": "~2.25.0",
    "reds": "~0.2.4",
    "winston": "~0.7.2",
    "rss": "~0.2.0",
    "prompt": "~0.2.11",
    "uglify-js": "~2.4.0",
-    "validator": "~1.5.1",
+    "validator": "^3.4.0",
-    "nodebb-plugin-mentions": "~0.3",
+    "cron": "~1.0.4",
    "nodebb-plugin-markdown": "~0.3",
    "nodebb-theme-vanilla": "~0.0.13",
    "nodebb-theme-cerulean": "~0.0.12",
    "nodebb-theme-lavender": "~0.0",
    "cron": "~1.0.1",
    "semver": "~2.2.1",
    "string": "~1.7.0",
    "xregexp": "~2.0.0",
    "socket.io-wildcard": "~0.1.1",
-    "bcryptjs": "~0.7.10"
+    "bcryptjs": "~0.7.10",
    "nodebb-plugin-mentions": "~0.4.0",
    "nodebb-plugin-markdown": "~0.4.1",
    "nodebb-widget-essentials": "~0.0.21",
    "nodebb-theme-vanilla": "~0.0.19",
    "nodebb-theme-lavender": "~0.0.25",
    "less": "~1.6.3",
    "daemon": "~1.1.0",
    "underscore": "^1.6.0",
    "mkdirp": "~0.3.5",
    "rimraf": "~2.2.6"
  },
  "optionalDependencies": {
    "redis": "0.8.3",
    "mongodb": "~1.3.19",
    "connect-redis": "1.4.5",
    "connect-mongo": "0.4.0",
    "hiredis": "~0.1.15",
-    "nodebb-plugin-sso-facebook": "~0.1.0",
+    "connect-redis": "1.4.5",
-    "nodebb-plugin-sso-twitter": "~0.1.0",
+    "mongodb": "~1.3.19",
-    "nodebb-plugin-sso-google": "~0.1.0"
+    "connect-mongo": "0.4.0"
  },
  "devDependencies": {
    "mocha": "~1.13.0"
@@ -68,7 +66,7 @@
  "engines": {
    "node": ">=0.8"
  },
-  "contributors": [
+  "maintainers": [
    {
      "name": "Andrew Rodrigues",
      "email": "andrew@designcreateplay.com",
@@ -83,22 +81,6 @@
      "name": "Barış Soner Uşaklı",
      "email": "baris@designcreateplay.com",
      "url": "https://github.com/barisusakli"
    },
    {
      "name": "Andrew Darqui",
      "url": "https://github.com/adarqui"
    },
    {
      "name": "Damian Bushong",
      "url": "https://github.com/damianb"
    },
    {
      "name": "Matt Smith",
      "url": "https://github.com/soimafreak"
    },
    {
      "name": "Quinton Marchi",
      "url": "https://github.com/iamcardinal"
    }
  ]
 }
--- a/public/language/ar/category.json
+++ b/public/language/ar/category.json
@@ -1,14 +1,12 @@
 {
    "new_topic_button": "موضوع جديد",
    "no_topics": "<strong>لا توجد مواضيع في هذه الفئة</strong>لماذا لا تحاول نشر واحد؟<br />",
    "sidebar.recent_replies": "الردود مؤخرا",
    "sidebar.active_participants": "المشاركون النشطة",
    "sidebar.moderators": "المشرفين",
    "posts": "مشاركات",
    "views": "مشاهدات",
    "posted": "نشر",
    "browsing": "يتصفح",
    "no_replies": "لم يرد أحد",
    "replied": "رد",
-    "last_edited_by": "تغيرت أخيراً عبر"
+    "last_edited_by": "تغيرت أخيراً عبر",
    "share_this_category": "Share this category"
 }
--- a/public/language/ar/global.json
+++ b/public/language/ar/global.json
@@ -10,11 +10,14 @@
    "500.message": "عفوا! يبدو وكأنه شيء ذهب على نحو خاطئ!",
    "register": "تسجيل",
    "login": "دخول",
    "please_log_in": "Please Log In",
    "logout": "تسجيل الخروج",
-    "logout.title": "تم تسجيل الخروج",
+    "posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.",
-    "logout.message": "قمت بتسجيل الخروج بنجاح من NodeBB",
+    "welcome_back": "Welcome Back ",
    "you_have_successfully_logged_in": "You have successfully logged in",
    "save_changes": "حفظ التغييرات",
    "close": "أغلق",
    "pagination": "Pagination",
    "header.admin": "مشرف",
    "header.recent": "حديث",
    "header.unread": "غير مقروء",
@@ -27,10 +30,6 @@
    "notifications.loading": "تحميل التبليغات",
    "chats.loading": "تحميل الدردشات",
    "motd.welcome": "مرحبا بكم  NodeBB، منصة مناقشة المستقبل",
    "motd.get": "NodeBB إحصل على",
    "motd.fork": "فرع",
    "motd.like": "ود",
    "motd.follow": "تابع",
    "previouspage": "Previous Page",
    "nextpage": "Next Page",
    "alert.success": "Success",
@@ -43,10 +42,14 @@
    "views": "Views",
    "posted": "posted",
    "in": "in",
    "norecentposts": "No Recent Posts",
    "norecenttopics": "No Recent Topics",
    "recentposts": "Recent Posts",
    "recentips": "Recently Logged In IPs",
    "online": "Online",
    "away": "Away",
    "dnd": "Do not Disturb",
    "invisible": "Invisible",
-    "offline": "Offline"
+    "offline": "Offline",
    "privacy": "Privacy"
 }
--- a/public/language/ar/login.json
+++ b/public/language/ar/login.json
@@ -1,6 +1,6 @@
 {
    "login": "دخول",
-    "username": "اسم المستخدم",
+    "username": "Username / Email",
    "password": "كلمة السر",
    "remember_me": "تذكرني؟",
    "forgot_password": "نسيت كلمة المرور؟",
--- a/public/language/ar/notifications.json
+++ b/public/language/ar/notifications.json
@@ -1,6 +1,6 @@
 {
    "title": "إعلام",
-    "no_notifs": "You have no notifications",
+    "no_notifs": "You have no new notifications",
    "see_all": "See all Notifications",
    "back_to_home": "العودة إلى NodeBB",
    "outgoing_link": "رابط خارجي",
--- a/public/language/ar/pages.json
+++ b/public/language/ar/pages.json
@@ -1,12 +1,14 @@
 {
    "home": "Home",
    "unread": "Unread Topics",
    "popular": "Popular Topics",
    "recent": "Recent Topics",
    "users": "Registered Users",
    "notifications": "Notifications",
    "user.edit": "Editing \"%1\"",
    "user.following": "People %1 Follows",
    "user.followers": "People who Follow %1",
    "user.posts": "Posts made by %1",
    "user.favourites": "%1's Favourite Posts",
    "user.settings": "User Settings"
 }
--- a/public/language/ar/reset_password.json
+++ b/public/language/ar/reset_password.json
@@ -8,6 +8,7 @@
    "new_password": "كلمة السر الجديدة",
    "repeat_password": "تأكيد كلمة السر",
    "enter_email": "يرجى إدخال <strong>عنوان البريد الإلكتروني</strong> الخاص بك وسوف نرسل لك رسالة بالبريد الالكتروني مع تعليمات حول كيفية إستعادة حسابك.",
    "enter_email_address": "Enter Email Address",
    "password_reset_sent": "إعادة تعيين كلمة السر أرسلت",
    "invalid_email": "بريد إلكتروني غير صالح أو غير موجود"
 }
--- a/public/language/ar/topic.json
+++ b/public/language/ar/topic.json
@@ -1,6 +1,8 @@
 {
    "topic": "موضوع",
    "topics": "مواضيع",
    "topic_id": "Topic ID",
    "topic_id_placeholder": "Enter topic ID",
    "no_topics_found": "لا توجد مواضيع !",
    "no_posts_found": "No posts found!",
    "profile": "ملف",
@@ -11,6 +13,7 @@
    "reply": "رد",
    "edit": "صحح",
    "delete": "حذف",
    "restore": "Restore",
    "move": "انقل",
    "fork": "فرع",
    "banned": "محظور",
@@ -18,8 +21,20 @@
    "share": "شارك",
    "tools": "أدوات",
    "flag": "Flag",
    "bookmark_instructions": "Click here to return to your last position or close to discard.",
    "flag_title": "Flag this post for moderation",
    "flag_confirm": "Are you sure you want to flag this post?",
    "flag_success": "This post has been flagged for moderation.",
    "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
    "following_topic.title": "Following Topic",
    "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
    "not_following_topic.title": "Not Following Topic",
    "not_following_topic.message": "You will no longer receive notifications from this topic.",
    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
    "markAsUnreadForAll.success": "Topic marked as unread for all.",
    "watch": "Watch",
    "watch.title": "Be notified of new replies in this topic",
    "share_this_post": "Share this Post",
    "thread_tools.title": "أدوات الموضوع",
    "thread_tools.markAsUnreadForAll": "علم غير مقروء",
    "thread_tools.pin": "علق الموضوع",
@@ -56,8 +71,17 @@
    "composer.title_placeholder": "Enter your topic title here...",
    "composer.write": "Write",
    "composer.preview": "Preview",
    "composer.help": "Help",
    "composer.discard": "Discard",
    "composer.submit": "Submit",
    "composer.replying_to": "Replying to",
-    "composer.new_topic": "New Topic"
+    "composer.new_topic": "New Topic",
    "composer.uploading": "uploading...",
    "composer.thumb_url_label": "Paste a topic thumbnail URL",
    "composer.thumb_title": "Add a thumbnail to this topic",
    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
    "composer.thumb_file_label": "Or upload a file",
    "composer.thumb_remove": "Clear fields",
    "composer.drag_and_drop_images": "Drag and Drop Images Here",
    "composer.upload_instructions": "Upload images by dragging & dropping them."
 }
--- a/public/language/ar/user.json
+++ b/public/language/ar/user.json
@@ -5,6 +5,7 @@
    "email": "البريد الإلكتروني",
    "fullname": "الاسم الكامل",
    "website": "الموقع الإلكتروني",
    "user:website_placeholder": "http://...",
    "location": "موقع",
    "age": "عمر",
    "joined": "تاريخ التسجيل",
@@ -19,21 +20,37 @@
    "signature": "توقيع",
    "gravatar": "Gravatar",
    "birthday": "عيد ميلاد",
    "birthday_placeholder": "mm/dd/yyyy",
    "chat": "Chat",
    "follow": "Follow",
    "unfollow": "Unfollow",
    "change_picture": "تغيير الصورة",
    "edit": "صحح",
    "uploaded_picture": "صورة تم تحميلها",
    "upload_new_picture": "تحميل صورة جديدة",
    "current_password": "Current Password",
    "change_password": "تغيير كلمة السر",
    "change_password_error": "Invalid Password!",
    "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 are not have the rights to change this password.",
    "change_password_success": "Your password is updated!",
    "confirm_password": "تأكيد كلمة السر",
    "password": "كلمة السر",
    "upload_picture": "تحميل الصورة",
    "upload_a_picture": "تحميل صورة",
-    "image_spec": "تستطيع تحميل سوى PNG، JPG، GIF تحت 256KB.",
+    "image_spec": "You may only upload PNG, JPG, or GIF files",
    "max": "max.",
    "settings": "Settings",
    "show_email": "أظهر بريدي الإلكتروني",
    "has_no_follower": "هذا المستخدم ليس لديه أي أتباع :(",
    "follows_no_one": "هذا المستخدم لا يتبع أحد :(",
    "has_no_posts": "This user didn't post anything yet.",
    "email_hidden": "البريد الإلكتروني مخفي",
-    "hidden": "مخفي"
+    "hidden": "مخفي",
    "paginate_description": "Paginate topics and posts instead of using infinite scroll.",
    "topics_per_page": "Topics per Page",
    "posts_per_page": "Posts per Page",
    "notification_sounds": "Play a sound when you receive a notification."
 }
--- a/public/language/cs/category.json
+++ b/public/language/cs/category.json
@@ -1,14 +1,12 @@
 {
    "new_topic_button": "Nové téma",
    "no_topics": "<strong>V této kategorii zatím nejsou žádné příspěvky.</strong><br />Můžeš být první!",
    "sidebar.recent_replies": "Poslední příspěvky",
    "sidebar.active_participants": "Aktivní účastníci",
    "sidebar.moderators": "Moderátoři",
    "posts": "příspěvky",
    "views": "zobrazení",
    "posted": "odesláno",
    "browsing": "prohlíží",
    "no_replies": "Nikdo ještě neodpověděl",
    "replied": "přispěl",
-    "last_edited_by": "naposledy upravil"
+    "last_edited_by": "naposledy upravil",
    "share_this_category": "Share this category"
 }
--- a/public/language/cs/global.json
+++ b/public/language/cs/global.json
@@ -10,11 +10,14 @@
    "500.message": "Jejda, vypadá to, že se něco pokazilo.",
    "register": "Registrovat",
    "login": "Přihlásit se",
    "please_log_in": "Please Log In",
    "logout": "Odhlásit se",
-    "logout.title": "Odhlásili jsme Vás.",
+    "posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.",
-    "logout.message": "Úspěšně jsme Vás odhlásili z fóra.",
+    "welcome_back": "Welcome Back ",
    "you_have_successfully_logged_in": "You have successfully logged in",
    "save_changes": "Uložit změny",
    "close": "Zrušit",
    "pagination": "Pagination",
    "header.admin": "Administrace",
    "header.recent": "Aktuality",
    "header.unread": "Nepřečtené",
@@ -27,10 +30,6 @@
    "notifications.loading": "Načítání upozornění",
    "chats.loading": "Načítání grafů",
    "motd.welcome": "Vítejte na NodeBB, diskusní platforma buducnosti.",
    "motd.get": "Získat NodeBB",
    "motd.fork": "Fork",
    "motd.like": "To se mi líbí",
    "motd.follow": "Sledovat",
    "previouspage": "Předchozí stránka",
    "nextpage": "Další stránka",
    "alert.success": "Success",
@@ -43,10 +42,14 @@
    "views": "Zobrazení",
    "posted": "odesláno",
    "in": "v",
    "norecentposts": "No Recent Posts",
    "norecenttopics": "No Recent Topics",
    "recentposts": "Nedávné příspěvky",
    "recentips": "Recently Logged In IPs",
    "online": "Online",
    "away": "Pryč",
    "dnd": "Nerušit",
    "invisible": "Neviditelný",
-    "offline": "Offline"
+    "offline": "Offline",
    "privacy": "Privacy"
 }
--- a/public/language/cs/login.json
+++ b/public/language/cs/login.json
@@ -1,6 +1,6 @@
 {
    "login": "Přihlásit se",
-    "username": "Uživatelské jméno",
+    "username": "Username / Email",
    "password": "Heslo",
    "remember_me": "Zapamatovat si mě?",
    "forgot_password": "Zapomněli jste heslo?",
--- a/public/language/cs/notifications.json
+++ b/public/language/cs/notifications.json
@@ -1,6 +1,6 @@
 {
    "title": "Upozornění",
-    "no_notifs": "You have no notifications",
+    "no_notifs": "You have no new notifications",
    "see_all": "See all Notifications",
    "back_to_home": "Zpět na úvodní stránku",
    "outgoing_link": "Odkaz mimo fórum",
--- a/public/language/cs/pages.json
+++ b/public/language/cs/pages.json
@@ -1,12 +1,14 @@
 {
    "home": "Home",
    "unread": "Unread Topics",
    "popular": "Popular Topics",
    "recent": "Recent Topics",
    "users": "Registered Users",
    "notifications": "Notifications",
    "user.edit": "Editing \"%1\"",
    "user.following": "People %1 Follows",
    "user.followers": "People who Follow %1",
    "user.posts": "Posts made by %1",
    "user.favourites": "%1's Favourite Posts",
    "user.settings": "User Settings"
 }
--- a/public/language/cs/reset_password.json
+++ b/public/language/cs/reset_password.json
@@ -8,6 +8,7 @@
    "new_password": "Nové heslo",
    "repeat_password": "Potvrzení hesla",
    "enter_email": "Zadejte svou <strong>emailovou adresu</strong> a my Vám pošleme informace, jak můžete obnovit své heslo.",
    "enter_email_address": "Enter Email Address",
    "password_reset_sent": "Obnova hesla odeslána",
    "invalid_email": "Špatný email / Email neexistuje!"
 }
--- a/public/language/cs/topic.json
+++ b/public/language/cs/topic.json
@@ -1,6 +1,8 @@
 {
    "topic": "Téma",
    "topics": "Témata",
    "topic_id": "Topic ID",
    "topic_id_placeholder": "Enter topic ID",
    "no_topics_found": "Nebyla nalezena žádná témata!",
    "no_posts_found": "No posts found!",
    "profile": "Profil",
@@ -11,6 +13,7 @@
    "reply": "Odpovědět",
    "edit": "Upravit",
    "delete": "Smazat",
    "restore": "Restore",
    "move": "Přesunout",
    "fork": "Rozdělit",
    "banned": "banned",
@@ -18,8 +21,20 @@
    "share": "Sdílet",
    "tools": "Nástroje",
    "flag": "Flag",
    "bookmark_instructions": "Click here to return to your last position or close to discard.",
    "flag_title": "Flag this post for moderation",
    "flag_confirm": "Are you sure you want to flag this post?",
    "flag_success": "This post has been flagged for moderation.",
    "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
    "following_topic.title": "Following Topic",
    "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
    "not_following_topic.title": "Not Following Topic",
    "not_following_topic.message": "You will no longer receive notifications from this topic.",
    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
    "markAsUnreadForAll.success": "Topic marked as unread for all.",
    "watch": "Watch",
    "watch.title": "Be notified of new replies in this topic",
    "share_this_post": "Share this Post",
    "thread_tools.title": "Nástroje",
    "thread_tools.markAsUnreadForAll": "Označit jako nepřečtené",
    "thread_tools.pin": "Pin Topic",
@@ -56,8 +71,17 @@
    "composer.title_placeholder": "Enter your topic title here...",
    "composer.write": "Write",
    "composer.preview": "Preview",
    "composer.help": "Help",
    "composer.discard": "Discard",
    "composer.submit": "Submit",
    "composer.replying_to": "Replying to",
-    "composer.new_topic": "New Topic"
+    "composer.new_topic": "New Topic",
    "composer.uploading": "uploading...",
    "composer.thumb_url_label": "Paste a topic thumbnail URL",
    "composer.thumb_title": "Add a thumbnail to this topic",
    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
    "composer.thumb_file_label": "Or upload a file",
    "composer.thumb_remove": "Clear fields",
    "composer.drag_and_drop_images": "Drag and Drop Images Here",
    "composer.upload_instructions": "Upload images by dragging & dropping them."
 }
--- a/public/language/cs/user.json
+++ b/public/language/cs/user.json
@@ -5,6 +5,7 @@
    "email": "Email",
    "fullname": "Jméno a příjmení",
    "website": "Webové stránky",
    "user:website_placeholder": "http://...",
    "location": "Poloha",
    "age": "Věk",
    "joined": "Registrován",
@@ -19,21 +20,37 @@
    "signature": "Podpis",
    "gravatar": "Gravatar",
    "birthday": "Datum narození",
    "birthday_placeholder": "mm/dd/yyyy",
    "chat": "Chat",
    "follow": "Follow",
    "unfollow": "Unfollow",
    "change_picture": "Změnit obrázek",
    "edit": "Upravit",
    "uploaded_picture": "Nahraný obrázek",
    "upload_new_picture": "Nahrát nový obrázek",
    "current_password": "Current Password",
    "change_password": "Změnit heslo",
    "change_password_error": "Invalid Password!",
    "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 are not have the rights to change this password.",
    "change_password_success": "Your password is updated!",
    "confirm_password": "Potvrzení hesla",
    "password": "Heslo",
    "upload_picture": "Nahrát obrázek",
    "upload_a_picture": "Nahrát obrázek",
-    "image_spec": "Můžete nahrávat poze obrázky ve formátu PNG, JPG, nebo GIF o velikosti menší než 256kb.",
+    "image_spec": "You may only upload PNG, JPG, or GIF files",
    "max": "max.",
    "settings": "Nastavení",
    "show_email": "Zobrazovat můj email v profilu",
    "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.",
    "email_hidden": "Skrytý email",
-    "hidden": "skrytý"
+    "hidden": "skrytý",
    "paginate_description": "Paginate topics and posts instead of using infinite scroll.",
    "topics_per_page": "Topics per Page",
    "posts_per_page": "Posts per Page",
    "notification_sounds": "Play a sound when you receive a notification."
 }
--- a/public/language/de/category.json
+++ b/public/language/de/category.json
@@ -1,14 +1,12 @@
 {
    "new_topic_button": "Neues Thema",
-    "no_topics": "<strong>Es gibt noch keine Threads in dieser Kategorie.</strong><br />Warum beginnst du nicht den ersten?",
+    "no_topics": "<strong>Es gibt noch keine Themen in dieser Kategorie.</strong><br />Warum beginnst du nicht das erste?",
-    "sidebar.recent_replies": "Neuste Antworten",
+    "posts": "Beiträge",
    "sidebar.active_participants": "Aktive Teilnehmer",
    "sidebar.moderators": "Moderatoren",
    "posts": "Posts",
    "views": "Aufrufe",
-    "posted": "Geposted",
+    "posted": "Geschrieben",
-    "browsing": "Sieht zu",
+    "browsing": "Aktiv",
    "no_replies": "Niemand hat geantwortet",
    "replied": "geantwortet",
-    "last_edited_by": "zuletzt editiert durch"
+    "last_edited_by": "zuletzt editiert durch",
    "share_this_category": "Share this category"
 }
--- a/public/language/de/global.json
+++ b/public/language/de/global.json
@@ -10,11 +10,14 @@
    "500.message": "Ooops! Looks like something went wrong!",
    "register": "Registrierung",
    "login": "Login",
    "please_log_in": "Bitte einloggen",
    "logout": "Logout",
-    "logout.title": "Du bist ausgeloggt.",
+    "posting_restriction_info": "Nur registrierte Mitglieder dürfen Beiträge verfassen. Hier klicken zum Einloggen.",
-    "logout.message": "Du hast dich soeben erfolgreich aus dem Forum ausgeloggt.",
+    "welcome_back": "Willkommen zurück",
    "you_have_successfully_logged_in": "Du hast dich erfolgreich eingeloggt",
    "save_changes": "Speichere Änderungen",
    "close": "Schließen",
    "pagination": "Seitennummerierung",
    "header.admin": "Admin",
    "header.recent": "Aktuell",
    "header.unread": "Ungelesen",
@@ -27,10 +30,6 @@
    "notifications.loading": "Benachrichtigungen laden",
    "chats.loading": "Nachrichten werden geladen",
    "motd.welcome": "Willkommen auf NodeBB, der Diskussionsplattform der Zukunft.",
    "motd.get": "Bekommen NodeBB",
    "motd.fork": "Fork",
    "motd.like": "Gefällt mir",
    "motd.follow": "Folgen",
    "previouspage": "Vorherige Seite",
    "nextpage": "Nächste Seite",
    "alert.success": "Erfolg",
@@ -43,10 +42,14 @@
    "views": "Aufrufe",
    "posted": "geposted",
    "in": "in",
    "norecentposts": "Keine aktuellen Beiträge",
    "norecenttopics": "Keine aktuellen Themen",
    "recentposts": "Aktuelle Beiträge",
    "recentips": "Zuletzt eingeloggte IPs",
    "online": "Online",
    "away": "Abwesend",
    "dnd": "Nicht stören",
    "invisible": "Unsichtbar",
-    "offline": "Offline"
+    "offline": "Offline",
    "privacy": "Privatsphäre"
 }
--- a/public/language/de/login.json
+++ b/public/language/de/login.json
@@ -1,6 +1,6 @@
 {
    "login": "Einloggen",
-    "username": "Benutzername",
+    "username": "Nutzername / E-Mail Adresse",
    "password": "Passwort",
    "remember_me": "Eingeloggt bleiben?",
    "forgot_password": "Passwort vergessen?",
--- a/public/language/de/modules.json
+++ b/public/language/de/modules.json
@@ -2,5 +2,5 @@
    "chat.chatting_with": "Chatten mit <span id='chat-with-name'></span>",
    "chat.placeholder": "schreibe hier etwas, und drücke Enter zum absenden",
    "chat.send": "Senden",
-    "chat.no_active": "Sie haben keine aktiven Chats."
+    "chat.no_active": "Du hast keine aktiven Chats."
 }
--- a/public/language/de/notifications.json
+++ b/public/language/de/notifications.json
@@ -1,7 +1,7 @@
 {
    "title": "Benachrichtigungen",
-    "no_notifs": "You have no notifications",
+    "no_notifs": "Du hast keine neuen Benachrichtigungen",
-    "see_all": "See all Notifications",
+    "see_all": "Alle Benachrichtigungen ansehen",
    "back_to_home": "Zurück zur Startseite",
    "outgoing_link": "Externer Link",
    "outgoing_link_message": "Du verlässt nun",
--- a/public/language/de/pages.json
+++ b/public/language/de/pages.json
@@ -1,12 +1,14 @@
 {
    "home": "Home",
    "unread": "Unread Topics",
    "popular": "Beliebte Themen",
    "recent": "Recent Topics",
    "users": "Registered Users",
    "notifications": "Notifications",
    "user.edit": "Editing \"%1\"",
    "user.following": "People %1 Follows",
    "user.followers": "People who Follow %1",
-    "user.favourites": "%1's Favourite Posts",
+    "user.posts": "Beiträge von %1",
    "user.favourites": "%1's favorisierte Beiträge",
    "user.settings": "User Settings"
 }
--- a/public/language/de/recent.json
+++ b/public/language/de/recent.json
@@ -3,5 +3,5 @@
    "day": "Tag",
    "week": "Woche",
    "month": "Monat",
-    "no_recent_topics": "There are no recent topics."
+    "no_recent_topics": "Es gibt keine aktuellen Themen."
 }
--- a/public/language/de/reset_password.json
+++ b/public/language/de/reset_password.json
@@ -8,6 +8,7 @@
    "new_password": "Neues Passwort",
    "repeat_password": "Wiederhole das Passwort",
    "enter_email": "Bitte gib Deine <strong>E-Mail Adresse</strong> ein und wir senden Dir eine Anleitung, wie Du Dein Passwort zurücksetzen kannst.",
    "enter_email_address": "E-Mail Adresse eingeben",
    "password_reset_sent": "Passwortzrücksetzung beantragt.",
    "invalid_email": "Ungültige E-Mail / Adresse existiert nicht!"
 }
--- a/public/language/de/topic.json
+++ b/public/language/de/topic.json
@@ -1,8 +1,10 @@
 {
    "topic": "Thema",
    "topics": "Themen",
    "topic_id": "Topic ID",
    "topic_id_placeholder": "Enter topic ID",
    "no_topics_found": "Keine passende Themen gefunden.",
-    "no_posts_found": "No posts found!",
+    "no_posts_found": "Keine Beiträge gefunden!",
    "profile": "Profil",
    "posted_by": "Geposted von",
    "chat": "Chat",
@@ -11,6 +13,7 @@
    "reply": "antworten",
    "edit": "bearbeiten",
    "delete": "löschen",
    "restore": "Wiederherstellen",
    "move": "Verschieben",
    "fork": "Aufspalten",
    "banned": "gesperrt",
@@ -18,18 +21,30 @@
    "share": "Teilen",
    "tools": "Tools",
    "flag": "Markieren",
    "bookmark_instructions": "Klicke hier um zur letzten Position zurückzukehren oder schließe zum Abbrechen.",
    "flag_title": "Diesen Beitrag zur Moderation markieren",
-    "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
+    "flag_confirm": "Are you sure you want to flag this post?",
-    "thread_tools.title": "Thread Tools",
+    "flag_success": "This post has been flagged for moderation.",
    "deleted_message": "Dieses Thema wurde gelöscht. Nur Nutzer mit entsprechenden Rechten können ihn sehen.",
    "following_topic.title": "Thema wird gefolgt",
    "following_topic.message": "Du erhälst nun eine Benachrichtigung, wenn jemand einen Beitrag zu diesem Thema verfasst.",
    "not_following_topic.title": "Thema nicht gefolgt",
    "not_following_topic.message": "Du erhälst keine weiteren Benachrichtigungen zu diesem Thema.",
    "login_to_subscribe": "Bitte registrieren oder einloggen um dieses Thema zu abonnieren",
    "markAsUnreadForAll.success": "Thema für Alle als ungelesen markiert.",
    "watch": "Beobachten",
    "watch.title": "Bei neuen Antworten benachrichtigen",
    "share_this_post": "Diesen Beitrag teilen",
    "thread_tools.title": "Tools",
    "thread_tools.markAsUnreadForAll": "Als ungelesen markieren",
-    "thread_tools.pin": "Pin Topic",
+    "thread_tools.pin": "Thema anpinnen",
-    "thread_tools.unpin": "Unpin Topic",
+    "thread_tools.unpin": "Thema nicht mehr anpinnen",
-    "thread_tools.lock": "Lock Topic",
+    "thread_tools.lock": "Thema schließen",
-    "thread_tools.unlock": "Unlock Topic",
+    "thread_tools.unlock": "Thema öffnen",
-    "thread_tools.move": "Move Topic",
+    "thread_tools.move": "Thema verschieben",
-    "thread_tools.fork": "Fork Topic",
+    "thread_tools.fork": "Thema aufspalten",
-    "thread_tools.delete": "Delete Topic",
+    "thread_tools.delete": "Thema löschen",
-    "thread_tools.restore": "Restore Topic",
+    "thread_tools.restore": "Thema wiederherstellen",
    "load_categories": "Kategorien laden",
    "disabled_categories_note": "Deaktivierte Kategorien sind ausgegraut.",
    "confirm_move": "verschieben",
@@ -39,10 +54,10 @@
    "favourites.not_logged_in.title": "Nicht eingeloggt!",
    "favourites.not_logged_in.message": "Bitte logge dich ein, um diesen Beitrag favorisieren zu können.",
    "favourites.has_no_favourites": "Du hast noch keine Favoriten.",
-    "vote.not_logged_in.title": "Not Logged In",
+    "vote.not_logged_in.title": "Nicht eingeloggt",
-    "vote.not_logged_in.message": "Please log in in order to vote",
+    "vote.not_logged_in.message": "Zum Bewerten bitte einloggen",
-    "vote.cant_vote_self.title": "Invalid Vote",
+    "vote.cant_vote_self.title": "Ungültige Bewertung",
-    "vote.cant_vote_self.message": "You cannot vote for your own post",
+    "vote.cant_vote_self.message": "Du kannst deinen eigenen Beitrag nicht bewerten",
    "loading_more_posts": "Lade Mehr Posts",
    "move_topic": "Thema verschieben",
    "move_post": "Beitrag verschieben",
@@ -53,11 +68,20 @@
    "fork_success": "Thema erfolgreich aufgespalten!",
    "reputation": "Reputation",
    "posts": "Beiträge",
-    "composer.title_placeholder": "Enter your topic title here...",
+    "composer.title_placeholder": "Hier den Titel des Themas eingeben...",
-    "composer.write": "Write",
+    "composer.write": "Schreiben",
-    "composer.preview": "Preview",
+    "composer.preview": "Vorschau",
-    "composer.discard": "Discard",
+    "composer.help": "Hilfe",
-    "composer.submit": "Submit",
+    "composer.discard": "Verwerfen",
-    "composer.replying_to": "Replying to",
+    "composer.submit": "Absenden",
-    "composer.new_topic": "New Topic"
+    "composer.replying_to": "Als Antwort auf",
    "composer.new_topic": "Neues Thema",
    "composer.uploading": "Upload läuft...",
    "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.upload_instructions": "Zum Hochladen Bilder hier reinziehen."
 }
--- a/public/language/de/user.json
+++ b/public/language/de/user.json
@@ -5,11 +5,12 @@
    "email": "E-Mail",
    "fullname": "Kompletter Name",
    "website": "Homepage",
    "user:website_placeholder": "http://...",
    "location": "Wohnort",
    "age": "Alter",
    "joined": "Beigetreten",
    "lastonline": "Zuletzt online",
-    "profile": "Profile",
+    "profile": "Profil",
    "profile_views": "Profilaufrufe",
    "reputation": "Reputation",
    "posts": "Posts",
@@ -19,21 +20,37 @@
    "signature": "Signatur",
    "gravatar": "Gravatar",
    "birthday": "Geburtstag",
    "birthday_placeholder": "mm/dd/yyyy",
    "chat": "Chat",
    "follow": "Folgen",
    "unfollow": "Nicht mehr folgen",
    "change_picture": "Ändere Profilbild",
    "edit": "Ändern",
    "uploaded_picture": "Hochgeladene Bilder",
    "upload_new_picture": "Neues Bild hochladen",
    "current_password": "Aktuelles Passwort",
    "change_password": "Ändere Passwort",
    "change_password_error": "Invalid Password!",
    "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 are not have the rights to change this password.",
    "change_password_success": "Your password is updated!",
    "confirm_password": "Passwort wiederholen",
    "password": "Passwort",
    "upload_picture": "Bild hochladen",
    "upload_a_picture": "Ein Bild hochladen",
-    "image_spec": "Du solltest nur Dateien die PNG, JPG, oder GIF kleiner als 256kb hochladen.",
+    "image_spec": "Du darfst nur Dateien vom Typ PNG, JPG oder GIF hochladen",
    "max": "max.",
    "settings": "Einstellungen",
    "show_email": "Zeige meine E-Mail Adresse an.",
    "has_no_follower": "Dieser User hat noch keine Follower.",
    "follows_no_one": "Dieser User folgt noch niemanden.",
-    "has_no_posts": "This user didn't post anything yet.",
+    "has_no_posts": "Dieser Nutzer hat noch nichts gepostet.",
    "email_hidden": "E-Mail Adresse versteckt",
-    "hidden": "versteckt"
+    "hidden": "versteckt",
    "paginate_description": "Themen und Beiträge auf Seiten aufteilen statt unendliches Scrollen verweden",
    "topics_per_page": "Themen pro Seite",
    "posts_per_page": "Beiträge pro Seite",
    "notification_sounds": "Ton abspielen, wenn ich eine Benachrichtigung erhalte."
 }
--- a/public/language/en@pirate/category.json
+++ b/public/language/en@pirate/category.json
@@ -0,0 +1,12 @@
 {
    "new_topic_button": "New Topic",
    "no_topics": "<strong>Thar be no topics in 'tis category.</strong><br />Why don't ye give a go' postin' one?",
    "posts": "messages",
    "views": "views",
    "posted": "sent",
    "browsing": "browsin'",
    "no_replies": "No one has replied to ye message",
    "replied": "replied",
    "last_edited_by": "last edited by",
    "share_this_category": "Share this category"
 }
--- a/public/language/en@pirate/footer.json
+++ b/public/language/en@pirate/footer.json
@@ -0,0 +1,7 @@
 {
    "stats.online": "Online",
    "stats.users": "Mates",
    "stats.topics": "Topics",
    "stats.posts": "Messages",
    "success": "success"
 }
--- a/public/language/en@pirate/global.json
+++ b/public/language/en@pirate/global.json
@@ -0,0 +1,55 @@
 {
    "home": "Home Port",
    "search": "Finderer",
    "buttons.close": "Shoot down",
    "403.title": "Not Enough Booty Power",
    "403.message": "Ye seem to have stumbled upon a page that ye do not have access to. Perhaps ye <a href='/login'>give a go' loggin' in</a>?",
    "404.title": "T'ere be nut'in 'ere",
    "404.message": "Ye seem to have stumbled upon a page that does not exist. Return to th' <a href='/'>home page</a>",
    "500.title": "Broken beam.",
    "500.message": "Looks like we've got somethin' in th' sails.",
    "register": "Register",
    "login": "Login",
    "please_log_in": "Please Log In",
    "logout": "Logout",
    "posting_restriction_info": "Postin' be currently restricted to registered members only, click here to log in.",
    "welcome_back": "Welcome to Port",
    "you_have_successfully_logged_in": "Ye have successfully logged in",
    "save_changes": "Save yer Changes",
    "close": "Shoot down",
    "pagination": "Pagination",
    "header.admin": "Captains only",
    "header.recent": "Recent",
    "header.unread": "Undiscovered",
    "header.popular": "Famous",
    "header.users": "Mates",
    "header.chats": "Yik-Yaks",
    "header.notifications": "Parrot Calls",
    "header.search": "Finderer",
    "header.profile": "Bunk",
    "notifications.loading": "Fetching yer Parrot Calls",
    "chats.loading": "Loading Yik-Yaks",
    "motd.welcome": "Welcome to NodeBB, th' discussion platform 'o th' future.",
    "previouspage": "Previous Page",
    "nextpage": "Next Page",
    "alert.success": "Success",
    "alert.error": "Somethin' broke",
    "alert.banned": "Exiled",
    "alert.banned.message": "Ye be banned ye gunna be logged out!",
    "alert.unfollow": "Ye be no longer stalkin' %1!",
    "alert.follow": "Ye be stalkin' %1",
    "posts": "Messages",
    "views": "Views",
    "posted": "posted",
    "in": "in",
    "norecentposts": "No Recent Posts",
    "norecenttopics": "No Recent Topics",
    "recentposts": "Recent Messages",
    "recentips": "Recently Logged In IPs",
    "online": "Available",
    "away": "Out to sea",
    "dnd": "Do not Disturb",
    "invisible": "Magic usin'",
    "offline": "Dead",
    "privacy": "Privacy"
 }
--- a/public/language/en@pirate/language.json
+++ b/public/language/en@pirate/language.json
@@ -0,0 +1,5 @@
 {
    "name": "English (Pirate)",
    "code": "en@pirate",
    "dir": "ltr"
 }
--- a/public/language/en@pirate/login.json
+++ b/public/language/en@pirate/login.json
@@ -0,0 +1,10 @@
 {
    "login": "Login",
    "username": "Yer handle or email",
    "password": "Secret Combination",
    "remember_me": "Remember Me?",
    "forgot_password": "My mind be a scatt'rbrain, help a matey out!",
    "alternative_logins": "Oth'r gangplanks",
    "failed_login_attempt": "Failed login attempt, please give it a go' again.",
    "login_successful": "Welcome on board, matey!"
 }
--- a/public/language/en@pirate/modules.json
+++ b/public/language/en@pirate/modules.json
@@ -0,0 +1,6 @@
 {
    "chat.chatting_with": "Letters from <span id=\"chat-with-name\"></span>",
    "chat.placeholder": "Yer message goes here, hit enter to send 'er off",
    "chat.send": "Send Parrot",
    "chat.no_active": "Ye be a lonely sailor."
 }
--- a/public/language/en@pirate/notifications.json
+++ b/public/language/en@pirate/notifications.json
@@ -0,0 +1,10 @@
 {
    "title": "Notifications",
    "no_notifs": "You have no new notifications",
    "see_all": "Spy wit' ye eye all ye notifications",
    "back_to_home": "Take me back!",
    "outgoing_link": "Go offshore",
    "outgoing_link_message": "Ye be goin' offshore",
    "continue_to": "Continue to",
    "return_to": "Return to"
 }
--- a/public/language/en@pirate/pages.json
+++ b/public/language/en@pirate/pages.json
@@ -0,0 +1,14 @@
 {
    "home": "Home",
    "unread": "Unread Topics",
    "popular": "Popular Topics",
    "recent": "Recent Topics",
    "users": "Registered Users",
    "notifications": "Notifications",
    "user.edit": "Editing \"%1\"",
    "user.following": "People %1 Follows",
    "user.followers": "People who Follow %1",
    "user.posts": "Posts made by %1",
    "user.favourites": "%1's Favourite Posts",
    "user.settings": "User Settings"
 }
--- a/public/language/en@pirate/recent.json
+++ b/public/language/en@pirate/recent.json
@@ -0,0 +1,7 @@
 {
    "title": "Recent",
    "day": "Day",
    "week": "Week",
    "month": "Month",
    "no_recent_topics": "There be no recent topics."
 }
--- a/public/language/en@pirate/register.json
+++ b/public/language/en@pirate/register.json
@@ -0,0 +1,18 @@
 {
    "register": "Board the ship",
    "help.email": "By default, your email will be hidden from the public.",
    "help.username_restrictions": "A unique username between %1 and %2 characters. Others can mention you with @<span id='yourUsername'>username</span>.",
    "help.minimum_password_length": "Your password's length must be at least %1 characters.",
    "email_address": "Email Address",
    "email_address_placeholder": "Enter Email Address",
    "username": "Username",
    "username_placeholder": "Enter Username",
    "password": "Password",
    "password_placeholder": "Enter Password",
    "confirm_password": "Confirm Password",
    "confirm_password_placeholder": "Confirm Password",
    "register_now_button": "Register Now",
    "alternative_registration": "Alternative Registration",
    "terms_of_use": "Terms of Use",
    "agree_to_terms_of_use": "I agree to the Terms of Use"
 }
--- a/public/language/en@pirate/reset_password.json
+++ b/public/language/en@pirate/reset_password.json
@@ -0,0 +1,14 @@
 {
    "reset_password": "Reset Password",
    "update_password": "Update Password",
    "password_changed.title": "Password Changed",
    "password_changed.message": "<p>Password successfully reset, please <a href=\"/login\">log in again</a>.",
    "wrong_reset_code.title": "Incorrect Reset Code",
    "wrong_reset_code.message": "The reset code received was incorrect. Please try again, or <a href=\"/reset\">request a new reset code</a>.",
    "new_password": "New Password",
    "repeat_password": "Confirm Password",
    "enter_email": "Please enter your <strong>email address</strong> and we will send you an email with instructions on how to reset your account.",
    "enter_email_address": "Enter Email Address",
    "password_reset_sent": "Password Reset Sent",
    "invalid_email": "Invalid Email / Email does not exist!"
 }
--- a/public/language/en@pirate/topic.json
+++ b/public/language/en@pirate/topic.json
@@ -0,0 +1,87 @@
 {
    "topic": "Topic",
    "topics": "Topics",
    "topic_id": "Topic ID",
    "topic_id_placeholder": "Enter topic ID",
    "no_topics_found": "No topics found!",
    "no_posts_found": "No posts found!",
    "profile": "Profile",
    "posted_by": "Posted by",
    "chat": "Chat",
    "notify_me": "Be notified of new replies in this topic",
    "quote": "Quote",
    "reply": "Reply",
    "edit": "Edit",
    "delete": "Delete",
    "restore": "Restore",
    "move": "Move",
    "fork": "Fork",
    "banned": "banned",
    "link": "Link",
    "share": "Share",
    "tools": "Tools",
    "flag": "Flag",
    "bookmark_instructions": "Click here to return to your last position or close to discard.",
    "flag_title": "Flag this post for moderation",
    "flag_confirm": "Are you sure you want to flag this post?",
    "flag_success": "This post has been flagged for moderation.",
    "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
    "following_topic.title": "Following Topic",
    "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
    "not_following_topic.title": "Not Following Topic",
    "not_following_topic.message": "You will no longer receive notifications from this topic.",
    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
    "markAsUnreadForAll.success": "Topic marked as unread for all.",
    "watch": "Watch",
    "watch.title": "Be notified of new replies in this topic",
    "share_this_post": "Share this Post",
    "thread_tools.title": "Thread Tools",
    "thread_tools.markAsUnreadForAll": "Mark Unread",
    "thread_tools.pin": "Pin Topic",
    "thread_tools.unpin": "Unpin Topic",
    "thread_tools.lock": "Lock Topic",
    "thread_tools.unlock": "Unlock Topic",
    "thread_tools.move": "Move Topic",
    "thread_tools.fork": "Fork Topic",
    "thread_tools.delete": "Delete Topic",
    "thread_tools.restore": "Restore Topic",
    "load_categories": "Loading Categories",
    "disabled_categories_note": "Disabled Categories are greyed out",
    "confirm_move": "Move",
    "confirm_fork": "Fork",
    "favourite": "Favourite",
    "favourites": "Favourites",
    "favourites.not_logged_in.title": "Not Logged In",
    "favourites.not_logged_in.message": "Please log in in order to favourite this post",
    "favourites.has_no_favourites": "You don't have any favourites, favourite some posts to see them here!",
    "vote.not_logged_in.title": "Not Logged In",
    "vote.not_logged_in.message": "Please log in in order to vote",
    "vote.cant_vote_self.title": "Invalid Vote",
    "vote.cant_vote_self.message": "You cannot vote for your own post",
    "loading_more_posts": "Loading More Posts",
    "move_topic": "Move Topic",
    "move_post": "Move Post",
    "fork_topic": "Fork Topic",
    "topic_will_be_moved_to": "This topic will be moved to the category",
    "fork_topic_instruction": "Click the posts you want to fork",
    "fork_no_pids": "No posts selected!",
    "fork_success": "Succesfully forked topic!",
    "reputation": "Reputation",
    "posts": "Posts",
    "composer.title_placeholder": "Enter your topic title here...",
    "composer.write": "Write",
    "composer.preview": "Preview",
    "composer.help": "Help",
    "composer.discard": "Discard",
    "composer.submit": "Submit",
    "composer.replying_to": "Replying to",
    "composer.new_topic": "New Topic",
    "composer.uploading": "uploading...",
    "composer.thumb_url_label": "Paste a topic thumbnail URL",
    "composer.thumb_title": "Add a thumbnail to this topic",
    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
    "composer.thumb_file_label": "Or upload a file",
    "composer.thumb_remove": "Clear fields",
    "composer.drag_and_drop_images": "Drag and Drop Images Here",
    "composer.upload_instructions": "Upload images by dragging & dropping them."
 }
--- a/public/language/en@pirate/unread.json
+++ b/public/language/en@pirate/unread.json
@@ -0,0 +1,6 @@
 {
    "title": "Unread",
    "no_unread_topics": "There be no unread topics.",
    "mark_all_read": "I seen 'em all!",
    "load_more": "Giv'er more"
 }
--- a/public/language/en@pirate/user.json
+++ b/public/language/en@pirate/user.json
@@ -0,0 +1,56 @@
 {
    "banned": "Blackmarked",
    "offline": "Asleep at the wheel",
    "username": "User Name",
    "email": "Email",
    "fullname": "Full Name",
    "website": "Website",
    "user:website_placeholder": "http://...",
    "location": "Location",
    "age": "Age",
    "joined": "Joined",
    "lastonline": "Last Online",
    "profile": "Profile",
    "profile_views": "Profile views",
    "reputation": "Reputation",
    "posts": "Posts",
    "favourites": "Favourites",
    "followers": "Followers",
    "following": "Following",
    "signature": "Signature",
    "gravatar": "Gravatar",
    "birthday": "Birthday",
    "birthday_placeholder": "mm/dd/yyyy",
    "chat": "Chat",
    "follow": "Follow",
    "unfollow": "Unfollow",
    "change_picture": "Change Picture",
    "edit": "Edit",
    "uploaded_picture": "Uploaded Picture",
    "upload_new_picture": "Upload New Picture",
    "current_password": "Current Password",
    "change_password": "Change Password",
    "change_password_error": "Invalid Password!",
    "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 are not have the rights to change this password.",
    "change_password_success": "Your password is updated!",
    "confirm_password": "Confirm Password",
    "password": "Password",
    "upload_picture": "Upload picture",
    "upload_a_picture": "Upload a picture",
    "image_spec": "You may only upload PNG, JPG, or GIF files",
    "max": "max.",
    "settings": "Settings",
    "show_email": "Show My Email",
    "has_no_follower": "This user doesn't have any followers :(",
    "follows_no_one": "This user isn't following anyone :(",
    "has_no_posts": "This user didn't post anything yet.",
    "email_hidden": "Email Hidden",
    "hidden": "hidden",
    "paginate_description": "Paginate topics and posts instead of using infinite scroll.",
    "topics_per_page": "Topics per Page",
    "posts_per_page": "Posts per Page",
    "notification_sounds": "Play a sound when you receive a notification."
 }
--- a/public/language/en@pirate/users.json
+++ b/public/language/en@pirate/users.json
@@ -0,0 +1,9 @@
 {
    "latest_users": "Land lubbers",
    "top_posters": "Top mateys",
    "most_reputation": "Most Reputation",
    "online": "Online",
    "search": "Search",
    "enter_username": "Gimme y'er handle",
    "load_more": "Load More"
 }
--- a/public/language/en_GB/category.json
+++ b/public/language/en_GB/category.json
@@ -1,14 +1,12 @@
 {
 	"new_topic_button": "New Topic",
 	"no_topics": "<strong>There are no topics in this category.</strong><br />Why don't you try posting one?",
 	"sidebar.recent_replies": "Recent Replies",
 	"sidebar.active_participants": "Active Participants",
 	"sidebar.moderators": "Moderators",
 	"posts": "posts",
 	"views": "views",
 	"posted": "posted",
 	"browsing": "browsing",
 	"no_replies": "No one has replied",
 	"replied": "replied",
-	"last_edited_by": "last edited by"
+	"last_edited_by": "last edited by",
 	"share_this_category": "Share this category"
 }
--- a/public/language/en_GB/global.json
+++ b/public/language/en_GB/global.json
@@ -11,14 +11,20 @@
 	"register": "Register",
 	"login": "Login",
-
+	"please_log_in": "Please Log In",
 	"logout": "Logout",
-	"logout.title": "You are now logged out.",
+
-	"logout.message": "You have successfully logged out of NodeBB",
+	"posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.",
 	"welcome_back": "Welcome Back ",
 	"you_have_successfully_logged_in": "You have successfully logged in",
 	"save_changes": "Save Changes",
 	"close": "Close",
 	"pagination": "Pagination",
 	"header.admin": "Admin",
 	"header.recent": "Recent",
 	"header.unread": "Unread",
@@ -33,10 +39,6 @@
 	"chats.loading": "Loading Chats",
 	"motd.welcome": "Welcome to NodeBB, the discussion platform of the future.",
 	"motd.get": "Get NodeBB",
 	"motd.fork": "Fork",
 	"motd.like": "Like",
 	"motd.follow": "Follow",
 	"previouspage": "Previous Page",
 	"nextpage": "Next Page",
@@ -56,7 +58,10 @@
 	"posted": "posted",
 	"in": "in",
 	"norecentposts": "No Recent Posts",
 	"norecenttopics": "No Recent Topics",
 	"recentposts": "Recent Posts",
 	"recentips": "Recently Logged In IPs",
 	"online": "Online",
 	"away": "Away",
--- a/public/language/en_GB/login.json
+++ b/public/language/en_GB/login.json
@@ -1,6 +1,6 @@
 {
 	"login": "Login",
-	"username": "Username",
+	"username": "Username / Email",
 	"password": "Password",
 	"remember_me": "Remember Me?",
 	"forgot_password": "Forgot Password?",
--- a/public/language/en_GB/pages.json
+++ b/public/language/en_GB/pages.json
@@ -1,12 +1,14 @@
 {
 	"home": "Home",
 	"unread": "Unread Topics",
 	"popular": "Popular Topics",
 	"recent": "Recent Topics",
 	"users": "Registered Users",
 	"notifications": "Notifications",
 	"user.edit": "Editing \"%1\"",
 	"user.following": "People %1 Follows",
 	"user.followers": "People who Follow %1",
 	"user.posts": "Posts made by %1",
 	"user.favourites": "%1's Favourite Posts",
 	"user.settings": "User Settings"
 }
--- a/public/language/en_GB/reset_password.json
+++ b/public/language/en_GB/reset_password.json
@@ -8,6 +8,7 @@
 	"new_password": "New Password",
 	"repeat_password": "Confirm Password",
 	"enter_email": "Please enter your <strong>email address</strong> and we will send you an email with instructions on how to reset your account.",
 	"enter_email_address": "Enter Email Address",
 	"password_reset_sent": "Password Reset Sent",
 	"invalid_email": "Invalid Email / Email does not exist!"
 }
--- a/public/language/en_GB/topic.json
+++ b/public/language/en_GB/topic.json
@@ -1,6 +1,8 @@
 {
 	"topic": "Topic",
 	"topics": "Topics",
 	"topic_id": "Topic ID",
 	"topic_id_placeholder": "Enter topic ID",
 	"no_topics_found": "No topics found!",
 	"no_posts_found": "No posts found!",
@@ -13,6 +15,7 @@
 	"reply": "Reply",
 	"edit": "Edit",
 	"delete": "Delete",
 	"restore": "Restore",
 	"move": "Move",
 	"fork": "Fork",
 	"banned": "banned",
@@ -21,9 +24,26 @@
 	"tools": "Tools",
 	"flag": "Flag",
 	"bookmark_instructions" : "Click here to return to your last position or close to discard.",
 	"flag_title": "Flag this post for moderation",
 	"flag_confirm": "Are you sure you want to flag this post?",
 	"flag_success": "This post has been flagged for moderation.",
 	"deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
 	"following_topic.title": "Following Topic",
 	"following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
 	"not_following_topic.title": "Not Following Topic",
 	"not_following_topic.message": "You will no longer receive notifications from this topic.",
 	"login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
 	"markAsUnreadForAll.success" : "Topic marked as unread for all.",
 	"watch": "Watch",
 	"watch.title": "Be notified of new replies in this topic",
 	"share_this_post": "Share this Post",
 	"thread_tools.title": "Thread Tools",
 	"thread_tools.markAsUnreadForAll": "Mark Unread",
 	"thread_tools.pin": "Pin Topic",
@@ -66,8 +86,18 @@
 	"composer.title_placeholder": "Enter your topic title here...",
 	"composer.write": "Write",
 	"composer.preview": "Preview",
 	"composer.help": "Help",
 	"composer.discard": "Discard",
 	"composer.submit": "Submit",
 	"composer.replying_to": "Replying to",
-	"composer.new_topic": "New Topic"
+	"composer.new_topic": "New Topic",
 	"composer.uploading": "uploading...",
 	"composer.thumb_url_label": "Paste a topic thumbnail URL",
 	"composer.thumb_title": "Add a thumbnail to this topic",
 	"composer.thumb_url_placeholder": "http://example.com/thumb.png",
 	"composer.thumb_file_label": "Or upload a file",
 	"composer.thumb_remove": "Clear fields",
 	"composer.drag_and_drop_images": "Drag and Drop Images Here",
 	"composer.upload_instructions": "Upload images by dragging & dropping them."
 }
--- a/public/language/en_GB/user.json
+++ b/public/language/en_GB/user.json
@@ -5,6 +5,7 @@
 	"email": "Email",
 	"fullname": "Full Name",
 	"website": "Website",
 	"user:website_placeholder": "http://...",
 	"location": "Location",
 	"age": "Age",
 	"joined": "Joined",
@@ -19,12 +20,23 @@
 	"signature": "Signature",
 	"gravatar": "Gravatar",
 	"birthday": "Birthday",
 	"birthday_placeholder": "mm/dd/yyyy",
 	"chat": "Chat",
 	"follow": "Follow",
 	"unfollow": "Unfollow",
 	"change_picture": "Change Picture",
 	"edit": "Edit",
 	"uploaded_picture": "Uploaded Picture",
 	"upload_new_picture": "Upload New Picture",
 	"current_password": "Current Password",
 	"change_password": "Change Password",
 	"change_password_error": "Invalid Password!",
 	"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 are not have the rights to change this password.",
 	"change_password_success": "Your password is updated!",
 	"confirm_password": "Confirm Password",
 	"password": "Password",
@@ -45,5 +57,7 @@
 	"paginate_description" : "Paginate topics and posts instead of using infinite scroll.",
 	"topics_per_page": "Topics per Page",
-	"posts_per_page": "Posts per Page"
+	"posts_per_page": "Posts per Page",
 	"notification_sounds" : "Play a sound when you receive a notification."
 }
--- a/public/language/es/category.json
+++ b/public/language/es/category.json
@@ -1,14 +1,12 @@
 {
    "new_topic_button": "Nuevo Tema",
    "no_topics": "<strong>No hay temas en esta categoría.</strong><br />Por que no te animas y publicas uno?",
    "sidebar.recent_replies": "Respuestas recientes",
    "sidebar.active_participants": "Miembros más activos",
    "sidebar.moderators": "Moderadores",
    "posts": "respuestas",
    "views": "visitas",
    "posted": "posted",
    "browsing": "viendo ahora",
    "no_replies": "Nadie ha respondido aún",
-    "replied": "respondio",
+    "replied": "respondió",
-    "last_edited_by": "ultima edición por"
+    "last_edited_by": "ultima edición por",
    "share_this_category": "Compartir esta categoría"
 }
--- a/public/language/es/footer.json
+++ b/public/language/es/footer.json
@@ -1,7 +1,7 @@
 {
    "stats.online": "Online",
-    "stats.users": "Usuarios",
+    "stats.users": "Gente",
    "stats.topics": "Temas",
    "stats.posts": "Posts",
-    "success": "exito!"
+    "success": "éxito!"
 }
--- a/public/language/es/global.json
+++ b/public/language/es/global.json
@@ -4,20 +4,23 @@
    "buttons.close": "Cerrar",
    "403.title": "Acceso denegado",
    "403.message": "Al parecer no tienes premisos necesarios para estar en este lugar. Tal vez puedes <a href='/login'>intentar conectarte</a>?",
-    "404.title": "Ups... 404, no se encontra che!",
+    "404.title": "Ups... 404, no se encontró lo que buscabas!",
    "404.message": "Al parecer lo que estas buscando no existe. Te recomendamos que vuelvas al <a href='/''>inicio</a>.",
    "500.title": "Error Interno.",
    "500.message": "Ooops! Algo salio mal!, No te alarmes. Nuestros simios hiperinteligentes lo solucionarán",
    "register": "Registrarse",
    "login": "Conectarse",
    "please_log_in": "Por favor conectate.",
    "logout": "Salir",
-    "logout.title": "Te has desconectado.",
+    "posting_restriction_info": "Para publicar debes ser miembro, registrate o conectate.",
-    "logout.message": "Haz sido desconectado correctamente",
+    "welcome_back": "Bienvenido de nuevo!",
    "you_have_successfully_logged_in": "Te has conectado!",
    "save_changes": "Guardar Cambios",
    "close": "Cerrar",
-    "header.admin": "Admin",
+    "pagination": "Paginación",
    "header.admin": "Administración",
    "header.recent": "Recientes",
-    "header.unread": "No Leeidos",
+    "header.unread": "No Leídos",
    "header.popular": "Popular",
    "header.users": "Miembros",
    "header.chats": "Chats",
@@ -26,27 +29,27 @@
    "header.profile": "Perfil",
    "notifications.loading": "Cargando Notificaciones",
    "chats.loading": "Cargando Chats",
-    "motd.welcome": "Bienvenido a NodeBB, la plataforma de debate sobre el futuro.",
+    "motd.welcome": "Bienvenido a NodeBB, la plataforma de debate del el futuro.",
-    "motd.get": "Obtener NodeBB",
+    "previouspage": "Página Anterior",
-    "motd.fork": "Fork",
+    "nextpage": "Siguente Página",
-    "motd.like": "Me gusta",
+    "alert.success": "Éxito!",
    "motd.follow": "Seguir",
    "previouspage": "Pagina Anterior",
    "nextpage": "Siguente Pagina",
    "alert.success": "Exito!",
    "alert.error": "Error",
-    "alert.banned": "Banneado",
+    "alert.banned": "Baneado",
-    "alert.banned.message": "Estas banneado, seras desconectado!",
+    "alert.banned.message": "Estás baneado, serás desconectado!",
-    "alert.unfollow": "Ya no estas siguiendo a %1!",
+    "alert.unfollow": "Ya no estás siguiendo a %1!",
-    "alert.follow": "Estas siguiendo a %1!",
+    "alert.follow": "Estás siguiendo a %1!",
    "posts": "Posts",
    "views": "Visitas",
    "posted": "publicado",
    "in": "en",
-    "recentposts": "Posteos Recientes",
+    "norecentposts": "No hay publicaciones recientes",
    "norecenttopics": "No hay temas recientes",
    "recentposts": "Publicaciones Recientes",
    "recentips": "Conexions recientes de estas IP's",
    "online": "Conectado",
    "away": "No disponible",
    "dnd": "No molestar",
    "invisible": "Invisible",
-    "offline": "Desconectado"
+    "offline": "Desconectado",
    "privacy": "Privacidad"
 }
--- a/public/language/es/login.json
+++ b/public/language/es/login.json
@@ -1,10 +1,10 @@
 {
    "login": "Conectarse",
-    "username": "Usuario",
+    "username": "Usuario / Email",
    "password": "Contraseña",
    "remember_me": "Recordarme?",
    "forgot_password": "Olvidaste tu contraseña?",
    "alternative_logins": "Conexiones Alternativas",
-    "failed_login_attempt": "Error al loguearte, intenta de nuevo.",
+    "failed_login_attempt": "Error al iniciar sesión, intenta otra vez.",
-    "login_successful": "Te has conectado con exito!"
+    "login_successful": "Te has conectado con éxito!"
 }
--- a/public/language/es/modules.json
+++ b/public/language/es/modules.json
@@ -1,6 +1,6 @@
 {
    "chat.chatting_with": "Chatear con <span id='chat-with-name'></span>",
-    "chat.placeholder": "ingresa tu mensaje aqui, y presiona enter para enviar",
+    "chat.placeholder": "ingresa tu mensaje aquí, y presiona Intro para enviar",
    "chat.send": "Enviar",
    "chat.no_active": "No tiene conversaciones activas."
 }
--- a/public/language/es/notifications.json
+++ b/public/language/es/notifications.json
@@ -1,9 +1,9 @@
 {
    "title": "Notificaciones",
-    "no_notifs": "You have no notifications",
+    "no_notifs": "No tiene nuevas notificaciones",
-    "see_all": "See all Notifications",
+    "see_all": "Ver todas las notificaciones",
    "back_to_home": "Volver al Inicio",
-    "outgoing_link": "Link Externo",
+    "outgoing_link": "Enlace Externo",
    "outgoing_link_message": "Estas saliendo del sitio",
    "continue_to": "Continuar",
    "return_to": "Volver a "
--- a/public/language/es/pages.json
+++ b/public/language/es/pages.json
@@ -1,12 +1,14 @@
 {
-    "home": "Home",
+    "home": "Inicio",
-    "unread": "Unread Topics",
+    "unread": "Temas No Leídos",
-    "recent": "Recent Topics",
+    "popular": "Temas Populares",
-    "users": "Registered Users",
+    "recent": "Temas Recientes",
-    "notifications": "Notifications",
+    "users": "Usuarios Registrado",
-    "user.edit": "Editing \"%1\"",
+    "notifications": "Notificaciones",
-    "user.following": "People %1 Follows",
+    "user.edit": "Editando \"%1\"",
-    "user.followers": "People who Follow %1",
+    "user.following": "Gente que sigue %1 ",
-    "user.favourites": "%1's Favourite Posts",
+    "user.followers": "Seguidores de %1",
-    "user.settings": "User Settings"
+    "user.posts": "Posteos de %1",
    "user.favourites": "Publicaciones favoritas de %1 ",
    "user.settings": "Preferencias del Usuario"
 }
--- a/public/language/es/recent.json
+++ b/public/language/es/recent.json
@@ -3,5 +3,5 @@
    "day": "Día",
    "week": "Semana",
    "month": "Mes",
-    "no_recent_topics": "There are no recent topics."
+    "no_recent_topics": "No hay publicaciones recientes"
 }
--- a/public/language/es/register.json
+++ b/public/language/es/register.json
@@ -1,10 +1,10 @@
 {
    "register": "Registrase",
-    "help.email": "Por defecto, tu email será oculto al publico.",
+    "help.email": "Por defecto, tu cuenta de correo electrónico será oculto al publico.",
-    "help.username_restrictions": "El nombre de usuario debe tener entre %1 y %2 caracteres. Los miembros pueden responderte escribiendo @<span id='yourUsername'>usuario</span>.",
+    "help.username_restrictions": "El nombre de usuario debe tener entre %1 y %2 carácteres. Los miembros pueden responderte escribiendo @<span id='yourUsername'>usuario</span>.",
-    "help.minimum_password_length": "Tu contraseña debe tener al menos %1 caracteres.",
+    "help.minimum_password_length": "Tu contraseña debe tener al menos %1 carácteres.",
-    "email_address": "Email",
+    "email_address": "Correo electrónico",
-    "email_address_placeholder": "Escribe tu email",
+    "email_address_placeholder": "Escribe tu correo electrónico",
    "username": "Usuario",
    "username_placeholder": "Escribe tu usuario",
    "password": "Contraseña",
@@ -12,7 +12,7 @@
    "confirm_password": "Confirmar Contraseña",
    "confirm_password_placeholder": "Confirmar Contraseña",
    "register_now_button": "Registrarme ahora",
-    "alternative_registration": "Otros metodos interesantes para registrarse",
+    "alternative_registration": "Otros métodos interesantes para registrarse",
    "terms_of_use": "Términos y Condiciones de uso",
-    "agree_to_terms_of_use": "Acepto los Terminos y condiciones de uso"
+    "agree_to_terms_of_use": "Acepto los Términos y Condiciones de uso"
 }
--- a/public/language/es/reset_password.json
+++ b/public/language/es/reset_password.json
@@ -1,13 +1,14 @@
 {
-    "reset_password": "Resetear Contraseña",
+    "reset_password": "Reiniciar Contraseña",
    "update_password": "Actualizar contraseña",
    "password_changed.title": "Contraseña editada",
-    "password_changed.message": "<p>La contraseña fue modificada con exito, por favor <a href=\"/login\">conectate de nuevo</a>.",
+    "password_changed.message": "<p>La contraseña fue modificada con éxito, por favor <a href=\"/login\">inicia sesión de nuevo</a>.",
-    "wrong_reset_code.title": "Código de Reseteo Incorrecto",
+    "wrong_reset_code.title": "Código de reinicio Incorrecto",
-    "wrong_reset_code.message": "El código de reseteo ingresado no es correcto. Por favor intentalo de nuevo o <a href=\"/reset\">pide un nuevo código</a>.",
+    "wrong_reset_code.message": "El código de reinicio ingresado no es correcto. Por favor inténtalo de nuevo o <a href=\"/reset\">pide un nuevo código</a>.",
    "new_password": "Nueva Contraseña",
    "repeat_password": "Confirmar Contraseña",
-    "enter_email": "Por favor ingresa tu <strong>email</strong> y te enviaremos un email de como resetear tu cuenta.",
+    "enter_email": "Por favor ingresa tu <strong>correo electrónico</strong> y te enviaremos un correo con indicaciones para inicializar tu cuenta.",
-    "password_reset_sent": "Resteo de contraseña enviado",
+    "enter_email_address": "Enter Email Address",
-    "invalid_email": "Email Invalido o no existe!"
+    "password_reset_sent": "Reinicio de contraseña enviado",
    "invalid_email": "Correo Electrónico no válido o inexistente!"
 }
--- a/public/language/es/topic.json
+++ b/public/language/es/topic.json
@@ -1,63 +1,87 @@
 {
    "topic": "Tema",
    "topics": "Temas",
    "topic_id": "Topic ID",
    "topic_id_placeholder": "Enter topic ID",
    "no_topics_found": "No se encontraron temas!",
-    "no_posts_found": "No posts found!",
+    "no_posts_found": "No se encontraron publicaciones!",
    "profile": "Perfil",
    "posted_by": "Publicado por",
    "chat": "Chat",
-    "notify_me": "Seras notificado cuando haya nuevas respuestas en este tema",
+    "notify_me": "Serás notificado cuando haya nuevas respuestas en este tema",
    "quote": "Citar",
    "reply": "Responder",
    "edit": "Editar",
    "delete": "Borrar",
    "restore": "Restaurar",
    "move": "Mover",
-    "fork": "Forkear",
+    "fork": "Bifurcar",
-    "banned": "banneado",
+    "banned": "baneado",
    "link": "Link",
    "share": "Compartir",
    "tools": "Herramientas",
    "flag": "Reportar",
-    "flag_title": "Reportar este post a los moderadores",
+    "bookmark_instructions": "Click aqui para restablecer la ultima posicion del post o cierralo para descartar cambios.",
-    "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
+    "flag_title": "Reportar esta publicación a los moderadores",
    "flag_confirm": "Are you sure you want to flag this post?",
    "flag_success": "This post has been flagged for moderation.",
    "deleted_message": "Este tema ha sido borrado. Solo los miembros con privilegios pueden verlo.",
    "following_topic.title": "Siguendo tema",
    "following_topic.message": "Ahora recibiras notificaciones cuando alguien publique en este tema.",
    "not_following_topic.title": "No sigues este tema",
    "not_following_topic.message": "No recibiras notificaciones de este tema.",
    "login_to_subscribe": "Por favor, conectate para subscribirte a este tema.",
    "markAsUnreadForAll.success": "Marcar todo como leeido.",
    "watch": "Seguir",
    "watch.title": "Serás notificado cuando haya nuevas respuestas en este tema",
    "share_this_post": "Compartir este post",
    "thread_tools.title": "Herramientas del Tema",
-    "thread_tools.markAsUnreadForAll": "Marcar como no leido",
+    "thread_tools.markAsUnreadForAll": "Marcar como no leído",
-    "thread_tools.pin": "Pin Topic",
+    "thread_tools.pin": "Tema Importante",
-    "thread_tools.unpin": "Unpin Topic",
+    "thread_tools.unpin": "Quitar Importante",
-    "thread_tools.lock": "Lock Topic",
+    "thread_tools.lock": "Cerrar Tema",
-    "thread_tools.unlock": "Unlock Topic",
+    "thread_tools.unlock": "Abrir Tema",
-    "thread_tools.move": "Move Topic",
+    "thread_tools.move": "Mover Tema",
-    "thread_tools.fork": "Fork Topic",
+    "thread_tools.fork": "Bifurcar Tema",
-    "thread_tools.delete": "Delete Topic",
+    "thread_tools.delete": "Borrar Tema",
-    "thread_tools.restore": "Restore Topic",
+    "thread_tools.restore": "Restaurar Tema",
-    "load_categories": "Cargando Categorias",
+    "load_categories": "Cargando Categorías",
-    "disabled_categories_note": "Las categorías deshabilidas estan en gris",
+    "disabled_categories_note": "Las categorías deshabilitadas estan en gris",
    "confirm_move": "Mover",
-    "confirm_fork": "Forkear",
+    "confirm_fork": "Bifurcar",
    "favourite": "Favorito",
    "favourites": "Favoritos",
-    "favourites.not_logged_in.title": "No estas conectado :(",
+    "favourites.not_logged_in.title": "No estás conectado :(",
-    "favourites.not_logged_in.message": "Por favor, conectate para agregar a favorito este post.",
+    "favourites.not_logged_in.message": "Por favor, conáctate para agregar a favoritos esta publicación.",
-    "favourites.has_no_favourites": "No tienes favoritos, puedes agregar alguno y volver a verlos aqui!",
+    "favourites.has_no_favourites": "No tienes favoritos, puedes agregar alguno y volver a verlos aquí!",
-    "vote.not_logged_in.title": "Not Logged In",
+    "vote.not_logged_in.title": "No estás conectado",
-    "vote.not_logged_in.message": "Please log in in order to vote",
+    "vote.not_logged_in.message": "Por favor conéctate para votar...",
-    "vote.cant_vote_self.title": "Invalid Vote",
+    "vote.cant_vote_self.title": "Voto Inválido",
-    "vote.cant_vote_self.message": "You cannot vote for your own post",
+    "vote.cant_vote_self.message": "No puedes votar tus propias publicaciones!",
-    "loading_more_posts": "Cargando más posts",
+    "loading_more_posts": "Cargando más publicaciones",
    "move_topic": "Mover Tema",
-    "move_post": "Mover post",
+    "move_post": "Mover Publicación",
-    "fork_topic": "Forkear Tema",
+    "fork_topic": "Bifurcar Tema",
-    "topic_will_be_moved_to": "Este tema sera movido a la categoría",
+    "topic_will_be_moved_to": "Este tema será movido a la categoría",
-    "fork_topic_instruction": "Click en los posts que quieres forkear",
+    "fork_topic_instruction": "Click en las publicaciones que quieres bifurcar",
-    "fork_no_pids": "No seleccionaste posts!",
+    "fork_no_pids": "No seleccionaste publicaciones!",
-    "fork_success": "Forkeado con exito!",
+    "fork_success": "Bifurcado con exito!",
    "reputation": "Reputación",
-    "posts": "Posts",
+    "posts": "Publicaciones",
-    "composer.title_placeholder": "Enter your topic title here...",
+    "composer.title_placeholder": "Ingresa el titulo de tu tema",
-    "composer.write": "Write",
+    "composer.write": "Escribe",
-    "composer.preview": "Preview",
+    "composer.preview": "Previsualización",
-    "composer.discard": "Discard",
+    "composer.help": "Ayuda",
-    "composer.submit": "Submit",
+    "composer.discard": "Descartar",
-    "composer.replying_to": "Replying to",
+    "composer.submit": "Enviar",
-    "composer.new_topic": "New Topic"
+    "composer.replying_to": "Respondiendo a",
    "composer.new_topic": "Nuevo Tema",
    "composer.uploading": "cargando...",
    "composer.thumb_url_label": "Agregar imagen destacada a este tema.",
    "composer.thumb_title": "Agregar miniatura a este tema.",
    "composer.thumb_url_placeholder": "http://ejemplo.com/mini.png",
    "composer.thumb_file_label": "Cargar una foto",
    "composer.thumb_remove": "Limpiar campos.",
    "composer.drag_and_drop_images": "Arrastra las imagenes aqui",
    "composer.upload_instructions": "Carga tus imagenes con solo arrastrarlas aqui."
 }
--- a/public/language/es/unread.json
+++ b/public/language/es/unread.json
@@ -1,6 +1,6 @@
 {
-    "title": "No leeido",
+    "title": "No leído",
    "no_unread_topics": "No hay temas nuevos para leer.",
-    "mark_all_read": "Marcar todo como leeido",
+    "mark_all_read": "Marcar todo como leído",
    "load_more": "Cargar más"
 }
--- a/public/language/es/user.json
+++ b/public/language/es/user.json
@@ -1,39 +1,56 @@
 {
-    "banned": "Banneado",
+    "banned": "Baneado",
    "offline": "Desconectado",
    "username": "Usuario",
-    "email": "Email",
+    "email": "Correo Electrónico",
    "fullname": "Nombre",
-    "website": "Website",
+    "website": "Sitio Web",
    "user:website_placeholder": "http://...",
    "location": "Ubicación",
    "age": "Edad",
    "joined": "Registro",
-    "lastonline": "Última vez online",
+    "lastonline": "Última vez conectado",
-    "profile": "Profile",
+    "profile": "Perfil",
-    "profile_views": "Visitas en su perfil",
+    "profile_views": "Visitas",
    "reputation": "Reputación",
-    "posts": "Posts",
+    "posts": "Publicaciones",
    "favourites": "Favoritos",
    "followers": "Seguidores",
-    "following": "Siguiendo",
+    "following": "Sigue",
    "signature": "Firma",
    "gravatar": "Gravatar",
    "birthday": "Cumpleaños",
    "birthday_placeholder": "mm/dd/yyyy",
    "chat": "Chat!",
    "follow": "Seguir",
    "unfollow": "Dejar de Seguir",
    "change_picture": "Cambiar Foto",
    "edit": "Editar",
    "uploaded_picture": "Fotos Cargadas",
    "upload_new_picture": "Cargar Nueva Foto",
    "current_password": "Contraseña actual",
    "change_password": "Cambiar Contraseña",
    "change_password_error": "Invalid Password!",
    "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 are not have the rights to change this password.",
    "change_password_success": "Your password is updated!",
    "confirm_password": "Confirmar Contraseña",
    "password": "Contraseña",
    "upload_picture": "Cargar foto",
    "upload_a_picture": "Cargar una foto",
-    "image_spec": "Solo puedes usar PNG, JPG, o GIF hasta 256kb.",
+    "image_spec": "Sólo puedes subir imágenes en formato PNG, JPG o GIF.",
    "max": "máx.",
    "settings": "Opciones",
-    "show_email": "Mostrar mi Email",
+    "show_email": "Mostrar mi Correo electrónico",
-    "has_no_follower": "Este miembro no tiene seguidores :(",
+    "has_no_follower": "Este miembro no tiene seguidores.",
-    "follows_no_one": "Este miembro no sigue a nadie, que pena :(",
+    "follows_no_one": "Este miembro no sigue a nadie.",
-    "has_no_posts": "This user didn't post anything yet.",
+    "has_no_posts": "Este usuario aún no ha publicado nada.",
-    "email_hidden": "Email Oculto",
+    "email_hidden": "Correo electrónico Oculto",
-    "hidden": "oculto"
+    "hidden": "oculto",
    "paginate_description": "La paginación de los temas no es por página, ya que tiene scroll infinito.",
    "topics_per_page": "Temas por página",
    "posts_per_page": "Post por página",
    "notification_sounds": "Reproducir un sonido al recibir una notificación"
 }
--- a/public/language/es/users.json
+++ b/public/language/es/users.json
@@ -1,9 +1,9 @@
 {
-    "latest_users": "Ultimos Miembros",
+    "latest_users": "Últimos Miembros",
-    "top_posters": "Top Posteadores",
+    "top_posters": "Top Publicadores",
    "most_reputation": "Mayor Reputación",
    "online": "Conectados",
    "search": "Buscar",
-    "enter_username": "Ingresa el nombre de usuario para buscar",
+    "enter_username": "Ingresa el nombre de usuario que quieres buscar",
    "load_more": "Cargar más"
 }
--- a/public/language/fa_IR/category.json
+++ b/public/language/fa_IR/category.json
@@ -0,0 +1,12 @@
 {
    "new_topic_button": "جستار تازه",
    "no_topics": "<strong>هیچ جستاری در این دسته نیست.</strong><br />چرا شما یکی نفرستید؟",
    "posts": "دیدگاه‌ها",
    "views": "بازدیدها",
    "posted": "فرستاده شده",
    "browsing": "بیننده‌ها",
    "no_replies": "هیچ کسی پاسخ نداده است.",
    "replied": "پاسخ داد",
    "last_edited_by": "آخرین ویرایش از سوی",
    "share_this_category": "به اشتراک‌گذاری این دسته"
 }
--- a/public/language/fa_IR/footer.json
+++ b/public/language/fa_IR/footer.json
@@ -0,0 +1,7 @@
 {
    "stats.online": "حاضر",
    "stats.users": "کاربران",
    "stats.topics": "جُستارها",
    "stats.posts": "دیدگاه‌ها",
    "success": "موفقيت"
 }
--- a/public/language/fa_IR/global.json
+++ b/public/language/fa_IR/global.json
@@ -0,0 +1,55 @@
 {
    "home": "خانه",
    "search": "جستجو",
    "buttons.close": "بستن",
    "403.title": "دسترسی ندارید",
    "403.message": "شما برگه‌ای را فراخوانده‌اید که دسترسی به آن ندارید. شاید باید <a href='/login'>به درون بیایید</a>؟",
    "404.title": "یافت نشد",
    "404.message": "شما برگه‌ای را فراخوانده‌اید که وجود ندارد. به <a href='/'>برگهٔ خانه</a> برگردید.",
    "500.title": "خطای درونی.",
    "500.message": "اوه! گویا اشتباهی رخ داده!",
    "register": "نام‌نویسی",
    "login": "درون آمدن",
    "please_log_in": "لطفا به درون بیایید",
    "logout": "بیرون رفتن",
    "posting_restriction_info": "دیدگاه گذاستن هم‌اکنون به اعضا محدود شده است، برای درون آمدن اینجا را بفشارید.",
    "welcome_back": "خوش آمدید",
    "you_have_successfully_logged_in": "با موفقیت درون آمده‌اید",
    "save_changes": "اندوختن تغییرها",
    "close": "بستن",
    "pagination": "صفحه‌بندی",
    "header.admin": "مدیر",
    "header.recent": "تازه‌ها",
    "header.unread": "نخوانده‌ها",
    "header.popular": "دوست‌داشتنی‌ها",
    "header.users": "کاربران",
    "header.chats": "گفتگوها",
    "header.notifications": "آگاه‌سازی‌ها",
    "header.search": "جستجو",
    "header.profile": "نمایه",
    "notifications.loading": "بارگذاری آگاه‌سازی‌ها",
    "chats.loading": "بارگذاری گفتگوها",
    "motd.welcome": "به NodeBB خوش آمدید،  پلتفرم انجمن‌ساز آینده",
    "previouspage": "برگهٔ پیشین",
    "nextpage": "برگهٔ پسین",
    "alert.success": "موفقیت",
    "alert.error": "خطا",
    "alert.banned": "مسدود",
    "alert.banned.message": "شما بن شده‌اید، به بیرون هدایت خواهید شد.",
    "alert.unfollow": "شما دیگر %1 را دنبال نمی‌کنید!",
    "alert.follow": "اکنون %1 را دنبال می‌کنید.",
    "posts": "دیدگاه‌ها",
    "views": "بازدیدها",
    "posted": "فرستاده شده",
    "in": "در",
    "norecentposts": "هیچ دیدگاه تازه‌ای نیست",
    "norecenttopics": "هیچ جستار تازه‌ای نیست",
    "recentposts": "دیدگاه‌های تازه",
    "recentips": "آخرین IPها",
    "online": "حاضر",
    "away": "دور از دسترس",
    "dnd": "مزاحم نشوید",
    "invisible": "نادیدنی",
    "offline": "غایب",
    "privacy": "حریم خصوصی"
 }
--- a/public/language/fa_IR/language.json
+++ b/public/language/fa_IR/language.json
@@ -0,0 +1,5 @@
 {
    "name": "Persian (Iran)",
    "code": "fa_IR",
    "dir": "rtl"
 }
--- a/public/language/fa_IR/login.json
+++ b/public/language/fa_IR/login.json
@@ -0,0 +1,10 @@
 {
    "login": "درون آمدن",
    "username": "نام کاربری / رایانامه",
    "password": "گذرواژه",
    "remember_me": "مرا به یاد بسپار؟",
    "forgot_password": "گذرواژه را فراموش کرده‌اید؟",
    "alternative_logins": "روش‌های درون آمدن جایگزین",
    "failed_login_attempt": "شکست در درون آمدن، لطفا دوباره تلاش کنید.",
    "login_successful": "شما با موفقیت به درون آمدید!"
 }
--- a/public/language/fa_IR/modules.json
+++ b/public/language/fa_IR/modules.json
@@ -0,0 +1,6 @@
 {
    "chat.chatting_with": "گفتگو با <span id=\"chat-with-name\"></span>",
    "chat.placeholder": "متن را اینجا بنویسد و دکمهٔ‌ Enter را برای فرستادن بفشارید.",
    "chat.send": "فرستادن",
    "chat.no_active": "شما هیچ گفتگوی فعالی ندارید."
 }
--- a/public/language/fa_IR/notifications.json
+++ b/public/language/fa_IR/notifications.json
@@ -0,0 +1,10 @@
 {
    "title": "آگاه‌سازی‌ها",
    "no_notifs": "هیچ آگاه‌سازی تازه‌ای ندارید",
    "see_all": "دیدن همهٔ آگاه‌سازی‌ها",
    "back_to_home": "بازگشت به NodeBB",
    "outgoing_link": "پیوند برون‌رو",
    "outgoing_link_message": "شما در حال ترک اینجایید",
    "continue_to": "رفتن به",
    "return_to": "بازگشت به"
 }
--- a/public/language/fa_IR/pages.json
+++ b/public/language/fa_IR/pages.json
@@ -0,0 +1,14 @@
 {
    "home": "خانه",
    "unread": "جستاره‌های نخوانده",
    "popular": "جستارهای دوست‌داشتنی",
    "recent": "جستارهای تازه",
    "users": "کاربران نام‌نویسی شده",
    "notifications": "آگاه‌سازی‌ها",
    "user.edit": "ویرایش \"%1\"",
    "user.following": "%1 کاربر دنبال می‌کنند",
    "user.followers": "کاربرانی که %1 را دنبال می‌کنند",
    "user.posts": "دیدگاه‌های %1",
    "user.favourites": "دیدگاه‌های پسندیدهٔ %1",
    "user.settings": "تنظیمات کاربر"
 }
--- a/public/language/fa_IR/recent.json
+++ b/public/language/fa_IR/recent.json
@@ -0,0 +1,7 @@
 {
    "title": "تازه‌ها",
    "day": "روز",
    "week": "هفته",
    "month": "ماه",
    "no_recent_topics": "هیچ جستار تازه‌ای نیست."
 }
--- a/public/language/fa_IR/register.json
+++ b/public/language/fa_IR/register.json
@@ -0,0 +1,18 @@
 {
    "register": "نام‌نویسی",
    "help.email": "پیش‌فرض، رایانامهٔ شما از دید همگان پنهان می‌شود.",
    "help.username_restrictions": "یک نام کاربری یکتا بین %1 و %2 نویسه؛ دیگران می‌توانند با @<span id='yourUsername'>نام‌کاربری</span> به شما اشاره کنند.",
    "help.minimum_password_length": "گذرواژه شما باید دست‌کم %1 نویسه داشته باشد.",
    "email_address": "نشانی رایانامه",
    "email_address_placeholder": "نوشتن نشانی رایانامه",
    "username": "نام کاربری",
    "username_placeholder": "نوشتن نام کاربری",
    "password": "گذرواژه",
    "password_placeholder": "نوشتن گذرواژه",
    "confirm_password": "تأیید گذرواژه",
    "confirm_password_placeholder": "تکرار گذرواژه",
    "register_now_button": "اکنون نام‌نویسی کنید",
    "alternative_registration": "روش نام‌نویسی جایگزین",
    "terms_of_use": "شرایط استفاده",
    "agree_to_terms_of_use": "با شرایط استفاده موافقم"
 }
--- a/public/language/fa_IR/reset_password.json
+++ b/public/language/fa_IR/reset_password.json
@@ -0,0 +1,14 @@
 {
    "reset_password": "بازیابی گذرواژه",
    "update_password": "تازه‌سازی گذرواژه",
    "password_changed.title": "گذرواژه تغییر کرد",
    "password_changed.message": "<p>گذرواژه با موفقیت بازیابی شد، لطفا <a href=\"/login\">دوباره درون بیایید</a>.",
    "wrong_reset_code.title": "کد بازیابی نادرست است",
    "wrong_reset_code.message": "کد بازیابی که دریافت شد، نادرست بود. لطفا دوباره تلاش کنید یا <a href=\"/reset\">یک کد بازیابی تازه درخواست کنید</a>.",
    "new_password": "گذرواژهٔ تازه",
    "repeat_password": "تکرار گذرواژه",
    "enter_email": "لطفا <strong>نشانی رایانامهٔ</strong> خود را بنویسید و ما دستورکار بازیابی شناسه‌تان را به این رایانامه می‌فرستیم.",
    "enter_email_address": "نوشتن نشانی رایانامه",
    "password_reset_sent": "رایانامهٔ بازیابی گذرواژه فرستاده شد",
    "invalid_email": "رایانامهٔ نامعتبر / رایانامه وجود ندارد!"
 }
--- a/public/language/fa_IR/topic.json
+++ b/public/language/fa_IR/topic.json
@@ -0,0 +1,87 @@
 {
    "topic": "جُستار",
    "topics": "جُستارها",
    "topic_id": "Topic ID",
    "topic_id_placeholder": "Enter topic ID",
    "no_topics_found": "هیچ جستاری یافت نشد!",
    "no_posts_found": "دیدگاهی یافت نشد!",
    "profile": "نمایه",
    "posted_by": "فرستادهٔ",
    "chat": "گفتگو",
    "notify_me": "از پاسخ‌های تازه در جستار آگاه شوید",
    "quote": "نقل قول",
    "reply": "پاسخ",
    "edit": "ویرایش",
    "delete": "پاک کردن",
    "restore": "برگرداندن",
    "move": "جابه‌جا کردن",
    "fork": "شاخه ساختن",
    "banned": "مسدود",
    "link": "پیوند",
    "share": "اشتراک‌گذاری",
    "tools": "ابزارها",
    "flag": "پرچم",
    "bookmark_instructions": "برای بازگشت به مکان پیشین اینجا را بفشارید یا برای رد دادن ببندید.",
    "flag_title": "پرچم‌گذاری این جستار برای بررسی ناظران",
    "flag_confirm": "Are you sure you want to flag this post?",
    "flag_success": "This post has been flagged for moderation.",
    "deleted_message": "این جستار پاک شده است. تنها کاربران دارای پروانه‌های مدیریت جستار می‌توانند آن را ببینند.",
    "following_topic.title": "جستار را دنبال می‌کنید",
    "following_topic.message": "از این پس اگر کسی در این جستار دیدگاه بگذارد، شما آگاه خواهید شد.",
    "not_following_topic.title": "جستار را دنبال نمی‌کنید",
    "not_following_topic.message": "شما دیگر آگاه‌سازی‌های این جستار را دریافت نخواهید کرد.",
    "login_to_subscribe": "برای دنبال کردن این جستار، لطفا نام‌نویسی کنید یا به درون بیایید.",
    "markAsUnreadForAll.success": "جستار برای همگان نخوانده در نظر گرفته شد.",
    "watch": "تماشا کردن",
    "watch.title": "از پاسخ‌های تازه به این جستار آگاه شوید.",
    "share_this_post": "به اشتراک‌گذاری این جستار",
    "thread_tools.title": "ابزاهای جستار",
    "thread_tools.markAsUnreadForAll": "نخوانده بگیر",
    "thread_tools.pin": "سنجاق زدن جستار",
    "thread_tools.unpin": "برداشتن سنجاق جستار",
    "thread_tools.lock": "قفل کردن جستار",
    "thread_tools.unlock": "باز کردن جستار",
    "thread_tools.move": "جابجا کردن جستار",
    "thread_tools.fork": "شاخه ساختن از جستار",
    "thread_tools.delete": "پاک کردن جستار",
    "thread_tools.restore": "برگرداندن جستار",
    "load_categories": "بارگذاری دسته‌ها",
    "disabled_categories_note": "دسته‌های از کار افتاده به رنگ خاکستری در می‌آیند",
    "confirm_move": "جابه‌جا کردن",
    "confirm_fork": "شاخه ساختن",
    "favourite": "پسندیدن",
    "favourites": "پسندها",
    "favourites.not_logged_in.title": "درون نیامده",
    "favourites.not_logged_in.message": "برای پسندیدن این دیدگاه، لطفا به درون بیایید",
    "favourites.has_no_favourites": "شما هیچ پسندی ندارید، چندین دیدگاه را پسند کنید تا آن‌ها را در اینجا ببینید.",
    "vote.not_logged_in.title": "درون نیامده",
    "vote.not_logged_in.message": "برای رأی دادن، لطفا به درون بیایید",
    "vote.cant_vote_self.title": "رأی نامعتبر",
    "vote.cant_vote_self.message": "نمی‌توانید به دیدگاه خودتان رآی بدهید",
    "loading_more_posts": "بارگذاری دیدگاه‌های بیش‌تر",
    "move_topic": "جابه‌جایی جستار",
    "move_post": "جابه‌جایی جستار",
    "fork_topic": "شاخه ساختن از جستار",
    "topic_will_be_moved_to": "این جستار جابه‌جا خواهد شد به دستهٔ",
    "fork_topic_instruction": "دیدگاه‌هایی را که می‌خواهید به جستار تازه ببرید، برگزینید",
    "fork_no_pids": "هیچ دیدگاهی انتخاب نشده!",
    "fork_success": "جستار با موفقیت منشعب شد.",
    "reputation": "اعتبار",
    "posts": "دیدگاه‌ها",
    "composer.title_placeholder": "سرنویس جستارتان را اینجا بنویسید...",
    "composer.write": "نوشتن",
    "composer.preview": "پیش‌نمایش",
    "composer.help": "راهنمایی",
    "composer.discard": "دور بیانداز",
    "composer.submit": "بفرست",
    "composer.replying_to": "پاسخ به",
    "composer.new_topic": "جستار تازه",
    "composer.uploading": "بارگذاری...",
    "composer.thumb_url_label": "چسباندن نشانی یک تصویر بندانگشتی جستار",
    "composer.thumb_title": "افزودن یک تصویر بندانگشتی به این جستار",
    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
    "composer.thumb_file_label": "یا بارگذاری یک پرونده",
    "composer.thumb_remove": "پاک کردن جعبه‌ها",
    "composer.drag_and_drop_images": "تصویرها را به اینجا بکشید و رها کنید",
    "composer.upload_instructions": "با کشیدن و رها کردن تصویرها، آن‌ها را بار بگذارید."
 }
--- a/public/language/fa_IR/unread.json
+++ b/public/language/fa_IR/unread.json
@@ -0,0 +1,6 @@
 {
    "title": "نخوانده‌ها",
    "no_unread_topics": "جستار خوانده نشده‌ای وجود ندارد.",
    "mark_all_read": "همه را خوانده شده بگیر",
    "load_more": "بارگذاری بیش‌تر"
 }
--- a/public/language/fa_IR/user.json
+++ b/public/language/fa_IR/user.json
@@ -0,0 +1,56 @@
 {
    "banned": "مسدود",
    "offline": "غایب",
    "username": "نام کاربری",
    "email": "رایانامه",
    "fullname": "نام کامل",
    "website": "تارنما",
    "user:website_placeholder": "http://...",
    "location": "محل سکونت",
    "age": "سن",
    "joined": "عضو شده",
    "lastonline": "آخرین حضور",
    "profile": "نمایه",
    "profile_views": "بازدیدهای نمایه",
    "reputation": "اعتبار",
    "posts": "دیدگاه‌ها",
    "favourites": "پسندها",
    "followers": "دنبال‌کننده‌ها",
    "following": "دنبال‌شونده‌ها",
    "signature": "امضا",
    "gravatar": "گراواتار",
    "birthday": "روز تولد",
    "birthday_placeholder": "mm/dd/yyyy",
    "chat": "گفتگو",
    "follow": "دنبال کن",
    "unfollow": "دنبال نکن",
    "change_picture": "تغییر تصویر",
    "edit": "ویرایش",
    "uploaded_picture": "تصویر بارشده",
    "upload_new_picture": "بارگذاری تصویر تازه",
    "current_password": "گذرواژه کنونی",
    "change_password": "تغیر گذرواژه",
    "change_password_error": "Invalid Password!",
    "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 are not have the rights to change this password.",
    "change_password_success": "Your password is updated!",
    "confirm_password": "تکرار گذرواژه",
    "password": "گذرواژه",
    "upload_picture": "بارگذاری تصویر",
    "upload_a_picture": "یک تصویر بارگذاری کنید",
    "image_spec": "شما تنها می‌توانید پرونده‌های PNG‏، JPG و GIF بار بگذارید.",
    "max": "بیشینه",
    "settings": "تنظیمات",
    "show_email": "نمایش رایانامه‌ام",
    "has_no_follower": "این کاربر هیچ دنبال‌کننده‌ای ندارد :(",
    "follows_no_one": "این کاربر هیچ کسی را دنبال نمی‌کند :(",
    "has_no_posts": "این کاربر هنوز هیچ دیدگاهی نگذاشته است.",
    "email_hidden": "رایانامه پنهان شده",
    "hidden": "پنهان",
    "paginate_description": "محدود کردن شمار جستارها و دیدگاه‌ها در هر برگه به جای مرور بی‌پایان برگه‌ها",
    "topics_per_page": "شمار جستارها در هر برگه",
    "posts_per_page": "شمار دیدگاه‌ها در هر برگه",
    "notification_sounds": "پخش صدا هنگامی که شما یک آگاه‌سازی دریافت می‌کنید."
 }
--- a/public/language/fa_IR/users.json
+++ b/public/language/fa_IR/users.json
@@ -0,0 +1,9 @@
 {
    "latest_users": "آخرین کاربران",
    "top_posters": "بهترین فرستنده‌ها",
    "most_reputation": "بیش‌ترین اعتبار",
    "online": "حاضر",
    "search": "جستجو",
    "enter_username": "یک نام کاربری برای جستجو وارد کنید",
    "load_more": "بارگذاری بیش‌تر"
 }
--- a/public/language/fi/category.json
+++ b/public/language/fi/category.json
@@ -1,14 +1,12 @@
 {
-    "new_topic_button": "Aloita uusi keskustelu.",
+    "new_topic_button": "Uusi aihe",
-    "no_topics": "<strong>Tällä aihealueella ei ole yhtään viestiketjua.</strong><br />Miksi et aloittaisi yhtä?",
+    "no_topics": "<strong>Tällä aihealueella ei ole yhtään aihetta.</strong><br />Miksi et aloittaisi uutta?",
    "sidebar.recent_replies": "Viimeisimmät vastaukset",
    "sidebar.active_participants": "Aktiiviset keskustelijat",
    "sidebar.moderators": "Moderaattorit",
    "posts": "viestit",
    "views": "katsottu",
-    "posted": "lähetetty",
+    "posted": "kirjoitettu",
    "browsing": "selaamassa",
    "no_replies": "Kukaan ei ole vastannut",
    "replied": "vastasi",
-    "last_edited_by": "viimeksi muokannut "
+    "last_edited_by": "viimeksi muokannut ",
    "share_this_category": "Share this category"
 }
--- a/public/language/fi/footer.json
+++ b/public/language/fi/footer.json
@@ -1,7 +1,7 @@
 {
    "stats.online": "Online",
    "stats.users": "Käyttäjää",
-    "stats.topics": "Viestiketjua",
+    "stats.topics": "Aihetta",
    "stats.posts": "Viestiä",
    "success": "onnistunut"
 }
--- a/public/language/fi/global.json
+++ b/public/language/fi/global.json
@@ -1,52 +1,55 @@
 {
    "home": "Etusivu",
-    "search": "Etsi",
+    "search": "Hae",
    "buttons.close": "Sulje",
    "403.title": "Pääsy kielletty",
-    "403.message": "Olet päätynyt sivulle jolle sinulla ei ole tarvittavia oikeuksia. Ehkäpä sinun tulisi <a href='/login'>kirjaudu sisään</a>?",
+    "403.message": "Olet päätynyt sivulle, johon sinulla ei ole tarvittavia oikeuksia. Sinun pitäisi kai <a href='/login'>kirjautua sisään</a>.",
-    "404.title": "Sivua ei löydy",
+    "404.title": "Ei löydy",
-    "404.message": "Olet päätynyt sivulle jota ei ole olemassa. Palaa <a href='/'>etusivulle</a>.",
+    "404.message": "Olet päätynyt sivulle, jota ei ole olemassa. Palaa <a href='/'>etusivulle</a>.",
    "500.title": "Sisäinen virhe.",
    "500.message": "Oho! Jotain meni pieleen!",
    "register": "Rekisteröidy",
    "login": "Kirjaudu",
    "please_log_in": "Kirjaudu, ole hyvä",
    "logout": "Kirjaudu ulos",
-    "logout.title": "Olet nyt kirjaunut ulos.",
+    "posting_restriction_info": "Kirjoittaminen on tällä hetkellä rajattu vain rekisteröityneille käyttäjille. Napsauta tätä kirjautuaksesi.",
-    "logout.message": "Olet onnistuneesti kirjautunut ulos NodeBB:stä",
+    "welcome_back": "Tervetuloa takaisin",
    "you_have_successfully_logged_in": "Olet onnistuneesti kirjautunut sisään",
    "save_changes": "Tallenna muutokset",
    "close": "Sulje",
-    "header.admin": "Admin",
+    "pagination": "Sivutus",
    "header.admin": "Ylläpitäjä",
    "header.recent": "Viimeisimmät",
    "header.unread": "Lukemattomat",
-    "header.popular": "Popular",
+    "header.popular": "Suositut",
    "header.users": "Käyttäjät",
-    "header.chats": "Chats",
+    "header.chats": "Keskustelut",
-    "header.notifications": "Notifications",
+    "header.notifications": "Ilmoitukset",
-    "header.search": "Etsi",
+    "header.search": "Hae",
    "header.profile": "Profiili",
-    "notifications.loading": "Ladataan ilmoituksia.",
+    "notifications.loading": "Ladataan ilmoituksia",
    "chats.loading": "Ladataan keskusteluja",
-    "motd.welcome": "Tervetuloa NodeBB:n, tulevaisuuden keskustelualustalle.",
+    "motd.welcome": "Tervetuloa NodeBB:hen, tulevaisuuden keskustelualustalle.",
-    "motd.get": "Hanki NodeBB",
+    "previouspage": "Edellinen sivu",
-    "motd.fork": "Fork",
+    "nextpage": "Seuraava sivu",
-    "motd.like": "Tykkää",
+    "alert.success": "Onnistui",
-    "motd.follow": "Seuraa",
+    "alert.error": "Virhe",
-    "previouspage": "Previous Page",
+    "alert.banned": "Estetty",
-    "nextpage": "Next Page",
+    "alert.banned.message": "Sinut on estetty ja kirjaudut ulos!",
-    "alert.success": "Success",
+    "alert.unfollow": "Et seuraa enää %1!",
-    "alert.error": "Error",
+    "alert.follow": "Seuraat nyt %1!",
-    "alert.banned": "Banned",
+    "posts": "Viestit",
-    "alert.banned.message": "You are banned you will be logged out!",
+    "views": "Katsottu",
-    "alert.unfollow": "You are no longer following %1!",
+    "posted": "kirjoitettu",
-    "alert.follow": "You are now following %1!",
+    "in": "alueelle",
-    "posts": "Posts",
+    "norecentposts": "No Recent Posts",
-    "views": "Views",
+    "norecenttopics": "No Recent Topics",
-    "posted": "posted",
+    "recentposts": "Viimeisimmät viestit",
-    "in": "in",
+    "recentips": "Recently Logged In IPs",
    "recentposts": "Recent Posts",
    "online": "Online",
-    "away": "Away",
+    "away": "Poissa",
-    "dnd": "Do not Disturb",
+    "dnd": "Älä häiritse",
-    "invisible": "Invisible",
+    "invisible": "Näkymätön",
-    "offline": "Offline"
+    "offline": "Offline",
    "privacy": "Yksityisyys"
 }
--- a/public/language/fi/login.json
+++ b/public/language/fi/login.json
@@ -1,10 +1,10 @@
 {
    "login": "Kirjaudu sisään",
-    "username": "Käyttäjän nimi",
+    "username": "Username / Email",
    "password": "Salasana",
    "remember_me": "Muista minut?",
-    "forgot_password": "Unohtuiko salasana?",
+    "forgot_password": "Unohditko salasanasi?",
-    "alternative_logins": "Vaihtoehtoiset sisäänkirjaantumistavat",
+    "alternative_logins": "Vaihtoehtoiset kirjautumistavat",
-    "failed_login_attempt": "Sisäänkirjaantuminen epäonnistui, ole hyvä ja yritä uudestaan.",
+    "failed_login_attempt": "Kirjautumisyritys epäonnistui, ole hyvä ja yritä uudestaan.",
    "login_successful": "Olet onnistuneesti kirjautunut sisään!"
 }
--- a/public/language/fi/modules.json
+++ b/public/language/fi/modules.json
@@ -1,6 +1,6 @@
 {
-    "chat.chatting_with": "Juttele <span id=\"chat-with-name\"></span> kanssa",
+    "chat.chatting_with": "Keskustele käyttäjän <span id=\"chat-with-name\"></span> kanssa",
-    "chat.placeholder": "kirjoita viestisi tähän, paina enter lähettääksesi",
+    "chat.placeholder": "kirjoita viestisi tähän ja paina enter lähettääksesi",
    "chat.send": "Lähetä",
-    "chat.no_active": "Sinulla ei ole aktiivisiä keskusteluita."
+    "chat.no_active": "Sinulla ei ole aktiivisia keskusteluita."
 }
--- a/public/language/fi/notifications.json
+++ b/public/language/fi/notifications.json
@@ -1,8 +1,8 @@
 {
    "title": "Ilmoitukset",
-    "no_notifs": "You have no notifications",
+    "no_notifs": "Sinulla ei ole uusia ilmoituksia",
-    "see_all": "See all Notifications",
+    "see_all": "Katso kaikki ilmoitukset",
-    "back_to_home": "Takaisin NodeBB:n",
+    "back_to_home": "Takaisin NodeBB:hen",
    "outgoing_link": "Ulkopuolinen linkki",
    "outgoing_link_message": "Olet nyt poistumassa",
    "continue_to": "Jatka",
--- a/public/language/fi/pages.json
+++ b/public/language/fi/pages.json
@@ -1,12 +1,14 @@
 {
-    "home": "Home",
+    "home": "Etusivu",
-    "unread": "Unread Topics",
+    "unread": "Lukemattomat aiheet",
-    "recent": "Recent Topics",
+    "popular": "Suositut aiheet",
-    "users": "Registered Users",
+    "recent": "Viimeisimmät aiheet",
-    "notifications": "Notifications",
+    "users": "Rekisteröityneet käyttäjät",
-    "user.edit": "Editing \"%1\"",
+    "notifications": "Ilmoitukset",
-    "user.following": "People %1 Follows",
+    "user.edit": "Muokataan \"%1\"",
-    "user.followers": "People who Follow %1",
+    "user.following": "Käyttäjät, joita %1 seuraa",
-    "user.favourites": "%1's Favourite Posts",
+    "user.followers": "Käyttäjät, jotka seuraavat käyttäjää %1",
-    "user.settings": "User Settings"
+    "user.posts": "Posts made by %1",
    "user.favourites": "Käyttäjän %1 suosikkiviestit",
    "user.settings": "Käyttäjän asetukset"
 }
--- a/public/language/fi/recent.json
+++ b/public/language/fi/recent.json
@@ -1,7 +1,7 @@
 {
-    "title": "Recent",
+    "title": "Viimeisimmät",
    "day": "Päivä",
    "week": "Viikko",
    "month": "Kuukausi",
-    "no_recent_topics": "There are no recent topics."
+    "no_recent_topics": "Ei viimeisimpiä aiheita."
 }
--- a/public/language/fi/register.json
+++ b/public/language/fi/register.json
@@ -1,18 +1,18 @@
 {
    "register": "Rekisteröidy",
-    "help.email": "Oletuksena sähköposti osoitettasi ei näytetä muille .",
+    "help.email": "Oletuksena sähköpostiosoitettasi ei näytetä muille.",
-    "help.username_restrictions": "Yksilöllinen käyttäjänimi, pitää olla %1 - %2 merkkiä pitkä. Toiset voivat mainita sinut @<span id='yourUsername'>käyttäjänimi</span>.",
+    "help.username_restrictions": "Yksilöllisen käyttäjätunnuksen pitää olla %1-%2 merkkiä pitkä. Toiset voivat mainita sinut @<span id='yourUsername'>username</span>.",
    "help.minimum_password_length": "Salasanasi pitää olla vähintään %1 merkin mittainen.",
-    "email_address": "Sähköposti",
+    "email_address": "Sähköpostiosoite",
-    "email_address_placeholder": "Anna sähköpostiosoitteesi",
+    "email_address_placeholder": "Syötä sähköpostiosoitteesi",
-    "username": "Käyttäjänimi",
+    "username": "Käyttäjätunnus",
-    "username_placeholder": "Syötä käyttäjänimesi",
+    "username_placeholder": "Syötä käyttäjätunnuksesi",
    "password": "Salasana",
    "password_placeholder": "Syötä salasanasi",
-    "confirm_password": "Vahvista salasana",
+    "confirm_password": "Vahvista salasanasi",
-    "confirm_password_placeholder": "Vahvista salasana",
+    "confirm_password_placeholder": "Vahvista salasanasi",
    "register_now_button": "Rekisteröidy nyt",
    "alternative_registration": "Vaihtoehtoiset rekisteröitymistavat",
-    "terms_of_use": "Terms of Use",
+    "terms_of_use": "Käyttöehdot",
-    "agree_to_terms_of_use": "I agree to the Terms of Use"
+    "agree_to_terms_of_use": "Hyväksyn käyttöehdot"
 }
--- a/public/language/fi/reset_password.json
+++ b/public/language/fi/reset_password.json
@@ -2,12 +2,13 @@
    "reset_password": "Palauta salasana",
    "update_password": "Päivitä salasana",
    "password_changed.title": "Salasana muutettu",
-    "password_changed.message": "<p>Salasana palautettu onnistunesti, ole hyvä ja <a href=\"/login\">kirjaudu sisään uudestaan.</a>.",
+    "password_changed.message": "<p>Salasanasi on palautettu onnistuneesti, ole hyvä ja <a href=\"/login\">kirjaudu uudestaan</a>.",
    "wrong_reset_code.title": "Väärä palautuskoodi",
-    "wrong_reset_code.message": "Annettu palautuskoodi oli väärä. Ole hyvä yritä uudelleen, tai <a href=\"/reset\">pyydä uutta palautuskoodia</a>.",
+    "wrong_reset_code.message": "Annettu palautuskoodi oli väärä. Ole hyvä ja yritä uudelleen tai <a href=\"/reset\">pyydä uutta palautuskoodia</a>.",
    "new_password": "Uusi salasana",
    "repeat_password": "Vahvista salasana",
-    "enter_email": "Syötä <strong>sähköpostiosoitteesi</strong> niin me lähetämänne Sinulle ohjeet kuinka voit palauttaa käyttäjätilisi.",
+    "enter_email": "Syötä <strong>sähköpostiosoitteesi</strong>, niin me lähetämme sinulle sähköpostilla ohjeet käyttäjätilisi palauttamiseksi.",
-    "password_reset_sent": "Salasanan palautus lähetetty",
+    "enter_email_address": "Enter Email Address",
-    "invalid_email": "Väärä sähköpostiosoite / Sähköpostiosoitetta ei ole!"
+    "password_reset_sent": "Salasanan palautuskoodi lähetetty",
    "invalid_email": "Virheellinen sähköpostiosoite / Sähköpostiosoitetta ei ole olemassa!"
 }
--- a/public/language/fi/topic.json
+++ b/public/language/fi/topic.json
@@ -1,63 +1,87 @@
 {
-    "topic": "Keskustelu",
+    "topic": "Aihe",
-    "topics": "Keskustelut",
+    "topics": "Aiheet",
-    "no_topics_found": "Keskusteluja ei löytynyt!",
+    "topic_id": "Topic ID",
-    "no_posts_found": "No posts found!",
+    "topic_id_placeholder": "Enter topic ID",
    "no_topics_found": "Aiheita ei löytynyt!",
    "no_posts_found": "Viestejä ei löytynyt!",
    "profile": "Profiili",
-    "posted_by": "Posted by",
+    "posted_by": "Kirjoittanut",
-    "chat": "Juttele",
+    "chat": "Keskustele",
-    "notify_me": "Ilmoita uusista viesteistä tässä keskustelussa",
+    "notify_me": "Ilmoita, kun tähän keskusteluun tulee uusia viestejä",
    "quote": "Lainaa",
    "reply": "Vastaa",
    "edit": "Muokkaa",
    "delete": "Poista",
    "restore": "Restore",
    "move": "Siirrä",
    "fork": "Haaroita",
-    "banned": "banned",
+    "banned": "estetty",
-    "link": "Linkkaa",
+    "link": "Linkitä",
    "share": "Jaa",
    "tools": "Työkalut",
-    "flag": "Flag",
+    "flag": "Ilmianna",
-    "flag_title": "Flag this post for moderation",
+    "bookmark_instructions": "Click here to return to your last position or close to discard.",
-    "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
+    "flag_title": "Ilmianna tämä viesti moderaattoreille",
-    "thread_tools.title": "Ketjun työkalut",
+    "flag_confirm": "Are you sure you want to flag this post?",
-    "thread_tools.markAsUnreadForAll": "Merkitse luetuiksi",
+    "flag_success": "This post has been flagged for moderation.",
-    "thread_tools.pin": "Pin Topic",
+    "deleted_message": "Tämä viestiketju on poistettu. Vain käyttäjät, joilla on viestiketjujen hallintaoikeudet, voivat nähdä sen.",
-    "thread_tools.unpin": "Unpin Topic",
+    "following_topic.title": "Seurataan aihetta",
-    "thread_tools.lock": "Lock Topic",
+    "following_topic.message": "Saat nyt ilmoituksen, kun joku kirjoittaa tähän aiheeseen.",
-    "thread_tools.unlock": "Unlock Topic",
+    "not_following_topic.title": "Et seuraa aihetta",
-    "thread_tools.move": "Move Topic",
+    "not_following_topic.message": "Et saa enää ilmoituksia tästä aiheesta.",
-    "thread_tools.fork": "Fork Topic",
+    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
-    "thread_tools.delete": "Delete Topic",
+    "markAsUnreadForAll.success": "Topic marked as unread for all.",
-    "thread_tools.restore": "Restore Topic",
+    "watch": "Tarkkaile",
    "watch.title": "Be notified of new replies in this topic",
    "share_this_post": "Jaa tämä viesti",
    "thread_tools.title": "Aiheen työkalut",
    "thread_tools.markAsUnreadForAll": "Merkitse lukemattomaksi",
    "thread_tools.pin": "Kiinnitä aihe",
    "thread_tools.unpin": "Poista aiheen kiinnitys",
    "thread_tools.lock": "Lukitse aihe",
    "thread_tools.unlock": "Poista aiheen lukitus",
    "thread_tools.move": "Siirrä aihe",
    "thread_tools.fork": "Haaroita aihe",
    "thread_tools.delete": "Poista aihe",
    "thread_tools.restore": "Palauta aihe",
    "load_categories": "Ladataan aihealueita",
-    "disabled_categories_note": "Käytöstä poistetut aihealueetta ovat harmaina",
+    "disabled_categories_note": "Käytöstä poistetut aihealueet ovat harmaina",
    "confirm_move": "Siirrä",
    "confirm_fork": "Haaroita",
-    "favourite": "Suosikki",
+    "favourite": "Lisää suosikiksi",
    "favourites": "Suosikit",
-    "favourites.not_logged_in.title": "Ei kirjaantuneena sisään",
+    "favourites.not_logged_in.title": "Et ole kirjautunut",
-    "favourites.not_logged_in.message": "Kirjaudu sisään jotta voit lisätä tämän viestin suosikkeihisi.",
+    "favourites.not_logged_in.message": "Kirjaudu sisään, jotta voit lisätä tämän viestin suosikkeihisi",
-    "favourites.has_no_favourites": "Sinulla ei ole yhtään suosikkiviestiä.",
+    "favourites.has_no_favourites": "Sinulla ei ole yhtään suosikkiviestiä. Lisää joitakin viestejä suosikeiksi nähdäksesi ne täällä!",
-    "vote.not_logged_in.title": "Not Logged In",
+    "vote.not_logged_in.title": "Et ole kirjautunut",
-    "vote.not_logged_in.message": "Please log in in order to vote",
+    "vote.not_logged_in.message": "Kirjaudu sisään äänestääksesi",
-    "vote.cant_vote_self.title": "Invalid Vote",
+    "vote.cant_vote_self.title": "Virheellinen ääni",
-    "vote.cant_vote_self.message": "You cannot vote for your own post",
+    "vote.cant_vote_self.message": "Et voi äänestää omaa viestiäsi",
    "loading_more_posts": "Ladataan lisää viestejä",
-    "move_topic": "Siirrä keskustelu",
+    "move_topic": "Siirrä aihe",
    "move_post": "Siirrä viesti",
    "fork_topic": "Haaroita keskustelu",
-    "topic_will_be_moved_to": "Tämä keskustelu siirretään aihealueelle ",
+    "topic_will_be_moved_to": "Tämä keskustelu siirretään aihealueelle",
-    "fork_topic_instruction": "Klikkaa viestejä jotka haluat haaroittaa",
+    "fork_topic_instruction": "Napsauta viestejä, jotka haluat haaroittaa",
    "fork_no_pids": "Ei valittuja viestejä!",
    "fork_success": "Keskustelu haaroitettu onnistuneesti!",
    "reputation": "Maine",
    "posts": "Viestejä",
-    "composer.title_placeholder": "Enter your topic title here...",
+    "composer.title_placeholder": "Syötä aiheesi otsikko tähän...",
-    "composer.write": "Write",
+    "composer.write": "Kirjoita",
-    "composer.preview": "Preview",
+    "composer.preview": "Esikatsele",
-    "composer.discard": "Discard",
+    "composer.help": "Help",
-    "composer.submit": "Submit",
+    "composer.discard": "Hylkää",
-    "composer.replying_to": "Replying to",
+    "composer.submit": "Lähetä",
-    "composer.new_topic": "New Topic"
+    "composer.replying_to": "Vastataan aiheeseen",
    "composer.new_topic": "Uusi aihe",
    "composer.uploading": "uploading...",
    "composer.thumb_url_label": "Paste a topic thumbnail URL",
    "composer.thumb_title": "Add a thumbnail to this topic",
    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
    "composer.thumb_file_label": "Or upload a file",
    "composer.thumb_remove": "Clear fields",
    "composer.drag_and_drop_images": "Vedä ja pudota kuvat tähän",
    "composer.upload_instructions": "Lataa kuvia vetämällä & pudottamalla ne."
 }
--- a/Show More
+++ b/Show More