Incremented version number

show post tools for global mod on post delete

.tx/config

@@ -919,4 +919,50 @@ trans.tr = public/language/tr/groups.json
 trans.vi = public/language/vi/groups.json
 trans.zh_CN = public/language/zh_CN/groups.json
 trans.zh_TW = public/language/zh_TW/groups.json
+type = KEYVALUEJSON
+
+[nodebb.uploads]
+file_filter = public/language/<lang>/uploads.json
+source_file = public/language/en_GB/uploads.json
+source_lang = en_GB
+trans.ar = public/language/ar/uploads.json
+trans.bn = public/language/bn/uploads.json
+trans.bg = public/language/bg/uploads.json
+trans.cs = public/language/cs/uploads.json
+trans.da = public/language/da/uploads.json
+trans.de = public/language/de/uploads.json
+trans.el = public/language/el/uploads.json
+trans.en_US = public/language/en_US/uploads.json
+trans.en@pirate = public/language/en@pirate/uploads.json
+trans.es = public/language/es/uploads.json
+trans.et = public/language/et/uploads.json
+trans.fa_IR = public/language/fa_IR/uploads.json
+trans.fi = public/language/fi/uploads.json
+trans.fr = public/language/fr/uploads.json
+trans.gl = public/language/gl/uploads.json
+trans.he = public/language/he/uploads.json
+trans.hu = public/language/hu/uploads.json
+trans.id = public/language/id/uploads.json
+trans.it = public/language/it/uploads.json
+trans.ja = public/language/ja/uploads.json
+trans.ko = public/language/ko/uploads.json
+trans.lt = public/language/lt/uploads.json
+trans.ms = public/language/ms/uploads.json
+trans.nb = public/language/nb/uploads.json
+trans.nl = public/language/nl/uploads.json
+trans.pl = public/language/pl/uploads.json
+trans.pt_BR = public/language/pt_BR/uploads.json
+trans.ru = public/language/ru/uploads.json
+trans.ro = public/language/ro/uploads.json
+trans.rw = public/language/rw/uploads.json
+trans.sc = public/language/sc/uploads.json
+trans.sk = public/language/sk/uploads.json
+trans.sl = public/language/sl/uploads.json
+trans.sr = public/language/sr/uploads.json
+trans.sv = public/language/sv/uploads.json
+trans.th = public/language/th/uploads.json
+trans.tr = public/language/tr/uploads.json
+trans.vi = public/language/vi/uploads.json
+trans.zh_CN = public/language/zh_CN/uploads.json
+trans.zh_TW = public/language/zh_TW/uploads.json
 type = KEYVALUEJSON

Gruntfile.js

@@ -17,17 +17,20 @@ module.exports = function(grunt) {
 			args.push('--log-level=info');
 		}
 		
-		if (target === 'lessUpdated') {
-			fromFile = ['js','tpl'];
-			compiling = 'less';
+		if (target === 'lessUpdated_Client') {
+			fromFile = ['js', 'tpl', 'acpLess'];
+			compiling = 'clientLess';
+		} else if (target === 'lessUpdated_Admin') {
+			fromFile = ['js', 'tpl', 'clientLess'];
+			compiling = 'acpLess';
 		} else if (target === 'clientUpdated') {
-			fromFile = ['less','tpl'];
+			fromFile = ['clientLess', 'acpLess', 'tpl'];
 			compiling = 'js';
 		} else if (target === 'templatesUpdated') {
-			fromFile = ['js','less'];
+			fromFile = ['js', 'clientLess', 'acpLess'];
 			compiling = 'tpl';
 		} else if (target === 'serverUpdated') {
-			fromFile = ['less','js','tpl'];
+			fromFile = ['clientLess', 'acpLess', 'js', 'tpl'];
 		}
 
 		fromFile = fromFile.filter(function(ext) {
@@ -53,17 +56,36 @@ module.exports = function(grunt) {
 
 	grunt.initConfig({
 		watch: {
-			lessUpdated: {
-				files: ['public/**/*.less', 'node_modules/nodebb-*/*.less', 'node_modules/nodebb-*/*/*.less', 'node_modules/nodebb-*/*/*/*.less', 'node_modules/nodebb-*/*/*/*/*.less']
+			lessUpdated_Client: {
+				files: [
+					'public/*.less',
+					'node_modules/nodebb-*/*.less', 'node_modules/nodebb-*/**/*.less',
+					'!node_modules/nodebb-*/node_modules/**',
+					'!node_modules/nodebb-*/.git/**'
+				]
+			},
+			lessUpdated_Admin: {
+				files: ['public/**/*.less']
 			},
 			clientUpdated: {
-				files: ['public/src/**/*.js', 'node_modules/nodebb-*/*.js', 'node_modules/nodebb-*/*/*.js', 'node_modules/nodebb-*/*/*/*.js', 'node_modules/nodebb-*/*/*/*/*.js', 'node_modules/templates.js/lib/templates.js']
+				files: [
+					'public/src/**/*.js',
+					'node_modules/nodebb-*/*.js', 'node_modules/nodebb-*/**/*.js',
+					'!node_modules/nodebb-*/node_modules/**',
+					'node_modules/templates.js/lib/templates.js',
+					'!node_modules/nodebb-*/.git/**'
+				]
 			},
 			serverUpdated: {
 				files: ['*.js', 'install/*.js', 'src/**/*.js']
 			},
 			templatesUpdated: {
-				files: ['src/views/**/*.tpl', 'node_modules/nodebb-*/*.tpl', 'node_modules/nodebb-*/*/*.tpl', 'node_modules/nodebb-*/*/*/*.tpl', 'node_modules/nodebb-*/*/*/*/*.tpl', 'node_modules/nodebb-*/*/*/*/*/*.tpl']
+				files: [
+					'src/views/**/*.tpl',
+					'node_modules/nodebb-*/*.tpl', 'node_modules/nodebb-*/**/*.tpl',
+					'!node_modules/nodebb-*/node_modules/**',
+					'!node_modules/nodebb-*/.git/**'
+				]
 			}
 		}
 	});

app.js

@@ -149,9 +149,7 @@ function start() {
 				meta.reload();
 			break;
 			case 'js-propagate':
-				meta.js.target[message.target] = meta.js.target[message.target] || {};
-				meta.js.target[message.target].cache = message.cache;
-				meta.js.target[message.target].map = message.map;
+				meta.js.target = message.data;
 				emitter.emit('meta:js.compiled');
 				winston.verbose('[cluster] Client-side javascript and mapping propagated to worker %s', process.pid);
 			break;
@@ -209,6 +207,10 @@ function start() {
 					winston.warn('One or more of NodeBB\'s dependent packages are out-of-date. Please run the following command to update them:');
 					winston.warn('    ./nodebb upgrade');
 					break;
+				case 'dependencies-missing':
+					winston.warn('One or more of NodeBB\'s dependent packages are missing. Please run the following command to update them:');
+					winston.warn('    ./nodebb upgrade');
+					break;
 				default:
 					if (err.stacktrace !== false) {
 						winston.error(err.stack);

install/data/navigation.json

@@ -79,9 +79,7 @@
 		"textClass": "visible-xs-inline",
 		"text": "\\[\\[global:header.search\\]\\]",
 		"properties": {
-			"installed": {
-				"search": true
-			}
+			"searchInstalled": true
 		}
 	}
 ]

loader.js

@@ -34,8 +34,9 @@ var	pidFilePath = __dirname + '/pidfile',
 
 Loader.init = function(callback) {
 	if (silent) {
-		console.log = function(value) {
-			output.write(value + '\n');
+		console.log = function() {
+			var args = Array.prototype.slice.call(arguments);
+			output.write(args.join(' ') + '\n');
 		};
 	}
 
@@ -122,15 +123,11 @@ Loader.addWorkerEvents = function(worker) {
 					Loader.reload();
 				break;
 				case 'js-propagate':
-					Loader.js.target[message.target] = Loader.js.target[message.target] || {};
-					Loader.js.target[message.target].cache = message.cache;
-					Loader.js.target[message.target].map = message.map;
+					Loader.js.target = message.data;
 
 					Loader.notifyWorkers({
 						action: 'js-propagate',
-						cache: message.cache,
-						map: message.map,
-						target: message.target
+						data: message.data
 					}, worker.pid);
 				break;
 				case 'css-propagate':

nodebb

@@ -118,12 +118,13 @@ var getRunningPid = function(callback) {
 				version: async.apply(getCurrentVersion)
 			}),
 			function(payload, next) {
-				if (!payload.plugins.length) {
+				var toCheck = Object.keys(payload.plugins);
+
+				if (!toCheck.length) {
 					process.stdout.write('OK'.green + '\n'.reset);
 					return next(null, []);	// no extraneous plugins installed
 				}
 
-				var toCheck = Object.keys(payload.plugins);
 				request({
 					method: 'GET',
 					url: 'https://packages.nodebb.org/api/v1/suggest?version=' + payload.version + '&package[]=' + toCheck.join('&package[]='),

package.json

@@ -2,7 +2,7 @@
   "name": "nodebb",
   "license": "GPL-3.0",
   "description": "NodeBB Forum",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "homepage": "http://www.nodebb.org",
   "repository": {
     "type": "git",
@@ -18,6 +18,7 @@
     "autoprefixer": "^6.2.3",
     "bcryptjs": "~2.3.0",
     "body-parser": "^1.9.0",
+    "chart.js": "^1.0.2",
     "colors": "^1.1.0",
     "compression": "^1.1.0",
     "connect-ensure-login": "^0.1.1",
@@ -43,19 +44,21 @@
     "mkdirp": "~0.5.0",
     "mongodb": "~2.1.3",
     "morgan": "^1.3.2",
+    "mousetrap": "^1.5.3",
     "nconf": "~0.8.2",
-    "nodebb-plugin-composer-default": "3.0.10",
-    "nodebb-plugin-dbsearch": "1.0.0",
-    "nodebb-plugin-emoji-extended": "1.0.3",
-    "nodebb-plugin-markdown": "4.0.17",
-    "nodebb-plugin-mentions": "1.0.18",
+    "nodebb-plugin-composer-default": "3.0.22",
+    "nodebb-plugin-dbsearch": "1.0.1",
+    "nodebb-plugin-emoji-one": "1.1.0",
+    "nodebb-plugin-emoji-extended": "1.1.0",
+    "nodebb-plugin-markdown": "5.0.1",
+    "nodebb-plugin-mentions": "1.0.21",
     "nodebb-plugin-soundpack-default": "0.1.6",
-    "nodebb-plugin-spam-be-gone": "0.4.5",
+    "nodebb-plugin-spam-be-gone": "0.4.6",
     "nodebb-rewards-essentials": "0.0.8",
     "nodebb-theme-lavender": "3.0.9",
-    "nodebb-theme-persona": "4.0.99",
-    "nodebb-theme-vanilla": "5.0.56",
-    "nodebb-widget-essentials": "2.0.8",
+    "nodebb-theme-persona": "4.0.118",
+    "nodebb-theme-vanilla": "5.0.63",
+    "nodebb-widget-essentials": "2.0.9",
     "nodemailer": "2.0.0",
     "nodemailer-sendmail-transport": "1.0.0",
     "nodemailer-smtp-transport": "^2.4.1",
@@ -67,7 +70,7 @@
     "request": "^2.44.0",
     "rimraf": "~2.5.0",
     "rss": "^1.0.0",
-    "semver": "^5.0.1",
+    "semver": "^5.1.0",
     "serve-favicon": "^2.1.5",
     "sitemap": "^1.4.0",
     "socket.io": "^1.4.0",
@@ -75,7 +78,7 @@
     "socket.io-redis": "^1.0.0",
     "socketio-wildcard": "~0.3.0",
     "string": "^3.0.0",
-    "templates.js": "0.3.3",
+    "templates.js": "0.3.4",
     "toobusy-js": "^0.4.2",
     "uglify-js": "^2.6.0",
     "underscore": "^1.8.3",
@@ -87,7 +90,7 @@
   "devDependencies": {
     "mocha": "~1.13.0",
     "grunt": "~0.4.5",
-    "grunt-contrib-watch": "^0.6.1"
+    "grunt-contrib-watch": "^1.0.0"
   },
   "bugs": {
     "url": "https://github.com/NodeBB/NodeBB/issues"
@@ -112,4 +115,4 @@
       "url": "https://github.com/barisusakli"
     }
   ]
-}
+}

public/js-enabled.css

@@ -0,0 +1,7 @@
+/*
+    The following stylesheet is only included on pages that can execute javascript
+*/
+
+[component="post/content"] img:not(.not-responsive):not([data-state]) {
+	display: none !important;
+}

public/language/ar/error.json

@@ -27,6 +27,7 @@
     "password-too-long": "Password too long",
     "user-banned": "المستخدم محظور",
     "user-too-new": "عذرا, يجب أن تنتظر 1% ثواني قبل قيامك بأول مشاركة",
+    "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
     "no-category": "قائمة غير موجودة",
     "no-topic": "موضوع غير موجود",
     "no-post": "رد غير موجود",
@@ -97,5 +98,6 @@
     "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
-    "no-users-in-room": "No users in this room"
+    "no-users-in-room": "No users in this room",
+    "cant-kick-self": "You can't kick yourself from the group"
 }

public/language/ar/groups.json

@@ -41,6 +41,7 @@
     "details.hidden": "مخفي",
     "details.hidden_help": "في حالة تفعيل الخيار، لن تظهر المجموعة للعموم والإنضمام إليها سيتلزم دعوة.",
     "details.delete_group": "حذف المجموعة",
+    "details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
     "event.updated": "تم تحديث بيانات المجموعة",
     "event.deleted": "تم حذف المجموعة %1",
     "membership.accept-invitation": "اقبل الدعوة",

public/language/ar/modules.json

@@ -6,6 +6,7 @@
     "chat.user_typing": "%1 يكتب رسالة...",
     "chat.user_has_messaged_you": "%1 أرسل لك رسالة.",
     "chat.see_all": "عرض كل المحادثات",
+    "chat.mark_all_read": "Mark all chats read",
     "chat.no-messages": "المرجو اختيار مرسل إليه لمعاينة تاريخ الدردشات",
     "chat.no-users-in-room": "No users in this room",
     "chat.recent-chats": "آخر الدردشات",

public/language/ar/uploads.json

@@ -0,0 +1,6 @@
+{
+    "uploading-file": "Uploading the file...",
+    "select-file-to-upload": "Select a file to upload!",
+    "upload-success": "File uploaded successfully!",
+    "maximum-file-size": "Maximum %1 kb"
+}

public/language/ar/user.json

@@ -39,6 +39,7 @@
     "change_username": "Change Username",
     "change_email": "Change Email",
     "edit": "تعديل",
+    "edit-profile": "Edit Profile",
     "default_picture": "Default Icon",
     "uploaded_picture": "الصورة المرفوعة",
     "upload_new_picture": "رفع صورة جديدة",
@@ -91,6 +92,7 @@
     "open_links_in_new_tab": "فتح الروابط الخارجية في نافدة جديدة",
     "enable_topic_searching": "تفعيل خاصية البحث داخل المواضيع",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
+    "scroll_to_my_post": "After posting a reply, show the new post",
     "follow_topics_you_reply_to": "متابعة المواضيع التي تقوم بالرد فيها",
     "follow_topics_you_create": "متابعة المواضيع التي تنشئها",
     "grouptitle": "حدد عنوان المجموعة الذي تريد عرضه",

public/language/bg/error.json

@@ -27,6 +27,7 @@
     "password-too-long": "Паролата е твърде дълга",
     "user-banned": "Потребителят е блокиран",
     "user-too-new": "Съжаляваме, но трябва да изчакате поне %1 секунда/и, преди да направите първата си публикация",
+    "blacklisted-ip": "Съжаляваме, но Вашият IP адрес е забранен за ползване в тази общност. Ако смятате, че това е грешка, моля, свържете се с администратор.",
     "no-category": "Категорията не съществува",
     "no-topic": "Темата не съществува",
     "no-post": "Публикацията не съществува",
@@ -60,8 +61,8 @@
     "group-name-too-short": "Името на групата е твърде кратко",
     "group-already-exists": "Вече съществува такава група",
     "group-name-change-not-allowed": "Промяната на името на групата не е разрешено",
-    "group-already-member": "Вече членувате в тази група",
-    "group-not-member": "Не членувате в тази група",
+    "group-already-member": "Потребителят вече членува в тази група",
+    "group-not-member": "Потребителят не членува в тази група",
     "group-needs-owner": "Тази група се нуждае от поне един собственик",
     "group-already-invited": "Този потребител вече е бил поканен",
     "group-already-requested": "Вашата заявка за членство вече е била изпратена",
@@ -97,5 +98,6 @@
     "invite-maximum-met": "Вие сте поканили максимално позволения брой хора (%1 от %2).",
     "no-session-found": "Не е открита сесия за вход!",
     "not-in-room": "Потребителят не е в стаята",
-    "no-users-in-room": "Няма потребители в тази стая"
+    "no-users-in-room": "Няма потребители в тази стая",
+    "cant-kick-self": "Не можете да изритате себе си от групата"
 }

public/language/bg/groups.json

@@ -41,6 +41,7 @@
     "details.hidden": "Скрита",
     "details.hidden_help": "Ако е включено, тази група няма да бъде извеждана в списъка от групи и потребителите ще трябва да бъдат поканени лично",
     "details.delete_group": "Изтриване на групата",
+    "details.private_system_help": "Частните групи са забранени на системно ниво; тази възможност не върши нищо",
     "event.updated": "Подробностите за групата бяха обновени",
     "event.deleted": "Групата „%1“ беше изтрита",
     "membership.accept-invitation": "Приемане на поканата",

public/language/bg/modules.json

@@ -6,6 +6,7 @@
     "chat.user_typing": "%1 пише...",
     "chat.user_has_messaged_you": "%1 Ви написа съобщение.",
     "chat.see_all": "Вижте всички разговори",
+    "chat.mark_all_read": "Отбелязване на всички разговори като прочетени",
     "chat.no-messages": "Моля, изберете получател, за да видите историята на съобщенията",
     "chat.no-users-in-room": "Няма потребители в тази стая",
     "chat.recent-chats": "Скорошни разговори",

public/language/bg/notifications.json

@@ -30,7 +30,7 @@
     "user_started_following_you_dual": "<strong>%1</strong> и <strong>%2</strong> започнаха да Ви следват.",
     "user_started_following_you_multiple": "<strong>%1</strong> и %2 започнаха да Ви следват.",
     "new_register": "<strong>%1</strong> изпрати заявка за регистрация.",
-    "new_register_multiple": "There are <strong>%1</strong> registration requests awaiting review.",
+    "new_register_multiple": "Има <strong>%1</strong> заявки за регистрация, които очакват да бъдат прегледани.",
     "email-confirmed": "Е-пощата беше потвърдена",
     "email-confirmed-message": "Благодарим Ви, че потвърдихте е-пощата си. Акаунтът Ви е вече напълно активиран.",
     "email-confirm-error-message": "Възникна проблем при потвърждаването на е-пощата Ви. Може кодът да е грешен или давността му да е изтекла.",

public/language/bg/uploads.json

@@ -0,0 +1,6 @@
+{
+    "uploading-file": "Качване на файла…",
+    "select-file-to-upload": "Изберете файл за качване!",
+    "upload-success": "Файлът е качен успешно!",
+    "maximum-file-size": "Най-много %1 КБ"
+}

public/language/bg/user.json

@@ -39,6 +39,7 @@
     "change_username": "Промяна на потребителското име",
     "change_email": "Промяна на е-пощата",
     "edit": "Редактиране",
+    "edit-profile": "Редактиране на профила",
     "default_picture": "Иконка по подразбиране",
     "uploaded_picture": "Качена снимка",
     "upload_new_picture": "Качване на нова снимка",
@@ -91,6 +92,7 @@
     "open_links_in_new_tab": "Отваряне на външните връзки в нов подпрозорец",
     "enable_topic_searching": "Включване на търсенето в темите",
     "topic_search_help": "Ако е включено, търсенето в темата ще замени стандартното поведение на браузъра при търсене в страницата и ще Ви позволи да претърсвате цялата тема, а не само това, което се вижда на екрана",
+    "scroll_to_my_post": "След публикуване на отговор, да се показва новата публикация",
     "follow_topics_you_reply_to": "Следване на темите, на които отговаряте",
     "follow_topics_you_create": "Следване на темите, които създавате",
     "grouptitle": "Изберете заглавието на групата, което искате да се показва",

public/language/bn/error.json

@@ -27,6 +27,7 @@
     "password-too-long": "Password too long",
     "user-banned": "ব্যবহারকারী নিষিদ্ধ",
     "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
+    "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
     "no-category": "বিভাগটি খুজে পাওয়া যায় নি",
     "no-topic": "এই টপিক নেই",
     "no-post": "এই পোষ্ট নেই",
@@ -97,5 +98,6 @@
     "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
-    "no-users-in-room": "No users in this room"
+    "no-users-in-room": "No users in this room",
+    "cant-kick-self": "You can't kick yourself from the group"
 }

public/language/bn/groups.json

@@ -41,6 +41,7 @@
     "details.hidden": "Hidden",
     "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
     "details.delete_group": "Delete Group",
+    "details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
     "event.updated": "Group details have been updated",
     "event.deleted": "The group \"%1\" has been deleted",
     "membership.accept-invitation": "Accept Invitation",

public/language/bn/modules.json

@@ -6,6 +6,7 @@
     "chat.user_typing": "%1 লিখছেন",
     "chat.user_has_messaged_you": "%1 আপনাকে বার্তা পাঠিয়েছেন",
     "chat.see_all": "See all chats",
+    "chat.mark_all_read": "Mark all chats read",
     "chat.no-messages": "মেসেজ হিস্টোরী দেখতে প্রাপক নির্বাচন করুন",
     "chat.no-users-in-room": "No users in this room",
     "chat.recent-chats": "সাম্প্রতিক চ্যাটসমূহ",

public/language/bn/uploads.json

@@ -0,0 +1,6 @@
+{
+    "uploading-file": "Uploading the file...",
+    "select-file-to-upload": "Select a file to upload!",
+    "upload-success": "File uploaded successfully!",
+    "maximum-file-size": "Maximum %1 kb"
+}

public/language/bn/user.json

@@ -39,6 +39,7 @@
     "change_username": "ইউজারনেম পরিবর্তন করুন",
     "change_email": "ইমেইল পরিবর্তন করুন",
     "edit": "সম্পাদনা",
+    "edit-profile": "Edit Profile",
     "default_picture": "ডিফল্ট আইকন",
     "uploaded_picture": "ছবি আপলোড করুন",
     "upload_new_picture": "নতুন ছবি আপলোড করুন",
@@ -91,6 +92,7 @@
     "open_links_in_new_tab": "আউটগোয়িং লিংকগুলো নতুন ট্যাবে খুলুন",
     "enable_topic_searching": "In-Topic সার্চ সক্রীয় করো",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
+    "scroll_to_my_post": "After posting a reply, show the new post",
     "follow_topics_you_reply_to": "Follow topics that you reply to",
     "follow_topics_you_create": "Follow topics you create",
     "grouptitle": "Select the group title you would like to display",

public/language/cs/error.json

@@ -27,6 +27,7 @@
     "password-too-long": "Password too long",
     "user-banned": "Uživatel byl zakázán",
     "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
+    "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
     "no-category": "Kategorie neexistuje",
     "no-topic": "Téma neexistuje",
     "no-post": "Příspěvek neexistuje",
@@ -97,5 +98,6 @@
     "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
-    "no-users-in-room": "No users in this room"
+    "no-users-in-room": "No users in this room",
+    "cant-kick-self": "You can't kick yourself from the group"
 }

public/language/cs/groups.json

@@ -41,6 +41,7 @@
     "details.hidden": "Hidden",
     "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
     "details.delete_group": "Delete Group",
+    "details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
     "event.updated": "Group details have been updated",
     "event.deleted": "The group \"%1\" has been deleted",
     "membership.accept-invitation": "Accept Invitation",

public/language/cs/modules.json

@@ -6,6 +6,7 @@
     "chat.user_typing": "%1 píše ...",
     "chat.user_has_messaged_you": "%1 has messaged you.",
     "chat.see_all": "See all chats",
+    "chat.mark_all_read": "Mark all chats read",
     "chat.no-messages": "Please select a recipient to view chat message history",
     "chat.no-users-in-room": "No users in this room",
     "chat.recent-chats": "Recent Chats",

public/language/cs/uploads.json

@@ -0,0 +1,6 @@
+{
+    "uploading-file": "Uploading the file...",
+    "select-file-to-upload": "Select a file to upload!",
+    "upload-success": "File uploaded successfully!",
+    "maximum-file-size": "Maximum %1 kb"
+}

public/language/cs/user.json

@@ -39,6 +39,7 @@
     "change_username": "Change Username",
     "change_email": "Change Email",
     "edit": "Upravit",
+    "edit-profile": "Edit Profile",
     "default_picture": "Default Icon",
     "uploaded_picture": "Nahraný obrázek",
     "upload_new_picture": "Nahrát nový obrázek",
@@ -91,6 +92,7 @@
     "open_links_in_new_tab": "Open outgoing links in new tab",
     "enable_topic_searching": "Enable In-Topic Searching",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
+    "scroll_to_my_post": "After posting a reply, show the new post",
     "follow_topics_you_reply_to": "Follow topics that you reply to",
     "follow_topics_you_create": "Follow topics you create",
     "grouptitle": "Select the group title you would like to display",

public/language/da/error.json

@@ -27,6 +27,7 @@
     "password-too-long": "Kodeord er for langt",
     "user-banned": "Bruger er bortvist",
     "user-too-new": "Beklager, du er nødt til at vente %1 sekund(er) før du opretter dit indlæg",
+    "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
     "no-category": "Kategorien eksisterer ikke",
     "no-topic": "Tråden eksisterer ikke",
     "no-post": "Indlægget eksisterer ikke",
@@ -97,5 +98,6 @@
     "invite-maximum-met": "Du har inviteret det maksimale antal personer (%1 ud af %2)",
     "no-session-found": "Ingen login session kan findes!",
     "not-in-room": "Bruger er ikke i rummet",
-    "no-users-in-room": "Ingen brugere i rummet"
+    "no-users-in-room": "Ingen brugere i rummet",
+    "cant-kick-self": "You can't kick yourself from the group"
 }

public/language/da/groups.json

@@ -41,6 +41,7 @@
     "details.hidden": "Skjult",
     "details.hidden_help": "Hvis aktiveret, så vil denne gruppe ikke kunne ses i gruppelisten og bruhere skal inviteres manuelt",
     "details.delete_group": "Slet Gruppe",
+    "details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
     "event.updated": "Gruppe detaljer er blevet opdateret",
     "event.deleted": "Gruppen \"%1\" er blevet slettet",
     "membership.accept-invitation": "Acceptér Invitation",

public/language/da/modules.json

@@ -6,6 +6,7 @@
     "chat.user_typing": "%1 skriver ...",
     "chat.user_has_messaged_you": "1% har skrevet til dig.",
     "chat.see_all": "Se alle chats",
+    "chat.mark_all_read": "Mark all chats read",
     "chat.no-messages": "Vælg en modtager for at se beskedhistorikken",
     "chat.no-users-in-room": "Ingen brugere i rummet",
     "chat.recent-chats": "Seneste chats",

public/language/da/uploads.json

@@ -0,0 +1,6 @@
+{
+    "uploading-file": "Uploading the file...",
+    "select-file-to-upload": "Select a file to upload!",
+    "upload-success": "File uploaded successfully!",
+    "maximum-file-size": "Maximum %1 kb"
+}

public/language/da/user.json

@@ -39,6 +39,7 @@
     "change_username": "Ændre brugernavn",
     "change_email": "Ændre email",
     "edit": "Rediger",
+    "edit-profile": "Edit Profile",
     "default_picture": "Standard ikon",
     "uploaded_picture": "Upload billede",
     "upload_new_picture": "Upload nyt billede",
@@ -91,6 +92,7 @@
     "open_links_in_new_tab": "Åben udgående link i en ny tab",
     "enable_topic_searching": "Slå In-Topic søgning til",
     "topic_search_help": "Hvis slået til, så vil in-topic søgning overskrive browserens almindelige søge function og tillade dig at søge hele emnet, istedet for kun det der er vist på skærmen",
+    "scroll_to_my_post": "After posting a reply, show the new post",
     "follow_topics_you_reply_to": "Følg emner du har skrevet indlæg i",
     "follow_topics_you_create": "Følg emner du opretter",
     "grouptitle": "Vælg gruppe titlen du gerne vil fremvise",

public/language/de/email.json

@@ -17,7 +17,7 @@
     "reset.notify.text1": "Wir benachrichtigen dich, dass dein Passwort am %1 erfolgreich geändert wurde.",
     "reset.notify.text2": "Bitte benachrichtige umgehend einen Administrator, wenn du dies nicht autorisiert hast.",
     "digest.notifications": "Du hast ungelesene Benachrichtigungen von %1:",
-    "digest.latest_topics": "Neueste Themen vom %1",
+    "digest.latest_topics": "Neueste Themen auf %1",
     "digest.cta": "Klicke hier, um %1 zu besuchen",
     "digest.unsub.info": "Diese Zusammenfassung wurde dir aufgrund deiner Abonnement-Einstellungen gesendet.",
     "digest.no_topics": "Es gab keine aktiven Themen innerhalb %1",

public/language/de/error.json

@@ -27,6 +27,7 @@
     "password-too-long": "Passwort ist zu lang",
     "user-banned": "Benutzer ist gesperrt",
     "user-too-new": "Entschuldigung, du musst %1 Sekunde(n) warten, bevor du deinen ersten Beitrag schreiben kannst.",
+    "blacklisted-ip": "Deine IP-Adresse ist für diese Plattform gesperrt. Sollte dies ein Irrtum sein, dann kontaktiere bitte einen Administrator.",
     "no-category": "Die Kategorie existiert nicht",
     "no-topic": "Das Thema existiert nicht",
     "no-post": "Der Beitrag existiert nicht",
@@ -60,7 +61,7 @@
     "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",
-    "group-already-member": "Du bist bereits Teil dieser Gruppe",
+    "group-already-member": "Bereits Teil dieser Gruppe",
     "group-not-member": "Du bist kein Mitglied dieser Gruppe",
     "group-needs-owner": "Diese Gruppe muss mindestens einen Besitzer vorweisen",
     "group-already-invited": "Dieser Benutzer wurde bereits eingeladen",
@@ -96,6 +97,7 @@
     "wrong-login-type-username": "Bitte nutze deinen Benutzernamen zum einloggen",
     "invite-maximum-met": "Du hast bereits die maximale Anzahl an Personen eingeladen (%1 von %2).",
     "no-session-found": "Keine Login-Sitzung gefunden!",
-    "not-in-room": "Benutzer nicht in Raum",
-    "no-users-in-room": "In diesem Raum befinden sich keine Benutzer."
+    "not-in-room": "Benutzer nicht im Raum",
+    "no-users-in-room": "In diesem Raum befinden sich keine Benutzer.",
+    "cant-kick-self": "Du kannst dich nicht selber aus der Gruppe entfernen."
 }

public/language/de/groups.json

@@ -8,7 +8,7 @@
     "pending.reject": "Abweisen",
     "pending.accept_all": "Alle annehmen",
     "pending.reject_all": "Alle ablehnen",
-    "pending.none": "Es sind zur Zeit keine unvearbeiteten Mitglieder vorhanden",
+    "pending.none": "Es gibt zur Zeit keine ausstehende Mitglieder",
     "invited.none": "Es sind zur Zeit keine weiteren Mitglieder eingeladen",
     "invited.uninvite": "Einladung zurücknehmen",
     "invited.search": "Suche nach einem Benutzer um ihn in diese Gruppe aufzunehmen",
@@ -41,6 +41,7 @@
     "details.hidden": "Versteckt",
     "details.hidden_help": "Wenn aktiviert, wird diese Gruppe in der Gruppenliste nicht zu finden sein, und Benutzer werden manuell eingeladen werden müssen.",
     "details.delete_group": "Gruppe löschen",
+    "details.private_system_help": "Private Gruppen wurden systemweit deaktiviert. Diese Einstellung hat keine Funktion.",
     "event.updated": "Gruppendetails wurden aktualisiert",
     "event.deleted": "Die Gruppe \"%1\" wurde gelöscht.",
     "membership.accept-invitation": "Einladung akzeptieren",

public/language/de/modules.json

@@ -5,7 +5,8 @@
     "chat.no_active": "Du hast keine aktiven Chats.",
     "chat.user_typing": "%1 tippt gerade ...",
     "chat.user_has_messaged_you": "%1 hat dir geschrieben.",
-    "chat.see_all": "Alle Chats sehen",
+    "chat.see_all": "Alle Chats anzeigen",
+    "chat.mark_all_read": "Alle als gelesen markieren",
     "chat.no-messages": "Bitte wähle einen Empfänger, um den jeweiligen Nachrichtenverlauf anzuzeigen.",
     "chat.no-users-in-room": "In diesem Raum befinden sich keine Benutzer.",
     "chat.recent-chats": "Aktuelle Chats",

public/language/de/notifications.json

@@ -1,8 +1,8 @@
 {
     "title": "Benachrichtigungen",
     "no_notifs": "Keine neuen Benachrichtigungen",
-    "see_all": "Alle Benachrichtigungen zeigen",
-    "mark_all_read": "Alle Benachrichtigungen als gelesen markieren",
+    "see_all": "Alle Benachrichtigungen anzeigen",
+    "mark_all_read": "Alle als gelesen markieren",
     "back_to_home": "Zurück zu %1",
     "outgoing_link": "Externer Link",
     "outgoing_link_message": "Du verlässt nun %1",
@@ -30,7 +30,7 @@
     "user_started_following_you_dual": "<strong>%1</strong> und <strong>%2</strong> folgen dir jetzt.",
     "user_started_following_you_multiple": "<strong>%1</strong> und %2 andere Nutzer folgen dir jetzt.",
     "new_register": "<strong>%1</strong> hat eine Registrationsanfrage geschickt.",
-    "new_register_multiple": "There are <strong>%1</strong> registration requests awaiting review.",
+    "new_register_multiple": "Es erwarten <strong>%1</strong>  Registrierungsanfragen eine Überprüfung.",
     "email-confirmed": "E-Mail bestätigt",
     "email-confirmed-message": "Vielen Dank für Ihre E-Mail-Validierung. Ihr Konto ist nun vollständig aktiviert.",
     "email-confirm-error-message": "Es gab ein Problem bei der Validierung Ihrer E-Mail-Adresse. Möglicherweise ist der Code ungültig oder abgelaufen.",

public/language/de/uploads.json

@@ -0,0 +1,6 @@
+{
+    "uploading-file": "Lade Datei hoch...",
+    "select-file-to-upload": "Wähle eine Datei zum Hochladen aus!",
+    "upload-success": "Datei erfolgreich hochgeladen!",
+    "maximum-file-size": "Maximal %1 kb"
+}

public/language/de/user.json

@@ -1,7 +1,7 @@
 {
     "banned": "Gesperrt",
     "offline": "offline",
-    "username": "Nutzername",
+    "username": "Benutzername",
     "joindate": "Registriert vor",
     "postcount": "Beiträge",
     "email": "E-Mail",
@@ -39,6 +39,7 @@
     "change_username": "Benutzernamen ändern",
     "change_email": "E-Mail ändern",
     "edit": "Ändern",
+    "edit-profile": "Profil ändern",
     "default_picture": "Standardsymbol",
     "uploaded_picture": "Hochgeladene Bilder",
     "upload_new_picture": "Neues Bild hochladen",
@@ -64,7 +65,7 @@
     "show_email": "Zeige meine E-Mail Adresse an.",
     "show_fullname": "Zeige meinen kompletten Namen an",
     "restrict_chats": "Nur Chatnachrichten von Benutzern, denen ich folge, erlauben",
-    "digest_label": "Auszug abonnieren",
+    "digest_label": "Zusammenfassung abonnieren",
     "digest_description": "Abonniere E-Mail-Benachrichtigungen für dieses Forum (neue Benachrichtigungen und Themen) nach einem festen Zeitplan.",
     "digest_off": "Aus",
     "digest_daily": "Täglich",
@@ -73,35 +74,36 @@
     "send_chat_notifications": "Sende eine E-Mail, wenn eine neue Chat-Nachricht eingeht und ich nicht online bin",
     "send_post_notifications": "Sende eine E-Mail wenn auf Themen die ich abonniert habe geantwortet wird",
     "settings-require-reload": "Einige Einstellungsänderung benötigen eine Aktualisierung. Hier klicken um die Seite neu zu laden.",
-    "has_no_follower": "Dieser User hat noch keine Follower.",
-    "follows_no_one": "Dieser User folgt noch niemandem :(",
-    "has_no_posts": "Dieser Nutzer hat noch nichts gepostet.",
-    "has_no_topics": "Dieser Nutzer hat noch keine Themen gepostet.",
-    "has_no_watched_topics": "Dieser Nutzer beobachtet keine Themen.",
+    "has_no_follower": "Dieser Benutzer hat noch keine Follower. :(",
+    "follows_no_one": "Dieser Benutzer folgt noch niemandem. :(",
+    "has_no_posts": "Dieser Benutzer hat noch nichts gepostet.",
+    "has_no_topics": "Dieser Benutzer hat noch keine Themen gepostet.",
+    "has_no_watched_topics": "Dieser Benutzer beobachtet keine Themen.",
     "has_no_upvoted_posts": "Dieser Benutzer hat bisher keine Beiträge positiv bewertet.",
     "has_no_downvoted_posts": "Dieser Benutzer hat bisher keine Beiträge negativ bewertet.",
-    "has_no_voted_posts": "Dieser Benutzer hat keine bewerteten Beiträge",
+    "has_no_voted_posts": "Dieser Benutzer hat keine bewerteten Beiträge.",
     "email_hidden": "E-Mail Adresse versteckt",
     "hidden": "versteckt",
     "paginate_description": "Themen und Beiträge in Seiten aufteilen, anstelle unendlich zu scrollen",
     "topics_per_page": "Themen pro Seite",
     "posts_per_page": "Beiträge pro Seite",
     "notification_sounds": "Ton abspielen, wenn du eine Benachrichtigung erhältst",
-    "browsing": "Stöbereinstellungen",
+    "browsing": "Browsing",
     "open_links_in_new_tab": "Ausgehende Links in neuem Tab öffnen",
     "enable_topic_searching": "Suchen innerhalb von Themen aktivieren",
     "topic_search_help": "Wenn aktiviert, ersetzt die im-Thema-Suche die Standardsuche des Browsers. Dadurch kannst du im ganzen Thema suchen, nicht nur im sichtbaren Abschnitt.",
+    "scroll_to_my_post": "Zeige eigene Antwort nach dem Erstellen im Thema an",
     "follow_topics_you_reply_to": "Themen folgen, in denen auf dich geantwortet wird",
     "follow_topics_you_create": "Themen folgen, die du erstellst",
     "grouptitle": "Wähle den anzuzeigenden Gruppen Titel aus",
     "no-group-title": "Kein Gruppentitel",
     "select-skin": "Einen Skin auswählen",
-    "select-homepage": "Eine Startseite auswählen",
+    "select-homepage": "Startseite",
     "homepage": "Startseite",
     "homepage_description": "Wähle eine Seite die als Forumstartseite benutzt werden soll aus oder 'Keine' um die Standardstartseite zu verwenden.",
     "custom_route": "Eigener Startseitenpfad",
     "custom_route_help": "Gib hier einen Pfadnamen ohne vorangehenden Slash ein (z.B. \"recent\" oder \"popular\")",
-    "sso.title": "Einmalanmeldungsdienste",
+    "sso.title": "Single Sign-on Dienste",
     "sso.associated": "Verbunden mit",
     "sso.not-associated": "Verbinde dich mit"
 }

public/language/el/error.json

@@ -27,6 +27,7 @@
     "password-too-long": "Password too long",
     "user-banned": "Ο Χρήστης είναι αποκλεισμένος/η",
     "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
+    "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
     "no-category": "Category does not exist",
     "no-topic": "Topic does not exist",
     "no-post": "Post does not exist",
@@ -97,5 +98,6 @@
     "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
-    "no-users-in-room": "No users in this room"
+    "no-users-in-room": "No users in this room",
+    "cant-kick-self": "You can't kick yourself from the group"
 }

public/language/el/groups.json

@@ -41,6 +41,7 @@
     "details.hidden": "Hidden",
     "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
     "details.delete_group": "Delete Group",
+    "details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
     "event.updated": "Group details have been updated",
     "event.deleted": "The group \"%1\" has been deleted",
     "membership.accept-invitation": "Accept Invitation",

public/language/el/modules.json

@@ -6,6 +6,7 @@
     "chat.user_typing": "Ο/Η %1 πληκτρολογεί...",
     "chat.user_has_messaged_you": "Ο/Η %1 σου έστειλε μήνυμα.",
     "chat.see_all": "See all chats",
+    "chat.mark_all_read": "Mark all chats read",
     "chat.no-messages": "Παρακαλώ επέλεξε έναν παραλήπτη για να δείς το ιστορικό της συνομιλίας",
     "chat.no-users-in-room": "No users in this room",
     "chat.recent-chats": "Πρόσφατες Συνομιλίες",

public/language/el/uploads.json

@@ -0,0 +1,6 @@
+{
+    "uploading-file": "Uploading the file...",
+    "select-file-to-upload": "Select a file to upload!",
+    "upload-success": "File uploaded successfully!",
+    "maximum-file-size": "Maximum %1 kb"
+}

public/language/el/user.json

@@ -39,6 +39,7 @@
     "change_username": "Change Username",
     "change_email": "Change Email",
     "edit": "Επεξεργασία",
+    "edit-profile": "Edit Profile",
     "default_picture": "Default Icon",
     "uploaded_picture": "Ανεβασμένη Φωτογραφία",
     "upload_new_picture": "Ανέβασμα Νέας Φωτογραφίας",
@@ -91,6 +92,7 @@
     "open_links_in_new_tab": "Open outgoing links in new tab",
     "enable_topic_searching": "Enable In-Topic Searching",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
+    "scroll_to_my_post": "After posting a reply, show the new post",
     "follow_topics_you_reply_to": "Follow topics that you reply to",
     "follow_topics_you_create": "Follow topics you create",
     "grouptitle": "Select the group title you would like to display",

public/language/en@pirate/category.json

@@ -6,11 +6,11 @@
     "no_topics": "<strong>Thar be no topics in 'tis category.</strong><br />Why don't ye give a go' postin' one?",
     "browsing": "browsin'",
     "no_replies": "No one has replied to ye message",
-    "no_new_posts": "No new posts.",
+    "no_new_posts": "Thar be no new posts.",
     "share_this_category": "Share this category",
     "watch": "Watch",
     "ignore": "Ignore",
-    "watch.message": "You are now watching updates from this category",
-    "ignore.message": "You are now ignoring updates from this category",
+    "watch.message": "Ye now be watchin' updates from 'tis category",
+    "ignore.message": "Ye now be ignorin' updates from 'tis category",
     "watched-categories": "Watched categories"
 }

public/language/en@pirate/error.json

@@ -27,6 +27,7 @@
     "password-too-long": "Password too long",
     "user-banned": "User banned",
     "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
+    "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
     "no-category": "Category does not exist",
     "no-topic": "Topic does not exist",
     "no-post": "Post does not exist",
@@ -97,5 +98,6 @@
     "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
-    "no-users-in-room": "No users in this room"
+    "no-users-in-room": "No users in this room",
+    "cant-kick-self": "You can't kick yourself from the group"
 }

public/language/en@pirate/groups.json

@@ -41,6 +41,7 @@
     "details.hidden": "Hidden",
     "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
     "details.delete_group": "Delete Group",
+    "details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
     "event.updated": "Group details have been updated",
     "event.deleted": "The group \"%1\" has been deleted",
     "membership.accept-invitation": "Accept Invitation",

public/language/en@pirate/modules.json

@@ -6,6 +6,7 @@
     "chat.user_typing": "%1 is typing ...",
     "chat.user_has_messaged_you": "%1 has messaged you.",
     "chat.see_all": "See all chats",
+    "chat.mark_all_read": "Mark all chats read",
     "chat.no-messages": "Please select a recipient to view chat message history",
     "chat.no-users-in-room": "No users in this room",
     "chat.recent-chats": "Recent Chats",

public/language/en@pirate/uploads.json

@@ -0,0 +1,6 @@
+{
+    "uploading-file": "Uploading the file...",
+    "select-file-to-upload": "Select a file to upload!",
+    "upload-success": "File uploaded successfully!",
+    "maximum-file-size": "Maximum %1 kb"
+}

public/language/en@pirate/user.json

@@ -39,6 +39,7 @@
     "change_username": "Change Username",
     "change_email": "Change Email",
     "edit": "Edit",
+    "edit-profile": "Edit Profile",
     "default_picture": "Default Icon",
     "uploaded_picture": "Uploaded Picture",
     "upload_new_picture": "Upload New Picture",
@@ -91,6 +92,7 @@
     "open_links_in_new_tab": "Open outgoing links in new tab",
     "enable_topic_searching": "Enable In-Topic Searching",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
+    "scroll_to_my_post": "After posting a reply, show the new post",
     "follow_topics_you_reply_to": "Follow topics that you reply to",
     "follow_topics_you_create": "Follow topics you create",
     "grouptitle": "Select the group title you would like to display",

public/language/en_GB/email.json

@@ -31,6 +31,7 @@
 	"digest.day": "day",
 	"digest.week": "week",
 	"digest.month": "month",
+	"digest.subject": "Digest for %1",
 
 	"notif.chat.subject": "New chat message received from %1",
 	"notif.chat.cta": "Click here to continue the conversation",

public/language/en_GB/error.json

@@ -109,6 +109,7 @@
 	"cant-remove-last-user": "You can't remove the last user",
 	"cant-delete-chat-message": "You are not allowed to delete this message",
 
+	"already-voting-for-this-post": "You have already voted for this post.",
 	"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",

public/language/en_GB/topic.json

@@ -30,7 +30,7 @@
 	"flag": "Flag",
 	"locked": "Locked",
 
-	"bookmark_instructions" : "Click here to return to the last unread post in this thread.",
+	"bookmark_instructions" : "Click here to return to the last read post in this thread.",
 
 	"flag_title": "Flag this post for moderation",
 	"flag_success": "This post has been flagged for moderation.",

public/language/en_GB/user.json

@@ -42,6 +42,7 @@
 	"change_username": "Change Username",
 	"change_email": "Change Email",
 	"edit": "Edit",
+	"edit-profile": "Edit Profile",
 	"default_picture": "Default Icon",
 	"uploaded_picture": "Uploaded Picture",
 	"upload_new_picture": "Upload New Picture",
@@ -103,6 +104,9 @@
 	"enable_topic_searching": "Enable In-Topic Searching",
 	"topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
 
+	"delay_image_loading": "Delay Image Loading",
+	"image_load_delay_help": "If enabled, images in topics will not load until they are scrolled into view",
+
 	"scroll_to_my_post": "After posting a reply, show the new post",
 
 	"follow_topics_you_reply_to": "Follow topics that you reply to",

public/language/en_US/error.json

@@ -27,6 +27,7 @@
     "password-too-long": "Password too long",
     "user-banned": "User banned",
     "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
+    "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
     "no-category": "Category does not exist",
     "no-topic": "Topic does not exist",
     "no-post": "Post does not exist",
@@ -97,5 +98,6 @@
     "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
-    "no-users-in-room": "No users in this room"
+    "no-users-in-room": "No users in this room",
+    "cant-kick-self": "You can't kick yourself from the group"
 }

public/language/en_US/groups.json

@@ -41,6 +41,7 @@
     "details.hidden": "Hidden",
     "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
     "details.delete_group": "Delete Group",
+    "details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
     "event.updated": "Group details have been updated",
     "event.deleted": "The group \"%1\" has been deleted",
     "membership.accept-invitation": "Accept Invitation",

public/language/en_US/modules.json

@@ -6,6 +6,7 @@
     "chat.user_typing": "%1 is typing ...",
     "chat.user_has_messaged_you": "%1 has messaged you.",
     "chat.see_all": "See all chats",
+    "chat.mark_all_read": "Mark all chats read",
     "chat.no-messages": "Please select a recipient to view chat message history",
     "chat.no-users-in-room": "No users in this room",
     "chat.recent-chats": "Recent Chats",

public/language/en_US/topic.json

@@ -26,7 +26,7 @@
     "tools": "Tools",
     "flag": "Flag",
     "locked": "Locked",
-    "bookmark_instructions": "Click here to return to the last unread post in this thread.",
+    "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Flag this post for moderation",
     "flag_success": "This post has been flagged for moderation.",
     "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",

public/language/en_US/uploads.json

@@ -0,0 +1,6 @@
+{
+    "uploading-file": "Uploading the file...",
+    "select-file-to-upload": "Select a file to upload!",
+    "upload-success": "File uploaded successfully!",
+    "maximum-file-size": "Maximum %1 kb"
+}

public/language/en_US/user.json

@@ -39,6 +39,7 @@
     "change_username": "Change Username",
     "change_email": "Change Email",
     "edit": "Edit",
+    "edit-profile": "Edit Profile",
     "default_picture": "Default Icon",
     "uploaded_picture": "Uploaded Picture",
     "upload_new_picture": "Upload New Picture",
@@ -91,6 +92,7 @@
     "open_links_in_new_tab": "Open outgoing links in new tab",
     "enable_topic_searching": "Enable In-Topic Searching",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behavior and allow you to search through the entire topic, instead of what is only shown on screen",
+    "scroll_to_my_post": "After posting a reply, show the new post",
     "follow_topics_you_reply_to": "Follow topics that you reply to",
     "follow_topics_you_create": "Follow topics you create",
     "grouptitle": "Select the group title you would like to display",

public/language/es/error.json

@@ -14,7 +14,7 @@
     "invalid-password": "Contraseña no válida",
     "invalid-username-or-password": "Por favor especifica tanto un usuario como contraseña",
     "invalid-search-term": "Término de búsqueda inválido",
-    "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
+    "invalid-pagination-value": "Número de página inválido, debe estar entre %1 y %2",
     "username-taken": "Nombre de usuario ocupado",
     "email-taken": "Correo electrónico ocupado",
     "email-not-confirmed": "Su cuenta de correo electrónico no ha sido confirmada aún, por favor haga click aquí para confirmarla.",
@@ -27,6 +27,7 @@
     "password-too-long": "Contraseña muy corta",
     "user-banned": "Usuario baneado",
     "user-too-new": "Lo sentimos, es necesario que esperes %1 segundo(s) antes poder hacer tu primera publicación",
+    "blacklisted-ip": "Lo sentimos, tu dirección IP ha sido baneada de esta comunidad. Si crees que debe de haber un error, por favor contacte con un administrador.",
     "no-category": "La categoría no existe",
     "no-topic": "El tema no existe",
     "no-post": "La publicación no existe",
@@ -50,8 +51,8 @@
     "still-uploading": "Por favor, espera a que terminen las subidas.",
     "file-too-big": "El tamaño de fichero máximo es de %1 kB - por favor, suba un fichero más pequeño",
     "guest-upload-disabled": "Las subidas están deshabilitadas para los invitados",
-    "already-favourited": "You have already bookmarked this post",
-    "already-unfavourited": "You have already unbookmarked this post",
+    "already-favourited": "Ya habías guardado este post.",
+    "already-unfavourited": "Ya habías desguardado este post.",
     "cant-ban-other-admins": "¡No puedes expulsar a otros administradores!",
     "cant-remove-last-admin": "Tu eres el unico administrador. Añade otro usuario como administrador antes de eliminarte a ti mismo.",
     "invalid-image-type": "Tipo de imagen inválido. Los tipos permitidos son: %1",
@@ -83,7 +84,7 @@
     "chat-message-too-long": "Mensaje de Chat es demasiado largo",
     "cant-edit-chat-message": "No tienes permiso para editar este mensaje",
     "cant-remove-last-user": "No puedes eliminar el último usuario",
-    "cant-delete-chat-message": "You are not allowed to delete this message",
+    "cant-delete-chat-message": "No tienes permiso para eliminar este mensaje",
     "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",
@@ -96,6 +97,7 @@
     "wrong-login-type-username": "Por favor introduce tu nombre de usuario para acceder",
     "invite-maximum-met": "Has alcanzado el número máximo de personas invitadas (%1 de %2).",
     "no-session-found": "¡No se ha encontrado ningún inicio de sesión!",
-    "not-in-room": "User not in room",
-    "no-users-in-room": "No users in this room"
+    "not-in-room": "El usuario no está en la sala",
+    "no-users-in-room": "No hay usuarios en esta sala",
+    "cant-kick-self": "No te puedes expulsar a ti mismo del grupo"
 }

public/language/es/global.json

@@ -65,7 +65,7 @@
     "posted_in_ago_by": "publicado en %1 %2 por %3",
     "user_posted_ago": "%1 publicó %2",
     "guest_posted_ago": "Invitado publicó %1",
-    "last_edited_by": "last edited by %1",
+    "last_edited_by": "Última edición por %1",
     "norecentposts": "No hay publicaciones recientes",
     "norecenttopics": "No hay temas recientes",
     "recentposts": "Publicaciones recientes",
@@ -87,8 +87,8 @@
     "map": "Mapa",
     "sessions": "Inicios de sesión",
     "ip_address": "Direcciones IP",
-    "enter_page_number": "Enter page number",
-    "upload_file": "Upload file",
-    "upload": "Upload",
-    "allowed-file-types": "Allowed file types are %1"
+    "enter_page_number": "Escribe el número de página",
+    "upload_file": "Subir archivo",
+    "upload": "Subir",
+    "allowed-file-types": "Los tipos de archivos permitidos son: %1"
 }

public/language/es/groups.json

@@ -41,6 +41,7 @@
     "details.hidden": "Oculto",
     "details.hidden_help": "Si está habilitado, este grupo no aparecerá en los listados de grupos, y los usuarios tendrán que ser invitados manualmente",
     "details.delete_group": "Eliminar grupo",
+    "details.private_system_help": "Los grupos privados están desactivados a nivel de sistema, esta opción no cambiará nada.",
     "event.updated": "Los detalles del grupo han sido actualizados",
     "event.deleted": "El grupo \"%1\" ha sido eliminado",
     "membership.accept-invitation": "Aceptar Invitación",
@@ -49,5 +50,5 @@
     "membership.leave-group": "Dejar el grupo",
     "membership.reject": "Rechazar",
     "new-group.group_name": "Nombre de Grupo:",
-    "upload-group-cover": "Upload group cover"
+    "upload-group-cover": "Cargar foto para el grupo"
 }

public/language/es/modules.json

@@ -6,6 +6,7 @@
     "chat.user_typing": "%1 está escribiendo...",
     "chat.user_has_messaged_you": "%1 te ha enviado un mensaje.",
     "chat.see_all": "Ver todos los chats",
+    "chat.mark_all_read": "Marcar todos los chats como leídos",
     "chat.no-messages": "Por favor, selecciona un contacto para ver el historial de mensajes",
     "chat.no-users-in-room": "No hay usuarios en esta sala",
     "chat.recent-chats": "Chats recientes",

public/language/es/notifications.json

@@ -16,9 +16,9 @@
     "upvoted_your_post_in_multiple": "<strong>%1</strong> y otras %2 personas han votado positivamente tu respuesta en <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> su tema ha sido movido a <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> se ha movido <strong>%2</strong>",
-    "favourited_your_post_in": "<strong>%1</strong> has bookmarked your post in <strong>%2</strong>.",
-    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have bookmarked your post in <strong>%3</strong>.",
-    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have bookmarked your post in <strong>%3</strong>.",
+    "favourited_your_post_in": "<strong>%1</strong> se ha guardado su post en <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> y <strong>%2</strong> se han guardado su post en <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> y otros %2 usuarios se han guardado su post en <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> ha reportado una respuesta en <strong>%2</strong>",
     "user_flagged_post_in_dual": "<strong>%1</strong> y <strong>%2</strong> han reportado un post en <strong>%3</strong>",
     "user_flagged_post_in_multiple": "<strong>%1</strong> y otras %2 personas han reportado un post en <strong>%3</strong>",
@@ -30,7 +30,7 @@
     "user_started_following_you_dual": "<strong>%1</strong> y <strong>%2</strong> comenzaron a seguirte.",
     "user_started_following_you_multiple": "<strong>%1</strong> y otras %2 personas comenzaron a seguirte.",
     "new_register": "<strong>%1</strong> envió una solicitud de registro.",
-    "new_register_multiple": "There are <strong>%1</strong> registration requests awaiting review.",
+    "new_register_multiple": "Hay <strong>%1</strong> peticiones de registros pendientes de revisión",
     "email-confirmed": "Correo electrónico confirmado",
     "email-confirmed-message": "Gracias por validar tu correo electrónico. Tu cuenta ya está completamente activa.",
     "email-confirm-error-message": "Hubo un problema al validar tu cuenta de correo electrónico. Quizá el código era erróneo o expiró...",

public/language/es/pages.json

@@ -6,12 +6,12 @@
     "popular-month": "Temas populares del mes",
     "popular-alltime": "Temas populares de siempre",
     "recent": "Temas recientes",
-    "flagged-posts": "Flagged Posts",
+    "flagged-posts": "Posts reportados",
     "users/online": "Conectados",
     "users/latest": "Últimos usuarios",
     "users/sort-posts": "Top por mensajes",
     "users/sort-reputation": "Más reputados",
-    "users/banned": "Banned Users",
+    "users/banned": "Usuarios baneados",
     "users/search": "Buscar",
     "notifications": "Notificaciones",
     "tags": "Etiquetas",
@@ -33,13 +33,13 @@
     "account/posts": "Publicados por %1",
     "account/topics": "Temas creados por %1",
     "account/groups": "Grupos de %1",
-    "account/favourites": "%1's Bookmarked Posts",
+    "account/favourites": "Publicaciones favoritas de %1 ",
     "account/settings": "Preferencias",
     "account/watched": "Temas seguidos por %1",
     "account/upvoted": "Publicaciones votadas positivamente %1",
     "account/downvoted": "Publicaciones votadas negativamente %1",
     "account/best": "Mejores publicaciones hechas por %1",
-    "confirm": "Email Confirmed",
+    "confirm": "Correo electrónico confirmado",
     "maintenance.text": "%1 está en mantenimiento actualmente. Por favor vuelva en otro momento.",
     "maintenance.messageIntro": "Además, la administración ha dejado este mensaje:",
     "throttled.text": "%1 no está disponible debido a una carga excesiva. Por favor vuelva en otro momento"

public/language/es/uploads.json

@@ -0,0 +1,6 @@
+{
+    "uploading-file": "Uploading the file...",
+    "select-file-to-upload": "Select a file to upload!",
+    "upload-success": "File uploaded successfully!",
+    "maximum-file-size": "Maximum %1 kb"
+}

public/language/es/user.json

@@ -39,6 +39,7 @@
     "change_username": "Cambiar nombre de usuario",
     "change_email": "Cambiar email",
     "edit": "Editar",
+    "edit-profile": "Edit Profile",
     "default_picture": "Icono por defecto",
     "uploaded_picture": "Imagen subida",
     "upload_new_picture": "Subir nueva imagen",
@@ -91,6 +92,7 @@
     "open_links_in_new_tab": "Abrir los enlaces externos en una nueva pestaña",
     "enable_topic_searching": "Activar la búsqueda \"in-topic\"",
     "topic_search_help": "Si está activada, la búsqueda 'in-topic' sustituirá el comportamiento por defecto del navegador y le permitirá buscar en el tema al completo, en vez de hacer una búsqueda únicamente sobre el contenido mostrado en pantalla",
+    "scroll_to_my_post": "After posting a reply, show the new post",
     "follow_topics_you_reply_to": "Seguir los temas en los que respondes",
     "follow_topics_you_create": "Seguir publicaciones que creas",
     "grouptitle": "Selecciona el título del grupo que deseas visualizar",

public/language/et/error.json

@@ -27,6 +27,7 @@
     "password-too-long": "Parool liiga pikk",
     "user-banned": "Kasutaja bannitud",
     "user-too-new": "Vabandust, te peate ootama %1 sekund(it) enne esimese postituse loomist.",
+    "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
     "no-category": "Kategooriat ei eksisteeri",
     "no-topic": "Teemat ei eksisteeri",
     "no-post": "Postitust ei eksisteeri",
@@ -97,5 +98,6 @@
     "invite-maximum-met": "Sa oled kutsunud maksimaalse lubatud inimeste arvu (%1 %2 'st).",
     "no-session-found": "Sisse logimis sessiooni ei leitud!",
     "not-in-room": "Kasutaja pole ruumis",
-    "no-users-in-room": "No users in this room"
+    "no-users-in-room": "No users in this room",
+    "cant-kick-self": "You can't kick yourself from the group"
 }

public/language/et/groups.json

@@ -41,6 +41,7 @@
     "details.hidden": "Peidetud",
     "details.hidden_help": "Kui sisse lülitatud, siis seda gruppi ei kuvata gruppide nimekirjas ning liikmed tuleb lisada manuaalselt",
     "details.delete_group": "Kustuta grupp",
+    "details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
     "event.updated": "Grupi lisainformatsiooni on uuendatud",
     "event.deleted": "Grupp \"%1\" on kustutatud",
     "membership.accept-invitation": "Võta kutse vastu",

public/language/et/modules.json

@@ -6,6 +6,7 @@
     "chat.user_typing": "%1 kirjutab sõnumit...",
     "chat.user_has_messaged_you": "%1 saatis sulle sõnumi.",
     "chat.see_all": "Vaata kõiki vestluseid",
+    "chat.mark_all_read": "Mark all chats read",
     "chat.no-messages": "Vali sõnumisaaja, et vaadata sõnumite ajalugu.",
     "chat.no-users-in-room": "Ühtki kasutajat selles ruumis",
     "chat.recent-chats": "Hiljutised vestlused",

public/language/et/uploads.json

@@ -0,0 +1,6 @@
+{
+    "uploading-file": "Uploading the file...",
+    "select-file-to-upload": "Select a file to upload!",
+    "upload-success": "File uploaded successfully!",
+    "maximum-file-size": "Maximum %1 kb"
+}

public/language/et/user.json

@@ -39,6 +39,7 @@
     "change_username": "Vaheta kasutajanime",
     "change_email": "Vaheta emaili",
     "edit": "Muuda",
+    "edit-profile": "Edit Profile",
     "default_picture": "Algne ikoon",
     "uploaded_picture": "Üleslaetud pilt",
     "upload_new_picture": "Laadi uus pilt",
@@ -91,6 +92,7 @@
     "open_links_in_new_tab": "Ava väljaminevad lingid uues aknas",
     "enable_topic_searching": "Võimalda teemasisene otsing",
     "topic_search_help": "Kui see on sisse lükatud, siis teemasisene otsing võtab üle brauseri tavapärase otsingu ning võimaldab otsida ainult ekraanile mahtuva teema asemel terve teema ulatuses.",
+    "scroll_to_my_post": "After posting a reply, show the new post",
     "follow_topics_you_reply_to": "Järgi teemasid, millele olete vastanud.",
     "follow_topics_you_create": "Järgi teemasi, mis on teie loodud.",
     "grouptitle": "Vali grupile tiitel mida kuvada soovid",

public/language/fa_IR/error.json

@@ -27,6 +27,7 @@
     "password-too-long": "کلمه عبور بسیار طولانیست",
     "user-banned": "کاربر محروم شد.",
     "user-too-new": "با عرض پوزش، شما باید %1 ثانیه پیش از فرستادن پست نخست خود صبر کنید",
+    "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
     "no-category": "دسته بندی وجود ندارد",
     "no-topic": "موضوع وجود ندارد.",
     "no-post": "پست وجود ندارد",
@@ -97,5 +98,6 @@
     "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
     "no-session-found": "No login session found!",
     "not-in-room": "User not in room",
-    "no-users-in-room": "هیچ کاربری در این گفتگو نیست"
+    "no-users-in-room": "هیچ کاربری در این گفتگو نیست",
+    "cant-kick-self": "You can't kick yourself from the group"
 }

public/language/fa_IR/groups.json

@@ -41,6 +41,7 @@
     "details.hidden": "پنهان",
     "details.hidden_help": "اگر فعال باشد، این گروه در فهرست گروه‌ها پیدا نمی‌شود و کاربران باید دستی فراخوانده شوند",
     "details.delete_group": "حذف گروه",
+    "details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
     "event.updated": "جزییات گروه با موفقیت به روز شد",
     "event.deleted": "گروه \"%1\" حدف شد",
     "membership.accept-invitation": "دعوت را قبول میکنم",

public/language/fa_IR/modules.json

@@ -6,6 +6,7 @@
     "chat.user_typing": "%1 در حال نوشتن است...",
     "chat.user_has_messaged_you": "%1 به شما پیام داده است.",
     "chat.see_all": "دیدن همه ی چت ها",
+    "chat.mark_all_read": "Mark all chats read",
     "chat.no-messages": "مشخص کنید تاریخچه چتهایتان با چه کاربری را می‌خواهید ببینید",
     "chat.no-users-in-room": "هیچ کاربری در این گفتگو نیست",
     "chat.recent-chats": "چتهای اخیر",

public/language/fa_IR/uploads.json

@@ -0,0 +1,6 @@
+{
+    "uploading-file": "Uploading the file...",
+    "select-file-to-upload": "Select a file to upload!",
+    "upload-success": "File uploaded successfully!",
+    "maximum-file-size": "Maximum %1 kb"
+}

public/language/fa_IR/user.json

@@ -39,6 +39,7 @@
     "change_username": "تغییر نام کاربری",
     "change_email": "تغییر ایمیل",
     "edit": "ویرایش",
+    "edit-profile": "Edit Profile",
     "default_picture": "آیکون پیش فرض",
     "uploaded_picture": "تصویر بارشده",
     "upload_new_picture": "بارگذاری تصویر تازه",
@@ -91,6 +92,7 @@
     "open_links_in_new_tab": "پیوندهای به بیرون را در برگ جدید باز کن",
     "enable_topic_searching": "فعال کردن جستجوی داخل-موضوع",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
+    "scroll_to_my_post": "After posting a reply, show the new post",
     "follow_topics_you_reply_to": "تاپیک هایی که پاسخ داده ای را دنبال کن",
     "follow_topics_you_create": "موضوع هایی که ایجاد کرده ای را دنبال کن",
     "grouptitle": "عنوان گروهی که میخواهید نشان داده شود را انتخاب کنید.",

public/language/fi/category.json

@@ -1,5 +1,5 @@
 {
-    "category": "Category",
+    "category": "Kategoria",
     "subcategories": "Subcategories",
     "new_topic_button": "Uusi aihe",
     "guest-login-post": "Kirjaudu sisään voidaksesi kirjoittaa viesti",

public/language/fi/email.json

@@ -1,30 +1,30 @@
 {
     "password-reset-requested": "Pyydetty salasanan palautuskoodia - %1!",
     "welcome-to": "%1 - Tervetuloa",
-    "invite": "Invitation from %1",
+    "invite": "Kutsu henkilöltä %1",
     "greeting_no_name": "Hei",
     "greeting_with_name": "Hei %1",
     "welcome.text1": "Kiitos rekisteröitymisestäsi sivustolle %1!",
     "welcome.text2": "Meidän täytyy varmistaa, että omistat sen sähköpostiosoitteen, jolla rekisteröidyit, ennen kuin tilisi voidaan aktivoida kokonaan.",
-    "welcome.text3": "An administrator has accepted your registration application. You can login with your username/password now.",
+    "welcome.text3": "Ylläpitäjä hyväksyi rekisteröintipyyntösi. Voit nyt kirjautua käyttäjänimelläsi ja salasanallasi.",
     "welcome.cta": "Napsauta tästä vahvistaaksesi sähköpostiosoitteesi",
-    "invitation.text1": "%1 has invited you to join %2",
-    "invitation.ctr": "Click here to create your account.",
-    "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",
-    "reset.notify.subject": "Password successfully changed",
-    "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.",
-    "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.",
-    "digest.notifications": "You have unread notifications from %1:",
-    "digest.latest_topics": "Latest topics from %1",
+    "invitation.text1": "%1 pyysi sinua liittymään %2",
+    "invitation.ctr": "Napsauta tästä luodaksesi käyttäjätilisi.",
+    "reset.text1": "Saimme pyynnön vaihtaa salasanasi, todennäkösesti koska olit unohtanut sen. Jos näin ei ollut käynyt, voit jättää tämän viestin huomiotta.",
+    "reset.text2": "Jatkaaksesi salasanan nollausta, napsauta seuraavaa linkkiä:",
+    "reset.cta": "Napsauta tästä vaihtaaksesi salasanasi",
+    "reset.notify.subject": "Salasana onnistuneesti vaihdettu",
+    "reset.notify.text1": "Ilmoitamme sinua että %1, salasanasi vaihdettiin onnistuneesti.",
+    "reset.notify.text2": "Jos et tunnista tätä toimintoa, ilmoita välittömästi ylläpitäjälle.",
+    "digest.notifications": "Sinulla on lukemattomia ilmoituksia: %1:",
+    "digest.latest_topics": "Viimeisimmät viestiketjut henkilöltä %1",
     "digest.cta": "Click here to visit %1",
     "digest.unsub.info": "This digest was sent to you due to your subscription settings.",
     "digest.no_topics": "There have been no active topics in the past %1",
-    "digest.day": "day",
-    "digest.week": "week",
-    "digest.month": "month",
-    "notif.chat.subject": "New chat message received from %1",
+    "digest.day": "päivä",
+    "digest.week": "viikko",
+    "digest.month": "kuukausi",
+    "notif.chat.subject": "Uusi chatviesti henkilöltä %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.post.cta": "Click here to read the full topic",

public/language/fi/error.json

@@ -18,7 +18,7 @@
     "username-taken": "Käyttäjänimi varattu",
     "email-taken": "Sähköpostiosoite varattu",
     "email-not-confirmed": "Sähköpostiasi ei ole vielä vahvistettu, ole hyvä ja napsauta tätä vahvistaaksesi sen.",
-    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
+    "email-not-confirmed-chat": "Et voi keskustella ennen kuin sähköpostiosoitteesi on vahvistettu, ole hyvä ja paina tästä vahvistaaksesi sen.",
     "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
     "email-confirm-failed": "We could not confirm your email, please try again later.",
     "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
@@ -26,7 +26,8 @@
     "username-too-long": "Käyttäjänimi on liian pitkä",
     "password-too-long": "Password too long",
     "user-banned": "Käyttäjä on estetty",
-    "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
+    "user-too-new": "Anteeksi, mutta sinun täytyy odottaa %1 sekunti(a) ennen sinun ensimmäisen viestin lähettämistä",
+    "blacklisted-ip": "Sorry, your IP address has been banned from this community. If you feel this is in error, please contact an administrator.",
     "no-category": "Kategoriaa ei ole olemassa",
     "no-topic": "Aihetta ei ole olemassa",
     "no-post": "Viestiä ei ole olemassa",
@@ -37,10 +38,10 @@
     "category-disabled": "Kategoria ei ole käytössä",
     "topic-locked": "Aihe lukittu",
     "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
-    "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
-    "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
-    "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
-    "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 character(s).",
+    "content-too-short": "Ole hyvä ja syötä pidempi viesti. Sen pitäisi sisältää ainakin %1 merkki(ä).",
+    "content-too-long": "Ole hyvä ja syötä lyhyempi viesti. Sen voi sisältää vain %1 merkki(ä).",
+    "title-too-short": "Ole hyä ja syötä pidempi otsikko. Sen pitäisi sisältää anakin %1 merkki(ä).",
+    "title-too-long": "Ole hyvä ja syötä lyhyempi otsikko. Se voi sisältää vain %1 merkki(ä).",
     "too-many-posts": "You can only post once every %1 second(s) - please wait before posting again",
     "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
     "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",
@@ -77,10 +78,10 @@
     "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
     "cant-chat-with-yourself": "Et voi keskustella itsesi kanssa!",
     "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
-    "chat-disabled": "Chat system disabled",
+    "chat-disabled": "Keskustelujärjestelmä on pois käytöstä",
     "too-many-messages": "You have sent too many messages, please wait awhile.",
-    "invalid-chat-message": "Invalid chat message",
-    "chat-message-too-long": "Chat message is too long",
+    "invalid-chat-message": "Virheellinen keskusteluviesti",
+    "chat-message-too-long": "Keskusteluviesti on liian pitkä",
     "cant-edit-chat-message": "You are not allowed to edit this message",
     "cant-remove-last-user": "You can't remove the last user",
     "cant-delete-chat-message": "You are not allowed to delete this message",
@@ -96,6 +97,7 @@
     "wrong-login-type-username": "Please use your username to login",
     "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
     "no-session-found": "No login session found!",
-    "not-in-room": "User not in room",
-    "no-users-in-room": "No users in this room"
+    "not-in-room": "Käyttäjä ei ole huoneessa",
+    "no-users-in-room": "Ei käyttäjiä tässä huoneessa",
+    "cant-kick-self": "You can't kick yourself from the group"
 }

public/language/fi/groups.json

@@ -41,6 +41,7 @@
     "details.hidden": "Hidden",
     "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
     "details.delete_group": "Delete Group",
+    "details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
     "event.updated": "Group details have been updated",
     "event.deleted": "The group \"%1\" has been deleted",
     "membership.accept-invitation": "Accept Invitation",

public/language/fi/modules.json

@@ -6,8 +6,9 @@
     "chat.user_typing": "%1 kirjoittaa ...",
     "chat.user_has_messaged_you": "%1 lähetti sinulle viestin.",
     "chat.see_all": "See all chats",
+    "chat.mark_all_read": "Mark all chats read",
     "chat.no-messages": "Valitse vastaanottaja katsellaksesi keskusteluhistoriaa",
-    "chat.no-users-in-room": "No users in this room",
+    "chat.no-users-in-room": "Ei käyttäjiä tässä huoneessa",
     "chat.recent-chats": "Viimeisimmät keskustelut",
     "chat.contacts": "Contacts",
     "chat.message-history": "Viestihistoria",

public/language/fi/notifications.json

@@ -1,11 +1,11 @@
 {
     "title": "Ilmoitukset",
     "no_notifs": "Sinulla ei ole uusia ilmoituksia",
-    "see_all": "See all notifications",
-    "mark_all_read": "Mark all notifications read",
-    "back_to_home": "Back to %1",
+    "see_all": "Katso kaikki ilmoitukset",
+    "mark_all_read": "Merkkaa kaikki ilmoitukset luetuiksi",
+    "back_to_home": "Palaa takaisin %1",
     "outgoing_link": "Ulkopuolinen linkki",
-    "outgoing_link_message": "You are now leaving %1",
+    "outgoing_link_message": "Olet nyt poistumassa %1",
     "continue_to": "Continue to %1",
     "return_to": "Return to %1",
     "new_notification": "Uusi ilmoitus",

public/language/fi/pages.json

@@ -1,35 +1,35 @@
 {
     "home": "Etusivu",
     "unread": "Lukemattomat aiheet",
-    "popular-day": "Popular topics today",
-    "popular-week": "Popular topics this week",
-    "popular-month": "Popular topics this month",
-    "popular-alltime": "All time popular topics",
+    "popular-day": "Suositut aiheet tänään",
+    "popular-week": "Suositut aiheet tällä viikolla",
+    "popular-month": "Suositut aiheet tässä kuussa",
+    "popular-alltime": "Suositut aiheet koko ajalta",
     "recent": "Viimeisimmät aiheet",
-    "flagged-posts": "Flagged Posts",
-    "users/online": "Online Users",
-    "users/latest": "Latest Users",
+    "flagged-posts": "Liputetut viestit",
+    "users/online": "Paikalla olevat käyttäjät",
+    "users/latest": "Viimeisimmat käyttäjät",
     "users/sort-posts": "Users with the most posts",
     "users/sort-reputation": "Users with the most reputation",
     "users/banned": "Banned Users",
     "users/search": "User Search",
     "notifications": "Ilmoitukset",
-    "tags": "Tags",
+    "tags": "Tunnisteet",
     "tag": "Topics tagged under \"%1\"",
-    "register": "Register an account",
-    "login": "Login to your account",
+    "register": "Luo käyttäjät",
+    "login": "Kirjaudu käyttäjällesi",
     "reset": "Reset your account password",
     "categories": "Categories",
     "groups": "Groups",
     "group": "%1 group",
-    "chats": "Chats",
+    "chats": "Keskustelut",
     "chat": "Chatting with %1",
     "account/edit": "Editing \"%1\"",
     "account/edit/password": "Editing password of \"%1\"",
     "account/edit/username": "Editing username of \"%1\"",
     "account/edit/email": "Editing email of \"%1\"",
-    "account/following": "People %1 follows",
-    "account/followers": "People who follow %1",
+    "account/following": "Ihmiset, jota %1 seuraa",
+    "account/followers": "Ihmiset, jotka seuraavat %1",
     "account/posts": "Posts made by %1",
     "account/topics": "Topics created by %1",
     "account/groups": "%1's Groups",

public/language/fi/uploads.json

@@ -0,0 +1,6 @@
+{
+    "uploading-file": "Uploading the file...",
+    "select-file-to-upload": "Select a file to upload!",
+    "upload-success": "File uploaded successfully!",
+    "maximum-file-size": "Maximum %1 kb"
+}

public/language/fi/user.json

@@ -39,6 +39,7 @@
     "change_username": "Change Username",
     "change_email": "Change Email",
     "edit": "Muokkaa",
+    "edit-profile": "Edit Profile",
     "default_picture": "Default Icon",
     "uploaded_picture": "Ladattu kuva",
     "upload_new_picture": "Lataa uusi kuva",
@@ -91,6 +92,7 @@
     "open_links_in_new_tab": "Open outgoing links in new tab",
     "enable_topic_searching": "Salli aiheen sisäiset haut",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
+    "scroll_to_my_post": "After posting a reply, show the new post",
     "follow_topics_you_reply_to": "Follow topics that you reply to",
     "follow_topics_you_create": "Follow topics you create",
     "grouptitle": "Select the group title you would like to display",

public/language/fi/users.json

@@ -15,6 +15,6 @@
     "popular_topics": "Popular Topics",
     "unread_topics": "Unread Topics",
     "categories": "Categories",
-    "tags": "Tags",
+    "tags": "Tunnisteet",
     "no-users-found": "No users found!"
 }

public/language/fr/error.json

@@ -27,6 +27,7 @@
     "password-too-long": "Mot de passe trop long",
     "user-banned": "Utilisateur banni",
     "user-too-new": "Désolé, vous devez attendre encore %1 seconde(s) avant d'envoyer votre premier message",
+    "blacklisted-ip": "Désolé, votre adresse IP a été bannie de cette communauté. Si vous pensez que c'est une erreur, veuillez contacter un administrateur.",
     "no-category": "Cette catégorie n'existe pas",
     "no-topic": "Ce sujet n'existe pas",
     "no-post": "Ce message n'existe pas",
@@ -50,8 +51,8 @@
     "still-uploading": "Veuillez patienter pendant le téléchargement.",
     "file-too-big": "La taille maximale autorisée pour un fichier est de %1 kb. Veuillez envoyer un fichier plus petit.",
     "guest-upload-disabled": "Le téléversement est désactivé pour les Invités.",
-    "already-favourited": "You have already bookmarked this post",
-    "already-unfavourited": "You have already unbookmarked this post",
+    "already-favourited": "Vous avez déjà mis un marque-page",
+    "already-unfavourited": "Vous avez déjà retiré un marque-page",
     "cant-ban-other-admins": "Vous ne pouvez pas bannir les autres administrateurs !",
     "cant-remove-last-admin": "Vous seul êtes administrateur. Ajouter un autre utilisateur en tant qu'administrateur avant de vous en retirer.",
     "invalid-image-type": "Type d'image invalide. Les types autorisés sont: %1",
@@ -97,5 +98,6 @@
     "invite-maximum-met": "Vous avez invité la quantité maximale de personnes (%1 de %2).",
     "no-session-found": "Pas de session de connexion trouvé!",
     "not-in-room": "L'utilisateur n'est pas dans cette salle",
-    "no-users-in-room": "No users in this room"
+    "no-users-in-room": "Aucun utilisateur dans cette salle",
+    "cant-kick-self": "Vous ne pouvez pas vous exclure vous-même du groupe"
 }

public/language/fr/global.json

@@ -29,13 +29,13 @@
     "header.popular": "Populaire",
     "header.users": "Utilisateurs",
     "header.groups": "Groupes",
-    "header.chats": "Chats",
+    "header.chats": "Discussions",
     "header.notifications": "Notifications",
     "header.search": "Recherche",
     "header.profile": "Profil",
     "header.navigation": "Navigation",
     "notifications.loading": "Chargement des notifications",
-    "chats.loading": "Chargement des chats",
+    "chats.loading": "Chargement des discussions",
     "motd.welcome": "Bienvenue sur NodeBB, la plate-forme de discussion du futur.",
     "previouspage": "Page précédente",
     "nextpage": "Page suivante",
@@ -87,8 +87,8 @@
     "map": "Carte",
     "sessions": "Sessions de connexion",
     "ip_address": "Adresse IP",
-    "enter_page_number": "Enter page number",
-    "upload_file": "Upload file",
-    "upload": "Upload",
-    "allowed-file-types": "Allowed file types are %1"
+    "enter_page_number": "Entrer un numéro de page",
+    "upload_file": "Envoyer un fichier",
+    "upload": "Envoyer",
+    "allowed-file-types": "Les types de fichiers autorisés sont : %1"
 }

public/language/fr/groups.json

@@ -41,6 +41,7 @@
     "details.hidden": "Masqué",
     "details.hidden_help": "Si cette case est cochée, ce groupe n'est pas affiché dans la liste des groupes, et les utilisateurs devront être invités manuellement.",
     "details.delete_group": "Supprimer le groupe",
+    "details.private_system_help": "Les groupes privés sont désactivés au niveau du système, cette option ne déclenche rien",
     "event.updated": "Les détails du groupe ont été mis à jour",
     "event.deleted": "Le groupe \"%1\" a été supprimé",
     "membership.accept-invitation": "Accepter l'invitation",
@@ -49,5 +50,5 @@
     "membership.leave-group": "Quitter le groupe",
     "membership.reject": "Refuser",
     "new-group.group_name": "Nom du groupe :",
-    "upload-group-cover": "Upload group cover"
+    "upload-group-cover": "Envoyer une image de groupe"
 }

public/language/fr/modules.json

@@ -1,13 +1,14 @@
 {
     "chat.chatting_with": "Discuter avec <span id=\"chat-with-name\"></span>",
-    "chat.placeholder": "Tapez votre message ici, appuyez sur Entrer pour envoyer",
+    "chat.placeholder": "Tapez votre message ici, appuyez sur Entrée pour envoyer",
     "chat.send": "Envoyer",
     "chat.no_active": "Vous n'avez aucune discussion en cours.",
     "chat.user_typing": "%1 est en train d'écrire ...",
     "chat.user_has_messaged_you": "%1 vous a envoyé un message.",
     "chat.see_all": "Voir toutes les discussions",
+    "chat.mark_all_read": "Marquer toutes les discussions comme lues",
     "chat.no-messages": "Veuillez sélectionner un destinataire pour voir l'historique des discussions",
-    "chat.no-users-in-room": "Aucun utilisateur dans cette salle",
+    "chat.no-users-in-room": "Aucun participant à cette discussion",
     "chat.recent-chats": "Discussions récentes",
     "chat.contacts": "Contacts",
     "chat.message-history": "Historique des messages",
@@ -18,7 +19,7 @@
     "chat.three_months": "3 Mois",
     "chat.delete_message_confirm": "Êtes-vous sûr de vouloir supprimer ce message ?",
     "chat.roomname": "Salle de discussion %1",
-    "chat.add-users-to-room": "Ajouter des utilisateurs à la salle",
+    "chat.add-users-to-room": "Ajouter des participants",
     "composer.compose": "Écrire",
     "composer.show_preview": "Afficher l'aperçu",
     "composer.hide_preview": "Masquer l'aperçu",

public/language/fr/notifications.json

@@ -16,9 +16,9 @@
     "upvoted_your_post_in_multiple": "<strong>%1</strong> et %2 autres on voté pour votre message dans <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> a déplacé votre message vers <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> a déplacé <strong>%2</strong>.",
-    "favourited_your_post_in": "<strong>%1</strong> has bookmarked your post in <strong>%2</strong>.",
-    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have bookmarked your post in <strong>%3</strong>.",
-    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have bookmarked your post in <strong>%3</strong>.",
+    "favourited_your_post_in": "<strong>%1</strong> a enregistré votre message dans <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> et <strong>%2</strong> autres ont enregistré votre message dans <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> et %2 autres ont enregistré votre message dans <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> a signalé un message dans <strong>%2</strong>.",
     "user_flagged_post_in_dual": "<strong>%1</strong> et <strong>%2</strong> ont signalé un message dans <strong>%3</strong>",
     "user_flagged_post_in_multiple": "<strong>%1</strong> et %2 autres on signalé un message dans <strong>%3</strong>",
@@ -30,7 +30,7 @@
     "user_started_following_you_dual": "<strong>%1</strong> et <strong>%2</strong> vous suivent.",
     "user_started_following_you_multiple": "<strong>%1</strong> et %2 autres vous suivent.",
     "new_register": "<strong>%1</strong> a envoyé une demande d'incription.",
-    "new_register_multiple": "There are <strong>%1</strong> registration requests awaiting review.",
+    "new_register_multiple": "<strong>%1</strong> inscription(s) est en attente de validation.",
     "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-message": "Il y a un un problème dans la vérification de votre adresse email. Le code est peut être invalide ou a expiré.",

public/language/fr/pages.json

@@ -33,13 +33,13 @@
     "account/posts": "Messages postés par %1",
     "account/topics": "Sujets créés par %1",
     "account/groups": "Groupes auxquels appartient %1",
-    "account/favourites": "%1's Bookmarked Posts",
+    "account/favourites": "Marques-pages de %1",
     "account/settings": "Paramètres d'utilisateur",
     "account/watched": "Sujets surveillés par %1",
     "account/upvoted": "Messages pour lesquels %1 a voté",
     "account/downvoted": "Messages contre lesquels %1 a voté",
     "account/best": "Meilleurs messages postés par %1",
-    "confirm": "Email Confirmed",
+    "confirm": "Email vérifié",
     "maintenance.text": "%1 est en maintenance. Veuillez revenir un peu plus tard.",
     "maintenance.messageIntro": "De plus, l'administrateur a laissé ce message:",
     "throttled.text": "%1 est actuellement indisponible en raison d'une charge excessive. Merci de réessayer plus tard."

public/language/fr/topic.json

@@ -65,9 +65,9 @@
     "disabled_categories_note": "Les catégories désactivées sont grisées",
     "confirm_move": "Déplacer",
     "confirm_fork": "Scinder",
-    "favourite": "Bookmark",
-    "favourites": "Bookmarks",
-    "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
+    "favourite": "Marque-page",
+    "favourites": "Marque-page",
+    "favourites.has_no_favourites": "Vous n'avez aucuns marque-page.",
     "loading_more_posts": "Charger plus de messages",
     "move_topic": "Déplacer le sujet",
     "move_topics": "Déplacer des sujets",

public/language/fr/uploads.json

@@ -0,0 +1,6 @@
+{
+    "uploading-file": "Envoi du fichier…",
+    "select-file-to-upload": "Sélectionnez un ficher à envoyer",
+    "upload-success": "Fichier envoyé",
+    "maximum-file-size": "%1 Ko maximum"
+}

public/language/fr/user.json

@@ -22,7 +22,7 @@
     "profile": "Profil",
     "profile_views": "Vues",
     "reputation": "Réputation",
-    "favourites": "Bookmarks",
+    "favourites": "Marque-pages",
     "watched": "Suivis",
     "followers": "Abonnés",
     "following": "Abonnements",
@@ -39,6 +39,7 @@
     "change_username": "Changer le nom d'utilisateur",
     "change_email": "Changer l'e-mail",
     "edit": "Éditer",
+    "edit-profile": "Éditer le profil",
     "default_picture": "Icône par défaut",
     "uploaded_picture": "Image envoyée",
     "upload_new_picture": "Envoyer une nouvelle image",
@@ -55,11 +56,11 @@
     "password": "Mot de passe",
     "username_taken_workaround": "Le nom d'utilisateur désiré est déjà utilisé, nous l'avons donc légèrement modifié. Vous êtes maintenant connu comme <strong>%1</strong>",
     "password_same_as_username": "Votre mot de passe est identique à votre nom d'utilisateur. Veuillez en choisir un autre.",
-    "password_same_as_email": "Your password is the same as your email, please select another password.",
+    "password_same_as_email": "Votre mot de passe est identique à votre adresse email. Veuillez en choisir un autre.",
     "upload_picture": "Envoyer l'image",
     "upload_a_picture": "Envoyer une image",
     "remove_uploaded_picture": "Supprimer l'image envoyée",
-    "upload_cover_picture": "Upload cover picture",
+    "upload_cover_picture": "Envoyer une image de couverture",
     "settings": "Paramètres",
     "show_email": "Afficher mon email",
     "show_fullname": "Afficher mon nom complet",
@@ -91,6 +92,7 @@
     "open_links_in_new_tab": "Ouvrir les liens externes dans un nouvel onglet",
     "enable_topic_searching": "Activer la recherche dans les sujets",
     "topic_search_help": "Une fois activé, la recherche dans les sujets va remplacer la recherche de page du navigateur et vous permettra de rechercher dans l'intégralité d'un sujet au lieu des seuls posts affichés à l'écran.",
+    "scroll_to_my_post": "Après avoir répondu, montrer le nouveau message",
     "follow_topics_you_reply_to": "Suivre les sujets auxquels vous répondez",
     "follow_topics_you_create": "Suivre les sujets que vous créez",
     "grouptitle": "Sélectionnez le titre de groupe que vous souhaitez afficher",

public/language/fr/users.json

@@ -3,7 +3,7 @@
     "top_posters": "Actifs",
     "most_reputation": "Réputés",
     "search": "Rechercher",
-    "enter_username": "Entrer un nom d'utilisateur pour rechercher",
+    "enter_username": "Entrez le nom d'un utilisateur",
     "load_more": "Charger la suite",
     "users-found-search-took": "%1 utilisateur(s) trouvé(s)! La recherche a pris %2 secondes.",
     "filter-by": "Filtrer par",