Merge remote-tracking branch 'origin/master' into chat-kick-support

public/language/ar/admin/extend/plugins.json

@@ -44,6 +44,8 @@
 	"alert.package-manager-unreachable": "<p>NodeBB could not reach the package manager, an upgrade is not suggested at this time.</p>",
 	"alert.incompatible": "<p>Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.</p>",
 	"alert.possibly-incompatible": "<div class=\"alert alert-warning\"><p><strong>No Compatibility Information Found</strong></p><p>This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.</p></div><p>In the event that NodeBB cannot boot properly:</p><pre><code>$ ./nodebb reset plugin=\"%1\"</code></pre><p>Continue installation of latest version of this plugin?</p>",
+	"alert.reorder": "Plugins Re-ordered",
+	"alert.reorder-success": "Please rebuild and restart your NodeBB to fully complete the process.",
 
 	"license.title": "معلومات ترخيص الإضافة",
 	"license.intro": "The plugin <strong>%1</strong> is licensed under the %2. Please read and understand the license terms prior to activating this plugin.",

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

@@ -5,6 +5,7 @@
 	"private-groups.warning": "<strong>Beware!</strong> If this option is disabled and you have private groups, they automatically become public.",
 	"allow-creation": "Allow Group Creation",
 	"allow-creation-help": "If enabled, users can create groups <em>(Default: disabled)</em>",
+	"allow-multiple-badges-help": "This flag can be used to allow users to select multiple group badges, requires theme support.",
 	"max-name-length": "Maximum Group Name Length",
 	"cover-image": "Group Cover Image",
 	"default-cover": "Default Cover Images",

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

@@ -2,5 +2,6 @@
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
 	"welcome-notification-link": "Welcome Notification Link",
-	"welcome-notification-uid": "Welcome Notification User (UID)"
+	"welcome-notification-uid": "Welcome Notification User (UID)",
+	"notification-alert-timeout": "Notification Alert Timeout"
 }

public/language/ar/error.json

@@ -18,6 +18,7 @@
     "invalid-username-or-password": "المرجود تحديد اسم مستخدم و كلمة مرور",
     "invalid-search-term": "كلمة البحث غير صحيحة",
     "invalid-url": "Invalid URL",
+    "local-login-disabled": "Local login system has been disabled for non-privileged accounts.",
     "csrf-invalid": "لم تتمكن من تسجيل الدخول. هنالك أحتمال ان جلستك انتهت. رجاءًا حاول مرة اخرى.",
     "invalid-pagination-value": "رقم الصفحة غير صحيح ، يجب أن يكون بين %1 و %2 .",
     "username-taken": "اسم المستخدم مأخوذ",

public/language/ar/flags.json

@@ -18,6 +18,7 @@
 	"filter-type": "Flag Type",
 	"filter-type-all": "All Content",
 	"filter-type-post": "Post",
+	"filter-type-user": "User",
 	"filter-state": "State",
 	"filter-assignee": "Assignee UID",
 	"filter-cid": "Category",

public/language/ar/global.json

@@ -97,6 +97,7 @@
     "enter_page_number": "ادخل رقم الصفحة",
     "upload_file": "ارفع ملف",
     "upload": "ارفع",
+    "uploads": "Uploads",
     "allowed-file-types": "صيغ الملفات المدعومة هي 1%",
     "unsaved-changes": "لديك تغييرات لم تحفظ. هل أنت متأكد من رغبتك بمغادرة الصفحة؟",
     "reconnecting-message": "يبدو أن اتصالك لـ %1 قد فقد. رجاءًا أنتظر ثم حاول الإتصال مرة اخرى.",

public/language/ar/pages.json

@@ -49,6 +49,8 @@
     "account/upvoted": "Posts upvoted by %1",
     "account/downvoted": "Posts downvoted by %1",
     "account/best": "Best posts made by %1",
+    "account/blocks": "Blocked users for %1",
+    "account/uploads": "Uploads by %1",
     "confirm": "تم التحقق من عنوان البريد الإلكتروني",
     "maintenance.text": "جاري صيانة %1. المرجو العودة لاحقًا.",
     "maintenance.messageIntro": "بالإضافة إلى ذلك، قام مدبر النظام بترك هذه الرسالة:",

public/language/ar/register.json

@@ -19,5 +19,8 @@
     "terms_of_use_error": "يجب عليك الموافقة على شروط الاستخدام",
     "registration-added-to-queue": "تمت إضافتك في قائمة الإنتضار. ستتلقى رسالة إلكترونية عند الموافقة على تسجيلك من قبل الإدارة.",
     "interstitial.intro": "نحتاج إلى بعض المعلومات الإضافية قبل أن نتمكن من إنشاء حسابك.",
-    "interstitial.errors-found": "تعذر علينا إتمام عملية التسجيل:"
+    "interstitial.errors-found": "تعذر علينا إتمام عملية التسجيل:",
+    "gdpr_agree_data": "I consent to the collection and processing of my personal information on this website.",
+    "gdpr_agree_email": "I consent to receive digest and notification emails from this website.",
+    "gdpr_consent_denied": "You must give consent to this site to collect/process your information, and to send you emails."
 }

public/language/ar/topic.json

@@ -118,8 +118,8 @@
     "sort_by": "ترتيب حسب",
     "oldest_to_newest": "من الأقدم إلى الأحدث",
     "newest_to_oldest": "من الأحدث إلى الأقدم",
-    "most_votes": "الأكثر تصويتًا",
+    "most_votes": "Most Votes",
-    "most_posts": "اﻷكثر رداً",
+    "most_posts": "Most Posts",
     "stale.title": "Create new topic instead?",
     "stale.warning": "The topic you are replying to is quite old. Would you like to create a new topic instead, and reference this one in your reply?",
     "stale.create": "موضوع جديد",
@@ -127,5 +127,7 @@
     "link_back": "رد:  [%1](%2)",
     "diffs.title": "Post Edit History",
     "diffs.description": "This post has <strong>%1</strong> revisions. Click one of the revisions below to see the post content at that point in time.",
-    "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions."
+    "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
+    "diffs.current-revision": "current revision",
+    "diffs.original-revision": "original revision"
 }

public/language/ar/uploads.json

@@ -2,5 +2,8 @@
     "uploading-file": "جاري رفع الملف...",
     "select-file-to-upload": "إختر ملف لرفعه!",
     "upload-success": "تم رفع الملف بنجاح!",
-    "maximum-file-size": "الحجم الأقصى %1 كيلوبت"
+    "maximum-file-size": "الحجم الأقصى %1 كيلوبت",
+    "no-uploads-found": "No uploads found",
+    "public-uploads-info": "Uploads are public, all visitors can see them.",
+    "private-uploads-info": "Uploads are private, only logged in users can see them."
 }

public/language/ar/user.json

@@ -29,6 +29,8 @@
     "ignored": "تم تجاهله",
     "followers": "المتابعون",
     "following": "يتابع",
+    "blocks": "Blocks",
+    "block_toggle": "Toggle Block",
     "aboutme": "معلومة عنك او السيرة الذاتية",
     "signature": "توقيع",
     "birthday": "عيد ميلاد",
@@ -89,6 +91,7 @@
     "has_no_upvoted_posts": "هذا المستخدم لم يقم بالتصويت للأعلى لأي مشاركة حتى الآن.",
     "has_no_downvoted_posts": "هذا المستخدم لم يقم بالتصويت للأسفل لأي مشاركة حتى الآن.",
     "has_no_voted_posts": "هذا المستخدم لا يمتلك اية مشاركات تم التصويت عليها",
+    "has_no_blocks": "You have blocked no users.",
     "email_hidden": "البريد الإلكتروني مخفي",
     "hidden": "مخفي",
     "paginate_description": "عرض المواضيع والردود موزعة على صفحات عوضاً عن التمرير اللانهائي.",
@@ -142,5 +145,25 @@
     "info.email-history": "سجل البريد الإلكتروني",
     "info.moderation-note": "ملاحظة الإشراف",
     "info.moderation-note.success": "تم حفظ ملاحظة الإشراف",
-    "info.moderation-note.add": "إضافة ملاحظة"
+    "info.moderation-note.add": "إضافة ملاحظة",
+    "consent.title": "Your Rights & Consent",
+    "consent.lead": "This community forum collects and processes your personal information.",
+    "consent.intro": "We use this information strictly to personalise your experience in this community, as well as to associate the posts you make to your user account. During the registration step you were asked to provide a username and email address, you can also optionally provide additional information to complete your user profile on this website.<br /><br />We retain this information for the life of your user account, and you are able to withdraw consent at any time by deleting your account. At any time you may request a copy of your contribution to this website, via your Rights &amp; Consent page.<br /><br />If you have any questions or concerns, we encourage you to reach out to this forum's administrative team.",
+    "consent.email_intro": "Occasionally, we may send emails to your registered email address in order to provide updates and/or to notify you of new activity that is pertinent to you. You can customise the frequency of the community digest (including disabling it outright), as well as select which types of notifications to receive via email, via your user settings page.",
+    "consent.digest_frequency": "By default, this community delivers email digests every %1.",
+    "consent.digest_off": "Currently, this community does not send out email digests",
+    "consent.received": "You have provided consent for this website to collect and process your information. No additional action is required.",
+    "consent.not_received": "You have not provided consent for data collection and processing. At any time this website&apos;s administration may elect to delete your account in order to become compliant with the General Data Protection Regulation.",
+    "consent.give": "Give consent",
+    "consent.right_of_access": "You have the Right of Access",
+    "consent.right_of_access_description": "You have the right to access any data collected by this website upon request. You can retrieve a copy of this data by clicking the appropriate button below.",
+    "consent.right_to_rectification": "You have the Right to Rectification",
+    "consent.right_to_rectification_description": "You have the right to change or update any inaccurate data provided to us. Your profile can be updated by editing your profile, and post content can always be edited. If this is not the case, please contact this site&apos;s administrative team.",
+    "consent.right_to_erasure": "You have the Right to Erasure",
+    "consent.right_to_erasure_description": "At any time, you are able to revoke your consent to data collection and/or processing by deleting your account.",
+    "consent.right_to_data_portability": "You have the Right to Data Portability",
+    "consent.right_to_data_portability_description": "You may request from us a machine-readable export of any collected data about you and your account. You can do so by clicking the appropriate button below.",
+    "consent.export_profile": "Export Profile (.csv)",
+    "consent.export_uploads": "Export Uploaded Content (.zip)",
+    "consent.export_posts": "Export Posts (.csv)"
 }

public/language/bg/admin/extend/plugins.json

@@ -44,6 +44,8 @@
 	"alert.package-manager-unreachable": "<p>NodeBB не може да се свърже с пакетния мениджър. Не се препоръчва обновяване в момента.</p>",
 	"alert.incompatible": "<p>Вашата версия на NodeBB (версия %1) може да използва най-много версия %2 на тази добавка. Моля, обновете NodeBB, ако искате да инсталирате по-нова версия на тази добавка.</p>",
 	"alert.possibly-incompatible": "<div class=\"alert alert-warning\"><p><strong>Няма информация за съвместимостта</strong></p><p>Тази добавка не е посочила конкретна версия за инсталация, съвместима с Вашата версия на NodeBB. Не можем да гарантираме пълна съвместимост и има възможност Вашият NodeBB да не може да стартира правилно.</p></div><p>Ако NodeBB не може да стартира, използвайте следната команда:</p><pre><code>$ ./nodebb reset plugin=\"%1\"</code></pre><p>Искате ли да продължите с инсталацията на най-новата версия на тази добавка?</p>",
+	"alert.reorder": "Добавките са пренаредени",
+	"alert.reorder-success": "Моля, изградете повторно и рестартирайте NodeBB, за да завърши този процес напълно.",
 
 	"license.title": "Информация за лиценза на добавката",
 	"license.intro": "Добавката „<strong>%1</strong>“ използва лиценза „%2“. Моля, прочетете условията на лиценза и се уверете, че ги разбирате, преди да включите добавката.",

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

@@ -5,6 +5,7 @@
 	"private-groups.warning": "<strong>Внимание!</strong> Ако това е изключено и имате частни групи, те автоматично ще станат публични.",
 	"allow-creation": "Позволяване на създаването на групи",
 	"allow-creation-help": "Ако е включено, потребителите ще могат да създават групи. <em>(По подразбиране: изключено)</em>",
+	"allow-multiple-badges-help": "Това може да се използва, за да позволи на потребителите да избират множество значки за групите. Изисква поддържа на теми.",
 	"max-name-length": "Минимална дължина на името на група",
 	"cover-image": "Изображение на корицата за групата",
 	"default-cover": "Стандартни изображения на корицата",

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

@@ -2,5 +2,6 @@
 	"notifications": "Известия",
 	"welcome-notification": "Приветствено известие",
 	"welcome-notification-link": "Връзка за приветственото известие",
-	"welcome-notification-uid": "Потр. ид. за приветственото известие"
+	"welcome-notification-uid": "Потр. ид. за приветственото известие",
+	"notification-alert-timeout": "Време за изчакване преди премахване на уведомяването за известие"
 }

public/language/bg/error.json

@@ -18,6 +18,7 @@
     "invalid-username-or-password": "Моля, въведете потребителско име и парола",
     "invalid-search-term": "Грешен текст за търсене",
     "invalid-url": "Грешен адрес",
+    "local-login-disabled": "Системата за местно вписване е изключена за непривилегированите акаунти.",
     "csrf-invalid": "Не успяхме да Ви впишем, най-вероятно защото сесията Ви е изтекла. Моля, опитайте отново",
     "invalid-pagination-value": "Грешен номер на странициране, трябва да бъде между %1 и %2",
     "username-taken": "Потребителското име е заето",

public/language/bg/flags.json

@@ -18,6 +18,7 @@
 	"filter-type": "Вид на доклада",
 	"filter-type-all": "Всичко",
 	"filter-type-post": "Публикация",
+	"filter-type-user": "Потребител",
 	"filter-state": "Състояние",
 	"filter-assignee": "Потр. ид. на назначения",
 	"filter-cid": "Категория",

public/language/bg/global.json

@@ -97,6 +97,7 @@
     "enter_page_number": "Въведете номер на страница",
     "upload_file": "Качване на файл",
     "upload": "Качване",
+    "uploads": "Качвания",
     "allowed-file-types": "Разрешените файлови типове са: %1",
     "unsaved-changes": "Имате незапазени промени. Наистина ли искате да напуснете тази страница?",
     "reconnecting-message": "Изглежда връзката Ви към %1 беше прекъсната. Моля, изчакайте докато се опитаме да Ви свържем отново.",

public/language/bg/pages.json

@@ -49,6 +49,8 @@
     "account/upvoted": "Публикации, получили положителен глас от %1",
     "account/downvoted": "Публикации, получили отрицателен глас от %1",
     "account/best": "Най-добрите публикации от %1",
+    "account/blocks": "Блокирани потребители за %1",
+    "account/uploads": "Качвания от %1",
     "confirm": "Е-пощата е потвърдена",
     "maintenance.text": "%1 в момента е в профилактика. Моля, върнете се по-късно.",
     "maintenance.messageIntro": "В допълнение, администраторът е оставил това съобщение:",

public/language/bg/register.json

@@ -19,5 +19,8 @@
     "terms_of_use_error": "Трябва да се съгласите с условията за ползване",
     "registration-added-to-queue": "Вашата регистрация беше добавена в опашката за одобрение. Ще получите е-писмо, когато тя бъде одобрена от администратор.",
     "interstitial.intro": "Нуждаем се от малко допълнителна информация, преди да можем да създадем акаунта Ви.",
-    "interstitial.errors-found": "Не можем да завършим Вашата регистрация:"
+    "interstitial.errors-found": "Не можем да завършим Вашата регистрация:",
+    "gdpr_agree_data": "Съгласявам се това личната ми информация да се съхранява и обработва от този уеб сайт.",
+    "gdpr_agree_email": "Съгласявам се да получавам е-писма с резюмета и известия от този уеб сайт.",
+    "gdpr_consent_denied": "Трябва да се съгласите с това уеб сайтът да събира/обработва информацията Ви, и да Ви изпраща е-писма."
 }

public/language/bg/topic.json

@@ -118,8 +118,8 @@
     "sort_by": "Подреждане по",
     "oldest_to_newest": "Първо най-старите",
     "newest_to_oldest": "Първо най-новите",
-    "most_votes": "Най-много гласове",
+    "most_votes": "Първо тези с най-много гласове",
-    "most_posts": "Най-много публикации",
+    "most_posts": "Първо тези с най-много публикации",
     "stale.title": "Създаване на нова тема вместо това?",
     "stale.warning": "Темата, в която отговаряте, е доста стара. Искате ли вместо това да създадете нова и да направите препратка към тази в отговора си?",
     "stale.create": "Създаване на нова тема",
@@ -127,5 +127,7 @@
     "link_back": "Отговор: [%1](%2)",
     "diffs.title": "История на редакциите",
     "diffs.description": "Тази публикация има <strong>%1</strong> варианта. Щракнете върху някоя от версиите по-долу, за да видите съдържанието ѝ в съответния момент.",
-    "diffs.no-revisions-description": "Тази публикация има <strong>%1</strong> варианта."
+    "diffs.no-revisions-description": "Тази публикация има <strong>%1</strong> варианта.",
+    "diffs.current-revision": "текуща версия",
+    "diffs.original-revision": "оригинална версия"
 }

public/language/bg/uploads.json

@@ -2,5 +2,8 @@
     "uploading-file": "Качване на файла…",
     "select-file-to-upload": "Изберете файл за качване!",
     "upload-success": "Файлът е качен успешно!",
-    "maximum-file-size": "Най-много %1 КБ"
+    "maximum-file-size": "Най-много %1 КБ",
+    "no-uploads-found": "Няма качвания",
+    "public-uploads-info": "Качванията са публични – всички посетители могат да ги видят.",
+    "private-uploads-info": "Качванията са частни – само вписаните потребители могат да ги видят"
 }

public/language/bg/user.json

@@ -29,6 +29,8 @@
     "ignored": "Пренебрегвани",
     "followers": "Последователи",
     "following": "Следва",
+    "blocks": "Блокира",
+    "block_toggle": "Превключване на блокирането",
     "aboutme": "За мен",
     "signature": "Подпис",
     "birthday": "Рождена дата",
@@ -89,6 +91,7 @@
     "has_no_upvoted_posts": "Този потребител не е гласувал положително досега.",
     "has_no_downvoted_posts": "Този потребител не е гласувал отрицателно досега.",
     "has_no_voted_posts": "Този потребител не е гласувал досега.",
+    "has_no_blocks": "Не сте блокирали никого.",
     "email_hidden": "Е-пощата е скрита",
     "hidden": "скрито",
     "paginate_description": "Разделяне на темите и публикациите на страници, вместо да се превърта безкрайно",
@@ -142,5 +145,25 @@
     "info.email-history": "Историята на е-пощите",
     "info.moderation-note": "Модераторска бележка",
     "info.moderation-note.success": "Модераторската бележка е запазена",
-    "info.moderation-note.add": "Добавяне на бележка"
+    "info.moderation-note.add": "Добавяне на бележка",
+    "consent.title": "Вашите права и съгласие",
+    "consent.lead": "Този обществен форум събира и обработва лична информация.",
+    "consent.intro": "Използваме тази информация, само за да персонализираме взаимодействието Ви с форума, както и за да свържем публикациите Ви с Вашия потребителски акаунт. По време на регистрацията ще трябва да въведете потребителско име и е-поща, но ако искате, можете да предоставите и допълнителна информация, за да завършите потребителския си профил в уеб сайта.<br /><br />Ние съхраняваме тази информация докато съществува потребителският Ви акаунт. Във всеки един момент можете да оттеглите съгласието си за това, като изтриете акаунта си. Във всеки един момент можете да изискате копие на въведеното от Вас в уеб сайт, чрез страницата за „Права и съгласие“.<br /><br />Ако имате въпроси или притеснения, можете да се свържете с екипа от администратори на форума.",
+    "consent.email_intro": "Понякога може да изпращаме е-писма на регистрираната Ви е-поща, за да Ви кажем какво се случва, или да Ви уведомим, че има нещо ново, което Ви засяга. Можете да персонализирате честотата на резюметата (както и да ги изключите), както и да изберете какви известия да получавате по е-поща, чрез страницата с потребителските настройки.",
+    "consent.digest_frequency": "По подразбиране резюмета се изпращат по е-поща на всеки %1.",
+    "consent.digest_off": "В момента не се изпращат е-писма с резюмета",
+    "consent.received": "Вие сте се съгласили с това уеб сайтът да събира и обработва личната Ви информация. Не се изискват допълнителни действия.",
+    "consent.not_received": "Вие не сте се съгласили със събирането и обработването на Ваши данни. Администрацията на уеб сайта може по всяко време да изтрие акаунта Ви, за да спази изискванията за защита на данните.",
+    "consent.give": "Даване на съгласие",
+    "consent.right_of_access": "Имате право на достъп",
+    "consent.right_of_access_description": "Имате право на достъп до всички данни, събирани от този уеб сайт, при заявяване. Можете да получите копие от данните, като натиснете бутона по-долу.",
+    "consent.right_to_rectification": "Имате право на поправка",
+    "consent.right_to_rectification_description": "Имате право да промените или поправите всички неточни данни, които сте ни предоставили. Профилът Ви може да бъде променен като го редактирате, а съдържанието на публикациите може да бъде редактирано по всяко време. Ако имате по-различно изискване, моля, свържете се с администраторския екип",
+    "consent.right_to_erasure": "Имате право на изтриване",
+    "consent.right_to_erasure_description": "Във всеки един момент можете да оттеглите съгласието си за събиране и/или обработка на данни, като изтриете акаунта си.",
+    "consent.right_to_data_portability": "Имате право на пренос на данни",
+    "consent.right_to_data_portability_description": "Можете да изискате от нас всички събрани за Вас и акаунта Ви данни в машинен формат. Можете да направите това като натиснете съответния бутон по-долу.",
+    "consent.export_profile": "Изнасяне на профила (.csv)",
+    "consent.export_uploads": "Изнасяне на каченото съдържание (.zip)",
+    "consent.export_posts": "Изнасяне на публикациите (.csv)"
 }

public/language/bn/admin/extend/plugins.json

@@ -44,6 +44,8 @@
 	"alert.package-manager-unreachable": "<p>NodeBB could not reach the package manager, an upgrade is not suggested at this time.</p>",
 	"alert.incompatible": "<p>Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.</p>",
 	"alert.possibly-incompatible": "<div class=\"alert alert-warning\"><p><strong>No Compatibility Information Found</strong></p><p>This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.</p></div><p>In the event that NodeBB cannot boot properly:</p><pre><code>$ ./nodebb reset plugin=\"%1\"</code></pre><p>Continue installation of latest version of this plugin?</p>",
+	"alert.reorder": "Plugins Re-ordered",
+	"alert.reorder-success": "Please rebuild and restart your NodeBB to fully complete the process.",
 
 	"license.title": "Plugin License Information",
 	"license.intro": "The plugin <strong>%1</strong> is licensed under the %2. Please read and understand the license terms prior to activating this plugin.",

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

@@ -5,6 +5,7 @@
 	"private-groups.warning": "<strong>Beware!</strong> If this option is disabled and you have private groups, they automatically become public.",
 	"allow-creation": "Allow Group Creation",
 	"allow-creation-help": "If enabled, users can create groups <em>(Default: disabled)</em>",
+	"allow-multiple-badges-help": "This flag can be used to allow users to select multiple group badges, requires theme support.",
 	"max-name-length": "Maximum Group Name Length",
 	"cover-image": "Group Cover Image",
 	"default-cover": "Default Cover Images",

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

@@ -2,5 +2,6 @@
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
 	"welcome-notification-link": "Welcome Notification Link",
-	"welcome-notification-uid": "Welcome Notification User (UID)"
+	"welcome-notification-uid": "Welcome Notification User (UID)",
+	"notification-alert-timeout": "Notification Alert Timeout"
 }

public/language/bn/error.json

@@ -18,6 +18,7 @@
     "invalid-username-or-password": "অনুগ্রহ পূর্বক ইউজারনেম এবং পাসওয়ার্ড উভয়ই প্রদান করুন",
     "invalid-search-term": "অগ্রহনযোগ্য সার্চ টার্ম",
     "invalid-url": "Invalid URL",
+    "local-login-disabled": "Local login system has been disabled for non-privileged accounts.",
     "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "ইউজারনেম আগেই ব্যবহৃত",

public/language/bn/flags.json

@@ -18,6 +18,7 @@
 	"filter-type": "Flag Type",
 	"filter-type-all": "All Content",
 	"filter-type-post": "Post",
+	"filter-type-user": "User",
 	"filter-state": "State",
 	"filter-assignee": "Assignee UID",
 	"filter-cid": "Category",

public/language/bn/global.json

@@ -97,6 +97,7 @@
     "enter_page_number": "Enter page number",
     "upload_file": "Upload file",
     "upload": "Upload",
+    "uploads": "Uploads",
     "allowed-file-types": "Allowed file types are %1",
     "unsaved-changes": "You have unsaved changes. Are you sure you wish to navigate away?",
     "reconnecting-message": "Looks like your connection to %1 was lost, please wait while we try to reconnect.",

public/language/bn/pages.json

@@ -49,6 +49,8 @@
     "account/upvoted": "Posts upvoted by %1",
     "account/downvoted": "Posts downvoted by %1",
     "account/best": "Best posts made by %1",
+    "account/blocks": "Blocked users for %1",
+    "account/uploads": "Uploads by %1",
     "confirm": "Email Confirmed",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
     "maintenance.messageIntro": "Additionally, the administrator has left this message:",

public/language/bn/register.json

@@ -19,5 +19,8 @@
     "terms_of_use_error": "আপনাকে অবশ্যই ব্যাবহার নীতিমালায় সম্মত হতে হবে।",
     "registration-added-to-queue": "আপনার নিবন্ধনটি এ্যাপ্লুভাল তালিকায় যুক্ত হয়েছে। একজন এডমিনিস্ট্রেটর কর্তৃক নিবন্ধন গৃহীত হলে আপনি একটি মেইল পাবেন। ",
     "interstitial.intro": "আপনার একাউন্ট তৈরীর পূর্বে আমাদের আরো কিছু বাড়তি তথ্য জানা প্রয়োজন।",
-    "interstitial.errors-found": "আপনার নিবন্ধনটি সম্পূর্ণ করা সম্ভব হয় নি।"
+    "interstitial.errors-found": "আপনার নিবন্ধনটি সম্পূর্ণ করা সম্ভব হয় নি।",
+    "gdpr_agree_data": "I consent to the collection and processing of my personal information on this website.",
+    "gdpr_agree_email": "I consent to receive digest and notification emails from this website.",
+    "gdpr_consent_denied": "You must give consent to this site to collect/process your information, and to send you emails."
 }

public/language/bn/topic.json

@@ -118,8 +118,8 @@
     "sort_by": "সাজানোর ভিত্তি:",
     "oldest_to_newest": "পুরাতন থেকে নতুন",
     "newest_to_oldest": "নতুন থেকে পুরাতন",
-    "most_votes": "সর্বোচ্চ ভোট",
+    "most_votes": "Most Votes",
-    "most_posts": "Most posts",
+    "most_posts": "Most Posts",
     "stale.title": "Create new topic instead?",
     "stale.warning": "The topic you are replying to is quite old. Would you like to create a new topic instead, and reference this one in your reply?",
     "stale.create": "Create a new topic",
@@ -127,5 +127,7 @@
     "link_back": "Re: [%1](%2)",
     "diffs.title": "Post Edit History",
     "diffs.description": "This post has <strong>%1</strong> revisions. Click one of the revisions below to see the post content at that point in time.",
-    "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions."
+    "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
+    "diffs.current-revision": "current revision",
+    "diffs.original-revision": "original revision"
 }

public/language/bn/uploads.json

@@ -2,5 +2,8 @@
     "uploading-file": "Uploading the file...",
     "select-file-to-upload": "Select a file to upload!",
     "upload-success": "File uploaded successfully!",
-    "maximum-file-size": "Maximum %1 kb"
+    "maximum-file-size": "Maximum %1 kb",
+    "no-uploads-found": "No uploads found",
+    "public-uploads-info": "Uploads are public, all visitors can see them.",
+    "private-uploads-info": "Uploads are private, only logged in users can see them."
 }

public/language/bn/user.json

@@ -29,6 +29,8 @@
     "ignored": "Ignored",
     "followers": "যাদের অনুসরণ করছেন",
     "following": "যারা আপনাকে অনুসরণ করছে",
+    "blocks": "Blocks",
+    "block_toggle": "Toggle Block",
     "aboutme": "আমার সম্পর্কে: ",
     "signature": "স্বাক্ষর",
     "birthday": "জন্মদিন",
@@ -89,6 +91,7 @@
     "has_no_upvoted_posts": "This user hasn't upvoted any posts yet.",
     "has_no_downvoted_posts": "This user hasn't downvoted any posts yet.",
     "has_no_voted_posts": "This user has no voted posts",
+    "has_no_blocks": "You have blocked no users.",
     "email_hidden": "ইমেইল গোপন রাখা হয়েছে",
     "hidden": "গোপন করা হয়েছে",
     "paginate_description": "ইনফাইনাইট স্ক্রলের বদলে টপিক ও পোস্টের জন্য পেজিনেশন ব্যাবহার করা হোক",
@@ -142,5 +145,25 @@
     "info.email-history": "Email History",
     "info.moderation-note": "Moderation Note",
     "info.moderation-note.success": "Moderation note saved",
-    "info.moderation-note.add": "Add note"
+    "info.moderation-note.add": "Add note",
+    "consent.title": "Your Rights & Consent",
+    "consent.lead": "This community forum collects and processes your personal information.",
+    "consent.intro": "We use this information strictly to personalise your experience in this community, as well as to associate the posts you make to your user account. During the registration step you were asked to provide a username and email address, you can also optionally provide additional information to complete your user profile on this website.<br /><br />We retain this information for the life of your user account, and you are able to withdraw consent at any time by deleting your account. At any time you may request a copy of your contribution to this website, via your Rights &amp; Consent page.<br /><br />If you have any questions or concerns, we encourage you to reach out to this forum's administrative team.",
+    "consent.email_intro": "Occasionally, we may send emails to your registered email address in order to provide updates and/or to notify you of new activity that is pertinent to you. You can customise the frequency of the community digest (including disabling it outright), as well as select which types of notifications to receive via email, via your user settings page.",
+    "consent.digest_frequency": "By default, this community delivers email digests every %1.",
+    "consent.digest_off": "Currently, this community does not send out email digests",
+    "consent.received": "You have provided consent for this website to collect and process your information. No additional action is required.",
+    "consent.not_received": "You have not provided consent for data collection and processing. At any time this website&apos;s administration may elect to delete your account in order to become compliant with the General Data Protection Regulation.",
+    "consent.give": "Give consent",
+    "consent.right_of_access": "You have the Right of Access",
+    "consent.right_of_access_description": "You have the right to access any data collected by this website upon request. You can retrieve a copy of this data by clicking the appropriate button below.",
+    "consent.right_to_rectification": "You have the Right to Rectification",
+    "consent.right_to_rectification_description": "You have the right to change or update any inaccurate data provided to us. Your profile can be updated by editing your profile, and post content can always be edited. If this is not the case, please contact this site&apos;s administrative team.",
+    "consent.right_to_erasure": "You have the Right to Erasure",
+    "consent.right_to_erasure_description": "At any time, you are able to revoke your consent to data collection and/or processing by deleting your account.",
+    "consent.right_to_data_portability": "You have the Right to Data Portability",
+    "consent.right_to_data_portability_description": "You may request from us a machine-readable export of any collected data about you and your account. You can do so by clicking the appropriate button below.",
+    "consent.export_profile": "Export Profile (.csv)",
+    "consent.export_uploads": "Export Uploaded Content (.zip)",
+    "consent.export_posts": "Export Posts (.csv)"
 }

public/language/cs/admin/extend/plugins.json

@@ -44,6 +44,8 @@
 	"alert.package-manager-unreachable": "<p>NodeBB se nemohl připojit ke správci balíčku, aktualizace není doporučena.</p>",
 	"alert.incompatible": "<p>Vaše verze NodeBB (v%1) umožňuje jen aktualizovat toto rozšíření na v%2. Aktualizujte prosím NodeBB, chcete-li nainstalovat nejnovější verzi tohoto rozšíření.</p>",
 	"alert.possibly-incompatible": "<div class=\"alert alert-warning\"><p><strong>Nebyla nalezena žádná informace o kompatibilitě</strong></p><p>Toto rozšíření nemá nastavenou požadovanou verzi NodeBB. Plná kompatibilita nemůže být garantována a může způsobit, že se vám již NodeBB nespustí.</p></div><p>Nespustí-li se správně NodeBB:</p><pre><code>$ ./nodebb reset plugin=\"%1\"</code></pre><p>Pokračovat v instalaci této aktuální verze rozšíření?</p>",
+	"alert.reorder": "Plugins Re-ordered",
+	"alert.reorder-success": "Please rebuild and restart your NodeBB to fully complete the process.",
 
 	"license.title": "Licenční informace o rozšíření",
 	"license.intro": "Rozšíření <strong>%1</strong> je licencováno pod %2. Pro aktivování tohoto rozšíření si přečtěte licenční podmínky.",

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

@@ -5,6 +5,7 @@
 	"private-groups.warning": "<strong>Ale pozor</strong>, je-li tato možnost zakázána a vy máte soukromé skupiny, stanou se automaticky veřejnými.",
 	"allow-creation": "Povolit vytvoření skupin",
 	"allow-creation-help": "Je-li povoleno, uživatelé mohou vytvořit skupiny <em>(výchozí: zakázáno)</em>",
+	"allow-multiple-badges-help": "This flag can be used to allow users to select multiple group badges, requires theme support.",
 	"max-name-length": "Maximální délka názvu skupiny",
 	"cover-image": "Obrázek skupiny",
 	"default-cover": "Výchozí obrázek",

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

@@ -2,5 +2,6 @@
 	"notifications": "Oznámení",
 	"welcome-notification": "Uvítání",
 	"welcome-notification-link": "Odkaz na uvítání",
-	"welcome-notification-uid": "Uvítání uživatele (UID)"
+	"welcome-notification-uid": "Uvítání uživatele (UID)",
+	"notification-alert-timeout": "Notification Alert Timeout"
 }

public/language/cs/error.json

@@ -18,6 +18,7 @@
     "invalid-username-or-password": "Zadejte prosím uživatelské jméno a i heslo",
     "invalid-search-term": "Neplatný výraz pro vyhledávání",
     "invalid-url": "Neplatné URL",
+    "local-login-disabled": "Local login system has been disabled for non-privileged accounts.",
     "csrf-invalid": "Není možné vás přihlásit, díky vypršení relace. Zkuste to prosím znovu.",
     "invalid-pagination-value": "Neplatná hodnota stránkování, musí být alespoň %1 a nejvýše %2",
     "username-taken": "Uživatelské jméno je již použito",

public/language/cs/flags.json

@@ -18,6 +18,7 @@
 	"filter-type": "Typ označení",
 	"filter-type-all": "Všechen obsah",
 	"filter-type-post": "Příspěvek",
+	"filter-type-user": "User",
 	"filter-state": "Stav",
 	"filter-assignee": "UID nabyvatele",
 	"filter-cid": "Kategorie",

public/language/cs/global.json

@@ -97,6 +97,7 @@
     "enter_page_number": "Zadejte číslo stránky",
     "upload_file": "Nahrár soubor",
     "upload": "Nahrát",
+    "uploads": "Uploads",
     "allowed-file-types": "Povolené typy souborů jsou %1",
     "unsaved-changes": "Některé změny nebyly uloženy. Jste si jist, že chcete jít jinam?",
     "reconnecting-message": "Vypadá to, že vaše připojení k %1 bylo ukončeno. Vyčkejte prosím, než obnovíme připojení.",

public/language/cs/pages.json

@@ -49,6 +49,8 @@
     "account/upvoted": "Souhlasí s příspěvkem %1",
     "account/downvoted": "Nesouhlasí s příspěvkem %1",
     "account/best": "Nejlepší příspěvky od %1",
+    "account/blocks": "Blocked users for %1",
+    "account/uploads": "Uploads by %1",
     "confirm": "E-mail potvrzen",
     "maintenance.text": "%1 momentálně prochází údržbou. Vraťte se později.",
     "maintenance.messageIntro": "Správce zanechal tuto zprávu:",

public/language/cs/register.json

@@ -19,5 +19,8 @@
     "terms_of_use_error": "Musíte souhlasit s podmínkami.",
     "registration-added-to-queue": "Vaše registrace byla přidána do fronty. Obdržíte e-mail až ji správce schválí.",
     "interstitial.intro": "Před vytvořením účtu vyžadujeme některé dodatečné informace.",
-    "interstitial.errors-found": "Nebylo možné dokončit vaší registraci:"
+    "interstitial.errors-found": "Nebylo možné dokončit vaší registraci:",
+    "gdpr_agree_data": "I consent to the collection and processing of my personal information on this website.",
+    "gdpr_agree_email": "I consent to receive digest and notification emails from this website.",
+    "gdpr_consent_denied": "You must give consent to this site to collect/process your information, and to send you emails."
 }

public/language/cs/topic.json

@@ -118,8 +118,8 @@
     "sort_by": "Seřadit dle",
     "oldest_to_newest": "Od nejstarších po nejnovější",
     "newest_to_oldest": "Od nejnovějších po nejstarší",
-    "most_votes": "Nejvíce hlasů",
+    "most_votes": "Most Votes",
-    "most_posts": "Nejvíce příspěvků",
+    "most_posts": "Most Posts",
     "stale.title": "Raději vytvořit nové téma?",
     "stale.warning": "Reagujete na starší téma. Nechcete raději vytvořit nové téma a na původní v něm odkázat?",
     "stale.create": "Vytvořit nové téma",
@@ -127,5 +127,7 @@
     "link_back": "Odpověď: [%1](%2)",
     "diffs.title": "Historie úpravy příspěvku",
     "diffs.description": "Tento příspěvek má <strong>%1</strong> změn. Pro zobrazení obsahu příspěvku platného v daný čas, klikněte níže na jednu ze změn.",
-    "diffs.no-revisions-description": "Tento příspěvek má <strong>%1</strong> změn."
+    "diffs.no-revisions-description": "Tento příspěvek má <strong>%1</strong> změn.",
+    "diffs.current-revision": "current revision",
+    "diffs.original-revision": "original revision"
 }

public/language/cs/uploads.json

@@ -2,5 +2,8 @@
     "uploading-file": "Nahrávání souboru…",
     "select-file-to-upload": "Vyberte soubor pro nahrání.",
     "upload-success": "Soubor byl úspěšně nahrán.",
-    "maximum-file-size": "Maximálně %1 kb"
+    "maximum-file-size": "Maximálně %1 kb",
+    "no-uploads-found": "No uploads found",
+    "public-uploads-info": "Uploads are public, all visitors can see them.",
+    "private-uploads-info": "Uploads are private, only logged in users can see them."
 }

public/language/cs/user.json

@@ -29,6 +29,8 @@
     "ignored": "Ignorován",
     "followers": "Sledují ho",
     "following": "Sleduje",
+    "blocks": "Blocks",
+    "block_toggle": "Toggle Block",
     "aboutme": "O mně",
     "signature": "Podpis",
     "birthday": "Datum narození",
@@ -89,6 +91,7 @@
     "has_no_upvoted_posts": "Tento uživatel zatím nevyjádřil souhlas u žádného příspěvku.",
     "has_no_downvoted_posts": "Tento uživatel zatím nevyjádřil nesouhlas  u žádného příspěvku.",
     "has_no_voted_posts": "Tento uživatel nemá žádné hlasovací příspěvky",
+    "has_no_blocks": "You have blocked no users.",
     "email_hidden": "E-mail je skryt",
     "hidden": "skrytý",
     "paginate_description": "Stránkovat témata a příspěvky místo použití nekonečného posunování",
@@ -142,5 +145,25 @@
     "info.email-history": "E-mailová historie",
     "info.moderation-note": "Poznámka moderace",
     "info.moderation-note.success": "Poznámka moderace byla uložena",
-    "info.moderation-note.add": "Přidat poznámku"
+    "info.moderation-note.add": "Přidat poznámku",
+    "consent.title": "Your Rights & Consent",
+    "consent.lead": "This community forum collects and processes your personal information.",
+    "consent.intro": "We use this information strictly to personalise your experience in this community, as well as to associate the posts you make to your user account. During the registration step you were asked to provide a username and email address, you can also optionally provide additional information to complete your user profile on this website.<br /><br />We retain this information for the life of your user account, and you are able to withdraw consent at any time by deleting your account. At any time you may request a copy of your contribution to this website, via your Rights &amp; Consent page.<br /><br />If you have any questions or concerns, we encourage you to reach out to this forum's administrative team.",
+    "consent.email_intro": "Occasionally, we may send emails to your registered email address in order to provide updates and/or to notify you of new activity that is pertinent to you. You can customise the frequency of the community digest (including disabling it outright), as well as select which types of notifications to receive via email, via your user settings page.",
+    "consent.digest_frequency": "By default, this community delivers email digests every %1.",
+    "consent.digest_off": "Currently, this community does not send out email digests",
+    "consent.received": "You have provided consent for this website to collect and process your information. No additional action is required.",
+    "consent.not_received": "You have not provided consent for data collection and processing. At any time this website&apos;s administration may elect to delete your account in order to become compliant with the General Data Protection Regulation.",
+    "consent.give": "Give consent",
+    "consent.right_of_access": "You have the Right of Access",
+    "consent.right_of_access_description": "You have the right to access any data collected by this website upon request. You can retrieve a copy of this data by clicking the appropriate button below.",
+    "consent.right_to_rectification": "You have the Right to Rectification",
+    "consent.right_to_rectification_description": "You have the right to change or update any inaccurate data provided to us. Your profile can be updated by editing your profile, and post content can always be edited. If this is not the case, please contact this site&apos;s administrative team.",
+    "consent.right_to_erasure": "You have the Right to Erasure",
+    "consent.right_to_erasure_description": "At any time, you are able to revoke your consent to data collection and/or processing by deleting your account.",
+    "consent.right_to_data_portability": "You have the Right to Data Portability",
+    "consent.right_to_data_portability_description": "You may request from us a machine-readable export of any collected data about you and your account. You can do so by clicking the appropriate button below.",
+    "consent.export_profile": "Export Profile (.csv)",
+    "consent.export_uploads": "Export Uploaded Content (.zip)",
+    "consent.export_posts": "Export Posts (.csv)"
 }

public/language/da/admin/extend/plugins.json

@@ -44,6 +44,8 @@
 	"alert.package-manager-unreachable": "<p>NodeBB could not reach the package manager, an upgrade is not suggested at this time.</p>",
 	"alert.incompatible": "<p>Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.</p>",
 	"alert.possibly-incompatible": "<div class=\"alert alert-warning\"><p><strong>No Compatibility Information Found</strong></p><p>This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.</p></div><p>In the event that NodeBB cannot boot properly:</p><pre><code>$ ./nodebb reset plugin=\"%1\"</code></pre><p>Continue installation of latest version of this plugin?</p>",
+	"alert.reorder": "Plugins Re-ordered",
+	"alert.reorder-success": "Please rebuild and restart your NodeBB to fully complete the process.",
 
 	"license.title": "Plugin License Information",
 	"license.intro": "The plugin <strong>%1</strong> is licensed under the %2. Please read and understand the license terms prior to activating this plugin.",

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

@@ -5,6 +5,7 @@
 	"private-groups.warning": "<strong>Beware!</strong> If this option is disabled and you have private groups, they automatically become public.",
 	"allow-creation": "Allow Group Creation",
 	"allow-creation-help": "If enabled, users can create groups <em>(Default: disabled)</em>",
+	"allow-multiple-badges-help": "This flag can be used to allow users to select multiple group badges, requires theme support.",
 	"max-name-length": "Maximum Group Name Length",
 	"cover-image": "Group Cover Image",
 	"default-cover": "Default Cover Images",

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

@@ -2,5 +2,6 @@
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
 	"welcome-notification-link": "Welcome Notification Link",
-	"welcome-notification-uid": "Welcome Notification User (UID)"
+	"welcome-notification-uid": "Welcome Notification User (UID)",
+	"notification-alert-timeout": "Notification Alert Timeout"
 }

public/language/da/error.json

@@ -18,6 +18,7 @@
     "invalid-username-or-password": "Venligst angiv både brugernavn og adgangskode",
     "invalid-search-term": "Ugyldig søgeterm",
     "invalid-url": "Invalid URL",
+    "local-login-disabled": "Local login system has been disabled for non-privileged accounts.",
     "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Ugyldig side værdi, skal mindst være %1 og maks. %2",
     "username-taken": "Brugernavn optaget",

public/language/da/flags.json

@@ -18,6 +18,7 @@
 	"filter-type": "Flag Type",
 	"filter-type-all": "All Content",
 	"filter-type-post": "Post",
+	"filter-type-user": "User",
 	"filter-state": "State",
 	"filter-assignee": "Assignee UID",
 	"filter-cid": "Category",

public/language/da/global.json

@@ -97,6 +97,7 @@
     "enter_page_number": "Indsæt sideantal",
     "upload_file": "Upload fil",
     "upload": "Upload",
+    "uploads": "Uploads",
     "allowed-file-types": "Tilladte filtyper er %1",
     "unsaved-changes": "You have unsaved changes. Are you sure you wish to navigate away?",
     "reconnecting-message": "Looks like your connection to %1 was lost, please wait while we try to reconnect.",

public/language/da/pages.json

@@ -49,6 +49,8 @@
     "account/upvoted": "Indlæg syntes godt om af %1",
     "account/downvoted": "Indlæg syntes ikke godt om af %1",
     "account/best": "Bedste indlæg skrevet af %1",
+    "account/blocks": "Blocked users for %1",
+    "account/uploads": "Uploads by %1",
     "confirm": "Email Bekræftet",
     "maintenance.text": "%1 er under vedligeholdelse. Kom venligst tilbage senere.",
     "maintenance.messageIntro": "Administratoren har yderligere vedlagt denne besked:",

public/language/da/register.json

@@ -19,5 +19,8 @@
     "terms_of_use_error": "You must agree to the Terms of Use",
     "registration-added-to-queue": "Din registrering er blevet tilføjet til godkendelses køen. Du vil mostage en email når du er blevet accepteret af en administrator.",
     "interstitial.intro": "We require some additional information before we can create your account.",
-    "interstitial.errors-found": "We could not complete your registration:"
+    "interstitial.errors-found": "We could not complete your registration:",
+    "gdpr_agree_data": "I consent to the collection and processing of my personal information on this website.",
+    "gdpr_agree_email": "I consent to receive digest and notification emails from this website.",
+    "gdpr_consent_denied": "You must give consent to this site to collect/process your information, and to send you emails."
 }

public/language/da/topic.json

@@ -118,8 +118,8 @@
     "sort_by": "Sorter efter",
     "oldest_to_newest": "Ældste til nyeste",
     "newest_to_oldest": "Nyeste til ældste",
-    "most_votes": "Flest stemmer",
+    "most_votes": "Most Votes",
-    "most_posts": "Flest indlæg",
+    "most_posts": "Most Posts",
     "stale.title": "Opret nyt emne istedet?",
     "stale.warning": "Emnet du svarer på er ret gammelt. Vil du oprette et nyt emne istedet og referere dette indlæg i dit svar?",
     "stale.create": "Opret nyt emne",
@@ -127,5 +127,7 @@
     "link_back": "Svar: [%1](%2)",
     "diffs.title": "Post Edit History",
     "diffs.description": "This post has <strong>%1</strong> revisions. Click one of the revisions below to see the post content at that point in time.",
-    "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions."
+    "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
+    "diffs.current-revision": "current revision",
+    "diffs.original-revision": "original revision"
 }

public/language/da/uploads.json

@@ -2,5 +2,8 @@
     "uploading-file": "Uploading the file...",
     "select-file-to-upload": "Select a file to upload!",
     "upload-success": "File uploaded successfully!",
-    "maximum-file-size": "Maximum %1 kb"
+    "maximum-file-size": "Maximum %1 kb",
+    "no-uploads-found": "No uploads found",
+    "public-uploads-info": "Uploads are public, all visitors can see them.",
+    "private-uploads-info": "Uploads are private, only logged in users can see them."
 }

public/language/da/user.json

@@ -29,6 +29,8 @@
     "ignored": "Ignored",
     "followers": "Followers",
     "following": "Følger",
+    "blocks": "Blocks",
+    "block_toggle": "Toggle Block",
     "aboutme": "Om mig",
     "signature": "Signatur",
     "birthday": "Fødselsdag",
@@ -89,6 +91,7 @@
     "has_no_upvoted_posts": "Denne bruger har ikke syntes godt om nogle indlæg endnu.",
     "has_no_downvoted_posts": "Denne bruger har ikke, syntes ikke godt om nogle indlæg endnu.",
     "has_no_voted_posts": "Denne bruger har ingen stemte indlæg",
+    "has_no_blocks": "You have blocked no users.",
     "email_hidden": "Email Skjult",
     "hidden": "skjult",
     "paginate_description": "Sideinddel emner og indlæg istedet for uendeligt rul",
@@ -142,5 +145,25 @@
     "info.email-history": "Email History",
     "info.moderation-note": "Moderation Note",
     "info.moderation-note.success": "Moderation note saved",
-    "info.moderation-note.add": "Add note"
+    "info.moderation-note.add": "Add note",
+    "consent.title": "Your Rights & Consent",
+    "consent.lead": "This community forum collects and processes your personal information.",
+    "consent.intro": "We use this information strictly to personalise your experience in this community, as well as to associate the posts you make to your user account. During the registration step you were asked to provide a username and email address, you can also optionally provide additional information to complete your user profile on this website.<br /><br />We retain this information for the life of your user account, and you are able to withdraw consent at any time by deleting your account. At any time you may request a copy of your contribution to this website, via your Rights &amp; Consent page.<br /><br />If you have any questions or concerns, we encourage you to reach out to this forum's administrative team.",
+    "consent.email_intro": "Occasionally, we may send emails to your registered email address in order to provide updates and/or to notify you of new activity that is pertinent to you. You can customise the frequency of the community digest (including disabling it outright), as well as select which types of notifications to receive via email, via your user settings page.",
+    "consent.digest_frequency": "By default, this community delivers email digests every %1.",
+    "consent.digest_off": "Currently, this community does not send out email digests",
+    "consent.received": "You have provided consent for this website to collect and process your information. No additional action is required.",
+    "consent.not_received": "You have not provided consent for data collection and processing. At any time this website&apos;s administration may elect to delete your account in order to become compliant with the General Data Protection Regulation.",
+    "consent.give": "Give consent",
+    "consent.right_of_access": "You have the Right of Access",
+    "consent.right_of_access_description": "You have the right to access any data collected by this website upon request. You can retrieve a copy of this data by clicking the appropriate button below.",
+    "consent.right_to_rectification": "You have the Right to Rectification",
+    "consent.right_to_rectification_description": "You have the right to change or update any inaccurate data provided to us. Your profile can be updated by editing your profile, and post content can always be edited. If this is not the case, please contact this site&apos;s administrative team.",
+    "consent.right_to_erasure": "You have the Right to Erasure",
+    "consent.right_to_erasure_description": "At any time, you are able to revoke your consent to data collection and/or processing by deleting your account.",
+    "consent.right_to_data_portability": "You have the Right to Data Portability",
+    "consent.right_to_data_portability_description": "You may request from us a machine-readable export of any collected data about you and your account. You can do so by clicking the appropriate button below.",
+    "consent.export_profile": "Export Profile (.csv)",
+    "consent.export_uploads": "Export Uploaded Content (.zip)",
+    "consent.export_posts": "Export Posts (.csv)"
 }

public/language/de/admin/extend/plugins.json

@@ -37,13 +37,15 @@
 	"alert.uninstalled": "Plugin deinstalliert",
 	"alert.activate-success": "Bitte starte NodeBB neu, um dieses Plugin vollständig zu aktivieren",
 	"alert.deactivate-success": "Plugin erfolgreich deaktiviert",
-	"alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
+	"alert.upgrade-success": "Bitte Starte dein NodeBB neu um dieses Plugin völlständig zu upgraden.",
 	"alert.install-success": "Plugin erfolgreich installiert. Bitte aktiviere das Plugin",
 	"alert.uninstall-success": "Das Plugin wurde erfolgreich deaktiviert und deinstalliert.",
 	"alert.suggest-error": "<p>NodeBB konnte den Paket-Manager nicht erreichen. Willst Du mit der Installation der neuesten Version fortfahren</p><div class=\"alert alert-danger\"><strong>Der Server meldete (%1)</strong>: %2</div>",
 	"alert.package-manager-unreachable": "<p>NodeBB konnte den Paket-Manager nicht erreichen, eine Aktualisierung wird momentan nicht empfohlen.</p>",
 	"alert.incompatible": "<p>NodeBB Version (v%1) ist nur für Aktualisierungen bis v%2 dieses Plugins bestimmt. Bitte aktualisiere NodeBB, wenn eine neuere Version dieses Plugins installiert werden soll.</p>",
 	"alert.possibly-incompatible": "<div class=\"alert alert-warning\"><p><strong>Keine Kompatibilitätsinformationen gefunden</strong></p><p>Dieses Plugin legte keine spezifische NodeBB version fest, welche für die Installation benötigt wird. Volle Kompatibilität kann nicht gewährleistet werden, was dazu führen könnte, dass ihr NodeBB nicht mehr korrekt startet.</p></div><p>Für den Fall, dass NodeBB nicht mehr ordnungsgemäß startet:</p><pre><code>$ ./nodebb reset plugin=\"%1\"</code></pre><p>Soll mit der installation der neuesten Version dieses Plugins fortgefahren werden?</p>",
+	"alert.reorder": "Plugins Neusortiert",
+	"alert.reorder-success": "Bitte Starte dein NodeBB neu um diesen Prozess vollständig abzuschließen.",
 
 	"license.title": "Plugin-Lizenzinformation",
 	"license.intro": "Das Plugin <strong>%1</strong>is unter der %2 lizenziert. Bitte ließ dir diese durch bevor du dieses Plugin aktivierst.",

public/language/de/admin/general/dashboard.json

@@ -37,8 +37,8 @@
 	"search-plugin-tooltip": "Installiere ein Such-Plugin auf der Plugin-Seite um die Such-Funktionalität zu aktivieren",
 
 	"control-panel": "Systemsteuerung",
-	"rebuild-and-restart": "Rebuild & Restart",
+	"rebuild-and-restart": "Regenerieren & Neustarten",
-	"restart": "Restart",
+	"restart": "Neustarten",
 	"restart-warning": "NodeBB zu regenerieren oder neuzustarten wird alle existierenden Verbindungen für ein paar Sekunden trennen.",
 	"restart-disabled": "Das Regenerieren und Neustarten von NodeBB wurde deaktiviert, da es nicht so aussieht als ob es über einem kompatiblem daemon läuft.",
 	"maintenance-mode": "Wartungsmodus",

public/language/de/admin/menu.json

@@ -63,7 +63,7 @@
 	"development/logger": "Logger",
 	"development/info": "Info",
 
-	"rebuild-and-restart-forum": "Rebuild & Restart Forum",
+	"rebuild-and-restart-forum": "Forum regenerieren & neustarten",
 	"restart-forum": "Forum neu starten",
 	"logout": "Abmelden",
 	"view-forum": "Forum anzeigen",

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

@@ -5,6 +5,7 @@
 	"private-groups.warning": "<strong>Vorsicht!</strong> Wenn diese Option deaktiviert ist, und es private Gruppen gibt, werden diese automatisch öffentlich.",
 	"allow-creation": "Erstellung von Gruppen erlauben",
 	"allow-creation-help": "Wenn aktiviert können Nutzer Gruppen erstellen <em>(Standard: deaktiviert)</em>",
+	"allow-multiple-badges-help": "Diese Eintellung kann verwendet werden um Benutzern zu erlauben mehrere Gruppen abzeichen auszuwählen, benötigt Theme unterstützung.",
 	"max-name-length": "Maximale Länge von Gruppennamen",
 	"cover-image": "Gruppen-Deckbild",
 	"default-cover": "Standard-Deckbild",

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

@@ -2,5 +2,6 @@
 	"notifications": "Benachrichtigungen",
 	"welcome-notification": "Wilkommensnachricht",
 	"welcome-notification-link": "Wilkommensnachricht-Link",
-	"welcome-notification-uid": "Wilkommensbenachrichtigung Benutzer (UID)"
+	"welcome-notification-uid": "Wilkommensbenachrichtigung Benutzer (UID)",
+	"notification-alert-timeout": "Benachrichtigungs Timeout"
 }

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

@@ -50,5 +50,5 @@
 	"composer.custom-help": "Benutzerdefinierter Hilfe-Text",
 	"ip-tracking": "IP-Verfolgung",
 	"ip-tracking.each-post": "IP-Adresse für jeden Beitrag speichern",
-	"enable-post-history": "Enable Post History"
+	"enable-post-history": "Aktiviere Beitrags-Änderungsgeschichte"
 }

public/language/de/error.json

@@ -18,6 +18,7 @@
     "invalid-username-or-password": "Bitte gib sowohl einen Benutzernamen als auch ein Passwort an",
     "invalid-search-term": "Ungültige Suchanfrage",
     "invalid-url": "Ungültige URL",
+    "local-login-disabled": "Lokales Login System wurde für nicht-priviligierte Accounts deaktiviert.",
     "csrf-invalid": "Dein Login war nicht erfolgreich da wahrscheinlich deine Sitzung abgelaufen ist. Bitte versuche es noch einmal",
     "invalid-pagination-value": "Ungültige Seitennummerierung, muss mindestens %1 und maximal %2 sein",
     "username-taken": "Der Benutzername ist bereits vergeben",

public/language/de/flags.json

@@ -18,6 +18,7 @@
 	"filter-type": "Meldungstyp",
 	"filter-type-all": "Gesamter Inhalt",
 	"filter-type-post": "Beitrag",
+	"filter-type-user": "Benutzer",
 	"filter-state": "Status",
 	"filter-assignee": "UID des Zugewiesenen",
 	"filter-cid": "Kategorie",

public/language/de/global.json

@@ -97,6 +97,7 @@
     "enter_page_number": "Seitennummer eingeben",
     "upload_file": "Datei hochladen",
     "upload": "Hochladen",
+    "uploads": "Uploads",
     "allowed-file-types": "Erlaubte Dateitypen sind %1",
     "unsaved-changes": "Es gibt ungespeicherte Änderungen. Bist du dir sicher, dass du die Seite verlassen willst?",
     "reconnecting-message": "Es scheint als hättest du die Verbindung zu %1 verloren, bitte warte während wir versuchen sie wieder aufzubauen.",

public/language/de/pages.json

@@ -49,6 +49,8 @@
     "account/upvoted": "Von %1 positiv bewertete Beiträge",
     "account/downvoted": "Von %1 negativ bewertete Beiträge",
     "account/best": "Bestbewertete Beiträge von %1",
+    "account/blocks": "Für %1 geblockte Benutzer",
+    "account/uploads": "Uploads von %1",
     "confirm": "E-Mail bestätigt",
     "maintenance.text": "%1 befindet sich derzeit in der Wartung. Bitte komm später wieder.",
     "maintenance.messageIntro": "Zusätzlich hat der Administrator diese Nachricht hinterlassen:",

public/language/de/register.json

@@ -19,5 +19,8 @@
     "terms_of_use_error": "Du musst den Nutzungsbedingungen zustimmen",
     "registration-added-to-queue": "Deine Registration wurde abgeschickt. Du wirst eine E-Mail erhalten, sobald sie von einem Administrator akzeptiert wird.",
     "interstitial.intro": "Wir benötigen ein wenig mehr Informationen bevor wir deinen Account erstellen können.",
-    "interstitial.errors-found": "Wir konnten deinen Registrierungsvorgang nicht abschließen:"
+    "interstitial.errors-found": "Wir konnten deinen Registrierungsvorgang nicht abschließen:",
+    "gdpr_agree_data": "Ich stimme der Sammlung und Verarbeitung meiner Persönlichen Daten auf dieser Website zu.",
+    "gdpr_agree_email": "Ich bin damit einverstanden, dass ich Informations und Benachrichtigungs-EMails von dieser Website erhalte.",
+    "gdpr_consent_denied": "Du musst zustimmen, dass diese Seite deine Daten sammeln und verarbeiten darf, und dir Emails senden darf."
 }

public/language/de/reset_password.json

@@ -9,7 +9,7 @@
     "repeat_password": "Wiederhole das Passwort",
     "enter_email": "Bitte gib Deine <strong>E-Mail Adresse</strong> ein und wir senden Dir eine Anleitung, wie Du Dein Passwort zurücksetzen kannst.",
     "enter_email_address": "E-Mail Adresse eingeben",
-    "password_reset_sent": "A password reset email has been sent to the specified address. Please note that only one email will be sent per minute.",
+    "password_reset_sent": "Eine Passwort-Reset-Email wurde an die angegebene Adresse gesendet. Bitte beachte, dass nur eine Email pro Minute versandt wird.",
     "invalid_email": "Ungültige E-Mail / Adresse existiert nicht!",
     "password_too_short": "Das eingegebene Passwort ist zu kurz, bitte wähle ein anderes Passwort.",
     "passwords_do_not_match": "Die eingegebenen Passwörter stimmen nicht überein.",

public/language/de/search.json

@@ -5,9 +5,9 @@
     "in": "In",
     "titles": "Titel",
     "titles-posts": "Titel und Beiträge",
-    "match-words": "Match words",
+    "match-words": "Übereinstimmende Worte",
     "all": "Alle",
-    "any": "Any",
+    "any": "Alles",
     "posted-by": "Geschrieben von",
     "in-categories": "In Kategorien",
     "search-child-categories": "Suche in Unterkategorien",

public/language/de/topic.json

@@ -62,7 +62,7 @@
     "thread_tools.lock": "Thema schließen",
     "thread_tools.unlock": "Thema öffnen",
     "thread_tools.move": "Thema verschieben",
-    "thread_tools.move-posts": "Move Posts",
+    "thread_tools.move-posts": "Beiträge verschieben",
     "thread_tools.move_all": "Alle verschieben",
     "thread_tools.select_category": "Kategorie auswählen",
     "thread_tools.fork": "Thema aufspalten",
@@ -97,7 +97,7 @@
     "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",
-    "move_posts_instruction": "Click the posts you want to move",
+    "move_posts_instruction": "Klicke auf die Beiträge, die du verschieben möchstest.",
     "composer.title_placeholder": "Hier den Titel des Themas eingeben...",
     "composer.handle_placeholder": "Name",
     "composer.discard": "Verwerfen",
@@ -118,8 +118,8 @@
     "sort_by": "Sortieren nach",
     "oldest_to_newest": "Älteste zuerst",
     "newest_to_oldest": "Neuste zuerst",
-    "most_votes": "Die meisten Stimmen",
+    "most_votes": "Meiste Stimmen",
-    "most_posts": "Die meisten Beiträge",
+    "most_posts": "Meiste Beiträge",
     "stale.title": "Stattdessen ein neues Thema erstellen?",
     "stale.warning": "Das Thema auf das du antworten willst ist ziemlich alt. Möchtest du stattdessen ein neues Thema erstellen und auf dieses in deiner Antwort hinweisen?",
     "stale.create": "Ein neues Thema erstellen",
@@ -127,5 +127,7 @@
     "link_back": "Re: [%1](%2)",
     "diffs.title": "Beitragsänderungsverlauf",
     "diffs.description": "Dieser Beitrag hat <strong>%1</strong> Revisionen. Klicke unten auf eine dieser Revisionen um den Inhalt zu diesem Zeitpunkt zu sehen.",
-    "diffs.no-revisions-description": "Dieser Beitrag ha <strong>%1</strong> Revisionen."
+    "diffs.no-revisions-description": "Dieser Beitrag ha <strong>%1</strong> Revisionen.",
+    "diffs.current-revision": "Aktuelle Revision",
+    "diffs.original-revision": "Ursprüngliche Revision"
 }

public/language/de/uploads.json

@@ -2,5 +2,8 @@
     "uploading-file": "Lade Datei hoch...",
     "select-file-to-upload": "Wähle eine Datei zum Hochladen aus!",
     "upload-success": "Datei erfolgreich hochgeladen!",
-    "maximum-file-size": "Maximal %1 kb"
+    "maximum-file-size": "Maximal %1 kb",
+    "no-uploads-found": "Keine Uploads gefunden",
+    "public-uploads-info": "Uploads sind öffentlich, alle Besucher können diese sehen.",
+    "private-uploads-info": "Uploads sind privat, nur eingeloggte Benutzer können diese sehen."
 }

public/language/de/user.json

@@ -12,7 +12,7 @@
     "ban_account_confirm": "Bist du sicher, dass du diesen Benutzer sperren möchtest?",
     "unban_account": "Konto entsperren",
     "delete_account": "Konto löschen",
-    "delete_account_confirm": "Are you sure you want to 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_account_confirm": "Bist du sicher, dass du deinen Account löschen willst?<br /><strong>Dies kann nicht rückgängig gemacht werden und du wirst deine Daten nicht wiederherstellen können.</strong><br /><br />Gib dein Passwort ein um zu bestätigen, dass du diesen Account wirklich löschen willst.",
     "delete_this_account_confirm": "Bist du sicher, dass du dieses Konto löschen möchtest?<br /><strong>Diese Aktion kann nicht rückgangig gemacht werden und du kannst die Daten nicht wiederherstellen</strong><br /><br />",
     "account-deleted": "Account gelöscht",
     "fullname": "Kompletter Name",
@@ -29,6 +29,8 @@
     "ignored": "Ignoriert",
     "followers": "Follower",
     "following": "Folge ich",
+    "blocks": "Blockiert",
+    "block_toggle": "Ent-/Blocken",
     "aboutme": "Über mich",
     "signature": "Signatur",
     "birthday": "Geburtstag",
@@ -89,6 +91,7 @@
     "has_no_upvoted_posts": "Dieser Benutzer hat bisher keine Beiträge positiv bewertet.",
     "has_no_downvoted_posts": "Dieser Benutzer hat bisher keine Beiträge negativ bewertet.",
     "has_no_voted_posts": "Dieser Benutzer hat keine bewerteten Beiträge.",
+    "has_no_blocks": "Du hast keine Benutzer geblockt",
     "email_hidden": "E-Mail Adresse versteckt",
     "hidden": "versteckt",
     "paginate_description": "Themen und Beiträge in Seiten aufteilen, anstatt unendlich zu scrollen",
@@ -142,5 +145,25 @@
     "info.email-history": "E-Mail Verlauf",
     "info.moderation-note": "Moderationsnotiz",
     "info.moderation-note.success": "Moderationsnotiz gespeichert",
-    "info.moderation-note.add": "Notitz hinzufügen"
+    "info.moderation-note.add": "Notitz hinzufügen",
+    "consent.title": "Deine Rechte &amp; Zustimmungen",
+    "consent.lead": "Dieses Community-Forum sammelt und verarbeitet deine persönlichen Daten.",
+    "consent.intro": "Wir nutzen diese Daten ausschließlich um dein Erlebnis in dieser Community persönlicher zu gestalten, sowie um deine Beiträge mit deinem Account zu verknüpfen. Während der Registration wurdes du nach einem Benutzernamen und einer EMail-Adresse gefragt. Optional kannst du weitere Informationen bereitstellen um dein Profil auf dieser Website zu vervollständigen.<br /><br />Wir behalten diese Informationen für die Lebensdauer deines Accounts, womit du jederzeit in der Lage bist deine Zustimmung durch löschen deines Accounts zu widerrufen. Du kannst jederzeit eine Kopie deiner Daten über deine Rechte &amp; Zustimmungen-Seite anfordern.<br /><br />Solltest du Fragen oder Bedenken haben, melde dich gerne bei den Administratoren dieses Forums.",
+    "consent.email_intro": "Gelegentlich werden wir EMails zu deiner registrierten EMail Adresse senden um dich über generelles oder dich direkt betreffendes auf dem Laufenden zu halten. Auf deiner Benutzer-Einstellungen-Seite kannst du die häufigkeit dieser Benachrichtigungen Einstellen (sogar komplett deaktivieren), sowie auswählen, welche Art von Benachrichtigungen du erhalten möchtest.",
+    "consent.digest_frequency": "Standardmäßig werden Emails alle %1 versandt.",
+    "consent.digest_off": "Momentan werden keine Emails versandt.",
+    "consent.received": "Du hast zugestimmt, dass diese Website deine Persönlichen Daten sammeln und verarbeiten darf. Es ist keine weitere Aktion erforderlich.",
+    "consent.not_received": "Du hast der Sammlung und Verarbeitung von Daten nicht zugestimmt. Diese Website-Administration behält sich vor deinen Account jederzeit zu löschen um die GDPR einzuhalten.",
+    "consent.give": "Zustimmen",
+    "consent.right_of_access": "Du hast das Recht auf Zugriff",
+    "consent.right_of_access_description": "Du hast das Recht deine Daten die von dieser Website gesammelt wurden auf anfrage einsehen zu können. Du kannst eine kopie bekommen, indem du unten auf den entsprechenden Knopf drückst.",
+    "consent.right_to_rectification": "Du hast das Recht auf Korrektur",
+    "consent.right_to_rectification_description": "Du hast das Recht ungenaue Daten die an uns übermittelt wurden zu ändern oder zu aktualisieren. Dein Profil kann aktualisiert werden, in dem du dein Profil bearbeitest, Beiträge können immer bearbeitet werden. Sollte dies nicht der Fall sein, melde dich bitte bei den Administratoren dieser Website.",
+    "consent.right_to_erasure": "Du hast das Recht auf Löschung",
+    "consent.right_to_erasure_description": "Du kannst jederzeit deine Zustimung auf Datensammlung und/oder -verarbeitung wiederrufen indem du deinen Account löschst.",
+    "consent.right_to_data_portability": "Du hast das Recht auf Datenportabilität",
+    "consent.right_to_data_portability_description": "Du kannst von uns eine Maschinen-Lesbare Datei von jeglichen gesammelten Daten von dir und deinem Account anfordern, indem du untern auf den entsprechenden Knopf drückst. ",
+    "consent.export_profile": "Profil exportieren (.csv)",
+    "consent.export_uploads": "Hochgeladene Dateien exportieren (.zip)",
+    "consent.export_posts": "Beiträge exportieren (.csv)"
 }

public/language/el/admin/extend/plugins.json

@@ -44,6 +44,8 @@
 	"alert.package-manager-unreachable": "<p>NodeBB could not reach the package manager, an upgrade is not suggested at this time.</p>",
 	"alert.incompatible": "<p>Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.</p>",
 	"alert.possibly-incompatible": "<div class=\"alert alert-warning\"><p><strong>No Compatibility Information Found</strong></p><p>This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.</p></div><p>In the event that NodeBB cannot boot properly:</p><pre><code>$ ./nodebb reset plugin=\"%1\"</code></pre><p>Continue installation of latest version of this plugin?</p>",
+	"alert.reorder": "Plugins Re-ordered",
+	"alert.reorder-success": "Please rebuild and restart your NodeBB to fully complete the process.",
 
 	"license.title": "Plugin License Information",
 	"license.intro": "The plugin <strong>%1</strong> is licensed under the %2. Please read and understand the license terms prior to activating this plugin.",

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

@@ -5,6 +5,7 @@
 	"private-groups.warning": "<strong>Beware!</strong> If this option is disabled and you have private groups, they automatically become public.",
 	"allow-creation": "Allow Group Creation",
 	"allow-creation-help": "If enabled, users can create groups <em>(Default: disabled)</em>",
+	"allow-multiple-badges-help": "This flag can be used to allow users to select multiple group badges, requires theme support.",
 	"max-name-length": "Maximum Group Name Length",
 	"cover-image": "Group Cover Image",
 	"default-cover": "Default Cover Images",

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

@@ -2,5 +2,6 @@
 	"notifications": "Ειδοποιήσεις",
 	"welcome-notification": "Ειδοποίηση καλωσορίσματος",
 	"welcome-notification-link": "Welcome Notification Link",
-	"welcome-notification-uid": "Welcome Notification User (UID)"
+	"welcome-notification-uid": "Welcome Notification User (UID)",
+	"notification-alert-timeout": "Notification Alert Timeout"
 }

public/language/el/error.json

@@ -18,6 +18,7 @@
     "invalid-username-or-password": "Παρακαλώ γράψε το όνομα χρήστη και τον κωδικό",
     "invalid-search-term": "Άκυρος όρος αναζήτησης",
     "invalid-url": "Invalid URL",
+    "local-login-disabled": "Local login system has been disabled for non-privileged accounts.",
     "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "Το όνομα χρήστη είναι πιασμένο",

public/language/el/flags.json

@@ -18,6 +18,7 @@
 	"filter-type": "Flag Type",
 	"filter-type-all": "All Content",
 	"filter-type-post": "Post",
+	"filter-type-user": "User",
 	"filter-state": "State",
 	"filter-assignee": "Assignee UID",
 	"filter-cid": "Category",

public/language/el/global.json

@@ -97,6 +97,7 @@
     "enter_page_number": "Enter page number",
     "upload_file": "Ανέβασμα αρχείου",
     "upload": "Ανέβασμα",
+    "uploads": "Uploads",
     "allowed-file-types": "Allowed file types are %1",
     "unsaved-changes": "You have unsaved changes. Are you sure you wish to navigate away?",
     "reconnecting-message": "Looks like your connection to %1 was lost, please wait while we try to reconnect.",

public/language/el/pages.json

@@ -49,6 +49,8 @@
     "account/upvoted": "Posts upvoted by %1",
     "account/downvoted": "Posts downvoted by %1",
     "account/best": "Best posts made by %1",
+    "account/blocks": "Blocked users for %1",
+    "account/uploads": "Uploads by %1",
     "confirm": "Email Confirmed",
     "maintenance.text": "Το %1 αυτή την στιγμή συντηρείται. Παρακαλώ έλα αργότερα.",
     "maintenance.messageIntro": "Additionally, the administrator has left this message:",

public/language/el/register.json

@@ -19,5 +19,8 @@
     "terms_of_use_error": "You must agree to the Terms of Use",
     "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator.",
     "interstitial.intro": "We require some additional information before we can create your account.",
-    "interstitial.errors-found": "We could not complete your registration:"
+    "interstitial.errors-found": "We could not complete your registration:",
+    "gdpr_agree_data": "I consent to the collection and processing of my personal information on this website.",
+    "gdpr_agree_email": "I consent to receive digest and notification emails from this website.",
+    "gdpr_consent_denied": "You must give consent to this site to collect/process your information, and to send you emails."
 }

public/language/el/topic.json

@@ -118,8 +118,8 @@
     "sort_by": "Ταξινόμηση κατά",
     "oldest_to_newest": "Παλαιότερο προς Νεότερο",
     "newest_to_oldest": "Νεότερο προς Παλαιότερο",
-    "most_votes": "Περισσότερες ψήφοι",
+    "most_votes": "Most Votes",
-    "most_posts": "Most posts",
+    "most_posts": "Most Posts",
     "stale.title": "Create new topic instead?",
     "stale.warning": "The topic you are replying to is quite old. Would you like to create a new topic instead, and reference this one in your reply?",
     "stale.create": "Create a new topic",
@@ -127,5 +127,7 @@
     "link_back": "Re: [%1](%2)",
     "diffs.title": "Post Edit History",
     "diffs.description": "This post has <strong>%1</strong> revisions. Click one of the revisions below to see the post content at that point in time.",
-    "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions."
+    "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
+    "diffs.current-revision": "current revision",
+    "diffs.original-revision": "original revision"
 }

public/language/el/uploads.json

@@ -2,5 +2,8 @@
     "uploading-file": "Το αρχείο ανεβαίνει...",
     "select-file-to-upload": "Επίλεξε αρχείο για ανέβασμα!",
     "upload-success": "Το αρχείο ανέβηκε επιτυχώς!",
-    "maximum-file-size": "Μέγιστο %1 kb"
+    "maximum-file-size": "Μέγιστο %1 kb",
+    "no-uploads-found": "No uploads found",
+    "public-uploads-info": "Uploads are public, all visitors can see them.",
+    "private-uploads-info": "Uploads are private, only logged in users can see them."
 }

public/language/el/user.json

@@ -29,6 +29,8 @@
     "ignored": "Ignored",
     "followers": "Ακόλουθοι",
     "following": "Ακολουθά",
+    "blocks": "Blocks",
+    "block_toggle": "Toggle Block",
     "aboutme": "About me",
     "signature": "Υπογραφή",
     "birthday": "Γενέθλια",
@@ -89,6 +91,7 @@
     "has_no_upvoted_posts": "This user hasn't upvoted any posts yet.",
     "has_no_downvoted_posts": "This user hasn't downvoted any posts yet.",
     "has_no_voted_posts": "This user has no voted posts",
+    "has_no_blocks": "You have blocked no users.",
     "email_hidden": "Κρυμμένο Emai",
     "hidden": "κρυμμένο",
     "paginate_description": "Paginate topics and posts instead of using infinite scroll",
@@ -142,5 +145,25 @@
     "info.email-history": "Email History",
     "info.moderation-note": "Moderation Note",
     "info.moderation-note.success": "Moderation note saved",
-    "info.moderation-note.add": "Add note"
+    "info.moderation-note.add": "Add note",
+    "consent.title": "Your Rights & Consent",
+    "consent.lead": "This community forum collects and processes your personal information.",
+    "consent.intro": "We use this information strictly to personalise your experience in this community, as well as to associate the posts you make to your user account. During the registration step you were asked to provide a username and email address, you can also optionally provide additional information to complete your user profile on this website.<br /><br />We retain this information for the life of your user account, and you are able to withdraw consent at any time by deleting your account. At any time you may request a copy of your contribution to this website, via your Rights &amp; Consent page.<br /><br />If you have any questions or concerns, we encourage you to reach out to this forum's administrative team.",
+    "consent.email_intro": "Occasionally, we may send emails to your registered email address in order to provide updates and/or to notify you of new activity that is pertinent to you. You can customise the frequency of the community digest (including disabling it outright), as well as select which types of notifications to receive via email, via your user settings page.",
+    "consent.digest_frequency": "By default, this community delivers email digests every %1.",
+    "consent.digest_off": "Currently, this community does not send out email digests",
+    "consent.received": "You have provided consent for this website to collect and process your information. No additional action is required.",
+    "consent.not_received": "You have not provided consent for data collection and processing. At any time this website&apos;s administration may elect to delete your account in order to become compliant with the General Data Protection Regulation.",
+    "consent.give": "Give consent",
+    "consent.right_of_access": "You have the Right of Access",
+    "consent.right_of_access_description": "You have the right to access any data collected by this website upon request. You can retrieve a copy of this data by clicking the appropriate button below.",
+    "consent.right_to_rectification": "You have the Right to Rectification",
+    "consent.right_to_rectification_description": "You have the right to change or update any inaccurate data provided to us. Your profile can be updated by editing your profile, and post content can always be edited. If this is not the case, please contact this site&apos;s administrative team.",
+    "consent.right_to_erasure": "You have the Right to Erasure",
+    "consent.right_to_erasure_description": "At any time, you are able to revoke your consent to data collection and/or processing by deleting your account.",
+    "consent.right_to_data_portability": "You have the Right to Data Portability",
+    "consent.right_to_data_portability_description": "You may request from us a machine-readable export of any collected data about you and your account. You can do so by clicking the appropriate button below.",
+    "consent.export_profile": "Export Profile (.csv)",
+    "consent.export_uploads": "Export Uploaded Content (.zip)",
+    "consent.export_posts": "Export Posts (.csv)"
 }

public/language/en-US/admin/extend/plugins.json

@@ -44,6 +44,8 @@
 	"alert.package-manager-unreachable": "<p>NodeBB could not reach the package manager, an upgrade is not suggested at this time.</p>",
 	"alert.incompatible": "<p>Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.</p>",
 	"alert.possibly-incompatible": "<div class=\"alert alert-warning\"><p><strong>No Compatibility Information Found</strong></p><p>This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.</p></div><p>In the event that NodeBB cannot boot properly:</p><pre><code>$ ./nodebb reset plugin=\"%1\"</code></pre><p>Continue installation of latest version of this plugin?</p>",
+	"alert.reorder": "Plugins Re-ordered",
+	"alert.reorder-success": "Please rebuild and restart your NodeBB to fully complete the process.",
 
 	"license.title": "Plugin License Information",
 	"license.intro": "The plugin <strong>%1</strong> is licensed under the %2. Please read and understand the license terms prior to activating this plugin.",

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

@@ -5,6 +5,7 @@
 	"private-groups.warning": "<strong>Beware!</strong> If this option is disabled and you have private groups, they automatically become public.",
 	"allow-creation": "Allow Group Creation",
 	"allow-creation-help": "If enabled, users can create groups <em>(Default: disabled)</em>",
+	"allow-multiple-badges-help": "This flag can be used to allow users to select multiple group badges, requires theme support.",
 	"max-name-length": "Maximum Group Name Length",
 	"cover-image": "Group Cover Image",
 	"default-cover": "Default Cover Images",

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

@@ -2,5 +2,6 @@
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
 	"welcome-notification-link": "Welcome Notification Link",
-	"welcome-notification-uid": "Welcome Notification User (UID)"
+	"welcome-notification-uid": "Welcome Notification User (UID)",
+	"notification-alert-timeout": "Notification Alert Timeout"
 }

public/language/en-US/error.json

@@ -18,6 +18,7 @@
     "invalid-username-or-password": "Please specify both a username and password",
     "invalid-search-term": "Invalid search term",
     "invalid-url": "Invalid URL",
+    "local-login-disabled": "Local login system has been disabled for non-privileged accounts.",
     "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "Username taken",

public/language/en-US/flags.json

@@ -18,6 +18,7 @@
 	"filter-type": "Flag Type",
 	"filter-type-all": "All Content",
 	"filter-type-post": "Post",
+	"filter-type-user": "User",
 	"filter-state": "State",
 	"filter-assignee": "Assignee UID",
 	"filter-cid": "Category",

public/language/en-US/global.json

@@ -97,6 +97,7 @@
     "enter_page_number": "Enter page number",
     "upload_file": "Upload file",
     "upload": "Upload",
+    "uploads": "Uploads",
     "allowed-file-types": "Allowed file types are %1",
     "unsaved-changes": "You have unsaved changes. Are you sure you wish to navigate away?",
     "reconnecting-message": "Looks like your connection to %1 was lost, please wait while we try to reconnect.",

public/language/en-US/pages.json

@@ -49,6 +49,8 @@
     "account/upvoted": "Posts upvoted by %1",
     "account/downvoted": "Posts downvoted by %1",
     "account/best": "Best posts made by %1",
+    "account/blocks": "Blocked users for %1",
+    "account/uploads": "Uploads by %1",
     "confirm": "Email Confirmed",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
     "maintenance.messageIntro": "Additionally, the administrator has left this message:",

public/language/en-US/register.json

@@ -19,5 +19,8 @@
     "terms_of_use_error": "You must agree to the Terms of Use",
     "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator.",
     "interstitial.intro": "We require some additional information before we can create your account.",
-    "interstitial.errors-found": "We could not complete your registration:"
+    "interstitial.errors-found": "We could not complete your registration:",
+    "gdpr_agree_data": "I consent to the collection and processing of my personal information on this website.",
+    "gdpr_agree_email": "I consent to receive digest and notification emails from this website.",
+    "gdpr_consent_denied": "You must give consent to this site to collect/process your information, and to send you emails."
 }

public/language/en-US/topic.json

@@ -118,8 +118,8 @@
     "sort_by": "Sort by",
     "oldest_to_newest": "Oldest to Newest",
     "newest_to_oldest": "Newest to Oldest",
-    "most_votes": "Most votes",
+    "most_votes": "Most Votes",
-    "most_posts": "Most posts",
+    "most_posts": "Most Posts",
     "stale.title": "Create new topic instead?",
     "stale.warning": "The topic you are replying to is quite old. Would you like to create a new topic instead, and reference this one in your reply?",
     "stale.create": "Create a new topic",
@@ -127,5 +127,7 @@
     "link_back": "Re: [%1](%2)",
     "diffs.title": "Post Edit History",
     "diffs.description": "This post has <strong>%1</strong> revisions. Click one of the revisions below to see the post content at that point in time.",
-    "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions."
+    "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
+    "diffs.current-revision": "current revision",
+    "diffs.original-revision": "original revision"
 }

public/language/en-US/uploads.json

@@ -2,5 +2,8 @@
     "uploading-file": "Uploading the file...",
     "select-file-to-upload": "Select a file to upload!",
     "upload-success": "File uploaded successfully!",
-    "maximum-file-size": "Maximum %1 kb"
+    "maximum-file-size": "Maximum %1 kb",
+    "no-uploads-found": "No uploads found",
+    "public-uploads-info": "Uploads are public, all visitors can see them.",
+    "private-uploads-info": "Uploads are private, only logged in users can see them."
 }

public/language/en-US/user.json

@@ -29,6 +29,8 @@
     "ignored": "Ignored",
     "followers": "Followers",
     "following": "Following",
+    "blocks": "Blocks",
+    "block_toggle": "Toggle Block",
     "aboutme": "About me",
     "signature": "Signature",
     "birthday": "Birthday",
@@ -89,6 +91,7 @@
     "has_no_upvoted_posts": "This user hasn't upvoted any posts yet.",
     "has_no_downvoted_posts": "This user hasn't downvoted any posts yet.",
     "has_no_voted_posts": "This user has no voted posts",
+    "has_no_blocks": "You have blocked no users.",
     "email_hidden": "Email Hidden",
     "hidden": "hidden",
     "paginate_description": "Paginate topics and posts instead of using infinite scroll",
@@ -142,5 +145,25 @@
     "info.email-history": "Email History",
     "info.moderation-note": "Moderation Note",
     "info.moderation-note.success": "Moderation note saved",
-    "info.moderation-note.add": "Add note"
+    "info.moderation-note.add": "Add note",
+    "consent.title": "Your Rights & Consent",
+    "consent.lead": "This community forum collects and processes your personal information.",
+    "consent.intro": "We use this information strictly to personalise your experience in this community, as well as to associate the posts you make to your user account. During the registration step you were asked to provide a username and email address, you can also optionally provide additional information to complete your user profile on this website.<br /><br />We retain this information for the life of your user account, and you are able to withdraw consent at any time by deleting your account. At any time you may request a copy of your contribution to this website, via your Rights &amp; Consent page.<br /><br />If you have any questions or concerns, we encourage you to reach out to this forum's administrative team.",
+    "consent.email_intro": "Occasionally, we may send emails to your registered email address in order to provide updates and/or to notify you of new activity that is pertinent to you. You can customise the frequency of the community digest (including disabling it outright), as well as select which types of notifications to receive via email, via your user settings page.",
+    "consent.digest_frequency": "By default, this community delivers email digests every %1.",
+    "consent.digest_off": "Currently, this community does not send out email digests",
+    "consent.received": "You have provided consent for this website to collect and process your information. No additional action is required.",
+    "consent.not_received": "You have not provided consent for data collection and processing. At any time this website&apos;s administration may elect to delete your account in order to become compliant with the General Data Protection Regulation.",
+    "consent.give": "Give consent",
+    "consent.right_of_access": "You have the Right of Access",
+    "consent.right_of_access_description": "You have the right to access any data collected by this website upon request. You can retrieve a copy of this data by clicking the appropriate button below.",
+    "consent.right_to_rectification": "You have the Right to Rectification",
+    "consent.right_to_rectification_description": "You have the right to change or update any inaccurate data provided to us. Your profile can be updated by editing your profile, and post content can always be edited. If this is not the case, please contact this site&apos;s administrative team.",
+    "consent.right_to_erasure": "You have the Right to Erasure",
+    "consent.right_to_erasure_description": "At any time, you are able to revoke your consent to data collection and/or processing by deleting your account.",
+    "consent.right_to_data_portability": "You have the Right to Data Portability",
+    "consent.right_to_data_portability_description": "You may request from us a machine-readable export of any collected data about you and your account. You can do so by clicking the appropriate button below.",
+    "consent.export_profile": "Export Profile (.csv)",
+    "consent.export_uploads": "Export Uploaded Content (.zip)",
+    "consent.export_posts": "Export Posts (.csv)"
 }

public/language/en-x-pirate/admin/extend/plugins.json

@@ -44,6 +44,8 @@
 	"alert.package-manager-unreachable": "<p>NodeBB could not reach the package manager, an upgrade is not suggested at this time.</p>",
 	"alert.incompatible": "<p>Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.</p>",
 	"alert.possibly-incompatible": "<div class=\"alert alert-warning\"><p><strong>No Compatibility Information Found</strong></p><p>This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.</p></div><p>In the event that NodeBB cannot boot properly:</p><pre><code>$ ./nodebb reset plugin=\"%1\"</code></pre><p>Continue installation of latest version of this plugin?</p>",
+	"alert.reorder": "Plugins Re-ordered",
+	"alert.reorder-success": "Please rebuild and restart your NodeBB to fully complete the process.",
 
 	"license.title": "Plugin License Information",
 	"license.intro": "The plugin <strong>%1</strong> is licensed under the %2. Please read and understand the license terms prior to activating this plugin.",

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

@@ -5,6 +5,7 @@
 	"private-groups.warning": "<strong>Beware!</strong> If this option is disabled and you have private groups, they automatically become public.",
 	"allow-creation": "Allow Group Creation",
 	"allow-creation-help": "If enabled, users can create groups <em>(Default: disabled)</em>",
+	"allow-multiple-badges-help": "This flag can be used to allow users to select multiple group badges, requires theme support.",
 	"max-name-length": "Maximum Group Name Length",
 	"cover-image": "Group Cover Image",
 	"default-cover": "Default Cover Images",

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

@@ -2,5 +2,6 @@
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
 	"welcome-notification-link": "Welcome Notification Link",
-	"welcome-notification-uid": "Welcome Notification User (UID)"
+	"welcome-notification-uid": "Welcome Notification User (UID)",
+	"notification-alert-timeout": "Notification Alert Timeout"
 }

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

@@ -18,6 +18,7 @@
     "invalid-username-or-password": "Please specify both a username and password",
     "invalid-search-term": "Invalid search term",
     "invalid-url": "Invalid URL",
+    "local-login-disabled": "Local login system has been disabled for non-privileged accounts.",
     "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
     "username-taken": "Username taken",

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

@@ -18,6 +18,7 @@
 	"filter-type": "Flag Type",
 	"filter-type-all": "All Content",
 	"filter-type-post": "Post",
+	"filter-type-user": "User",
 	"filter-state": "State",
 	"filter-assignee": "Assignee UID",
 	"filter-cid": "Category",

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

@@ -97,6 +97,7 @@
     "enter_page_number": "Enter page number",
     "upload_file": "Upload file",
     "upload": "Upload",
+    "uploads": "Uploads",
     "allowed-file-types": "Allowed file types are %1",
     "unsaved-changes": "You have unsaved changes. Are you sure you wish to navigate away?",
     "reconnecting-message": "Looks like your connection to %1 was lost, please wait while we try to reconnect.",

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

@@ -49,6 +49,8 @@
     "account/upvoted": "Posts upvoted by %1",
     "account/downvoted": "Posts downvoted by %1",
     "account/best": "Best posts made by %1",
+    "account/blocks": "Blocked users for %1",
+    "account/uploads": "Uploads by %1",
     "confirm": "Email Confirmed",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
     "maintenance.messageIntro": "Additionally, the administrator has left this message:",