Merge commit '2f9d8c350e54543f608d3d4c8e1a49bbb6cdea38' into v2.x

.github/workflows/test.yaml

@@ -5,10 +5,12 @@ on:
     branches:
       - master
       - develop
+      - bootstrap5
   pull_request:
     branches:
       - master
       - develop
+      - bootstrap5
 
 defaults:
   run:

CHANGELOG.md

@@ -1,3 +1,28 @@
+#### v2.5.7 (2022-10-14)
+
+##### Chores
+
+*  incrementing version number - v2.5.6 (c7bd7dbf)
+*  update changelog for v2.5.6 (e92238d0)
+*  incrementing version number - v2.5.5 (3509ed94)
+*  incrementing version number - v2.5.4 (e83260ca)
+*  incrementing version number - v2.5.3 (7e922936)
+*  incrementing version number - v2.5.2 (babcd17e)
+*  incrementing version number - v2.5.1 (ce3aa950)
+*  incrementing version number - v2.5.0 (01d276cb)
+*  incrementing version number - v2.4.5 (dd3e1a28)
+*  incrementing version number - v2.4.4 (d5525c87)
+*  incrementing version number - v2.4.3 (9c647c6c)
+*  incrementing version number - v2.4.2 (3aa7b855)
+*  incrementing version number - v2.4.1 (60cbd148)
+*  incrementing version number - v2.4.0 (4834cde3)
+*  incrementing version number - v2.3.1 (d2425942)
+*  incrementing version number - v2.3.0 (046ea120)
+
+##### Performance Improvements
+
+*  speed up build (dd4e9cce)
+
 #### v2.5.6 (2022-10-13)
 
 ##### Chores

README.md

@@ -3,6 +3,7 @@
 [![Workflow](https://github.com/NodeBB/NodeBB/actions/workflows/test.yaml/badge.svg)](https://github.com/NodeBB/NodeBB/actions/workflows/test.yaml)
 [![Coverage Status](https://coveralls.io/repos/github/NodeBB/NodeBB/badge.svg?branch=master)](https://coveralls.io/github/NodeBB/NodeBB?branch=master)
 [![Code Climate](https://codeclimate.com/github/NodeBB/NodeBB/badges/gpa.svg)](https://codeclimate.com/github/NodeBB/NodeBB)
+[![](https://dcbadge.vercel.app/api/server/p6YKPXu7er?style=flat)](https://discord.gg/p6YKPXu7er)
 
 [**NodeBB Forum Software**](https://nodebb.org) is powered by Node.js and supports either Redis, MongoDB, or a PostgreSQL database. It utilizes web sockets for instant interactions and real-time notifications. NodeBB takes the best of the modern web: real-time streaming discussions, mobile responsiveness, and rich RESTful read/write APIs, while staying true to the original bulletin board/forum format → categorical hierarchies, local user accounts, and asynchronous messaging.
 

install/data/defaults.json

@@ -146,6 +146,7 @@
     "maximumRelatedTopics": 0,
     "disableEmailSubscriptions": 0,
     "emailConfirmInterval": 10,
+    "emailConfirmExpiry": 24,
     "removeEmailNotificationImages": 0,
     "sendValidationEmail": 1,
     "includeUnverifiedEmails": 0,

install/package.json

@@ -99,9 +99,9 @@
         "nodebb-plugin-spam-be-gone": "1.0.2",
         "nodebb-rewards-essentials": "0.2.1",
         "nodebb-theme-lavender": "6.0.0",
-        "nodebb-theme-persona": "12.1.1",
+        "nodebb-theme-persona": "12.1.10",
         "nodebb-theme-slick": "2.0.2",
-        "nodebb-theme-vanilla": "12.1.18",
+        "nodebb-theme-vanilla": "12.1.19",
         "nodebb-widget-essentials": "6.0.0",
         "nodemailer": "6.7.8",
         "nprogress": "0.2.0",

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "المصادقة",
 	"email-confirm-interval": "لا يمكن للمستخدم إعادة إرسال رسالة تأكيد البريد الالكتروني حتى مرور",
-	"email-confirm-email2": "دقائق",
+	"email-confirm-interval2": "دقائق",
 	"allow-login-with": "السماح بتسجيل الدخول باستخدام",
 	"allow-login-with.username-email": "اسم المستخدم أو البريد الالكتروني",
 	"allow-login-with.username": "اسم المستخدم فقط",

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

@@ -5,6 +5,9 @@
 	"from": "Име за полето „От“",
 	"from-help": "Името на изпращача, което да бъде показано в е-писмото.",
 
+	"confirmation-settings": "Потвърждение",
+	"confirmation.expiry": "Продължителност на давността на връзката за потвърждаване, в часове",
+
 	"smtp-transport": "Транспорт чрез SMTP",
 	"smtp-transport.enabled": "Включване на транспорта чрез SMTP",
 	"smtp-transport-help": "Можете да изберете от списък от познати услуги, или да въведете такава ръчно.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Удостоверяване",
 	"email-confirm-interval": "Потребителят не може да изпраща повторно е-писмото за потвърждение, преди да са минали",
-	"email-confirm-email2": "минути",
+	"email-confirm-interval2": "минути",
 	"allow-login-with": "Позволяване на вписването чрез",
 	"allow-login-with.username-email": "Потребителско име или е-поща",
 	"allow-login-with.username": "Само потребителско име",

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

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

@@ -5,6 +5,9 @@
 	"from": "Jméno – od",
 	"from-help": "Zobrazené jméno v e-mailu v – Od",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "Přenos SMTP",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "Ze seznamu můžete vybrat známé služby nebo zadat vlastní.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Ověření",
 	"email-confirm-interval": "Uživatel nesmí požádat o znovu zaslání potvrzujícího e-mailu do",
-	"email-confirm-email2": "minut uplynulo",
+	"email-confirm-interval2": "minut uplynulo",
 	"allow-login-with": "Povolit přihlášení pomocí",
 	"allow-login-with.username-email": "Uživatelské jméno nebo e-mail",
 	"allow-login-with.username": "Pouze uživatelské jméno",

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

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

@@ -5,6 +5,9 @@
 	"from": "Name des Absenders",
 	"from-help": "Der Name des Absenders, welcher in der E-Mail angezeigt werden soll.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Konfiguration",
 	"smtp-transport.enabled": "SMTP-Transport aktivieren",
 	"smtp-transport-help": "Du kannst aus einer Liste bekannter Email-Provider auswählen, oder einen benutzerdefinierten eingeben.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentifizierung",
 	"email-confirm-interval": "Der Benutzer kann für ",
-	"email-confirm-email2": "  Minuten keine Bestätigungsmail erneut senden.",
+	"email-confirm-interval2": "  Minuten keine Bestätigungsmail erneut senden.",
 	"allow-login-with": "Erlaube Login mit",
 	"allow-login-with.username-email": "Benutzername oder E-Mail",
 	"allow-login-with.username": "Nur Benutzername",

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Autenticación",
 	"email-confirm-interval": "El usuario no puede re-enviar una confirmación por email hasta",
-	"email-confirm-email2": "minutos han pasado",
+	"email-confirm-interval2": "minutos han pasado",
 	"allow-login-with": "Permitir login con",
 	"allow-login-with.username-email": "Nombre de usuario o Email",
 	"allow-login-with.username": "Solo Nombre de Usuario",

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

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

@@ -5,6 +5,9 @@
 	"from": "Nom de l’expéditeur",
 	"from-help": "Le nom de l’expéditeur à afficher dans l'e-mail",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "Protocole SMTP",
 	"smtp-transport.enabled": "Activer l'envoi via SMTP",
 	"smtp-transport-help": "Vous pouvez sélectionner depuis une liste de services ou entrer un service personnalisé.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentification",
 	"email-confirm-interval": "Les utilisateurs ne peuvent pas demander un e-mail de vérification avant",
-	"email-confirm-email2": "minutes se sont écoulées",
+	"email-confirm-interval2": "minutes se sont écoulées",
 	"allow-login-with": "Autoriser l'identification avec",
 	"allow-login-with.username-email": "Nom d'utilisateur ou e-mail",
 	"allow-login-with.username": "Nom d'utilisateur uniquement",

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

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

@@ -5,6 +5,9 @@
 	"from": "מאת",
 	"from-help": "השם 'מאת' יוצג בדוא\"ל.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "אימות",
 	"email-confirm-interval": "המשתמש לא יוכל לשלוח הודעת אישור מייל עד שיחלוף",
-	"email-confirm-email2": "דקות",
+	"email-confirm-interval2": "דקות",
 	"allow-login-with": "אפשר התחברות עם",
 	"allow-login-with.username-email": "שם משתמש או סיסמא",
 	"allow-login-with.username": "שם משתמש בלבד",

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

@@ -5,6 +5,9 @@
 	"from": "Od imena",
 	"from-help": "Ime prikazano u dolaznom emailu.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Autentifikacija",
 	"email-confirm-interval": "Korisnik ne može ponovno poslati potvrdni email do ",
-	"email-confirm-email2": "prošlo je minuta",
+	"email-confirm-interval2": "prošlo je minuta",
 	"allow-login-with": "Dozvoli prijavu sa",
 	"allow-login-with.username-email": "Korisničko ime ili Email",
 	"allow-login-with.username": "Korisničko ime",

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

@@ -5,6 +5,9 @@
 	"from": "Feladó neve",
 	"from-help": "Az emailben megjelenített feladói név.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP beállítások",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "Válogathatsz a jól ismert szolgáltatások listájából vagy megadhatsz sajátot.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Hitelesítés",
 	"email-confirm-interval": "A felhasználó nem küldetheti újra az emailt ameddig nem telt el",
-	"email-confirm-email2": "perc",
+	"email-confirm-interval2": "perc",
 	"allow-login-with": "Bejelentkezés engedélyezése ezzel:",
 	"allow-login-with.username-email": "Felhasználónév vagy email cím",
 	"allow-login-with.username": "Csak felhasználónév",

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

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

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

@@ -5,6 +5,9 @@
 	"from": "Da Nome",
 	"from-help": "Il nome da visualizzare nell'email.",
 
+	"confirmation-settings": "Conferma",
+	"confirmation.expiry": "Ore per mantenere valido il link di conferma dell'email",
+
 	"smtp-transport": "Trasporto SMTP",
 	"smtp-transport.enabled": "Abilita trasporto SMTP",
 	"smtp-transport-help": "Puoi selezionare da un elenco di servizi noti o inserirne uno personalizzato.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "Autenticazione",
 	"email-confirm-interval": "L'utente non può mandare una nuova email di conferma fino a",
-	"email-confirm-email2": "minuti trascorsi",
+	"email-confirm-interval2": "minuti trascorsi",
 	"allow-login-with": "Consenti l'accesso con",
 	"allow-login-with.username-email": "Username o Email",
 	"allow-login-with.username": "Solo Username",

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

@@ -5,6 +5,9 @@
 	"from": "名前から",
 	"from-help": "メールからの名前が表示されます。",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "認証",
 	"email-confirm-interval": "ユーザーが確認するまでEメールを再送信しない",
-	"email-confirm-email2": "分経過",
+	"email-confirm-interval2": "分経過",
 	"allow-login-with": "ログインを許可",
 	"allow-login-with.username-email": "ユーザー名または電子メール",
 	"allow-login-with.username": "ユーザー名のみ",

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

@@ -5,6 +5,9 @@
 	"from": "포럼 메일 발신자 이름",
 	"from-help": "이메일에 표시할 발신자 이름",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "자주 사용되는 서비스 목록 중에 하나를 선택하거나 직접 입력할 수 있습니다.",

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

@@ -1,7 +1,7 @@
 {
 	"authentication": "인증",
 	"email-confirm-interval": "사용자는",
-	"email-confirm-email2": "분이 지나기 전까지 인증 메일 재요청이 불가능합니다.",
+	"email-confirm-interval2": "분이 지나기 전까지 인증 메일 재요청이 불가능합니다.",
 	"allow-login-with": "로그인 허용 수단",
 	"allow-login-with.username-email": "사용자명 또는 이메일",
 	"allow-login-with.username": "사용자명",

public/language/lt/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/lt/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

public/language/lv/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "Sūtītāja vārds vai nosaukums",
 	"from-help": "Vārds vai nosaukums, ko saņēmējs redzēs kā sūtītāju.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP transports",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "Izvēlies no labi zināmu pakalpojumu saraksta vai ievadi pielāgotu pakalpojumu.",

public/language/lv/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Autentifikācija",
 	"email-confirm-interval": "Lietotājs nevar atkārtoti nosūtīt apstiprinājuma e-pastu pirms",
-	"email-confirm-email2": "minūtes nav pagājušas",
+	"email-confirm-interval2": "minūtes nav pagājušas",
 	"allow-login-with": "Ielogoties",
 	"allow-login-with.username-email": "Ar lietotājvārdu vai e-pasta adresi",
 	"allow-login-with.username": "Tikai ar lietotājvārdu",

public/language/ms/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/ms/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

public/language/nb/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/nb/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Autentisering ",
 	"email-confirm-interval": "Brukeren kan ikke sende en bekreftelses-e-post på nytt før",
-	"email-confirm-email2": "minutter har gått",
+	"email-confirm-interval2": "minutter har gått",
 	"allow-login-with": "Tillat innlogging med",
 	"allow-login-with.username-email": "Brukernavn eller e-post",
 	"allow-login-with.username": "Kun brukernavn",

public/language/nl/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Naam",
 	"from-help": "De from naam om te tonen in de e-mail.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "Je kunt een bekende dienst uit de lijst selecteren of vul een aangepaste dienst in.",

public/language/nl/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

public/language/pl/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "Pole „Od”",
 	"from-help": "Nazwa „Od” widoczna w e-mailach",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "Transport SMTP",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "Możesz wybrać z listy dobrze znanych usług lub wskazać usługę niestandardową.",

public/language/pl/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Uwierzytelnianie",
 	"email-confirm-interval": "Użytkownik nie może ponownie wysłać e-maila z potwierdzeniem, dopóki nie minie",
-	"email-confirm-email2": "minut",
+	"email-confirm-interval2": "minut",
 	"allow-login-with": "Zezwalaj na logowanie przy użyciu",
 	"allow-login-with.username-email": "Nazwy użytkownika lub adresu email",
 	"allow-login-with.username": "Tylko nazwy użytkownika",

public/language/pt-BR/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "Por Nome (From)",
 	"from-help": "O nome que será mostrado em \"De\" no e-mail.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "Trasporte por SMTP",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "Você pode escolher entre uma lista de serviços conhecidos ou adicionar um personalizado.",

public/language/pt-BR/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Autenticação",
 	"email-confirm-interval": "O usuário não pode reenviar um e-mail de confirmação até",
-	"email-confirm-email2": "minutos decorridos",
+	"email-confirm-interval2": "minutos decorridos",
 	"allow-login-with": "Permitir login com",
 	"allow-login-with.username-email": "Nome de Usuário ou E-mail",
 	"allow-login-with.username": "Apenas Nome de Usuário",

public/language/pt-PT/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/pt-PT/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Autenticação",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Permitir início de sessão com",
 	"allow-login-with.username-email": "Nome de Utilizador ou E-mail",
 	"allow-login-with.username": "Nome de Utilizador Apenas",

public/language/ro/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/ro/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

public/language/ru/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "От кого",
 	"from-help": "Имя отправителя письма (или название форума).",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "Сервис SMTP",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "Выберите один из популярных сервисов или укажите свой почтовый сервер.",

public/language/ru/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Авторизация",
 	"email-confirm-interval": "Пользователь не сможет снова запросить код подтверждения, пока не пройдёт",
-	"email-confirm-email2": "минут",
+	"email-confirm-interval2": "минут",
 	"allow-login-with": "Разрешить вход с помощью",
 	"allow-login-with.username-email": "Имени пользователя или адреса электронной почты",
 	"allow-login-with.username": "Только имени пользователя",

public/language/rw/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/rw/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

public/language/sc/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/sc/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

public/language/sk/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "Meno - od",
 	"from-help": "Zobrazené meno v e-maily v - Od",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "Prenos SMTP",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "Zo zoznamu môžete vybrať známe služby alebo zadať vlastné.",

public/language/sk/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Overenie",
 	"email-confirm-interval": "Používateľ nesmie požiadať o znovu odoslanie potvrdzujúceho e-mailu do",
-	"email-confirm-email2": "minút uplynulo",
+	"email-confirm-interval2": "minút uplynulo",
 	"allow-login-with": "Povoliť prihlásenie pomocou",
 	"allow-login-with.username-email": "Používateľské meno alebo e-mail",
 	"allow-login-with.username": "Iba používateľské meno",

public/language/sl/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/sl/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Preverjanje pristnosti",
 	"email-confirm-interval": "Uporabnik morda ne bo mogel znova poslati potrditvenega e-poštnega sporočila, dokler",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Dovoli prijavo z",
 	"allow-login-with.username-email": "Uporabniško ime ali e-poštni naslov",
 	"allow-login-with.username": "Samo uporabniško ime",

public/language/sq-AL/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/sq-AL/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

public/language/sr/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "Od koga",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/sr/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Auntentifikacija",
 	"email-confirm-interval": "Korisnik možda neće moći da ponovo pošalje email konfirmaciju sve dok",
-	"email-confirm-email2": "minuta je prošlo",
+	"email-confirm-interval2": "minuta je prošlo",
 	"allow-login-with": "Dozvoli login sa",
 	"allow-login-with.username-email": "Korisničko ime ili Email",
 	"allow-login-with.username": "Samo korisničko ime",

public/language/sv/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/sv/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

public/language/th/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/th/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Authentication",
 	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
+	"email-confirm-interval2": "minutes have elapsed",
 	"allow-login-with": "Allow login with",
 	"allow-login-with.username-email": "Username or Email",
 	"allow-login-with.username": "Username Only",

public/language/tr/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "SMTP Aktarımını Etkinleştir",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",

public/language/tr/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Kimlik Doğrulama",
 	"email-confirm-interval": "Kullanıcı onay e-postasını tekrar gönderemez",
-	"email-confirm-email2": "dakika geçti",
+	"email-confirm-interval2": "dakika geçti",
 	"allow-login-with": "Girişe izin ver:",
 	"allow-login-with.username-email": "Kullanıcı Adı veya E-posta",
 	"allow-login-with.username": "Sadece kullanıcı adı",

public/language/uk/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "Ім'я відправника",
 	"from-help": "Ім'я відправника, що буде показано в електронних листах",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "Протокол SMTP",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "Ви можете обрати поштовий сервіс зі списку або використати ваш власний сервіс.",

public/language/uk/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Аутентифікація",
 	"email-confirm-interval": "Користувач не може повторно надіслати підтвердження електронної пошти поки не мине",
-	"email-confirm-email2": "хвилин",
+	"email-confirm-interval2": "хвилин",
 	"allow-login-with": "Дозволити вхід використовуючи",
 	"allow-login-with.username-email": "Ім'я користувача або електронну пошту",
 	"allow-login-with.username": "Тільки ім'я користувача",

public/language/vi/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "Tên Người Gửi",
 	"from-help": "Tên người gửi hiển thị trong email.",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "Truyền Tải SMTP",
 	"smtp-transport.enabled": "Bật truyền tải SMTP",
 	"smtp-transport-help": "Bạn có thể chọn từ danh sách các dịch vụ nổi bật hoặc nhập một dịch vụ tùy chỉnh.",

public/language/vi/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "Xác thực",
 	"email-confirm-interval": "Người dùng không thể gửi lại email xác nhận cho đến khi",
-	"email-confirm-email2": "phút đã trôi qua",
+	"email-confirm-interval2": "phút đã trôi qua",
 	"allow-login-with": "Cho phép đăng nhập với",
 	"allow-login-with.username-email": "Tên Đăng Nhập hoặc Email",
 	"allow-login-with.username": "Chỉ Tên Đăng Nhập",

public/language/zh-CN/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "发送者",
 	"from-help": "用于邮件中显示的发送者",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP 通信",
 	"smtp-transport.enabled": "启用 SMTP 通信",
 	"smtp-transport-help": "您可以从列表中选取一个已知的服务或自定义。",

public/language/zh-CN/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "验证",
 	"email-confirm-interval": "用户无法重新发送电子邮箱激活直到",
-	"email-confirm-email2": "分钟已经过",
+	"email-confirm-interval2": "分钟已经过",
 	"allow-login-with": "允许使用何种登录名",
 	"allow-login-with.username-email": "用户名或者邮箱",
 	"allow-login-with.username": "仅限用户名",

public/language/zh-TW/admin/settings/email.json

@@ -5,6 +5,9 @@
 	"from": "發送人",
 	"from-help": "用於郵件中顯示的發送人",
 
+	"confirmation-settings": "Confirmation",
+	"confirmation.expiry": "Hours to keep email confirmation link valid",
+
 	"smtp-transport": "SMTP 通信",
 	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "您可以從列表中選取一個已知的服務或自訂。",

public/language/zh-TW/admin/settings/user.json

@@ -1,7 +1,7 @@
 {
 	"authentication": "驗證",
 	"email-confirm-interval": "使用者無法重新發送電子信箱確認信直到",
-	"email-confirm-email2": "分鐘已經過",
+	"email-confirm-interval2": "分鐘已經過",
 	"allow-login-with": "允許使用何種登入名",
 	"allow-login-with.username-email": "使用者名或者電子信箱",
 	"allow-login-with.username": "僅限使用者名",

public/src/client/groups/memberlist.js

@@ -2,7 +2,6 @@
 
 define('forum/groups/memberlist', ['api', 'bootbox', 'alerts'], function (api, bootbox, alerts) {
 	const MemberList = {};
-	let searchInterval;
 	let groupName;
 	let templateName;
 
@@ -89,15 +88,13 @@ define('forum/groups/memberlist', ['api', 'bootbox', 'alerts'], function (api, b
 	}
 
 	function handleMemberSearch() {
-		$('[component="groups/members/search"]').on('keyup', function () {
+		const searchEl = $('[component="groups/members/search"]');
-			const query = $(this).val();
+		searchEl.on('keyup', utils.debounce(function () {
-			if (searchInterval) {
+			const query = searchEl.val();
-				clearInterval(searchInterval);
+			socket.emit('groups.searchMembers', {
-				searchInterval = 0;
+				groupName: groupName,
-			}
+				query: query,
-
+			}, function (err, results) {
-			searchInterval = setTimeout(function () {
-				socket.emit('groups.searchMembers', { groupName: groupName, query: query }, function (err, results) {
 				if (err) {
 					return alerts.error(err);
 				}
@@ -106,8 +103,7 @@ define('forum/groups/memberlist', ['api', 'bootbox', 'alerts'], function (api, b
 					$('[component="groups/members"]').attr('data-nextstart', 20);
 				});
 			});
-			}, 250);
+		}, 250));
-		});
 	}
 
 	function handleMemberInfiniteScroll() {

public/src/modules/iconSelect.js

@@ -45,7 +45,7 @@ define('iconSelect', ['benchpress', 'bootbox'], function (Benchpress, bootbox) {
 						label: 'Select',
 						className: 'btn-primary',
 						callback: function () {
-							const iconClass = $('.bootbox .selected').attr('class');
+							const iconClass = $('.bootbox .selected').attr('class') || `fa fa-${$('.bootbox #fa-filter').val()}`;
 							const categoryIconClass = $('<div></div>').addClass(iconClass).removeClass('fa').removeClass('selected')
 								.attr('class');
 							const searchElVal = picker.find('input').val();

public/src/modules/messages.js

@@ -38,12 +38,7 @@ define('messages', ['bootbox', 'translator', 'storage', 'alerts', 'hooks'], func
 			msg.message = message || '[[error:email-not-confirmed]]';
 			msg.clickfn = function () {
 				alerts.remove('email_confirm');
-				socket.emit('user.emailConfirm', {}, function (err) {
+				ajaxify.go('/me/edit/email');
-					if (err) {
-						return alerts.error(err);
-					}
-					alerts.success('[[notifications:email-confirm-sent]]');
-				});
 			};
 			alerts.alert(msg);
 		} else if (!app.user['email:confirmed'] && app.user.isEmailConfirmSent) {