chore: incrementing version number - v1.14.0-7

switch to @nodebb/socket.io-adapter-mongo

Gruntfile.js

@@ -45,6 +45,9 @@ module.exports = function (grunt) {
 			if (!plugins.includes('nodebb-plugin-composer-default')) {
 				plugins.push('nodebb-plugin-composer-default');
 			}
+			if (!plugins.includes('nodebb-theme-persona')) {
+				plugins.push('nodebb-theme-persona');
+			}
 		}
 
 		const styleUpdated_Client = plugins.map(p => 'node_modules/' + p + '/*.less')

install/package.json

@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "1.14.0-4",
+    "version": "1.14.0-7",
     "homepage": "http://www.nodebb.org",
     "repository": {
         "type": "git",
@@ -74,12 +74,13 @@
         "material-design-lite": "^1.3.0",
         "mime": "^2.4.4",
         "mkdirp": "^1.0.4",
-        "mongodb": "3.5.8",
+        "mongodb": "3.5.9",
         "morgan": "^1.10.0",
         "mousetrap": "^1.6.5",
         "@nodebb/mubsub": "^1.6.0",
+        "@nodebb/socket.io-adapter-mongo": "3.0.0",
         "nconf": "^0.10.0",
-        "nodebb-plugin-composer-default": "6.3.40",
+        "nodebb-plugin-composer-default": "6.3.43",
         "nodebb-plugin-dbsearch": "4.0.7",
         "nodebb-plugin-emoji": "^3.3.0",
         "nodebb-plugin-emoji-android": "2.0.0",
@@ -89,16 +90,16 @@
         "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.48",
+        "nodebb-theme-persona": "10.1.52",
         "nodebb-theme-slick": "1.2.29",
-        "nodebb-theme-vanilla": "11.1.23",
+        "nodebb-theme-vanilla": "11.1.27",
         "nodebb-widget-essentials": "4.1.0",
         "nodemailer": "^6.4.6",
         "passport": "^0.4.1",
         "passport-local": "1.0.0",
         "pg": "^8.0.2",
         "pg-cursor": "^2.1.9",
-        "postcss": "7.0.30",
+        "postcss": "7.0.32",
         "postcss-clean": "1.1.0",
         "promise-polyfill": "^8.1.3",
         "prompt": "^1.0.0",
@@ -110,11 +111,10 @@
         "sanitize-html": "^1.23.0",
         "semver": "^7.2.1",
         "serve-favicon": "^2.5.0",
-        "sharp": "0.25.3",
+        "sharp": "0.25.4",
         "sitemap": "^6.1.0",
         "socket.io": "2.3.0",
         "socket.io-adapter-cluster": "^1.0.1",
-        "socket.io-adapter-mongo": "^2.0.5",
         "socket.io-adapter-postgres": "^1.2.1",
         "socket.io-client": "2.3.0",
         "socket.io-redis": "5.3.0",
@@ -125,7 +125,7 @@
         "textcomplete.contenteditable": "^0.1.1",
         "toobusy-js": "^0.5.1",
         "uglify-es": "^3.3.9",
-        "validator": "13.0.0",
+        "validator": "13.1.1",
         "winston": "3.2.1",
         "xml": "^1.0.1",
         "xregexp": "^4.3.0",
@@ -136,15 +136,15 @@
         "@commitlint/cli": "8.3.5",
         "@commitlint/config-angular": "8.3.4",
         "coveralls": "3.1.0",
-        "eslint": "7.1.0",
+        "eslint": "7.2.0",
         "eslint-config-airbnb-base": "14.1.0",
         "eslint-plugin-import": "2.21.1",
         "grunt": "1.1.0",
         "grunt-contrib-watch": "1.1.0",
         "husky": "4.2.5",
         "jsdom": "16.2.2",
-        "lint-staged": "10.2.9",
-        "mocha": "7.2.0",
+        "lint-staged": "10.2.10",
+        "mocha": "8.0.1",
         "mocha-lcov-reporter": "1.3.0",
         "nyc": "15.0.1",
         "smtp-server": "3.6.0"

public/language/ar/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Traffic Management",
-	"traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Enable Traffic Management",
 	"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)",

public/language/ar/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "مشاهدة الملف الشخصي",
 	"start-new-chat": "بدء محادثه جديده",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "حذف المشاركة",
 	"purge-post": "Purge Post",
 	"restore-post": "استرجاع المشاركة",

public/language/ar/global.json

@@ -30,6 +30,7 @@
     "header.unread": "غير مقروء",
     "header.tags": "وسم",
     "header.popular": "الأكثر شهرة",
+    "header.top": "Top",
     "header.users": "المستخدمين",
     "header.groups": "المجموعات",
     "header.chats": "المحادثات",

public/language/ar/topic.json

@@ -99,7 +99,11 @@
     "fork_pid_count": "1% مشاركة محددة",
     "fork_success": "تم إنشاء فرع للموضوع بنجاح! إضغط هنا لمعاينة الفرع.",
     "delete_posts_instruction": "Click the posts you want to delete/purge",
-    "merge_topics_instruction": "Click the topics you want to merge",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
     "move_posts_instruction": "Click the posts you want to move",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "أدخل عنوان موضوعك هنا...",
@@ -134,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/bg/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "Позволяване на предварителното зареждане на заглавката на HSTS",
 	"hsts.help": "Ако това е включено, за този уеб ще бъде настроена заглавка за HSTS. Можете да изберете дали да включите поддомейните и дали за заредите предварително флаговете в заглавката си. Ако не знаете какво да направите, най-добре не избирайте нищо. <a href=\"%1\">Още информация<i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Управление на трафика",
-	"traffic.help": "NodeBB има вграден модул, който автоматично отказва заявките в натоварените моменти. Можете да настроите поведението тук, въпреки че стойностите по подразбиране са добра отправна точка.",
+	"traffic.help": "NodeBB използва модул, който автоматично отказва заявките в натоварените моменти. Можете да настроите поведението тук, въпреки че стойностите по подразбиране са добра отправна точка.",
 	"traffic.enable": "Включване на управлението на трафика",
 	"traffic.event-lag": "Граница на забавяне в цикъла на събитията (в милисекунди)",
 	"traffic.event-lag-help": "Намаляването на тази стойност ще намали времето за изчакване при зареждане на страници, но също така ще предизвика по-често показване на съобщението „прекомерно натоварване“ на повече потребители. (Нужно е рестартиране.)",

public/language/bg/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Преглед на профила",
 	"start-new-chat": "Започване на нов разговор",
 	"go-to-target": "Преглед на целта на доклада",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Изтриване на публикацията",
 	"purge-post": "Изчистване на публикацията",
 	"restore-post": "Възстановяване на публикацията",

public/language/bg/global.json

@@ -30,6 +30,7 @@
     "header.unread": "Непрочетени",
     "header.tags": "Етикети",
     "header.popular": "Популярни",
+    "header.top": "Най-харесвани",
     "header.users": "Потребители",
     "header.groups": "Групи",
     "header.chats": "Разговори",

public/language/bg/topic.json

@@ -99,7 +99,11 @@
     "fork_pid_count": "Избрани публикации: %1",
     "fork_success": "Темата е разделена успешно! Натиснете тук, за да преминете към отделената тема.",
     "delete_posts_instruction": "Натиснете публикациите, които искате да изтриете/изчистите",
-    "merge_topics_instruction": "Натиснете темите, които искате да слеете",
+    "merge_topics_instruction": "Щракнете върху темите, които искате да слеете, или ги потърсете",
+    "merge-topic-list-title": "Списък от темите, които ще бъдат слети",
+    "merge-options": "Настройки за сливането",
+    "merge-select-main-topic": "Изберете основната тема",
+    "merge-new-title-for-topic": "Ново заглавие за темата",
     "move_posts_instruction": "Натиснете публикациите, които искате да преместите",
     "change_owner_instruction": "Натиснете публикациите, които искате да прехвърлите на друг потребител",
     "composer.title_placeholder": "Въведете заглавието на темата си тук...",
@@ -134,6 +138,9 @@
     "diffs.no-revisions-description": "Тази публикация има <strong>%1</strong> варианта.",
     "diffs.current-revision": "текуща версия",
     "diffs.original-revision": "оригинална версия",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 по-късно",
     "timeago_earlier": "%1 по-рано"
 }

public/language/bn/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Traffic Management",
-	"traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Enable Traffic Management",
 	"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)",

public/language/bn/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/bn/global.json

@@ -30,6 +30,7 @@
     "header.unread": "অপঠিত",
     "header.tags": "ট্যাগ",
     "header.popular": "জনপ্রিয়",
+    "header.top": "Top",
     "header.users": "ব্যবহারকারীগণ",
     "header.groups": "Groups",
     "header.chats": "কথোপকথন",

public/language/bn/topic.json

@@ -99,7 +99,11 @@
     "fork_pid_count": "%1 post(s) selected",
     "fork_success": "টপিক ফর্ক করা হয়েছে। ফর্ক করা টপিকে যেতে এখানে ক্লিক করুন",
     "delete_posts_instruction": "Click the posts you want to delete/purge",
-    "merge_topics_instruction": "Click the topics you want to merge",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
     "move_posts_instruction": "Click the posts you want to move",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "আপনার টপিকের শিরোনাম দিন",
@@ -134,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/cs/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "Povolit před-načtení hlavičky HSTS",
 	"hsts.help": "Je-li povoleno, bude nastavena pro tyto stránky hlavička HSTS . Můžete si v hlavičce zvolit zahrnutí i poddomén a přednastavených příznaků. Nejste-li si jist/a, ponechte nezaškrtnuté<a href=\"%1\">Více informací <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Správa provozu",
-	"traffic.help": "NodeBB obsahuje modul, který automaticky zamítá požadavky při vysokém vytížení. Toto nastavení můžete zde upravit, ačkoliv výchozí hodnoty jsou zaručením úspěchu.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Povolit správu provozu",
 	"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)",

public/language/cs/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Zobrazit profil",
 	"start-new-chat": "Začít novou konverzaci",
 	"go-to-target": "Zobrazit cílové označení",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/cs/global.json

@@ -30,6 +30,7 @@
     "header.unread": "Nepřečtené",
     "header.tags": "Značky",
     "header.popular": "Populární",
+    "header.top": "Top",
     "header.users": "Uživatelé",
     "header.groups": "Skupiny",
     "header.chats": "Chaty",

public/language/cs/topic.json

@@ -99,7 +99,11 @@
     "fork_pid_count": "Vybráno %1 příspěvek/ů",
     "fork_success": "Téma úspěšně rozděleno. Pro přejití na rozdělené téma, zde klikněte.",
     "delete_posts_instruction": "Klikněte na příspěvek, který chcete odstranit/vyčistit",
-    "merge_topics_instruction": "Pro sloučení témat, klikněte na ně",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
     "move_posts_instruction": "Klikněte na příspěvek/y, který chcete přesunout",
     "change_owner_instruction": "Klikněte na příspěvek u kterého chcete změnit vlastníka",
     "composer.title_placeholder": "Zadejte název tématu…",
@@ -134,6 +138,9 @@
     "diffs.no-revisions-description": "Tento příspěvek má <strong>%1</strong> změn.",
     "diffs.current-revision": "aktuální revize",
     "diffs.original-revision": "originální revize",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 později",
     "timeago_earlier": "%1 dříve"
 }

public/language/da/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Traffic Management",
-	"traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Enable Traffic Management",
 	"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)",

public/language/da/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/da/global.json

@@ -30,6 +30,7 @@
     "header.unread": "Ulæst",
     "header.tags": "Etiket",
     "header.popular": "Populære",
+    "header.top": "Top",
     "header.users": "Bruger",
     "header.groups": "Grupper",
     "header.chats": "Chats",

public/language/da/topic.json

@@ -99,7 +99,11 @@
     "fork_pid_count": "%1 post(s) selected",
     "fork_success": "Tråden blev fraskilt! Klik her for at gå til den fraskilte tråd.",
     "delete_posts_instruction": "Klik på de indlæg du vil slette/rense",
-    "merge_topics_instruction": "Click the topics you want to merge",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
     "move_posts_instruction": "Click the posts you want to move",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "Angiv din trådtittel her ...",
@@ -134,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/de/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "Vorabladen von HSTS Header erlauben",
 	"hsts.help": "Wenn aktiviert, wird ein HSTS-Header für diese Seite gesetzt. Du kannst wählen, ob du Subdomains und Preloading-Flags in deinen Header aufnehmen möchtest. Im Zweifelsfall kannst du diese unmarkiert lassen.",
 	"traffic-management": "Traffic Management",
-	"traffic.help": "NodeBB wird mit einem Modul geliefert, welches automatisch anfragen in High-Traffic Situationen blockiert. Du kannst diese Einstellungen hier ändern, auch wenn die Standardeinstellungen einen guten Anfang darstellen sollten",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Traffic Management aktivieren",
 	"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)",

public/language/de/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Profil ansehen",
 	"start-new-chat": "Neuen Chat beginnen",
 	"go-to-target": "Meldungsziel ansehen",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/de/global.json

@@ -30,6 +30,7 @@
     "header.unread": "Ungelesen",
     "header.tags": "Tags",
     "header.popular": "Beliebt",
+    "header.top": "Top",
     "header.users": "Benutzer",
     "header.groups": "Gruppen",
     "header.chats": "Chats",

public/language/de/topic.json

@@ -99,7 +99,11 @@
     "fork_pid_count": "%1 Beiträge ausgewählt",
     "fork_success": "Thema erfolgreich aufgespalten! Klicke hier, um zum abgespaltenen Thema zu gelangen.",
     "delete_posts_instruction": "Wähle die zu löschenden Beiträge aus",
-    "merge_topics_instruction": "Wähle die Themen aus, die du vereinen möchtest",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
     "move_posts_instruction": "Klicke auf die Beiträge, die du verschieben möchstest.",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "Hier den Titel des Themas eingeben...",
@@ -134,6 +138,9 @@
     "diffs.no-revisions-description": "Dieser Beitrag ha <strong>%1</strong> Revisionen.",
     "diffs.current-revision": "Aktuelle Revision",
     "diffs.original-revision": "Ursprüngliche Revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 später",
     "timeago_earlier": "%1 earlier"
 }

public/language/el/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Traffic Management",
-	"traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Enable Traffic Management",
 	"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)",

public/language/el/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/el/global.json

@@ -30,6 +30,7 @@
     "header.unread": "Μη αναγνωσμένα",
     "header.tags": "Ετικέτες",
     "header.popular": "Δημοφιλή",
+    "header.top": "Top",
     "header.users": "Χρήστες",
     "header.groups": "Ομάδες",
     "header.chats": "Συνομιλίες",

public/language/el/topic.json

@@ -99,7 +99,11 @@
     "fork_pid_count": "%1 post(s) selected",
     "fork_success": "Successfully forked topic! Click here to go to the forked topic.",
     "delete_posts_instruction": "Click the posts you want to delete/purge",
-    "merge_topics_instruction": "Click the topics you want to merge",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
     "move_posts_instruction": "Click the posts you want to move",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "Εισαγωγή του τίτλου του θέματος εδώ...",
@@ -134,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/en-GB/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Traffic Management",
-	"traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Enable Traffic Management",
 	"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)",

public/language/en-GB/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/en-GB/global.json

@@ -36,6 +36,7 @@
 	"header.unread": "Unread",
 	"header.tags": "Tags",
 	"header.popular": "Popular",
+	"header.top": "Top",
 	"header.users": "Users",
 	"header.groups": "Groups",
 	"header.chats": "Chats",

public/language/en-GB/topic.json

@@ -115,7 +115,11 @@
 	"fork_pid_count": "%1 post(s) selected",
 	"fork_success": "Successfully forked topic! Click here to go to the forked topic.",
 	"delete_posts_instruction": "Click the posts you want to delete/purge",
-	"merge_topics_instruction": "Click the topics you want to merge",
+	"merge_topics_instruction": "Click the topics you want to merge or search for them",
+	"merge-topic-list-title": "List of topics to be merged",
+	"merge-options": "Merge options",
+	"merge-select-main-topic": "Select the main topic",
+	"merge-new-title-for-topic": "New title for topic",
 	"move_posts_instruction": "Click the posts you want to move",
 	"change_owner_instruction": "Click the posts you want to assign to another user",
 
@@ -157,6 +161,9 @@
 	"diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
 	"diffs.current-revision": "current revision",
 	"diffs.original-revision": "original revision",
+	"diffs.restore": "Restore this revision",
+	"diffs.restore-description": "A new revision will be appended to this post's edit history.",
+	"diffs.post-restored": "Post successfully restored to earlier revision",
 
 	"timeago_later": "%1 later",
 	"timeago_earlier": "%1 earlier"

public/language/en-US/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Traffic Management",
-	"traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Enable Traffic Management",
 	"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)",

public/language/en-US/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/en-US/global.json

@@ -30,6 +30,7 @@
     "header.unread": "Unread",
     "header.tags": "Tags",
     "header.popular": "Popular",
+    "header.top": "Top",
     "header.users": "Users",
     "header.groups": "Groups",
     "header.chats": "Chats",

public/language/en-US/top.json

@@ -0,0 +1,4 @@
+{
+	"title": "Top",
+	"no_top_topics": "No top topics"
+}

public/language/en-US/topic.json

@@ -99,7 +99,11 @@
     "fork_pid_count": "%1 post(s) selected",
     "fork_success": "Successfully forked topic! Click here to go to the forked topic.",
     "delete_posts_instruction": "Click the posts you want to delete/purge",
-    "merge_topics_instruction": "Click the topics you want to merge",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
     "move_posts_instruction": "Click the posts you want to move",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "Enter your topic title here...",
@@ -134,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/en-x-pirate/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Traffic Management",
-	"traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Enable Traffic Management",
 	"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)",

public/language/en-x-pirate/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/en-x-pirate/global.json

@@ -30,6 +30,7 @@
     "header.unread": "Undiscovered",
     "header.tags": "Tags",
     "header.popular": "Famous",
+    "header.top": "Top",
     "header.users": "Mates",
     "header.groups": "Groups",
     "header.chats": "Yik-Yaks",

public/language/en-x-pirate/topic.json

@@ -99,7 +99,11 @@
     "fork_pid_count": "%1 post(s) selected",
     "fork_success": "Successfully forked topic! Click here to go to the forked topic.",
     "delete_posts_instruction": "Click the posts you want to delete/purge",
-    "merge_topics_instruction": "Click the topics you want to merge",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
     "move_posts_instruction": "Click the posts you want to move",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "Enter your topic title here...",
@@ -134,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/es/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Administración de Tráfico",
-	"traffic.help": "NodeBB se despliega equipado con un módulo que deniega automáticamente requests de HTTP en situaciones de tráfico alto. Puedes ajustar esta configuración aquí, aunque los valores por defecto son un punto de partida aceptable.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Habilitar Administración de Tráfico",
 	"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)",

public/language/es/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Ver perfil",
 	"start-new-chat": "Empezar nuevo chat",
 	"go-to-target": "Ver objetivo marcado",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/es/global.json

@@ -30,6 +30,7 @@
     "header.unread": "No leídos",
     "header.tags": "Etiquetas",
     "header.popular": "Popular",
+    "header.top": "Top",
     "header.users": "Usuarios",
     "header.groups": "Grupos",
     "header.chats": "Chats",

public/language/es/topic.json

@@ -99,7 +99,11 @@
     "fork_pid_count": "%1 mensaje(s) seleccionados",
     "fork_success": "¡Se ha creado un nuevo tema a partir del original! Haz click aquí para ir al nuevo tema.",
     "delete_posts_instruction": "Haz click en los mensajes que quieres eliminar/limpiar",
-    "merge_topics_instruction": "Selecciona los temas que quieres fusionar",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
     "move_posts_instruction": "Pulsa en los posts que quieras mover",
     "change_owner_instruction": "Haz click en los mensajes que quieres asignar a otro usuario",
     "composer.title_placeholder": "Ingresa el título de tu tema...",
@@ -134,6 +138,9 @@
     "diffs.no-revisions-description": "Este post ha tenido <strong>%1</strong> revisión(es).",
     "diffs.current-revision": "revisión actual",
     "diffs.original-revision": "revisión original",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 después",
     "timeago_earlier": "%1 antes"
 }

public/language/et/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Traffic Management",
-	"traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Enable Traffic Management",
 	"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)",

public/language/et/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/et/global.json

@@ -30,6 +30,7 @@
     "header.unread": "Lugemata",
     "header.tags": "Märksõnad",
     "header.popular": "Populaarne",
+    "header.top": "Top",
     "header.users": "Kasutajad",
     "header.groups": "Grupid",
     "header.chats": "Vestlused",

public/language/et/topic.json

@@ -99,7 +99,11 @@
     "fork_pid_count": "%1 postitus(t) valitud",
     "fork_success": "Edukalt ''forkisid'' teema! Vajuta siia, et vaadata loodud teemat.",
     "delete_posts_instruction": "Klikka postitustel, mida tahad kustutada/puhastada",
-    "merge_topics_instruction": "Click the topics you want to merge",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
     "move_posts_instruction": "Click the posts you want to move",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "Sisesta teema pealkiri siia...",
@@ -134,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/fa-IR/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Traffic Management",
-	"traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Enable Traffic Management",
 	"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)",

public/language/fa-IR/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "نمایش پروفایل",
 	"start-new-chat": "شروع چت جدید",
 	"go-to-target": "مشاهده محتوای گزارش شده",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/fa-IR/global.json

@@ -30,6 +30,7 @@
     "header.unread": "نخوانده‌ها",
     "header.tags": "برچسب‌ها",
     "header.popular": "دوست‌داشتنی‌ها",
+    "header.top": "Top",
     "header.users": "کاربران",
     "header.groups": "گروه‌ها",
     "header.chats": "چتها",

public/language/fa-IR/topic.json

@@ -99,7 +99,11 @@
     "fork_pid_count": "%1 پست (ها) انتخاب شده اند",
     "fork_success": "موضوع با موفقیت منشعب شد! برای رفتن به موضوع انشعابی اینجا را کلیک کنید.",
     "delete_posts_instruction": "با کلیک بر روی پست شما می خواهید به حذف/پاکسازی",
-    "merge_topics_instruction": "بر روی عنوان موضوعاتی که می خواهید ادغام کنید کلیک کنید",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
     "move_posts_instruction": "بر روی پستی که می خواهید انتقال دهید کلیک کنید",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "عنوان موضوعتان را اینجا بنویسید...",
@@ -134,6 +138,9 @@
     "diffs.no-revisions-description": "این پست %1 نسخه دارد.",
     "diffs.current-revision": "نسخه فعلی",
     "diffs.original-revision": "نسخه اصلی",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/fi/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Traffic Management",
-	"traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Enable Traffic Management",
 	"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)",

public/language/fi/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/fi/global.json

@@ -30,6 +30,7 @@
     "header.unread": "Lukemattomat",
     "header.tags": "Tagit",
     "header.popular": "Suositut",
+    "header.top": "Top",
     "header.users": "Käyttäjät",
     "header.groups": "Ryhmät",
     "header.chats": "Keskustelut",

public/language/fi/topic.json

@@ -99,7 +99,11 @@
     "fork_pid_count": "%1 viesti(ä) valittuna",
     "fork_success": "Aihe eriytetty onnistuneesti! Klikkaa täältä mennäkseksi uuteen aiheeseen.",
     "delete_posts_instruction": "Valitse viestit jotka haluat poistaa (pysyvästi)",
-    "merge_topics_instruction": "Valitse viestit jotka haluat sulauttaa",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
     "move_posts_instruction": "Valitse viestit jotka haluat siirtää",
     "change_owner_instruction": "Valitse viestit jotka haluat siirtää toiselle henkilölle",
     "composer.title_placeholder": "Syötä aiheesi otsikko tähän...",
@@ -134,6 +138,9 @@
     "diffs.no-revisions-description": "Tästä viestistä on <strong>%1 </strong>versiota",
     "diffs.current-revision": "nykyinen versio",
     "diffs.original-revision": "alkuperäinen versio",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 myöhempi",
     "timeago_earlier": "%1 aiempi"
 }

public/language/fr/admin/advanced/events.json

@@ -2,7 +2,7 @@
 	"events": "Évènements",
 	"no-events": "Il n'y a aucun évènement.",
 	"control-panel": "Panneau de contrôle des évènements",
-	"delete-events": "Delete Events",
+	"delete-events": "Supprimer les évènements",
 	"filters": "Filtres",
 	"filters-apply": "Appliquer",
 	"filter-type": "Évènements",

public/language/fr/admin/manage/privileges.json

@@ -34,9 +34,9 @@
 	"purge": "Purger",
 	"moderate": "Modérer",
 
-	"admin-dashboard": "Dashboard",
-	"admin-categories": "Categories",
-	"admin-privileges": "Privileges",
-	"admin-users": "Users",
-	"admin-settings": "Settings"
+	"admin-dashboard": "Tableau de bord",
+	"admin-categories": "Catégories",
+	"admin-privileges": "Privilèges",
+	"admin-users": "Utilisateurs",
+	"admin-settings": "Paramètres"
 }

public/language/fr/admin/manage/users.json

@@ -12,9 +12,9 @@
 	"unban": "Dé-bannir le(s) utilisateur(s)",
 	"reset-lockout": "Supprimer le blocage",
 	"reset-flags": "Supprimer les signalements",
-	"delete": "Delete <strong>User(s)</strong>",
-	"delete-content": "Delete User(s) <strong>Content</strong>",
-	"purge": "Delete <strong>User(s)</strong> and <strong>Content</strong>",
+	"delete": "Supprimer <strong>le(s) utilisateur(s)</strong>",
+	"delete-content": "Supprimer <strong>le contenu</strong> du compte",
+	"purge": "Supprimer <strong>le(s) compte(s)</strong> et <strong>le contenu</strong>",
 	"download-csv": "Télécharger au format CSV",
 	"manage-groups": "Gérer les groupes",
 	"add-group": "Ajouter un groupe",
@@ -94,11 +94,11 @@
 	"alerts.validate-email-success": "Adresse e-mail vérifiée",
 	"alerts.validate-force-password-reset-success": "Les mots de passe des utilisateurs ont été réinitialisés et leurs sessions existantes ont été révoquées.",
 	"alerts.password-reset-confirm": "Voulez-vous réellement envoyer un e-mail de réinitialisation de mot de passe à ces utilisateurs ?",
-	"alerts.confirm-delete": "<strong>Warning!</strong><p>Do you really want to delete <strong>user(s)</strong>?</p><p>This action is not reversible! Only the user account will be deleted, their posts and topics will remain.</p>",
+	"alerts.confirm-delete": "<strong>Attention !</strong><p>Voulez-vous réellement supprimer <strong>le(s) utilisateur(s)</strong> ?</p><p> Cette action est irréversible ! Toutes les données de ces utilisateurs seront effacées !</p>",
 	"alerts.delete-success": "Utilisateur(s) supprimé(s) !",
-	"alerts.confirm-delete-content": "<strong>Warning!</strong><p>Do you really want to delete these user(s) <strong>content</strong>?</p><p>This action is not reversible! The users' accounts will remain, but their posts and topics will be deleted.</p>",
-	"alerts.delete-content-success": "User(s) Content Deleted!",
-	"alerts.confirm-purge": "<strong>Warning!</strong><p>Do you really want to delete <strong>user(s) and their content</strong>?</p><p>This action is not reversible! All user data and content will be erased!</p>",
+	"alerts.confirm-delete-content": "<strong>Attention !</strong><p>Voulez-vous réellement supprimer <strong>le contenu de ces utilisateurs</strong> ?</p><p> Cette action est irréversible ! Toutes les données de ces utilisateurs seront effacées !</p>",
+	"alerts.delete-content-success": "Contenu utilisateur(s) supprimé(s) !",
+	"alerts.confirm-purge": "<strong>Attention !</strong><p>Voulez-vous réellement supprimer <strong>ces utilisateurs ainsi que leurs contenus</strong> ?</p><p> Cette action est irréversible ! Toutes les données de ces utilisateurs seront effacées !</p>",
 	"alerts.create": "Créer un utilisateur",
 	"alerts.button-create": "Créer",
 	"alerts.button-cancel": "Annuler",

public/language/fr/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "Autoriser le préchargement de l'en-tête HSTS",
 	"hsts.help": "Si activé, un en-tête HSTS sera défini pour ce site. Vous pouvez choisir d'inclure des sous-domaines et des indicateurs de préchargement dans votre en-tête. En cas de doute, ne cochez pas l'option. <a href=\"%1\">Plus d'informations<i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Gestion du trafic",
-	"traffic.help": "NodeBB est déployé équipé d'un module qui refuse les requêtes en cas de situation de haut traffic. Vous pouvez changer les paramètres ici, bien que les paramètres par défaut sont un bon commencement.",
+	"traffic.help": "NodeBB utilise un module qui refuse automatiquement les demandes dans les situations de fort trafic. Vous pouvez régler ces paramètres ici, bien que les valeurs par défaut soient un bon point de départ.",
 	"traffic.enable": "Activé la gestion du trafic",
 	"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)",

public/language/fr/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Voir le profil",
 	"start-new-chat": "Démarrer un nouveau Chat",
 	"go-to-target": "Voir le signalement cible",
+	"assign-to-me": "Me l'assigner",
 	"delete-post": "Supprimer les messages",
 	"purge-post": "Supprimer définitivement",
 	"restore-post": "Restaurer les messages",

public/language/fr/global.json

@@ -30,6 +30,7 @@
     "header.unread": "Non lus",
     "header.tags": "Mots-clés",
     "header.popular": "Populaire",
+    "header.top": "Haut",
     "header.users": "Utilisateurs",
     "header.groups": "Groupes",
     "header.chats": "Discussions",

public/language/fr/tags.json

@@ -4,5 +4,5 @@
     "enter_tags_here": "Entrez les mots-clés ici. Chaque mot doit faire entre %1 et %2 caractères.",
     "enter_tags_here_short": "Entrez des mots-clés...",
     "no_tags": "Il n'y a pas encore de mots-clés.",
-    "select_tags": "Select Tags"
+    "select_tags": "Sélectionner les mots-clés"
 }

public/language/fr/topic.json

@@ -100,6 +100,10 @@
     "fork_success": "Sujet copié avec succès ! Cliquez ici pour aller au sujet copié.",
     "delete_posts_instruction": "Sélectionnez les messages que vous souhaitez supprimer/vider",
     "merge_topics_instruction": "Cliquez sur les sujets que vous voulez fusionner",
+    "merge-topic-list-title": "Liste des sujets à fusionner",
+    "merge-options": "Options de fusion",
+    "merge-select-main-topic": "Sélectionnez le sujet principal",
+    "merge-new-title-for-topic": "Nouveau titre pour le sujet",
     "move_posts_instruction": "Cliquez sur les messages que vous souhaitez déplacer",
     "change_owner_instruction": "Cliquez sur les messages que vous souhaitez attribuer à un autre utilisateur.",
     "composer.title_placeholder": "Entrer le titre du sujet ici…",
@@ -134,6 +138,9 @@
     "diffs.no-revisions-description": "Cet article a <strong>%1</strong> révisions.",
     "diffs.current-revision": "Révision en cours",
     "diffs.original-revision": "Révision originale",
+    "diffs.restore": "Restaurer cette révision",
+    "diffs.restore-description": "Une nouvelle révision sera ajoutée à l'historique des modifications de ce message.",
+    "diffs.post-restored": "Restauration avec succès dans une révision antérieure",
     "timeago_later": "%1",
     "timeago_earlier": "il y a %1"
 }

public/language/fr/user.json

@@ -8,20 +8,20 @@
     "email": "Email",
     "confirm_email": "Confirmer l'adresse email",
     "account_info": "Informations du compte",
-    "admin_actions_label": "Administrative Actions",
+    "admin_actions_label": "Administration",
     "ban_account": "Bannir",
     "ban_account_confirm": "Êtes-vous sûr de bien vouloir bannir cet utilisateur ?",
     "unban_account": "Restaurer le compte",
     "delete_account": "Supprimer le compte",
-    "delete_account_as_admin": "Delete <strong>Account</strong>",
-    "delete_content": "Delete Account <strong>Content</strong>",
-    "delete_all": "Delete <strong>Account</strong> and <strong>Content</strong>",
-    "delete_account_confirm": "Are you sure you want to anonymize your posts and delete your account?<br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your password to confirm that you wish to destroy this account.",
-    "delete_this_account_confirm": "Are you sure you want to delete this account while leaving its contents behind?<br /><strong>This action is irreversible, posts will be anonymized, and you will not be able to restore post associations with the deleted account</strong><br /><br />",
-    "delete_account_content_confirm": "Are you sure you want to delete this account's content (posts/topics/uploads)? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
-    "delete_all_confirm": "Are you sure you want to delete this account and all of its content (posts/topics/uploads)? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
+    "delete_account_as_admin": "Supprimer le <strong>Compte</strong>",
+    "delete_content": "Supprimer <strong>le contenu</strong> du compte",
+    "delete_all": "Supprimer <strong>le compte</strong> et <strong>le contenu</strong>",
+    "delete_account_confirm": "Êtes-vous sûr de vouloir supprimer votre compte?<br /><strong>Cette action est irréversible et vous ne pourrez récupérer aucune de vos données</strong><br /><br />Entrez votre mot de passe pour confirmer que vous souhaitez détruire ce compte.",
+    "delete_this_account_confirm": "Êtes-vous sûr de vouloir supprimer ce compte? <br /><strong>Cette action est irréversible, les messages deviendront anonymes et vous ne pourrez pas restaurer les messages associés avec le compte supprimé.</strong><br /><br />",
+    "delete_account_content_confirm": "Êtes-vous sûr de vouloir supprimer le contenu de ce compte (messages / sujets / téléversements)? <br /><strong>Cette action est irréversible et vous ne pourrez récupérer aucune donnée.</strong><br /><br />",
+    "delete_all_confirm": "Êtes-vous sûr de vouloir supprimer ce compte et tout son contenu (messages / sujets / téléversements)? <br /><strong>Cette action est irréversible et vous ne pourrez récupérer aucune donnée.</strong><br /><br />",
     "account-deleted": "Compte supprimé",
-    "account-content-deleted": "Account content deleted",
+    "account-content-deleted": "Compte supprimé",
     "fullname": "Nom",
     "website": "Site web",
     "location": "Situation géographique",

public/language/gl/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Traffic Management",
-	"traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Enable Traffic Management",
 	"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)",

public/language/gl/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Ver perfil",
 	"start-new-chat": "Comezar novo chat",
 	"go-to-target": "Ver contido marcado",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/gl/global.json

@@ -30,6 +30,7 @@
     "header.unread": "Non lidas",
     "header.tags": "Etiquetas",
     "header.popular": "Populares",
+    "header.top": "Top",
     "header.users": "Usuarios",
     "header.groups": "Grupos",
     "header.chats": "Charlas",

public/language/gl/topic.json

@@ -99,7 +99,11 @@
     "fork_pid_count": "%1 mensaxe(s) seleccionada(s)",
     "fork_success": "Creouse un novo tema a partir do orixinal! Fai clic aquí para ir ó novo tema.",
     "delete_posts_instruction": "Fai clic nas mensaxes que queres eliminar/limpar",
-    "merge_topics_instruction": "Click the topics you want to merge",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
     "move_posts_instruction": "Click the posts you want to move",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "Introduce o título do teu tema",
@@ -134,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/he/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Traffic Management",
-	"traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Enable Traffic Management",
 	"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)",

public/language/he/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "צפה בפרופיל",
 	"start-new-chat": "התחל שיחה חדשה",
 	"go-to-target": "צפה במטרת הסימון",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/he/global.json

@@ -30,6 +30,7 @@
     "header.unread": "לא נקרא",
     "header.tags": "תגיות",
     "header.popular": "פופולרי",
+    "header.top": "Top",
     "header.users": "משתמשים",
     "header.groups": "קבוצות",
     "header.chats": "צ'אטים",

public/language/he/topic.json

@@ -99,7 +99,11 @@
     "fork_pid_count": "%1 פוסט(ים) נבחרו",
     "fork_success": "הפוסט שוכפל בהצלחה! לחץ כאן על מנת לעבור לפוסט המשוכפל.",
     "delete_posts_instruction": "לחץ על הפוסטים שברצונך למחוק",
-    "merge_topics_instruction": "לחץ על הנושאים שתרצה למזג",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
     "move_posts_instruction": "לחץ על הפוסטים שאתה רוצה להזיז",
     "change_owner_instruction": "לחץ על ההודעה שהנך רוצה לשנות את בעל ההודעה",
     "composer.title_placeholder": "הכנס את כותרת הנושא כאן...",
@@ -134,6 +138,9 @@
     "diffs.no-revisions-description": "לפוסט זה יש <strong>%1</strong>גרסאות",
     "diffs.current-revision": "גירסה נוכחית",
     "diffs.original-revision": "גירסה מקורית",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "אחרי %1:",
     "timeago_earlier": "לפני %1 "
 }

public/language/hr/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Upravljanje prometom",
-	"traffic.help": "NodeBB koristi modul koji automatski odbija zahtjeve u situacijama visokog prometa.Možete ove postavke izmjeniti ovdje,iako su već zadane postavke dobra početna točka.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Omogući upravljanje prometom",
 	"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).",

public/language/hr/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Pogledaj profil",
 	"start-new-chat": "Pokreni novi razgovor",
 	"go-to-target": "Pogledaj metu zastave",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/hr/global.json

@@ -30,6 +30,7 @@
     "header.unread": "Nepročitano",
     "header.tags": "Tagovi",
     "header.popular": "Popularno",
+    "header.top": "Top",
     "header.users": "Korisnici",
     "header.groups": "Grupe",
     "header.chats": "Razgovori",

public/language/hr/topic.json

@@ -99,7 +99,11 @@
     "fork_pid_count": "%1 objava odabrana",
     "fork_success": "Uspješno duplirana tema. Kliknite ovdje za dupliranu temu.",
     "delete_posts_instruction": "Označite objave koje želite obrisati/odbaciti",
-    "merge_topics_instruction": "Click the topics you want to merge",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
     "move_posts_instruction": "Click the posts you want to move",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "Unesite naslov teme ovdje ...",
@@ -134,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/hu/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Forgalomirányítás",
-	"traffic.help": "A NodeBB egy, a kéréseket nagy forgalmú helyzetekben automatikusan elutasító modullal felszerelve vonul fel. Átállíthatod ezen opciókat, habár az alapértékek egy remek kiinduló pont.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Forgalomirányítás engedélyezése",
 	"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)",

public/language/hu/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Profil megtekintése",
 	"start-new-chat": "Új chat indítása",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/hu/global.json

@@ -30,6 +30,7 @@
     "header.unread": "Olvasatlan",
     "header.tags": "Címkék",
     "header.popular": "Népszerű",
+    "header.top": "Top",
     "header.users": "Felhasználók",
     "header.groups": "Csoportok",
     "header.chats": "Chat",

public/language/hu/topic.json

@@ -99,7 +99,11 @@
     "fork_pid_count": "%1 kiválasztott hozzászólás",
     "fork_success": "Témakör sikeresen szétválasztva! Kattints ide a szétválasztott témakörre ugráshoz.",
     "delete_posts_instruction": "Kattints a törlendő/véglegesen törlendő hozzászólásokra",
-    "merge_topics_instruction": "Kattints a összevonandó témakörökre",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
     "move_posts_instruction": "Click the posts you want to move",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "Add meg a témakör címét...",
@@ -134,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/id/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Traffic Management",
-	"traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Enable Traffic Management",
 	"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)",

public/language/id/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/id/global.json

@@ -30,6 +30,7 @@
     "header.unread": "Belum dibaca",
     "header.tags": "Tag",
     "header.popular": "Populer",
+    "header.top": "Top",
     "header.users": "Pengguna",
     "header.groups": "Grup",
     "header.chats": "Chat",

public/language/id/topic.json

@@ -99,7 +99,11 @@
     "fork_pid_count": "%1 post(s) selected",
     "fork_success": "Topik berhasil dicabangkan! Klik disini untuk menuju topik yang telah dicabangkan.",
     "delete_posts_instruction": "Click the posts you want to delete/purge",
-    "merge_topics_instruction": "Click the topics you want to merge",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
     "move_posts_instruction": "Click the posts you want to move",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "Masukkan judul topik di sini...",
@@ -134,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/it/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "Consenti la precarica dell'intestazione HSTS",
 	"hsts.help": "Se abilitato, sarà impostata un'intestazione HSTS per questo sito. Puoi scegliere di includere sottodomini e segnalazioni di precaricamento nell'intestazione. In caso di dubbio, puoi lasciarle deselezionate. <a href=\"%1\">Più informazioni <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Gestione Traffico",
-	"traffic.help": "NodeBB è dotato di un modulo che nega automaticamente le richieste in situazioni ad alto traffico. Puoi regolare queste impostazioni qui, anche se i valori predefiniti sono un buon punto di partenza.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "Abilita Gestione Traffico",
 	"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)",

public/language/it/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Vedi Profilo",
 	"start-new-chat": "Inizia Nuova Chat",
 	"go-to-target": "Visualizza oggetto segnalazione",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Elimina post",
 	"purge-post": "Elimina Post",
 	"restore-post": "Ripristina post",

public/language/it/global.json

@@ -30,6 +30,7 @@
     "header.unread": "Non letti",
     "header.tags": "Tag",
     "header.popular": "Popolare",
+    "header.top": "Top",
     "header.users": "Utenti",
     "header.groups": "Gruppi",
     "header.chats": "Chat",

public/language/it/topic.json

@@ -99,7 +99,11 @@
     "fork_pid_count": "%1 post selezionati",
     "fork_success": "Topic Diviso con successo ! Clicca qui per andare al Topic Diviso.",
     "delete_posts_instruction": "Clicca sui post che vuoi eliminare/eliminare definitivamente",
-    "merge_topics_instruction": "Clicca sulle discussioni che vuoi unire",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
     "move_posts_instruction": "Clicca sui post che vuoi spostare",
     "change_owner_instruction": "Clicca sui post che vuoi assegnare ad un altro utente",
     "composer.title_placeholder": "Inserisci qui il titolo della discussione...",
@@ -134,6 +138,9 @@
     "diffs.no-revisions-description": "Questo post ha <strong>%1</strong> revisioni.",
     "diffs.current-revision": "revisione corrente",
     "diffs.original-revision": "revisione originale",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 successivo",
     "timeago_earlier": "%1 precedente"
 }

public/language/ja/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "トラフィック管理",
-	"traffic.help": "NodeBBは、トラフィックの多い状況で要求を自動的に拒否するモジュールを備えています。これらの設定はここで調整することができますが、はじめはデフォルト設定にしておくことをお勧めします。",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "トラフィック管理を有効にする",
 	"traffic.event-lag": "イベントループの場所のしきい値(ミリ秒単位)",
 	"traffic.event-lag-help": "この値を下げるとページの読み込み時間が短縮されますが、さらに多くのユーザーには「過剰な読み込み」メッセージが表示されます。(再起動が必要)",

public/language/ja/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "プロフィールを見る",
 	"start-new-chat": "新しいチャットを開始",
 	"go-to-target": "フラグのターゲットを表示",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/ja/global.json

@@ -30,6 +30,7 @@
     "header.unread": "未読",
     "header.tags": "タグ",
     "header.popular": "人気",
+    "header.top": "Top",
     "header.users": "ユーザー",
     "header.groups": "グループ",
     "header.chats": "チャット",

public/language/ja/topic.json

@@ -99,7 +99,11 @@
     "fork_pid_count": "%1 投稿(s)が選択されました",
     "fork_success": "スレッドをフォークするのに成功しました。ここを押して、このフォークしたスレッドに行きます。",
     "delete_posts_instruction": "削除または切り離するには、当てはまる投稿を押してください",
-    "merge_topics_instruction": "結合したいトピックをクリック",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
     "move_posts_instruction": "移動したい投稿をクリック",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "スレッドのタイトルを入力...",
@@ -134,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "現在のリビジョン",
     "diffs.original-revision": "元のリビジョン",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/ko/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "트래픽 관리",
-	"traffic.help": "NodeBB는 트래픽이 많은 상황에서는 자동으로 리퀘스트를 거부하는 모듈을 가지고 있습니다. 이에 관련된 세팅은 디폴트 값들도 괜찮지만, 여기서 세부 조율도 가능합니다.",
+	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
 	"traffic.enable": "트래픽 관리 허용",
 	"traffic.event-lag": "이벤트 루프 간격(단위: 1/1000초)",
 	"traffic.event-lag-help": "이 값을 낮추게 되면 페이지 로딩에 걸리는 시간이 단축되지만, 더 많은 사용자들이 \"과도한 로딩\"이라는 메시지를 보게됩니다. (재시작 필요)",

public/language/ko/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "프로필 보기",
 	"start-new-chat": "새로운 채팅 시작",
 	"go-to-target": "신고된 게시물 바로가기",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/ko/global.json

@@ -30,6 +30,7 @@
     "header.unread": "읽지 않은 게시물",
     "header.tags": "태그",
     "header.popular": "인기 게시물",
+    "header.top": "Top",
     "header.users": "사용자",
     "header.groups": "그룹",
     "header.chats": "채팅",

public/language/ko/topic.json

@@ -99,7 +99,11 @@
     "fork_pid_count": "%1 개의 포스트(들)이 선택되었습니다",
     "fork_success": "게시물이 분리되었습니다! 분리된 게시물을 보려면 여기를 클릭 하세요.",
     "delete_posts_instruction": "삭제할 포스트를 선택하세요.",
-    "merge_topics_instruction": "병합할 게시물을 클릭하세요",
+    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge-topic-list-title": "List of topics to be merged",
+    "merge-options": "Merge options",
+    "merge-select-main-topic": "Select the main topic",
+    "merge-new-title-for-topic": "New title for topic",
     "move_posts_instruction": "Click the posts you want to move",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "게시물 제목을 입력하세요.",
@@ -134,6 +138,9 @@
     "diffs.no-revisions-description": "이 게시글에는 <strong>%1</strong>번의 수정이 있습니다.",
     "diffs.current-revision": "현재 리비젼",
     "diffs.original-revision": "원래의 리비젼",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }