Merge branch '0.5.1' into topic_searching

.tx/config

@@ -613,4 +613,112 @@ trans.tr = public/language/tr/tags.json
 trans.vi = public/language/vi/tags.json
 trans.zh_CN = public/language/zh_CN/tags.json
 trans.zh_TW = public/language/zh_TW/tags.json
+type = KEYVALUEJSON
+
+[nodebb.email]
+source_file = public/language/en_GB/email.json
+source_lang = en_GB
+trans.ar = public/language/ar/email.json
+trans.cs = public/language/cs/email.json
+trans.de = public/language/de/email.json
+trans.en_US = public/language/en_US/email.json
+trans.en@pirate = public/language/en@pirate/email.json
+trans.es = public/language/es/email.json
+trans.et = public/language/et/email.json
+trans.fa_IR = public/language/fa_IR/email.json
+trans.fi = public/language/fi/email.json
+trans.fr = public/language/fr/email.json
+trans.he = public/language/he/email.json
+trans.hu = public/language/hu/email.json
+trans.it = public/language/it/email.json
+trans.ja = public/language/ja/email.json
+trans.ko = public/language/ko/email.json
+trans.lt = public/language/lt/email.json
+trans.ms = public/language/ms/email.json
+trans.nb = public/language/nb/email.json
+trans.nl = public/language/nl/email.json
+trans.pl = public/language/pl/email.json
+trans.pt_BR = public/language/pt_BR/email.json
+trans.ru = public/language/ru/email.json
+trans.ro = public/language/ro/email.json
+trans.sc = public/language/sc/email.json
+trans.sk = public/language/sk/email.json
+trans.sv = public/language/sv/email.json
+trans.th = public/language/th/email.json
+trans.tr = public/language/tr/email.json
+trans.vi = public/language/vi/email.json
+trans.zh_CN = public/language/zh_CN/email.json
+trans.zh_TW = public/language/zh_TW/email.json
+type = KEYVALUEJSON
+
+[nodebb.search]
+source_file = public/language/en_GB/search.json
+source_lang = en_GB
+trans.ar = public/language/ar/search.json
+trans.cs = public/language/cs/search.json
+trans.de = public/language/de/search.json
+trans.en_US = public/language/en_US/search.json
+trans.en@pirate = public/language/en@pirate/search.json
+trans.es = public/language/es/search.json
+trans.et = public/language/et/search.json
+trans.fa_IR = public/language/fa_IR/search.json
+trans.fi = public/language/fi/search.json
+trans.fr = public/language/fr/search.json
+trans.he = public/language/he/search.json
+trans.hu = public/language/hu/search.json
+trans.it = public/language/it/search.json
+trans.ja = public/language/ja/search.json
+trans.ko = public/language/ko/search.json
+trans.lt = public/language/lt/search.json
+trans.ms = public/language/ms/search.json
+trans.nb = public/language/nb/search.json
+trans.nl = public/language/nl/search.json
+trans.pl = public/language/pl/search.json
+trans.pt_BR = public/language/pt_BR/search.json
+trans.ru = public/language/ru/search.json
+trans.ro = public/language/ro/search.json
+trans.sc = public/language/sc/search.json
+trans.sk = public/language/sk/search.json
+trans.sv = public/language/sv/search.json
+trans.th = public/language/th/search.json
+trans.tr = public/language/tr/search.json
+trans.vi = public/language/vi/search.json
+trans.zh_CN = public/language/zh_CN/search.json
+trans.zh_TW = public/language/zh_TW/search.json
+type = KEYVALUEJSON
+
+[nodebb.groups]
+source_file = public/language/en_GB/groups.json
+source_lang = en_GB
+trans.ar = public/language/ar/groups.json
+trans.cs = public/language/cs/groups.json
+trans.de = public/language/de/groups.json
+trans.en_US = public/language/en_US/groups.json
+trans.en@pirate = public/language/en@pirate/groups.json
+trans.es = public/language/es/groups.json
+trans.et = public/language/et/groups.json
+trans.fa_IR = public/language/fa_IR/groups.json
+trans.fi = public/language/fi/groups.json
+trans.fr = public/language/fr/groups.json
+trans.he = public/language/he/groups.json
+trans.hu = public/language/hu/groups.json
+trans.it = public/language/it/groups.json
+trans.ja = public/language/ja/groups.json
+trans.ko = public/language/ko/groups.json
+trans.lt = public/language/lt/groups.json
+trans.ms = public/language/ms/groups.json
+trans.nb = public/language/nb/groups.json
+trans.nl = public/language/nl/groups.json
+trans.pl = public/language/pl/groups.json
+trans.pt_BR = public/language/pt_BR/groups.json
+trans.ru = public/language/ru/groups.json
+trans.ro = public/language/ro/groups.json
+trans.sc = public/language/sc/groups.json
+trans.sk = public/language/sk/groups.json
+trans.sv = public/language/sv/groups.json
+trans.th = public/language/th/groups.json
+trans.tr = public/language/tr/groups.json
+trans.vi = public/language/vi/groups.json
+trans.zh_CN = public/language/zh_CN/groups.json
+trans.zh_TW = public/language/zh_TW/groups.json
 type = KEYVALUEJSON

README.md

@@ -1,5 +1,5 @@
 # <img alt="NodeBB" src="http://i.imgur.com/mYxPPtB.png" />
-[![Build Status](https://travis-ci.org/NodeBB/NodeBB.svg?branch=master)](https://travis-ci.org/nodebb/nodebb)
+[![Build Status](https://travis-ci.org/NodeBB/NodeBB.svg?branch=master)](https://travis-ci.org/NodeBB/NodeBB)
 [![Dependency Status](https://david-dm.org/nodebb/nodebb.svg)](https://david-dm.org/nodebb/nodebb)
 [![Code Climate](https://codeclimate.com/github/designcreateplay/NodeBB.png)](https://codeclimate.com/github/designcreateplay/NodeBB)
 

app.js

@@ -141,7 +141,13 @@ function start() {
 					nconf.set('url', nconf.get('base_url') + (nconf.get('use_port') ? ':' + nconf.get('port') : '') + nconf.get('relative_path'));
 
 					plugins.ready(function() {
-						webserver.init();
+						webserver.init(function() {
+							// If this callback is called, this means that loader.js is used
+							process.on('SIGCONT', webserver.listen);
+							process.send({
+								action: 'ready'
+							});
+						});
 					});
 
 					process.on('SIGTERM', shutdown);
@@ -313,6 +319,8 @@ function shutdown(code) {
 	winston.info('[app] Shutdown (SIGTERM/SIGINT) Initialised.');
 	require('./src/database').close();
 	winston.info('[app] Database connection closed.');
+	require('./src/webserver').server.close();
+	winston.info('[app] Web server closed to connections.');
 
 	winston.info('[app] Shutdown complete.');
 	process.exit(code || 0);

bcrypt.js

@@ -0,0 +1,30 @@
+
+'use strict';
+
+
+var bcrypt = require('bcryptjs');
+
+process.on('message', function(m) {
+	if (m.type === 'hash') {
+		hash(m.rounds, m.password);
+	} else if (m.type === 'compare') {
+		compare(m.password, m.hash);
+	}
+});
+
+function hash(rounds, password) {
+	bcrypt.genSalt(rounds, function(err, salt) {
+		if (err) {
+			return process.send({type:'hash', err: {message: err.message}});
+		}
+		bcrypt.hash(password, salt, function(err, hash) {
+			process.send({type:'hash', err: err ? {message: err.message} : null, hash: hash, password: password});
+		});
+	});
+}
+
+function compare(password, hash) {
+	bcrypt.compare(password, hash, function(err, res) {
+		process.send({type:'compare', err: err ? {message: err.message} : null, hash: hash, password: password, result: res});
+	});
+}

install/data/defaults.json

@@ -63,6 +63,10 @@
         "field": "maximumProfileImageSize",
         "value": 256
     },
+    {
+        "field": "profileImageDimension",
+        "value": 128
+    },
     {
         "field": "chatMessagesToDisplay",
         "value": 50

loader.js

@@ -5,8 +5,7 @@ var	nconf = require('nconf'),
 	pidFilePath = __dirname + '/pidfile',
 	output = fs.openSync(__dirname + '/logs/output.log', 'a'),
 	start = function() {
-		var	fork = require('child_process').fork,
+		var	nbb_start = function(callback) {
-			nbb_start = function() {
 				if (timesStarted > 3) {
 					console.log('\n[loader] Experienced three start attempts in 10 seconds, most likely an error on startup. Halting.');
 					return nbb_stop();
@@ -18,14 +17,24 @@ var	nconf = require('nconf'),
 				}
 				startTimer = setTimeout(resetTimer, 1000*10);
 
-				nbb = fork('./app', process.argv.slice(2), {
+				if (nbb) {
+					nbbOld = nbb;
+				}
+
+				nbb = require('child_process').fork('./app', process.argv.slice(2), {
 					env: process.env
 				});
 
 				nbb.on('message', function(message) {
 					if (message && typeof message === 'object' && message.action) {
-						if (message.action === 'restart') {
+						switch (message.action) {
-							nbb_restart();
+							case 'ready':
+								if (!callback) return nbb.kill('SIGCONT');
+								callback();
+							break;
+							case 'restart':
+								nbb_restart();
+							break;
 						}
 					}
 				});
@@ -52,10 +61,12 @@ var	nconf = require('nconf'),
 				}
 			},
 			nbb_restart = function() {
-				nbb.removeAllListeners('exit').on('exit', function() {
+				nbb_start(function() {
-					nbb_start();
+					nbbOld.removeAllListeners('exit').on('exit', function() {
+						nbb.kill('SIGCONT');
+					});
+					nbbOld.kill();
 				});
-				nbb.kill();
 			},
 			resetTimer = function() {
 				clearTimeout(startTimer);
@@ -70,7 +81,7 @@ var	nconf = require('nconf'),
 
 		nbb_start();
 	},
-	nbb;
+	nbb, nbbOld;
 
 nconf.argv();
 

package.json

@@ -2,7 +2,7 @@
   "name": "nodebb",
   "license": "GPLv3 or later",
   "description": "NodeBB Forum",
-  "version": "0.4.3",
+  "version": "0.5.0-2",
   "homepage": "http://www.nodebb.org",
   "repository": {
     "type": "git",
@@ -34,7 +34,7 @@
     "less": "~1.7.3",
     "mkdirp": "~0.5.0",
     "nconf": "~0.6.7",
-    "nodebb-plugin-dbsearch": "0.0.12",
+    "nodebb-plugin-dbsearch": "0.0.13",
     "nodebb-plugin-markdown": "~0.5.0",
     "nodebb-plugin-mentions": "~0.5.0",
     "nodebb-plugin-soundpack-default": "~0.1.1",
@@ -58,7 +58,7 @@
     "validator": "~3.16.1",
     "winston": "~0.7.2",
     "xregexp": "~2.0.0",
-    "templates.js": "0.0.8"
+    "templates.js": "0.0.13"
   },
   "devDependencies": {
     "mocha": "~1.13.0"
@@ -67,7 +67,7 @@
     "url": "https://github.com/NodeBB/NodeBB/issues"
   },
   "engines": {
-    "node": ">=0.8"
+    "node": ">=0.10"
   },
   "maintainers": [
     {

public/language/ar/email.json

@@ -0,0 +1,20 @@
+{
+    "password-reset-requested": "Password Reset Requested - %1!",
+    "welcome-to": "Welcome to %1",
+    "greeting_no_name": "Hello",
+    "greeting_with_name": "Hello %1",
+    "welcome.text1": "Thank you for registering with %1!",
+    "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.",
+    "welcome.cta": "Click here to confirm your email address",
+    "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
+    "reset.text2": "To continue with the password reset, please click on the following link:",
+    "reset.cta": "Click here to reset your password",
+    "digest.notifications": "You have some unread notifications from %1:",
+    "digest.latest_topics": "Latest topics from %1",
+    "digest.cta": "Click here to visit %1",
+    "digest.unsub.info": "This digest was sent to you due to your subscription settings.",
+    "digest.unsub.cta": "Click here to alter those settings",
+    "digest.daily.no_topics": "There have been no active topics in the past day",
+    "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+    "closing": "Thanks!"
+}

public/language/ar/error.json

@@ -25,6 +25,7 @@
     "no-user": "المستخدم لا يوجد",
     "no-teaser": "Teaser doesn't exist",
     "no-privileges": "You don't have enough privileges for this action.",
+    "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
     "category-disabled": "Category disabled",
     "topic-locked": "الموضوع مقفول",
     "still-uploading": "الرجاء انتظار الرفع",

public/language/ar/footer.json

@@ -1,7 +0,0 @@
-{
-    "stats.online": "حالياً على الموقع",
-    "stats.users": "مستخدمين",
-    "stats.topics": "مواضيع",
-    "stats.posts": "مشاركات",
-    "success": "نجاح"
-}

public/language/ar/global.json

@@ -13,7 +13,7 @@
     "please_log_in": "Please Log In",
     "logout": "تسجيل الخروج",
     "posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.",
-    "welcome_back": "Welcome Back ",
+    "welcome_back": "Welcome Back",
     "you_have_successfully_logged_in": "You have successfully logged in",
     "save_changes": "حفظ التغييرات",
     "close": "أغلق",

public/language/ar/groups.json

@@ -0,0 +1,7 @@
+{
+    "view_group": "View Group",
+    "details.title": "Group Details",
+    "details.members": "Member List",
+    "details.has_no_posts": "This group's members have not made any posts.",
+    "details.latest_posts": "Latest Posts"
+}

public/language/ar/notifications.json

@@ -4,12 +4,11 @@
     "see_all": "See all Notifications",
     "back_to_home": "Back to %1",
     "outgoing_link": "رابط خارجي",
-    "outgoing_link_message": "أنت الأن ترحل",
+    "outgoing_link_message": "You are now leaving %1.",
-    "continue_to": "أكمل إلى",
+    "continue_to": "Continue to %1",
-    "return_to": "Return to",
+    "return_to": "Return to %1",
     "new_notification": "New Notification",
     "you_have_unread_notifications": "You have unread notifications.",
-    "user_made_post": "<strong>%1</strong> made a new post",
     "new_message_from": "New message from <strong>%1</strong>",
     "upvoted_your_post": "<strong>%1</strong> has upvoted your post.",
     "favourited_your_post": "<strong>%1</strong> has favourited your post.",

public/language/ar/pages.json

@@ -5,6 +5,7 @@
     "recent": "Recent Topics",
     "users": "Registered Users",
     "notifications": "Notifications",
+    "tags": "Topics tagged under \"%1\"",
     "user.edit": "Editing \"%1\"",
     "user.following": "People %1 Follows",
     "user.followers": "People who Follow %1",

public/language/ar/search.json

@@ -0,0 +1,3 @@
+{
+    "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+}

public/language/ar/topic.json

@@ -87,6 +87,7 @@
     "more_users_and_guests": "%1 more user(s) and %2 guest(s)",
     "more_users": "%1 more user(s)",
     "more_guests": "%1 more guest(s)",
+    "users_and_others": "%1 and %2 others",
     "sort_by": "Sort by",
     "oldest_to_newest": "Oldest to Newest",
     "newest_to_oldest": "Newest to Oldest",

public/language/cs/email.json

@@ -0,0 +1,20 @@
+{
+    "password-reset-requested": "Password Reset Requested - %1!",
+    "welcome-to": "Welcome to %1",
+    "greeting_no_name": "Hello",
+    "greeting_with_name": "Hello %1",
+    "welcome.text1": "Thank you for registering with %1!",
+    "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.",
+    "welcome.cta": "Click here to confirm your email address",
+    "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
+    "reset.text2": "To continue with the password reset, please click on the following link:",
+    "reset.cta": "Click here to reset your password",
+    "digest.notifications": "You have some unread notifications from %1:",
+    "digest.latest_topics": "Latest topics from %1",
+    "digest.cta": "Click here to visit %1",
+    "digest.unsub.info": "This digest was sent to you due to your subscription settings.",
+    "digest.unsub.cta": "Click here to alter those settings",
+    "digest.daily.no_topics": "There have been no active topics in the past day",
+    "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+    "closing": "Thanks!"
+}

public/language/cs/error.json

@@ -25,6 +25,7 @@
     "no-user": "User doesn't exist",
     "no-teaser": "Teaser doesn't exist",
     "no-privileges": "You don't have enough privileges for this action.",
+    "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
     "category-disabled": "Category disabled",
     "topic-locked": "Topic Locked",
     "still-uploading": "Please wait for uploads to complete.",

public/language/cs/footer.json

@@ -1,7 +0,0 @@
-{
-    "stats.online": "Online",
-    "stats.users": "Uživatelé",
-    "stats.topics": "Témata",
-    "stats.posts": "Příspěvky",
-    "success": "úspěch"
-}

public/language/cs/global.json

@@ -13,7 +13,7 @@
     "please_log_in": "Please Log In",
     "logout": "Odhlásit se",
     "posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.",
-    "welcome_back": "Welcome Back ",
+    "welcome_back": "Welcome Back",
     "you_have_successfully_logged_in": "You have successfully logged in",
     "save_changes": "Uložit změny",
     "close": "Zrušit",

public/language/cs/groups.json

@@ -0,0 +1,7 @@
+{
+    "view_group": "View Group",
+    "details.title": "Group Details",
+    "details.members": "Member List",
+    "details.has_no_posts": "This group's members have not made any posts.",
+    "details.latest_posts": "Latest Posts"
+}

public/language/cs/notifications.json

@@ -4,12 +4,11 @@
     "see_all": "See all Notifications",
     "back_to_home": "Back to %1",
     "outgoing_link": "Odkaz mimo fórum",
-    "outgoing_link_message": "Nyní opouštíte fórum",
+    "outgoing_link_message": "You are now leaving %1.",
-    "continue_to": "Přejít na",
+    "continue_to": "Continue to %1",
-    "return_to": "Return to",
+    "return_to": "Return to %1",
     "new_notification": "New Notification",
     "you_have_unread_notifications": "You have unread notifications.",
-    "user_made_post": "<strong>%1</strong> made a new post",
     "new_message_from": "New message from <strong>%1</strong>",
     "upvoted_your_post": "<strong>%1</strong> has upvoted your post.",
     "favourited_your_post": "<strong>%1</strong> has favourited your post.",

public/language/cs/pages.json

@@ -5,6 +5,7 @@
     "recent": "Recent Topics",
     "users": "Registered Users",
     "notifications": "Notifications",
+    "tags": "Topics tagged under \"%1\"",
     "user.edit": "Editing \"%1\"",
     "user.following": "People %1 Follows",
     "user.followers": "People who Follow %1",

public/language/cs/search.json

@@ -0,0 +1,3 @@
+{
+    "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+}

public/language/cs/topic.json

@@ -87,6 +87,7 @@
     "more_users_and_guests": "%1 more user(s) and %2 guest(s)",
     "more_users": "%1 more user(s)",
     "more_guests": "%1 more guest(s)",
+    "users_and_others": "%1 and %2 others",
     "sort_by": "Sort by",
     "oldest_to_newest": "Oldest to Newest",
     "newest_to_oldest": "Newest to Oldest",

public/language/de/email.json

@@ -0,0 +1,20 @@
+{
+    "password-reset-requested": "Zurücksetzung des Passworts beantragt - %1!",
+    "welcome-to": "Willkommen zu %1",
+    "greeting_no_name": "Hallo",
+    "greeting_with_name": "Hallo %1",
+    "welcome.text1": "Vielen Dank für die Registrierung mit %1!",
+    "welcome.text2": "Um dein Konto vollständig zu aktivieren, müssen wir überprüfen, ob du Besitzer der E-Mail-Adresse bist, mit der du dich registriert hast.",
+    "welcome.cta": "Klicke hier, um deine E-Mail-Adresse zu bestätigen.",
+    "reset.text1": "Wir haben eine Anfrage auf Zurücksetzung deines Passworts erhalten, wahrscheinlich, weil du es vergessen hast. Falls dies nicht der Fall ist, ignoriere bitte diese E-Mail.",
+    "reset.text2": "Klicke bitte auf den folgenden Link, um mit der Zurücksetzung deines Passworts fortzufahren:",
+    "reset.cta": "Klicke hier, um dein Passwort zurückzusetzen",
+    "digest.notifications": "Du hast einige ungelesene Benachrichtigungen vom %1:",
+    "digest.latest_topics": "Aktuellste Themen vom %1",
+    "digest.cta": "Klicke hier, um %1 zu besuchen",
+    "digest.unsub.info": "Diese Zusammenfassung wurde dir aufgrund deiner Abonnement-Einstellungen gesendet.",
+    "digest.unsub.cta": "Klicke hier, um diese Einstellungen zu ändern",
+    "digest.daily.no_topics": "Es gab heute keine aktiven Themen",
+    "test.text1": "Dies ist eine Test-E-Mail, um zu überprüfen, ob der E-Mailer deines NodeBB korrekt eingestellt wurde.",
+    "closing": "Danke!"
+}

public/language/de/error.json

@@ -25,6 +25,7 @@
     "no-user": "Der Benutzer existiert nicht",
     "no-teaser": "Kurztext existiert nicht",
     "no-privileges": "Du verfügst nicht über ausreichende Berechtigungen, um die Aktion durchzuführen.",
+    "no-emailers-configured": "Es wurde keine E-Mail-Plugins geladen, weshalb eine Test-E-Mail nicht gesendet werden konnte.",
     "category-disabled": "Kategorie ist deaktiviert",
     "topic-locked": "Thema ist gesperrt",
     "still-uploading": "Bitte warte bis der Vorgang abgeschlossen ist.",

public/language/de/footer.json

@@ -1,7 +0,0 @@
-{
-    "stats.online": "Online",
-    "stats.users": "Benutzer",
-    "stats.topics": "Themen",
-    "stats.posts": "Beiträge",
-    "success": "Erfolg"
-}

public/language/de/groups.json

@@ -0,0 +1,7 @@
+{
+    "view_group": "Gruppe betrachten",
+    "details.title": "Gruppendetails",
+    "details.members": "Mitgliederliste",
+    "details.has_no_posts": "Die Mitglieder dieser Gruppe haben keine Beiträge verfasst.",
+    "details.latest_posts": "Aktuelle Beiträge"
+}

public/language/de/notifications.json

@@ -4,12 +4,11 @@
     "see_all": "Alle Benachrichtigungen ansehen",
     "back_to_home": "Zurück zu %1",
     "outgoing_link": "Externer Link",
-    "outgoing_link_message": "Du verlässt nun",
+    "outgoing_link_message": "Du verlässt nun %1.",
-    "continue_to": "Gehe weiter zu",
+    "continue_to": "Fortfahren zu %1",
-    "return_to": "Zurück zu",
+    "return_to": "Kehre zurück zu %1",
     "new_notification": "Neue Benachrichtigung",
     "you_have_unread_notifications": "Du hast ungelesene Benachrichtigungen.",
-    "user_made_post": "<strong>%1</strong> hat einen Beitrag erstellt.",
     "new_message_from": "Neue Nachricht von <strong>%1</strong>",
     "upvoted_your_post": "<strong>%1</strong> hat deinen Beitrag positiv bewertet.",
     "favourited_your_post": "<strong>%1</strong> favorisiert deinen Beitrag.",

public/language/de/pages.json

@@ -5,6 +5,7 @@
     "recent": "Neueste Themen",
     "users": "Registrierte User",
     "notifications": "Benachrichtigungen",
+    "tags": "Topics tagged under \"%1\"",
     "user.edit": "Bearbeite \"%1\"",
     "user.following": "Nutzer, die %1 folgt",
     "user.followers": "Nutzer, die %1 folgen",

public/language/de/search.json

@@ -0,0 +1,3 @@
+{
+    "results_matching": "%1 Ergebniss(e) stimmen mit \"%2\" überein, (%3 Sekunden)"
+}

public/language/de/tags.json

@@ -1,6 +1,6 @@
 {
-    "no_tag_topics": "There are no topics with this tag.",
+    "no_tag_topics": "Es gibt keine Themen mit diesem Tag.",
     "tags": "Tags",
-    "enter_tags_here": "Enter tags here. Press enter after each tag.",
+    "enter_tags_here": "Gib hier Tags ein und drück die Eingabetaste nach jedem Tag.",
-    "no_tags": "There are no tags yet."
+    "no_tags": "Es gibt bisher keine Tags."
 }

public/language/de/topic.json

@@ -87,6 +87,7 @@
     "more_users_and_guests": "%1 weitere(r) Nutzer und %2 Gäste",
     "more_users": "%1 weitere(r) Nutzer",
     "more_guests": "%1 weitere Gäste",
+    "users_and_others": "%1 and %2 others",
     "sort_by": "Sortieren nach",
     "oldest_to_newest": "Älteste zuerst",
     "newest_to_oldest": "Neuster zuerst",

public/language/en@pirate/email.json

@@ -0,0 +1,20 @@
+{
+    "password-reset-requested": "Password Reset Requested - %1!",
+    "welcome-to": "Welcome to %1",
+    "greeting_no_name": "Hello",
+    "greeting_with_name": "Hello %1",
+    "welcome.text1": "Thank you for registering with %1!",
+    "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.",
+    "welcome.cta": "Click here to confirm your email address",
+    "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
+    "reset.text2": "To continue with the password reset, please click on the following link:",
+    "reset.cta": "Click here to reset your password",
+    "digest.notifications": "You have some unread notifications from %1:",
+    "digest.latest_topics": "Latest topics from %1",
+    "digest.cta": "Click here to visit %1",
+    "digest.unsub.info": "This digest was sent to you due to your subscription settings.",
+    "digest.unsub.cta": "Click here to alter those settings",
+    "digest.daily.no_topics": "There have been no active topics in the past day",
+    "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+    "closing": "Thanks!"
+}

public/language/en@pirate/error.json

@@ -25,6 +25,7 @@
     "no-user": "User doesn't exist",
     "no-teaser": "Teaser doesn't exist",
     "no-privileges": "You don't have enough privileges for this action.",
+    "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
     "category-disabled": "Category disabled",
     "topic-locked": "Topic Locked",
     "still-uploading": "Please wait for uploads to complete.",

public/language/en@pirate/footer.json

@@ -1,7 +0,0 @@
-{
-    "stats.online": "Online",
-    "stats.users": "Mates",
-    "stats.topics": "Topics",
-    "stats.posts": "Messages",
-    "success": "success"
-}

public/language/en@pirate/global.json

@@ -13,7 +13,7 @@
     "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",
+    "welcome_back": "Welcome Back",
     "you_have_successfully_logged_in": "Ye have successfully logged in",
     "save_changes": "Save yer Changes",
     "close": "Shoot down",

public/language/en@pirate/groups.json

@@ -0,0 +1,7 @@
+{
+    "view_group": "View Group",
+    "details.title": "Group Details",
+    "details.members": "Member List",
+    "details.has_no_posts": "This group's members have not made any posts.",
+    "details.latest_posts": "Latest Posts"
+}

public/language/en@pirate/notifications.json

@@ -4,12 +4,11 @@
     "see_all": "Spy wit' ye eye all ye notifications",
     "back_to_home": "Back to %1",
     "outgoing_link": "Go offshore",
-    "outgoing_link_message": "Ye be goin' offshore",
+    "outgoing_link_message": "You are now leaving %1.",
-    "continue_to": "Continue to",
+    "continue_to": "Continue to %1",
-    "return_to": "Return to",
+    "return_to": "Return to %1",
     "new_notification": "New Notification",
     "you_have_unread_notifications": "You have unread notifications.",
-    "user_made_post": "<strong>%1</strong> made a new post",
     "new_message_from": "New message from <strong>%1</strong>",
     "upvoted_your_post": "<strong>%1</strong> has upvoted your post.",
     "favourited_your_post": "<strong>%1</strong> has favourited your post.",

public/language/en@pirate/pages.json

@@ -5,6 +5,7 @@
     "recent": "Recent Topics",
     "users": "Registered Users",
     "notifications": "Notifications",
+    "tags": "Topics tagged under \"%1\"",
     "user.edit": "Editing \"%1\"",
     "user.following": "People %1 Follows",
     "user.followers": "People who Follow %1",

public/language/en@pirate/search.json

@@ -0,0 +1,3 @@
+{
+    "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+}

public/language/en@pirate/topic.json

@@ -87,6 +87,7 @@
     "more_users_and_guests": "%1 more user(s) and %2 guest(s)",
     "more_users": "%1 more user(s)",
     "more_guests": "%1 more guest(s)",
+    "users_and_others": "%1 and %2 others",
     "sort_by": "Sort by",
     "oldest_to_newest": "Oldest to Newest",
     "newest_to_oldest": "Newest to Oldest",

public/language/en_GB/error.json

@@ -75,5 +75,7 @@
 
 	"cant-chat-with-yourself": "You can't chat with yourself!",
 
-	"not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+	"not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",
+
+	"reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
 }

public/language/en_GB/modules.json

@@ -13,7 +13,7 @@
 	"chat.pop-out": "Pop out chat",
 	"chat.maximize": "Maximize",
 
-	"composer.user_said_in": "%1 said in %2:\n",
+	"composer.user_said_in": "%1 said in %2:",
-	"composer.user_said": "%1 said:\n",
+	"composer.user_said": "%1 said:",
 	"composer.discard": "Are you sure you wish to discard this post?"
 }

public/language/en_GB/notifications.json

@@ -13,10 +13,13 @@
 
 	"new_message_from": "New message from <strong>%1</strong>",
 	"upvoted_your_post": "<strong>%1</strong> has upvoted your post.",
+	"moved_your_post": "<strong>%1<strong> has moved your post.",
+	"moved_your_topic": "<strong>%1<strong> has moved your topic.",
 	"favourited_your_post": "<strong>%1</strong> has favourited your post.",
 	"user_flagged_post": "<strong>%1</strong> flagged a post.",
 	"user_posted_to" : "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
 	"user_mentioned_you_in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
+	"user_started_following_you": "<strong>%1</strong> started following you.",
 
 	"email-confirmed": "Email Confirmed",
 	"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",

public/language/en_GB/pages.json

@@ -5,6 +5,7 @@
 	"recent": "Recent Topics",
 	"users": "Registered Users",
 	"notifications": "Notifications",
+	"tags": "Topics tagged under \"%1\"",
 	"user.edit": "Editing \"%1\"",
 	"user.following": "People %1 Follows",
 	"user.followers": "People who Follow %1",

public/language/en_GB/recent.json

@@ -4,5 +4,6 @@
 	"week": "Week",
 	"month": "Month",
 	"year": "Year",
+	"alltime": "All Time",
 	"no_recent_topics": "There are no recent topics."
 }

public/language/en_GB/topic.json

@@ -105,6 +105,7 @@
 	"more_users_and_guests": "%1 more user(s) and %2 guest(s)",
 	"more_users": "%1 more user(s)",
 	"more_guests": "%1 more guest(s)",
+	"users_and_others": "%1 and %2 others",
 
 	"sort_by": "Sort by",
 	"oldest_to_newest": "Oldest to Newest",

public/language/en_GB/user.json

@@ -5,6 +5,8 @@
 
 	"email": "Email",
 	"confirm_email": "Confirm Email",
+	"delete_account": "Delete Account",
+	"delete_account_confirm": "Are you sure you want to delete your account?",
 
 	"fullname": "Full Name",
 	"website": "Website",
@@ -71,5 +73,8 @@
 	"notification_sounds" : "Play a sound when you receive a notification.",
 
 	"browsing": "Browsing Settings",
-	"open_links_in_new_tab": "Open outgoing links in new tab?"
+	"open_links_in_new_tab": "Open outgoing links in new tab?",
+
+	"follow_topics_you_reply_to": "Follow topics that you reply to.",
+	"follow_topics_you_create": "Follow topics you create."
 }

public/language/en_US/email.json

@@ -0,0 +1,20 @@
+{
+    "password-reset-requested": "Password Reset Requested - %1!",
+    "welcome-to": "Welcome to %1",
+    "greeting_no_name": "Hello",
+    "greeting_with_name": "Hello %1",
+    "welcome.text1": "Thank you for registering with %1!",
+    "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.",
+    "welcome.cta": "Click here to confirm your email address",
+    "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
+    "reset.text2": "To continue with the password reset, please click on the following link:",
+    "reset.cta": "Click here to reset your password",
+    "digest.notifications": "You have some unread notifications from %1:",
+    "digest.latest_topics": "Latest topics from %1",
+    "digest.cta": "Click here to visit %1",
+    "digest.unsub.info": "This digest was sent to you due to your subscription settings.",
+    "digest.unsub.cta": "Click here to alter those settings",
+    "digest.daily.no_topics": "There have been no active topics in the past day",
+    "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+    "closing": "Thanks!"
+}

public/language/en_US/error.json

@@ -25,6 +25,7 @@
     "no-user": "User doesn't exist",
     "no-teaser": "Teaser doesn't exist",
     "no-privileges": "You don't have enough privileges for this action.",
+    "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
     "category-disabled": "Category disabled",
     "topic-locked": "Topic Locked",
     "still-uploading": "Please wait for uploads to complete.",

public/language/en_US/footer.json

@@ -1,7 +0,0 @@
-{
-    "stats.online": "Online",
-    "stats.users": "Users",
-    "stats.topics": "Topics",
-    "stats.posts": "Posts",
-    "success": "success"
-}

public/language/en_US/groups.json

@@ -0,0 +1,7 @@
+{
+    "view_group": "View Group",
+    "details.title": "Group Details",
+    "details.members": "Member List",
+    "details.has_no_posts": "This group's members have not made any posts.",
+    "details.latest_posts": "Latest Posts"
+}

public/language/en_US/notifications.json

@@ -4,12 +4,11 @@
     "see_all": "See all Notifications",
     "back_to_home": "Back to %1",
     "outgoing_link": "Outgoing Link",
-    "outgoing_link_message": "You are now leaving",
+    "outgoing_link_message": "You are now leaving %1.",
-    "continue_to": "Continue to",
+    "continue_to": "Continue to %1",
-    "return_to": "Return to",
+    "return_to": "Return to %1",
     "new_notification": "New Notification",
     "you_have_unread_notifications": "You have unread notifications.",
-    "user_made_post": "<strong>%1</strong> made a new post",
     "new_message_from": "New message from <strong>%1</strong>",
     "upvoted_your_post": "<strong>%1</strong> has upvoted your post.",
     "favourited_your_post": "<strong>%1</strong> has favorited your post.",

public/language/en_US/pages.json

@@ -5,6 +5,7 @@
     "recent": "Recent Topics",
     "users": "Registered Users",
     "notifications": "Notifications",
+    "tags": "Topics tagged under \"%1\"",
     "user.edit": "Editing \"%1\"",
     "user.following": "People %1 Follows",
     "user.followers": "People who Follow %1",

public/language/en_US/search.json

@@ -0,0 +1,3 @@
+{
+    "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+}

public/language/en_US/topic.json

@@ -87,6 +87,7 @@
     "more_users_and_guests": "%1 more user(s) and %2 guest(s)",
     "more_users": "%1 more user(s)",
     "more_guests": "%1 more guest(s)",
+    "users_and_others": "%1 and %2 others",
     "sort_by": "Sort by",
     "oldest_to_newest": "Oldest to Newest",
     "newest_to_oldest": "Newest to Oldest",

public/language/es/email.json

@@ -0,0 +1,20 @@
+{
+    "password-reset-requested": "Password Reset Requested - %1!",
+    "welcome-to": "Welcome to %1",
+    "greeting_no_name": "Hello",
+    "greeting_with_name": "Hello %1",
+    "welcome.text1": "Thank you for registering with %1!",
+    "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.",
+    "welcome.cta": "Click here to confirm your email address",
+    "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
+    "reset.text2": "To continue with the password reset, please click on the following link:",
+    "reset.cta": "Click here to reset your password",
+    "digest.notifications": "You have some unread notifications from %1:",
+    "digest.latest_topics": "Latest topics from %1",
+    "digest.cta": "Click here to visit %1",
+    "digest.unsub.info": "This digest was sent to you due to your subscription settings.",
+    "digest.unsub.cta": "Click here to alter those settings",
+    "digest.daily.no_topics": "There have been no active topics in the past day",
+    "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+    "closing": "Thanks!"
+}

public/language/es/error.json

@@ -25,6 +25,7 @@
     "no-user": "El usuario no existe",
     "no-teaser": "El extracto del tema no existe.",
     "no-privileges": "No tienes los privilegios necesarios para esa acción.",
+    "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
     "category-disabled": "Categoría deshabilitada.",
     "topic-locked": "Tema bloqueado.",
     "still-uploading": "Por favor, espera a que terminen las subidas.",

public/language/es/footer.json

@@ -1,7 +0,0 @@
-{
-    "stats.online": "Online",
-    "stats.users": "Gente",
-    "stats.topics": "Temas",
-    "stats.posts": "Posts",
-    "success": "éxito!"
-}

public/language/es/groups.json

@@ -0,0 +1,7 @@
+{
+    "view_group": "View Group",
+    "details.title": "Group Details",
+    "details.members": "Member List",
+    "details.has_no_posts": "This group's members have not made any posts.",
+    "details.latest_posts": "Latest Posts"
+}

public/language/es/notifications.json

@@ -4,12 +4,11 @@
     "see_all": "Ver todas las notificaciones",
     "back_to_home": "Volver a %1",
     "outgoing_link": "Enlace Externo",
-    "outgoing_link_message": "Estas saliendo del sitio",
+    "outgoing_link_message": "You are now leaving %1.",
-    "continue_to": "Continuar",
+    "continue_to": "Continue to %1",
-    "return_to": "Volver a",
+    "return_to": "Return to %1",
     "new_notification": "Nueva Notificación",
     "you_have_unread_notifications": "Tienes notificaciones sin leer.",
-    "user_made_post": "<strong>%1</strong> hizo una nueva publicación",
     "new_message_from": "Nuevo mensaje de <strong>%1</strong>",
     "upvoted_your_post": "<strong>%1</strong> ha marcado como favorita tu respuesta.",
     "favourited_your_post": "<strong>%1</strong> ha marcado como favorita tu respuesta.",

public/language/es/pages.json

@@ -5,6 +5,7 @@
     "recent": "Temas Recientes",
     "users": "Usuarios Registrado",
     "notifications": "Notificaciones",
+    "tags": "Topics tagged under \"%1\"",
     "user.edit": "Editando \"%1\"",
     "user.following": "Gente que sigue %1 ",
     "user.followers": "Seguidores de %1",

public/language/es/search.json

@@ -0,0 +1,3 @@
+{
+    "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+}

public/language/es/tags.json

@@ -1,6 +1,6 @@
 {
-    "no_tag_topics": "There are no topics with this tag.",
+    "no_tag_topics": "No hay temas con esta etiqueta.",
-    "tags": "Tags",
+    "tags": "Etiquetas",
-    "enter_tags_here": "Enter tags here. Press enter after each tag.",
+    "enter_tags_here": "Introduce las etiquetas aquí. Pulsa intro desde de cada una.",
-    "no_tags": "There are no tags yet."
+    "no_tags": "Aún no hay etiquetas."
 }

public/language/es/topic.json

@@ -87,6 +87,7 @@
     "more_users_and_guests": "%1 usuario(s) y %2 invitado(s) más",
     "more_users": "%1 usuario(s) más",
     "more_guests": "%1 invitado(s) más",
+    "users_and_others": "%1 and %2 others",
     "sort_by": "Ordenar por",
     "oldest_to_newest": "Más antiguo a más nuevo",
     "newest_to_oldest": "Más nuevo a más antiguo",

public/language/et/email.json

@@ -0,0 +1,20 @@
+{
+    "password-reset-requested": "Password Reset Requested - %1!",
+    "welcome-to": "Welcome to %1",
+    "greeting_no_name": "Hello",
+    "greeting_with_name": "Hello %1",
+    "welcome.text1": "Thank you for registering with %1!",
+    "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.",
+    "welcome.cta": "Click here to confirm your email address",
+    "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
+    "reset.text2": "To continue with the password reset, please click on the following link:",
+    "reset.cta": "Click here to reset your password",
+    "digest.notifications": "You have some unread notifications from %1:",
+    "digest.latest_topics": "Latest topics from %1",
+    "digest.cta": "Click here to visit %1",
+    "digest.unsub.info": "This digest was sent to you due to your subscription settings.",
+    "digest.unsub.cta": "Click here to alter those settings",
+    "digest.daily.no_topics": "There have been no active topics in the past day",
+    "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+    "closing": "Thanks!"
+}

public/language/et/error.json

@@ -25,6 +25,7 @@
     "no-user": "Kasutajat ei eksisteeri",
     "no-teaser": "Eelvaadet ei eksisteeri",
     "no-privileges": "Sul pole piisvalt õigusi.",
+    "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
     "category-disabled": "Kategooria keelatud",
     "topic-locked": "Teema lukustatud",
     "still-uploading": "Palun oota, kuni üleslaadimised on laetud.",

public/language/et/footer.json

@@ -1,7 +0,0 @@
-{
-    "stats.online": "Sees",
-    "stats.users": "Kasutajad",
-    "stats.topics": "Teemad",
-    "stats.posts": "Postitused",
-    "success": "õnnestus"
-}

public/language/et/global.json

@@ -50,9 +50,9 @@
     "read_more": "loe veel",
     "posted_ago_by_guest": "postitatud %1 tagasi külalise poolt",
     "posted_ago_by": "postitatud %1 tagasi kasutaja %2 poolt",
-    "posted_ago": "postitatud %1 tagasi",
+    "posted_ago": "postitatud %1",
     "posted_in_ago_by_guest": "postitatud kategooriasse %1 %2 tagasi külalise poolt",
-    "posted_in_ago_by": "postitatud kategooriasse %1 %2 aega tagasi kasutaja %3 poolt",
+    "posted_in_ago_by": "postitatud kategooriasse %1 %2 kasutaja %3 poolt",
     "posted_in_ago": "postitatud kategooriasse %1 %2 tagasi",
     "replied_ago": "vastas %1",
     "user_posted_ago": "kasutaja %1 postitas %2 tagasi",

public/language/et/groups.json

@@ -0,0 +1,7 @@
+{
+    "view_group": "View Group",
+    "details.title": "Group Details",
+    "details.members": "Member List",
+    "details.has_no_posts": "This group's members have not made any posts.",
+    "details.latest_posts": "Latest Posts"
+}

public/language/et/notifications.json

@@ -4,12 +4,11 @@
     "see_all": "Vaata kõiki teateid",
     "back_to_home": "Tagasi %1",
     "outgoing_link": "Väljaminev link",
-    "outgoing_link_message": "Lahkud foorumist",
+    "outgoing_link_message": "You are now leaving %1.",
-    "continue_to": "Jätka",
+    "continue_to": "Continue to %1",
-    "return_to": "Pöördu tagasi",
+    "return_to": "Return to %1",
     "new_notification": "Uus teade",
     "you_have_unread_notifications": "Sul ei ole lugemata teateid.",
-    "user_made_post": "<strong>%1</strong> tegi uue postituse",
     "new_message_from": "Uus sõnum kasutajalt <strong>%1</strong>",
     "upvoted_your_post": "<strong>%1</strong> hääletas sinu postituse poolt.",
     "favourited_your_post": "<strong>%1</strong> märkis sinu postituse lemmikuks.",

public/language/et/pages.json

@@ -5,6 +5,7 @@
     "recent": "Hiljutised teemad",
     "users": "Registreeritud kasutajad",
     "notifications": "Teated",
+    "tags": "Topics tagged under \"%1\"",
     "user.edit": "Muudan \"%1\"",
     "user.following": "Kasutaja %1 jälgib",
     "user.followers": "Kasutajad, kes jälgivad %1",

public/language/et/search.json

@@ -0,0 +1,3 @@
+{
+    "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+}

public/language/et/topic.json

@@ -41,7 +41,7 @@
     "thread_tools.pin": "Tõsta esile teema",
     "thread_tools.unpin": "Märgista teema",
     "thread_tools.lock": "Lukusta teema",
-    "thread_tools.unlock": "Eemalda märgistatud teema",
+    "thread_tools.unlock": "Taasava teema",
     "thread_tools.move": "Liiguta teema",
     "thread_tools.move_all": "Liiguta kõik",
     "thread_tools.fork": "Fork Topic",
@@ -87,6 +87,7 @@
     "more_users_and_guests": "%1 kasutaja(t) ja %2 külalist",
     "more_users": "veel %1 kasutaja(t)",
     "more_guests": "veel %1 külalist",
+    "users_and_others": "%1 and %2 others",
     "sort_by": "Sorteeri",
     "oldest_to_newest": "Vanematest uuemateni",
     "newest_to_oldest": "Uuematest vanemateni",

public/language/fa_IR/email.json

@@ -0,0 +1,20 @@
+{
+    "password-reset-requested": "Password Reset Requested - %1!",
+    "welcome-to": "Welcome to %1",
+    "greeting_no_name": "Hello",
+    "greeting_with_name": "Hello %1",
+    "welcome.text1": "Thank you for registering with %1!",
+    "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.",
+    "welcome.cta": "Click here to confirm your email address",
+    "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
+    "reset.text2": "To continue with the password reset, please click on the following link:",
+    "reset.cta": "Click here to reset your password",
+    "digest.notifications": "You have some unread notifications from %1:",
+    "digest.latest_topics": "Latest topics from %1",
+    "digest.cta": "Click here to visit %1",
+    "digest.unsub.info": "This digest was sent to you due to your subscription settings.",
+    "digest.unsub.cta": "Click here to alter those settings",
+    "digest.daily.no_topics": "There have been no active topics in the past day",
+    "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+    "closing": "Thanks!"
+}

public/language/fa_IR/error.json

@@ -15,7 +15,7 @@
     "invalid-pagination-value": "عدد صفحه‌بندی نامعتبر است.",
     "username-taken": "این نام کاربری گرفته شده است.",
     "email-taken": "این رایانامه گرفته شده است.",
-    "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
+    "email-not-confirmed": "رایانامه شما تأیید نشده است، لطفاً برای تأیید رایانامه‌تان اینجا را بفشارید.",
     "username-too-short": "نام کاربری خیلی کوتاه است.",
     "user-banned": "کاربر محروم شد.",
     "no-category": "چنین دسته‌ای وجود ندارد.",
@@ -25,6 +25,7 @@
     "no-user": "چنین کاربری وجود ندارد.",
     "no-teaser": "چکیدهٔ دیدگاه وجود ندارد.",
     "no-privileges": "شما دسترسی کافی برای این کار را ندارید.",
+    "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
     "category-disabled": "دسته غیر‌فعال شد.",
     "topic-locked": "جستار بسته شد.",
     "still-uploading": "خواهشمندیم تا پایان بارگذاری‌ها شکیبا باشید.",

public/language/fa_IR/footer.json

@@ -1,7 +0,0 @@
-{
-    "stats.online": "حاضر",
-    "stats.users": "کاربران",
-    "stats.topics": "جُستارها",
-    "stats.posts": "دیدگاه‌ها",
-    "success": "موفقيت"
-}

public/language/fa_IR/groups.json

@@ -0,0 +1,7 @@
+{
+    "view_group": "View Group",
+    "details.title": "Group Details",
+    "details.members": "Member List",
+    "details.has_no_posts": "This group's members have not made any posts.",
+    "details.latest_posts": "Latest Posts"
+}

public/language/fa_IR/modules.json

@@ -1,17 +1,17 @@
 {
     "chat.chatting_with": "گفتگو با <span id=\"chat-with-name\"></span>",
-    "chat.placeholder": "Type chat message here, press enter to send",
+    "chat.placeholder": "پیام گفتگو را اینجا بنویسید، دکمه Enter را بزنید تا فرستاده شود.",
     "chat.send": "فرستادن",
     "chat.no_active": "شما هیچ گفتگوی فعالی ندارید.",
     "chat.user_typing": "%1 در حال نوشتن است...",
     "chat.user_has_messaged_you": "%1 به شما پیام داده است.",
     "chat.see_all": "نمایش تمامی گفتگوها",
-    "chat.no-messages": "Please select a recipient to view chat message history",
+    "chat.no-messages": "مشخص کنید تاریخچه گفتگوهایتان با چه کاربری را می‌خواهید ببینید",
-    "chat.recent-chats": "Recent Chats",
+    "chat.recent-chats": "گفتگوهای اخیر",
-    "chat.contacts": "Contacts",
+    "chat.contacts": "تماس‌ها",
-    "chat.message-history": "Message History",
+    "chat.message-history": "تاریخچه پیام‌ها",
     "chat.pop-out": "Pop out chat",
-    "chat.maximize": "Maximize",
+    "chat.maximize": "تمام صفحه",
     "composer.user_said_in": "%1 در %2 گفته است:",
     "composer.user_said": "%1 گفته است:",
     "composer.discard": "آیا از دور انداختن این دیدگاه اطمینان دارید؟"

public/language/fa_IR/notifications.json

@@ -4,12 +4,11 @@
     "see_all": "دیدن همهٔ آگاه‌سازی‌ها",
     "back_to_home": "بازگشت به %1",
     "outgoing_link": "پیوند برون‌رو",
-    "outgoing_link_message": "شما در حال ترک اینجایید",
+    "outgoing_link_message": "You are now leaving %1.",
-    "continue_to": "رفتن به",
+    "continue_to": "Continue to %1",
-    "return_to": "بازگشت به",
+    "return_to": "Return to %1",
     "new_notification": "آکاه‌سازی تازه",
     "you_have_unread_notifications": "شما آگاه‌سازی‌های نخوانده دارید.",
-    "user_made_post": "<strong>%1</strong> یک دیدگاه تازه فرستاد.",
     "new_message_from": "پیام تازه از <strong>%1</strong>",
     "upvoted_your_post": "<strong>%1</strong> به دیدگاه شما رای داده است.",
     "favourited_your_post": "<strong>%1</strong> دیدگاه شما را پسندیده است.",

public/language/fa_IR/pages.json

@@ -5,6 +5,7 @@
     "recent": "جستارهای تازه",
     "users": "کاربران نام‌نویسی شده",
     "notifications": "آگاه‌سازی‌ها",
+    "tags": "Topics tagged under \"%1\"",
     "user.edit": "ویرایش \"%1\"",
     "user.following": "%1 کاربر دنبال می‌کنند",
     "user.followers": "کاربرانی که %1 را دنبال می‌کنند",

public/language/fa_IR/recent.json

@@ -3,6 +3,6 @@
     "day": "روز",
     "week": "هفته",
     "month": "ماه",
-    "year": "Year",
+    "year": "سال",
     "no_recent_topics": "هیچ جستار تازه‌ای نیست."
 }

public/language/fa_IR/search.json

@@ -0,0 +1,3 @@
+{
+    "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+}

public/language/fa_IR/topic.json

@@ -87,6 +87,7 @@
     "more_users_and_guests": "%1 کاربر() و %2 مهمان()",
     "more_users": "1% کاربر()",
     "more_guests": "1% مهمان()",
+    "users_and_others": "%1 and %2 others",
     "sort_by": "مرتب‌سازی بر اساس",
     "oldest_to_newest": "قدیمی‌ترین به جدید‌ترین",
     "newest_to_oldest": "جدید‌ترین به قدیمی‌ترین",

public/language/fa_IR/user.json

@@ -3,7 +3,7 @@
     "offline": "آفلاین",
     "username": "نام کاربری",
     "email": "رایانامه",
-    "confirm_email": "Confirm Email",
+    "confirm_email": "تأیید رایانامه",
     "fullname": "نام کامل",
     "website": "تارنما",
     "location": "محل سکونت",

public/language/fi/email.json

@@ -0,0 +1,20 @@
+{
+    "password-reset-requested": "Password Reset Requested - %1!",
+    "welcome-to": "Welcome to %1",
+    "greeting_no_name": "Hello",
+    "greeting_with_name": "Hello %1",
+    "welcome.text1": "Thank you for registering with %1!",
+    "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.",
+    "welcome.cta": "Click here to confirm your email address",
+    "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
+    "reset.text2": "To continue with the password reset, please click on the following link:",
+    "reset.cta": "Click here to reset your password",
+    "digest.notifications": "You have some unread notifications from %1:",
+    "digest.latest_topics": "Latest topics from %1",
+    "digest.cta": "Click here to visit %1",
+    "digest.unsub.info": "This digest was sent to you due to your subscription settings.",
+    "digest.unsub.cta": "Click here to alter those settings",
+    "digest.daily.no_topics": "There have been no active topics in the past day",
+    "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+    "closing": "Thanks!"
+}

public/language/fi/error.json

@@ -25,6 +25,7 @@
     "no-user": "Käyttäjää ei ole olemassa",
     "no-teaser": "Teaseria ei ole olemassa",
     "no-privileges": "Oikeutesi eivät riitä toiminnon suorittamiseen",
+    "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
     "category-disabled": "Kategoria ei ole käytössä",
     "topic-locked": "Aihe lukittu",
     "still-uploading": "Ole hyvä ja odota tiedostojen lähettämisen valmistumista.",

public/language/fi/footer.json

@@ -1,7 +0,0 @@
-{
-    "stats.online": "Online",
-    "stats.users": "Käyttäjää",
-    "stats.topics": "Aihetta",
-    "stats.posts": "Viestiä",
-    "success": "onnistunut"
-}

public/language/fi/global.json

@@ -13,7 +13,7 @@
     "please_log_in": "Kirjaudu, ole hyvä",
     "logout": "Kirjaudu ulos",
     "posting_restriction_info": "Kirjoittaminen on tällä hetkellä rajattu vain rekisteröityneille käyttäjille. Napsauta tätä kirjautuaksesi.",
-    "welcome_back": "Tervetuloa takaisin",
+    "welcome_back": "Welcome Back",
     "you_have_successfully_logged_in": "Olet onnistuneesti kirjautunut sisään",
     "save_changes": "Tallenna muutokset",
     "close": "Sulje",

public/language/fi/groups.json

@@ -0,0 +1,7 @@
+{
+    "view_group": "View Group",
+    "details.title": "Group Details",
+    "details.members": "Member List",
+    "details.has_no_posts": "This group's members have not made any posts.",
+    "details.latest_posts": "Latest Posts"
+}

public/language/fi/notifications.json

@@ -4,12 +4,11 @@
     "see_all": "Katso kaikki ilmoitukset",
     "back_to_home": "Back to %1",
     "outgoing_link": "Ulkopuolinen linkki",
-    "outgoing_link_message": "Olet nyt poistumassa",
+    "outgoing_link_message": "You are now leaving %1.",
-    "continue_to": "Jatka",
+    "continue_to": "Continue to %1",
-    "return_to": "Return to",
+    "return_to": "Return to %1",
     "new_notification": "Uusi ilmoitus",
     "you_have_unread_notifications": "Sinulla on lukemattomia ilmoituksia.",
-    "user_made_post": "<strong>%1</strong> kirjoitti uuden viestin",
     "new_message_from": "Uusi viesti käyttäjältä <strong>%1</strong>",
     "upvoted_your_post": "<strong>%1</strong> has upvoted your post.",
     "favourited_your_post": "<strong>%1</strong> lisäsi viestisi suosikkeihinsa.",

public/language/fi/pages.json

@@ -5,6 +5,7 @@
     "recent": "Viimeisimmät aiheet",
     "users": "Rekisteröityneet käyttäjät",
     "notifications": "Ilmoitukset",
+    "tags": "Topics tagged under \"%1\"",
     "user.edit": "Muokataan \"%1\"",
     "user.following": "Käyttäjät, joita %1 seuraa",
     "user.followers": "Käyttäjät, jotka seuraavat käyttäjää %1",

public/language/fi/search.json

@@ -0,0 +1,3 @@
+{
+    "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+}

public/language/fi/topic.json

@@ -87,6 +87,7 @@
     "more_users_and_guests": "%1 more user(s) and %2 guest(s)",
     "more_users": "%1 more user(s)",
     "more_guests": "%1 more guest(s)",
+    "users_and_others": "%1 and %2 others",
     "sort_by": "Sort by",
     "oldest_to_newest": "Oldest to Newest",
     "newest_to_oldest": "Newest to Oldest",

public/language/fr/email.json

@@ -0,0 +1,20 @@
+{
+    "password-reset-requested": "Demande de réinitialisation du mot de passe - %1",
+    "welcome-to": "Bienvenue sur %1",
+    "greeting_no_name": "Bonjour",
+    "greeting_with_name": "Bonjour %1",
+    "welcome.text1": "Merci de vous être inscrit avec %1!",
+    "welcome.text2": "Pour activer totalement votre compte, nous devons vérifier que vous êtes bien propriétaire de l'adresse email que vous avez utilisé pour vous inscrire.",
+    "welcome.cta": "Cliquez ici pour confirmer votre adresse email",
+    "reset.text1": "Nous avons reçu une demande de réinitialisation de votre mot de passe, probablement parce que vous l'avez oublié. Si ce n'est pas le cas, veuillez ignorer cet email.",
+    "reset.text2": "Pour confirmer la réinitialisation de votre mot de passe, veuillez cliquer sur le lien suivant :",
+    "reset.cta": "Cliquez ici pour réinitialiser votre mot de passe",
+    "digest.notifications": "Vous avez des notifications non-lues de %1 :",
+    "digest.latest_topics": "Derniers sujets de %1 :",
+    "digest.cta": "Cliquez ici pour aller sur %1",
+    "digest.unsub.info": "Ce message vous a été envoyé en raison de vos paramètres d'abonnement.",
+    "digest.unsub.cta": "Cliquez ici pour modifier ces paramètres",
+    "digest.daily.no_topics": "Il n'y a eu aucun sujet actif ces derniers jours",
+    "test.text1": "Ceci est un email de test pour vérifier que l'emailer est correctement configuré pour NodeBB.",
+    "closing": "Merci !"
+}

public/language/fr/error.json

@@ -25,6 +25,7 @@
     "no-user": "Cet utilisateur n'existe pas",
     "no-teaser": "L’aperçu n'existe pas",
     "no-privileges": "Vous n'avez pas les privilèges nécessaires pour effectuer cette action.",
+    "no-emailers-configured": "Un email de test n'a pas pu être envoyé car aucun plugin de gestion des emails n'était chargé",
     "category-disabled": "Catégorie désactivée",
     "topic-locked": "Sujet verrouillé",
     "still-uploading": "Veuillez patienter pendant le téléchargement.",

public/language/fr/footer.json

@@ -1,7 +0,0 @@
-{
-    "stats.online": "En ligne",
-    "stats.users": "Utilisateurs",
-    "stats.topics": "Sujets",
-    "stats.posts": "Message",
-    "success": "succès"
-}

public/language/fr/groups.json

@@ -0,0 +1,7 @@
+{
+    "view_group": "Voir le groupe",
+    "details.title": "Informations du groupe",
+    "details.members": "Liste des membres",
+    "details.has_no_posts": "Ce membre du groupe n'a envoyé aucun message.",
+    "details.latest_posts": "Derniers messages"
+}