0.5.5

Conflicts:
	src/categories.js

CONTRIBUTING.md

@@ -4,6 +4,11 @@ Thanks for reporting an issue with NodeBB! Please follow these guidelines in ord
 
 In general, if we can't reproduce it, we can't fix it!
 
+> #### **Important**
+> If you believe you have identified a security vulnerability with NodeBB, report it as soon as possible via email to **security@nodebb.org**.
+> A member of the NodeBB security team will respond to the issue.
+> Please do not post it to the public bug tracker.
+
 ## Try the latest version of NodeBB
 
 There is a chance that the issue you are experiencing may have already been fixed.
@@ -28,3 +33,9 @@ $ git rev-parse HEAD
 ```
 
 If you have downloaded the `.zip` or `.tar.gz` packages from GitHub (or elsewhere), please let us know.
+
+## Attempt to use `git bisect`
+
+If you have installed NodeBB via GitHub clone, are familiar with utilising git, and are willing to help us narrow down the specific commit that causes a bug, consider running `git bisect`.
+
+A full guide can be found here: [Debugging with Git/Binary Search](http://git-scm.com/book/en/Git-Tools-Debugging-with-Git#Binary-Search)

app.js

@@ -37,7 +37,8 @@ global.env = process.env.NODE_ENV || 'production';
 
 winston.remove(winston.transports.Console);
 winston.add(winston.transports.Console, {
-	colorize: true
+	colorize: true,
+	timestamp: true
 });
 
 winston.add(winston.transports.File, {
@@ -93,7 +94,7 @@ function loadConfig() {
 	nconf.defaults({
 		base_dir: __dirname,
 		themes_path: path.join(__dirname, 'node_modules'),
-		upload_url: '/uploads/',
+		upload_url: nconf.get('relative_path') + '/uploads/',
 		views_dir: path.join(__dirname, 'public/templates')
 	});
 
@@ -106,7 +107,7 @@ function loadConfig() {
 function start() {
 	loadConfig();
 
-	if (!cluster.isWorker) {
+	if (!cluster.isWorker || process.env.cluster_setup === 'true') {
 		winston.info('Time: ' + new Date());
 		winston.info('Initializing NodeBB v' + pkg.version);
 		winston.info('* using configuration stored in: ' + configFile);

install/data/categories.json

@@ -2,7 +2,7 @@
     {
         "name": "Announcements",
         "description": "Announcements regarding our community",
-        "bgColor": "#0059B2",
+        "bgColor": "#fda34b",
         "color": "#fff",
         "icon" : "fa-bullhorn",
         "order": 1
@@ -10,89 +10,25 @@
     {
         "name": "General Discussion",
         "description": "A place to talk about whateeeever you want",
-        "bgColor": "#0059B2",
+        "bgColor": "#59b3d0",
         "color": "#fff",
-        "icon" : "fa-comment",
+        "icon" : "fa-comments-o",
         "order": 2
     },
-    {
-        "name": "NodeBB Development",
-        "description": "NodeBB development news and announcements",
-        "bgColor": "#0059B2",
-        "color": "#fff",
-        "icon" : "fa-github",
-        "order": 3
-    },
     {
         "name": "Blogs",
         "description": "Blog posts from individual members",
-        "bgColor": "#0059B2",
+        "bgColor": "#86ba4b",
         "color": "#fff",
-        "icon" : "fa-pencil",
+        "icon" : "fa-newspaper-o",
         "order": 4
     },
     {
-        "name": "Feature Requests",
-        "description": "Got a feature request you'd like to see? Give us a shout here.",
-        "bgColor": "#ab1290",
+        "name": "Comments & Feedback",
+        "description": "Got a question? Ask away!",
+        "bgColor": "#e95c5a",
         "color": "#fff",
-        "icon" : "fa-lightbulb-o",
-        "order": 5
-    },
-    {
-        "name": "Bug Reports",
-        "description": "Having trouble with NodeBB? Let us know...",
-        "bgColor": "#ab1290",
-        "color": "#fff",
-        "icon" : "fa-cogs",
-        "order": 6
-    },
-    {
-        "name": "NodeBB Plugins",
-        "description": "Enhance your NodeBB with plugins!",
-        "bgColor": "#ab1290",
-        "color": "#fff",
-        "icon" : "fa-plus-square",
-        "order": 7
-    },
-    {
-        "name": "NodeBB Link Exchange",
-        "description": "Link exchange",
-        "bgColor": "#ab1290",
-        "color": "#fff",
-        "icon" : "fa-exchange",
-        "order": 8
-    },
-    {
-        "name": "News",
-        "description": "News from around the world",
-        "bgColor": "#004C66",
-        "color": "#fff",
-        "icon" : "fa-globe",
-        "order": 9
-    },
-    {
-        "name": "Movies",
-        "description": "Discuss the latest movies here",
-        "bgColor": "#004C66",
-        "color": "#fff",
-        "icon" : "fa-film",
-        "order": 10
-    },
-    {
-        "name": "Games",
-        "description": "Discuss the latest games here",
-        "bgColor": "#004C66",
-        "color": "#fff",
-        "icon" : "fa-crosshairs",
-        "order": 11
-    },
-    {
-        "name": "Random",
-        "description": "Anything and (almost) everything welcome!",
-        "bgColor": "#004C66",
-        "color": "#fff",
-        "icon" : "fa-beer",
-        "order": 12
+        "icon" : "fa-question",
+        "order": 3
     }
 ]

loader.js

@@ -45,6 +45,7 @@ Loader.init = function(callback) {
 };
 
 Loader.displayStartupMessages = function(callback) {
+	console.log('');
 	console.log('NodeBB v' + pkg.version + ' Copyright (C) 2013-2014 NodeBB Inc.');
 	console.log('This program comes with ABSOLUTELY NO WARRANTY.');
 	console.log('This is free software, and you are welcome to redistribute it under certain conditions.');
@@ -160,41 +161,46 @@ Loader.addClusterEvents = function(callback) {
 			}
 		}
 
-		console.log('[cluster] Child Process (' + worker.process.pid + ') has exited (code: ' + code + ')');
+		console.log('[cluster] Child Process (' + worker.process.pid + ') has exited (code: ' + code + ', signal: ' + signal +')');
 		if (!worker.suicide) {
 			console.log('[cluster] Spinning up another process...');
 
 			var wasPrimary = parseInt(worker.id, 10) === Loader.primaryWorker;
-			cluster.fork({
-				handle_jobs: wasPrimary
-			});
+			forkWorker(wasPrimary);
 		}
 	});
 
+	cluster.on('disconnect', function(worker) {
+		console.log('[cluster] Child Process (' + worker.process.pid + ') has disconnected');
+	});
+
 	callback();
-}
+};
 
 Loader.start = function(callback) {
-	var output = logrotate({ file: __dirname + '/logs/output.log', size: '1m', keep: 3, compress: true }),
-		worker;
-
 	console.log('Clustering enabled: Spinning up ' + numProcs + ' process(es).\n');
 
-	for(var x=0;x<numProcs;x++) {
-		// Only the first worker sets up templates/sounds/jobs/etc
-		worker = cluster.fork({
-			cluster_setup: x === 0,
-			handle_jobs: x === 0
-		});
+	for(var x=0; x<numProcs; ++x) {
+		forkWorker(x === 0);
+	}
+
+	if (callback) {
+		callback();
+	}
+};
+
+function forkWorker(isPrimary) {
+	var worker = cluster.fork({
+			cluster_setup: isPrimary,
+			handle_jobs: isPrimary
+		}),
+		output = logrotate({ file: __dirname + '/logs/output.log', size: '1m', keep: 3, compress: true });
 
-		// Logging
 	if (silent) {
 		worker.process.stdout.pipe(output);
+		worker.process.stderr.pipe(output);
 	}
-	}
-
-	if (callback) callback();
-};
+}
 
 Loader.restart = function(callback) {
 	// Slate existing workers for termination -- welcome to death row.
@@ -214,7 +220,7 @@ Loader.notifyWorkers = function (msg) {
 	Object.keys(cluster.workers).forEach(function(id) {
 		cluster.workers[id].send(msg);
 	});
-}
+};
 
 
 nconf.argv().file({

minifier.js

@@ -14,7 +14,10 @@ var uglifyjs = require('uglify-js'),
 /* Javascript */
 Minifier.js.minify = function (scripts, relativePath, minify, callback) {
 	var options = {
-		compress: false
+		compress: false,
+		sourceMapURL: '/nodebb.min.js.map',
+		outSourceMap: 'nodebb.min.js.map',
+		sourceRoot: relativePath
 	};
 
 	scripts = scripts.filter(function(file) {
@@ -22,9 +25,6 @@ Minifier.js.minify = function (scripts, relativePath, minify, callback) {
 	});
 
 	if (!minify) {
-		options.sourceMapURL = '/nodebb.min.js.map';
-		options.outSourceMap = 'nodebb.min.js.map';
-		options.sourceRoot = relativePath;
 		options.mangle = false;
 		options.prefix = 1;
 	}

nodebb

@@ -29,7 +29,7 @@ case "$1" in
 		echo "  \"./nodebb log\" to view server output";
 
 		# Start the loader daemon
-		"$node" loader -d "$@"
+		"$node" loader "$@"
 		;;
 
 	stop)

package.json

@@ -2,7 +2,7 @@
   "name": "nodebb",
   "license": "GPLv3 or later",
   "description": "NodeBB Forum",
-  "version": "0.5.2-dev",
+  "version": "0.5.5",
   "homepage": "http://www.nodebb.org",
   "repository": {
     "type": "git",
@@ -39,8 +39,8 @@
     "nodebb-plugin-markdown": "^0.7.0",
     "nodebb-plugin-mentions": "~0.6.0",
     "nodebb-plugin-soundpack-default": "~0.1.1",
-    "nodebb-theme-lavender": "~0.1.0",
-    "nodebb-theme-vanilla": "~0.1.0",
+    "nodebb-theme-lavender": "0.1.13",
+    "nodebb-theme-vanilla": "0.1.30",
     "nodebb-widget-essentials": "~0.1.1",
     "npm": "^2.1.4",
     "passport": "^0.2.1",

public/language/ar/email.json

@@ -9,7 +9,7 @@
     "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.notifications": "You have 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.",

public/language/ar/error.json

@@ -17,48 +17,48 @@
     "invalid-pagination-value": "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": "Your email has not been confirmed yet, please click here to confirm your email.",
     "username-too-short": "Username too short",
     "username-too-long": "Username too long",
     "user-banned": "المستخدم محظور",
-    "user-too-new": "You need to wait %1 seconds before making your first post!",
-    "no-category": "Category doesn't exist",
-    "no-topic": "Topic doesn't exist",
-    "no-post": "Post doesn't exist",
-    "no-group": "Group doesn't exist",
-    "no-user": "المستخدم لا يوجد",
-    "no-teaser": "Teaser doesn't exist",
-    "no-privileges": "You don't have enough privileges for this action.",
+    "user-too-new": "Sorry, you are required to wait %1 seconds before making your first post",
+    "no-category": "Category does not exist",
+    "no-topic": "Topic does not exist",
+    "no-post": "Post does not exist",
+    "no-group": "Group does not exist",
+    "no-user": "User does not exist",
+    "no-teaser": "Teaser does not exist",
+    "no-privileges": "You do not 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": "الرجاء انتظار الرفع",
-    "content-too-short": "Please enter a longer post. At least %1 characters.",
-    "title-too-short": "Please enter a longer title. At least %1 characters.",
+    "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.",
+    "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.",
     "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.",
-    "too-many-posts": "You can only post every %1 seconds.",
-    "file-too-big": "Maximum allowed file size is %1 kbs",
+    "too-many-posts": "You can only post once every %1 seconds - please wait before posting again",
+    "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file",
     "cant-vote-self-post": "You cannot vote for your own post",
-    "already-favourited": "You already favourited this post",
-    "already-unfavourited": "You already unfavourited this post",
+    "already-favourited": "You have already favourited this post",
+    "already-unfavourited": "You have already unfavourited this post",
     "cant-ban-other-admins": "You can't ban other admins!",
     "invalid-image-type": "نوع الصورة ممنوع",
     "group-name-too-short": "Group name too short",
     "group-already-exists": "Group already exists",
     "group-name-change-not-allowed": "Group name change not allowed",
-    "post-already-deleted": "Post already deleted",
-    "post-already-restored": "Post already restored",
-    "topic-already-deleted": "Topic already deleted",
-    "topic-already-restored": "Topic already restored",
+    "post-already-deleted": "This post has already been deleted",
+    "post-already-restored": "This post has already been restored",
+    "topic-already-deleted": "This topic has already been deleted",
+    "topic-already-restored": "This topic has already been restored",
     "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.",
     "invalid-file": "Invalid File",
     "uploads-are-disabled": "Uploads are disabled",
     "upload-error": "مشكلة في الرفع: 1%",
-    "signature-too-long": "Signature can't be longer than %1 characters!",
+    "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.",
     "cant-chat-with-yourself": "You can't chat with yourself!",
     "reputation-system-disabled": "Reputation system is disabled.",
     "downvoting-disabled": "Downvoting is disabled",
     "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",
-    "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+    "not-enough-reputation-to-flag": "You do not have enough reputation to flag 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/ar/global.json

@@ -71,5 +71,6 @@
     "guest": "Guest",
     "guests": "Guests",
     "updated.title": "Forum Updated",
-    "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page."
+    "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page.",
+    "privacy": "Privacy"
 }

public/language/ar/groups.json

@@ -1,4 +1,5 @@
 {
+    "groups": "Groups",
     "view_group": "View Group",
     "details.title": "Group Details",
     "details.members": "Member List",

public/language/ar/notifications.json

@@ -16,6 +16,7 @@
     "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
     "user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
+    "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
     "user_mentioned_you_in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> started following you.",
     "email-confirmed": "Email Confirmed",

public/language/ar/pages.json

@@ -14,5 +14,5 @@
     "user.favourites": "%1's Favourite Posts",
     "user.settings": "User Settings",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
-    "maintenance.messageIntro": "Additionally, the administator has left this message:"
+    "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }

public/language/ar/topic.json

@@ -18,7 +18,6 @@
     "restore": "Restore",
     "move": "انقل",
     "fork": "فرع",
-    "banned": "محظور",
     "link": "رابط",
     "share": "شارك",
     "tools": "أدوات",
@@ -73,7 +72,7 @@
     "topic_will_be_moved_to": "هذا الموضوع سوف ينقل إلى فئة",
     "fork_topic_instruction": "إضغط على الردود لتفريعهم",
     "fork_no_pids": "لم تختار أي رد",
-    "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
+    "fork_success": "Successfully forked topic! Click here to go to the forked topic.",
     "composer.title_placeholder": "Enter your topic title here...",
     "composer.discard": "Discard",
     "composer.submit": "Submit",

public/language/ar/user.json

@@ -47,6 +47,7 @@
     "max": "max.",
     "settings": "Settings",
     "show_email": "أظهر بريدي الإلكتروني",
+    "show_fullname": "Show My Full Name",
     "digest_label": "Subscribe to Digest",
     "digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule",
     "digest_off": "Off",

public/language/ar/users.json

@@ -5,6 +5,5 @@
     "search": "بحث",
     "enter_username": "أدخل اسم مستخدم للبحث",
     "load_more": "حمل المزيد",
-    "user-not-found": "User not found!",
     "users-found-search-took": "%1 user(s) found! Search took %2 ms."
 }

public/language/cs/email.json

@@ -9,7 +9,7 @@
     "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.notifications": "You have 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.",

public/language/cs/error.json

@@ -17,48 +17,48 @@
     "invalid-pagination-value": "Invalid pagination value",
     "username-taken": "Username taken",
     "email-taken": "Email taken",
-    "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
+    "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.",
     "username-too-short": "Username too short",
     "username-too-long": "Username too long",
     "user-banned": "User banned",
-    "user-too-new": "You need to wait %1 seconds before making your first post!",
-    "no-category": "Category doesn't exist",
-    "no-topic": "Topic doesn't exist",
-    "no-post": "Post doesn't exist",
-    "no-group": "Group doesn't exist",
-    "no-user": "User doesn't exist",
-    "no-teaser": "Teaser doesn't exist",
-    "no-privileges": "You don't have enough privileges for this action.",
+    "user-too-new": "Sorry, you are required to wait %1 seconds before making your first post",
+    "no-category": "Category does not exist",
+    "no-topic": "Topic does not exist",
+    "no-post": "Post does not exist",
+    "no-group": "Group does not exist",
+    "no-user": "User does not exist",
+    "no-teaser": "Teaser does not exist",
+    "no-privileges": "You do not 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.",
-    "content-too-short": "Please enter a longer post. At least %1 characters.",
-    "title-too-short": "Please enter a longer title. At least %1 characters.",
+    "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.",
+    "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.",
     "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.",
-    "too-many-posts": "You can only post every %1 seconds.",
-    "file-too-big": "Maximum allowed file size is %1 kbs",
+    "too-many-posts": "You can only post once every %1 seconds - please wait before posting again",
+    "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file",
     "cant-vote-self-post": "You cannot vote for your own post",
-    "already-favourited": "You already favourited this post",
-    "already-unfavourited": "You already unfavourited this post",
+    "already-favourited": "You have already favourited this post",
+    "already-unfavourited": "You have already unfavourited this post",
     "cant-ban-other-admins": "You can't ban other admins!",
     "invalid-image-type": "Invalid image type",
     "group-name-too-short": "Group name too short",
     "group-already-exists": "Group already exists",
     "group-name-change-not-allowed": "Group name change not allowed",
-    "post-already-deleted": "Post already deleted",
-    "post-already-restored": "Post already restored",
-    "topic-already-deleted": "Topic already deleted",
-    "topic-already-restored": "Topic already restored",
+    "post-already-deleted": "This post has already been deleted",
+    "post-already-restored": "This post has already been restored",
+    "topic-already-deleted": "This topic has already been deleted",
+    "topic-already-restored": "This topic has already been restored",
     "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.",
     "invalid-file": "Invalid File",
     "uploads-are-disabled": "Uploads are disabled",
     "upload-error": "Upload Error : %1",
-    "signature-too-long": "Signature can't be longer than %1 characters!",
+    "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.",
     "cant-chat-with-yourself": "You can't chat with yourself!",
     "reputation-system-disabled": "Reputation system is disabled.",
     "downvoting-disabled": "Downvoting is disabled",
     "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",
-    "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+    "not-enough-reputation-to-flag": "You do not have enough reputation to flag 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/cs/global.json

@@ -71,5 +71,6 @@
     "guest": "Guest",
     "guests": "Guests",
     "updated.title": "Forum Updated",
-    "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page."
+    "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page.",
+    "privacy": "Privacy"
 }

public/language/cs/groups.json

@@ -1,4 +1,5 @@
 {
+    "groups": "Groups",
     "view_group": "View Group",
     "details.title": "Group Details",
     "details.members": "Member List",

public/language/cs/notifications.json

@@ -16,6 +16,7 @@
     "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
     "user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
+    "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
     "user_mentioned_you_in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> started following you.",
     "email-confirmed": "Email Confirmed",

public/language/cs/pages.json

@@ -14,5 +14,5 @@
     "user.favourites": "%1's Favourite Posts",
     "user.settings": "User Settings",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
-    "maintenance.messageIntro": "Additionally, the administator has left this message:"
+    "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }

public/language/cs/topic.json

@@ -18,7 +18,6 @@
     "restore": "Restore",
     "move": "Přesunout",
     "fork": "Rozdělit",
-    "banned": "banned",
     "link": "Odkaz",
     "share": "Sdílet",
     "tools": "Nástroje",
@@ -73,7 +72,7 @@
     "topic_will_be_moved_to": "Toto téma bude přesunuto do kategorie",
     "fork_topic_instruction": "Vyber příspěvky, které chceš oddělit",
     "fork_no_pids": "Žádné příspěvky nebyly vybrány!",
-    "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
+    "fork_success": "Successfully forked topic! Click here to go to the forked topic.",
     "composer.title_placeholder": "Enter your topic title here...",
     "composer.discard": "Discard",
     "composer.submit": "Submit",

public/language/cs/user.json

@@ -47,6 +47,7 @@
     "max": "max.",
     "settings": "Nastavení",
     "show_email": "Zobrazovat můj email v profilu",
+    "show_fullname": "Show My Full Name",
     "digest_label": "Subscribe to Digest",
     "digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule",
     "digest_off": "Off",

public/language/cs/users.json

@@ -5,6 +5,5 @@
     "search": "Vyhledávat",
     "enter_username": "Zadej uživatelské jméno k hledání",
     "load_more": "Načíst další",
-    "user-not-found": "User not found!",
     "users-found-search-took": "%1 user(s) found! Search took %2 ms."
 }

public/language/de/email.json

@@ -9,7 +9,7 @@
     "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.notifications": "You have unread notifications from %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.",

public/language/de/error.json

@@ -13,52 +13,52 @@
     "invalid-user-data": "Ungültige Benutzerdaten",
     "invalid-password": "Ungültiges Passwort",
     "invalid-username-or-password": "Bitte gebe einen Benutzernamen und ein Passwort an",
-    "invalid-search-term": "Invalid search term",
+    "invalid-search-term": "Ungültige Suchanfrage",
     "invalid-pagination-value": "Die Nummerierung ist ungültig",
     "username-taken": "Der Benutzername ist bereits vergeben",
     "email-taken": "Die E-Mail-Adresse ist bereits vergeben",
-    "email-not-confirmed": "Deine E-Mail wurde noch nicht bestätigt. Bitte klicke hier, um deine E-Mail zu bestätigen.",
+    "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.",
     "username-too-short": "Benutzername ist zu kurz",
     "username-too-long": "Der Benutzername ist zu lang",
     "user-banned": "Der Benutzer ist gesperrt",
-    "user-too-new": "Du musst %1 Sekunden warten, bevor du deinen ersten Beitrag verfassen kannst!",
-    "no-category": "Die Kategorie existiert nicht",
-    "no-topic": "Das Thema existiert nicht",
-    "no-post": "Der Beitrag existiert nicht",
-    "no-group": "Die Gruppe existiert nicht",
-    "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.",
+    "user-too-new": "Sorry, you are required to wait %1 seconds before making your first post",
+    "no-category": "Category does not exist",
+    "no-topic": "Topic does not exist",
+    "no-post": "Post does not exist",
+    "no-group": "Group does not exist",
+    "no-user": "User does not exist",
+    "no-teaser": "Teaser does not exist",
+    "no-privileges": "You do not have enough privileges for this action.",
     "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.",
-    "content-too-short": "Der Beitrag muss mindestens %1 Zeichen enthalten.",
-    "title-too-short": "Der Titel muss mindestens %1 Zeichen enthalten.",
+    "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.",
+    "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.",
     "title-too-long": "Der Titel darf maximal %1 Zeichen enthalten.",
-    "too-many-posts": "Du kannst maximal alle %1 Sekunden einen Beitrag erstellen.",
-    "file-too-big": "Die maximale Dateigröße beträgt %1 kbs",
+    "too-many-posts": "You can only post once every %1 seconds - please wait before posting again",
+    "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file",
     "cant-vote-self-post": "Du kannst deinen eigenen Beitrag nicht bewerten.",
-    "already-favourited": "Dieser Beitrag ist bereits in deinen Favoriten enthalten",
-    "already-unfavourited": "Du hast diesen Beitrag bereits aus deinen Favoriten entfernt",
+    "already-favourited": "You have already favourited this post",
+    "already-unfavourited": "You have already unfavourited this post",
     "cant-ban-other-admins": "Du kannst andere Administratoren nicht sperren!",
     "invalid-image-type": "Ungültiger Bildtyp",
     "group-name-too-short": "Gruppenname zu kurz",
     "group-already-exists": "Gruppe existiert bereits",
     "group-name-change-not-allowed": "Du kannst den Namen der Gruppe nicht ändern",
-    "post-already-deleted": "Beitrag wurde bereits gelöscht",
-    "post-already-restored": "Der Beitrag wurde bereits wiederhergestellt",
-    "topic-already-deleted": "Das Thema wurde bereits gelöscht",
-    "topic-already-restored": "Das Thema wurde bereits wiederhergestellt",
+    "post-already-deleted": "This post has already been deleted",
+    "post-already-restored": "This post has already been restored",
+    "topic-already-deleted": "This topic has already been deleted",
+    "topic-already-restored": "This topic has already been restored",
     "topic-thumbnails-are-disabled": "Vorschaubilder für Themen sind deaktiviert",
     "invalid-file": "Datei ungültig",
     "uploads-are-disabled": "Uploads sind deaktiviert",
     "upload-error": "Upload-Fehler: %1",
-    "signature-too-long": "Die Signatur darf maximal %1 Zeichen enthalten!",
+    "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.",
     "cant-chat-with-yourself": "Du kannst nicht mit dir selber chatten!",
     "reputation-system-disabled": "Das Reputationssystem ist deaktiviert.",
     "downvoting-disabled": "Downvotes sind deaktiviert.",
     "not-enough-reputation-to-downvote": "Deine Reputation ist zu niedrig, um diesen Beitrag negativ zu bewerten.",
-    "not-enough-reputation-to-flag": "Deine Reputation ist nicht gut genug, um diesen Beitrag zu melden.",
+    "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post",
     "reload-failed": "Es ist ein Problem während des Reloads von NodeBB aufgetreten: \"%1\". NodeBB wird weiterhin clientseitige Assets bereitstellen, allerdings solltest du das, was du vor dem Reload gemacht hast, rückgängig machen."
 }

public/language/de/global.json

@@ -71,5 +71,6 @@
     "guest": "Gast",
     "guests": "Gäste",
     "updated.title": "Forum aktualisiert",
-    "updated.message": "Dieses Forum wurde gerade auf die neueste Version aktualisiert. Klicke hier, um die Seite  neuzuladen."
+    "updated.message": "Dieses Forum wurde gerade auf die neueste Version aktualisiert. Klicke hier, um die Seite  neuzuladen.",
+    "privacy": "Privacy"
 }

public/language/de/groups.json

@@ -1,4 +1,5 @@
 {
+    "groups": "Groups",
     "view_group": "Gruppe betrachten",
     "details.title": "Gruppendetails",
     "details.members": "Mitgliederliste",

public/language/de/notifications.json

@@ -11,11 +11,12 @@
     "you_have_unread_notifications": "Du hast ungelesene Benachrichtigungen.",
     "new_message_from": "Neue Nachricht von <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> hat deinen Beitrag in <strong>%2</strong> positiv bewertet.",
-    "moved_your_post": "<strong>%1</strong> has moved your post.",
-    "moved_your_topic": "<strong>%1</strong> has moved your topic.",
+    "moved_your_post": "<strong>%1</strong> hat deinen Beitrag verschoben.",
+    "moved_your_topic": "<strong>%1</strong> hat dein Thema verschoben.",
     "favourited_your_post_in": "<strong>%1</strong> hat deinen Beitrag in <strong>%2</strong> favorisiert.",
     "user_flagged_post_in": "<strong>%1</strong> hat einen Beitrag in </strong>%2</strong> gemeldet",
     "user_posted_to": "<strong>%1</strong> hat auf <strong>%2</strong> geantwortet.",
+    "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
     "user_mentioned_you_in": "<strong>%1</strong> erwähnte dich in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> folgt dir jetzt.",
     "email-confirmed": "E-Mail bestätigt",

public/language/de/pages.json

@@ -13,6 +13,6 @@
     "user.topics": "Themen von %1",
     "user.favourites": "Von %1 favorisierte Beiträge",
     "user.settings": "Benutzer-Einstellungen",
-    "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
-    "maintenance.messageIntro": "Additionally, the administator has left this message:"
+    "maintenance.text": "%1 befindet sich derzeit in der Wartung. Bitte komm später wieder.",
+    "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }

public/language/de/tags.json

@@ -2,6 +2,6 @@
     "no_tag_topics": "Es gibt keine Themen mit diesem Tag.",
     "tags": "Tags",
     "enter_tags_here": "Gib hier Tags ein und drück die Eingabetaste nach jedem Tag.",
-    "enter_tags_here_short": "Enter tags...",
+    "enter_tags_here_short": "Gib Tags ein...",
     "no_tags": "Es gibt bisher keine Tags."
 }

public/language/de/topic.json

@@ -18,7 +18,6 @@
     "restore": "Wiederherstellen",
     "move": "verschieben",
     "fork": "Aufspalten",
-    "banned": "gesperrt",
     "link": "Link",
     "share": "Teilen",
     "tools": "Tools",
@@ -28,17 +27,17 @@
     "flag_title": "Diesen Beitrag zur Moderation markieren",
     "flag_confirm": "Sind Sie sicher, dass Sie diesen Post markieren möchten?",
     "flag_success": "Dieser Beitrag wurde erfolgreich für die Moderation markiert.",
-    "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
+    "deleted_message": "Dieses Thema wurde gelöscht. Nur Nutzer mit entsprechenden Rechten können es sehen.",
     "following_topic.message": "Du erhälst nun eine Benachrichtigung, wenn jemand einen Beitrag zu diesem Thema verfasst.",
     "not_following_topic.message": "Du erhälst keine weiteren Benachrichtigungen zu diesem Thema.",
     "login_to_subscribe": "Bitte registrieren oder einloggen um dieses Thema zu abonnieren",
     "markAsUnreadForAll.success": "Thema für Alle als ungelesen markiert.",
     "watch": "Beobachten",
-    "unwatch": "Unwatch",
+    "unwatch": "Nicht mehr beobachten",
     "watch.title": "Bei neuen Antworten benachrichtigen",
-    "unwatch.title": "Stop watching this topic",
+    "unwatch.title": "Dieses Thema nicht mehr beobachten",
     "share_this_post": "Diesen Beitrag teilen",
-    "thread_tools.title": "Topic Tools",
+    "thread_tools.title": "Themen-Tools",
     "thread_tools.markAsUnreadForAll": "Als ungelesen markieren",
     "thread_tools.pin": "Thema anpinnen",
     "thread_tools.unpin": "Thema nicht mehr anpinnen",
@@ -48,11 +47,11 @@
     "thread_tools.move_all": "Alle verschieben",
     "thread_tools.fork": "Thema aufspalten",
     "thread_tools.delete": "Thema löschen",
-    "thread_tools.delete_confirm": "Are you sure you want to delete this topic?",
+    "thread_tools.delete_confirm": "Bist du sicher, dass du dieses Thema löschen möchtest?",
     "thread_tools.restore": "Thema wiederherstellen",
-    "thread_tools.restore_confirm": "Are you sure you want to restore this topic?",
+    "thread_tools.restore_confirm": "Bist du sicher, dass du dieses Thema wiederherstellen möchtest?",
     "thread_tools.purge": "Thema bereinigen",
-    "thread_tools.purge_confirm": "Are you sure you want to purge this topic?",
+    "thread_tools.purge_confirm": "Bist du sicher, dass du dieses Thema bereinigen möchtest?",
     "topic_move_success": "Thema wurde erfolgreich zu %1 verschoben.",
     "post_delete_confirm": "Sind Sie sicher, dass Sie diesen Beitrag löschen möchten?",
     "post_restore_confirm": "Sind Sie sicher, dass Sie diesen Beitrag wiederherstellen möchten?",
@@ -73,7 +72,7 @@
     "topic_will_be_moved_to": "Dieses Thema wird verschoben nach",
     "fork_topic_instruction": "Klicke auf die Beiträge, die du aufspalten willst",
     "fork_no_pids": "Keine Beiträge ausgewählt!",
-    "fork_success": "Thema erfolgreich abgespalten! Klicke hier, um zum abgespalteten Thema zu gelangen.",
+    "fork_success": "Successfully forked topic! Click here to go to the forked topic.",
     "composer.title_placeholder": "Hier den Titel des Themas eingeben...",
     "composer.discard": "Verwerfen",
     "composer.submit": "Absenden",

public/language/de/user.json

@@ -5,7 +5,7 @@
     "email": "E-Mail",
     "confirm_email": "E-Mail bestätigen",
     "delete_account": "Konto löschen",
-    "delete_account_confirm": "Bist du sicher, dass du dein Konto löschen möchtest? <br /><strong>Diese Aktion kann nicht rückgängig gemacht werden und du kannst deine Daten nicht widerherstellen</strong><br /><br />Gebe deinen Benutzernamen ein, um zu bestätigen, dass du dieses Konto terminieren möchtest.",
+    "delete_account_confirm": "Bist du sicher, dass du dein Konto löschen möchtest? <br /><strong>Diese Aktion kann nicht rückgängig gemacht werden und du kannst deine Daten nicht wiederherstellen</strong><br /><br />Gebe deinen Benutzernamen ein, um zu bestätigen, dass du dieses Konto löschen möchtest.",
     "fullname": "Kompletter Name",
     "website": "Homepage",
     "location": "Wohnort",
@@ -29,7 +29,7 @@
     "edit": "Ändern",
     "uploaded_picture": "Hochgeladene Bilder",
     "upload_new_picture": "Neues Bild hochladen",
-    "upload_new_picture_from_url": "Upload New Picture From URL",
+    "upload_new_picture_from_url": "Neues Bild von URL hochladen",
     "current_password": "Aktuelles Passwort",
     "change_password": "Passwort ändern",
     "change_password_error": "Ungültiges Passwort!",
@@ -47,6 +47,7 @@
     "max": "max.",
     "settings": "Einstellungen",
     "show_email": "Zeige meine E-Mail Adresse an.",
+    "show_fullname": "Show My Full Name",
     "digest_label": "Auszug abonnieren",
     "digest_description": "Abonniere E-Mail-Benachrichtigungen für dieses Forum (neue Benachrichtigungen und Themen) nach einem festen Zeitplan.",
     "digest_off": "Aus",

public/language/de/users.json

@@ -5,6 +5,5 @@
     "search": "Suchen",
     "enter_username": "Benutzer durchsuchen",
     "load_more": "mehr laden",
-    "user-not-found": "Benutzer nicht gefunden!",
     "users-found-search-took": "%1 Benutzer gefunden! Die Suche dauerte %2 ms."
 }

public/language/en@pirate/email.json

@@ -9,7 +9,7 @@
     "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.notifications": "You have 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.",

public/language/en@pirate/error.json

@@ -17,48 +17,48 @@
     "invalid-pagination-value": "Invalid pagination value",
     "username-taken": "Username taken",
     "email-taken": "Email taken",
-    "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
+    "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.",
     "username-too-short": "Username too short",
     "username-too-long": "Username too long",
     "user-banned": "User banned",
-    "user-too-new": "You need to wait %1 seconds before making your first post!",
-    "no-category": "Category doesn't exist",
-    "no-topic": "Topic doesn't exist",
-    "no-post": "Post doesn't exist",
-    "no-group": "Group doesn't exist",
-    "no-user": "User doesn't exist",
-    "no-teaser": "Teaser doesn't exist",
-    "no-privileges": "You don't have enough privileges for this action.",
+    "user-too-new": "Sorry, you are required to wait %1 seconds before making your first post",
+    "no-category": "Category does not exist",
+    "no-topic": "Topic does not exist",
+    "no-post": "Post does not exist",
+    "no-group": "Group does not exist",
+    "no-user": "User does not exist",
+    "no-teaser": "Teaser does not exist",
+    "no-privileges": "You do not 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.",
-    "content-too-short": "Please enter a longer post. At least %1 characters.",
-    "title-too-short": "Please enter a longer title. At least %1 characters.",
+    "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.",
+    "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.",
     "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.",
-    "too-many-posts": "You can only post every %1 seconds.",
-    "file-too-big": "Maximum allowed file size is %1 kbs",
+    "too-many-posts": "You can only post once every %1 seconds - please wait before posting again",
+    "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file",
     "cant-vote-self-post": "You cannot vote for your own post",
-    "already-favourited": "You already favourited this post",
-    "already-unfavourited": "You already unfavourited this post",
+    "already-favourited": "You have already favourited this post",
+    "already-unfavourited": "You have already unfavourited this post",
     "cant-ban-other-admins": "You can't ban other admins!",
     "invalid-image-type": "Invalid image type",
     "group-name-too-short": "Group name too short",
     "group-already-exists": "Group already exists",
     "group-name-change-not-allowed": "Group name change not allowed",
-    "post-already-deleted": "Post already deleted",
-    "post-already-restored": "Post already restored",
-    "topic-already-deleted": "Topic already deleted",
-    "topic-already-restored": "Topic already restored",
+    "post-already-deleted": "This post has already been deleted",
+    "post-already-restored": "This post has already been restored",
+    "topic-already-deleted": "This topic has already been deleted",
+    "topic-already-restored": "This topic has already been restored",
     "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.",
     "invalid-file": "Invalid File",
     "uploads-are-disabled": "Uploads are disabled",
     "upload-error": "Upload Error : %1",
-    "signature-too-long": "Signature can't be longer than %1 characters!",
+    "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.",
     "cant-chat-with-yourself": "You can't chat with yourself!",
     "reputation-system-disabled": "Reputation system is disabled.",
     "downvoting-disabled": "Downvoting is disabled",
     "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",
-    "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+    "not-enough-reputation-to-flag": "You do not have enough reputation to flag 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@pirate/global.json

@@ -71,5 +71,6 @@
     "guest": "Guest",
     "guests": "Guests",
     "updated.title": "Forum Updated",
-    "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page."
+    "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page.",
+    "privacy": "Privacy"
 }

public/language/en@pirate/groups.json

@@ -1,4 +1,5 @@
 {
+    "groups": "Groups",
     "view_group": "View Group",
     "details.title": "Group Details",
     "details.members": "Member List",

public/language/en@pirate/notifications.json

@@ -16,6 +16,7 @@
     "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
     "user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
+    "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
     "user_mentioned_you_in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> started following you.",
     "email-confirmed": "Email Confirmed",

public/language/en@pirate/pages.json

@@ -14,5 +14,5 @@
     "user.favourites": "%1's Favourite Posts",
     "user.settings": "User Settings",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
-    "maintenance.messageIntro": "Additionally, the administator has left this message:"
+    "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }

public/language/en@pirate/topic.json

@@ -18,7 +18,6 @@
     "restore": "Restore",
     "move": "Move",
     "fork": "Fork",
-    "banned": "banned",
     "link": "Link",
     "share": "Share",
     "tools": "Tools",
@@ -73,7 +72,7 @@
     "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! Click here to go to the forked topic.",
+    "fork_success": "Successfully forked topic! Click here to go to the forked topic.",
     "composer.title_placeholder": "Enter your topic title here...",
     "composer.discard": "Discard",
     "composer.submit": "Submit",

public/language/en@pirate/user.json

@@ -47,6 +47,7 @@
     "max": "max.",
     "settings": "Settings",
     "show_email": "Show My Email",
+    "show_fullname": "Show My Full Name",
     "digest_label": "Subscribe to Digest",
     "digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule",
     "digest_off": "Off",

public/language/en@pirate/users.json

@@ -5,6 +5,5 @@
     "search": "Search",
     "enter_username": "Gimme y'er handle",
     "load_more": "Load More",
-    "user-not-found": "User not found!",
     "users-found-search-took": "%1 user(s) found! Search took %2 ms."
 }

public/language/en_US/email.json

@@ -9,7 +9,7 @@
     "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.notifications": "You have 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.",

public/language/en_US/error.json

@@ -17,48 +17,48 @@
     "invalid-pagination-value": "Invalid pagination value",
     "username-taken": "Username taken",
     "email-taken": "Email taken",
-    "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
+    "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.",
     "username-too-short": "Username too short",
     "username-too-long": "Username too long",
     "user-banned": "User banned",
-    "user-too-new": "You need to wait %1 seconds before making your first post!",
-    "no-category": "Category doesn't exist",
-    "no-topic": "Topic doesn't exist",
-    "no-post": "Post doesn't exist",
-    "no-group": "Group doesn't exist",
-    "no-user": "User doesn't exist",
-    "no-teaser": "Teaser doesn't exist",
-    "no-privileges": "You don't have enough privileges for this action.",
+    "user-too-new": "Sorry, you are required to wait %1 seconds before making your first post",
+    "no-category": "Category does not exist",
+    "no-topic": "Topic does not exist",
+    "no-post": "Post does not exist",
+    "no-group": "Group does not exist",
+    "no-user": "User does not exist",
+    "no-teaser": "Teaser does not exist",
+    "no-privileges": "You do not 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.",
-    "content-too-short": "Please enter a longer post. At least %1 characters.",
-    "title-too-short": "Please enter a longer title. At least %1 characters.",
+    "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.",
+    "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.",
     "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.",
-    "too-many-posts": "You can only post every %1 seconds.",
-    "file-too-big": "Maximum allowed file size is %1 kbs",
+    "too-many-posts": "You can only post once every %1 seconds - please wait before posting again",
+    "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file",
     "cant-vote-self-post": "You cannot vote for your own post",
-    "already-favourited": "You already favorited this post",
-    "already-unfavourited": "You already unfavorited this post",
+    "already-favourited": "You have already favourited this post",
+    "already-unfavourited": "You have already unfavourited this post",
     "cant-ban-other-admins": "You can't ban other admins!",
     "invalid-image-type": "Invalid image type",
     "group-name-too-short": "Group name too short",
     "group-already-exists": "Group already exists",
     "group-name-change-not-allowed": "Group name change not allowed",
-    "post-already-deleted": "Post already deleted",
-    "post-already-restored": "Post already restored",
-    "topic-already-deleted": "Topic already deleted",
-    "topic-already-restored": "Topic already restored",
+    "post-already-deleted": "This post has already been deleted",
+    "post-already-restored": "This post has already been restored",
+    "topic-already-deleted": "This topic has already been deleted",
+    "topic-already-restored": "This topic has already been restored",
     "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.",
     "invalid-file": "Invalid File",
     "uploads-are-disabled": "Uploads are disabled",
     "upload-error": "Upload Error : %1",
-    "signature-too-long": "Signature can't be longer than %1 characters!",
+    "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.",
     "cant-chat-with-yourself": "You can't chat with yourself!",
     "reputation-system-disabled": "Reputation system is disabled.",
     "downvoting-disabled": "Downvoting is disabled",
     "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",
-    "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+    "not-enough-reputation-to-flag": "You do not have enough reputation to flag 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_US/global.json

@@ -71,5 +71,6 @@
     "guest": "Guest",
     "guests": "Guests",
     "updated.title": "Forum Updated",
-    "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page."
+    "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page.",
+    "privacy": "Privacy"
 }

public/language/en_US/groups.json

@@ -1,4 +1,5 @@
 {
+    "groups": "Groups",
     "view_group": "View Group",
     "details.title": "Group Details",
     "details.members": "Member List",

public/language/en_US/notifications.json

@@ -13,9 +13,10 @@
     "upvoted_your_post_in": "<strong>%1</strong> has upvoted your post in <strong>%2</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post.",
     "moved_your_topic": "<strong>%1</strong> has moved your topic.",
-    "favourited_your_post_in": "<strong>%1</strong> has favorited your post in <strong>%2</strong>.",
+    "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
     "user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
+    "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
     "user_mentioned_you_in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> started following you.",
     "email-confirmed": "Email Confirmed",

public/language/en_US/pages.json

@@ -14,5 +14,5 @@
     "user.favourites": "%1's Favorite Posts",
     "user.settings": "User Settings",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
-    "maintenance.messageIntro": "Additionally, the administator has left this message:"
+    "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }

public/language/en_US/topic.json

@@ -18,7 +18,6 @@
     "restore": "Restore",
     "move": "Move",
     "fork": "Fork",
-    "banned": "banned",
     "link": "Link",
     "share": "Share",
     "tools": "Tools",
@@ -73,7 +72,7 @@
     "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! Click here to go to the forked topic.",
+    "fork_success": "Successfully forked topic! Click here to go to the forked topic.",
     "composer.title_placeholder": "Enter your topic title here...",
     "composer.discard": "Discard",
     "composer.submit": "Submit",

public/language/en_US/user.json

@@ -47,6 +47,7 @@
     "max": "max.",
     "settings": "Settings",
     "show_email": "Show My Email",
+    "show_fullname": "Show My Full Name",
     "digest_label": "Subscribe to Digest",
     "digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule",
     "digest_off": "Off",

public/language/en_US/users.json

@@ -5,6 +5,5 @@
     "search": "Search",
     "enter_username": "Enter a username to search",
     "load_more": "Load More",
-    "user-not-found": "User not found!",
     "users-found-search-took": "%1 user(s) found! Search took %2 ms."
 }

public/language/es/email.json

@@ -9,7 +9,7 @@
     "reset.text1": "Recibimos una solicitud para reiniciar tu contraseña, posiblemente porque la olvidaste. Si no es así, por favor ignora este email.",
     "reset.text2": "Para continuar con el reinicio de contraseña, por favor cliquea en el siguiente vínculo:",
     "reset.cta": "Cliquea aquí para reiniciar tu contraseña",
-    "digest.notifications": "Tienes algunas notificaciónes de %1 sin leer:",
+    "digest.notifications": "You have unread notifications from %1:",
     "digest.latest_topics": "Últimos temas de %1",
     "digest.cta": "Cliquea aquí para visitar %1",
     "digest.unsub.info": "Este compendio te fue enviado debido a tus ajustes de subscripción.",

public/language/es/error.json

@@ -17,48 +17,48 @@
     "invalid-pagination-value": "Valor de paginación no válido.",
     "username-taken": "Nombre de usuario ya escogido",
     "email-taken": "El correo electrónico ya está escogido.",
-    "email-not-confirmed": "Tu correo electrónico está sin confirmar, por favor haz click aquí para confirmar tu email.",
+    "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.",
     "username-too-short": "El nombre de usuario es demasiado corto",
     "username-too-long": "Nombre de usuario demasiado largo",
     "user-banned": "Usuario expulsado",
-    "user-too-new": "Necesitas esperar %1 segundos antes de hacer tu primera publicación.",
-    "no-category": "La categoría no existe",
-    "no-topic": "El tema no existe.",
-    "no-post": "La publicación no existe",
-    "no-group": "El grupo no existe",
-    "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.",
+    "user-too-new": "Sorry, you are required to wait %1 seconds before making your first post",
+    "no-category": "Category does not exist",
+    "no-topic": "Topic does not exist",
+    "no-post": "Post does not exist",
+    "no-group": "Group does not exist",
+    "no-user": "User does not exist",
+    "no-teaser": "Teaser does not exist",
+    "no-privileges": "You do not have enough privileges for this action.",
     "no-emailers-configured": "Ningún plugin para email fue cargado, así que no se pudo enviar email de prueba.",
     "category-disabled": "Categoría deshabilitada.",
     "topic-locked": "Tema bloqueado.",
     "still-uploading": "Por favor, espera a que terminen las subidas.",
-    "content-too-short": "Por favor, introduce una respuesta más larga, al menos de %1 caracteres.",
-    "title-too-short": "Por favor, introduce un título más largo, al menos de %1 caracteres.",
+    "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.",
+    "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.",
     "title-too-long": "Por favor, introduce un título más corto, que no sobrepase los %1 caracteres.",
-    "too-many-posts": "Sólo puedes publicar cada %1 segundos.",
-    "file-too-big": "El tamaño máximo de archivo es de %1 KBs",
+    "too-many-posts": "You can only post once every %1 seconds - please wait before posting again",
+    "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file",
     "cant-vote-self-post": "No puedes votar tus propios posts",
-    "already-favourited": "Ya has marcado esa publicación como favorita.",
-    "already-unfavourited": "Ya has desmarcado este hilo como favorito",
+    "already-favourited": "You have already favourited this post",
+    "already-unfavourited": "You have already unfavourited this post",
     "cant-ban-other-admins": "No puedes expulsar a otros administradores!",
     "invalid-image-type": "Tipo de imagen no válido.",
     "group-name-too-short": "Nombre del grupo es demasiado corto.",
     "group-already-exists": "El grupo ya existe.",
     "group-name-change-not-allowed": "El nombre del grupo deseado no está permitido.",
-    "post-already-deleted": "La publicación ya ha sido eliminada.",
-    "post-already-restored": "La publicación ya ha sido recuperada.",
-    "topic-already-deleted": "El tema ya ha sido eliminado.",
-    "topic-already-restored": "El tema ya ha sido recuperado.",
+    "post-already-deleted": "This post has already been deleted",
+    "post-already-restored": "This post has already been restored",
+    "topic-already-deleted": "This topic has already been deleted",
+    "topic-already-restored": "This topic has already been restored",
     "topic-thumbnails-are-disabled": "Las miniaturas de los temas están deshabilitadas.",
     "invalid-file": "Archivo no válido.",
     "uploads-are-disabled": "Las subidas están deshabilitadas.",
     "upload-error": "Error de subida: %1",
-    "signature-too-long": "Las firmas no pueden ser más largas de %1 caracteres!",
+    "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.",
     "cant-chat-with-yourself": "No puedes conversar contigo mismo!",
     "reputation-system-disabled": "El sistema de reputación está deshabilitado.",
     "downvoting-disabled": "La votación negativa está deshabilitada.",
     "not-enough-reputation-to-downvote": "No tienes suficiente reputación para votar negativo este post",
-    "not-enough-reputation-to-flag": "No tienes suficiente reputación para marcar esta publicación",
+    "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post",
     "reload-failed": "NodeBB encontró un problema mientras refrescar: \"%1\". NodeBB intentará cargar el resto de contenido, aunque deberías deshacer lo que hiciste antes de refrescar."
 }

public/language/es/global.json

@@ -71,5 +71,6 @@
     "guest": "Invitado",
     "guests": "Invitados",
     "updated.title": "Foro actualizado",
-    "updated.message": "El foro acaba de ser actualizado a la última versión. Haz click aquí para refrescar la página."
+    "updated.message": "El foro acaba de ser actualizado a la última versión. Haz click aquí para refrescar la página.",
+    "privacy": "Privacy"
 }

public/language/es/groups.json

@@ -1,4 +1,5 @@
 {
+    "groups": "Groups",
     "view_group": "Ver Grupo",
     "details.title": "Detalles de Grupo",
     "details.members": "Lista de Miembros",

public/language/es/notifications.json

@@ -16,6 +16,7 @@
     "favourited_your_post_in": "<strong>%1</strong> ha marcado como favorito su publicación en <strong>%2</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> ha marcado como indebida una respuesta en <strong>%2</strong>",
     "user_posted_to": "<strong>%1</strong> ha publicado una respuesta a: <strong>%2</strong>",
+    "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
     "user_mentioned_you_in": "<strong>%1</strong> te mencionó en <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> comenzó a seguirte.",
     "email-confirmed": "Correo electrónico confirmado",

public/language/es/pages.json

@@ -14,5 +14,5 @@
     "user.favourites": "Publicaciones favoritas de %1 ",
     "user.settings": "Preferencias del Usuario",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
-    "maintenance.messageIntro": "Additionally, the administator has left this message:"
+    "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }

public/language/es/topic.json

@@ -18,7 +18,6 @@
     "restore": "Restaurar",
     "move": "Mover",
     "fork": "Bifurcar",
-    "banned": "baneado",
     "link": "Link",
     "share": "Compartir",
     "tools": "Herramientas",
@@ -73,7 +72,7 @@
     "topic_will_be_moved_to": "Este tema será movido a la categoría",
     "fork_topic_instruction": "Click en las publicaciones que quieres bifurcar",
     "fork_no_pids": "¡No seleccionaste publicaciones!",
-    "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
+    "fork_success": "Successfully forked topic! Click here to go to the forked topic.",
     "composer.title_placeholder": "Ingresa el titulo de tu tema",
     "composer.discard": "Descartar",
     "composer.submit": "Enviar",

public/language/es/user.json

@@ -47,6 +47,7 @@
     "max": "máx.",
     "settings": "Opciones",
     "show_email": "Mostrar mi Correo electrónico",
+    "show_fullname": "Show My Full Name",
     "digest_label": "Suscribirse a Resumen",
     "digest_description": "Suscribirse a actualizaciones por correo electrónico a este foro (nuevas notificaciones y temas) de acuerdo a una recurrencia definida",
     "digest_off": "Apagado",

public/language/es/users.json

@@ -5,6 +5,5 @@
     "search": "Buscar",
     "enter_username": "Ingresa el nombre de usuario que quieres buscar",
     "load_more": "Cargar más",
-    "user-not-found": "¡Usuario no encontrado!",
     "users-found-search-took": "¡%1 usuario(s) encontrados! La búsqueda tardó %2 ms."
 }

public/language/et/email.json

@@ -9,7 +9,7 @@
     "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.notifications": "You have 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.",

public/language/et/error.json

@@ -17,48 +17,48 @@
     "invalid-pagination-value": "Vigane lehe väärtus",
     "username-taken": "Kasutajanimi on juba võetud",
     "email-taken": "Email on võetud",
-    "email-not-confirmed": "Su emaili aadress ei ole kinnitatud, vajuta siia et kinnitada.",
+    "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.",
     "username-too-short": "Kasutajanimi on liiga lühike",
     "username-too-long": "Username too long",
     "user-banned": "Kasutaja bannitud",
-    "user-too-new": "You need to wait %1 seconds before making your first post!",
-    "no-category": "Kategooriat ei eksisteeri",
-    "no-topic": "Teemat ei eksisteeri",
-    "no-post": "Postitust ei eksisteeri",
-    "no-group": "Gruppi ei eksisteeri",
-    "no-user": "Kasutajat ei eksisteeri",
-    "no-teaser": "Eelvaadet ei eksisteeri",
-    "no-privileges": "Sul pole piisvalt õigusi.",
+    "user-too-new": "Sorry, you are required to wait %1 seconds before making your first post",
+    "no-category": "Category does not exist",
+    "no-topic": "Topic does not exist",
+    "no-post": "Post does not exist",
+    "no-group": "Group does not exist",
+    "no-user": "User does not exist",
+    "no-teaser": "Teaser does not exist",
+    "no-privileges": "You do not have enough privileges for this action.",
     "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.",
-    "content-too-short": "Palun sisesta pikem vastus. Vähemalt %1 tähemärki.",
-    "title-too-short": "Palun sisesta pikem pealkiri. Vähemalt %1 tähemärki.",
+    "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.",
+    "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.",
     "title-too-long": "Palun sisesta lühem pealkiri. Pealkirjad ei saa olla pikemad kui %1 tähemärki.",
-    "too-many-posts": "Sa saad postitada iga %1 sekundi tagant.",
-    "file-too-big": "Maksimaalne üleslaetava faili suurus on %1 kb",
+    "too-many-posts": "You can only post once every %1 seconds - please wait before posting again",
+    "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file",
     "cant-vote-self-post": "Sa ei saa hääletada enda postituse poolt",
-    "already-favourited": "Sa juba märkisid selle postituse lemmikuks",
-    "already-unfavourited": "Sa juba eemaldasid selle postituse lemmikutest",
+    "already-favourited": "You have already favourited this post",
+    "already-unfavourited": "You have already unfavourited this post",
     "cant-ban-other-admins": "Sa ei saa bannida teisi administraatoreid!",
     "invalid-image-type": "Vigane pildi formaat",
     "group-name-too-short": "Grupi nimi liiga lühike",
     "group-already-exists": "Grupp juba eksisteerib",
     "group-name-change-not-allowed": "Grupi nimevahetus ei ole lubatud",
-    "post-already-deleted": "Postitus on juba kustutatud",
-    "post-already-restored": "Postitus on juba taastatud",
-    "topic-already-deleted": "Teema on juba kustutatud",
-    "topic-already-restored": "Teema on juba taastatud",
+    "post-already-deleted": "This post has already been deleted",
+    "post-already-restored": "This post has already been restored",
+    "topic-already-deleted": "This topic has already been deleted",
+    "topic-already-restored": "This topic has already been restored",
     "topic-thumbnails-are-disabled": "Teema thumbnailid on keelatud.",
     "invalid-file": "Vigane fail",
     "uploads-are-disabled": "Üleslaadimised on keelatud",
     "upload-error": "Üleslaadimise viga: %1",
-    "signature-too-long": "Allkiri ei saa olla pikem kui %1 tähemärki!",
+    "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.",
     "cant-chat-with-yourself": "Sa ei saa endaga vestelda!",
     "reputation-system-disabled": "Reputation system is disabled.",
     "downvoting-disabled": "Downvoting is disabled",
     "not-enough-reputation-to-downvote": "Sul ei ole piisavalt reputatsiooni, et anda negatiivset hinnangut sellele postitusele.",
-    "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+    "not-enough-reputation-to-flag": "You do not have enough reputation to flag 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/et/global.json

@@ -71,5 +71,6 @@
     "guest": "Külaline",
     "guests": "Külalised",
     "updated.title": "Foorum on uuendatud",
-    "updated.message": "See foorum uuendati just kõige uuemale versioonile. Vajuta siia et värskendada veebilehte."
+    "updated.message": "See foorum uuendati just kõige uuemale versioonile. Vajuta siia et värskendada veebilehte.",
+    "privacy": "Privacy"
 }

public/language/et/groups.json

@@ -1,4 +1,5 @@
 {
+    "groups": "Groups",
     "view_group": "View Group",
     "details.title": "Group Details",
     "details.members": "Member List",

public/language/et/notifications.json

@@ -16,6 +16,7 @@
     "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
     "user_posted_to": "Kasutaja <strong>%1</strong> postitas vastuse teemasse <strong>%2</strong>",
+    "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
     "user_mentioned_you_in": "<strong>%1</strong> mainis sind postituses <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> started following you.",
     "email-confirmed": "Emaili aadress kinnitatud",

public/language/et/pages.json

@@ -14,5 +14,5 @@
     "user.favourites": "%1's lemmikud postitused",
     "user.settings": "Kasutaja sätted",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
-    "maintenance.messageIntro": "Additionally, the administator has left this message:"
+    "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }

public/language/et/topic.json

@@ -18,7 +18,6 @@
     "restore": "Taasta",
     "move": "Liiguta",
     "fork": "Fork",
-    "banned": "Bannitud",
     "link": "Ühenda",
     "share": "Jaga",
     "tools": "Tööriistad",
@@ -73,7 +72,7 @@
     "topic_will_be_moved_to": "See teema liigutatakse antud kategooriasse",
     "fork_topic_instruction": "Vajuta postitustele, mida soovid forkida",
     "fork_no_pids": "Sa ei ole postitusi valinud!",
-    "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
+    "fork_success": "Successfully forked topic! Click here to go to the forked topic.",
     "composer.title_placeholder": "Sisesta teema pealkiri siia...",
     "composer.discard": "Katkesta",
     "composer.submit": "Postita",

public/language/et/user.json

@@ -47,6 +47,7 @@
     "max": "max.",
     "settings": "Seaded",
     "show_email": "Näita minu emaili",
+    "show_fullname": "Show My Full Name",
     "digest_label": "Telli",
     "digest_description": "Telli kõik teated emaili teel (uued teated ja teemad).",
     "digest_off": "Väljas",

public/language/et/users.json

@@ -5,6 +5,5 @@
     "search": "Otsi",
     "enter_username": "Sisesta kasutajanimi, keda soovid otsida",
     "load_more": "Lae veel",
-    "user-not-found": "Kasutajat ei leitud!",
     "users-found-search-took": "%1kasutaja(t) leiti! Otsing kestis %2 ms."
 }

public/language/fa_IR/email.json

@@ -9,7 +9,7 @@
     "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.notifications": "You have 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.",

public/language/fa_IR/error.json

@@ -17,48 +17,48 @@
     "invalid-pagination-value": "عدد صفحه‌بندی نامعتبر است.",
     "username-taken": "این نام کاربری گرفته شده است.",
     "email-taken": "این رایانامه گرفته شده است.",
-    "email-not-confirmed": "رایانامه شما تأیید نشده است، لطفاً برای تأیید رایانامه‌تان اینجا را بفشارید.",
+    "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.",
     "username-too-short": "نام کاربری خیلی کوتاه است.",
     "username-too-long": "Username too long",
     "user-banned": "کاربر محروم شد.",
-    "user-too-new": "You need to wait %1 seconds before making your first post!",
-    "no-category": "چنین دسته‌ای وجود ندارد.",
-    "no-topic": "چنین جستاری وجود ندارد.",
-    "no-post": "چنین دیدگاهی وجود ندارد.",
-    "no-group": "چنین گروهی وجود ندارد.",
-    "no-user": "چنین کاربری وجود ندارد.",
-    "no-teaser": "چکیدهٔ دیدگاه وجود ندارد.",
-    "no-privileges": "شما دسترسی کافی برای این کار را ندارید.",
+    "user-too-new": "Sorry, you are required to wait %1 seconds before making your first post",
+    "no-category": "Category does not exist",
+    "no-topic": "Topic does not exist",
+    "no-post": "Post does not exist",
+    "no-group": "Group does not exist",
+    "no-user": "User does not exist",
+    "no-teaser": "Teaser does not exist",
+    "no-privileges": "You do not have enough privileges for this action.",
     "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
     "category-disabled": "دسته غیر‌فعال شد.",
     "topic-locked": "جستار بسته شد.",
     "still-uploading": "خواهشمندیم تا پایان بارگذاری‌ها شکیبا باشید.",
-    "content-too-short": "خواهشمندیم دیدگاه بلندتری بنویسید. دست‌کم با %1 نویسه.",
-    "title-too-short": "خواهشمندیم عنوان بلندتری بنویسید. دست‌کم با %1 نویسه.",
+    "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.",
+    "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.",
     "title-too-long": "خواهشمندیم عنوان کوتاه‌تری بنویسید. عنوان‌ها نمی‌توانند بیش‌تر از %1 نویسه داشته باشند.",
-    "too-many-posts": "شما تنها می‌توانید هر %1 ثانیه دیدگاهی بفرستید.",
-    "file-too-big": "بیشنیهٔ اندازهٔ مجاز پرونده %1 کیلوبایت است.",
+    "too-many-posts": "You can only post once every %1 seconds - please wait before posting again",
+    "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file",
     "cant-vote-self-post": "شما نمی‌توانید به دیدگاه خود رای بدهید.",
-    "already-favourited": "این دیدگاه را پیش از این پسندیده‌اید.",
-    "already-unfavourited": "این دیدگاه را پیش از این عدم پسند کرده‌اید.",
+    "already-favourited": "You have already favourited this post",
+    "already-unfavourited": "You have already unfavourited this post",
     "cant-ban-other-admins": "شما نمی‌توانید دیگر مدیران را محروم کنید!",
     "invalid-image-type": "نوع تصویر نامعتبر است.",
     "group-name-too-short": "نام گروه خیلی کوتاه است.",
     "group-already-exists": "این گروه از پیش وجود دارد.",
     "group-name-change-not-allowed": "تغیر نام گروه نیاز به دسترسی دارد.",
-    "post-already-deleted": "دیدگاه پیش‌تر پاک شده است.",
-    "post-already-restored": "دیدگاه پیش‌تر بازگردانی شده است.",
-    "topic-already-deleted": "جستار پیش‌تر پاک شده است.",
-    "topic-already-restored": "جستار پیش‌تر بازگردانی شده است.",
+    "post-already-deleted": "This post has already been deleted",
+    "post-already-restored": "This post has already been restored",
+    "topic-already-deleted": "This topic has already been deleted",
+    "topic-already-restored": "This topic has already been restored",
     "topic-thumbnails-are-disabled": "چهرک‌های جستار غیرفعال شده است.",
     "invalid-file": "فایل نامعتبر است.",
     "uploads-are-disabled": "امکان بارگذاری غیرفعال شده است.",
     "upload-error": "خطای بارگذاری: %1",
-    "signature-too-long": "امضا نمی‌تواند بیش‌تر از %1 نویسه داشته باشد.",
+    "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.",
     "cant-chat-with-yourself": "شما نمی‌توانید با خودتان گفتگو کنید!",
     "reputation-system-disabled": "Reputation system is disabled.",
     "downvoting-disabled": "Downvoting is disabled",
     "not-enough-reputation-to-downvote": "شما اعتبار کافی برای دادن رای منفی به این دیدگاه را ندارید.",
-    "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+    "not-enough-reputation-to-flag": "You do not have enough reputation to flag 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/fa_IR/global.json

@@ -71,5 +71,6 @@
     "guest": "مهمان",
     "guests": "مهمان‌ها",
     "updated.title": "انجمن بروزرسانی شد",
-    "updated.message": "این انجمن به آخرین نسخه بروزرسانی شد. برای بارگزاری مجدد صفحه اینجا کلیک کنید."
+    "updated.message": "این انجمن به آخرین نسخه بروزرسانی شد. برای بارگزاری مجدد صفحه اینجا کلیک کنید.",
+    "privacy": "Privacy"
 }

public/language/fa_IR/groups.json

@@ -1,4 +1,5 @@
 {
+    "groups": "Groups",
     "view_group": "View Group",
     "details.title": "Group Details",
     "details.members": "Member List",

public/language/fa_IR/notifications.json

@@ -16,6 +16,7 @@
     "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
     "user_posted_to": "پاسخ دادن به <strong>%2</strong> از سوی <strong>%1</strong>",
+    "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
     "user_mentioned_you_in": "%1 در %2 به شما اشاره کرد",
     "user_started_following_you": "<strong>%1</strong> started following you.",
     "email-confirmed": "رایانامه تایید شد",

public/language/fa_IR/pages.json

@@ -14,5 +14,5 @@
     "user.favourites": "دیدگاه‌های پسندیدهٔ %1",
     "user.settings": "تنظیمات کاربر",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
-    "maintenance.messageIntro": "Additionally, the administator has left this message:"
+    "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }

public/language/fa_IR/topic.json

@@ -18,7 +18,6 @@
     "restore": "برگرداندن",
     "move": "جابه‌جا کردن",
     "fork": "شاخه ساختن",
-    "banned": "مسدود",
     "link": "پیوند",
     "share": "اشتراک‌گذاری",
     "tools": "ابزارها",
@@ -73,7 +72,7 @@
     "topic_will_be_moved_to": "این جستار جابه‌جا خواهد شد به دستهٔ",
     "fork_topic_instruction": "دیدگاه‌هایی را که می‌خواهید به جستار تازه ببرید، برگزینید",
     "fork_no_pids": "هیچ دیدگاهی انتخاب نشده!",
-    "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
+    "fork_success": "Successfully forked topic! Click here to go to the forked topic.",
     "composer.title_placeholder": "سرنویس جستارتان را اینجا بنویسید...",
     "composer.discard": "دور بیانداز",
     "composer.submit": "بفرست",

public/language/fa_IR/user.json

@@ -47,6 +47,7 @@
     "max": "بیشینه",
     "settings": "تنظیمات",
     "show_email": "نمایش رایانامه‌ام",
+    "show_fullname": "Show My Full Name",
     "digest_label": "مشترک شدن در چکیده",
     "digest_description": "مشترک شدن برای دریافت تازه‌هی این انجمن (جستارها و آکاه‌سازی‌های تازه) با رایانامه روی یک برنامه زمان‌بندی",
     "digest_off": "خاموش",

public/language/fa_IR/users.json

@@ -5,6 +5,5 @@
     "search": "جستجو",
     "enter_username": "یک نام کاربری برای جستجو وارد کنید",
     "load_more": "بارگذاری بیش‌تر",
-    "user-not-found": "کاربر یافت نشد!",
     "users-found-search-took": "%1 کاربر() در مدت زمان %2 میلی ثانیه یافت شد!"
 }

public/language/fi/email.json

@@ -9,7 +9,7 @@
     "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.notifications": "You have 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.",

public/language/fi/error.json

@@ -17,48 +17,48 @@
     "invalid-pagination-value": "Virheellinen taittoarvo",
     "username-taken": "Käyttäjänimi varattu",
     "email-taken": "Sähköpostiosoite varattu",
-    "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
+    "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.",
     "username-too-short": "Käyttäjänimi on liian lyhyt",
     "username-too-long": "Username too long",
     "user-banned": "Käyttäjä on estetty",
-    "user-too-new": "You need to wait %1 seconds before making your first post!",
-    "no-category": "Kategoriaa ei ole olemassa",
-    "no-topic": "Aihetta ei ole olemassa",
-    "no-post": "Viestiä ei ole olemassa",
-    "no-group": "Ryhmää ei ole olemassa",
-    "no-user": "Käyttäjää ei ole olemassa",
-    "no-teaser": "Teaseria ei ole olemassa",
-    "no-privileges": "Oikeutesi eivät riitä toiminnon suorittamiseen",
+    "user-too-new": "Sorry, you are required to wait %1 seconds before making your first post",
+    "no-category": "Category does not exist",
+    "no-topic": "Topic does not exist",
+    "no-post": "Post does not exist",
+    "no-group": "Group does not exist",
+    "no-user": "User does not exist",
+    "no-teaser": "Teaser does not exist",
+    "no-privileges": "You do not have enough privileges for this action.",
     "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.",
-    "content-too-short": "Viestisi täytyy olla pidempi. Vähintään %1 merkkiä.",
-    "title-too-short": "Otsikon täytyy olla pidempi. Vähintään %1 merkkiä.",
+    "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.",
+    "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.",
     "title-too-long": "Otsikkosi on liian pitkä. Otsikoiden pituuden tulee olla enintään %1 merkkiä.",
-    "too-many-posts": "Voit lähettää viestin %1 sekuntin välein.",
-    "file-too-big": "Suurin sallittu tiedostokoko on %1 kb",
+    "too-many-posts": "You can only post once every %1 seconds - please wait before posting again",
+    "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file",
     "cant-vote-self-post": "Et voi antaa ääntä omalle viestillesi",
-    "already-favourited": "Tämä viesti on jo suosikeissasi",
-    "already-unfavourited": "Olet jo poistanut tämän viestin suosikeistasi",
+    "already-favourited": "You have already favourited this post",
+    "already-unfavourited": "You have already unfavourited this post",
     "cant-ban-other-admins": "Et voi estää muita ylläpitäjiä!",
     "invalid-image-type": "Virheellinen kuvatiedosto",
     "group-name-too-short": "Ryhmän nimi on liian lyhyt",
     "group-already-exists": "Ryhmä on jo olemassa",
     "group-name-change-not-allowed": "Et voi vaihtaa ryhmän nimeä",
-    "post-already-deleted": "Viesti on jo poistettu",
-    "post-already-restored": "Viesti on jo palautettu",
-    "topic-already-deleted": "Aihe on jo poistettu",
-    "topic-already-restored": "Aihe on jo palautettu",
+    "post-already-deleted": "This post has already been deleted",
+    "post-already-restored": "This post has already been restored",
+    "topic-already-deleted": "This topic has already been deleted",
+    "topic-already-restored": "This topic has already been restored",
     "topic-thumbnails-are-disabled": "Aiheiden kuvakkeet eivät ole käytössä",
     "invalid-file": "Virheellinen tiedosto",
     "uploads-are-disabled": "Et voi lähettää tiedostoa",
     "upload-error": "Lähetysvirhe: %1",
-    "signature-too-long": "Allekirjoitus ei voi olla pidempi kuin %1 merkkiä!",
+    "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.",
     "cant-chat-with-yourself": "Et voi keskustella itsesi kanssa!",
     "reputation-system-disabled": "Reputation system is disabled.",
     "downvoting-disabled": "Downvoting is disabled",
     "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",
-    "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+    "not-enough-reputation-to-flag": "You do not have enough reputation to flag 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/fi/global.json

@@ -71,5 +71,6 @@
     "guest": "Vieras",
     "guests": "Vieraat",
     "updated.title": "Foorumi päivitetty",
-    "updated.message": "Tämä foorumi on juuri päivitetty uusimpaan versioon. Paina tästä päivittääksesi sivun."
+    "updated.message": "Tämä foorumi on juuri päivitetty uusimpaan versioon. Paina tästä päivittääksesi sivun.",
+    "privacy": "Privacy"
 }

public/language/fi/groups.json

@@ -1,4 +1,5 @@
 {
+    "groups": "Groups",
     "view_group": "View Group",
     "details.title": "Group Details",
     "details.members": "Member List",

public/language/fi/notifications.json

@@ -16,6 +16,7 @@
     "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
     "user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
+    "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
     "user_mentioned_you_in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> started following you.",
     "email-confirmed": "Sähköpostiosoite vahvistettu",

public/language/fi/pages.json

@@ -14,5 +14,5 @@
     "user.favourites": "Käyttäjän %1 suosikkiviestit",
     "user.settings": "Käyttäjän asetukset",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
-    "maintenance.messageIntro": "Additionally, the administator has left this message:"
+    "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }

public/language/fi/topic.json

@@ -18,7 +18,6 @@
     "restore": "Restore",
     "move": "Siirrä",
     "fork": "Haaroita",
-    "banned": "estetty",
     "link": "Linkitä",
     "share": "Jaa",
     "tools": "Työkalut",
@@ -73,7 +72,7 @@
     "topic_will_be_moved_to": "Tämä keskustelu siirretään aihealueelle",
     "fork_topic_instruction": "Napsauta viestejä, jotka haluat haaroittaa",
     "fork_no_pids": "Ei valittuja viestejä!",
-    "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
+    "fork_success": "Successfully forked topic! Click here to go to the forked topic.",
     "composer.title_placeholder": "Syötä aiheesi otsikko tähän...",
     "composer.discard": "Hylkää",
     "composer.submit": "Lähetä",

public/language/fi/user.json

@@ -47,6 +47,7 @@
     "max": "max.",
     "settings": "Asetukset",
     "show_email": "Näytä sähköpostiosoitteeni",
+    "show_fullname": "Show My Full Name",
     "digest_label": "Subscribe to Digest",
     "digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule",
     "digest_off": "Off",

public/language/fi/users.json

@@ -5,6 +5,5 @@
     "search": "Hae",
     "enter_username": "Syötä käyttäjätunnus hakeaksesi",
     "load_more": "Lataa lisää",
-    "user-not-found": "User not found!",
     "users-found-search-took": "%1 user(s) found! Search took %2 ms."
 }

public/language/fr/email.json

@@ -14,10 +14,10 @@
     "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.daily.no_topics": "Il n'y a eu aucun sujet actif ces derniers jours",
-    "notif.chat.subject": "New chat message received from %1",
-    "notif.chat.cta": "Click here to continue the conversation",
-    "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
+    "notif.chat.subject": "Nouveau message de chat reçu de %1",
+    "notif.chat.cta": "Cliquez ici pour continuer la conversation",
+    "notif.chat.unsub.info": "Cette notification de chat a été envoyé en raison de vos paramètres d'abonnement.",
     "test.text1": "Ceci est un email de test pour vérifier que l'emailer est correctement configuré pour NodeBB.",
-    "unsub.cta": "Click here to alter those settings",
+    "unsub.cta": "Cliquez ici pour modifier ces paramètres",
     "closing": "Merci !"
 }

public/language/fr/error.json

@@ -12,16 +12,16 @@
     "invalid-title": "Titre invalide !",
     "invalid-user-data": "Données utilisateur invalides",
     "invalid-password": "Mot de passe invalide",
-    "invalid-username-or-password": "Please specify both a username and password",
-    "invalid-search-term": "Invalid search term",
+    "invalid-username-or-password": "S'il vous plait, veuillez entrer un nom d'utilisateur et un mot de passe",
+    "invalid-search-term": "Données de recherche invalides",
     "invalid-pagination-value": "Valeur de pagination invalide",
     "username-taken": "Nom d’utilisateur déjà utilisé",
     "email-taken": "Email déjà utilisé",
-    "email-not-confirmed": "Votre adresse email n'est pas confirmée, cliquez ici pour la valider.",
+    "email-not-confirmed": "Votre adresse email n'est pas confirmée, cliquer ici pour la valider.",
     "username-too-short": "Nom d'utilisateur trop court",
-    "username-too-long": "Username too long",
+    "username-too-long": "Nom d'utilisateur trop long",
     "user-banned": "Utilisateur banni",
-    "user-too-new": "You need to wait %1 seconds before making your first post!",
+    "user-too-new": "Désolé, vous devez attendre encore %1 secondes avant d'envoyer votre premier message",
     "no-category": "Cette catégorie n'existe pas",
     "no-topic": "Ce sujet n'existe pas",
     "no-post": "Ce message n'existe pas",
@@ -40,7 +40,7 @@
     "file-too-big": "La taille maximum des fichiers est de %1 kbs.",
     "cant-vote-self-post": "Vous ne pouvez pas voter pour vos propres messages",
     "already-favourited": "Vous avez déjà mis ce message en favoris",
-    "already-unfavourited": "Vous avez déjà retiré des favoris ce message",
+    "already-unfavourited": "Vous avez déjà retiré ce message des favoris",
     "cant-ban-other-admins": "Vous ne pouvez pas bannir les autres administrateurs !",
     "invalid-image-type": "Type d’image invalide",
     "group-name-too-short": "Nom de groupe trop court",
@@ -56,9 +56,9 @@
     "upload-error": "Erreur d'envoi : %1",
     "signature-too-long": "La signature ne peut dépasser %1 caractères !",
     "cant-chat-with-yourself": "Vous ne pouvez chatter avec vous même !",
-    "reputation-system-disabled": "Reputation system is disabled.",
-    "downvoting-disabled": "Downvoting is disabled",
+    "reputation-system-disabled": "Le système de réputation est désactivé",
+    "downvoting-disabled": "Les votes négatifs ne sont pas autorisés",
     "not-enough-reputation-to-downvote": "Vous n'avez pas une réputation assez élevée pour noter négativement ce message",
-    "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag 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."
+    "not-enough-reputation-to-flag": "Vous n'avez pas une réputation assez élevée pour signaler ce message",
+    "reload-failed": "NodeBB a rencontré un problème lors du rechargement : \"% 1\" . NodeBB continuera de fonctionner côté client, même si vous devez annuler ce que vous avez fait juste avant de recharger ."
 }

public/language/fr/global.json

@@ -71,5 +71,6 @@
     "guest": "Invité",
     "guests": "Invités",
     "updated.title": "Forum mis à jour",
-    "updated.message": "Ce forum a été mis à jour à la dernière version. Cliquez ici pour recharger la page."
+    "updated.message": "Ce forum a été mis à jour à la dernière version. Cliquez ici pour recharger la page.",
+    "privacy": "Vie privée"
 }

public/language/fr/groups.json

@@ -1,4 +1,5 @@
 {
+    "groups": "Groupes",
     "view_group": "Voir le groupe",
     "details.title": "Informations du groupe",
     "details.members": "Liste des membres",

public/language/fr/modules.json

@@ -12,10 +12,10 @@
     "chat.message-history": "Historique des messages",
     "chat.pop-out": "Afficher la discussion",
     "chat.maximize": "Agrandir",
-    "chat.yesterday": "Yesterday",
-    "chat.seven_days": "7 Days",
-    "chat.thirty_days": "30 Days",
-    "chat.three_months": "3 Months",
+    "chat.yesterday": "Hier",
+    "chat.seven_days": "7 Jours",
+    "chat.thirty_days": "30 Jours",
+    "chat.three_months": "3 Mois",
     "composer.user_said_in": "%1 a dit dans %2 :",
     "composer.user_said": "%1 a dit :",
     "composer.discard": "Êtes-vous sûr de bien vouloir supprimer ce message ?"

public/language/fr/notifications.json

@@ -10,14 +10,15 @@
     "new_notification": "Nouvelle notification",
     "you_have_unread_notifications": "Vous avez des notifications non-lues",
     "new_message_from": "Nouveau message de <strong>%1</strong>",
-    "upvoted_your_post_in": "<strong>%1</strong> has upvoted your post in <strong>%2</strong>.",
-    "moved_your_post": "<strong>%1</strong> has moved your post.",
-    "moved_your_topic": "<strong>%1</strong> has moved your topic.",
-    "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
-    "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
+    "upvoted_your_post_in": "<strong>%1</strong> a voté pour votre message dans <strong>%2</strong>.",
+    "moved_your_post": "<strong>%1</strong> a déplacé votre message.",
+    "moved_your_topic": "<strong>%1</strong> a déplacé votre sujet.",
+    "favourited_your_post_in": "<strong>%1</strong> a mis votre message en favoris dans <strong>%2</strong>.",
+    "user_flagged_post_in": "<strong>%1</strong> a signalé un message dans <strong>%2</strong>.",
     "user_posted_to": "<strong>%1</strong> a répondu à : <strong>%2</strong>",
+    "user_posted_topic": "<strong>%1</strong> a posté un nouveau sujet: <strong>%2</strong>.",
     "user_mentioned_you_in": "<strong>%1</strong> vous a mentionné dans <strong>%2</strong>",
-    "user_started_following_you": "<strong>%1</strong> started following you.",
+    "user_started_following_you": "<strong>%1</strong> vous suit.",
     "email-confirmed": "Email vérifié",
     "email-confirmed-message": "Merci pour la validation de votre adresse email. Votre compte est désormais activé.",
     "email-confirm-error": "Un erreur est survenue ...",

public/language/fr/pages.json

@@ -13,6 +13,6 @@
     "user.topics": "Sujets créés par %1",
     "user.favourites": "Messages favoris de %1",
     "user.settings": "Préférences utilisateur",
-    "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
-    "maintenance.messageIntro": "Additionally, the administator has left this message:"
+    "maintenance.text": "%1 est en maintenance. Veuillez revenir un peu plus tard.",
+    "maintenance.messageIntro": "De plus, l'administrateur a laissé ce message:"
 }

public/language/fr/recent.json

@@ -4,6 +4,6 @@
     "week": "Semaine",
     "month": "Mois",
     "year": "An",
-    "alltime": "All Time",
+    "alltime": "Toujours",
     "no_recent_topics": "Il n'y a aucun sujet récent."
 }

public/language/fr/search.json

@@ -1,4 +1,4 @@
 {
     "results_matching": "%1 résultat(s) correspondant(s) à \"%2\", (%3 secondes)",
-    "no-matches": "No posts found"
+    "no-matches": "Aucun message trouvé!"
 }

public/language/fr/tags.json

@@ -2,6 +2,6 @@
     "no_tag_topics": "Il n'y a aucun sujet ayant ce mot-clé",
     "tags": "Mots-clés",
     "enter_tags_here": "Entrez les mots-clés ici. Appuyez sur entrer après chaque mot-clé.",
-    "enter_tags_here_short": "Enter tags...",
+    "enter_tags_here_short": "Entrez des tags...",
     "no_tags": "Il n'y a pas encore de mots-clés."
 }