chore: incrementing version number - v1.14.0-1

Merge commit 'f6ad9605c609607c45397cb43ad97e11dd4ab93b' into v1.14.x
fix(deps): update dependency nodebb-theme-vanilla to v11.1.19
2026-01-06 15:42:52 +01:00 · 2020-06-03 17:40:15 +00:00 · 2020-06-03 17:40:14 +00:00 · 2020-06-03 11:56:20 -04:00 · 2020-06-03 11:55:23 -04:00 · 2020-06-03 11:49:25 -04:00
319 changed files with 2189 additions and 2083 deletions
--- a/.eslintrc
+++ b/.eslintrc
@@ -24,7 +24,7 @@
 		"consistent-return": "off",
 		"func-names": "off",
 		"no-tabs": "off",
-		"indent": ["error", "tab"],
+		"indent": ["error", "tab", { "SwitchCase": 1 }],
 		"no-eq-null": "off",
 		"camelcase": "off",
 		"no-new": "off",
--- a/install/package.json
+++ b/install/package.json
@@ -2,7 +2,7 @@
    "name": "nodebb",
    "license": "GPL-3.0",
    "description": "NodeBB Forum",
-    "version": "1.14.0-0",
+    "version": "1.14.0-1",
    "homepage": "http://www.nodebb.org",
    "repository": {
        "type": "git",
@@ -74,24 +74,24 @@
        "material-design-lite": "^1.3.0",
        "mime": "^2.4.4",
        "mkdirp": "^1.0.4",
-        "mongodb": "3.5.7",
+        "mongodb": "3.5.8",
        "morgan": "^1.10.0",
        "mousetrap": "^1.6.5",
        "@nodebb/mubsub": "^1.6.0",
        "nconf": "^0.10.0",
-        "nodebb-plugin-composer-default": "6.3.32",
+        "nodebb-plugin-composer-default": "6.3.34",
        "nodebb-plugin-dbsearch": "4.0.7",
        "nodebb-plugin-emoji": "^3.3.0",
        "nodebb-plugin-emoji-android": "2.0.0",
        "nodebb-plugin-markdown": "8.11.2",
        "nodebb-plugin-mentions": "2.7.4",
        "nodebb-plugin-soundpack-default": "1.0.0",
-        "nodebb-plugin-spam-be-gone": "0.7.0",
+        "nodebb-plugin-spam-be-gone": "0.7.1",
        "nodebb-rewards-essentials": "0.1.3",
        "nodebb-theme-lavender": "5.0.11",
-        "nodebb-theme-persona": "10.1.42",
+        "nodebb-theme-persona": "10.1.44",
        "nodebb-theme-slick": "1.2.29",
-        "nodebb-theme-vanilla": "11.1.18",
+        "nodebb-theme-vanilla": "11.1.19",
        "nodebb-widget-essentials": "4.1.0",
        "nodemailer": "^6.4.6",
        "passport": "^0.4.1",
@@ -143,7 +143,7 @@
        "grunt-contrib-watch": "1.1.0",
        "husky": "4.2.5",
        "jsdom": "16.2.2",
-        "lint-staged": "10.2.6",
+        "lint-staged": "10.2.8",
        "mocha": "7.2.0",
        "mocha-lcov-reporter": "1.3.0",
        "nyc": "15.0.1",
--- a/loader.js
+++ b/loader.js
@@ -87,22 +87,22 @@ Loader.addWorkerEvents = function (worker) {
 	worker.on('message', function (message) {
 		if (message && typeof message === 'object' && message.action) {
 			switch (message.action) {
-			case 'restart':
-				console.log('[cluster] Restarting...');
-				Loader.restart();
-				break;
-			case 'pubsub':
-				workers.forEach(function (w) {
-					w.send(message);
-				});
-				break;
-			case 'socket.io':
-				workers.forEach(function (w) {
-					if (w !== worker) {
+				case 'restart':
+					console.log('[cluster] Restarting...');
+					Loader.restart();
+					break;
+				case 'pubsub':
+					workers.forEach(function (w) {
 						w.send(message);
-					}
-				});
-				break;
+					});
+					break;
+				case 'socket.io':
+					workers.forEach(function (w) {
+						if (w !== worker) {
+							w.send(message);
+						}
+					});
+					break;
 			}
 		}
 	});
--- a/public/503.html
+++ b/public/503.html
@@ -1,13 +1,13 @@
 <html>
 <head>
 	<title>Excessive Load Warning</title>
-	<link href='https://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;
 		color: white;
-		font-family: 'Ubuntu', sans-serif;
+		/* see public/less/admin/vars.less for documentation on system font family */
+		font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
 		text-align: center;
 		-webkit-transform-style: preserve-3d;
 		-moz-transform-style: preserve-3d;
--- a/public/language/ar/admin/manage/tags.json
+++ b/public/language/ar/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",

 	"alerts.editing": "Editing tag(s)",
--- a/public/language/ar/admin/menu.json
+++ b/public/language/ar/admin/menu.json
@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "عام",
-	"general/dashboard": "اللوحة الرئيسية",
-	"general/homepage": "الصفحة الرئيسية",
-	"general/navigation": "التصفح",
-	"general/languages": "اللغات",
-	"general/sounds": "الأصوات",
-	"general/social": "شبكات التواصل",

 	"section-manage": "إدارة",
 	"manage/categories": "الأقسام",
@@ -22,17 +17,22 @@

 	"section-settings": "إعدادات",
 	"settings/general": "عامة",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "السمعة",
 	"settings/email": "البريد الإلكتروني",
-	"settings/user": "الأعضاء",
-	"settings/group": "المجموعات",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "الزوار",
 	"settings/uploads": "الرفع",
-	"settings/post": "المشاركة",
-	"settings/chat": "الدردشة",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "ترقيم الصفحات",
 	"settings/tags": "الكلمات المفتاحية",
 	"settings/notifications": "التنبيهات",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",
--- a/public/language/ar/admin/settings/advanced.json
+++ b/public/language/ar/admin/settings/advanced.json
@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }
--- a/public/language/ar/admin/settings/tags.json
+++ b/public/language/ar/admin/settings/tags.json
@@ -1,5 +1,6 @@
 {
    "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
    "min-per-topic": "Minimum Tags per Topic",
    "max-per-topic": "Maximum Tags per Topic",
    "min-length": "Minimum Tag Length",
--- a/public/language/bg/admin/manage/tags.json
+++ b/public/language/bg/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "Цвят на фона",
 	"text-color": "Цвят на текста",
 	"create-modify": "Създаване и редактиране на етикети",
-	"description": "Изберете етикетите чрез щракване и/или влачене. Използвайте „Shift“, за да изберете няколко етикета.",
+	"description": "Изберете етикетите чрез щракване или влачене. Използвайте <code>CTRL</code>, за да изберете няколко етикета.",
 	"create": "Създаване на етикет",
 	"modify": "Редактиране на етикети",
 	"rename": "Преименуване на етикети",
 	"delete": "Изтриване на избраните етикети",
 	"search": "Търсене на етикети…",
-	"settings": "Натиснете <a href=\"%1\">тук</a>, за да отворите страницата с настройки на етикета.",
+	"settings": "Настройки за етикетите",
 	"name": "Име на етикета",

 	"alerts.editing": "Редактиране на етикет(и)",
--- a/public/language/bg/admin/menu.json
+++ b/public/language/bg/admin/menu.json
@@ -1,11 +1,6 @@
 {
+	"dashboard": "Табло",
 	"section-general": "Общи",
-	"general/dashboard": "Табло",
-	"general/homepage": "Начало",
-	"general/navigation": "Навигация",
-	"general/languages": "Езици",
-	"general/sounds": "Звуци",
-	"general/social": "Обществени",

 	"section-manage": "Управление",
 	"manage/categories": "Категории",
@@ -22,17 +17,22 @@

 	"section-settings": "Настройки",
 	"settings/general": "Общи",
+	"settings/homepage": "Начална страница",
+	"settings/navigation": "Навигация",
 	"settings/reputation": "Репутация",
 	"settings/email": "Е-поща",
-	"settings/user": "Потребител",
-	"settings/group": "Група",
+	"settings/user": "Потребители",
+	"settings/group": "Групи",
 	"settings/guest": "Гости",
 	"settings/uploads": "Качвания",
-	"settings/post": "Публикация",
-	"settings/chat": "Разговор",
+	"settings/languages": "Езици",
+	"settings/post": "Публикации",
+	"settings/chat": "Разговори",
 	"settings/pagination": "Странициране",
 	"settings/tags": "Етикети",
 	"settings/notifications": "Известия",
+	"settings/sounds": "Звуци",
+	"settings/social": "Обществени",
 	"settings/cookies": "Бисквитки",
 	"settings/web-crawler": "Обхождач на уеб страници",
 	"settings/sockets": "Сокети",
--- a/public/language/bg/admin/settings/advanced.json
+++ b/public/language/bg/admin/settings/advanced.json
@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Граница на забавяне в цикъла на събитията (в милисекунди)",
 	"traffic.event-lag-help": "Намаляването на тази стойност ще намали времето за изчакване при зареждане на страници, но също така ще предизвика по-често показване на съобщението „прекомерно натоварване“ на повече потребители. (Нужно е рестартиране.)",
 	"traffic.lag-check-interval": "Интервал на проверка (в милисекунди)",
-	"traffic.lag-check-interval-help": "Намаляването на тази стойност ще направи NodeBB по-чувствителен към скоковете в натовареността, но може и да направи проверката твърде чувствителна. (Нужно е рестартиране.)"
+	"traffic.lag-check-interval-help": "Намаляването на тази стойност ще направи NodeBB по-чувствителен към скоковете в натовареността, но може и да направи проверката твърде чувствителна. (Нужно е рестартиране.)",
+
+	"sockets.settings": "Настройки за WebSocket",
+	"sockets.max-attempts": "Максимален брой опити за повторно свързване",
+	"sockets.default-placeholder": "По подразбиране: %1",
+	"sockets.delay": "Забавяне при повторно свързване"
 }
--- a/public/language/bg/admin/settings/tags.json
+++ b/public/language/bg/admin/settings/tags.json
@@ -1,5 +1,6 @@
 {
    "tag": "Настройки за етикетите",
+    "link-to-manage": "Управление на етикетите",
    "min-per-topic": "Минимален брой етикети за тема",
    "max-per-topic": "Максимален брой етикети за тема",
    "min-length": "Минимална дължина на етикетите",
--- a/public/language/bn/admin/manage/tags.json
+++ b/public/language/bn/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",

 	"alerts.editing": "Editing tag(s)",
--- a/public/language/bn/admin/menu.json
+++ b/public/language/bn/admin/menu.json
@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "General",
-	"general/dashboard": "Dashboard",
-	"general/homepage": "Home Page",
-	"general/navigation": "Navigation",
-	"general/languages": "Languages",
-	"general/sounds": "Sounds",
-	"general/social": "Social",

 	"section-manage": "Manage",
 	"manage/categories": "Categories",
@@ -22,17 +17,22 @@

 	"section-settings": "Settings",
 	"settings/general": "General",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputation",
 	"settings/email": "Email",
-	"settings/user": "User",
-	"settings/group": "Group",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Guests",
 	"settings/uploads": "Uploads",
-	"settings/post": "Post",
-	"settings/chat": "Chat",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Pagination",
 	"settings/tags": "Tags",
 	"settings/notifications": "Notifications",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",
--- a/public/language/bn/admin/settings/advanced.json
+++ b/public/language/bn/admin/settings/advanced.json
@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }
--- a/public/language/bn/admin/settings/tags.json
+++ b/public/language/bn/admin/settings/tags.json
@@ -1,5 +1,6 @@
 {
    "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
    "min-per-topic": "Minimum Tags per Topic",
    "max-per-topic": "Maximum Tags per Topic",
    "min-length": "Minimum Tag Length",
--- a/public/language/cs/admin/manage/tags.json
+++ b/public/language/cs/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "Barva pozadí",
 	"text-color": "Barva textu",
 	"create-modify": "Vytvořit a upravit značky",
-	"description": "Vyberte značky pomocí kliknutí a/nebo přetažením, pro vícenásobný výběr, použijte klávesu Shift.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Vytvořit značku",
 	"modify": "Upravit značky",
 	"rename": "Přejmenovat značky",
 	"delete": "Odstranit vybrané značky",
 	"search": "Hledat značky...",
-	"settings": "Pro přejití na stránku s nastavením značek, klikněte <a href=\"%1\">zde</a>.",
+	"settings": "Tags Settings",
 	"name": "Název značky",

 	"alerts.editing": "Editing tag(s)",
--- a/public/language/cs/admin/menu.json
+++ b/public/language/cs/admin/menu.json
@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "Všeobecné",
-	"general/dashboard": "Nástěnka",
-	"general/homepage": "Domovská stránka",
-	"general/navigation": "Navigace",
-	"general/languages": "Jazyky",
-	"general/sounds": "Zvuky",
-	"general/social": "Sociální",

 	"section-manage": "Spravovat",
 	"manage/categories": "Kategorie",
@@ -22,17 +17,22 @@

 	"section-settings": "Nastavení",
 	"settings/general": "Všeobecné",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputace",
 	"settings/email": "E-mail",
-	"settings/user": "Uživatel",
-	"settings/group": "Skupina",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Hosté",
 	"settings/uploads": "Nahrané",
-	"settings/post": "Příspěvěk",
-	"settings/chat": "Konverzace",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Stránkování",
 	"settings/tags": "Značky",
 	"settings/notifications": "Oznámení",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Webový prohledávač",
 	"settings/sockets": "Sockety",
--- a/public/language/cs/admin/settings/advanced.json
+++ b/public/language/cs/admin/settings/advanced.json
@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Hranice prodlevy smyčky události (v milisekundách)",
 	"traffic.event-lag-help": "Snížení této hodnoty sníží čas pro načtení stránky, ale taky zobrazí více uživatelům zprávu o „přetížení stránek”. (je vyžadován restart)",
 	"traffic.lag-check-interval": "Kontrola intervalů (v milisekundách)",
-	"traffic.lag-check-interval-help": "Snížení této hodnoty způsobí, že NodeBB bude citlivější na zatížení načítání stránek a na kontrolu tohoto zatížení. (je vyžadován restart)"
+	"traffic.lag-check-interval-help": "Snížení této hodnoty způsobí, že NodeBB bude citlivější na zatížení načítání stránek a na kontrolu tohoto zatížení. (je vyžadován restart)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }
--- a/public/language/cs/admin/settings/tags.json
+++ b/public/language/cs/admin/settings/tags.json
@@ -1,5 +1,6 @@
 {
    "tag": "Nastavení značky",
+    "link-to-manage": "Manage Tags",
    "min-per-topic": "Minimální počet značek/téma",
    "max-per-topic": "maximální počet značek/téma",
    "min-length": "Minimální délka značky",
--- a/public/language/da/admin/manage/tags.json
+++ b/public/language/da/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",

 	"alerts.editing": "Editing tag(s)",
--- a/public/language/da/admin/menu.json
+++ b/public/language/da/admin/menu.json
@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "General",
-	"general/dashboard": "Dashboard",
-	"general/homepage": "Home Page",
-	"general/navigation": "Navigation",
-	"general/languages": "Languages",
-	"general/sounds": "Sounds",
-	"general/social": "Social",

 	"section-manage": "Manage",
 	"manage/categories": "Categories",
@@ -22,17 +17,22 @@

 	"section-settings": "Settings",
 	"settings/general": "General",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputation",
 	"settings/email": "Email",
-	"settings/user": "User",
-	"settings/group": "Group",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Guests",
 	"settings/uploads": "Uploads",
-	"settings/post": "Post",
-	"settings/chat": "Chat",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Pagination",
 	"settings/tags": "Tags",
 	"settings/notifications": "Notifications",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",
--- a/public/language/da/admin/settings/advanced.json
+++ b/public/language/da/admin/settings/advanced.json
@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }
--- a/public/language/da/admin/settings/tags.json
+++ b/public/language/da/admin/settings/tags.json
@@ -1,5 +1,6 @@
 {
    "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
    "min-per-topic": "Minimum Tags per Topic",
    "max-per-topic": "Maximum Tags per Topic",
    "min-length": "Minimum Tag Length",
--- a/public/language/de/admin/manage/tags.json
+++ b/public/language/de/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "Hintergrundfarbe",
 	"text-color": "Textfarbe",
 	"create-modify": "Tags erstellen & bearbeiten",
-	"description": "Tags auswählen indem Du klickst und/oder ziehst, drücke die SHIFT-Taste, um mehrere auszuwählen",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Tag erstellen",
 	"modify": "Tag bearbeiten",
 	"rename": "Tags umbenennen",
 	"delete": "Ausgewählte Tags entfernen",
 	"search": "Nach Tags suchen",
-	"settings": "Klicke <a href=\"%1\">hier</a>, um die Tag-Einstellungsseite zu öffnen.",
+	"settings": "Tags Settings",
 	"name": "Tagname",

 	"alerts.editing": "Editing tag(s)",
--- a/public/language/de/admin/menu.json
+++ b/public/language/de/admin/menu.json
@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "Allgemein",
-	"general/dashboard": "Übersicht",
-	"general/homepage": "Startseite",
-	"general/navigation": "Navigation",
-	"general/languages": "Sprachen",
-	"general/sounds": "Töne",
-	"general/social": "Soziale Medien",

 	"section-manage": "Verwalten",
 	"manage/categories": "Kategorien",
@@ -22,17 +17,22 @@

 	"section-settings": "Einstellungen",
 	"settings/general": "Allgemein",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputation",
 	"settings/email": "E-Mail",
-	"settings/user": "Benutzer",
-	"settings/group": "Gruppe",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Gäste",
 	"settings/uploads": "Uploads",
-	"settings/post": "Beiträge",
-	"settings/chat": "Chat",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Seitennummerierung",
 	"settings/tags": "Tags",
 	"settings/notifications": "Benachrichtigungen",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",
--- a/public/language/de/admin/settings/advanced.json
+++ b/public/language/de/admin/settings/advanced.json
@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Eventschleifenverzögerungsschwelle (in Millisekunden)",
 	"traffic.event-lag-help": "Das Heruntersetzen dieses Werts reduziert die Ladezeiten, aber wird auch dafür sorgen, dass die \"Übermäßige Belastung\" nachricht öfter angezeigt wird. (Neustart erforderlich)",
 	"traffic.lag-check-interval": "Prüfungsintervall (in Millisekunden)",
-	"traffic.lag-check-interval-help": "Das Heruntersetzen dieses Werts sorgt dafür, dass NodeBB empfindlicher auf Auslastungs-Spikes reagiert, aber könnte auch dafür sorgen, dass der Test zu empfindlich werden könnte. (Neustart erforderlich)"
+	"traffic.lag-check-interval-help": "Das Heruntersetzen dieses Werts sorgt dafür, dass NodeBB empfindlicher auf Auslastungs-Spikes reagiert, aber könnte auch dafür sorgen, dass der Test zu empfindlich werden könnte. (Neustart erforderlich)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }
--- a/public/language/de/admin/settings/tags.json
+++ b/public/language/de/admin/settings/tags.json
@@ -1,5 +1,6 @@
 {
    "tag": "Tag-Einstellungen",
+    "link-to-manage": "Manage Tags",
    "min-per-topic": "Minimale Tags pro Thema",
    "max-per-topic": "Maximale Tags pro Thema",
    "min-length": "Minimale Tag Länge",
--- a/public/language/el/admin/manage/tags.json
+++ b/public/language/el/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",

 	"alerts.editing": "Editing tag(s)",
--- a/public/language/el/admin/menu.json
+++ b/public/language/el/admin/menu.json
@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "General",
-	"general/dashboard": "Dashboard",
-	"general/homepage": "Home Page",
-	"general/navigation": "Navigation",
-	"general/languages": "Languages",
-	"general/sounds": "Sounds",
-	"general/social": "Social",

 	"section-manage": "Manage",
 	"manage/categories": "Categories",
@@ -22,17 +17,22 @@

 	"section-settings": "Settings",
 	"settings/general": "General",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputation",
 	"settings/email": "Email",
-	"settings/user": "User",
-	"settings/group": "Group",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Guests",
 	"settings/uploads": "Uploads",
-	"settings/post": "Post",
-	"settings/chat": "Chat",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Pagination",
 	"settings/tags": "Tags",
 	"settings/notifications": "Notifications",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",
--- a/public/language/el/admin/settings/advanced.json
+++ b/public/language/el/admin/settings/advanced.json
@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }
--- a/public/language/el/admin/settings/tags.json
+++ b/public/language/el/admin/settings/tags.json
@@ -1,5 +1,6 @@
 {
    "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
    "min-per-topic": "Minimum Tags per Topic",
    "max-per-topic": "Maximum Tags per Topic",
    "min-length": "Minimum Tag Length",
--- a/public/language/en-GB/admin/general/dashboard.json
+++ b/public/language/en-GB/admin/general/dashboard.json
--- a/public/language/en-GB/admin/manage/tags.json
+++ b/public/language/en-GB/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",

 	"alerts.editing": "Editing tag(s)",
--- a/public/language/en-GB/admin/menu.json
+++ b/public/language/en-GB/admin/menu.json
@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "General",
-	"general/dashboard": "Dashboard",
-	"general/homepage": "Home Page",
-	"general/navigation": "Navigation",
-	"general/languages": "Languages",
-	"general/sounds": "Sounds",
-	"general/social": "Social",

 	"section-manage": "Manage",
 	"manage/categories": "Categories",
@@ -22,17 +17,22 @@

 	"section-settings": "Settings",
 	"settings/general": "General",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputation",
 	"settings/email": "Email",
-	"settings/user": "User",
-	"settings/group": "Group",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Guests",
 	"settings/uploads": "Uploads",
-	"settings/post": "Post",
-	"settings/chat": "Chat",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Pagination",
 	"settings/tags": "Tags",
 	"settings/notifications": "Notifications",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",
--- a/public/language/en-GB/admin/settings/advanced.json
+++ b/public/language/en-GB/admin/settings/advanced.json
@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }
--- a/public/language/en-GB/admin/settings/homepage.json
+++ b/public/language/en-GB/admin/settings/homepage.json
--- a/public/language/en-GB/admin/settings/languages.json
+++ b/public/language/en-GB/admin/settings/languages.json
--- a/public/language/en-GB/admin/settings/navigation.json
+++ b/public/language/en-GB/admin/settings/navigation.json
--- a/public/language/en-GB/admin/settings/social.json
+++ b/public/language/en-GB/admin/settings/social.json
--- a/public/language/en-GB/admin/settings/sounds.json
+++ b/public/language/en-GB/admin/settings/sounds.json
--- a/public/language/en-GB/admin/settings/tags.json
+++ b/public/language/en-GB/admin/settings/tags.json
@@ -1,5 +1,6 @@
 {
    "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
    "min-per-topic": "Minimum Tags per Topic",
    "max-per-topic": "Maximum Tags per Topic",
    "min-length": "Minimum Tag Length",
--- a/public/language/en-GB/flags.json
+++ b/public/language/en-GB/flags.json
@@ -32,6 +32,9 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"delete-post": "Delete Post",
+	"purge-post": "Purge Post",
+	"restore-post": "Restore Post",

 	"user-view": "View Profile",
 	"user-edit": "Edit Profile",
--- a/public/language/en-US/admin/manage/tags.json
+++ b/public/language/en-US/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "Background Color",
 	"text-color": "Text Color",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",

 	"alerts.editing": "Editing tag(s)",
--- a/public/language/en-US/admin/menu.json
+++ b/public/language/en-US/admin/menu.json
@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "General",
-	"general/dashboard": "Dashboard",
-	"general/homepage": "Home Page",
-	"general/navigation": "Navigation",
-	"general/languages": "Languages",
-	"general/sounds": "Sounds",
-	"general/social": "Social",

 	"section-manage": "Manage",
 	"manage/categories": "Categories",
@@ -22,17 +17,22 @@

 	"section-settings": "Settings",
 	"settings/general": "General",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputation",
 	"settings/email": "Email",
-	"settings/user": "User",
-	"settings/group": "Group",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Guests",
 	"settings/uploads": "Uploads",
-	"settings/post": "Post",
-	"settings/chat": "Chat",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Pagination",
 	"settings/tags": "Tags",
 	"settings/notifications": "Notifications",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",
--- a/public/language/en-US/admin/settings/advanced.json
+++ b/public/language/en-US/admin/settings/advanced.json
@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }
--- a/public/language/en-US/admin/settings/tags.json
+++ b/public/language/en-US/admin/settings/tags.json
@@ -1,5 +1,6 @@
 {
    "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
    "min-per-topic": "Minimum Tags per Topic",
    "max-per-topic": "Maximum Tags per Topic",
    "min-length": "Minimum Tag Length",
--- a/public/language/en-x-pirate/admin/manage/tags.json
+++ b/public/language/en-x-pirate/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",

 	"alerts.editing": "Editing tag(s)",
--- a/public/language/en-x-pirate/admin/menu.json
+++ b/public/language/en-x-pirate/admin/menu.json
@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "General",
-	"general/dashboard": "Dashboard",
-	"general/homepage": "Home Page",
-	"general/navigation": "Navigation",
-	"general/languages": "Languages",
-	"general/sounds": "Sounds",
-	"general/social": "Social",

 	"section-manage": "Manage",
 	"manage/categories": "Categories",
@@ -22,17 +17,22 @@

 	"section-settings": "Settings",
 	"settings/general": "General",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputation",
 	"settings/email": "Email",
-	"settings/user": "User",
-	"settings/group": "Group",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Guests",
 	"settings/uploads": "Uploads",
-	"settings/post": "Post",
-	"settings/chat": "Chat",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Pagination",
 	"settings/tags": "Tags",
 	"settings/notifications": "Notifications",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",
--- a/public/language/en-x-pirate/admin/settings/advanced.json
+++ b/public/language/en-x-pirate/admin/settings/advanced.json
@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }
--- a/public/language/en-x-pirate/admin/settings/tags.json
+++ b/public/language/en-x-pirate/admin/settings/tags.json
@@ -1,5 +1,6 @@
 {
    "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
    "min-per-topic": "Minimum Tags per Topic",
    "max-per-topic": "Maximum Tags per Topic",
    "min-length": "Minimum Tag Length",
--- a/public/language/es/admin/manage/tags.json
+++ b/public/language/es/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "Color de Fondo",
 	"text-color": "Color del Texto",
 	"create-modify": "Crear & Modificar Etiquetas (tags)",
-	"description": "Seleccionar etiquetas (tags) mediante click o arrastrando/soltando, usa shift para seleccionar múltiples.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Crear Etiqueta (tag)",
 	"modify": "Modificar Etiquetas (tags)",
 	"rename": "Renombrar Etiquetas (tags)",
 	"delete": "Borrar Etiquetas (tags) Seleccionadas",
 	"search": "Buscar etiquetas (tags)...",
-	"settings": "Haz click<a href=\"%1\">aquí</a> para visitar la página de configuración de etiquetas (tags).",
+	"settings": "Tags Settings",
 	"name": "Nombre de Etiqueta (tag)",

 	"alerts.editing": "Editing tag(s)",
--- a/public/language/es/admin/menu.json
+++ b/public/language/es/admin/menu.json
@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "General",
-	"general/dashboard": "Panel",
-	"general/homepage": "Inicio",
-	"general/navigation": "Navegación",
-	"general/languages": "Lenguajes",
-	"general/sounds": "Sonidos",
-	"general/social": "Social",

 	"section-manage": "Administrar",
 	"manage/categories": "Categorias",
@@ -22,17 +17,22 @@

 	"section-settings": "Opciones",
 	"settings/general": "General",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputación",
 	"settings/email": "Email",
-	"settings/user": "Usuario",
-	"settings/group": "Grupo",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Invitados",
 	"settings/uploads": "Subidas",
-	"settings/post": "Mensaje",
-	"settings/chat": "Chat",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Paginación",
 	"settings/tags": "Etiquetas",
 	"settings/notifications": "Notificaciones",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Rastreador web",
 	"settings/sockets": "Sockets",
--- a/public/language/es/admin/settings/advanced.json
+++ b/public/language/es/admin/settings/advanced.json
@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Límite de Lag para el Event Loop (en milisegundos)",
 	"traffic.event-lag-help": "Bajar este valor disminuye los tiempos de espera para cargas de página, pero también mostrará el mensaje \"carga excesiva\" a mas usuarios. (Se requiere Reiniciar)",
 	"traffic.lag-check-interval": "Chequear intervalo (milisegundos)",
-	"traffic.lag-check-interval-help": "Bajar este valor causará que NodeBB sea más sensible a picos de carga, pero también causará que el chequeo sea muy sensible. (Requiere reinicio)"
+	"traffic.lag-check-interval-help": "Bajar este valor causará que NodeBB sea más sensible a picos de carga, pero también causará que el chequeo sea muy sensible. (Requiere reinicio)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }
--- a/public/language/es/admin/settings/tags.json
+++ b/public/language/es/admin/settings/tags.json
@@ -1,5 +1,6 @@
 {
    "tag": "Configuración de Etiqueta (tag)",
+    "link-to-manage": "Manage Tags",
    "min-per-topic": "Etiquetas (tags) mínimas por tema",
    "max-per-topic": "Etiquetas (tags) Máximas por Tema",
    "min-length": "Longitud Mínima de Etiqueta (tag)",
--- a/public/language/et/admin/manage/tags.json
+++ b/public/language/et/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",

 	"alerts.editing": "Editing tag(s)",
--- a/public/language/et/admin/menu.json
+++ b/public/language/et/admin/menu.json
@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "General",
-	"general/dashboard": "Dashboard",
-	"general/homepage": "Home Page",
-	"general/navigation": "Navigation",
-	"general/languages": "Languages",
-	"general/sounds": "Sounds",
-	"general/social": "Social",

 	"section-manage": "Manage",
 	"manage/categories": "Categories",
@@ -22,17 +17,22 @@

 	"section-settings": "Settings",
 	"settings/general": "General",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputation",
 	"settings/email": "Email",
-	"settings/user": "User",
-	"settings/group": "Group",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Guests",
 	"settings/uploads": "Uploads",
-	"settings/post": "Post",
-	"settings/chat": "Chat",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Pagination",
 	"settings/tags": "Tags",
 	"settings/notifications": "Notifications",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",
--- a/public/language/et/admin/settings/advanced.json
+++ b/public/language/et/admin/settings/advanced.json
@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }
--- a/public/language/et/admin/settings/tags.json
+++ b/public/language/et/admin/settings/tags.json
@@ -1,5 +1,6 @@
 {
    "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
    "min-per-topic": "Minimum Tags per Topic",
    "max-per-topic": "Maximum Tags per Topic",
    "min-length": "Minimum Tag Length",
--- a/public/language/fa-IR/admin/manage/tags.json
+++ b/public/language/fa-IR/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",

 	"alerts.editing": "Editing tag(s)",
--- a/public/language/fa-IR/admin/menu.json
+++ b/public/language/fa-IR/admin/menu.json
@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "عمومی",
-	"general/dashboard": "Dashboard",
-	"general/homepage": "Home Page",
-	"general/navigation": "ناوبری",
-	"general/languages": "Languages",
-	"general/sounds": "Sounds",
-	"general/social": "اجتماعی",

 	"section-manage": "Manage",
 	"manage/categories": "Categories",
@@ -22,17 +17,22 @@

 	"section-settings": "Settings",
 	"settings/general": "General",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputation",
 	"settings/email": "رایانامه",
-	"settings/user": "کاربر",
-	"settings/group": "Group",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Guests",
 	"settings/uploads": "Uploads",
-	"settings/post": "دیدگاه",
-	"settings/chat": "گفتمان",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Pagination",
 	"settings/tags": "برچسب ها",
 	"settings/notifications": "آگاه‌سازی‌ها",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "کوکی ها",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",
--- a/public/language/fa-IR/admin/settings/advanced.json
+++ b/public/language/fa-IR/admin/settings/advanced.json
@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }
--- a/public/language/fa-IR/admin/settings/tags.json
+++ b/public/language/fa-IR/admin/settings/tags.json
@@ -1,5 +1,6 @@
 {
    "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
    "min-per-topic": "Minimum Tags per Topic",
    "max-per-topic": "Maximum Tags per Topic",
    "min-length": "Minimum Tag Length",
--- a/public/language/fi/admin/manage/tags.json
+++ b/public/language/fi/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",

 	"alerts.editing": "Editing tag(s)",
--- a/public/language/fi/admin/menu.json
+++ b/public/language/fi/admin/menu.json
@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "General",
-	"general/dashboard": "Dashboard",
-	"general/homepage": "Home Page",
-	"general/navigation": "Navigation",
-	"general/languages": "Languages",
-	"general/sounds": "Sounds",
-	"general/social": "Social",

 	"section-manage": "Manage",
 	"manage/categories": "Categories",
@@ -22,17 +17,22 @@

 	"section-settings": "Settings",
 	"settings/general": "General",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputation",
 	"settings/email": "Email",
-	"settings/user": "User",
-	"settings/group": "Group",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Guests",
 	"settings/uploads": "Uploads",
-	"settings/post": "Post",
-	"settings/chat": "Chat",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Pagination",
 	"settings/tags": "Tags",
 	"settings/notifications": "Notifications",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",
--- a/public/language/fi/admin/settings/advanced.json
+++ b/public/language/fi/admin/settings/advanced.json
@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }
--- a/public/language/fi/admin/settings/tags.json
+++ b/public/language/fi/admin/settings/tags.json
@@ -1,5 +1,6 @@
 {
    "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
    "min-per-topic": "Minimum Tags per Topic",
    "max-per-topic": "Maximum Tags per Topic",
    "min-length": "Minimum Tag Length",
--- a/public/language/fr/admin/manage/tags.json
+++ b/public/language/fr/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "Couleur d'arrière plan",
 	"text-color": "Couleur du texte",
 	"create-modify": "Créer et modifier les mots-clés",
-	"description": "Sélectionnez les mot-clés par clic ou glisser-déposer, maintenez shift pour en sélectionner plusieurs.",
+	"description": "Sélectionnez des mots-clés en cliquant ou en faisant glisser, utilisez <code>CTRL</code> pour une sélection multiple.",
 	"create": "Créer le mot-clés",
 	"modify": "Modifier les mots-clés",
 	"rename": "Renommer les mots-clés",
 	"delete": "Supprimer les mots-clés sélectionnés",
 	"search": "Chercher des mots-clés...",
-	"settings": "Cliquez <a href=\"%1\">ici</a> pour visiter la page de paramètres des mots clés.",
+	"settings": "Configuration des Tags",
 	"name": "Nom du mot-clés",

 	"alerts.editing": "Modification des tag(s)",
--- a/public/language/fr/admin/menu.json
+++ b/public/language/fr/admin/menu.json
@@ -1,11 +1,6 @@
 {
+	"dashboard": "Tableau de bord",
 	"section-general": "Général",
-	"general/dashboard": "Tableau de bord",
-	"general/homepage": "Page d'accueil",
-	"general/navigation": "Navigation",
-	"general/languages": "Langues",
-	"general/sounds": "Sons",
-	"general/social": "Social",

 	"section-manage": "Gestion",
 	"manage/categories": "Catégories",
@@ -22,17 +17,22 @@

 	"section-settings": "Réglages",
 	"settings/general": "Général",
+	"settings/homepage": "Page d'accueil",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Réputation",
 	"settings/email": "Email",
-	"settings/user": "Utilisateur",
-	"settings/group": "Groupe",
+	"settings/user": "Utilisateurs",
+	"settings/group": "Groupes",
 	"settings/guest": "Invités",
 	"settings/uploads": "Envois",
-	"settings/post": "Message",
-	"settings/chat": "Discussion",
+	"settings/languages": "Langues",
+	"settings/post": "Messages",
+	"settings/chat": "Chats",
 	"settings/pagination": "Pagination",
 	"settings/tags": "Mots-clés",
 	"settings/notifications": "Notifications",
+	"settings/sounds": "Sons",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Robot d'indexation Web",
 	"settings/sockets": "Sockets",
--- a/public/language/fr/admin/settings/advanced.json
+++ b/public/language/fr/admin/settings/advanced.json
@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Seuil de lag des boucles d'événements (en millisecondes) ",
 	"traffic.event-lag-help": "Descendre cette valeur réduit le temps d'attente pour le chargement de s pages, mais montrera le message \"charge excessive\" à plus d'utilisateurs. (redémarrage requis)",
 	"traffic.lag-check-interval": "Vérifier l’intervalle (en millisecondes)",
-	"traffic.lag-check-interval-help": "Descendre cette valeur rend NodeBB plus sensible aux pics dans le chargement, mais rend aussi le contrôle trop sensible. (redémarrage requis)"
+	"traffic.lag-check-interval-help": "Descendre cette valeur rend NodeBB plus sensible aux pics dans le chargement, mais rend aussi le contrôle trop sensible. (redémarrage requis)",
+
+	"sockets.settings": "Configuration WebSocket",
+	"sockets.max-attempts": "Nombre maximum de tentatives de reconnexion",
+	"sockets.default-placeholder": "Défaut : %1",
+	"sockets.delay": "Délai de reconnexion"
 }
--- a/public/language/fr/admin/settings/tags.json
+++ b/public/language/fr/admin/settings/tags.json
@@ -1,5 +1,6 @@
 {
    "tag": "Paramètres des mots-clés",
+    "link-to-manage": "Gérer les mots-clés",
    "min-per-topic": "Nombre minimum de mots-clés par sujet",
    "max-per-topic": "Nombre maximum de mots-clés par sujet",
    "min-length": "Longueur minimum des mots-clés",
--- a/public/language/gl/admin/manage/tags.json
+++ b/public/language/gl/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",

 	"alerts.editing": "Editing tag(s)",
--- a/public/language/gl/admin/menu.json
+++ b/public/language/gl/admin/menu.json
@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "General",
-	"general/dashboard": "Dashboard",
-	"general/homepage": "Home Page",
-	"general/navigation": "Navigation",
-	"general/languages": "Languages",
-	"general/sounds": "Sounds",
-	"general/social": "Social",

 	"section-manage": "Manage",
 	"manage/categories": "Categories",
@@ -22,17 +17,22 @@

 	"section-settings": "Settings",
 	"settings/general": "General",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputation",
 	"settings/email": "Email",
-	"settings/user": "User",
-	"settings/group": "Group",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Guests",
 	"settings/uploads": "Uploads",
-	"settings/post": "Post",
-	"settings/chat": "Chat",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Pagination",
 	"settings/tags": "Tags",
 	"settings/notifications": "Notifications",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",
--- a/public/language/gl/admin/settings/advanced.json
+++ b/public/language/gl/admin/settings/advanced.json
@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }
--- a/public/language/gl/admin/settings/tags.json
+++ b/public/language/gl/admin/settings/tags.json
@@ -1,5 +1,6 @@
 {
    "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
    "min-per-topic": "Minimum Tags per Topic",
    "max-per-topic": "Maximum Tags per Topic",
    "min-length": "Minimum Tag Length",
--- a/public/language/he/admin/manage/tags.json
+++ b/public/language/he/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "צבע רקע\n",
 	"text-color": "צבע טקסט\n",
 	"create-modify": "צור ושנה תגים",
-	"description": "בחר תגים באמצעות לחיצה ו/או גרירה, השתמש ב shift על מנת לבחור במספר תגים",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "צור תג",
 	"modify": "שנה תג",
 	"rename": "שנה שם של תג",
 	"delete": "מחק תגים שנבחרו",
 	"search": "חפש תג...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "שם תג",

 	"alerts.editing": "Editing tag(s)",
--- a/public/language/he/admin/menu.json
+++ b/public/language/he/admin/menu.json
@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "כללי",
-	"general/dashboard": "לוח מחוונים",
-	"general/homepage": "דף הבית",
-	"general/navigation": "ניווט",
-	"general/languages": "שפות",
-	"general/sounds": "שמע",
-	"general/social": "Social",

 	"section-manage": "ניהול",
 	"manage/categories": "קטגוריות",
@@ -22,17 +17,22 @@

 	"section-settings": "הגדרות",
 	"settings/general": "כללי",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "מוניטין",
 	"settings/email": "דוא\"ל",
-	"settings/user": "משתמש",
-	"settings/group": "קבוצה",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "אורח",
 	"settings/uploads": "העלאות",
-	"settings/post": "פוסט",
-	"settings/chat": "צ'אט",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Pagination",
 	"settings/tags": "תגיות",
 	"settings/notifications": "התראות",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "עוגיות",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",
--- a/public/language/he/admin/settings/advanced.json
+++ b/public/language/he/admin/settings/advanced.json
@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }
--- a/public/language/he/admin/settings/tags.json
+++ b/public/language/he/admin/settings/tags.json
@@ -1,5 +1,6 @@
 {
    "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
    "min-per-topic": "Minimum Tags per Topic",
    "max-per-topic": "Maximum Tags per Topic",
    "min-length": "Minimum Tag Length",
--- a/public/language/hr/admin/manage/tags.json
+++ b/public/language/hr/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "Pozadinska boja",
 	"text-color": "Boja teksta",
 	"create-modify": "Napravi i uredi oznake",
-	"description": "Odaberite oznake klikom ili povlačenjem, koristite SHIFT za  višestruki odabir.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Napravi oznaku",
 	"modify": "Uredi oznake",
 	"rename": "Rename Tags",
 	"delete": "Obriši odabrane oznake",
 	"search": "Pretraži za oznake ...",
-	"settings": "Kliknite <a href=\"%1\">ovdje</a> za posjetu postavki oznaka",
+	"settings": "Tags Settings",
 	"name": "Ime oznake",

 	"alerts.editing": "Editing tag(s)",
--- a/public/language/hr/admin/menu.json
+++ b/public/language/hr/admin/menu.json
@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "Glavno",
-	"general/dashboard": "Glavna ploča",
-	"general/homepage": "Naslovnica",
-	"general/navigation": "Navigacija",
-	"general/languages": "Jezici",
-	"general/sounds": "Zvukovi",
-	"general/social": "Socijalno",

 	"section-manage": "Upravljanje",
 	"manage/categories": "Kategorije",
@@ -22,17 +17,22 @@

 	"section-settings": "Postavke",
 	"settings/general": "Generalno",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputacija",
 	"settings/email": "Email",
-	"settings/user": "Korisnik",
-	"settings/group": "Grupa",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Gosti",
 	"settings/uploads": "Slanje",
-	"settings/post": "Objave",
-	"settings/chat": "Razgovor",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Numeriranje",
 	"settings/tags": "Oznake",
 	"settings/notifications": "Obavijesti",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Kolačići",
 	"settings/web-crawler": "Web puzač",
 	"settings/sockets": "Utičnice",
--- a/public/language/hr/admin/settings/advanced.json
+++ b/public/language/hr/admin/settings/advanced.json
@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Smanjivanje ove vrijednosti smanjuje vrijeme čekanja za učitavanje stranica,ali će također pokazivati poruku \"prekomjerno opterećenje\" više korisnika(u takvim slučajevima potrebno je ponovo pokretanje).",
 	"traffic.lag-check-interval": "Provjeri interval (u milisekundama)",
-	"traffic.lag-check-interval-help": "Smanjivanje ove vrijednosti uzrokuje da NodeBB postane osjetljivji na oscilacije u prometu,takodjer može uzrokovati da provjere postanu preosjetljive(Biti će potrebno ponovno pokretanje)."
+	"traffic.lag-check-interval-help": "Smanjivanje ove vrijednosti uzrokuje da NodeBB postane osjetljivji na oscilacije u prometu,takodjer može uzrokovati da provjere postanu preosjetljive(Biti će potrebno ponovno pokretanje).",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }
--- a/public/language/hr/admin/settings/tags.json
+++ b/public/language/hr/admin/settings/tags.json
@@ -1,5 +1,6 @@
 {
    "tag": "Postavke oznaka",
+    "link-to-manage": "Manage Tags",
    "min-per-topic": "Najmanje oznaka za temu",
    "max-per-topic": "Maksimalno oznaka po temi",
    "min-length": "Minimalna dužina oznake",
--- a/public/language/hu/admin/manage/tags.json
+++ b/public/language/hu/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "Háttérszín",
 	"text-color": "Szövegszín",
 	"create-modify": "Címkék létrehozása és módosítása",
-	"description": "Válassz címkéket kattintással és/vagy húzással, használd a shift-et több kijelöléséhez.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Címke létrehozása",
 	"modify": "Címkék módosítása",
 	"rename": "Címkék átnevezése",
 	"delete": "Kijelölt címkék törlése",
 	"search": "Címkék keresése...",
-	"settings": "Kattints <a href=\"%1\">ide</a> a címke beállítások lap meglátogatásához.",
+	"settings": "Tags Settings",
 	"name": "Címkenév",

 	"alerts.editing": "Editing tag(s)",
--- a/public/language/hu/admin/menu.json
+++ b/public/language/hu/admin/menu.json
@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "Általános",
-	"general/dashboard": "Műszerfal",
-	"general/homepage": "Kezdőlap",
-	"general/navigation": "Navigáció",
-	"general/languages": "Nyelvek",
-	"general/sounds": "Hangok",
-	"general/social": "Közösség",

 	"section-manage": "Kezelés",
 	"manage/categories": "Kategóriák",
@@ -22,17 +17,22 @@

 	"section-settings": "Beállítások",
 	"settings/general": "Általános",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Hírnév",
 	"settings/email": "E-mail",
-	"settings/user": "Felhasználó",
-	"settings/group": "Csoport",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Vendégek",
 	"settings/uploads": "Feltöltések",
-	"settings/post": "Hozzászólás",
-	"settings/chat": "Chat",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Lapszámozás",
 	"settings/tags": "Címkék",
 	"settings/notifications": "Értesítések",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Süti",
 	"settings/web-crawler": "Web indexelő",
 	"settings/sockets": "Csatlakozók",
--- a/public/language/hu/admin/settings/advanced.json
+++ b/public/language/hu/admin/settings/advanced.json
@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Eseményciklus késési küszübértéke (ezredmásodpercben)",
 	"traffic.event-lag-help": "Az érték csökkentésével csökken az oldalbetöltések várakozási ideje, ám több felhasználó fogja tapasztalni a \"túlzott terhelés\" üzenetet. (Újraindítást igényel)",
 	"traffic.lag-check-interval": "Ellenőrzési időköz (ezredmásodpercben)",
-	"traffic.lag-check-interval-help": "Az érték csökkentésével a NodeBB érzékenyebbé válik a tüskékkel szemben terheléskor, ám az ellenőrzés túlérzékenységét is okozhatja. (Újraindítást igényel)"
+	"traffic.lag-check-interval-help": "Az érték csökkentésével a NodeBB érzékenyebbé válik a tüskékkel szemben terheléskor, ám az ellenőrzés túlérzékenységét is okozhatja. (Újraindítást igényel)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }
--- a/public/language/hu/admin/settings/tags.json
+++ b/public/language/hu/admin/settings/tags.json
@@ -1,5 +1,6 @@
 {
    "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
    "min-per-topic": "Minimum Tags per Topic",
    "max-per-topic": "Maximum Tags per Topic",
    "min-length": "Minimum Tag Length",
--- a/public/language/id/admin/manage/tags.json
+++ b/public/language/id/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
 	"create-modify": "Create & Modify Tags",
-	"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
 	"rename": "Rename Tags",
 	"delete": "Delete Selected Tags",
 	"search": "Search for tags...",
-	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
+	"settings": "Tags Settings",
 	"name": "Tag Name",

 	"alerts.editing": "Editing tag(s)",
--- a/public/language/id/admin/menu.json
+++ b/public/language/id/admin/menu.json
@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "General",
-	"general/dashboard": "Dashboard",
-	"general/homepage": "Home Page",
-	"general/navigation": "Navigation",
-	"general/languages": "Languages",
-	"general/sounds": "Sounds",
-	"general/social": "Social",

 	"section-manage": "Manage",
 	"manage/categories": "Categories",
@@ -22,17 +17,22 @@

 	"section-settings": "Settings",
 	"settings/general": "General",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputation",
 	"settings/email": "Email",
-	"settings/user": "User",
-	"settings/group": "Group",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Guests",
 	"settings/uploads": "Uploads",
-	"settings/post": "Post",
-	"settings/chat": "Chat",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Pagination",
 	"settings/tags": "Tags",
 	"settings/notifications": "Notifications",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",
--- a/public/language/id/admin/settings/advanced.json
+++ b/public/language/id/admin/settings/advanced.json
@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)",
 	"traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)",
 	"traffic.lag-check-interval": "Check Interval (in milliseconds)",
-	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)"
+	"traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }
--- a/public/language/id/admin/settings/tags.json
+++ b/public/language/id/admin/settings/tags.json
@@ -1,5 +1,6 @@
 {
    "tag": "Tag Settings",
+    "link-to-manage": "Manage Tags",
    "min-per-topic": "Minimum Tags per Topic",
    "max-per-topic": "Maximum Tags per Topic",
    "min-length": "Minimum Tag Length",
--- a/public/language/it/admin/manage/tags.json
+++ b/public/language/it/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "Colore di sfondo",
 	"text-color": "Colore del testo",
 	"create-modify": "Crea e modifica i tag",
-	"description": "Seleziona i tag facendo clic e/o trascinando, utilizza shift per selezionare più tag.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Crea tag",
 	"modify": "Modifica i tag",
 	"rename": "Rinomina i tag",
 	"delete": "Elimina i tag selezionati",
 	"search": "Ricerca per tag...",
-	"settings": "Clicca <a href=\"%1\">qui</a> per visitare la pagina impostazioni tag.",
+	"settings": "Tags Settings",
 	"name": "Nome Tag",

 	"alerts.editing": "Modifica tag(s)",
--- a/public/language/it/admin/menu.json
+++ b/public/language/it/admin/menu.json
@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "Generale",
-	"general/dashboard": "Dashboard",
-	"general/homepage": "Home Page",
-	"general/navigation": "Navigazione",
-	"general/languages": "Lingue",
-	"general/sounds": "Suoni",
-	"general/social": "Social",

 	"section-manage": "Gestisci",
 	"manage/categories": "Categorie",
@@ -22,17 +17,22 @@

 	"section-settings": "Impostazioni",
 	"settings/general": "Generale",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "Reputazione",
 	"settings/email": "Email",
-	"settings/user": "Utente",
-	"settings/group": "Gruppo",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "Ospiti",
 	"settings/uploads": "Uploads",
-	"settings/post": "Post",
-	"settings/chat": "Chat",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "Paginazione",
 	"settings/tags": "Tabs",
 	"settings/notifications": "Notifiche",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",
--- a/public/language/it/admin/settings/advanced.json
+++ b/public/language/it/admin/settings/advanced.json
@@ -25,5 +25,10 @@
 	"traffic.event-lag": "Soglia ritardo ciclo eventi (in millisecondi)",
 	"traffic.event-lag-help": "L'abbassamento di questo valore diminuisce i tempi di attesa per il caricamento della pagina, ma mostrerà il messaggio \"carico eccessivo\" a più utenti. (Necessario riavviare)",
 	"traffic.lag-check-interval": "Intervallo di controllo (in millisecondi)",
-	"traffic.lag-check-interval-help": "L'abbassamento di questo valore fa sì che NodeBBB diventi più sensibile ai picchi di carico, ma può anche far sì che il controllo diventi troppo sensibile. (Necessario riavviare)"
+	"traffic.lag-check-interval-help": "L'abbassamento di questo valore fa sì che NodeBBB diventi più sensibile ai picchi di carico, ma può anche far sì che il controllo diventi troppo sensibile. (Necessario riavviare)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }
--- a/public/language/it/admin/settings/tags.json
+++ b/public/language/it/admin/settings/tags.json
@@ -1,5 +1,6 @@
 {
    "tag": "Impostazioni Tag",
+    "link-to-manage": "Manage Tags",
    "min-per-topic": "Tag minimi per discussione",
    "max-per-topic": "Tag massimi per discussione",
    "min-length": "Lunghezza minima tag",
--- a/public/language/ja/admin/manage/tags.json
+++ b/public/language/ja/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "背景カラー",
 	"text-color": "テキストカラー",
 	"create-modify": "タグの作成と変更",
-	"description": "クリックまたは、クリックしながらドラッグでタグを選択し、Shiftキーを使用して複数のタグを選択します。",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "タグを作成",
 	"modify": "タグを変更",
 	"rename": "Rename Tags",
 	"delete": "指定されたタグを削除",
 	"search": "タグを検索します...",
-	"settings": "<a href=\"%1\">こちら</a>をクリックしてタグ設定ページにアクセスしてください。",
+	"settings": "Tags Settings",
 	"name": "タグ名",

 	"alerts.editing": "Editing tag(s)",
--- a/public/language/ja/admin/menu.json
+++ b/public/language/ja/admin/menu.json
@@ -1,11 +1,6 @@
 {
+	"dashboard": "Dashboard",
 	"section-general": "一般",
-	"general/dashboard": "ダッシュボード",
-	"general/homepage": "ホームページ",
-	"general/navigation": "ナビゲーション",
-	"general/languages": "言語",
-	"general/sounds": "サウンド",
-	"general/social": "ソーシャル",

 	"section-manage": "管理",
 	"manage/categories": "カテゴリ",
@@ -22,17 +17,22 @@

 	"section-settings": "設定",
 	"settings/general": "一般",
+	"settings/homepage": "Home Page",
+	"settings/navigation": "Navigation",
 	"settings/reputation": "評価",
 	"settings/email": "メール",
-	"settings/user": "ユーザー",
-	"settings/group": "グループ",
+	"settings/user": "Users",
+	"settings/group": "Groups",
 	"settings/guest": "ゲスト",
 	"settings/uploads": "アップロード",
-	"settings/post": "投稿",
-	"settings/chat": "チャット",
+	"settings/languages": "Languages",
+	"settings/post": "Posts",
+	"settings/chat": "Chats",
 	"settings/pagination": "ページ",
 	"settings/tags": "タグ",
 	"settings/notifications": "通知",
+	"settings/sounds": "Sounds",
+	"settings/social": "Social",
 	"settings/cookies": "クッキー",
 	"settings/web-crawler": "Webクローラー",
 	"settings/sockets": "接続数",
--- a/public/language/ja/admin/settings/advanced.json
+++ b/public/language/ja/admin/settings/advanced.json
@@ -25,5 +25,10 @@
 	"traffic.event-lag": "イベントループの場所のしきい値(ミリ秒単位)",
 	"traffic.event-lag-help": "この値を下げるとページの読み込み時間が短縮されますが、さらに多くのユーザーには「過剰な読み込み」メッセージが表示されます。(再起動が必要)",
 	"traffic.lag-check-interval": "チェック間隔(ミリ秒単位)",
-	"traffic.lag-check-interval-help": "この値を小さくすると、NodeBBは負荷のスパイクに対してより敏感になりますが、チェックが過敏になる可能性もあります。(再起動が必要)"
+	"traffic.lag-check-interval-help": "この値を小さくすると、NodeBBは負荷のスパイクに対してより敏感になりますが、チェックが過敏になる可能性もあります。(再起動が必要)",
+
+	"sockets.settings": "WebSocket Settings",
+	"sockets.max-attempts": "Max Reconnection Attempts",
+	"sockets.default-placeholder": "Default: %1",
+	"sockets.delay": "Reconnection Delay"
 }
--- a/public/language/ja/admin/settings/tags.json
+++ b/public/language/ja/admin/settings/tags.json
@@ -1,5 +1,6 @@
 {
    "tag": "タグ設定",
+    "link-to-manage": "Manage Tags",
    "min-per-topic": "スレッドごとの最小タグ数",
    "max-per-topic": "スレッドごとの最大タグ数",
    "min-length": "タグの最小文字数",
--- a/public/language/ko/admin/manage/tags.json
+++ b/public/language/ko/admin/manage/tags.json
@@ -3,13 +3,13 @@
 	"bg-color": "배경색",
 	"text-color": "텍스트 색",
 	"create-modify": "태그 생성/수정",
-	"description": "태그를 클릭하거나 드래그해서 선택하고, Shift 를 눌러 다중 선택하세요.",
+	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "태그 생성",
 	"modify": "태그 수정",
 	"rename": "태그 이름 바꾸기",
 	"delete": "선택된 태그 삭제",
 	"search": "태그 검색",
-	"settings": "태그 설정 페이지를 방문하시려면 <a href=\"%1\">클릭</a>하세요",
+	"settings": "Tags Settings",
 	"name": "태그 이름",

 	"alerts.editing": "Editing tag(s)",
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Misty (Bot)	d93eba9f3b	chore: incrementing version number - v1.14.0-1	2020-06-03 17:40:15 +00:00
Misty (Bot)	626def8b31	Merge commit 'f6ad9605c609607c45397cb43ad97e11dd4ab93b' into v1.14.x	2020-06-03 17:40:14 +00:00
Renovate Bot	f6ad9605c6	fix(deps): update dependency nodebb-theme-vanilla to v11.1.19	2020-06-03 11:56:20 -04:00
Renovate Bot	cb28e6cfd1	fix(deps): update dependency nodebb-theme-persona to v10.1.44	2020-06-03 11:55:23 -04:00
Julian Lam	8ea1634824	feat: #8360 flag quick actions for delete/restore/purge	2020-06-03 11:49:25 -04:00
Julian Lam	6b1d1acb48	fix(style): more switch..case	2020-06-03 11:46:57 -04:00
Renovate Bot	331b1a85bb	chore(deps): update dependency lint-staged to v10.2.8	2020-06-03 11:36:52 -04:00
Julian Lam	922d49be0b	fix(style): switch..case	2020-06-03 11:26:08 -04:00
renovate[bot]	d7ab0894d4	fix(deps): update dependency nodebb-plugin-composer-default to v6.3.34 (#8357 ) Co-authored-by: Renovate Bot <bot@renovateapp.com>	2020-06-02 16:23:52 -04:00
Julian Lam	d135b6f763	fix(style): enforcing "better" indentation for switch..case	2020-06-02 14:23:38 -04:00
Barış Soner Uşaklı	75b3a81dad	fix: clear error log before checking fix intermittent test failure due to analytics being written every 10 seconds	2020-06-01 23:00:26 -04:00
Barış Soner Uşaklı	5a2b515431	feat: #8349 , remove user posts from queue if user is deleted	2020-06-01 22:29:56 -04:00
Barış Soner Uşaklı	e603ebc0c6	fix: #8323 , let admins send validation emails without timeout	2020-06-01 21:54:47 -04:00
Peter Jaszkowiak	de7ec47f13	fix: #8352 , remove webfonts (#8354 )	2020-06-01 11:06:23 -04:00
Misty (Bot)	b31482092d	Latest translations and fallbacks	2020-06-01 09:29:58 +00:00
Julian Lam	da90fd562e	fix: more tests	2020-05-31 21:22:07 -04:00
Julian Lam	98dffa3af8	fix: tests due to `0633ad327`	2020-05-31 21:09:19 -04:00
Misty (Bot)	bad23159d2	Latest translations and fallbacks	2020-05-31 09:29:35 +00:00
Barış Soner Uşaklı	2c9e865763	fix: retry failed setObject calls	2020-05-30 15:49:34 -04:00
Misty (Bot)	d7b2f163f2	Latest translations and fallbacks	2020-05-30 09:28:34 +00:00
Julian Lam	0633ad3277	fix: acp menu items - Shuffled items in settings - Moved post-queue and ip-blacklist to front-end - Removed Settings > Sockets, merged with Settings > Advanced	2020-05-29 16:42:09 -04:00
Julian Lam	a83f4259e8	fix: re-jigged tags acp pages	2020-05-29 15:28:34 -04:00
Renovate Bot	c40471793f	fix(deps): update dependency nodebb-plugin-composer-default to v6.3.33	2020-05-29 11:57:56 -04:00
Julian Lam	a51fff8bd1	refactor: remove general menu from ACP (#8347 ) * refactor: remove general menu from ACP * fix: incorrect translation keys, fixed tests	2020-05-29 09:59:22 -04:00
Renovate Bot	d1df08269f	chore(deps): update dependency lint-staged to v10.2.7	2020-05-29 09:55:33 -04:00
Renovate Bot	27ab36ac84	fix(deps): update dependency nodebb-plugin-spam-be-gone to v0.7.1	2020-05-28 16:42:27 -04:00
renovate[bot]	dabff9728f	fix(deps): update dependency nodebb-theme-persona to v10.1.43 (#8343 ) Co-authored-by: Renovate Bot <bot@renovateapp.com>	2020-05-28 15:31:23 -04:00
renovate[bot]	8224127fcf	fix(deps): update dependency mongodb to v3.5.8 (#8342 ) Co-authored-by: Renovate Bot <bot@renovateapp.com>	2020-05-28 09:21:16 -04:00