Incremented version number

Merge commit '3bebc3ce09e66bbd18203eeaf72a9ab286eceed6' into weekly
Latest translations and fallbacks
2026-01-06 15:42:52 +01:00 · 2016-06-27 16:00:20 -04:00 · 2016-06-27 16:00:19 -04:00 · 2016-06-27 09:02:31 -04:00 · 2016-06-27 12:09:57 +03:00 · 2016-06-26 09:03:13 -04:00
307 changed files with 3119 additions and 1266 deletions
--- a/app.js
+++ b/app.js
@@ -117,7 +117,7 @@ function start() {
 	var urlObject = url.parse(nconf.get('url'));
 	var relativePath = urlObject.pathname !== '/' ? urlObject.pathname : '';
 	nconf.set('base_url', urlObject.protocol + '//' + urlObject.host);
-	nconf.set('secure', urlObject.protocol === 'https');
+	nconf.set('secure', urlObject.protocol === 'https:');
 	nconf.set('use_port', !!urlObject.port);
 	nconf.set('relative_path', relativePath);
 	nconf.set('port', urlObject.port || nconf.get('port') || nconf.get('PORT') || 4567);
@@ -180,7 +180,11 @@ function start() {
 			require('./src/meta').configs.init(next);
 		},
 		function(next) {
-			require('./src/meta').dependencies.check(next);
+			if (nconf.get('dep-check') === undefined || nconf.get('dep-check') !== false) {
+				require('./src/meta').dependencies.check(next);
+			} else {
+				setImmediate(next);
+			}
 		},
 		function(next) {
 			require('./src/upgrade').check(next);
--- a/install/data/footer.json
+++ b/install/data/footer.json
@@ -2,7 +2,7 @@
 	{
 		"widget": "html",
 		"data" : {
-			"html": "<footer id=\"footer\" class=\"container footer\">\r\n\t<div class=\"copyright\">\r\n\t\tCopyright © 2015 <a target=\"_blank\" href=\"https://nodebb.org\">NodeBB Forums</a> | <a target=\"_blank\" href=\"//github.com/NodeBB/NodeBB/graphs/contributors\">Contributors</a>\r\n\t</div>\r\n</footer>",
+			"html": "<footer id=\"footer\" class=\"container footer\">\r\n\t<div class=\"copyright\">\r\n\t\tCopyright © 2016 <a target=\"_blank\" href=\"https://nodebb.org\">NodeBB Forums</a> | <a target=\"_blank\" href=\"//github.com/NodeBB/NodeBB/graphs/contributors\">Contributors</a>\r\n\t</div>\r\n</footer>",
 			"title":"",
 			"container":""
 		}
--- a/loader.js
+++ b/loader.js
@@ -171,7 +171,7 @@ function forkWorker(index, isPrimary) {
 	}

 	process.env.isPrimary = isPrimary;
-	process.env.isCluster = true;
+	process.env.isCluster = ports.length > 1 ? true : false;
 	process.env.port = ports[index];

 	var worker = fork('app.js', [], {
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "nodebb",
  "license": "GPL-3.0",
  "description": "NodeBB Forum",
-  "version": "1.0.4-auto.4",
+  "version": "1.0.4-auto.10",
  "homepage": "http://www.nodebb.org",
  "repository": {
    "type": "git",
@@ -26,7 +26,6 @@
    "connect-mongo": "~1.1.0",
    "connect-multiparty": "^2.0.0",
    "connect-redis": "~3.0.2",
-    "continuation-local-storage": "^3.1.6",
    "cookie-parser": "^1.3.3",
    "cron": "^1.0.5",
    "csurf": "^1.6.1",
@@ -37,6 +36,7 @@
    "html-to-text": "2.0.0",
    "ip": "1.1.2",
    "jimp": "0.2.21",
+    "json-2-csv": "^2.0.22",
    "less": "^2.0.0",
    "logrotate-stream": "^0.2.3",
    "lru-cache": "4.0.0",
@@ -47,18 +47,18 @@
    "morgan": "^1.3.2",
    "mousetrap": "^1.5.3",
    "nconf": "~0.8.2",
-    "nodebb-plugin-composer-default": "3.0.30",
-    "nodebb-plugin-dbsearch": "1.0.1",
-    "nodebb-plugin-emoji-one": "1.1.3",
+    "nodebb-plugin-composer-default": "4.0.5",
+    "nodebb-plugin-dbsearch": "1.0.2",
    "nodebb-plugin-emoji-extended": "1.1.0",
-    "nodebb-plugin-markdown": "5.1.5",
-    "nodebb-plugin-mentions": "1.1.0",
+    "nodebb-plugin-emoji-one": "1.1.5",
+    "nodebb-plugin-markdown": "6.0.0",
+    "nodebb-plugin-mentions": "1.1.2",
    "nodebb-plugin-soundpack-default": "0.1.6",
-    "nodebb-plugin-spam-be-gone": "0.4.6",
+    "nodebb-plugin-spam-be-gone": "0.4.8",
    "nodebb-rewards-essentials": "0.0.8",
-    "nodebb-theme-lavender": "3.0.10",
-    "nodebb-theme-persona": "4.0.138",
-    "nodebb-theme-vanilla": "5.0.75",
+    "nodebb-theme-lavender": "3.0.13",
+    "nodebb-theme-persona": "4.1.3",
+    "nodebb-theme-vanilla": "5.1.0",
    "nodebb-widget-essentials": "2.0.9",
    "nodemailer": "2.0.0",
    "nodemailer-sendmail-transport": "1.0.0",
--- a/public/503.html
+++ b/public/503.html
@@ -2,6 +2,7 @@
 <head>
 	<title>Excessive Load Warning</title>
 	<link href='http://fonts.googleapis.com/css?family=Ubuntu:400,500,700' rel='stylesheet' type='text/css'>
+	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<style type="text/css">
 	body {
 		background: #00A9EA;
@@ -32,6 +33,20 @@
 		font-size: 28px;
 	}

+	@media (max-width: 640px) {
+		h1 {
+			font-size: 125px;
+		}
+
+		p {
+			font-size: 16px;
+		}
+
+		p strong {
+			font-size: 20px;
+		}
+	}
+
 	.center {
 		position: relative;
 		top: 50%;
@@ -148,11 +163,13 @@
 		<div class="center">
 			<h1 id="click-me" class="animated bounce">503</h1>
 			<p>
-				<strong>This forum is temporarily unavailable due to excessive load.</strong> <br />
+				<strong>This forum is temporarily unavailable due to excessive load.</strong>
+			</p>
+			<p>
 				We shouldn't be down for long. Please check back shortly. Sorry for the inconvenience!
 			</p>
-			<p id="hide" class="hide">
-				<small>Alright. You can stop clicking... it's not going to make the site come back sooner!</small>
+			<p>
+				&nbsp;<small id="hide" class="hide">Alright. You can stop clicking... it's not going to make the site come back sooner!</small>
 			</p>
 		</div>
 	</div>
--- a/public/language/ar/error.json
+++ b/public/language/ar/error.json
@@ -14,6 +14,7 @@
    "invalid-password": "كلمة السر غير مقبولة",
    "invalid-username-or-password": "المرجود تحديد اسم مستخدم و كلمة مرور",
    "invalid-search-term": "كلمة البحث غير صحيحة",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
    "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
    "username-taken": "اسم المستخدم مأخوذ",
    "email-taken": "البريد الالكتروني مأخوذ",
@@ -39,6 +40,12 @@
    "category-disabled": "قائمة معطلة",
    "topic-locked": "الموضوع مقفول",
    "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(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).",
@@ -56,6 +63,7 @@
    "already-unfavourited": "You have already unbookmarked this post",
    "cant-ban-other-admins": "لايمكن حظر مدبر نظام آخر.",
    "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
    "invalid-image-type": "Invalid image type. Allowed types are: %1",
    "invalid-image-extension": "Invalid image extension",
    "invalid-file-type": "Invalid file type. Allowed types are: %1",
--- a/public/language/ar/topic.json
+++ b/public/language/ar/topic.json
@@ -32,6 +32,7 @@
    "deleted_message": "هذه المشاركة محذوفة. فقط من لهم صلاحية الإشراف على ا لمشاركات يمكنهم معاينتها.",
    "following_topic.message": "ستستلم تنبيها عند كل مشاركة جديدة في هذا الموضوع.",
    "not_following_topic.message": "لن تستلم أي تنبيه بخصوص عذا الموضوع بعد الآن.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
    "login_to_subscribe": "المرجو إنشاء حساب أو تسجيل الدخول حتى يمكنك متابعة هذا الموضوع.",
    "markAsUnreadForAll.success": "تم تحديد الموضوع على أنه غير مقروء.",
    "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
    "watch.title": "استلم تنبيها بالردود الجديدة في هذا الموضوع",
    "unwatch.title": "ألغ مراقبة هذا الموضوع",
    "share_this_post": "انشر هذا الموضوع",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
    "thread_tools.title": "أدوات الموضوع",
    "thread_tools.markAsUnreadForAll": "علم غير مقروء",
    "thread_tools.pin": "علق الموضوع",
--- a/public/language/bg/error.json
+++ b/public/language/bg/error.json
@@ -1,5 +1,5 @@
 {
-    "invalid-data": "Невалидни данни",
+    "invalid-data": "Грешни данни",
    "not-logged-in": "Изглежда не сте влезли в системата.",
    "account-locked": "Вашият акаунт беше заключен временно",
    "search-requires-login": "Търсенето изисква акаунт – моля, влезте или се регистрирайте.",
@@ -14,6 +14,7 @@
    "invalid-password": "Грешна парола",
    "invalid-username-or-password": "Моля, посочете потребителско име и парола",
    "invalid-search-term": "Грешен текст за търсене",
+    "csrf-invalid": "Не успяхме да Ви впишем, най-вероятно защото сесията Ви е изтекла. Моля, опитайте отново",
    "invalid-pagination-value": "Грешен номер на страница, трябва да бъде между %1 и %2",
    "username-taken": "Потребителското име е заето",
    "email-taken": "Е-пощата е заета",
@@ -39,6 +40,12 @@
    "category-disabled": "Категорията е изключена",
    "topic-locked": "Темата е заключена",
    "post-edit-duration-expired": "Можете да редактирате публикациите си до %1 секунда/и, след като ги пуснете",
+    "post-edit-duration-expired-minutes": "Можете да редактирате публикациите си до %1 минута/и, след като ги пуснете",
+    "post-edit-duration-expired-minutes-seconds": "Можете да редактирате публикациите си до %1 минута/и и %2 секунда/и, след като ги пуснете",
+    "post-edit-duration-expired-hours": "Можете да редактирате публикациите си до %1 час(а), след като ги пуснете",
+    "post-edit-duration-expired-hours-minutes": "Можете да редактирате публикациите си до %1 час(а) и %2 минута/и, след като ги пуснете",
+    "post-edit-duration-expired-days": "Можете да редактирате публикациите си до %1 ден(а), след като ги пуснете",
+    "post-edit-duration-expired-days-hours": "Можете да редактирате публикациите си до %1 ден(а) и %2 час(а), след като ги пуснете",
    "content-too-short": "Моля, въведете по-дълъг текст на публикацията. Публикациите трябва да съдържат поне %1 символ(а).",
    "content-too-long": "Моля, въведете по-кратък текст на публикацията. Публикациите трябва да съдържат не повече от %1 символ(а).",
    "title-too-short": "Моля, въведете по-дълго заглавие. Заглавията трябва да съдържат поне %1 символ(а).",
@@ -56,6 +63,7 @@
    "already-unfavourited": "Вече сте премахнали отметката си към тази публикация",
    "cant-ban-other-admins": "Не можете да блокирате другите администратори!",
    "cant-remove-last-admin": "Вие сте единственият администратор. Добавете друг потребител като администратор, преди да премахнете себе си като администратор",
+    "cant-delete-admin": "Премахнете администраторските права от този акаунт, преди да го изтриете.",
    "invalid-image-type": "Грешен тип на изображение. Позволените типове са: %1",
    "invalid-image-extension": "Грешно разширение на изображението",
    "invalid-file-type": "Грешен тип на файл. Позволените типове са: %1",
--- a/public/language/bg/topic.json
+++ b/public/language/bg/topic.json
@@ -32,6 +32,7 @@
    "deleted_message": "Тази тема е била изтрита. Само потребители с права за управление на темите могат да я видят.",
    "following_topic.message": "Вече ще получавате известия когато някой публикува коментар в тази тема.",
    "not_following_topic.message": "Вече няма да получавате известия за тази тема.",
+    "ignoring_topic.message": "Вече няма да виждате тази тема в списъка с непрочетени теми. Ще получите известие, когато някой Ви спомене или гласува положително за Ваша публикация.",
    "login_to_subscribe": "Моля, регистрирайте се или влезте, за да се абонирате за тази тема.",
    "markAsUnreadForAll.success": "Темата е отбелязана като непрочетена за всички.",
    "mark_unread": "Отбелязване като непрочетена",
@@ -41,6 +42,12 @@
    "watch.title": "Получавайте известия за новите отговори в тази тема",
    "unwatch.title": "Спрете да наблюдавате тази тема",
    "share_this_post": "Споделете тази публикация",
+    "watching": "Наблюдавате",
+    "not-watching": "Не наблюдавате",
+    "ignoring": "Пренебрегвате",
+    "watching.description": "Ще получавате известия за новите отговори.<br/>Темата ще се показва в списъка с непрочетени.",
+    "not-watching.description": "Няма да получавате известия за новите отговори.<br/>Темата ще се показва в списъка с непрочетени, само ако категорията не се пренебрегва.",
+    "ignoring.description": "Няма да получавате известия за новите отговори.<br/>Темата няма да се показва в списъка с непрочетени.",
    "thread_tools.title": "Инструменти за темата",
    "thread_tools.markAsUnreadForAll": "Отбелязване като непрочетена",
    "thread_tools.pin": "Закачане на темата",
--- a/public/language/bn/error.json
+++ b/public/language/bn/error.json
@@ -14,6 +14,7 @@
    "invalid-password": "ভুল পাসওয়ার্ড",
    "invalid-username-or-password": "অনুগ্রহ পূর্বক ইউজারনেম এবং পাসওয়ার্ড উভয়ই প্রদান করুন",
    "invalid-search-term": "অগ্রহনযোগ্য সার্চ টার্ম",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
    "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
    "username-taken": "ইউজারনেম আগেই ব্যবহৃত",
    "email-taken": "ইমেইল আগেই ব্যবহৃত",
@@ -39,6 +40,12 @@
    "category-disabled": "বিভাগটি নিষ্ক্রিয়",
    "topic-locked": "টপিক বন্ধ",
    "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(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).",
@@ -56,6 +63,7 @@
    "already-unfavourited": "You have already unbookmarked this post",
    "cant-ban-other-admins": "আপনি অন্য এ্যাডমিনদের নিষিদ্ধ করতে পারেন না!",
    "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
    "invalid-image-type": "Invalid image type. Allowed types are: %1",
    "invalid-image-extension": "Invalid image extension",
    "invalid-file-type": "Invalid file type. Allowed types are: %1",
--- a/public/language/bn/topic.json
+++ b/public/language/bn/topic.json
@@ -32,6 +32,7 @@
    "deleted_message": "এই টপিকটি মুছে ফেলা হয়েছে। শুধুমাত্র টপিক ব্যবস্থাপনার ক্ষমতাপ্রাপ্ত সদস্যগণ এটি দেখতে পারবেন।",
    "following_topic.message": "এখন থেকে এই টপিকে অন্যকেউ পোস্ট করলে আপনি নোটিফিকেশন পাবেন।",
    "not_following_topic.message": "এই টপিক থেকে আপনি আর নোটিফিকেশন পাবেন না।",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
    "login_to_subscribe": "এই টপিকে সাবস্ক্রাইব করতে চাইলে অনুগ্রহ করে নিবন্ধণ করুন অথবা প্রবেশ করুন।",
    "markAsUnreadForAll.success": "টপিকটি সবার জন্য অপঠিত হিসাবে মার্ক করুন।",
    "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
    "watch.title": "এই টপিকে নতুন উত্তর এলে বিজ্ঞাপণের মাধ্যমে জানুন।",
    "unwatch.title": "এই টপিক দেখা বন্ধ করুন",
    "share_this_post": "এই পোষ্টটি শেয়ার করুন",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
    "thread_tools.title": "টপিক সম্পর্কিত টুলস",
    "thread_tools.markAsUnreadForAll": "\"অপঠিত\" হিসেবে চিহ্নিত করুন",
    "thread_tools.pin": "টপিক পিন করুন",
--- a/public/language/cs/category.json
+++ b/public/language/cs/category.json
@@ -2,7 +2,7 @@
    "category": "Kategorie",
    "subcategories": "Podkategorie",
    "new_topic_button": "Nové téma",
-    "guest-login-post": "Přihlásit se pro přidání",
+    "guest-login-post": "Přihlásit se pro přispívání",
    "no_topics": "<strong>V této kategorii zatím nejsou žádné příspěvky.</strong><br />Můžeš být první!",
    "browsing": "prohlíží",
    "no_replies": "Nikdo ještě neodpověděl",
--- a/public/language/cs/error.json
+++ b/public/language/cs/error.json
@@ -14,6 +14,7 @@
    "invalid-password": "Neplatné heslo",
    "invalid-username-or-password": "Stanovte, prosím, oboje, jak uživatelské jméno, tak heslo",
    "invalid-search-term": "Neplatný výraz pro vyhledávání",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
    "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
    "username-taken": "Uživatelské jméno je již použito",
    "email-taken": "Email je již použit",
@@ -21,11 +22,11 @@
    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
    "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.",
+    "confirm-email-already-sent": "Potvrzovací email již byl odeslán. Vyčkejte %1 minut pokud chcete odeslat další.",
    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
    "username-too-short": "Uživatelské jméno je příliš krátké",
    "username-too-long": "Uživatelské jméno je příliš dlouhé",
-    "password-too-long": "Password too long",
+    "password-too-long": "Heslo je příliš dlouhé",
    "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.",
@@ -39,6 +40,12 @@
    "category-disabled": "Kategorie zakázána",
    "topic-locked": "Téma uzamčeno",
    "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(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).",
@@ -56,6 +63,7 @@
    "already-unfavourited": "You have already unbookmarked this post",
    "cant-ban-other-admins": "Nemůžete zakazovat ostatní administrátory!",
    "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
    "invalid-image-type": "Invalid image type. Allowed types are: %1",
    "invalid-image-extension": "Invalid image extension",
    "invalid-file-type": "Invalid file type. Allowed types are: %1",
--- a/public/language/cs/global.json
+++ b/public/language/cs/global.json
@@ -23,7 +23,7 @@
    "pagination.enter_index": "Enter index",
    "header.admin": "Administrace",
    "header.categories": "Kategorie",
-    "header.recent": "Aktuality",
+    "header.recent": "Nejnovější",
    "header.unread": "Nepřečtené",
    "header.tags": "Tagy",
    "header.popular": "Populární",
--- a/public/language/cs/topic.json
+++ b/public/language/cs/topic.json
@@ -32,6 +32,7 @@
    "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
    "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
    "not_following_topic.message": "You will no longer receive notifications from this topic.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
    "markAsUnreadForAll.success": "Topic marked as unread for all.",
    "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
    "watch.title": "Be notified of new replies in this topic",
    "unwatch.title": "Stop watching this topic",
    "share_this_post": "Sdílet toto téma",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
    "thread_tools.title": "Topic Tools",
    "thread_tools.markAsUnreadForAll": "Označit jako nepřečtené",
    "thread_tools.pin": "Pin Topic",
--- a/public/language/da/error.json
+++ b/public/language/da/error.json
@@ -14,6 +14,7 @@
    "invalid-password": "Ugyldig Adgangskode",
    "invalid-username-or-password": "Venligst angiv både brugernavn og adgangskode",
    "invalid-search-term": "Ugyldig søgeterm",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
    "invalid-pagination-value": "Ugyldig side værdi, skal mindst være %1 og maks. %2",
    "username-taken": "Brugernavn optaget",
    "email-taken": "Emailadresse allerede i brug",
@@ -39,6 +40,12 @@
    "category-disabled": "Kategorien er deaktiveret",
    "topic-locked": "Tråden er låst",
    "post-edit-duration-expired": "Du kan kun redigere indlæg i %1 sekund(er) efter indlæg",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
    "content-too-short": "Venligst indtast et længere indlæg. Indlægget skal mindst indeholde %1 karakter(er).",
    "content-too-long": "Venligt indtast et kortere indlæg. Indlæg kan ikke være længere end %1 karakter(er).",
    "title-too-short": "Venligst indtast en længere titel. Titlen skal mindst indeholde %1 karakter(er).",
@@ -56,6 +63,7 @@
    "already-unfavourited": "Du har allerede fjernet dette indlæg fra bogmærker",
    "cant-ban-other-admins": "Du kan ikke udlukke andre administatrorer!",
    "cant-remove-last-admin": "Du er den eneste administrator. Tilføj en anden bruger som administrator før du fjerner dig selv som administrator",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
    "invalid-image-type": "Invalid billed type. De tilladte typer er: %1",
    "invalid-image-extension": "Forkert billede filnavnsendelse",
    "invalid-file-type": "Invalid fil type. Tilladte typer er: %1",
--- a/public/language/da/topic.json
+++ b/public/language/da/topic.json
@@ -32,6 +32,7 @@
    "deleted_message": "Denne tråd er blevet slettet. Kun brugere med emne behandlings privilegier kan se den.",
    "following_topic.message": "Du vil nu modtage notifikationer når nogle skriver et indlæg i dette emne.",
    "not_following_topic.message": "Du vil ikke længere modtage notifikationer fra dette emne.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
    "login_to_subscribe": "Venligt registrer eller login for at abbonere på dette emne.",
    "markAsUnreadForAll.success": "Emnet er market ulæst for alle.",
    "mark_unread": "Marker ulæste",
@@ -41,6 +42,12 @@
    "watch.title": "Bliv notificeret ved nye indlæg i dette emne",
    "unwatch.title": "Fjern overvågning af dette emne",
    "share_this_post": "Del dette indlæg",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
    "thread_tools.title": "Emne værktøjer",
    "thread_tools.markAsUnreadForAll": "Marker som ulæst",
    "thread_tools.pin": "Fastgør tråd",
--- a/public/language/de/error.json
+++ b/public/language/de/error.json
@@ -14,6 +14,7 @@
    "invalid-password": "Ungültiges Passwort",
    "invalid-username-or-password": "Bitte gebe einen Benutzernamen und ein Passwort an",
    "invalid-search-term": "Ungültige Suchanfrage",
+    "csrf-invalid": "Dein Login war nicht erfolgreich da wahrscheinlich deine Sitzung abgelaufen ist. Bitte versuche es noch einmal",
    "invalid-pagination-value": "Ungültige Seitennummerierung, muss mindestens %1 und maximal %2 sein",
    "username-taken": "Der Benutzername ist bereits vergeben",
    "email-taken": "Die E-Mail-Adresse ist bereits vergeben",
@@ -22,7 +23,7 @@
    "no-email-to-confirm": "Dieses Forum setzt eine E-Mail-Bestätigung voraus, bitte klicke hier um eine E-Mail-Adresse einzugeben.",
    "email-confirm-failed": "Wir konnten deine E-Mail-Adresse nicht bestätigen, bitte versuch es später noch einmal",
    "confirm-email-already-sent": "Die Bestätigungsmail wurde verschickt, bitte warte %1 Minute(n) um eine Weitere zu verschicken.",
-    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
+    "sendmail-not-found": "Sendmail wurde nicht gefunden. Bitte stelle sicher, dass es installiert ist und durch den Benutzer unter dem NodeBB läuft ausgeführt werden kann.",
    "username-too-short": "Benutzername ist zu kurz",
    "username-too-long": "Benutzername ist zu lang",
    "password-too-long": "Passwort ist zu lang",
@@ -39,6 +40,12 @@
    "category-disabled": "Kategorie ist deaktiviert",
    "topic-locked": "Thema ist gesperrt",
    "post-edit-duration-expired": "Entschuldigung, du darfst Beiträge nur %1 Sekunde(n) nach dem Veröffentlichen editieren.",
+    "post-edit-duration-expired-minutes": "Du darfst Beiträge lediglich innerhalb von %1 Minuten/n nach dem Erstellen editieren",
+    "post-edit-duration-expired-minutes-seconds": "Du darfst Beiträge lediglich innerhalb von %1 Minuten/n und %2 Sekunden nach dem Erstellen editieren",
+    "post-edit-duration-expired-hours": "Du darfst Beiträge lediglich innerhalb von %1 Stunde/n nach dem Erstellen editieren",
+    "post-edit-duration-expired-hours-minutes": "Du darfst Beiträge lediglich innerhalb von %1 Stunde/n und %2 Minute/n nach dem Erstellen editieren",
+    "post-edit-duration-expired-days": "Du darfst Beiträge lediglich innerhalb von %1 Tag/en nach dem Erstellen editieren",
+    "post-edit-duration-expired-days-hours": "Du darfst Beiträge lediglich innerhalb von %1 Tag/en und %2 Stunde/n nach dem Erstellen editieren",
    "content-too-short": "Bitte schreibe einen längeren Beitrag. Beiträge sollten mindestens %1 Zeichen enthalten.",
    "content-too-long": "Bitte schreibe einen kürzeren Beitrag. Beiträge können nicht länger als %1 Zeichen sein.",
    "title-too-short": "Bitte gebe einen längeren Titel ein. Ein Titel muss mindestens %1 Zeichen enthalten.",
@@ -56,6 +63,7 @@
    "already-unfavourited": "Du hast diesen Beitrag bereits aus deinen Lesezeichen entfernt",
    "cant-ban-other-admins": "Du kannst andere Administratoren nicht sperren!",
    "cant-remove-last-admin": "Du bist der einzige Administrator. Füge zuerst einen anderen Administrator hinzu, bevor du dich selbst als Administrator entfernst",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
    "invalid-image-type": "Falsche Bildart. Erlaubte Arten sind: %1",
    "invalid-image-extension": "Ungültige Dateinamenerweiterung",
    "invalid-file-type": "Ungültiger Dateityp. Erlaubte Typen sind: %1",
--- a/public/language/de/login.json
+++ b/public/language/de/login.json
@@ -5,7 +5,7 @@
    "remember_me": "Eingeloggt bleiben?",
    "forgot_password": "Passwort vergessen?",
    "alternative_logins": "Alternative Logins",
-    "failed_login_attempt": "Login Unsuccessful",
+    "failed_login_attempt": "Login fehlgeschlagen",
    "login_successful": "Du hast dich erfolgreich eingeloggt!",
    "dont_have_account": "Du hast noch kein Konto?"
 }
--- a/public/language/de/modules.json
+++ b/public/language/de/modules.json
@@ -29,14 +29,14 @@
    "composer.submit_and_lock": "Einreichen und Sperren",
    "composer.toggle_dropdown": "Menu aus-/einblenden",
    "composer.uploading": "Lade %1 hoch",
-    "composer.formatting.bold": "Bold",
-    "composer.formatting.italic": "Italic",
-    "composer.formatting.list": "List",
-    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.bold": "Fett",
+    "composer.formatting.italic": "Kursiv",
+    "composer.formatting.list": "Liste",
+    "composer.formatting.strikethrough": "Durchstreichen",
    "composer.formatting.link": "Link",
-    "composer.formatting.picture": "Picture",
-    "composer.upload-picture": "Upload Image",
-    "composer.upload-file": "Upload File",
+    "composer.formatting.picture": "Bild",
+    "composer.upload-picture": "Bild hochladen",
+    "composer.upload-file": "Datei hochladen",
    "bootbox.ok": "OK",
    "bootbox.cancel": "Abbrechen",
    "bootbox.confirm": "Bestätigen",
--- a/public/language/de/topic.json
+++ b/public/language/de/topic.json
@@ -32,6 +32,7 @@
    "deleted_message": "Dieses Thema wurde gelöscht. Nur Nutzer mit entsprechenden Rechten können es sehen.",
    "following_topic.message": "Du erhälst nun eine Benachrichtigung, wenn jemand einen Beitrag zu diesem Thema verfasst.",
    "not_following_topic.message": "Du erhälst keine weiteren Benachrichtigungen zu diesem Thema mehr.",
+    "ignoring_topic.message": "Ungelesene Beiträge in diesem Thema werden nicht mehr angezeigt. Du erhältst eine Benachrichtigung wenn du in diesem Thema erwähnt wirst oder deine Beiträge positiv bewertet werden.",
    "login_to_subscribe": "Bitte registrieren oder einloggen um dieses Thema zu abonnieren",
    "markAsUnreadForAll.success": "Thema für Alle als ungelesen markiert.",
    "mark_unread": "Als ungelesen markieren",
@@ -41,6 +42,12 @@
    "watch.title": "Bei neuen Antworten benachrichtigen",
    "unwatch.title": "Dieses Thema nicht mehr beobachten",
    "share_this_post": "Diesen Beitrag teilen",
+    "watching": "Beobachtet",
+    "not-watching": "Nicht beobachtet",
+    "ignoring": "Ignoriert",
+    "watching.description": "Benachrichtigung bei neuen Beiträgen.<br/>Ungelesen Beiträge anzeigen.",
+    "not-watching.description": "Keine Benachrichtigung bei neuen Beiträgen.<br/>Ungelesen Beiträge anzeigen wenn die Kategorie nicht ignoriert wird.",
+    "ignoring.description": "Keine Benachrichtigung bei neuen Beiträgen.<br/>Ungelesene Beiträge nicht anzeigen.",
    "thread_tools.title": "Themen-Werkzeuge",
    "thread_tools.markAsUnreadForAll": "Als ungelesen markieren",
    "thread_tools.pin": "Thema anheften",
--- a/public/language/de/unread.json
+++ b/public/language/de/unread.json
@@ -7,7 +7,7 @@
    "all": "Alle",
    "all_categories": "Alle Kategorien",
    "topics_marked_as_read.success": "Themen als gelesen markiert!",
-    "all-topics": "All Topics",
-    "new-topics": "New Topics",
-    "watched-topics": "Watched Topics"
+    "all-topics": "Alle Themen",
+    "new-topics": "Neue Themen",
+    "watched-topics": "Beobachtete Themen"
 }
--- a/public/language/el/error.json
+++ b/public/language/el/error.json
@@ -14,6 +14,7 @@
    "invalid-password": "Άκυρος Κωδικός",
    "invalid-username-or-password": "Παρακαλώ γράψε το όνομα χρήστη και τον κωδικό",
    "invalid-search-term": "Άκυρος όρος αναζήτησης",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
    "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
    "username-taken": "Το όνομα χρήστη είναι πιασμένο",
    "email-taken": "Το email είναι πιασμένο",
@@ -39,6 +40,12 @@
    "category-disabled": "Η κατηγορία έχει απενεργοποιηθεί",
    "topic-locked": "Το θέμα έχει κλειδωθεί",
    "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(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).",
@@ -56,6 +63,7 @@
    "already-unfavourited": "You have already unbookmarked this post",
    "cant-ban-other-admins": "Δεν μπορείς να αποκλείσεις άλλους διαχειριστές!",
    "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
    "invalid-image-type": "Invalid image type. Allowed types are: %1",
    "invalid-image-extension": "Invalid image extension",
    "invalid-file-type": "Invalid file type. Allowed types are: %1",
--- a/public/language/el/topic.json
+++ b/public/language/el/topic.json
@@ -32,6 +32,7 @@
    "deleted_message": "Το θέμα αυτό έχει διαγραφεί. Μόνο οι χρήστες με δικαιώματα διαχειριστή θεμάτων μπορούν να το δουν.",
    "following_topic.message": "Θα λαμβάνεις ειδοποιήσεις όποτε κάποιος δημοσιεύει κάτι σε αυτό το θέμα.",
    "not_following_topic.message": "Δεν θα λαμβάνεις άλλες ειδοποιήσεις από αυτό το θέμα.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
    "login_to_subscribe": "Παρακαλώ εγγράψου ή συνδέσου για για γραφτείς σε αυτό το θέμα.",
    "markAsUnreadForAll.success": "Το θέμα σημειώθηκε ως μη αναγνωσμένο για όλους.",
    "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
    "watch.title": "Να ειδοποιούμαι για νέες απαντήσεις σε αυτό το θέμα",
    "unwatch.title": "Να μην παρακολουθώ αυτό το θέμα",
    "share_this_post": "Μοιράσου αυτή την Δημοσίευση",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
    "thread_tools.title": "Εργαλεία Θέματος",
    "thread_tools.markAsUnreadForAll": "Σημείωση ως μη αναγνωσμέν",
    "thread_tools.pin": "Καρφίτσωμα Θέματος",
--- a/public/language/en@pirate/error.json
+++ b/public/language/en@pirate/error.json
@@ -14,6 +14,7 @@
    "invalid-password": "Invalid Password",
    "invalid-username-or-password": "Please specify both a username and password",
    "invalid-search-term": "Invalid search term",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
    "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
    "username-taken": "Username taken",
    "email-taken": "Email taken",
@@ -39,6 +40,12 @@
    "category-disabled": "Category disabled",
    "topic-locked": "Topic Locked",
    "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(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).",
@@ -56,6 +63,7 @@
    "already-unfavourited": "You have already unbookmarked this post",
    "cant-ban-other-admins": "You can't ban other admins!",
    "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
    "invalid-image-type": "Invalid image type. Allowed types are: %1",
    "invalid-image-extension": "Invalid image extension",
    "invalid-file-type": "Invalid file type. Allowed types are: %1",
--- a/public/language/en@pirate/topic.json
+++ b/public/language/en@pirate/topic.json
@@ -32,6 +32,7 @@
    "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
    "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
    "not_following_topic.message": "You will no longer receive notifications from this topic.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
    "markAsUnreadForAll.success": "Topic marked as unread for all.",
    "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
    "watch.title": "Be notified of new replies in this topic",
    "unwatch.title": "Stop watching this topic",
    "share_this_post": "Share this Post",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
    "thread_tools.title": "Topic Tools",
    "thread_tools.markAsUnreadForAll": "Mark Unread",
    "thread_tools.pin": "Pin Topic",
--- a/public/language/en_GB/category.json
+++ b/public/language/en_GB/category.json
@@ -13,6 +13,10 @@
 	"share_this_category": "Share this category",
 	"watch": "Watch",
 	"ignore": "Ignore",
+	"watching": "Watching",
+	"ignoring": "Ignoring",
+	"watching.description": "Show topics in unread",
+	"ignoring.description": "Do not show topics in unread",

 	"watch.message": "You are now watching updates from this category",
 	"ignore.message": "You are now ignoring updates from this category",
--- a/public/language/en_GB/error.json
+++ b/public/language/en_GB/error.json
@@ -50,6 +50,13 @@

 	"topic-locked": "Topic Locked",
 	"post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
+	"post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+	"post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+	"post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+	"post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+	"post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+	"post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(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).",
@@ -72,12 +79,14 @@

 	"cant-ban-other-admins": "You can't ban other admins!",
 	"cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+	"cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",

 	"invalid-image-type": "Invalid image type. Allowed types are: %1",
 	"invalid-image-extension": "Invalid image extension",
 	"invalid-file-type": "Invalid file type. Allowed types are: %1",

 	"group-name-too-short": "Group name too short",
+	"group-name-too-long": "Group name too long",
 	"group-already-exists": "Group already exists",
 	"group-name-change-not-allowed": "Group name change not allowed",
 	"group-already-member": "Already part of this group",
--- a/public/language/en_GB/global.json
+++ b/public/language/en_GB/global.json
@@ -63,7 +63,9 @@
 	"topics": "Topics",
 	"posts": "Posts",
 	"best": "Best",
+	"upvoters": "Upvoters",
 	"upvoted": "Upvoted",
+	"downvoters": "Downvoters",
 	"downvoted": "Downvoted",
 	"views": "Views",
 	"reputation": "Reputation",
--- a/public/language/en_GB/notifications.json
+++ b/public/language/en_GB/notifications.json
@@ -18,9 +18,6 @@
 	"upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
 	"moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
 	"moved_your_topic": "<strong>%1</strong> has moved <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>.",
 	"user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
 	"user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
 	"user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
--- a/public/language/en_GB/register.json
+++ b/public/language/en_GB/register.json
@@ -1,5 +1,6 @@
 {
 	"register": "Register",
+	"cancel_registration": "Cancel Registration",
 	"help.email": "By default, your email will be hidden from the public.",
 	"help.username_restrictions": "A unique username between %1 and %2 characters. Others can mention you with @<span id='yourUsername'>username</span>.",
 	"help.minimum_password_length": "Your password's length must be at least %1 characters.",
@@ -15,5 +16,8 @@
 	"alternative_registration": "Alternative Registration",
 	"terms_of_use": "Terms of Use",
 	"agree_to_terms_of_use": "I agree to the Terms of Use",
-	"registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator."
+	"terms_of_use_error": "You must agree to the Terms of Use",
+	"registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator.",
+	"interstitial.intro": "We require some additional information before we can create your account.",
+	"interstitial.errors-found": "We could not complete your registration:"
 }
--- a/public/language/en_GB/topic.json
+++ b/public/language/en_GB/topic.json
@@ -37,7 +37,8 @@
 	"deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",

 	"following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
-	"not_following_topic.message": "You will no longer receive notifications from this topic.",
+	"not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
+	"ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",

 	"login_to_subscribe": "Please register or log in in order to subscribe to this topic.",

@@ -50,6 +51,12 @@
 	"watch.title": "Be notified of new replies in this topic",
 	"unwatch.title": "Stop watching this topic",
 	"share_this_post": "Share this Post",
+	"watching": "Watching",
+	"not-watching": "Not Watching",
+	"ignoring": "Ignoring",
+	"watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+	"not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+	"ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",

 	"thread_tools.title": "Topic Tools",
 	"thread_tools.markAsUnreadForAll": "Mark Unread",
@@ -125,7 +132,7 @@
 	"stale.warning": "The topic you are replying to is quite old. Would you like to create a new topic instead, and reference this one in your reply?",
 	"stale.create": "Create a new topic",
 	"stale.reply_anyway": "Reply to this topic anyway",
-	
+
 	"link_back": "Re: [%1](%2)\n\n",

 	"spam": "Spam",
--- a/public/language/en_GB/user.json
+++ b/public/language/en_GB/user.json
@@ -109,8 +109,8 @@

 	"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",
+	"follow_topics_you_reply_to": "Watch topics that you reply to",
+	"follow_topics_you_create": "Watch topics you create",

 	"grouptitle": "Group Title",
 	"no-group-title": "No group title",
--- a/public/language/en_US/error.json
+++ b/public/language/en_US/error.json
@@ -14,6 +14,7 @@
    "invalid-password": "Invalid Password",
    "invalid-username-or-password": "Please specify both a username and password",
    "invalid-search-term": "Invalid search term",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
    "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
    "username-taken": "Username taken",
    "email-taken": "Email taken",
@@ -39,6 +40,12 @@
    "category-disabled": "Category disabled",
    "topic-locked": "Topic Locked",
    "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(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).",
@@ -56,6 +63,7 @@
    "already-unfavourited": "You have already unbookmarked this post",
    "cant-ban-other-admins": "You can't ban other admins!",
    "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
    "invalid-image-type": "Invalid image type. Allowed types are: %1",
    "invalid-image-extension": "Invalid image extension",
    "invalid-file-type": "Invalid file type. Allowed types are: %1",
--- a/public/language/en_US/topic.json
+++ b/public/language/en_US/topic.json
@@ -32,6 +32,7 @@
    "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
    "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
    "not_following_topic.message": "You will no longer receive notifications from this topic.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
    "markAsUnreadForAll.success": "Topic marked as unread for all.",
    "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
    "watch.title": "Be notified of new replies in this topic",
    "unwatch.title": "Stop watching this topic",
    "share_this_post": "Share this Post",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
    "thread_tools.title": "Topic Tools",
    "thread_tools.markAsUnreadForAll": "Mark Unread",
    "thread_tools.pin": "Pin Topic",
--- a/public/language/es/category.json
+++ b/public/language/es/category.json
@@ -2,14 +2,14 @@
    "category": "Categoría",
    "subcategories": "Subcategorías",
    "new_topic_button": "Nuevo tema",
-    "guest-login-post": "Acceder para poder escribir un mensaje",
+    "guest-login-post": "Accede para poder escribir un mensaje",
    "no_topics": "<strong>No hay temas en esta categoría.</strong><br />¿Por qué no te animas y publicas uno?",
    "browsing": "viendo ahora",
    "no_replies": "Nadie ha respondido aún",
    "no_new_posts": "No hay mensajes nuevos.",
    "share_this_category": "Compartir esta categoría",
-    "watch": "Seguir",
-    "ignore": "Ignorar",
+    "watch": "Siguiendo",
+    "ignore": "Ignorando",
    "watch.message": "Ahora estás viendo actualizaciones de esta categoría",
    "ignore.message": "Ahora estás ignorando las actualizaciones de esta categoría",
    "watched-categories": "Categorías seguidas"
--- a/public/language/es/error.json
+++ b/public/language/es/error.json
@@ -14,6 +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",
+    "csrf-invalid": "El acceso ha fallado porque tu sesión ha expirado. Por favor prueba otra vez.",
    "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",
@@ -39,6 +40,12 @@
    "category-disabled": "Categoría deshabilitada",
    "topic-locked": "Tema bloqueado",
    "post-edit-duration-expired": "Sólo puedes editar mensajes durante %1 segundo(s) después de haberlo escrito",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
    "content-too-short": "Por favor introduzca una publicación más larga. Las publicaciones deben contener al menos %1 caractere(s).",
    "content-too-long": "Por favor introduzca un mensaje más corto. Los mensajes no pueden exceder los %1 caractere(s).",
    "title-too-short": "Por favor introduzca un título más largo. Los títulos deben contener al menos %1 caractere(s).",
@@ -56,6 +63,7 @@
    "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.",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
    "invalid-image-type": "Tipo de imagen inválido. Los tipos permitidos son: %1",
    "invalid-image-extension": "Extensión de imagen inválida",
    "invalid-file-type": "Tipo de fichero inválido. Los tipos permitidos son: %1",
--- a/public/language/es/global.json
+++ b/public/language/es/global.json
@@ -49,7 +49,7 @@
    "users": "Usuarios",
    "topics": "Temas",
    "posts": "Posts",
-    "best": "Mejor",
+    "best": "Mejor valorados",
    "upvoted": "Votado positivamente",
    "downvoted": "Votado negativamente",
    "views": "Visitas",
@@ -59,7 +59,7 @@
    "posted_ago_by_guest": "publicado %1 por Invitado",
    "posted_ago_by": "publicado %1 por %2",
    "posted_ago": "publicado %1",
-    "posted_in": "Publicado %1",
+    "posted_in": "publicado en %1",
    "posted_in_by": "publicado en %1 por %2",
    "posted_in_ago": "publicado en %1 %2",
    "posted_in_ago_by": "publicado en %1 %2 por %3",
--- a/public/language/es/pages.json
+++ b/public/language/es/pages.json
@@ -23,8 +23,8 @@
    "groups": "Grupos",
    "group": "Grupo de %1",
    "chats": "Chats",
-    "chat": "Chateando con %1",
-    "account/edit": "Editando \"%1\"",
+    "chat": "Chatear con %1",
+    "account/edit": "Editar \"%1\"",
    "account/edit/password": "Editar contraseña de \"%1\"",
    "account/edit/username": "Editar nombre de usuario de \"%1\"",
    "account/edit/email": "Editar email \"%1\"",
--- a/public/language/es/topic.json
+++ b/public/language/es/topic.json
@@ -32,6 +32,7 @@
    "deleted_message": "Este tema ha sido borrado. Solo los usuarios que tengan privilegios de administración de temas pueden verlo.",
    "following_topic.message": "Ahora recibiras notificaciones cuando alguien publique en este tema.",
    "not_following_topic.message": "No recibiras notificaciones de este tema.",
+    "ignoring_topic.message": "Ya no verás este tema en no leídos. Serás notificado si te mencionan o te votan.",
    "login_to_subscribe": "Por favor, conéctate para subscribirte a este tema.",
    "markAsUnreadForAll.success": "Publicación marcada como no leída para todos.",
    "mark_unread": "Marcar no leído",
@@ -41,6 +42,12 @@
    "watch.title": "Serás notificado cuando haya nuevas respuestas en este tema",
    "unwatch.title": "Dejar de seguir este tema",
    "share_this_post": "Compartir este post",
+    "watching": "Siguiendo",
+    "not-watching": "No siguiendo",
+    "ignoring": "Ignorando",
+    "watching.description": "Notificarme de nuevas respuestas.<br/>Mostrar tema en no leídos. ",
+    "not-watching.description": "No notificarme de nuevas respuestas.<br/>Mostrar tema en no leídos si sigo esa categoría. ",
+    "ignoring.description": "No notificarme de nuevas respuestas.<br/>No mostrar tema en no leídos. ",
    "thread_tools.title": "Herramientas",
    "thread_tools.markAsUnreadForAll": "Marcar no leído",
    "thread_tools.pin": "Adherir tema",
--- a/public/language/es/user.json
+++ b/public/language/es/user.json
@@ -2,13 +2,13 @@
    "banned": "Baneado",
    "offline": "Desconectado",
    "username": "Nombre de usuario",
-    "joindate": "Fecha de Registro",
+    "joindate": "Fecha de registro",
    "postcount": "Número De Publicaciones",
    "email": "Correo electrónico",
    "confirm_email": "Confirmar correo electrónico",
-    "ban_account": "Banear Cuenta",
+    "ban_account": "Banear cuenta",
    "ban_account_confirm": "Quieres confirmar el baneo de este usuario?",
-    "unban_account": "Desbanear Cuenta",
+    "unban_account": "Desbanear cuenta",
    "delete_account": "Eliminar cuenta",
    "delete_account_confirm": "¿Estás seguro de que quieres eliminar tu cuenta? <br /><strong>Esta acción es irreversible y no podrás recuperar ninguno de tus datos.</strong><br /><br />Introduce tu nombre de usuario para confirmar la eliminación de la cuenta.",
    "delete_this_account_confirm": "Esta seguro de eliminar este usuario? <br /><strong>Esta acción de irreversible y no podrás recuperar ningún dato</strong><br /><br />",
@@ -30,7 +30,7 @@
    "signature": "Firma",
    "birthday": "Cumpleaños",
    "chat": "Chat",
-    "chat_with": "Chateando con %1",
+    "chat_with": "Chatear con %1",
    "follow": "Seguir",
    "unfollow": "Dejar de seguir",
    "more": "Más",
@@ -90,20 +90,20 @@
    "notification_sounds": "Reproducir un sonido al recibir una notificación",
    "browsing": "Preferencias de navegación.",
    "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",
+    "enable_topic_searching": "Activar la búsqueda \"dentro del tema\"",
+    "topic_search_help": "Si está activada, la búsqueda 'dentro del tema' al usar el buscador de la barra de navegación automáticamente buscaras solo en el tema actual.",
    "delay_image_loading": "Retrasar la carga de imágenes",
    "image_load_delay_help": "Si se habilita, las imágenes no cargarán hasta que se vean en pantalla",
    "scroll_to_my_post": "Luego de enviar una respuesta, mostrar el nuevo mensaje",
    "follow_topics_you_reply_to": "Seguir los temas en los que respondes",
    "follow_topics_you_create": "Seguir publicaciones que creas",
-    "grouptitle": "Título del Grupo",
+    "grouptitle": "Título del grupo",
    "no-group-title": "Sin título de grupo",
    "select-skin": "Seleccionar una plantilla",
-    "select-homepage": "Seleccione una Página de inicio",
+    "select-homepage": "Seleccione una página de inicio",
    "homepage": "Página de inicio",
    "homepage_description": "Seleccione una página para su uso habitual como la página principal del foro o 'Ninguno' para utilizar la página de inicio.",
-    "custom_route": "Modificar página de ruta",
+    "custom_route": "Pagina de inicio personalizada",
    "custom_route_help": "Introduzca un nombre de ruta aquí, sin ninguna barra anterior (por ejemplo, \"reciente\", o \"popular\")",
    "sso.title": "Servicios de Inicio de sesión Único",
    "sso.associated": "Asociado con",
--- a/public/language/et/email.json
+++ b/public/language/et/email.json
@@ -24,7 +24,7 @@
    "digest.day": "päev",
    "digest.week": "nädal",
    "digest.month": "kuu",
-    "digest.subject": "Digest for %1",
+    "digest.subject": "Ima 1% jaoks",
    "notif.chat.subject": "Sulle on saabunud uus sõnum kasutajalt %1",
    "notif.chat.cta": "Vajuta siia, et jätkata vestlusega",
    "notif.chat.unsub.info": "See chat teavitus on saadetud teile tellimuse seadistuse tõttu.",
--- a/public/language/et/error.json
+++ b/public/language/et/error.json
@@ -14,6 +14,7 @@
    "invalid-password": "Vigane parool",
    "invalid-username-or-password": "Palun täpsusta kasutajanime ja parooli",
    "invalid-search-term": "Vigane otsingusõna",
+    "csrf-invalid": "Me ei saanud Sind sisse logida, võimalik, et tänu aegunud sessioonile, palun proovi uuesti",
    "invalid-pagination-value": "Väär lehekülje numeratsioon, peab olema vähemalt %1 ja kõige rohkem %2",
    "username-taken": "Kasutajanimi on juba võetud",
    "email-taken": "Email on võetud",
@@ -22,13 +23,13 @@
    "no-email-to-confirm": "See foorum nõuab emaili kinnitust, palun vajuta siia, et sisestada email",
    "email-confirm-failed": "Meil ei õnnestunud sinu emaili kinnitada, proovi hiljem uuesti.",
    "confirm-email-already-sent": "Kinnituskiri on juba saadetud, palun oota %1 minut(it) uue kirja saatmiseks.",
-    "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
+    "sendmail-not-found": "Sendmail'i käivitatavat ei leitud, palun tee kindlaks, et see on installeeritud ja on käivitatav kasutaja poolt, kes käitab NodeBB't.",
    "username-too-short": "Kasutajanimi on liiga lühike",
    "username-too-long": "Kasutajanimi on liiga pikk",
    "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.",
+    "blacklisted-ip": "Vabandust! Sinu IP-aadress on siin kogukonnas keelatud. Kui arvad, et see on eksitus, palun leia kontakti administraatoriga.",
    "no-category": "Kategooriat ei eksisteeri",
    "no-topic": "Teemat ei eksisteeri",
    "no-post": "Postitust ei eksisteeri",
@@ -39,6 +40,12 @@
    "category-disabled": "Kategooria keelatud",
    "topic-locked": "Teema lukustatud",
    "post-edit-duration-expired": "Te peate ootama %1 sekund(it), enne kui oma postitust muudate.",
+    "post-edit-duration-expired-minutes": "Teil on lubatud muuta oma postitusi vaid %1 minuti jooksul peale postitamist",
+    "post-edit-duration-expired-minutes-seconds": "Teil on lubatud muuta oma postitusi vaid %1 minuti %2 sekundi jooksul peale postitamist",
+    "post-edit-duration-expired-hours": "Teil on lubatud muuta oma postitusi vaid %1 tunni jooksul peale postitamist",
+    "post-edit-duration-expired-hours-minutes": "Teil on lubatud muuta oma postitusi vaid %1 tunni %2 minuti jooksul peale postitamist",
+    "post-edit-duration-expired-days": "Teil on lubatud muuta oma postitusi vaid %1 päeva jooksul peale postitamist",
+    "post-edit-duration-expired-days-hours": "Teil on lubatud muuta oma postitusi vaid %1 päeva %2 tunni jooksul peale postitamist",
    "content-too-short": "Palun tehke pikem postitus. Postituse pikkus peab olema vähemalt %1 tähemärk(i).",
    "content-too-long": "Palun tehke lühem postitus. Postituse pikkus peab olema vähem kui %1 tähemärk(i).",
    "title-too-short": "Palun sisesta pikem pealkiri. Pealkirjad ei saa olla lühemad kui %1 tähemärk(i).",
@@ -52,10 +59,11 @@
    "still-uploading": "Palun oota, kuni üleslaadimised on laetud.",
    "file-too-big": "Maksimaalne üleslaetava faili suurus on %1 kB - valige väiksema mahuga fail.",
    "guest-upload-disabled": "Külaliste üleslaadimine on keelatud.",
-    "already-favourited": "You have already bookmarked this post",
-    "already-unfavourited": "You have already unbookmarked this post",
+    "already-favourited": "Sa oled juba selle postituse järjehoidjatesse pannud.",
+    "already-unfavourited": "Sa oled juba selle postituse järjehoidjatest ära võtnud.",
    "cant-ban-other-admins": "Sa ei saa bannida teisi administraatoreid!",
    "cant-remove-last-admin": "Te olete ainus administraator. Lisage keegi teine administraatoriks, enne kui eemaldate endalt administraatori.",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
    "invalid-image-type": "Vigane pildi formaat. Lubatud formaadid on: %1",
    "invalid-image-extension": "Vigane pildi formaat",
    "invalid-file-type": "Vigane faili formaat. Lubatud formaadid on: %1",
@@ -86,7 +94,7 @@
    "cant-edit-chat-message": "Sul ei ole lubatud antud sõnumit muuta",
    "cant-remove-last-user": "Sa ei saa viimast kasutajat eemaldada",
    "cant-delete-chat-message": "Sul ei ole lubatud antud sõnumit kustutada",
-    "already-voting-for-this-post": "You have already voted for this post.",
+    "already-voting-for-this-post": "Sa oled juba hääletanud sellel postitusel.",
    "reputation-system-disabled": "Reputatsiooni süsteem ei ole aktiveeritud",
    "downvoting-disabled": "Negatiivsete häälte andmine ei ole võimaldatud",
    "not-enough-reputation-to-downvote": "Sul ei ole piisavalt reputatsiooni, et anda negatiivset hinnangut sellele postitusele.",
@@ -100,6 +108,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",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "no-users-in-room": "Ühtegi kasutajat ei leidu siit ruumist",
+    "cant-kick-self": "Sa ei saa ennast ära visata gruppist"
 }
--- a/public/language/et/global.json
+++ b/public/language/et/global.json
@@ -87,8 +87,8 @@
    "map": "Kaart",
    "sessions": "Logitud Sessioonid",
    "ip_address": "IP Aadress",
-    "enter_page_number": "Enter page number",
-    "upload_file": "Upload file",
-    "upload": "Upload",
-    "allowed-file-types": "Allowed file types are %1"
+    "enter_page_number": "Sisesta lehekülje number",
+    "upload_file": "Lae fail üles",
+    "upload": "Lae üles",
+    "allowed-file-types": "Lubatud faili formaadid on %1"
 }
--- a/public/language/et/groups.json
+++ b/public/language/et/groups.json
@@ -41,7 +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",
+    "details.private_system_help": "Privaatset gruppid on keelatud sellel süsteemi tasemel, see sätte ei tee midagi",
    "event.updated": "Grupi lisainformatsiooni on uuendatud",
    "event.deleted": "Grupp \"%1\" on kustutatud",
    "membership.accept-invitation": "Võta kutse vastu",
@@ -50,5 +50,5 @@
    "membership.leave-group": "Lahku grupist",
    "membership.reject": "Lükka tagasi",
    "new-group.group_name": "Grupi nimi:",
-    "upload-group-cover": "Upload group cover"
+    "upload-group-cover": "Lae gruppi pilt üles"
 }
--- a/public/language/et/login.json
+++ b/public/language/et/login.json
@@ -5,7 +5,7 @@
    "remember_me": "Mäleta mind?",
    "forgot_password": "Unustasid parooli?",
    "alternative_logins": "Alternatiivsed sisse logimise võimalused",
-    "failed_login_attempt": "Login Unsuccessful",
+    "failed_login_attempt": "Sisselogimine ebaõnnestus",
    "login_successful": "Edukalt sisse logitud!",
    "dont_have_account": "Pole veel kasutajat?"
 }
--- a/public/language/et/modules.json
+++ b/public/language/et/modules.json
@@ -6,7 +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.mark_all_read": "Märgi kõik jutud loetuks",
    "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",
@@ -29,14 +29,14 @@
    "composer.submit_and_lock": "Kinnita ja Lukusta",
    "composer.toggle_dropdown": "Aktiveeri rippmenüü",
    "composer.uploading": "%1 Üleslaadimine",
-    "composer.formatting.bold": "Bold",
-    "composer.formatting.italic": "Italic",
-    "composer.formatting.list": "List",
-    "composer.formatting.strikethrough": "Strikethrough",
+    "composer.formatting.bold": "Paksult",
+    "composer.formatting.italic": "Kaldkiri",
+    "composer.formatting.list": "Nimekiri",
+    "composer.formatting.strikethrough": "Läbitõmmatud",
    "composer.formatting.link": "Link",
-    "composer.formatting.picture": "Picture",
-    "composer.upload-picture": "Upload Image",
-    "composer.upload-file": "Upload File",
+    "composer.formatting.picture": "Pilt",
+    "composer.upload-picture": "Lae pilt üles",
+    "composer.upload-file": "Lae fail üles",
    "bootbox.ok": "Olgu",
    "bootbox.cancel": "Katkesta",
    "bootbox.confirm": "Kinnita",
--- a/public/language/et/notifications.json
+++ b/public/language/et/notifications.json
@@ -16,9 +16,9 @@
    "upvoted_your_post_in_multiple": "<strong>%1</strong> ja %2 teist on kiitnud sinu postituse heaks: <strong>%3</strong>.",
    "moved_your_post": "<strong>%1</strong> liigutas sinu postituse <strong>%2 'sse</strong>",
    "moved_your_topic": "<strong>%1</strong> liigutas <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> pani Sinu postituse <strong>%2</strong> järjehoidjatesse.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> ja <strong>%2</strong> panid Sinu postituse <strong>%3</strong> enda järjehoidjatesse.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> ja %2 teist on Sinu postitust <strong>%3</strong> järjehoidjasse lisanud.",
    "user_flagged_post_in": "<strong>%1</strong> raporteeris postitust <strong>%2</strong>",
    "user_flagged_post_in_dual": "<strong>%1</strong> ja <strong>%2</strong> märgistasid postituse: <strong>%3</strong>",
    "user_flagged_post_in_multiple": "<strong>%1</strong> ja %2 teist märgistasid postituse: <strong>%3</strong>",
@@ -30,7 +30,7 @@
    "user_started_following_you_dual": "<strong>%1</strong> ja <strong>%2</strong> hakkasid sind jälgima.",
    "user_started_following_you_multiple": "<strong>%1</strong> ja %2 hakkasid sind jälgima.",
    "new_register": "<strong>%1</strong> saatis registreerimistaotluse.",
-    "new_register_multiple": "There are <strong>%1</strong> registration requests awaiting review.",
+    "new_register_multiple": "<strong>%1</strong> registreerimistaotlust ootavad ülevaadet.",
    "email-confirmed": "Emaili aadress kinnitatud",
    "email-confirmed-message": "Täname, et kinnitasite oma emaili aadressi. Teie kasutaja on nüüd täielikult aktiveeritud.",
    "email-confirm-error-message": "Emaili aadressi kinnitamisel tekkis viga. Võibolla kinnituskood oli vale või aegunud.",
--- a/public/language/et/pages.json
+++ b/public/language/et/pages.json
@@ -33,13 +33,13 @@
    "account/posts": "Postitused, mis on tehtud kasutaja %1 poolt",
    "account/topics": "Teemad on kirjutanud %1",
    "account/groups": "Kasutaja %1 grupid",
-    "account/favourites": "%1's Bookmarked Posts",
+    "account/favourites": "%1 järjehoidjad",
    "account/settings": "Kasutaja sätted",
    "account/watched": "Teemasid jälgib %1 kasutajat",
    "account/upvoted": "Postitused %1 poolt heaks kiidetud",
    "account/downvoted": "Postitused %1 poolt vastu hääletatud",
    "account/best": "Parimad postitused %1 poolt",
-    "confirm": "Email Confirmed",
+    "confirm": "Emaili aadress kinnitatud",
    "maintenance.text": "%1 foorumil on käimas hooldustööd. Palun külastage meid mõne aja pärast uuesti.",
    "maintenance.messageIntro": "Administraator on jätnud ka omaltpoolt sõnumi:",
    "throttled.text": "%1 ei ole hetkel kättesaadav liigse koormuse tõttu. Palun tulge tagasi mõni teine kord."
--- a/public/language/et/topic.json
+++ b/public/language/et/topic.json
@@ -26,12 +26,13 @@
    "tools": "Tööriistad",
    "flag": "Märgista",
    "locked": "Lukustatud",
-    "bookmark_instructions": "Click here to return to the last read post in this thread.",
+    "bookmark_instructions": "Vajuta siia, et tagasi minna viimati loetud postituse juurde siin teemas.",
    "flag_title": "Märgista see postitus modereerimiseks",
    "flag_success": "See postitus on nüüd märgistatud modereerimiseks.",
    "deleted_message": "See teema on kustutatud. Ainult kasutajad kellel on piisavalt õigusi saavad seda näha.",
    "following_topic.message": "Sulle ei edastata enam teateid uutest postitustest kui keegi postitab siia teemasse.",
    "not_following_topic.message": "Sulle ei edastata enam teateid uutest postitustest siin teemas.",
+    "ignoring_topic.message": "Sa ei näe seda teemat enam lugemata teemade nimekirjas. Sind teavitatakse, kui Sind mainitakse või Sinu postitust kiidetakse heaks.",
    "login_to_subscribe": "Palun registreeru kasutajaks või logi sisse, et tellida teateid selle postituse kohta.",
    "markAsUnreadForAll.success": "Teema märgitud mitte-loetuks kõikidele.",
    "mark_unread": "Märgi lugematuks",
@@ -41,6 +42,12 @@
    "watch.title": "Saa teateid uutest postitustest siin teemas",
    "unwatch.title": "Ära järgi enam seda teemat",
    "share_this_post": "Jaga seda postitust",
+    "watching": "Vaatan",
+    "not-watching": "Ei vaata",
+    "ignoring": "Ignoreerin",
+    "watching.description": "Teavita mind uutest vastustest.<br/>Näita teemat lugemata teemade hulgas.",
+    "not-watching.description": "Ära teavita mind uutest vastustest.<br/>Näita teemat lugemata teemade hulgas, kui kategooria on ignoreeritud.",
+    "ignoring.description": "Ära teavita mind uutest vastustest.<br/>Ära näita teemat lugemata teemade hulgas.",
    "thread_tools.title": "Teema tööriistad",
    "thread_tools.markAsUnreadForAll": "Märgi mitte-loetuks",
    "thread_tools.pin": "Tõsta esile teema",
@@ -65,9 +72,9 @@
    "disabled_categories_note": "Kinnised kategooriad on hallid",
    "confirm_move": "Liiguta",
    "confirm_fork": "Fork",
-    "favourite": "Bookmark",
-    "favourites": "Bookmarks",
-    "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
+    "favourite": "Järjehoidja",
+    "favourites": "Järjehoidjad",
+    "favourites.has_no_favourites": "Sa ei ole ühtegi postitust pannud järjehoidjatesse veel.",
    "loading_more_posts": "Laen postitusi",
    "move_topic": "Liiguta teemat",
    "move_topics": "Liiguta teemasi",
--- a/public/language/et/unread.json
+++ b/public/language/et/unread.json
@@ -7,7 +7,7 @@
    "all": "Kõik",
    "all_categories": "Kõik kategooriad",
    "topics_marked_as_read.success": "Teemad märgitud loetuks!",
-    "all-topics": "All Topics",
-    "new-topics": "New Topics",
-    "watched-topics": "Watched Topics"
+    "all-topics": "Kõik teemad",
+    "new-topics": "Uued teemad",
+    "watched-topics": "Vaadatud teemad"
 }
--- a/public/language/et/uploads.json
+++ b/public/language/et/uploads.json
@@ -1,6 +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"
+    "uploading-file": "Laen faili üles...",
+    "select-file-to-upload": "Vali fail mida üles laadida!",
+    "upload-success": "Fail üles laetud edukalt!",
+    "maximum-file-size": "Maksimaalselt %1 kb"
 }
--- a/public/language/et/user.json
+++ b/public/language/et/user.json
@@ -22,7 +22,7 @@
    "profile": "Profiil",
    "profile_views": "Vaatamisi",
    "reputation": "Reputatsioon",
-    "favourites": "Bookmarks",
+    "favourites": "Järjehoidjad",
    "watched": "Vaadatud",
    "followers": "Jälgijad",
    "following": "Jälgimised",
@@ -39,7 +39,7 @@
    "change_username": "Vaheta kasutajanime",
    "change_email": "Vaheta emaili",
    "edit": "Muuda",
-    "edit-profile": "Edit Profile",
+    "edit-profile": "Redigeeri profiili",
    "default_picture": "Algne ikoon",
    "uploaded_picture": "Üleslaetud pilt",
    "upload_new_picture": "Laadi uus pilt",
@@ -56,11 +56,11 @@
    "password": "Parool",
    "username_taken_workaround": "Kasutajanimi mida soovisid, ei olnud saadaval, seeg muutsime seda natukene. Sinu uus kasutajanimi on nüüd: <strong>%1</strong>",
    "password_same_as_username": "Su parool kattub su kasutajanimega, palun vali mõni muu parool.",
-    "password_same_as_email": "Your password is the same as your email, please select another password.",
+    "password_same_as_email": "Su parool kattub su e-mailiga, palun vali mõni muu parool.",
    "upload_picture": "Laadi pilt",
    "upload_a_picture": "Lae pilt üles",
    "remove_uploaded_picture": "Eemalda üleslaetud pilt",
-    "upload_cover_picture": "Upload cover picture",
+    "upload_cover_picture": "Lae üles katte pilt",
    "settings": "Seaded",
    "show_email": "Näita minu emaili",
    "show_fullname": "Näita minu täisnime",
@@ -92,12 +92,12 @@
    "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.",
-    "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",
+    "delay_image_loading": "Viivita pildi laadimisega",
+    "image_load_delay_help": "Kui lubatud, pildid teemades ei lae kuni nad on nähtavuses",
+    "scroll_to_my_post": "Pärast vastuse postitamist, näita uut postitust",
    "follow_topics_you_reply_to": "Järgi teemasid, millele olete vastanud.",
    "follow_topics_you_create": "Järgi teemasi, mis on teie loodud.",
-    "grouptitle": "Group Title",
+    "grouptitle": "Grupi tiitel",
    "no-group-title": "Grupi tiitel puudub",
    "select-skin": "Vali välimus",
    "select-homepage": "Vali avaleht",
--- a/public/language/fa_IR/email.json
+++ b/public/language/fa_IR/email.json
@@ -24,7 +24,7 @@
    "digest.day": "روز",
    "digest.week": "هفته",
    "digest.month": "ماه",
-    "digest.subject": "Digest for %1",
+    "digest.subject": "خلاصه برای %1",
    "notif.chat.subject": "پیام چتی جدیدی از %1 دریافت شد",
    "notif.chat.cta": "برای ادامه‌ی چت اینجا کلیک کنید",
    "notif.chat.unsub.info": "این اطلاعیه ی چتیی که برای شما فرستاده شده به علت تنظیمات اشترک شماست.",
--- a/public/language/fa_IR/error.json
+++ b/public/language/fa_IR/error.json
@@ -14,6 +14,7 @@
    "invalid-password": "کلمه عبور نامعتبر است.",
    "invalid-username-or-password": "لطفا هم نام کاربری و هم کلمه عبور را مشخص کنید",
    "invalid-search-term": "کلمه جستجو نامعتبر است",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
    "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
    "username-taken": "این نام کاربری گرفته شده است.",
    "email-taken": "این ایمیل گرفته شده است.",
@@ -39,6 +40,12 @@
    "category-disabled": "دسته غیر‌فعال شد.",
    "topic-locked": "موضوع بسته شد.",
    "post-edit-duration-expired": "شما تنها می توانید %1 ثانیه پس از فرستادن پست آن‌را ویرایش کنید",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
    "content-too-short": "خواهشمندیم پست بلندتری بنویسید. پست‌ها دست‌کم باید %1 کاراکتر داشته باشند.",
    "content-too-long": "لطفا طول مطلب را کوتاه تر کنید. طول پست نمیتواند بیشتر از %1 کاراکتر باشد.",
    "title-too-short": "لطفا یک عنوان بلندتر وارد کنید. عنوان باید حداقل %1 کاراکتر داشته باشد.",
@@ -51,11 +58,12 @@
    "too-many-tags": "تعداد برچسب ها بیشتر  از حد مجاز است. موضوع ها نمی توانند بیشتر از %1 برچسب داشته باشند",
    "still-uploading": "خواهشمندیم تا پایان بارگذاری‌ها شکیبا باشید.",
    "file-too-big": "حداکثر مجاز حجم فایل %1 کیلوبایت می باشد - لطفا فایلی با حجم کمتر بارگذاری کنید",
-    "guest-upload-disabled": "Guest uploading has been disabled",
-    "already-favourited": "You have already bookmarked this post",
-    "already-unfavourited": "You have already unbookmarked this post",
+    "guest-upload-disabled": "بارگذاری برای مهمانان غیر فعال شده است",
+    "already-favourited": "شما در حال حاضر این پست را به علاقمندی های خود اضافه کرده ایید",
+    "already-unfavourited": "شما در حال حاضر این پست را از لیست علاقمندی خود خارج کردید",
    "cant-ban-other-admins": "شما نمی‌توانید دیگر مدیران را محروم کنید!",
    "cant-remove-last-admin": "شما تنها مدیر می باشید . شما باید قبل از عزل خود از مدیریت یک کاربر دیگر را مدیر کنید",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
    "invalid-image-type": "نوع تصویر نامعتبر است. نوعهای قابل قبول اینها هستند: %1",
    "invalid-image-extension": "پسوند عکس نامعتبر است",
    "invalid-file-type": "نوع پرونده نامعتبر است. نوعهای قابل قبول اینها هستند: %1",
@@ -79,14 +87,14 @@
    "about-me-too-long": "با عرض پوزش محتوای 'درباره ی من' نمی تواند طولانی تر از %1 کاراکتر باشد",
    "cant-chat-with-yourself": "شما نمی‌توانید با خودتان چت کنید!",
    "chat-restricted": "این کاربر پیام های چتی خود را محدود کرده است . آنها بایدشما را دنبال کنند تا اینکه شما بتوانید به آنها پیامی بفرستید",
-    "chat-disabled": "Chat system disabled",
+    "chat-disabled": "سیستم گفتمان غیرفعال شده است",
    "too-many-messages": "شما پیامهای خیلی زیادی فرستاده اید، لطفا مدتی صبر نمایید",
    "invalid-chat-message": "پیام نامعتبر",
    "chat-message-too-long": "پیام طولانی تر از حد مجاز است",
    "cant-edit-chat-message": "شما اجازه ی ویرایش این پیام را ندارید",
    "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.",
+    "cant-delete-chat-message": "شما اجازه حذف این پیام را ندارید.",
+    "already-voting-for-this-post": "شما قبلا به این پست رای داده اید.",
    "reputation-system-disabled": "سیستم اعتبار غیر فعال شده است",
    "downvoting-disabled": "رأی منفی غیر فعال شده است",
    "not-enough-reputation-to-downvote": "شما اعتبار کافی برای دادن رأی منفی به این پست را ندارید.",
@@ -99,7 +107,7 @@
    "wrong-login-type-username": "لطفا از نام کاربری خود برای ورود استفاده کنید",
    "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",
+    "not-in-room": "هیچ کاربری در این گفتگو نیست",
    "no-users-in-room": "هیچ کاربری در این گفتگو نیست",
-    "cant-kick-self": "You can't kick yourself from the group"
+    "cant-kick-self": "شما نمی توانید خودتان را از گروه کیک کنید"
 }
--- a/public/language/fa_IR/global.json
+++ b/public/language/fa_IR/global.json
@@ -49,7 +49,7 @@
    "users": "کاربران",
    "topics": "موضوع ها",
    "posts": "دیدگاه‌ها",
-    "best": "Best",
+    "best": "بهترین",
    "upvoted": "Upvoted",
    "downvoted": "Downvoted",
    "views": "بازدیدها",
@@ -65,7 +65,7 @@
    "posted_in_ago_by": "ارسال شده در %1 %2 توسط %3",
    "user_posted_ago": "%1 در %2 ارسال کرده است",
    "guest_posted_ago": "مهمان در %1 ارسال کرده است",
-    "last_edited_by": "last edited by %1",
+    "last_edited_by": "آخرین ویرایش توسط %1 انجام شده",
    "norecentposts": "هیچ دیدگاه تازه‌ای نیست",
    "norecenttopics": "هیچ جستار تازه‌ای نیست",
    "recentposts": "دیدگاه‌های تازه",
@@ -85,10 +85,10 @@
    "unfollow": "دنبال نکن",
    "delete_all": "حذف همه",
    "map": "نقشه",
-    "sessions": "Login Sessions",
-    "ip_address": "IP Address",
-    "enter_page_number": "Enter page number",
-    "upload_file": "Upload file",
-    "upload": "Upload",
-    "allowed-file-types": "Allowed file types are %1"
+    "sessions": "Session های ورود",
+    "ip_address": "آدرس آی پی",
+    "enter_page_number": "شماره صفحه را وارد کنید",
+    "upload_file": "بارگذاری فایل",
+    "upload": "بارگذاری",
+    "allowed-file-types": "فایل قابل قبول اینها هستند %1"
 }
--- a/public/language/fa_IR/groups.json
+++ b/public/language/fa_IR/groups.json
@@ -41,7 +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",
+    "details.private_system_help": "گروه های خصوصی در این سطح سیستم غیر فعال هستند، این گزینه هیچ کاری انجام نمی دهد",
    "event.updated": "جزییات گروه با موفقیت به روز شد",
    "event.deleted": "گروه \"%1\" حدف شد",
    "membership.accept-invitation": "دعوت را قبول میکنم",
--- a/public/language/fa_IR/login.json
+++ b/public/language/fa_IR/login.json
@@ -5,7 +5,7 @@
    "remember_me": "مرا به یاد بسپار؟",
    "forgot_password": "گذرواژه را فراموش کرده‌اید؟",
    "alternative_logins": "روش‌های درون آمدن جایگزین",
-    "failed_login_attempt": "Login Unsuccessful",
+    "failed_login_attempt": "ورود ناموفق",
    "login_successful": "شما با موفقیت به درون آمده‌اید!",
    "dont_have_account": "حساب کاربری ندارید؟"
 }
--- a/public/language/fa_IR/modules.json
+++ b/public/language/fa_IR/modules.json
@@ -6,7 +6,7 @@
    "chat.user_typing": "%1 در حال نوشتن است...",
    "chat.user_has_messaged_you": "%1 به شما پیام داده است.",
    "chat.see_all": "دیدن همه ی چت ها",
-    "chat.mark_all_read": "Mark all chats read",
+    "chat.mark_all_read": "علامت گذاری شده به عنوان تمام چت ها را خوانده",
    "chat.no-messages": "مشخص کنید تاریخچه چتهایتان با چه کاربری را می‌خواهید ببینید",
    "chat.no-users-in-room": "هیچ کاربری در این گفتگو نیست",
    "chat.recent-chats": "چتهای اخیر",
@@ -18,8 +18,8 @@
    "chat.thirty_days": "30 روز",
    "chat.three_months": "3 ماه",
    "chat.delete_message_confirm": "آیا مطمئن هستید که می خواهید این پیام را حذف کنید؟",
-    "chat.roomname": "Chat Room %1",
-    "chat.add-users-to-room": "Add users to room",
+    "chat.roomname": "اتاق گفتگو %1",
+    "chat.add-users-to-room": "اضافه کردن کاربر به این گفتگو",
    "composer.compose": "ارسال",
    "composer.show_preview": "نمایش پیش‌نمایش",
    "composer.hide_preview": "مخفی کردن پیش‌نمایش",
@@ -29,14 +29,14 @@
    "composer.submit_and_lock": "ارسال و قفل",
    "composer.toggle_dropdown": "باز و بسته کردن کرکره",
    "composer.uploading": "در حال بارگذاری %1",
-    "composer.formatting.bold": "Bold",
-    "composer.formatting.italic": "Italic",
-    "composer.formatting.list": "List",
-    "composer.formatting.strikethrough": "Strikethrough",
-    "composer.formatting.link": "Link",
-    "composer.formatting.picture": "Picture",
-    "composer.upload-picture": "Upload Image",
-    "composer.upload-file": "Upload File",
+    "composer.formatting.bold": "توپر",
+    "composer.formatting.italic": "کج",
+    "composer.formatting.list": "فهرست",
+    "composer.formatting.strikethrough": "خط خورده",
+    "composer.formatting.link": "پیوند",
+    "composer.formatting.picture": "عکس",
+    "composer.upload-picture": "بارگذاری عکس",
+    "composer.upload-file": "بارگذاری فایل",
    "bootbox.ok": "باشه",
    "bootbox.cancel": "لغو",
    "bootbox.confirm": "تایید",
--- a/public/language/fa_IR/notifications.json
+++ b/public/language/fa_IR/notifications.json
@@ -5,7 +5,7 @@
    "mark_all_read": "همه اطلاعیه ها را خوانده شده علامت بزن",
    "back_to_home": "بازگشت به %1",
    "outgoing_link": "پیوند برون‌رو",
-    "outgoing_link_message": "You are now leaving %1",
+    "outgoing_link_message": "شما در حال ترک %1 هستید",
    "continue_to": "ادامه به %1",
    "return_to": "بازگشت به %1",
    "new_notification": "آکاه‌سازی تازه",
--- a/public/language/fa_IR/pages.json
+++ b/public/language/fa_IR/pages.json
@@ -11,7 +11,7 @@
    "users/latest": "آخرین کاربران",
    "users/sort-posts": "کاربران با بیش‌ترین پست",
    "users/sort-reputation": "کاربران دارای بیشترین اعتبار",
-    "users/banned": "Banned Users",
+    "users/banned": "کاربران اخراج شده",
    "users/search": "جستجوی کاربر",
    "notifications": "آگاه‌سازی‌ها",
    "tags": "برچسب‌ها",
@@ -39,7 +39,7 @@
    "account/upvoted": "Posts upvoted by %1",
    "account/downvoted": "Posts downvoted by %1",
    "account/best": "Best posts made by %1",
-    "confirm": "Email Confirmed",
+    "confirm": "ایمیل تایید شد",
    "maintenance.text": "%1 در حال حاضر تحت تعمیر و نگهدارییست. لطفا زمان دیگری مراجعه کنید.",
    "maintenance.messageIntro": "علاوه بر این، مدیر این پیام را گذاشته است:",
    "throttled.text": "%1 به دلیل بارگذاری بیش از حد ، قابل دسترس نمی باشد. لطفا در زمان دیگری دوباره امتحان کنید"
--- a/public/language/fa_IR/topic.json
+++ b/public/language/fa_IR/topic.json
@@ -13,7 +13,7 @@
    "notify_me": "از پاسخ‌های تازه در موضوع آگاه شوید",
    "quote": "نقل قول",
    "reply": "پاسخ",
-    "reply-as-topic": "Reply as topic",
+    "reply-as-topic": "پاسخ به موضوع",
    "guest-login-reply": "وارد شوید تا پست بفرستید",
    "edit": "ویرایش",
    "delete": "حذف",
@@ -32,6 +32,7 @@
    "deleted_message": "این موضوع پاک شده است. تنها کاربرانِ با حق مدیریت موضوع می‌توانند آن را ببینند.",
    "following_topic.message": "از این پس اگر کسی در این موضوع پست بگذارد، شما آگاه خواهید شد.",
    "not_following_topic.message": "شما دیگر اطلاعیه های این موضوع را دریافت نخواهید کرد.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
    "login_to_subscribe": "برای دنبال کردن این موضوع، لطفا ثبت نام کنید و یا با نام کاربری خود وارد شوید",
    "markAsUnreadForAll.success": "موضوع برای همگان نخوانده در نظر گرفته شد.",
    "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
    "watch.title": "از پاسخ‌های تازه به این موضوع آگاه شوید.",
    "unwatch.title": "توقف پیگیری این موضوع",
    "share_this_post": "به اشتراک‌گذاری این موضوع",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
    "thread_tools.title": "ابزارهای موضوع",
    "thread_tools.markAsUnreadForAll": "نخوانده بگیر",
    "thread_tools.pin": "سنجاق زدن موضوع",
@@ -51,7 +58,7 @@
    "thread_tools.move_all": "جابجایی همه",
    "thread_tools.fork": "شاخه ساختن از موضوع",
    "thread_tools.delete": "پاک کردن موضوع",
-    "thread_tools.delete-posts": "Delete Posts",
+    "thread_tools.delete-posts": "حذف پست ها",
    "thread_tools.delete_confirm": "آیا مطمئنید می خواهید این موضوع را حذف کنید؟",
    "thread_tools.restore": "برگرداندن موضوع",
    "thread_tools.restore_confirm": "آیا مطمئنید که می خواهید این موضوع را بازگردانی کنید؟",
@@ -66,7 +73,7 @@
    "confirm_move": "جابه‌جا کردن",
    "confirm_fork": "شاخه ساختن",
    "favourite": "Bookmark",
-    "favourites": "Bookmarks",
+    "favourites": "علاقمندی ها",
    "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
    "loading_more_posts": "بارگذاری پست‌های بیش‌تر",
    "move_topic": "جابه‌جایی موضوع",
@@ -105,7 +112,7 @@
    "stale.warning": "موضوعی که شما در حال پاسخگویی به آن هستید قدیمی می باشد. آیا میلید به جای آن یک موضوع جدید ایجاد کنید و در آن به این موضوع ارجاع دهید؟",
    "stale.create": "ایجاد یک موضوع جدید",
    "stale.reply_anyway": "در هر صورت می خواهم به این موضوع پاسخ دهم",
-    "link_back": "Re: [%1](%2)",
+    "link_back": "پاسخ: [%1](%2)",
    "spam": "اسپم",
    "offensive": "توهین آمیز",
    "custom-flag-reason": "وارد کردن دلیل پرچمگذاری"
--- a/public/language/fa_IR/unread.json
+++ b/public/language/fa_IR/unread.json
@@ -7,7 +7,7 @@
    "all": "همه",
    "all_categories": "تمام دسته ها",
    "topics_marked_as_read.success": "همه موضوع ها خوانده شدند",
-    "all-topics": "All Topics",
-    "new-topics": "New Topics",
-    "watched-topics": "Watched Topics"
+    "all-topics": "همه موضوع ها",
+    "new-topics": "موضوع های جدید",
+    "watched-topics": "موضوع های پیگیری شده"
 }
--- a/public/language/fa_IR/uploads.json
+++ b/public/language/fa_IR/uploads.json
@@ -1,6 +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"
+    "uploading-file": "در حال بارگذاری فایل...",
+    "select-file-to-upload": "فایل مورد نظر را برای بارگذاری انتخاب کنید!",
+    "upload-success": "فایل با موفقیت بارگذاری شد!",
+    "maximum-file-size": "حداکثر %1 کیلوبایت"
 }
--- a/public/language/fa_IR/user.json
+++ b/public/language/fa_IR/user.json
@@ -22,7 +22,7 @@
    "profile": "پروفایل",
    "profile_views": "بازدیدهای نمایه",
    "reputation": "اعتبار",
-    "favourites": "Bookmarks",
+    "favourites": "علاقمندی ها",
    "watched": "پیگیری شده",
    "followers": "دنبال‌کننده‌ها",
    "following": "دنبال‌شونده‌ها",
@@ -39,7 +39,7 @@
    "change_username": "تغییر نام کاربری",
    "change_email": "تغییر ایمیل",
    "edit": "ویرایش",
-    "edit-profile": "Edit Profile",
+    "edit-profile": "ویرایش پروفایل",
    "default_picture": "آیکون پیش فرض",
    "uploaded_picture": "تصویر بارشده",
    "upload_new_picture": "بارگذاری تصویر تازه",
@@ -56,11 +56,11 @@
    "password": "گذرواژه",
    "username_taken_workaround": "نام کاربری درخواستی شما در حال حاضر گرفته شده است، بنابراین ما آن را کمی تغییر داده‌ایم. شما هم‌اکنون با نام <strong>%1</strong  شناخته می‌شوید.",
    "password_same_as_username": "کلمه ی عبور شما با نام کاربری شما یکسان می باشند ، لطفا کلمه ی عبور دیگری را انتخاب کنید",
-    "password_same_as_email": "Your password is the same as your email, please select another password.",
+    "password_same_as_email": "کلمه ی عبور شما با ایمیل شما یکسان است، لطفا کلمه عبور دیگری را انتخاب کنید.",
    "upload_picture": "بارگذاری تصویر",
    "upload_a_picture": "یک تصویر بارگذاری کنید",
    "remove_uploaded_picture": "پاک کردن عکس بارگذاری شده",
-    "upload_cover_picture": "Upload cover picture",
+    "upload_cover_picture": "بارگذاری عکس کاور",
    "settings": "تنظیمات",
    "show_email": "نمایش ایمیل‌ام",
    "show_fullname": "نام کامل من را نشان بده",
@@ -79,9 +79,9 @@
    "has_no_posts": "این کاربر تا به حال هیچ چیزی ارسال نکرده است.",
    "has_no_topics": "این کاربر تا به حال هیچ موضوعی ارسال نکرده است",
    "has_no_watched_topics": "این کاربر تا به حال هیچ موضوعی را پیگیری نکرده است",
-    "has_no_upvoted_posts": "This user hasn't upvoted any posts yet.",
+    "has_no_upvoted_posts": "این کاربر به هیچ پستی امتیاز نداده است.",
    "has_no_downvoted_posts": "This user hasn't downvoted any posts yet.",
-    "has_no_voted_posts": "This user has no voted posts",
+    "has_no_voted_posts": "این کاربر به پست رای نداده است",
    "email_hidden": "ایمیل پنهان شده",
    "hidden": "پنهان",
    "paginate_description": "صفحه بندی و نمایش موضوع ها و پست‌ها  به جای نمایش بر اساس اسکرول موس",
@@ -92,12 +92,12 @@
    "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",
-    "delay_image_loading": "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",
+    "scroll_to_my_post": "پس از ارسال پست، اولین پست جدید نشان بده",
    "follow_topics_you_reply_to": "تاپیک هایی که پاسخ داده ای را دنبال کن",
    "follow_topics_you_create": "موضوع هایی که ایجاد کرده ای را دنبال کن",
-    "grouptitle": "Group Title",
+    "grouptitle": "عنوان گروه",
    "no-group-title": "عنوان گروهی نیست",
    "select-skin": "Select a Skin",
    "select-homepage": "Select a Homepage",
--- a/public/language/fi/error.json
+++ b/public/language/fi/error.json
@@ -14,6 +14,7 @@
    "invalid-password": "Virheellinen salasana",
    "invalid-username-or-password": "Ole hyvä ja anna sekä käyttäjänimi että salasana",
    "invalid-search-term": "Virheellinen hakutermi",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
    "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
    "username-taken": "Käyttäjänimi varattu",
    "email-taken": "Sähköpostiosoite varattu",
@@ -39,6 +40,12 @@
    "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",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
    "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(ä).",
@@ -56,6 +63,7 @@
    "already-unfavourited": "You have already unbookmarked this post",
    "cant-ban-other-admins": "Et voi estää muita ylläpitäjiä!",
    "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
    "invalid-image-type": "Invalid image type. Allowed types are: %1",
    "invalid-image-extension": "Invalid image extension",
    "invalid-file-type": "Invalid file type. Allowed types are: %1",
--- a/public/language/fi/topic.json
+++ b/public/language/fi/topic.json
@@ -32,6 +32,7 @@
    "deleted_message": "Tämä aihe on poistettu. Vain käyttäjät, joilla on aiheen hallintaoikeudet, voivat nähdä sen.",
    "following_topic.message": "Saat nyt ilmoituksen, kun joku kirjoittaa tähän aiheeseen.",
    "not_following_topic.message": "Et saa enää ilmoituksia tästä aiheesta.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
    "login_to_subscribe": "Ole hyvä ja rekisteröidy tai kirjaudu sisään tilataksesi tämän aiheen.",
    "markAsUnreadForAll.success": "Aihe merkitty lukemattomaksi kaikille.",
    "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
    "watch.title": "Ilmoita, kun tähän keskusteluun tulee uusia viestejä",
    "unwatch.title": "Lopeta tämän aiheen seuraaminen",
    "share_this_post": "Jaa tämä viesti",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
    "thread_tools.title": "Aiheen työkalut",
    "thread_tools.markAsUnreadForAll": "Merkitse lukemattomaksi",
    "thread_tools.pin": "Kiinnitä aihe",
--- a/public/language/fr/category.json
+++ b/public/language/fr/category.json
@@ -8,9 +8,9 @@
    "no_replies": "Personne n'a répondu",
    "no_new_posts": "Pas de nouveau message",
    "share_this_category": "Partager cette catégorie",
-    "watch": "Surveiller",
+    "watch": "S'abonner",
    "ignore": "Ne plus surveiller",
-    "watch.message": "Vous surveillez désormais les mises à jour de cette catégorie.",
+    "watch.message": "Vous êtes désormais abonné aux mises à jour de cette catégorie.",
    "ignore.message": "Vous ne surveillez plus les mises jour de cette catégorie.",
-    "watched-categories": "Catégories Suivies"
+    "watched-categories": "Abonnements"
 }
--- a/public/language/fr/email.json
+++ b/public/language/fr/email.json
@@ -24,7 +24,7 @@
    "digest.day": "jour",
    "digest.week": "semaine",
    "digest.month": "mois",
-    "digest.subject": "Compte-rendu pour %1",
+    "digest.subject": "Résumé de l'actualité de %1",
    "notif.chat.subject": "Nouveau message de chat reçu de %1",
    "notif.chat.cta": "Cliquez ici pour continuer la conversation",
    "notif.chat.unsub.info": "Cette notification de chat a été envoyé en raison de vos paramètres d'abonnement.",
--- a/public/language/fr/error.json
+++ b/public/language/fr/error.json
@@ -14,6 +14,7 @@
    "invalid-password": "Mot de passe invalide",
    "invalid-username-or-password": "Veuillez entrer un nom d'utilisateur et un mot de passe",
    "invalid-search-term": "Données de recherche invalides",
+    "csrf-invalid": "Nous ne pouvons pas vous connectez, possiblement car votre session a expiré. Merci de réessayer.",
    "invalid-pagination-value": "Valeur de pagination invalide. Celle-ci doit être comprise entre %1 et %2.",
    "username-taken": "Nom d’utilisateur déjà utilisé",
    "email-taken": "Email déjà utilisé",
@@ -39,6 +40,12 @@
    "category-disabled": "Catégorie désactivée",
    "topic-locked": "Sujet verrouillé",
    "post-edit-duration-expired": "Vous ne pouvez modifier un message que %1 seconde(s) après l'avoir posté.",
+    "post-edit-duration-expired-minutes": "Vous ne pouvez éditer un message que %1 minute(s) après l'avoir posté.",
+    "post-edit-duration-expired-minutes-seconds": "Vous ne pouvez éditer un message que %1 minute(s) et %2 seconde(s) après l'avoir posté.",
+    "post-edit-duration-expired-hours": "Vous ne pouvez éditer un message que %1 heure(s) après l'avoir posté.",
+    "post-edit-duration-expired-hours-minutes": "Vous ne pouvez éditer un message que %1 heure(s) et %2 minute(s) après l'avoir posté.",
+    "post-edit-duration-expired-days": "Vous ne pouvez éditer un message que %1 jours(s) après l'avoir posté.",
+    "post-edit-duration-expired-days-hours": "Vous ne pouvez éditer un message que %1 jours(s) et %2 heures(s) après l'avoir posté.",
    "content-too-short": "Veuillez entrer un message plus long. %1 caractère(s) minimum.",
    "content-too-long": "Veuillez poster un message plus cours. Les messages ne peuvent être plus long que %1 caractère(s).",
    "title-too-short": "Veuillez entrer un titre plus long. %1 caractère(s) minimum.",
@@ -56,6 +63,7 @@
    "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.",
+    "cant-delete-admin": "Veuillez retirer les droits d'administration de ce compte avant de tenter de le supprimer.",
    "invalid-image-type": "Type d'image invalide. Les types autorisés sont: %1",
    "invalid-image-extension": "Extension d'image invalide",
    "invalid-file-type": "Type de fichier non valide. Les types autorisés sont : %1",
@@ -78,7 +86,7 @@
    "signature-too-long": "La signature ne peut dépasser %1 caractère(s).",
    "about-me-too-long": "Votre texte \"à propos de moi\" ne peut dépasser %1 caractère(s).",
    "cant-chat-with-yourself": "Vous ne pouvez chatter avec vous même !",
-    "chat-restricted": "Cet utilisateur a restreint les ses messages de chat. Il doit d'abord vous suivre avant de pouvoir discuter avec lui.",
+    "chat-restricted": "Cet utilisateur a restreint les ses messages de chat. Il doit d'abord s'abonner à votre compte avant que vous puissiez discuter avec lui.",
    "chat-disabled": "Système de chat désactivé",
    "too-many-messages": "Vous avez envoyé trop de messages, veuillez patienter un instant.",
    "invalid-chat-message": "Message de Chat invalide",
--- a/public/language/fr/global.json
+++ b/public/language/fr/global.json
@@ -43,8 +43,8 @@
    "alert.error": "Erreur",
    "alert.banned": "Banni",
    "alert.banned.message": "Vous venez d'être banni, vous allez maintenant être déconnecté.",
-    "alert.unfollow": "Vous ne suivez désormais plus %1 !",
-    "alert.follow": "Vous suivez désormais %1 !",
+    "alert.unfollow": "Vous n'êtes plus abonné à %1 !",
+    "alert.follow": "Vous êtes désormais abonné à %1 !",
    "online": "En ligne",
    "users": "Utilisateurs",
    "topics": "Sujets",
@@ -81,8 +81,8 @@
    "updated.title": "Forum mis à jour",
    "updated.message": "Ce forum a été mis à jour à la dernière version. Cliquez ici pour recharger la page.",
    "privacy": "Vie privée",
-    "follow": "Suivre",
-    "unfollow": "Ne plus suivre",
+    "follow": "S'abonner",
+    "unfollow": "Se désabonner",
    "delete_all": "Tout supprimer",
    "map": "Carte",
    "sessions": "Sessions de connexion",
--- a/public/language/fr/notifications.json
+++ b/public/language/fr/notifications.json
@@ -27,8 +27,8 @@
    "user_posted_to_multiple": "<strong>%1</strong> et %2 autres ont posté une réponse à : <strong>%3</strong>",
    "user_posted_topic": "<strong>%1</strong> a posté un nouveau sujet: <strong>%2</strong>.",
    "user_started_following_you": "<strong>%1</strong> vous suit.",
-    "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.",
+    "user_started_following_you_dual": "<strong>%1</strong> et <strong>%2</strong> se sont abonnés à votre compte.",
+    "user_started_following_you_multiple": "<strong>%1</strong> et %2 autres se sont abonnés à votre compte.",
    "new_register": "<strong>%1</strong> a envoyé une demande d'incription.",
    "new_register_multiple": "<strong>%1</strong> inscription(s) est en attente de validation.",
    "email-confirmed": "Email vérifié",
--- a/public/language/fr/pages.json
+++ b/public/language/fr/pages.json
@@ -24,23 +24,23 @@
    "group": "%1 groupe",
    "chats": "Discussions",
    "chat": "Conversation avec %1",
-    "account/edit": "Edition de \"%1\"",
+    "account/edit": "Édition de \"%1\"",
    "account/edit/password": "Édition du mot de passe de \"%1\"",
    "account/edit/username": "Édition du nom d'utilisateur de \"%1\"",
    "account/edit/email": "Édition de l'e-mail de \"%1\"",
-    "account/following": "Les personnes que %1 suit",
-    "account/followers": "Les personnes qui suivent %1",
+    "account/following": "Les personnes auxquelles %1 est abonné",
+    "account/followers": "Les personnes abonnées à %1",
    "account/posts": "Messages postés par %1",
    "account/topics": "Sujets créés par %1",
    "account/groups": "Groupes auxquels appartient %1",
    "account/favourites": "Marques-pages de %1",
    "account/settings": "Paramètres d'utilisateur",
-    "account/watched": "Sujets surveillés par %1",
+    "account/watched": "Sujets auxquels %1 est abonné",
    "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 vérifié",
    "maintenance.text": "%1 est en maintenance. Veuillez revenir un peu plus tard.",
-    "maintenance.messageIntro": "De plus, l'administrateur a laissé ce message:",
+    "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."
 }
--- a/public/language/fr/search.json
+++ b/public/language/fr/search.json
@@ -7,7 +7,7 @@
    "titles-posts": "Titres et Messages",
    "posted-by": "Posté par",
    "in-categories": "Dans les catégories",
-    "search-child-categories": "Chercher les sous catégories",
+    "search-child-categories": "Rechercher également dans les sous catégories",
    "reply-count": "Nombre de réponses",
    "at-least": "Au moins",
    "at-most": "Au plus",
--- a/public/language/fr/topic.json
+++ b/public/language/fr/topic.json
@@ -32,15 +32,22 @@
    "deleted_message": "Ce sujet a été supprimé. Seuls les utilisateurs avec les droits d'administration peuvent le voir.",
    "following_topic.message": "Vous recevrez désormais des notifications lorsque quelqu'un postera dans ce sujet.",
    "not_following_topic.message": "Vous ne recevrez plus de notifications pour ce sujet.",
+    "ignoring_topic.message": "Vous ne verrez plus ce sujet dans la liste des sujets non lus. Vous serez notifié lorsque vous serez mentionné ou que quelqu'un votera pour votre message.",
    "login_to_subscribe": "Veuillez vous enregistrer ou vous connecter afin de vous abonner à ce sujet.",
    "markAsUnreadForAll.success": "Sujet marqué comme non lu pour tout le monde.",
    "mark_unread": "Marquer comme non-lu",
    "mark_unread.success": "Sujet marqué comme non lu.",
-    "watch": "Surveiller",
-    "unwatch": "Ne plus surveiller",
+    "watch": "S'abonner",
+    "unwatch": "Se désabonner",
    "watch.title": "Être notifié des nouvelles réponses dans ce sujet",
-    "unwatch.title": "Arrêter de surveiller ce sujet",
+    "unwatch.title": "Se désabonner de ce sujet",
    "share_this_post": "Partager ce message",
+    "watching": "Abonné",
+    "not-watching": "Non abonné",
+    "ignoring": "Ignoré",
+    "watching.description": "Me notifier les nouvelles réponses.<br/>Afficher le sujet dans l'onglet \"Non lu\".",
+    "not-watching.description": "Ne pas me notifier les nouvelles réponses.<br/>Afficher le sujet dans l'onglet \"Non lu\" si la catégorie n'est pas ignorée.",
+    "ignoring.description": "Ne pas me notifier les nouvelle réponses.<br/>Ne pas afficher ce sujet dans l'onglet \"Non lu\".",
    "thread_tools.title": "Outils pour sujets",
    "thread_tools.markAsUnreadForAll": "Marquer comme non lu",
    "thread_tools.pin": "Épingler le sujet",
--- a/public/language/fr/unread.json
+++ b/public/language/fr/unread.json
@@ -9,5 +9,5 @@
    "topics_marked_as_read.success": "Sujets marqués comme lus !",
    "all-topics": "Tous les sujets",
    "new-topics": "Nouveau sujet",
-    "watched-topics": "Sujets surveillés"
+    "watched-topics": "Abonnements"
 }
--- a/public/language/fr/user.json
+++ b/public/language/fr/user.json
@@ -23,7 +23,7 @@
    "profile_views": "Vues",
    "reputation": "Réputation",
    "favourites": "Marque-pages",
-    "watched": "Suivis",
+    "watched": "Abonnements",
    "followers": "Abonnés",
    "following": "Abonnements",
    "aboutme": "À propos de moi",
@@ -64,8 +64,8 @@
    "settings": "Paramètres",
    "show_email": "Afficher mon email",
    "show_fullname": "Afficher mon nom complet",
-    "restrict_chats": "Autoriser la réception de messages provenant uniquement des personnes que je suis",
-    "digest_label": "S’inscrire aux comptes-rendus",
+    "restrict_chats": "Autoriser la réception de messages ne provenant que des personnes auxquelles je suis abonné",
+    "digest_label": "S’inscrire aux résumés de l'actualité du forum",
    "digest_description": "S'abonner par email aux mises à jours de ce forum (nouvelles notifications et nouveaux sujets) selon le planning sélectionné.",
    "digest_off": "Désactivé",
    "digest_daily": "Quotidien",
@@ -74,11 +74,11 @@
    "send_chat_notifications": "Envoyer un e-mail si un nouveau message de chat arrive lorsque je ne suis pas en ligne",
    "send_post_notifications": "Envoyer un email lors de réponses envoyées aux sujets auxquels je suis abonné",
    "settings-require-reload": "Certains réglages nécessitent un rechargement. Cliquez ici pour recharger la page.",
-    "has_no_follower": "Cet utilisateur n'est suivi par personne :(",
-    "follows_no_one": "Cet utilisateur ne suit personne :(",
+    "has_no_follower": "Personne n'est abonné à cet utilisateur :(",
+    "follows_no_one": "Cet utilisateur n'est abonné à personne :(",
    "has_no_posts": "Cet utilisateur n'a encore rien posté.",
    "has_no_topics": "Cet utilisateur n'a encore créé aucun sujet.",
-    "has_no_watched_topics": "Cet utilisateur n'a encore consulté aucun sujet.",
+    "has_no_watched_topics": "Cet utilisateur ne s'est encore abonné à aucun sujet.",
    "has_no_upvoted_posts": "Cet utilisateur n'a voté pour aucun message",
    "has_no_downvoted_posts": "Cet utilisateur n'a voté contre aucun message",
    "has_no_voted_posts": "Personne n'a voté pour des messages de cet utilisateur",
@@ -93,10 +93,10 @@
    "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.",
    "delay_image_loading": "Délayer le chargement des images",
-    "image_load_delay_help": "Lorsque cette option est activée, les images des sujets ne seront pas chargées avant qu'elles soient visibles dans la fenêtre.",
+    "image_load_delay_help": "Lorsque cette option est activée, les images des sujets ne seront pas chargées avant qu'elles ne soient visibles dans la fenêtre.",
    "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",
+    "follow_topics_you_reply_to": "S'abonner aux sujets auxquels vous répondez",
+    "follow_topics_you_create": "S'abonner aux sujets que vous créez",
    "grouptitle": "Nom du groupe",
    "no-group-title": "Aucun titre de groupe",
    "select-skin": "Sélectionner un thème",
--- a/public/language/gl/error.json
+++ b/public/language/gl/error.json
@@ -14,6 +14,7 @@
    "invalid-password": "Contrasinal Inválido",
    "invalid-username-or-password": "Especifica ámbolos dous por favor, nome de usuario e contrasinal",
    "invalid-search-term": "Termo de búsqueda inválido",
+    "csrf-invalid": "Non fomos capaces de entrar, probablemente debido a que a sesión expirou. Por favor, téntao de novo",
    "invalid-pagination-value": "Valor de paxinación incorreto, ten que estar entre %1 e %2",
    "username-taken": "Nome de usuario en uso",
    "email-taken": "Correo en uso",
@@ -39,6 +40,12 @@
    "category-disabled": "Categoría deshabilitada",
    "topic-locked": "Tema Pechado",
    "post-edit-duration-expired": "Só podes editar as publicacións %1 segundo(s) despois de envialas. ",
+    "post-edit-duration-expired-minutes": "Só podes editar as publicacións %1 segundo(s) despois de envialas. ",
+    "post-edit-duration-expired-minutes-seconds": "Só podes editar as publicacións %1 minuto(s) %2 segundo(s) despois de envialas. ",
+    "post-edit-duration-expired-hours": "Só podes editar as publicacións %1 hora(s) despois de envialas. ",
+    "post-edit-duration-expired-hours-minutes": "Só podes editar as publicacións %1 hora(s) %2 segundo(s) despois de envialas. ",
+    "post-edit-duration-expired-days": "Só podes editar as publicacións %1 día(s) despois de envialas. ",
+    "post-edit-duration-expired-days-hours": "Só podes editar as publicacións %1 día(s) %2 hora(s) despois de envialas. ",
    "content-too-short": "Por favor, introduce unha publicación máis longa. Debe conter %1 carácter(es) como mínimo.",
    "content-too-long": "Por favor, introduce unha publicación máis curta. As publicacións non poden conter máis de %1 carácter(es).",
    "title-too-short": "Por favor, introduce un título máis longo. Os títulos deben conter %1 carácter(es) como mínimo.",
@@ -56,6 +63,7 @@
    "already-unfavourited": "Xa desgardaras esta publicación.",
    "cant-ban-other-admins": "Non podes botar outros administradores!",
    "cant-remove-last-admin": "Eres o único administrador. Engade outros administradores antes de quitarte a ti mesmo como administrador.",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
    "invalid-image-type": "Tipo de imaxe inválida. Tipos admitidos: %1",
    "invalid-image-extension": "Extensión de imaxe inválida",
    "invalid-file-type": "Tipo de arquivo inválido. Tipos admitidos: %1",
--- a/public/language/gl/topic.json
+++ b/public/language/gl/topic.json
@@ -32,6 +32,7 @@
    "deleted_message": "Este tema foi borrado. Só os usuarios con privilexios administrativos poden velo.",
    "following_topic.message": "Agora recibirás notificacións cando alguén publique neste tema.",
    "not_following_topic.message": "Non recibirás notificacións deste tema.",
+    "ignoring_topic.message": "Xa non verás este fío na lista de fíos non lidos. Serás notificado cando sexas mencionado ou a túa publicación sexa votada.",
    "login_to_subscribe": "Por favor, identifícate para subscribirte a este tema.",
    "markAsUnreadForAll.success": "Publicación marcada como non lida para todos.",
    "mark_unread": "Marcar coma non lido",
@@ -41,6 +42,12 @@
    "watch.title": "Serás notificado canto haxa novas respostas neste tema",
    "unwatch.title": "Deixar de vixiar este tema",
    "share_this_post": "Compartir esta publicación",
+    "watching": "Vendo",
+    "not-watching": "Non Vendo",
+    "ignoring": "Ignorar",
+    "watching.description": "Notificádeme das novas repostas. <br/>Amosa-lo fío nos non lidos.",
+    "not-watching.description": "Non me notifiquedes as novas respostas. <br/>Amosa-lo fío en non lidos se a categoría non está ignorada.",
+    "ignoring.description": "Non me notifiquedes as novas respostas. <br/>Non amosa-lo fío en non lidos.",
    "thread_tools.title": "Ferramentas do tema",
    "thread_tools.markAsUnreadForAll": "Marcar como non lido",
    "thread_tools.pin": "Fixar Tema",
--- a/public/language/he/error.json
+++ b/public/language/he/error.json
@@ -14,6 +14,7 @@
    "invalid-password": "סיסמא שגויה",
    "invalid-username-or-password": "אנא הגדר שם משתמש וסיסמה",
    "invalid-search-term": "מילת חיפוש לא תקינה",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
    "invalid-pagination-value": "ערך דף לא חוקי, חייב להיות לפחות %1 ולא מעל %2",
    "username-taken": "שם משתמש תפוס",
    "email-taken": "כתובת אימייל תפוסה",
@@ -39,6 +40,12 @@
    "category-disabled": "קטגוריה לא פעילה",
    "topic-locked": "נושא נעול",
    "post-edit-duration-expired": "אתה רשאי לערוך פוסטים רק ל-%1 שניות לאחר הפרסום",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
    "content-too-short": "אנא הכנס פוסט ארוך יותר. פוסטים חייבים להכיל לפחות %1 תווים.",
    "content-too-long": "אנא הכנס פוסט קצר יותר. פוסטים חייבים להיות קצרים יותר מ-%1 תווים.",
    "title-too-short": "אנא הכנס כותרת ארוכה יותר. כותרות חייבות להכיל לפחות %1 תווים.",
@@ -56,6 +63,7 @@
    "already-unfavourited": "כבר הסרת את הסימון מפוסט זה",
    "cant-ban-other-admins": "אינך יכול לחסום מנהלים אחרים!",
    "cant-remove-last-admin": "אתה המנהל היחיד. הוסף משתמש אחר לניהול לפני שאתה מוריד את עצמך מניהול",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
    "invalid-image-type": "פורמט תמונה לא תקין. הפורמטים המורשים הם: %1",
    "invalid-image-extension": "פורמט תמונה לא תקין",
    "invalid-file-type": "פורמט הקובץ לא תקין. הפורמטים המורשים הם: %1",
--- a/public/language/he/language.json
+++ b/public/language/he/language.json
@@ -1,5 +1,5 @@
 {
-    "name": "אנגלית (הממלכה המאוחדת/קנדה)",
+    "name": "עברית (ישראל)",
    "code": "he",
    "dir": "rtl"
 }
--- a/public/language/he/topic.json
+++ b/public/language/he/topic.json
@@ -32,6 +32,7 @@
    "deleted_message": "נושא זה נמחק. רק משתמשים עם ההרשאות המתאימות יכולים לצפות בו.",
    "following_topic.message": "מעתה, תקבל הודעות כאשר מישהו יעלה פוסט לנושא זה.",
    "not_following_topic.message": "לא תקבל הודעות נוספות בנושא זה.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
    "login_to_subscribe": "אנא הרשם או התחבר על-מנת לעקוב אחר נושא זה.",
    "markAsUnreadForAll.success": "נושא זה סומן כלא נקרא לכולם.",
    "mark_unread": "סמן כלא נקרא",
@@ -41,6 +42,12 @@
    "watch.title": "קבל התראה כאשר יש תגובות חדשות בנושא זה",
    "unwatch.title": "הפסק לעקוב אחר נושא זה",
    "share_this_post": "שתף פוסט זה",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
    "thread_tools.title": "כלי נושא",
    "thread_tools.markAsUnreadForAll": "סמן כלא נקרא",
    "thread_tools.pin": "נעץ נושא",
--- a/public/language/hu/error.json
+++ b/public/language/hu/error.json
@@ -14,6 +14,7 @@
    "invalid-password": "Érvénytelen jelszó",
    "invalid-username-or-password": "Kérlek adj meg egy felhasználónevet és egy jelszót",
    "invalid-search-term": "Érvénytelen keresési feltétel",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
    "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
    "username-taken": "Foglalt felhasználónév",
    "email-taken": "Foglalt e-mail",
@@ -39,6 +40,12 @@
    "category-disabled": "Kategória kikapcsolva",
    "topic-locked": "Téma lezárva",
    "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(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).",
@@ -56,6 +63,7 @@
    "already-unfavourited": "You have already unbookmarked this post",
    "cant-ban-other-admins": "Nem tilthatsz ki másik adminisztrátort!",
    "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
    "invalid-image-type": "Érvénytelen a kép típusa. Engedett kiterjesztések: %1",
    "invalid-image-extension": "Érvénytelen a kép kiterjesztése",
    "invalid-file-type": "Érvénytelen a fájl típusa. Engedélyezett kiterjesztések: %1",
--- a/public/language/hu/topic.json
+++ b/public/language/hu/topic.json
@@ -32,6 +32,7 @@
    "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
    "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
    "not_following_topic.message": "You will no longer receive notifications from this topic.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
    "markAsUnreadForAll.success": "Topic marked as unread for all.",
    "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
    "watch.title": "Be notified of new replies in this topic",
    "unwatch.title": "Stop watching this topic",
    "share_this_post": "Hozzászólás megosztása",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
    "thread_tools.title": "Topic Tools",
    "thread_tools.markAsUnreadForAll": "Olvasatlannak jelölés",
    "thread_tools.pin": "Kiemel",
--- a/public/language/id/error.json
+++ b/public/language/id/error.json
@@ -14,6 +14,7 @@
    "invalid-password": "Password Salah",
    "invalid-username-or-password": "Mohon spesifikasikan username dan password",
    "invalid-search-term": "Kata pencarian salah",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
    "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
    "username-taken": "Username sudah terdaftar",
    "email-taken": "Email sudah terdaftar",
@@ -39,6 +40,12 @@
    "category-disabled": "Kategori ditiadakan",
    "topic-locked": "Topik dikunci",
    "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(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).",
@@ -56,6 +63,7 @@
    "already-unfavourited": "You have already unbookmarked this post",
    "cant-ban-other-admins": "Kamu tidak dapat ban admin lainnya!",
    "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
    "invalid-image-type": "Invalid image type. Allowed types are: %1",
    "invalid-image-extension": "Invalid image extension",
    "invalid-file-type": "Invalid file type. Allowed types are: %1",
--- a/public/language/id/topic.json
+++ b/public/language/id/topic.json
@@ -32,6 +32,7 @@
    "deleted_message": "Topik ini telah dihapus. Hanya pengguna dengan hak manajemen topik yang dapat melihatnya.",
    "following_topic.message": "Saat ini kamu akan menerima pemberitahuan saat seseorang membuat posting di dalam topik ini.",
    "not_following_topic.message": "Kamu tidak lagi menerima notiifikasi dari topik ini.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
    "login_to_subscribe": "Daftar atau login untuk berlangganan topik ini.",
    "markAsUnreadForAll.success": "Topik ditandai Belum Dibaca seluruhnya",
    "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
    "watch.title": "Beritahukan balasan baru untuk topik ini",
    "unwatch.title": "Berhenti memantau topik ini",
    "share_this_post": "Bagikan Posting ini",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
    "thread_tools.title": "Perangkat Topik",
    "thread_tools.markAsUnreadForAll": "Tandai Belum Dibaca",
    "thread_tools.pin": "Tempel Topik",
--- a/public/language/it/error.json
+++ b/public/language/it/error.json
@@ -14,6 +14,7 @@
    "invalid-password": "Password non valida",
    "invalid-username-or-password": "Si prega di specificare sia un nome utente che una password",
    "invalid-search-term": "Termine di ricerca non valido",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
    "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
    "username-taken": "Nome utente già preso",
    "email-taken": "Email già esistente",
@@ -39,6 +40,12 @@
    "category-disabled": "Categoria disabilitata",
    "topic-locked": "Discussione Bloccata",
    "post-edit-duration-expired": "Ti è consentito modificare un post per %1 secondi dopo averlo inviato",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
    "content-too-short": "Inserisci un testo più lungo. Il messaggio deve contenere almeno %1 caratteri.",
    "content-too-long": "Inserisci un post più breve. I post non possono essere più lunghi di %1 caratteri.",
    "title-too-short": "Inserisci un titolo più lungo. I titoli devono contenere almeno %1 caratteri.",
@@ -56,6 +63,7 @@
    "already-unfavourited": "You have already unbookmarked this post",
    "cant-ban-other-admins": "Non puoi bannare altri amministratori!",
    "cant-remove-last-admin": "Sei l'unico Amministratore. Aggiungi un altro amministratore prima di rimuovere il tuo ruolo",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
    "invalid-image-type": "Tipo dell'immagine non valido. I tipi permessi sono: %1",
    "invalid-image-extension": "Estensione immagine non valida",
    "invalid-file-type": "Tipo di file non valido. I formati consentiti sono: %1",
--- a/public/language/it/topic.json
+++ b/public/language/it/topic.json
@@ -32,6 +32,7 @@
    "deleted_message": "Questa discussione è stata cancellata. Solo gli utenti con diritti di gestione possono vederla.",
    "following_topic.message": "Da ora riceverai notifiche quando qualcuno posterà in questa discussione.",
    "not_following_topic.message": "Non riceverai più notifiche da questa discussione.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
    "login_to_subscribe": "Si prega di accedere o registrarsi per potersi iscrivere a questa discussione.",
    "markAsUnreadForAll.success": "Discussione segnata come non letta per tutti.",
    "mark_unread": "Segna come non letto",
@@ -41,6 +42,12 @@
    "watch.title": "Ricevi notifiche di nuove risposte in questa discussione",
    "unwatch.title": "Smetti di osservare questa discussione",
    "share_this_post": "Condividi questo Post",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
    "thread_tools.title": "Strumenti per la Discussione",
    "thread_tools.markAsUnreadForAll": "Segna come non letto",
    "thread_tools.pin": "Fissa Discussione",
--- a/public/language/ja/error.json
+++ b/public/language/ja/error.json
@@ -14,6 +14,7 @@
    "invalid-password": "無効なパスワード",
    "invalid-username-or-password": "ユーザー名とパスワードの両方を指定してください",
    "invalid-search-term": "無効な検索ワード",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
    "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
    "username-taken": "ユーザー名は既に使われています",
    "email-taken": "メールアドレスは既に使われています",
@@ -39,6 +40,12 @@
    "category-disabled": "この板は無効された",
    "topic-locked": "スレッドがロックされた",
    "post-edit-duration-expired": "あなたが%1秒後に投稿を編集する事が許されます",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
    "content-too-short": "より長く投稿を書いて下さい。投稿にはせめて%1文字が必要です。",
    "content-too-long": "より短く投稿を書いて下さい。投稿が%1文字以上が許されません。",
    "title-too-short": "より長くタイトルを書いて下さい。タイトルはせめて%1文字が必要です。",
@@ -56,6 +63,7 @@
    "already-unfavourited": "You have already unbookmarked this post",
    "cant-ban-other-admins": "ほかの管理者を停止することはできません！",
    "cant-remove-last-admin": "あなたが唯一の管理者です。管理者としてあなた自身を削除する前に、管理者として別のユーザーを追加します。",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
    "invalid-image-type": "無効なイメージタイプです。許可された種類は: %1",
    "invalid-image-extension": "無効なイメージのエクステンション",
    "invalid-file-type": "無効なファイルタイプです。許可された種類は: %1",
--- a/public/language/ja/topic.json
+++ b/public/language/ja/topic.json
@@ -32,6 +32,7 @@
    "deleted_message": "このトピックが削除されました。トピック管理権を持っているユーザーにしか読めません。",
    "following_topic.message": "このスレッドが更新された際に通知を受け取ります。",
    "not_following_topic.message": "このスレッドの更新通知を停止しました。",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
    "login_to_subscribe": "このスレッドを購読するためにログインが必要です。",
    "markAsUnreadForAll.success": "すべてのスレッドを未読にしました。",
    "mark_unread": "未読として示す",
@@ -41,6 +42,12 @@
    "watch.title": "新しいポストの通知を受ける",
    "unwatch.title": "このトピックの通知を停止します",
    "share_this_post": "ポストを共有",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
    "thread_tools.title": "トピックのツール",
    "thread_tools.markAsUnreadForAll": "未読にする",
    "thread_tools.pin": "スレッドを最上部に固定",
--- a/public/language/ko/error.json
+++ b/public/language/ko/error.json
@@ -14,6 +14,7 @@
    "invalid-password": "올바르지 않은 비밀번호입니다.",
    "invalid-username-or-password": "사용자 이름과 패스워드를 모두 설정해주세요.",
    "invalid-search-term": "올바르지 않은 검색어입니다.",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
    "invalid-pagination-value": "올바르지 않은 값입니다. 최소 1%에서 최대 2%까지 설정해야 합니다.",
    "username-taken": "이미 사용 중인 사용자 이름입니다.",
    "email-taken": "이미 사용 중인 이메일입니다.",
@@ -39,6 +40,12 @@
    "category-disabled": "비활성화된 카테고리입니다.",
    "topic-locked": "잠긴 주제입니다.",
    "post-edit-duration-expired": "게시물의 수정은 작성한 시간으로부터 %1초 후에 가능합니다.",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
    "content-too-short": "게시물의 내용이 너무 짧습니다. 내용은 최소 %1자 이상이어야 합니다.",
    "content-too-long": "게시물의 내용이 너무 깁니다. 내용은 최대 %1자 이내로 작성할 수 있습니다.",
    "title-too-short": "제목이 너무 짧습니다. 제목은 최소 %1자 이상이어야 합니다.",
@@ -56,6 +63,7 @@
    "already-unfavourited": "이미 이 게시물을 북마크 해제했습니다.",
    "cant-ban-other-admins": "다른 관리자를 차단할 수 없습니다.",
    "cant-remove-last-admin": "귀하는 유일한 관리자입니다. 관리자를 그만두시기 전에 다른 사용자를 관리자로 선임하세요.",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
    "invalid-image-type": "올바르지 않은 이미지입니다. 사용가능한 유형: %1",
    "invalid-image-extension": "올바르지 않은 이미지 확장자입니다.",
    "invalid-file-type": "올바르지 않은 파일 유형입니다. 사용가능한 유형: %1",
--- a/public/language/ko/topic.json
+++ b/public/language/ko/topic.json
@@ -32,6 +32,7 @@
    "deleted_message": "이 주제는 삭제되었습니다. 주제 관리 권한이 있는 사용자만 볼 수 있습니다.",
    "following_topic.message": "이제 이 주제에 새 답글이 달리면 알림을 받습니다.",
    "not_following_topic.message": "더 이상 이 주제의 새 답글을 알리지 않습니다.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
    "login_to_subscribe": "이 주제의 알림을 받기 위해서는 로그인해야 합니다.",
    "markAsUnreadForAll.success": "모든 사용자에 대해 읽지 않음으로 표시했습니다.",
    "mark_unread": "읽지 않음으로 표시",
@@ -41,6 +42,12 @@
    "watch.title": "이 주제의 새 답글 알리기",
    "unwatch.title": "이 주제에 대한 관심을 해제합니다.",
    "share_this_post": "이 게시물 공유",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
    "thread_tools.title": "주제 관리",
    "thread_tools.markAsUnreadForAll": "모두에게 읽지 않음으로 표시",
    "thread_tools.pin": "상단 고정",
--- a/public/language/lt/error.json
+++ b/public/language/lt/error.json
@@ -14,6 +14,7 @@
    "invalid-password": "Klaidingas slaptažodis",
    "invalid-username-or-password": "Prašome nurodyti tiek vartotojo vardą, tiek ir slaptažodį",
    "invalid-search-term": "Neteisingas paieškos terminas",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
    "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
    "username-taken": "Vartotojo vardas jau užimtas",
    "email-taken": "El. pašto adresas jau užimtas",
@@ -39,6 +40,12 @@
    "category-disabled": "Kategorija išjungta",
    "topic-locked": "Tema užrakinta",
    "post-edit-duration-expired": "Jums galima redaguoti pranešims tik %1 sekunde(s) po parašymo",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
    "content-too-short": "Prašome parašyti ilgesni pranešimą. Pranešimas turi sudaryti mažiausiai %1 simboli(us)",
    "content-too-long": "Prašome parašyti trumpesnį pranešimą. Pranešimas negali sudaryti daugiau %1 simboli(us)",
    "title-too-short": "Prašome įvesti ilgesni pavadinimą. Pavadinimas turi sudaryti mažiausiai %1 simboli(us)",
@@ -56,6 +63,7 @@
    "already-unfavourited": "You have already unbookmarked this post",
    "cant-ban-other-admins": "Jūs negalite užblokuoti kitų administratorių!",
    "cant-remove-last-admin": "Jūs esate vienintelis administratorius. Pridėkite kitą vartotoja kaip administratorių prieš pašalindamas save",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
    "invalid-image-type": "Neteisingas vaizdo tipas. Leidžiami tipai :%1",
    "invalid-image-extension": "Neteisingas vaizdo plėtinys",
    "invalid-file-type": "Neteisingas failo tipas. Leidžiami tipai: %1",
--- a/public/language/lt/topic.json
+++ b/public/language/lt/topic.json
@@ -32,6 +32,7 @@
    "deleted_message": "Ši tema buvo ištrinta. Tik Vartotojai su temos redagavimo privilegijomis gali matyti ja",
    "following_topic.message": "Dabar jūs gausite pranešimus kai kas nors atrašys šioje temoje.",
    "not_following_topic.message": "Jūs daugiau negausite pranešimų iš šios temos.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
    "login_to_subscribe": "Norėdami prenumeruoti šią temą, prašome prisiregistruoti arba prisijungti.",
    "markAsUnreadForAll.success": "Tema visiems vartotojams pažymėta kaip neskaityta.",
    "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
    "watch.title": "Gauti pranešimą apie naujus įrašus šioje temoje",
    "unwatch.title": "Baigti šios temos stebėjimą",
    "share_this_post": "Dalintis šiuo įrašu",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
    "thread_tools.title": "Temos priemonės",
    "thread_tools.markAsUnreadForAll": "Pažymėti kaip neskaitytą",
    "thread_tools.pin": "Prisegti temą",
--- a/public/language/ms/error.json
+++ b/public/language/ms/error.json
@@ -14,6 +14,7 @@
    "invalid-password": "Kata laluan salah!",
    "invalid-username-or-password": "Sila tentukan kedua-dua nama pengguna dan kata laluan",
    "invalid-search-term": "Terma pencarian tak sah",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
    "invalid-pagination-value": "Nombor halaman tidak sah, mesti tidak kurang dari %1 dan tidak lebih dari %2",
    "username-taken": "Nama pengguna telah digunakan",
    "email-taken": "Emel telah digunakan",
@@ -39,6 +40,12 @@
    "category-disabled": "Kategori dilumpuhkan",
    "topic-locked": "Topik Dikunci",
    "post-edit-duration-expired": "Anda hanya dibenarkan menyunting kiriman selepas %1 saat() berlalu",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
    "content-too-short": "Sila masukkan kiriman yang lebih panjang. Kiriman mesti mengandungi sekurang-kurangnya %1 aksara().",
    "content-too-long": "Sila masukkan kiriman yang lebih ringkas. Kiriman mesti mengandungi tidak lebih %1 aksara().",
    "title-too-short": "Sila masukkan tajuk yang lebih panjang. Tajuk mesti mengandungi sekurang-kurangnya %1 aksara().",
@@ -56,6 +63,7 @@
    "already-unfavourited": "Anda telah pun membuang penanda untuk kiriman ini",
    "cant-ban-other-admins": "Anda tidak boleh haramkan admin / pentadbir!",
    "cant-remove-last-admin": "Anda satu-satunya pentadbir. Tambah pentadbir lain sebelum membuang diri anda sebagai pentadbir",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
    "invalid-image-type": "Jenis imej tak sah. Jenis yang dibenarkan ialah: %1",
    "invalid-image-extension": "Sambungan imej tak sah",
    "invalid-file-type": "Jenis fail tak sah. Jenis fail yang dibenarkan ialah: %1",
--- a/public/language/ms/topic.json
+++ b/public/language/ms/topic.json
@@ -32,6 +32,7 @@
    "deleted_message": "Topik ini telah dipadam. Hanya pengguna dengan kuasa pengurusan boleh melihatnya.",
    "following_topic.message": "Anda akan menerima makluman apabila ada kiriman ke dalam topik ini",
    "not_following_topic.message": "Anda tidak lagi akan menerima makluman daripada topik ini",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
    "login_to_subscribe": "Sila daftar atau log masuk untuk melanggani topik ini",
    "markAsUnreadForAll.success": "Topik ditanda sebagai belum dibaca untuk semua",
    "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
    "watch.title": "Akan dimaklumkan sekiranya ada balasan dalam topik ini",
    "unwatch.title": "Berhenti melihat topik ini",
    "share_this_post": "Kongsi kiriman ini",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
    "thread_tools.title": "Perkakas Topik",
    "thread_tools.markAsUnreadForAll": "Tanda sebagai belum dibaca",
    "thread_tools.pin": "Pinkan topik",
--- a/public/language/nb/error.json
+++ b/public/language/nb/error.json
@@ -14,6 +14,7 @@
    "invalid-password": "Ugyldig passord",
    "invalid-username-or-password": "Vennligst spesifiser både et brukernavn og passord",
    "invalid-search-term": "Ugyldig søkeord",
+    "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
    "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
    "username-taken": "Brukernavn opptatt",
    "email-taken": "E-post opptatt",
@@ -39,6 +40,12 @@
    "category-disabled": "Kategori deaktivert",
    "topic-locked": "Emne låst",
    "post-edit-duration-expired": "Du har bare lov til å redigere innlegg i %1 sekund(er) etter at det er sendt",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
    "content-too-short": "Vennligst skriv et lengre innlegg. Innlegg må inneholde minst %1 tegn.",
    "content-too-long": "Vennligst skriv et kortere innlegg. Innlegg kan ikke være lengre enn %1 tegn.",
    "title-too-short": "Vennligst skriv en lengre tittel. Titler må inneholde minst %1 tegn.",
@@ -56,6 +63,7 @@
    "already-unfavourited": "You have already unbookmarked this post",
    "cant-ban-other-admins": "Du kan ikke utestenge andre administratorer!",
    "cant-remove-last-admin": "Du er den eneste administratoren. Legg til en annen bruker som administrator før du fjerner deg selv.",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
    "invalid-image-type": "Ugyldig bildetype. Tilatte typer er: %1",
    "invalid-image-extension": "Ugyldig bildefiltype",
    "invalid-file-type": "Ugyldig filtype. Tillatte typer er: %1",
--- a/public/language/nb/topic.json
+++ b/public/language/nb/topic.json
@@ -32,6 +32,7 @@
    "deleted_message": "Dette emnet har blitt slettet. Bare brukere med emnehåndterings-privilegier kan se den.",
    "following_topic.message": "Du vil nå motta varsler når noen skriver i denne tråden.",
    "not_following_topic.message": "Du vil ikke lenger motta varsler fra denne tråden.",
+    "ignoring_topic.message": "You will no longer see this topic in the unread topics list.  You will be notified when you are mentioned or your post is up voted.",
    "login_to_subscribe": "Vennligst registrer deg eller logg inn for å abonnere på denne tråden.",
    "markAsUnreadForAll.success": "Tråd markert som ulest for alle.",
    "mark_unread": "Mark unread",
@@ -41,6 +42,12 @@
    "watch.title": "Bli varslet om nye svar i dette emnet",
    "unwatch.title": "Slutt å overvåke dette emnet",
    "share_this_post": "Del ditt innlegg",
+    "watching": "Watching",
+    "not-watching": "Not Watching",
+    "ignoring": "Ignoring",
+    "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+    "not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+    "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
    "thread_tools.title": "Emneverktøy",
    "thread_tools.markAsUnreadForAll": "Marker som ulest",
    "thread_tools.pin": "Fest tråd",
--- a/public/language/nl/error.json
+++ b/public/language/nl/error.json
@@ -14,6 +14,7 @@
    "invalid-password": "Ongeldig wachtwoord",
    "invalid-username-or-password": "Geef zowel een gebruikersnaam als wachtwoord op",
    "invalid-search-term": "Ongeldig zoekterm",
+    "csrf-invalid": "We konden u niet aanmelden, waarschijnlijk door een verlopen sessie. Probeer het a.u.b. nogmaals.",
    "invalid-pagination-value": "Invalide paginering waarde. De waarde moet op z'n minst %1 zijn en niet hoger dan %2 zijn.",
    "username-taken": "Gebruikersnaam is al in gebruik ",
    "email-taken": "E-mailadres is al in gebruik",
@@ -39,6 +40,12 @@
    "category-disabled": "Categorie uitgeschakeld",
    "topic-locked": "Onderwerp gesloten",
    "post-edit-duration-expired": "Het is slechts toegestaan om binnen %1 seconde(n) na plaatsen van het bericht, deze te bewerken.",
+    "post-edit-duration-expired-minutes": "You are only allowed to edit posts for %1 minute(s) after posting",
+    "post-edit-duration-expired-minutes-seconds": "You are only allowed to edit posts for %1 minute(s) %2 second(s) after posting",
+    "post-edit-duration-expired-hours": "You are only allowed to edit posts for %1 hour(s) after posting",
+    "post-edit-duration-expired-hours-minutes": "You are only allowed to edit posts for %1 hour(s) %2 minute(s) after posting",
+    "post-edit-duration-expired-days": "You are only allowed to edit posts for %1 day(s) after posting",
+    "post-edit-duration-expired-days-hours": "You are only allowed to edit posts for %1 day(s) %2 hour(s) after posting",
    "content-too-short": "Geef wat meer inhoud aan een bericht! Berichten dienen uit minimaal %1 teken(s) te bestaan.",
    "content-too-long": "Kort het bericht wat in, het aantal gebruikte tekens overschrijdt het ingestelde limiet want berichten mogen niet meer dan %1 teken(s) bevatten.",
    "title-too-short": "Geef een titel op die uit meer tekens bestaat. Titels dienen ten minste uit %1 teken(s) te bestaan.",
@@ -56,6 +63,7 @@
    "already-unfavourited": "Je hebt dit bericht al verwijderd uit je favorieten",
    "cant-ban-other-admins": "Het is niet toegestaan andere beheerders te verbannen!",
    "cant-remove-last-admin": "Je bent de enige beheerder. Stel eerst een andere gebruiker als beheerder in voordat je jezelf geen beheerder meer maakt.",
+    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
    "invalid-image-type": "Ongeldig bestandstype afbeelding. Deze afbeelding is van een bestandstype dat niet ondersteund wordt. Toegestane bestandstypes voor afbeeldingsbestanden zijn: %1",
    "invalid-image-extension": "Ongeldig bestandstype afbeelding",
    "invalid-file-type": "Dit bestandstype wordt niet ondersteund. Toegestane bestandstypen zijn: %1",
--- a/public/language/nl/login.json
+++ b/public/language/nl/login.json
@@ -5,7 +5,7 @@
    "remember_me": "Aangemeld blijven?",
    "forgot_password": "Wachtwoord vergeten?",
    "alternative_logins": "Andere manieren van aanmelden",
-    "failed_login_attempt": "Login Unsuccessful",
+    "failed_login_attempt": "Aanmelden mislukt",
    "login_successful": "Je bent succesvol ingelogd!",
    "dont_have_account": "Geen gebruikersaccount?"
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
NodeBB Misty	cc3fc8e90e	Incremented version number	2016-06-27 16:00:20 -04:00
NodeBB Misty	70103b7ce9	Merge commit '3bebc3ce09e66bbd18203eeaf72a9ab286eceed6' into weekly	2016-06-27 16:00:19 -04:00
NodeBB Misty	3bebc3ce09	Latest translations and fallbacks	2016-06-27 09:02:31 -04:00
Barış Soner Uşaklı	4854f78afa	Merge pull request #4787 from akhoury/rm-cls rm cls because it's not ready yet	2016-06-27 12:09:57 +03:00
NodeBB Misty	899ffa97a9	Latest translations and fallbacks	2016-06-26 09:03:13 -04:00
barisusakli	4ad980d041	up composer	2016-06-26 09:37:50 +03:00
Aziz Khoury	6e0dc7eaf8	use spam-be-gone@0.4.8 (#4790 )	2016-06-25 23:28:16 -04:00
NodeBB Misty	ca57dc2657	Latest translations and fallbacks	2016-06-25 09:02:30 -04:00
barisusakli	731942e397	closes #4788 when resetting widgets dont erase stuff already in drafts	2016-06-25 11:25:34 +03:00
Julian Lam	98368bbb6a	if interstitials don't pass any errors back but some still exist, redirect properly	2016-06-24 18:40:32 -04:00
Julian Lam	fafcdf8320	no longer requiring that interstitial.data be set in interstitial data ... lol that commit message makes no sense.	2016-06-24 18:17:52 -04:00
akhoury	46a57f5d5c	rm cls because it's not ready yet	2016-06-24 16:57:58 -04:00
Barış Soner Uşaklı	3e8e2f0e58	Merge pull request #4783 from KitsuneSolar/patch-2 Added missing language variables.	2016-06-24 11:16:55 +03:00
Kitsune Solar	347e287277	Update global.json	2016-06-24 11:07:31 +03:00
Julian Lam	85010e7f41	up persona	2016-06-23 13:55:51 -04:00
psychobunny	27ec769948	up persona	2016-06-23 13:18:40 -04:00
psychobunny	371abba13b	helpers.notAllowed hook	2016-06-23 11:21:42 -04:00
barisusakli	41af78dcd2	closes #4744	2016-06-23 17:15:33 +03:00
barisusakli	cdfb882cd7	up persona	2016-06-23 17:02:05 +03:00
barisusakli	2342141e0f	fix validator.js crashes	2016-06-23 10:16:32 +03:00
Julian Lam	222b0f010c	up composer version /cc @pichalite	2016-06-22 21:35:04 -04:00
Julian Lam	2638138f67	upped themes	2016-06-22 16:54:17 -04:00
Julian Lam	08dd19da17	removed some client-side logic that used to handle termsOfUse	2016-06-22 16:54:17 -04:00
Julian Lam	a14263349b	updated termsOfUse to use registration interstitial instead of being integrated into register template	2016-06-22 16:54:17 -04:00
Julian Lam	041670bfe9	handling of form completion in registration interstitial	2016-06-22 16:54:17 -04:00
Julian Lam	d2926f4fe7	WIP registration interstitial	2016-06-22 16:54:17 -04:00
Julian Lam	f03018b7cc	updated middlewares so if you have not completed registration, you will be required to do so	2016-06-22 16:54:17 -04:00
Julian Lam	0ba0001f75	WIP registration interstitial	2016-06-22 16:54:16 -04:00
barisusakli	871a247840	closes #4779	2016-06-22 22:21:08 +03:00
barisusakli	cbd637b2a2	dont allow priv group names	2016-06-22 22:07:20 +03:00
barisusakli	1e142a44cd	closes #4775	2016-06-22 22:00:43 +03:00
psychobunny	a0f655ccc1	mobile composer fixes	2016-06-22 12:56:27 -04:00
Julian Lam	7e4c486c62	upped markdown version	2016-06-22 12:42:48 -04:00
Julian Lam	e6fa91a4a4	when logging out, end the express session	2016-06-21 21:02:32 -04:00
Julian Lam	51faa5496b	closes #4776	2016-06-21 17:49:54 -04:00
NodeBB Misty	c75cfb494c	Latest translations and fallbacks	2016-06-21 09:03:24 -04:00
barisusakli	4bbc8110a9	closes #4772	2016-06-21 14:43:38 +03:00
barisusakli	1bf6054345	showStalewarning change	2016-06-21 13:37:17 +03:00
barisusakli	d05d75a29f	up persona	2016-06-21 12:06:51 +03:00
NodeBB Misty	5d49af2f2a	Incremented version number	2016-06-20 16:00:18 -04:00
NodeBB Misty	ae76f3cb56	Merge commit '3631a30061530d93b9a789244342ac80615c638e' into weekly	2016-06-20 16:00:18 -04:00
barisusakli	3631a30061	update history on 40x/50x	2016-06-20 14:55:50 +03:00
barisusakli	f475068010	closes #4759	2016-06-20 13:39:08 +03:00
barisusakli	3bd93526cd	closes #4768	2016-06-20 13:06:08 +03:00
barisusakli	d227d526d1	closes #4341	2016-06-20 12:45:52 +03:00
barisusakli	abb1c1c010	closes #4758	2016-06-15 21:04:42 +03:00
NodeBB Misty	acae8c8ec6	Latest translations and fallbacks	2016-06-15 09:04:43 -04:00
barisusakli	0d4949ea26	parts not used	2016-06-15 10:11:27 +03:00
Barış Soner Uşaklı	b29715fa37	Merge pull request #4756 from pichalite/post-sharing change post sharing to use /post/pid url	2016-06-15 10:01:04 +03:00
pichalite	62fb092099	change post sharing to use /post/pid url	2016-06-14 19:58:17 +00:00
barisusakli	f2b4543685	fix user priv order as well	2016-06-14 16:25:48 +03:00
NodeBB Misty	a4307b83a9	Latest translations and fallbacks	2016-06-14 09:02:37 -04:00
barisusakli	1102a685d9	closes #4749	2016-06-14 11:07:36 +03:00
barisusakli	596af5d82b	closes #4754	2016-06-14 10:07:44 +03:00
Julian Lam	e3002d0885	fixed #4753	2016-06-13 18:23:16 -04:00
barisusakli	ff82008e92	up dbsearch	2016-06-14 00:15:26 +03:00
NodeBB Misty	4cb1e07fed	Incremented version number	2016-06-13 16:00:22 -04:00
NodeBB Misty	b2f37dcd93	Merge commit '54d2c39c3ad0663b8b2c3302152282aeab339375' into weekly	2016-06-13 16:00:21 -04:00
Julian Lam	54d2c39c3a	up persona	2016-06-13 11:09:42 -04:00
NodeBB Misty	c330b9f0d4	Latest translations and fallbacks	2016-06-13 09:04:03 -04:00
Julian Lam	990cdb4087	upped persona, re: nodebb/nodebb-theme-persona#289	2016-06-13 08:17:12 -04:00
barisusakli	ecf0323dd0	closes #4688	2016-06-13 14:02:54 +03:00
NodeBB Misty	d272912e13	Latest translations and fallbacks	2016-06-12 09:04:27 -04:00
Barış Soner Uşaklı	487e4eb445	Merge pull request #4751 from MegaGM/fix-utils.fileMimeType Fix: utils.fileMimeType is always undefined	2016-06-12 09:42:57 +03:00
Mega	a834275465	Fix: utils.fileMimeType is always undefined	2016-06-12 07:30:49 +05:00
Julian Lam	b7d9e27741	upped markdown version	2016-06-11 15:22:28 -04:00
NodeBB Misty	a1b02d8356	Latest translations and fallbacks	2016-06-11 09:04:08 -04:00
NodeBB Misty	04f3c5b3f2	Latest translations and fallbacks	2016-06-10 09:03:30 -04:00
Julian Lam	8b03199d5c	fixes issue where anchors to internal rss feeds would fail to resolve	2016-06-09 14:28:41 -04:00
NodeBB Misty	ecaa3eadcb	Latest translations and fallbacks	2016-06-09 09:02:30 -04:00
Barış Soner Uşaklı	ae19f0ff7d	closes #4713	2016-06-09 14:29:54 +03:00
Barış Soner Uşaklı	8a8e4062e2	Merge pull request #4745 from pichalite/issue-4727 fixes #4727	2016-06-09 11:49:00 +03:00
pichalite	c60f571d2c	fixes #4727	2016-06-08 23:21:11 +00:00
Julian Lam	0a1dea09a0	added missing dependency lib	2016-06-08 17:45:48 -04:00
psychobunny	3e23426c31	better messaging on flags page	2016-06-08 14:53:21 -04:00
NodeBB Misty	5494d9a8b8	Latest translations and fallbacks	2016-06-08 09:02:30 -04:00
barisusakli	0e92880dd4	fix previousUrl being set to current url	2016-06-08 13:34:41 +03:00
barisusakli	ded69e8373	closes #4677	2016-06-08 11:53:12 +03:00
barisusakli	09ce48ad33	fix privs	2016-06-08 11:52:55 +03:00
barisusakli	8f594de4c2	fix privs	2016-06-08 11:44:15 +03:00
barisusakli	ff0fee2170	fix arrays	2016-06-08 10:51:37 +03:00
barisusakli	73e21d1d31	closes #4720	2016-06-08 10:46:33 +03:00
barisusakli	c969870cb6	removed dupe privilegeList, added missing privilege to copyPrivsFrom	2016-06-08 10:37:46 +03:00
barisusakli	1f3fa3a90f	closes #4725	2016-06-08 10:16:40 +03:00
psychobunny	3549ce9873	#4731	2016-06-07 11:57:26 -04:00
psychobunny	4c2ee2e736	closes #4731	2016-06-07 11:52:04 -04:00
psychobunny	1bcaf7bca3	up'd the timeout for both default alert toasters	2016-06-07 09:47:29 -04:00
NodeBB Misty	51adcc479c	Latest translations and fallbacks	2016-06-07 09:03:33 -04:00
psychobunny	02c19c419d	Merge pull request #4729 from frissdiegurke/patch-1 Up emoji-one	2016-06-07 20:10:27 +08:00
Ole R	f471a94b7a	Up emoji-one	2016-06-07 14:05:13 +02:00
NodeBB Misty	5807c1d64f	Incremented version number	2016-06-06 16:00:17 -04:00
NodeBB Misty	0fccacbb6e	Merge commit '01aeb45af89cd5d64f9944e545c9684ed8e1ac18' into weekly	2016-06-06 16:00:17 -04:00
Julian Lam	01aeb45af8	up mentions	2016-06-06 14:59:57 -04:00
Julian Lam	08cdfd2d60	resolve bug with url path when SSL certificate is handled by NodeBB	2016-06-06 14:35:00 -04:00
psychobunny	05673e670c	fixes rare "priority error" when generating sitemaps	2016-06-06 12:38:40 -04:00
Barış Soner Uşaklı	1a5a51b67a	Merge pull request #4708 from darktrge/patch-3 Make topicSlug and postCount available to email notifications	2016-06-06 17:47:16 +03:00
barisusakli	b2311edb94	bubble replies from subcategories to the parents	2016-06-06 17:36:51 +03:00
NodeBB Misty	42ebc15521	Latest translations and fallbacks	2016-06-06 09:03:31 -04:00
psychobunny	9d6754bf6d	prevent jittery ajaxify in ACP when switching from a short page to a long one	2016-06-06 08:31:42 -04:00
psychobunny	bbc570c499	socket disconnected icon for ACP #4609	2016-06-06 08:30:21 -04:00
psychobunny	c44fa866e7	nprogress bar in ACP #4609	2016-06-06 08:24:15 -04:00
NodeBB Misty	9bc117e148	Latest translations and fallbacks	2016-06-03 09:02:35 -04:00
Barış Soner Uşaklı	0e466122e2	closes #4717	2016-06-03 11:22:47 +03:00
Julian Lam	1f9602d472	added --no-dep-check flag to skip dependency checking	2016-06-02 17:00:24 -04:00
Julian Lam	85fb9cd9dc	in cases where host is not provided in the websocket request, infer one from the referer	2016-06-02 15:21:11 -04:00
Ole R	f14b7e781c	Up emoji-one (#4715 )	2016-06-02 10:02:10 -04:00
NodeBB Misty	d356bf4ea9	Latest translations and fallbacks	2016-06-02 09:03:13 -04:00
psychobunny	96a9b59419	action:topics.changeWatching	2016-06-02 04:18:42 -04:00
Julian Lam	b3d6a8ef9a	mobile fixes for registration queue page	2016-06-01 16:33:29 -04:00
Julian Lam	470a40ecca	update errors css page	2016-06-01 16:25:51 -04:00
Julian Lam	b30151725d	fixed error shown when saving sounds ACP page	2016-06-01 15:42:01 -04:00
Aziz Khoury	374fa8dd8c	fix: deprecated-message not showing for all hooks (#4714 ) * fix deprecated hooks params warning + var-cleanup * fix deprecated message	2016-06-01 12:27:36 -04:00
psychobunny	5baf077cbe	Merge branch 'master' of https://github.com/NodeBB/NodeBB	2016-06-01 09:05:30 -04:00
psychobunny	e9921edb87	Merge remote-tracking branch 'refs/remotes/origin/topics-read-privileges'	2016-06-01 09:04:48 -04:00
NodeBB Misty	71c28034c1	Latest translations and fallbacks	2016-06-01 09:03:18 -04:00
psychobunny	38af8344cc	missed a spot for topics:read priv	2016-06-01 08:52:54 -04:00
psychobunny	6f0c00bb9f	use eachSeries instead	2016-06-01 08:42:37 -04:00
Barış Soner Uşaklı	dd1b261950	closes #4712	2016-06-01 11:48:40 +03:00
Julian Lam	7b7667b31d	made 503 page mobile responsive	2016-05-30 17:09:29 -04:00
NodeBB Misty	900fb07577	Incremented version number	2016-05-30 16:00:18 -04:00
NodeBB Misty	a23d927404	Merge commit 'd839f291ac7d54088c4d09c43af0a75bff92cc27' into weekly	2016-05-30 16:00:18 -04:00
Danijel	ba2d191f80	Make topicSlug and postCount available to email notifications, so these can be used in template if needed	2016-05-30 15:09:20 +02:00
NodeBB Misty	4ca49d7c92	Latest translations and fallbacks	2016-05-30 09:02:38 -04:00
Barış Soner Uşaklı	d839f291ac	closes #4706	2016-05-29 22:45:12 +03:00
Barış Soner Uşaklı	71b3a42bed	closes #4698	2016-05-29 22:38:20 +03:00
Barış Soner Uşaklı	26be7c25e4	closes #4701	2016-05-29 22:27:37 +03:00
Barış Soner Uşaklı	9ae8ee861a	closes #4700	2016-05-29 21:52:13 +03:00
Leonardo Vieira	e4afa67956	allow resizing chat from left/top as well	2016-05-29 12:45:10 -04:00
NodeBB Misty	bff844806f	Latest translations and fallbacks	2016-05-29 09:02:23 -04:00
NodeBB Misty	444a192a22	Latest translations and fallbacks	2016-05-28 09:02:22 -04:00
psychobunny	74ff9557d9	makes more sense to give topics:read priv to those who had the category read priv thanks @barisusakli	2016-05-28 06:37:53 -04:00
psychobunny	8616cc4ea5	upgrade script: give topics:read privs to any group that has topics:create privs	2016-05-28 06:08:28 -04:00
psychobunny	b37b083a4d	new privilege: Access Topic differentiation between Access Category and Access Topic, ie. allows you to see the category view but not actually enter the topic itself	2016-05-28 05:41:17 -04:00
Julian Lam	839ff06967	up lavender	2016-05-27 18:52:13 -04:00
Ben Lubar	c288ba0a17	fix replying on IE11 - see `c50f228acc (commitcomment-17651064)` (#4699 )	2016-05-27 15:55:02 -04:00
Julian Lam	34f2d25651	fixes #4696	2016-05-27 11:59:37 -04:00
Julian Lam	38ad980456	Fixes #4694 , fixes #4697	2016-05-27 11:35:58 -04:00
NodeBB Misty	9f3c1f6641	Latest translations and fallbacks	2016-05-27 09:02:28 -04:00
Barış Soner Uşaklı	975adf1741	up persona	2016-05-27 10:00:22 +03:00
Julian Lam	439576fa8c	up composer	2016-05-26 16:07:41 -04:00
NodeBB Misty	7e1e7eb05a	Latest translations and fallbacks	2016-05-26 09:02:25 -04:00
Julian Lam	c5ec83a6ca	up composer	2016-05-25 23:12:54 -04:00
Jan	efbc5f729d	update fontawesome.tpl to FA 4.6.2 (#4607 ) remove newline sort icons	2016-05-25 16:00:44 -04:00
Timothy Fike	6a4754efca	Set switches appropriately on plugin settings pages. (#4521 )	2016-05-25 15:59:49 -04:00
Julian Lam	2a5efd1a60	up persona, closes #4646	2016-05-25 15:57:43 -04:00
Julian Lam	8f665b65d1	up persona, #4661	2016-05-25 15:39:07 -04:00
Julian Lam	b4d14ef366	fixes #4687	2016-05-25 15:28:37 -04:00
Julian Lam	a8f5000247	advising restart instead of reload on plugin toggle @pichalite	2016-05-25 15:25:01 -04:00
Julian Lam	b5ced1db0f	upped composer version to MIT version	2016-05-25 14:57:36 -04:00
barisusakli	17b4dd85e7	use valueToString in sortedSetIncrBy	2016-05-25 21:18:19 +03:00
Julian Lam	920bc213d3	updated acp advanced/errors table to span the entire page	2016-05-25 14:02:05 -04:00
barisusakli	7c47f555be	up persona	2016-05-25 20:20:36 +03:00
barisusakli	bdc23b4a8d	add reputation to app.user	2016-05-25 20:17:02 +03:00
barisusakli	6c5cc5a513	up composer	2016-05-25 19:36:38 +03:00
barisusakli	8ddcc237a7	removed submit and lock	2016-05-25 19:33:50 +03:00
NodeBB Misty	e8906fd9f6	Latest translations and fallbacks	2016-05-25 09:03:22 -04:00
barisusakli	2c5464760d	#4668 allow admins/mods to edit even after postEditDuration has expired	2016-05-25 15:48:53 +03:00
Julian Lam	ba412f4a56	fully completed #4658	2016-05-24 23:04:57 -04:00
Julian Lam	149565169b	closes #4658	2016-05-24 22:01:46 -04:00
Julian Lam	458c930bb9	Merge branch 'master' of github.com:NodeBB/NodeBB	2016-05-24 21:33:08 -04:00
Julian Lam	60af3b9b77	removed extra comma in object definition	2016-05-24 21:14:14 -04:00
Barış Soner Uşaklı	bae2458b86	Merge pull request #4676 from natejlee/patch-1 changed cls.getItem to equal cls.get	2016-05-24 20:34:18 +03:00
Nate Lee	07c59ae174	changed cls.getItem to equal cls.get from cls.set based off of naming schema	2016-05-24 10:02:27 -07:00
barisusakli	dcb73f9647	use userCount	2016-05-24 17:52:28 +03:00
Julian Lam	79bcb9be10	fixes #4675	2016-05-24 10:42:56 -04:00
Julian Lam	afb0312f51	closes #4672	2016-05-24 10:37:45 -04:00
Julian Lam	92ab2699ba	added some styling to allow mdl buttons to be stacked in ACP	2016-05-24 09:55:14 -04:00
NodeBB Misty	6878466404	Latest translations and fallbacks	2016-05-24 09:04:33 -04:00
NodeBB Misty	8a0c28a86f	Incremented version number	2016-05-23 16:00:21 -04:00
NodeBB Misty	6c87bc0d38	Merge commit '5720dac80375d256af8191b5aa7565ba0101dc82' into weekly	2016-05-23 16:00:20 -04:00
barisusakli	5720dac803	#4175 , #4298	2016-05-23 13:03:31 +03:00
barisusakli	8621bd953d	Merge branch 'master' of https://github.com/NodeBB/NodeBB	2016-05-23 12:59:37 +03:00
barisusakli	54ccdf5262	closes #4651	2016-05-23 12:59:33 +03:00
Barış Soner Uşaklı	cf70c1d167	Merge pull request #4666 from akhoury/patch-5 CLS must be required first	2016-05-23 11:42:58 +03:00
barisusakli	38d1bde895	closes #4669	2016-05-23 11:39:35 +03:00
NodeBB Misty	6f544aba79	Latest translations and fallbacks	2016-05-22 09:03:09 -04:00
Barış Soner Uşaklı	86cab0787a	closes #4668	2016-05-21 19:26:06 +03:00
NodeBB Misty	ecf9359fb3	Latest translations and fallbacks	2016-05-21 09:02:58 -04:00
Aziz Khoury	d34af3a796	CLS must be required first to avoid issues. see https://gist.github.com/akhoury/acb852798e319b5ede93431e5910d3ef	2016-05-20 13:27:29 -04:00
NodeBB Misty	fac5856cc0	Latest translations and fallbacks	2016-05-20 09:02:28 -04:00
Julian Lam	95e757ea42	up mentions	2016-05-19 15:39:17 -04:00
Julian Lam	492a5ff730	proper year in copyright footer	2016-05-19 12:26:40 -04:00
barisusakli	eac2c44e5a	update not following message	2016-05-19 18:31:36 +03:00
barisusakli	cfc4deb83a	up themes	2016-05-19 17:09:05 +03:00
Julian Lam	192998c5c3	Revert "fixed link to documentation, @akhoury" This reverts commit `bc0359475c`.	2016-05-19 10:02:45 -04:00
barisusakli	46d7994093	removed some dupe code	2016-05-19 16:32:29 +03:00
barisusakli	3f0ca31393	style changes	2016-05-19 16:07:19 +03:00
barisusakli	b56baf2530	up themes	2016-05-19 15:02:54 +03:00
barisusakli	23d134ba6c	update text	2016-05-19 14:55:24 +03:00
barisusakli	9497459784	up themes	2016-05-19 14:42:24 +03:00
Barış Soner Uşaklı	ca835e35ba	Merge pull request #4662 from NodeBB/topic-watching topic watching	2016-05-19 14:34:42 +03:00
barisusakli	b02869b0f8	renamed reading to not-following added more description text	2016-05-19 14:20:34 +03:00
barisusakli	11d3834eb9	better filtering if topic is followed but category ignored show it in unread	2016-05-19 13:11:42 +03:00
barisusakli	7a044b4978	better filterIgnoringUids	2016-05-19 11:06:17 +03:00
barisusakli	a141f6f7ec	updated category watch control	2016-05-18 20:02:34 +03:00
Dravere	2fd6391081	Made the session cookie aware of the possible relative path (#4663 )	2016-05-18 12:43:46 -04:00
barisusakli	5d2e5377c5	fix tests	2016-05-18 19:22:26 +03:00
barisusakli	bf2133ed7c	topic watching	2016-05-18 19:02:43 +03:00
Julian Lam	ef4a94857d	fixed admin lockout timer for subfolder installs @barisusakli :trollface:	2016-05-18 11:05:25 -04:00
Barış Soner Uşaklı	917eb4bd79	up composer default	2016-05-17 23:55:51 +03:00
barisusakli	11be93a4d8	closes #4648	2016-05-17 15:45:47 +03:00
psychobunny	951ac17a90	up persona	2016-05-17 05:54:26 -04:00