From 46243719b728cc26e407c2fc63c22b2ad115223a Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Fri, 30 Jul 2021 17:53:30 +0000 Subject: [PATCH] Latest translations and fallbacks --- public/language/ar/admin/settings/email.json | 5 +++-- public/language/ar/email.json | 4 +++- public/language/ar/error.json | 3 ++- public/language/ar/register.json | 5 +++-- public/language/ar/user.json | 5 ++++- public/language/bg/admin/settings/email.json | 5 +++-- public/language/bg/email.json | 4 +++- public/language/bg/error.json | 3 ++- public/language/bg/register.json | 5 +++-- public/language/bg/user.json | 5 ++++- public/language/bn/admin/settings/email.json | 5 +++-- public/language/bn/email.json | 4 +++- public/language/bn/error.json | 3 ++- public/language/bn/register.json | 5 +++-- public/language/bn/user.json | 5 ++++- public/language/cs/admin/settings/email.json | 5 +++-- public/language/cs/email.json | 4 +++- public/language/cs/error.json | 3 ++- public/language/cs/register.json | 5 +++-- public/language/cs/user.json | 5 ++++- public/language/da/admin/settings/email.json | 5 +++-- public/language/da/email.json | 4 +++- public/language/da/error.json | 3 ++- public/language/da/register.json | 5 +++-- public/language/da/user.json | 5 ++++- public/language/de/admin/settings/email.json | 5 +++-- public/language/de/email.json | 4 +++- public/language/de/error.json | 3 ++- public/language/de/register.json | 5 +++-- public/language/de/user.json | 5 ++++- public/language/el/admin/settings/email.json | 5 +++-- public/language/el/email.json | 4 +++- public/language/el/error.json | 3 ++- public/language/el/register.json | 5 +++-- public/language/el/user.json | 5 ++++- public/language/en-US/admin/settings/email.json | 5 +++-- public/language/en-US/email.json | 4 +++- public/language/en-US/error.json | 3 ++- public/language/en-US/register.json | 5 +++-- public/language/en-US/user.json | 5 ++++- public/language/en-x-pirate/admin/settings/email.json | 5 +++-- public/language/en-x-pirate/email.json | 4 +++- public/language/en-x-pirate/error.json | 3 ++- public/language/en-x-pirate/register.json | 5 +++-- public/language/en-x-pirate/user.json | 5 ++++- public/language/es/admin/settings/email.json | 5 +++-- public/language/es/email.json | 4 +++- public/language/es/error.json | 3 ++- public/language/es/register.json | 5 +++-- public/language/es/user.json | 5 ++++- public/language/et/admin/settings/email.json | 5 +++-- public/language/et/email.json | 4 +++- public/language/et/error.json | 3 ++- public/language/et/register.json | 5 +++-- public/language/et/user.json | 5 ++++- public/language/fa-IR/admin/settings/email.json | 5 +++-- public/language/fa-IR/email.json | 4 +++- public/language/fa-IR/error.json | 3 ++- public/language/fa-IR/register.json | 5 +++-- public/language/fa-IR/user.json | 5 ++++- public/language/fi/admin/settings/email.json | 5 +++-- public/language/fi/email.json | 4 +++- public/language/fi/error.json | 3 ++- public/language/fi/register.json | 5 +++-- public/language/fi/user.json | 5 ++++- public/language/fr/admin/settings/email.json | 5 +++-- public/language/fr/email.json | 4 +++- public/language/fr/error.json | 3 ++- public/language/fr/register.json | 5 +++-- public/language/fr/user.json | 5 ++++- public/language/gl/admin/settings/email.json | 5 +++-- public/language/gl/email.json | 4 +++- public/language/gl/error.json | 3 ++- public/language/gl/register.json | 5 +++-- public/language/gl/user.json | 5 ++++- public/language/he/admin/settings/email.json | 5 +++-- public/language/he/email.json | 4 +++- public/language/he/error.json | 3 ++- public/language/he/register.json | 5 +++-- public/language/he/user.json | 5 ++++- public/language/hr/admin/settings/email.json | 5 +++-- public/language/hr/email.json | 4 +++- public/language/hr/error.json | 3 ++- public/language/hr/register.json | 5 +++-- public/language/hr/user.json | 5 ++++- public/language/hu/admin/settings/email.json | 5 +++-- public/language/hu/email.json | 4 +++- public/language/hu/error.json | 3 ++- public/language/hu/register.json | 5 +++-- public/language/hu/user.json | 5 ++++- public/language/id/admin/settings/email.json | 5 +++-- public/language/id/email.json | 4 +++- public/language/id/error.json | 3 ++- public/language/id/register.json | 5 +++-- public/language/id/user.json | 5 ++++- public/language/it/admin/settings/email.json | 5 +++-- public/language/it/email.json | 4 +++- public/language/it/error.json | 3 ++- public/language/it/register.json | 5 +++-- public/language/it/user.json | 5 ++++- public/language/ja/admin/settings/email.json | 5 +++-- public/language/ja/email.json | 4 +++- public/language/ja/error.json | 3 ++- public/language/ja/register.json | 5 +++-- public/language/ja/user.json | 5 ++++- public/language/ko/admin/settings/email.json | 5 +++-- public/language/ko/email.json | 4 +++- public/language/ko/error.json | 3 ++- public/language/ko/register.json | 5 +++-- public/language/ko/user.json | 5 ++++- public/language/lt/admin/settings/email.json | 5 +++-- public/language/lt/email.json | 4 +++- public/language/lt/error.json | 3 ++- public/language/lt/register.json | 5 +++-- public/language/lt/user.json | 5 ++++- public/language/lv/admin/settings/email.json | 5 +++-- public/language/lv/email.json | 4 +++- public/language/lv/error.json | 3 ++- public/language/lv/register.json | 5 +++-- public/language/lv/user.json | 5 ++++- public/language/ms/admin/settings/email.json | 5 +++-- public/language/ms/email.json | 4 +++- public/language/ms/error.json | 3 ++- public/language/ms/register.json | 5 +++-- public/language/ms/user.json | 5 ++++- public/language/nb/admin/settings/email.json | 5 +++-- public/language/nb/email.json | 4 +++- public/language/nb/error.json | 3 ++- public/language/nb/register.json | 5 +++-- public/language/nb/user.json | 5 ++++- public/language/nl/admin/settings/email.json | 5 +++-- public/language/nl/email.json | 4 +++- public/language/nl/error.json | 3 ++- public/language/nl/register.json | 5 +++-- public/language/nl/user.json | 5 ++++- public/language/pl/admin/settings/email.json | 5 +++-- public/language/pl/email.json | 4 +++- public/language/pl/error.json | 3 ++- public/language/pl/register.json | 5 +++-- public/language/pl/user.json | 5 ++++- public/language/pt-BR/admin/settings/email.json | 5 +++-- public/language/pt-BR/email.json | 4 +++- public/language/pt-BR/error.json | 3 ++- public/language/pt-BR/register.json | 5 +++-- public/language/pt-BR/user.json | 5 ++++- public/language/pt-PT/admin/settings/email.json | 5 +++-- public/language/pt-PT/email.json | 4 +++- public/language/pt-PT/error.json | 3 ++- public/language/pt-PT/register.json | 5 +++-- public/language/pt-PT/user.json | 5 ++++- public/language/ro/admin/settings/email.json | 5 +++-- public/language/ro/email.json | 4 +++- public/language/ro/error.json | 3 ++- public/language/ro/register.json | 5 +++-- public/language/ro/user.json | 5 ++++- public/language/ru/admin/settings/email.json | 5 +++-- public/language/ru/email.json | 4 +++- public/language/ru/error.json | 3 ++- public/language/ru/register.json | 5 +++-- public/language/ru/user.json | 5 ++++- public/language/rw/admin/settings/email.json | 5 +++-- public/language/rw/email.json | 4 +++- public/language/rw/error.json | 3 ++- public/language/rw/register.json | 5 +++-- public/language/rw/user.json | 5 ++++- public/language/sc/admin/settings/email.json | 5 +++-- public/language/sc/email.json | 4 +++- public/language/sc/error.json | 3 ++- public/language/sc/register.json | 5 +++-- public/language/sc/user.json | 5 ++++- public/language/sk/admin/settings/email.json | 5 +++-- public/language/sk/email.json | 4 +++- public/language/sk/error.json | 3 ++- public/language/sk/register.json | 5 +++-- public/language/sk/user.json | 5 ++++- public/language/sl/admin/settings/email.json | 5 +++-- public/language/sl/email.json | 4 +++- public/language/sl/error.json | 3 ++- public/language/sl/register.json | 5 +++-- public/language/sl/user.json | 5 ++++- public/language/sr/admin/settings/email.json | 5 +++-- public/language/sr/email.json | 4 +++- public/language/sr/error.json | 3 ++- public/language/sr/register.json | 5 +++-- public/language/sr/user.json | 5 ++++- public/language/sv/admin/settings/email.json | 5 +++-- public/language/sv/email.json | 4 +++- public/language/sv/error.json | 3 ++- public/language/sv/register.json | 5 +++-- public/language/sv/user.json | 5 ++++- public/language/th/admin/settings/email.json | 5 +++-- public/language/th/email.json | 4 +++- public/language/th/error.json | 3 ++- public/language/th/register.json | 5 +++-- public/language/th/user.json | 5 ++++- public/language/tr/admin/settings/email.json | 5 +++-- public/language/tr/email.json | 4 +++- public/language/tr/error.json | 3 ++- public/language/tr/register.json | 5 +++-- public/language/tr/user.json | 5 ++++- public/language/uk/admin/settings/email.json | 5 +++-- public/language/uk/email.json | 4 +++- public/language/uk/error.json | 3 ++- public/language/uk/register.json | 5 +++-- public/language/uk/user.json | 5 ++++- public/language/vi/admin/settings/email.json | 5 +++-- public/language/vi/email.json | 4 +++- public/language/vi/error.json | 3 ++- public/language/vi/register.json | 5 +++-- public/language/vi/user.json | 5 ++++- public/language/zh-CN/admin/settings/email.json | 5 +++-- public/language/zh-CN/email.json | 4 +++- public/language/zh-CN/error.json | 3 ++- public/language/zh-CN/register.json | 5 +++-- public/language/zh-CN/user.json | 5 ++++- public/language/zh-TW/admin/settings/email.json | 5 +++-- public/language/zh-TW/email.json | 4 +++- public/language/zh-TW/error.json | 3 ++- public/language/zh-TW/register.json | 5 +++-- public/language/zh-TW/user.json | 5 ++++- 220 files changed, 660 insertions(+), 308 deletions(-) diff --git a/public/language/ar/admin/settings/email.json b/public/language/ar/admin/settings/email.json index 839fd2b6f6..9bdbde26a6 100644 --- a/public/language/ar/admin/settings/email.json +++ b/public/language/ar/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/ar/email.json b/public/language/ar/email.json index e74f4af573..b4264f1d3d 100644 --- a/public/language/ar/email.json +++ b/public/language/ar/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "مرحبًا", "greeting_with_name": "مرحبًا بك يا %1", "email.verify-your-email.subject": "Please verify your email", - "email.verify.text1": "Your email address has changed!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "شكرًا على تسجيلك في %1!", "welcome.text2": "لتفعيل حسابك، نحتاج إلى التأكد من صحة عنوان البريد الإلكتروني الذي سجلت به.", "welcome.text3": "تم قبول نتسجيلك ، يمكنك الدخول باتسخدام اسم المستخدم و كلمة المرور.", diff --git a/public/language/ar/error.json b/public/language/ar/error.json index 69512b0986..6ea93ba5e7 100644 --- a/public/language/ar/error.json +++ b/public/language/ar/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "رقم الصفحة غير صحيح ، يجب أن يكون بين %1 و %2 .", "username-taken": "اسم المستخدم مأخوذ", "email-taken": "البريد الالكتروني مأخوذ", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "لا يمكنك الدردشة حتى تقوم بتأكيد بريدك الإلكتروني، الرجاء إضغط هنا لتأكيد بريدك اﻹلكتروني.", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "هذا المنتدى يستلزم تفعيل بريدك الإلكتروني، انقر هنا من فضلك لإدخاله.", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "لم نستطع تفعيل بريدك الإلكتروني، المرجو المحاولة لاحقًا.", "confirm-email-already-sent": "لقد تم ارسال بريد التأكيد، الرجاء اﻹنتظار 1% دقائق لإعادة اﻹرسال", "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.", diff --git a/public/language/ar/register.json b/public/language/ar/register.json index 4b48429bf9..ce3b35e526 100644 --- a/public/language/ar/register.json +++ b/public/language/ar/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "تمت إضافتك في قائمة الإنتضار. ستتلقى رسالة إلكترونية عند الموافقة على تسجيلك من قبل الإدارة.", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "نحتاج إلى بعض المعلومات الإضافية قبل أن نتمكن من إنشاء حسابك.", - "interstitial.errors-found": "تعذر علينا إتمام عملية التسجيل:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "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.", diff --git a/public/language/ar/user.json b/public/language/ar/user.json index 3a42d6334e..5f28117d79 100644 --- a/public/language/ar/user.json +++ b/public/language/ar/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Export Uploaded Content (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Export Posts (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/bg/admin/settings/email.json b/public/language/bg/admin/settings/email.json index 2722d28c0d..b5969f1920 100644 --- a/public/language/bg/admin/settings/email.json +++ b/public/language/bg/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Изключване на резюметата по е-пощата", "subscriptions.hour": "Време за разпращане", "subscriptions.hour-help": "Моля, въведете число, представляващо часа, в който да се разпращат е-писма с подготвеното резюме (напр.. 0 за полунощ, 17 за 5 следобед). Имайте предвид, че този час е според часовата зона на сървъра и може да не съвпада с часовника на системата Ви.
Приблизителното време на сървъра е:
Изпращането на следващия ежедневен бюлетин е планирано за ", - "notifications.settings": "Настройки за известията по е-поща", - "notifications.remove-images": "Премахване на изображенията от известията по е-поща" + "notifications.remove-images": "Премахване на изображенията от известията по е-поща", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/bg/email.json b/public/language/bg/email.json index db33b64c15..739ffbbbfd 100644 --- a/public/language/bg/email.json +++ b/public/language/bg/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Здравейте", "greeting_with_name": "Здравейте, %1", "email.verify-your-email.subject": "Моля, потвърдете е-пощата си", - "email.verify.text1": "Адресът на е-пощата Ви е променен!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Благодарим Ви, че се регистрирахте в %1", "welcome.text2": "За да активирате напълно акаунта си, трябва да потвърдите е-пощата, с която сте се регистрирали.", "welcome.text3": "Вашата заявка за регистрация беше приета от администратор. Вече можете да се впишете със своето потребителско име и парола.", diff --git a/public/language/bg/error.json b/public/language/bg/error.json index 2634182672..93888cff2c 100644 --- a/public/language/bg/error.json +++ b/public/language/bg/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Грешен номер на странициране, трябва да бъде между %1 и %2", "username-taken": "Потребителското име е заето", "email-taken": "Е-пощата е заета", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "На тази е-поща вече е била изпратена покана", "email-not-confirmed": "Няма да можете да публикувате съобщения, докато е-пощата Ви не бъде потвърдена. Моля, натиснете тук, за да потвърдите е-пощата си.", "email-not-confirmed-chat": "Няма да можете да пишете в разговори, докато е-пощата Ви не бъде потвърдена. Моля, натиснете тук, за да потвърдите е-пощата си.", "email-not-confirmed-email-sent": "Вашата е-поща все още не е потвърдена. Моля, проверете входящата си кутия за писмото за потвърждение. Няма да можете да публикувате съобщения или да пишете в разговори, докато е-пощата Ви не бъде потвърдена.", - "no-email-to-confirm": "Този форум изисква потвърдена е-поща. Моля, натиснете тук, за да въведете е-поща", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Не успяхме да потвърдим е-пощата Ви. Моля, опитайте отново по-късно.", "confirm-email-already-sent": "Е-писмото за потвърждение вече е изпратено. Моля, почакайте още %1 минута/и, преди да изпратите ново.", "sendmail-not-found": "Изпълнимият файл на „sendmail“ не може да бъде намерен. Моля, уверете се, че е инсталиран и изпълним за потребителя, чрез който е пуснат NodeBB.", diff --git a/public/language/bg/register.json b/public/language/bg/register.json index b96ac46593..aaf5427c97 100644 --- a/public/language/bg/register.json +++ b/public/language/bg/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Вашата регистрация беше добавена в опашката за одобрение. Ще получите е-писмо, когато тя бъде одобрена от администратор.", "registration-queue-average-time": "Средното време за одобрение на нови членове е %1 часа и %2 минути.", "registration-queue-auto-approve-time": "Членството Ви в този форум ще бъде напълно активирано след около %1 часа.", - "interstitial.intro": "Нуждаем се от малко допълнителна информация, преди да можем да създадем акаунта Ви.", - "interstitial.errors-found": "Не можем да завършим Вашата регистрация:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "Съгласявам се това личната ми информация да се съхранява и обработва от този уеб сайт.", "gdpr_agree_email": "Съгласявам се да получавам е-писма с резюмета и известия от този уеб сайт.", "gdpr_consent_denied": "Трябва да се съгласите с това уеб сайтът да събира/обработва информацията Ви, и да Ви изпраща е-писма.", diff --git a/public/language/bg/user.json b/public/language/bg/user.json index 5398779c84..b5f5bd9588 100644 --- a/public/language/bg/user.json +++ b/public/language/bg/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Изнасяне на каченото съдържание (.zip)", "consent.export-uploads-success": "Изнасяне на каченото съдържание… Ще получите известие, когато е готово.", "consent.export_posts": "Изнасяне на публикациите (.csv)", - "consent.export-posts-success": "Изнасяне на публикациите… Ще получите известие, когато е готово." + "consent.export-posts-success": "Изнасяне на публикациите… Ще получите известие, когато е готово.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/bn/admin/settings/email.json b/public/language/bn/admin/settings/email.json index 18d4209380..4dd2f2cb17 100644 --- a/public/language/bn/admin/settings/email.json +++ b/public/language/bn/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "ইমেইল ডাইজেস্ট নিষ্ক্রিয়", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/bn/email.json b/public/language/bn/email.json index 585b3d9381..dff579f0ee 100644 --- a/public/language/bn/email.json +++ b/public/language/bn/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "স্বাগতম", "greeting_with_name": "স্বাগতম %1", "email.verify-your-email.subject": "দয়া করে ইমেইল যাচাই করুন", - "email.verify.text1": "আপনার ইমেইল পরিবর্তন হয়েছে!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "%1 এ নিবন্ধন করার জন্য আপনাকে ধন্যবাদ!", "welcome.text2": "আপনার একাউন্ট এ্যাক্টিভেট করার জন্য, আপনি যে ইমেইল এড্রেস ব্যাবহার করে নিবন্ধন করেছেন তা যাচাই করতে হবে", "welcome.text3": "An administrator has accepted your registration application. You can login with your username/password now.", diff --git a/public/language/bn/error.json b/public/language/bn/error.json index 86f2405a59..3d6acfa487 100644 --- a/public/language/bn/error.json +++ b/public/language/bn/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2", "username-taken": "ইউজারনেম আগেই ব্যবহৃত", "email-taken": "ইমেইল আগেই ব্যবহৃত", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "We could not confirm your email, please try again later.", "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.", "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.", diff --git a/public/language/bn/register.json b/public/language/bn/register.json index 1b176bce46..a4216376a1 100644 --- a/public/language/bn/register.json +++ b/public/language/bn/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "আপনার নিবন্ধনটি এ্যাপ্লুভাল তালিকায় যুক্ত হয়েছে। একজন এডমিনিস্ট্রেটর কর্তৃক নিবন্ধন গৃহীত হলে আপনি একটি মেইল পাবেন। ", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "আপনার একাউন্ট তৈরীর পূর্বে আমাদের আরো কিছু বাড়তি তথ্য জানা প্রয়োজন।", - "interstitial.errors-found": "আপনার নিবন্ধনটি সম্পূর্ণ করা সম্ভব হয় নি।", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "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.", diff --git a/public/language/bn/user.json b/public/language/bn/user.json index 90d4509c69..ebac5582f5 100644 --- a/public/language/bn/user.json +++ b/public/language/bn/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Export Uploaded Content (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Export Posts (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/cs/admin/settings/email.json b/public/language/cs/admin/settings/email.json index c545b1a4bf..339700448d 100644 --- a/public/language/cs/admin/settings/email.json +++ b/public/language/cs/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Zakázat e-mailové odběry", "subscriptions.hour": "Hodina přehledu", "subscriptions.hour-help": "Zadejte číslo odpovídající hodině, kdy mají být odeslány přehledové e-maily (tj. 0 pro půlnoc, 17 pro 5:00pm). Mějte na paměti, že tato hodina závisí na hodinách samotného serveru a nemusí tak souhlasit se systémovými hodinami.
Přibližný čas serveru je: .
Další odeslání přehledů je plánováno na .", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/cs/email.json b/public/language/cs/email.json index fcfab63669..849719f377 100644 --- a/public/language/cs/email.json +++ b/public/language/cs/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Dobrý den", "greeting_with_name": "Dobrý den %1", "email.verify-your-email.subject": "Ověřte prosím vaší e-mailovou adresu", - "email.verify.text1": "Vaše e-mailová adresa byla změněna.", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Děkujeme vám za registraci na %1!", "welcome.text2": "Pro úplnou aktivaci vašeho účtu potřebujeme ověřit vaši e-mailovou adresu.", "welcome.text3": "Administrátor právě potvrdil vaší registraci. Nyní se můžete přihlásit jménem a heslem.", diff --git a/public/language/cs/error.json b/public/language/cs/error.json index 038747ead1..81b65ffc22 100644 --- a/public/language/cs/error.json +++ b/public/language/cs/error.json @@ -28,11 +28,12 @@ "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", "email-taken": "Tento e-mail je již použit", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "Nebude schopen konverzovat, dokud nebude váš e-mail potvrzen. Pro jeho potvrzení klikněte zde.", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "Toto fórum vyžaduje ověření e-mailové adresy. Pro zadání e-mailu, klikněte zde.", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Nemohli jsme ověřit vaši e-mailovou adresu, zkuste to později.", "confirm-email-already-sent": "Potvrzovací e-mail byl již odeslán. Vyčkejte %1 minut/y, chcete-li odeslat další.", "sendmail-not-found": "Modul pro odeslání e-mailů nebyl nalezen. Zkontrolujte prosím, zda je nainstalován a spuštěn uživatelem, který spustil NodeBB.", diff --git a/public/language/cs/register.json b/public/language/cs/register.json index f7ee2c26b7..365e4c1a48 100644 --- a/public/language/cs/register.json +++ b/public/language/cs/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Vaše registrace byla přidána do fronty. Obdržíte e-mail až ji správce schválí.", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "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.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "Dávám souhlas se sběrem a zpracováním mých osobních údajů na této webové stránce.", "gdpr_agree_email": "Dávám souhlas k dostávání e-mailových přehledů a oznámení z týkající se této webové stránky.", "gdpr_consent_denied": "Musíte dát souhlas této stránce sbírat/zpracovávat informace o vaší činnosti a odesílat vám e-maily.", diff --git a/public/language/cs/user.json b/public/language/cs/user.json index 2f1bbbd5be..828c7652d1 100644 --- a/public/language/cs/user.json +++ b/public/language/cs/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Exportovat nahraný obsah (*.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Exportovat příspěvky (*.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/da/admin/settings/email.json b/public/language/da/admin/settings/email.json index 839fd2b6f6..9bdbde26a6 100644 --- a/public/language/da/admin/settings/email.json +++ b/public/language/da/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/da/email.json b/public/language/da/email.json index 23f0d555df..a5cb5e9bc8 100644 --- a/public/language/da/email.json +++ b/public/language/da/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Hej", "greeting_with_name": "Hej %1", "email.verify-your-email.subject": "Please verify your email", - "email.verify.text1": "Your email address has changed!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Tak for at du registrerede dig hos %1!", "welcome.text2": "For at færdiggøre din konto, har vi brug for at verificere at du ejer den email adresse du registerede med.", "welcome.text3": "En administrator har accepteret din registreringsansøgning. Du kan logge ind med dit brugernavn og adgangskode nu.", diff --git a/public/language/da/error.json b/public/language/da/error.json index 7d066b9e08..0e1941f7f6 100644 --- a/public/language/da/error.json +++ b/public/language/da/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Ugyldig side værdi, skal mindst være %1 og maks. %2", "username-taken": "Brugernavn optaget", "email-taken": "Emailadresse allerede i brug", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "Du kan ikke chatte før din email er bekræftet, klik her for at bekræfte din email.", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "Dette forum kræver bekræftelse af din email, klik her for at indtaste en email", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Vi kunne ikke bekræfte din email, prøv igen senere.", "confirm-email-already-sent": "Bekræftelses email er allerede afsendt, vent venligt %1 minut(ter) for at sende endnu en.", "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.", diff --git a/public/language/da/register.json b/public/language/da/register.json index df081b92a5..49e5041f8d 100644 --- a/public/language/da/register.json +++ b/public/language/da/register.json @@ -20,8 +20,9 @@ "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.", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "We require some additional information before we can create your account.", - "interstitial.errors-found": "We could not complete your registration:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "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.", diff --git a/public/language/da/user.json b/public/language/da/user.json index 01b7b26f99..1c67da0491 100644 --- a/public/language/da/user.json +++ b/public/language/da/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Export Uploaded Content (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Export Posts (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/de/admin/settings/email.json b/public/language/de/admin/settings/email.json index 89a5bbba80..4a7c6f2a55 100644 --- a/public/language/de/admin/settings/email.json +++ b/public/language/de/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Deaktivierung der Email Zusammenfassungen", "subscriptions.hour": "Sende Zeit", "subscriptions.hour-help": "Bitte geben Sie eine Nummer ein, welche die Stunde repräsentiert zu welcher geplante Emails versandt werden sollen (z.B. 0 für Mitternacht, 17 für 5 Uhr Nachmittags). Beachten Sie, dass die Zeit auf der Serverzeit basiert und daher nicht umbedingt mit ihrer Systemzeit übereinstimmen muss.
Die ungefähre Serverzeit ist:
Die nächste tägliche Sendung ist um geplant", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/de/email.json b/public/language/de/email.json index 04b6ffb2a8..56b95f45b4 100644 --- a/public/language/de/email.json +++ b/public/language/de/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Hallo", "greeting_with_name": "Hallo %1", "email.verify-your-email.subject": "Bitte bestätige deine Email-Adresse", - "email.verify.text1": "Deine Email-Adresse hat sich verändert!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Vielen Dank für die Registrierung bei %1!", "welcome.text2": "Um dein Konto vollständig zu aktivieren, müssen wir überprüfen, ob du Besitzer der E-Mail-Adresse bist, mit der du dich registriert hast.", "welcome.text3": "Ein Administrator hat deine Registrierung aktzeptiert. Du kannst dich jetzt mit deinem Benutzernamen/Passwort einloggen.", diff --git a/public/language/de/error.json b/public/language/de/error.json index c10443ec2d..a4cd0fe119 100644 --- a/public/language/de/error.json +++ b/public/language/de/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Ungültige Seitennummerierung, muss mindestens %1 und maximal %2 sein", "username-taken": "Der Benutzername ist bereits vergeben", "email-taken": "Die E-Mail-Adresse ist bereits vergeben", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "Du kannst keine Beiträge erstellen, solange deine Email-Adresse nicht bestätigt wurde. Bitte klicke hier um deine Email-Adresse zu bestätigen.", "email-not-confirmed-chat": "Du kannst den Chat erst nutzen wenn deine E-Mail bestätigt wurde, bitte klicke hier, um deine E-Mail zu bestätigen.", "email-not-confirmed-email-sent": "Deine Email-Adresse wurde noch nicht bestätigt, bitte kontrolliere dein Postfach nach einer Bestätigungsmail. Du kannst keine Beiträge erstellen oder chatten bis deine Email-Adresse bestätigt wurde.", - "no-email-to-confirm": "Dieses Forum setzt eine E-Mail-Bestätigung voraus, bitte klicke hier um eine E-Mail-Adresse einzugeben.", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Wir konnten deine E-Mail-Adresse nicht bestätigen, bitte versuch es später noch einmal", "confirm-email-already-sent": "Die Bestätigungsmail wurde verschickt. Bitte warte %1 Minute(n), um eine weitere zu verschicken.", "sendmail-not-found": "Sendmail wurde nicht gefunden. Bitte stelle sicher, dass es installiert ist und durch den Benutzer unter dem NodeBB läuft ausgeführt werden kann.", diff --git a/public/language/de/register.json b/public/language/de/register.json index f24ee1ab30..66573c39c4 100644 --- a/public/language/de/register.json +++ b/public/language/de/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Deine Registration wurde abgeschickt. Du wirst eine E-Mail erhalten, sobald sie von einem Administrator akzeptiert wird.", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "Wir benötigen ein wenig mehr Informationen bevor wir dein Konto erstellen können.", - "interstitial.errors-found": "Wir konnten deinen Registrierungsvorgang nicht abschließen:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "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-E-Mails von dieser Website erhalte.", "gdpr_consent_denied": "Du musst zustimmen, dass diese Seite deine Daten sammeln und verarbeiten darf, und dir Emails senden darf.", diff --git a/public/language/de/user.json b/public/language/de/user.json index d08dc851ea..d3978165ec 100644 --- a/public/language/de/user.json +++ b/public/language/de/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Hochgeladene Dateien exportieren (.zip)", "consent.export-uploads-success": "Uploads werden exportiert, du bekommst eine Benachrichtigung sobald der Vorgang abgeschlossen ist.", "consent.export_posts": "Beiträge exportieren (.csv)", - "consent.export-posts-success": "Beiträge werden exportiert, du bekommst eine Benachrichtigung sobald der Vorgang abgeschlossen ist." + "consent.export-posts-success": "Beiträge werden exportiert, du bekommst eine Benachrichtigung sobald der Vorgang abgeschlossen ist.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/el/admin/settings/email.json b/public/language/el/admin/settings/email.json index 839fd2b6f6..9bdbde26a6 100644 --- a/public/language/el/admin/settings/email.json +++ b/public/language/el/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/el/email.json b/public/language/el/email.json index 9e3c16d79e..79850db937 100644 --- a/public/language/el/email.json +++ b/public/language/el/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Γειά σου", "greeting_with_name": "Γειά σου %1", "email.verify-your-email.subject": "Please verify your email", - "email.verify.text1": "Your email address has changed!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Ευχαριστούμε που γράφτηκες στο %1!", "welcome.text2": "Για να ενεργοποιήσεις πλήρως τον λογαριασμό σου, πρέπει να επιβεβαιώσουμε πως η διεύθυνση email με την οποια γράφτηκες σου ανήκει.", "welcome.text3": "An administrator has accepted your registration application. You can login with your username/password now.", diff --git a/public/language/el/error.json b/public/language/el/error.json index bee5e8e711..48832c1472 100644 --- a/public/language/el/error.json +++ b/public/language/el/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2", "username-taken": "Το όνομα χρήστη είναι πιασμένο", "email-taken": "Το email είναι πιασμένο", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "We could not confirm your email, please try again later.", "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.", "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.", diff --git a/public/language/el/register.json b/public/language/el/register.json index 2248594378..31f5bff688 100644 --- a/public/language/el/register.json +++ b/public/language/el/register.json @@ -20,8 +20,9 @@ "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.", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "We require some additional information before we can create your account.", - "interstitial.errors-found": "We could not complete your registration:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "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.", diff --git a/public/language/el/user.json b/public/language/el/user.json index 188741f66a..2ebd0b1ea1 100644 --- a/public/language/el/user.json +++ b/public/language/el/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Export Uploaded Content (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Export Posts (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/en-US/admin/settings/email.json b/public/language/en-US/admin/settings/email.json index 839fd2b6f6..9bdbde26a6 100644 --- a/public/language/en-US/admin/settings/email.json +++ b/public/language/en-US/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/en-US/email.json b/public/language/en-US/email.json index 88c5c56696..95aa8cfdfa 100644 --- a/public/language/en-US/email.json +++ b/public/language/en-US/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Hello", "greeting_with_name": "Hello %1", "email.verify-your-email.subject": "Please verify your email", - "email.verify.text1": "Your email address has changed!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Thank you for registering with %1!", "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.", "welcome.text3": "An administrator has accepted your registration application. You can login with your username/password now.", diff --git a/public/language/en-US/error.json b/public/language/en-US/error.json index 7a8f98a879..d4a252df72 100644 --- a/public/language/en-US/error.json +++ b/public/language/en-US/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2", "username-taken": "Username taken", "email-taken": "Email taken", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "We could not confirm your email, please try again later.", "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.", "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.", diff --git a/public/language/en-US/register.json b/public/language/en-US/register.json index e4da192ee3..57fd61b645 100644 --- a/public/language/en-US/register.json +++ b/public/language/en-US/register.json @@ -20,8 +20,9 @@ "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.", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "We require some additional information before we can create your account.", - "interstitial.errors-found": "We could not complete your registration:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "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.", diff --git a/public/language/en-US/user.json b/public/language/en-US/user.json index d29923305c..c9d3540ccf 100644 --- a/public/language/en-US/user.json +++ b/public/language/en-US/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Export Uploaded Content (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Export Posts (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/en-x-pirate/admin/settings/email.json b/public/language/en-x-pirate/admin/settings/email.json index 839fd2b6f6..9bdbde26a6 100644 --- a/public/language/en-x-pirate/admin/settings/email.json +++ b/public/language/en-x-pirate/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/en-x-pirate/email.json b/public/language/en-x-pirate/email.json index 076fa16b4d..442048893c 100644 --- a/public/language/en-x-pirate/email.json +++ b/public/language/en-x-pirate/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Hello", "greeting_with_name": "Hello %1", "email.verify-your-email.subject": "Please verify your email", - "email.verify.text1": "Your email address has changed!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Thank you for registering with %1!", "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.", "welcome.text3": "An administrator has accepted your registration application. You can login with your username/password now.", diff --git a/public/language/en-x-pirate/error.json b/public/language/en-x-pirate/error.json index 7a8f98a879..d4a252df72 100644 --- a/public/language/en-x-pirate/error.json +++ b/public/language/en-x-pirate/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2", "username-taken": "Username taken", "email-taken": "Email taken", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "We could not confirm your email, please try again later.", "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.", "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.", diff --git a/public/language/en-x-pirate/register.json b/public/language/en-x-pirate/register.json index ec15a1f978..8bf995da08 100644 --- a/public/language/en-x-pirate/register.json +++ b/public/language/en-x-pirate/register.json @@ -20,8 +20,9 @@ "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.", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "We require some additional information before we can create your account.", - "interstitial.errors-found": "We could not complete your registration:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "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.", diff --git a/public/language/en-x-pirate/user.json b/public/language/en-x-pirate/user.json index 3905f049fc..d351339439 100644 --- a/public/language/en-x-pirate/user.json +++ b/public/language/en-x-pirate/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Export Uploaded Content (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Export Posts (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/es/admin/settings/email.json b/public/language/es/admin/settings/email.json index 839fd2b6f6..9bdbde26a6 100644 --- a/public/language/es/admin/settings/email.json +++ b/public/language/es/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/es/email.json b/public/language/es/email.json index b9431d4c91..d27e922aa7 100644 --- a/public/language/es/email.json +++ b/public/language/es/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Hola", "greeting_with_name": "Hola %1", "email.verify-your-email.subject": "Favor de verificar su correo", - "email.verify.text1": "Su dirección de correo ha cambiado", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Gracias por registrarte con %1!", "welcome.text2": "Para activar completamente tu cuenta, necesitamos verificar que la dirección email con la que te registraste te pertenece.", "welcome.text3": "El administrador ha aceptado tu registro. Puedes acceder con tu usuario/contraseña ahora.", diff --git a/public/language/es/error.json b/public/language/es/error.json index dfeac51051..12cb8cccc3 100644 --- a/public/language/es/error.json +++ b/public/language/es/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Número de página inválido, debe estar entre %1 y %2", "username-taken": "Nombre de usuario ocupado", "email-taken": "Correo electrónico ocupado", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "No puedes usar el chat hasta que confirmes tu dirección de correo electrónico, por favor haz click aquí para confirmar tu correo.", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "Este foro requiere confirmación de su email, por favor pulse aquí para introducir un email", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "No se ha podido confirmar su email, por favor inténtelo de nuevo más tarde.", "confirm-email-already-sent": "El email de confirmación ya ha sido enviado, por favor espera %1 minuto(s) para enviar otro.", "sendmail-not-found": "El ejecutable \"sendmail\" no ha sido encontrado, por favor asegúrate de que esta instalado en tu sistema y es accesible por el usuario que ejecuta NodeBB. ", diff --git a/public/language/es/register.json b/public/language/es/register.json index 50bfe30afd..e94120861a 100644 --- a/public/language/es/register.json +++ b/public/language/es/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Tu registro se ha añadido a la cola de aprobación,. Recibirás un correo cuando este sea aceptado por un administrador. ", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "Se requiere de información adicional antes de crear tu cuenta.", - "interstitial.errors-found": "No pudimos completar tu registro:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "Consiento la recolección y el procesamiento de mi información personal en este sitio web", "gdpr_agree_email": "Consiento en recibir correos de informes y notificaciones de este sitio web.", "gdpr_consent_denied": "Usted debe dar consentimiento a este sitio para recolectar/procesar su información, así como enviarle correos electrónicos.", diff --git a/public/language/es/user.json b/public/language/es/user.json index c2f96eb51b..2ed860fc5a 100644 --- a/public/language/es/user.json +++ b/public/language/es/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Exportar Contenido Subido (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Exportar Entradas y Respuestas (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/et/admin/settings/email.json b/public/language/et/admin/settings/email.json index 839fd2b6f6..9bdbde26a6 100644 --- a/public/language/et/admin/settings/email.json +++ b/public/language/et/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/et/email.json b/public/language/et/email.json index e103532d00..e299015a21 100644 --- a/public/language/et/email.json +++ b/public/language/et/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Tere", "greeting_with_name": "Tere %1", "email.verify-your-email.subject": "Please verify your email", - "email.verify.text1": "Your email address has changed!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Täname et oled registreerinud %1 foorumisse!", "welcome.text2": "Konto täielikuks aktiveerimiseks peame me kinnitama, et registreerimisel kasutatud e-mail kuulub teile.", "welcome.text3": "Administraator aktsepteeris teie registreerimise. Te saate nüüd sisse logida oma kasutajanime/parooliga.", diff --git a/public/language/et/error.json b/public/language/et/error.json index 7f1bc7f82a..08a4c0dfb3 100644 --- a/public/language/et/error.json +++ b/public/language/et/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Väär lehekülje numeratsioon, peab olema vähemalt %1 ja kõige rohkem %2", "username-taken": "Kasutajanimi on juba võetud", "email-taken": "Email on võetud", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "Sõnumeid ei ole võimalik enne saata kui sinu email on kinnitatud. Kinnitamiseks vajuta siia.", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "See foorum nõuab emaili kinnitust, palun vajuta siia, et sisestada email", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Meil ei õnnestunud sinu emaili kinnitada, proovi hiljem uuesti.", "confirm-email-already-sent": "Kinnituskiri on juba saadetud, palun oota %1 minut(it) uue kirja saatmiseks.", "sendmail-not-found": "Sendmail'i käivitatavat ei leitud, palun tee kindlaks, et see on installeeritud ja on käivitatav kasutaja poolt, kes käitab NodeBB't.", diff --git a/public/language/et/register.json b/public/language/et/register.json index 2b8de0a8a3..0e7b671d59 100644 --- a/public/language/et/register.json +++ b/public/language/et/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Teie registreerimine vaadatakse üle. Te saate e-kirja kui administraator on aktsepteerinud registreermimise.", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "Enne kasutaja loomist on meil vaja lisainfot.", - "interstitial.errors-found": "Meil ei õnnestunud registreerimist lõpule viia:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "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.", diff --git a/public/language/et/user.json b/public/language/et/user.json index bd0e67bb7a..a0e9af0a13 100644 --- a/public/language/et/user.json +++ b/public/language/et/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Export Uploaded Content (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Export Posts (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/fa-IR/admin/settings/email.json b/public/language/fa-IR/admin/settings/email.json index 839fd2b6f6..9bdbde26a6 100644 --- a/public/language/fa-IR/admin/settings/email.json +++ b/public/language/fa-IR/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/fa-IR/email.json b/public/language/fa-IR/email.json index fe66fb82f3..06c8c02edc 100644 --- a/public/language/fa-IR/email.json +++ b/public/language/fa-IR/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "سلام", "greeting_with_name": "سلام %1", "email.verify-your-email.subject": "لطفا ایمیل خود را تأیید کنید", - "email.verify.text1": "آدرس ایمیل شما عوض شده است !", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "متشکریم بابت ثبت نام در %1!", "welcome.text2": "برای فعال کردن کامل اکانت شما، ما نیاز داریم تا اطمینان حاصل کنیم که شما مالک ایمیلی که با ان ثبت نام کردید هستید.", "welcome.text3": "ِک مدیر درخواست ثبت نام شما را قبول کرده. اکنون میتوانید با نام کاربری/رمز عبور خود وارد شوید", diff --git a/public/language/fa-IR/error.json b/public/language/fa-IR/error.json index 613050f842..fd445b5f31 100644 --- a/public/language/fa-IR/error.json +++ b/public/language/fa-IR/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "ارزش گذاری صفحه نامعتبر است، کمترین مقدار %1 و بیشترین مقدار %2 باید باشد", "username-taken": "این نام کاربری گرفته شده است.", "email-taken": "این ایمیل گرفته شده است.", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "شما تا قبل از تایید ایمیل قادر به چت نیستید، لطفا برای تایید ایمیل خود اینجا کلیک کنید", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "ایمیل شما تایید نشده است ، لطفا برای وارد کردن ایمیل اینجا کلیک کنید", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "سیستم موفق به تایید ایمیل شما نشد، لطفا بعدا دوباره سعی کنید", "confirm-email-already-sent": "ایمیل فعال‌سازی قبلا فرستاده شده، لطفا %1 دقیقه صبر کنید تا ایمیل دیگری فرستاده شود.", "sendmail-not-found": "اجازه ارسال رایانامه پیدا نشد، لطفا مطمئن شوید این قابلیت نصب شده و توسط کاربر مد نظر در نود‌بی‌بی قابل اجرا است.", diff --git a/public/language/fa-IR/register.json b/public/language/fa-IR/register.json index 62b9356cc8..d7876aa359 100644 --- a/public/language/fa-IR/register.json +++ b/public/language/fa-IR/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "ثبت نام شما به صف تایید اضافه شد. وقتی توسط یک مدیر تایید شد شما ایمیلی دریافت خواهید کرد.", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "ما نیاز به برخی اطلاعات اضافی شما قبل از ایجاد شناسه کاربری داریم.", - "interstitial.errors-found": "شما نمی‌توانید ثبت نام خود را تکمیل کنید:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "من با جمع آوری و پرداز اطلاعات شخصی در این وبسایت موافقم.", "gdpr_agree_email": "من با دریافت ایمیل ها و خلاصه ها از این وبسایت موافقم.", "gdpr_consent_denied": "شما باید رضایت خود را برای جمع آوری/پردازش اطلاعاتتان و دریافت ایمیل را اعلام کنید.", diff --git a/public/language/fa-IR/user.json b/public/language/fa-IR/user.json index 20e9722ebb..c6c13e26c7 100644 --- a/public/language/fa-IR/user.json +++ b/public/language/fa-IR/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Export Uploaded Content (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Export Posts (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/fi/admin/settings/email.json b/public/language/fi/admin/settings/email.json index ac0b01163a..02548f738e 100644 --- a/public/language/fi/admin/settings/email.json +++ b/public/language/fi/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Poista sähköpostin koosteet käytöstä", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/fi/email.json b/public/language/fi/email.json index c6e87c0017..0ce2427997 100644 --- a/public/language/fi/email.json +++ b/public/language/fi/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Hei", "greeting_with_name": "Hei %1", "email.verify-your-email.subject": "Tarkista sähköpostisi", - "email.verify.text1": "Sähköpostiosoitteesi on muutettu!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Kiitos rekisteröitymisestäsi sivustolle %1!", "welcome.text2": "Meidän täytyy varmistaa, että omistat sen sähköpostiosoitteen, jolla rekisteröidyit, ennen kuin tilisi voidaan aktivoida kokonaan.", "welcome.text3": "Ylläpitäjä hyväksyi rekisteröintipyyntösi. Voit nyt kirjautua käyttäjänimelläsi ja salasanallasi.", diff --git a/public/language/fi/error.json b/public/language/fi/error.json index 5d8e38f250..9c039bf694 100644 --- a/public/language/fi/error.json +++ b/public/language/fi/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2", "username-taken": "Käyttäjänimi varattu", "email-taken": "Sähköpostiosoite varattu", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "Et voi keskustella ennen kuin sähköpostiosoitteesi on vahvistettu, ole hyvä ja paina tästä vahvistaaksesi sen.", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "We could not confirm your email, please try again later.", "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.", "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.", diff --git a/public/language/fi/register.json b/public/language/fi/register.json index 106be68c99..fb25e15981 100644 --- a/public/language/fi/register.json +++ b/public/language/fi/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Rekisteröintisi on lisätty listalle odottamaan hyväksyntää. Saat ilmoituksen sähköpostiisi, kun ylläpitäjä on hyväksynyt rekisteröitymisesin.", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "Sivusto vaatii lisätietoja ennenkuin voi luoda tunnuksen.", - "interstitial.errors-found": "Rekisteröitymisesi keskeytyi", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "Annan hyväksyntäni henkilökohtaisten tietojen keräämiseen ja prosessointiin tälle verkkosivulle.", "gdpr_agree_email": "Haluan vastaanottaa viestikoosteita ja ilmoituksia tältä verkkosivulta", "gdpr_consent_denied": "Sinun täytyy antaa suostumus sivustolle, jotta se voi kerätä ja tallentaa tietosi ja lähettää sinulle tarvittaessa sähköpostia.", diff --git a/public/language/fi/user.json b/public/language/fi/user.json index 4231d5ce96..af1573106f 100644 --- a/public/language/fi/user.json +++ b/public/language/fi/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Export Uploaded Content (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Export Posts (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/fr/admin/settings/email.json b/public/language/fr/admin/settings/email.json index c38e33b7f4..1eff684db9 100644 --- a/public/language/fr/admin/settings/email.json +++ b/public/language/fr/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Désactiver les actualités du forum ", "subscriptions.hour": "Heure d'envoi", "subscriptions.hour-help": "Veuillez entrer un nombre représentant l'heure à laquelle envoyer les lettres d'activités (c'est à dire 0 pour minuit, 17 pour 5:00 pm). Gardez à l'esprit qu'il s'agit de l'heure du serveur, et peut ne pas correspondre à votre heure locale.
L'heure du serveur est :
La prochaine lettre d'activités sera envoyée à ", - "notifications.settings": "Paramètres de notification par e-mail", - "notifications.remove-images": "Supprimer les images des notifications par e-mail" + "notifications.remove-images": "Supprimer les images des notifications par e-mail", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/fr/email.json b/public/language/fr/email.json index f44397b911..811f0e66f1 100644 --- a/public/language/fr/email.json +++ b/public/language/fr/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Bonjour", "greeting_with_name": "Bonjour %1", "email.verify-your-email.subject": "Veuillez vérifier votre Email", - "email.verify.text1": "Votre adresse mail a changée !", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Merci de vous être inscrit sur %1!", "welcome.text2": "Pour activer totalement votre compte, nous devons vérifier que vous êtes bien propriétaire de l'adresse email que vous avez utilisé pour vous inscrire.", "welcome.text3": "Un administrateur a accepté votre demande d'inscription. Vous pouvez maintenant vous connecter avec vos identifiants/mots de passe.", diff --git a/public/language/fr/error.json b/public/language/fr/error.json index b0a77f2b02..ee8c2cf4ee 100644 --- a/public/language/fr/error.json +++ b/public/language/fr/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Valeur de pagination invalide. Celle-ci doit être comprise entre %1 et %2.", "username-taken": "Nom d’utilisateur déjà utilisé", "email-taken": "Email déjà utilisé", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Cet utilisateur a déjà été invité.", "email-not-confirmed": "Vous ne pouvez pas publier de message tant que votre adresse e-mail n'est pas confirmée. Veuillez cliquer ici pour confirmer votre adresse e-mail.", "email-not-confirmed-chat": "Il ne vous est pas possible d'utiliser le chat tant que votre adresse email n'a pas été vérifiée. Veuillez cliquer ici pour confirmer votre adresse email.", "email-not-confirmed-email-sent": "Votre email n'a pas encore été confirmé, veuillez vérifier votre boîte mail. Vous ne pourrez pas poster ou discuter avant que votre email ne soit confirmé.", - "no-email-to-confirm": "Ce forum requiert une vérification de votre adresse email. Veuillez cliquer ici pour entrer une adresse.", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Votre adresse email n'a pas pu être vérifiée. Veuillez ré-essayer plus tard.", "confirm-email-already-sent": "L'email de confirmation a déjà été envoyé. Veuillez attendre %1 minute(s) avant de redemander un nouvel envoi.", "sendmail-not-found": "L'application d'envoi de mail est introuvable, assurez-vous qu'elle est installée et que l'utilisateur ayant démarré NodeBB ait des droits suffisants.", diff --git a/public/language/fr/register.json b/public/language/fr/register.json index a3e51a5d1e..a512863e42 100644 --- a/public/language/fr/register.json +++ b/public/language/fr/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Votre inscription a été ajoutée à la liste d'approbation. Vous recevrez un email quand celle-ci sera acceptée par un administrateur.", "registration-queue-average-time": "Temps moyen d'approbation des adhésions est de %1 heures %2 minutes.", "registration-queue-auto-approve-time": "Votre adhésion à ce forum sera entièrement activée dans un maximum de %1 heures.", - "interstitial.intro": "Nous avons besoin de quelques informations supplémentaires avant de pouvoir créer votre compte.", - "interstitial.errors-found": "Nous n'avons pas pu compléter votre inscription :", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "J'accepte la collecte et le traitement de mes données personnelles sur ce site.", "gdpr_agree_email": "J'accepte de recevoir des courriels et des notifications de ce site Web.", "gdpr_consent_denied": "Vous devez accepter que ce site puisse collecter et traiter vos données, et pour vous envoyer des courriels.", diff --git a/public/language/fr/user.json b/public/language/fr/user.json index 88aa302136..da5129fb58 100644 --- a/public/language/fr/user.json +++ b/public/language/fr/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Exporter vos fichiers envoyés (.zip)", "consent.export-uploads-success": "Exportation des envois, vous recevrez une notification lorsqu'elle sera terminée.", "consent.export_posts": "Exporter vos messages (.csv)", - "consent.export-posts-success": "Exportation des messages, vous recevrez une notification lorsqu'elle sera terminée." + "consent.export-posts-success": "Exportation des messages, vous recevrez une notification lorsqu'elle sera terminée.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/gl/admin/settings/email.json b/public/language/gl/admin/settings/email.json index 839fd2b6f6..9bdbde26a6 100644 --- a/public/language/gl/admin/settings/email.json +++ b/public/language/gl/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/gl/email.json b/public/language/gl/email.json index 642be65819..c7c033e05a 100644 --- a/public/language/gl/email.json +++ b/public/language/gl/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Ola", "greeting_with_name": "Ola %1", "email.verify-your-email.subject": "Please verify your email", - "email.verify.text1": "Your email address has changed!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Grazas por rexistrarte %1!", "welcome.text2": "Para activar a túa conta, precisamos que a verifiques co enderezo de correo electrónico co que te rexistraches.", "welcome.text3": "Un administrador aceptou a túa solicitude de rexistro. Agora pódeste conectar co teu nome de usuario e contrasinal.", diff --git a/public/language/gl/error.json b/public/language/gl/error.json index 1ce467086c..687bc2e94c 100644 --- a/public/language/gl/error.json +++ b/public/language/gl/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Valor de paxinación incorreto, ten que estar entre %1 e %2", "username-taken": "Nome de usuario en uso", "email-taken": "Enderezo electrónico en uso", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "Non podes charlar ata que confirmes o teu correo, por favor pica aquí para confirmalo.", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "O foro require confirmación de enderezo electrónico, por favor pica aquí para engadir un.", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Non podemos confirmar o teu enderezo, por favor téntao de novo máis tarde.", "confirm-email-already-sent": "O correo de confirmación foi enviado, agarda %1 minute(s) para enviar outro.", "sendmail-not-found": "Non se atopa o executable \"sendmail\", por favor, asegúrate de que está instalado no teu sistema e que é accesible polo usuario que executa NodeBB. ", diff --git a/public/language/gl/register.json b/public/language/gl/register.json index 454e40a1a4..8c24a4e487 100644 --- a/public/language/gl/register.json +++ b/public/language/gl/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "O teu rexistro foi engadido á cola de aprobación. Recibirás un correo electrónico cando sexa aceptado por un administrador.", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "Requírese información adicional antes de crea-la túa conta", - "interstitial.errors-found": "Non puidemos completa-lo teu rexistro:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "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.", diff --git a/public/language/gl/user.json b/public/language/gl/user.json index aa434f65cc..cb01938b05 100644 --- a/public/language/gl/user.json +++ b/public/language/gl/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Export Uploaded Content (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Export Posts (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/he/admin/settings/email.json b/public/language/he/admin/settings/email.json index bf853372c0..f74f13bda8 100644 --- a/public/language/he/admin/settings/email.json +++ b/public/language/he/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "הפיכת תקצירי דואר אלקטרוני ללא זמינים", "subscriptions.hour": "שעת תקציר", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "הגדרות התראות בדוא\"ל", - "notifications.remove-images": "הסר תמונות מהודעות דוא\"ל" + "notifications.remove-images": "הסר תמונות מהודעות דוא\"ל", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/he/email.json b/public/language/he/email.json index 20b9ebaa02..5e390d8a21 100644 --- a/public/language/he/email.json +++ b/public/language/he/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "שלום", "greeting_with_name": "שלום %1", "email.verify-your-email.subject": "בבקשה אמת את המייל שלך.", - "email.verify.text1": "כתובת המייל שלך שונתה!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "תודה שנרשמת ל%1!", "welcome.text2": "על מנת להפעיל את החשבון שלך, אנו צריכים לוודא שאתה בעל חשבון המייל שנרשמת איתו.", "welcome.text3": "מנהל אישר את ההרשמה שלך.\nאתה יכול להתחבר עם השם משתמש והסיסמא שלך מעכשיו.", diff --git a/public/language/he/error.json b/public/language/he/error.json index 4af37ad11e..e2ef5a1845 100644 --- a/public/language/he/error.json +++ b/public/language/he/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "ערך דף לא חוקי, חייב להיות לפחות %1 ולא מעל %2", "username-taken": "שם משתמש תפוס", "email-taken": "כתובת אימייל תפוסה", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "כבר נשלחה הזמנה למייל זה", "email-not-confirmed": "אין באפשרותך לפרסם עד אישור הודעת הדוא\"ל שלך, לחץ כאן כדי לאשר את הדוא\"ל שלך.", "email-not-confirmed-chat": "אין באפשרותך לשוחח עד שהדוא\"ל שלך יאושר, אנא לחץ כאן כדי לאשר את הדוא\"ל שלך.", "email-not-confirmed-email-sent": "האימייל שלך עדין לא אושר. אנא בדוק בתיבת הדואר בנוגע לאישור האימייל שנשלח לך על ידנו. לא תוכל לכתוב פוסטים ולהשתמש בצ'אט לפני אימות המייל שלך.", - "no-email-to-confirm": "פורום זה דורש אישור בדוא\"ל, אנא לחץ כאן כדי להכניס לדואר אלקטרוני", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "לא הצלחנו לאשר את הדוא\"ל שלך, תנסה שוב אחר כך", "confirm-email-already-sent": "מייל האישור כבר נשלח, אנא המתן %1 דקות כדי לשלוח מייל נוסף.", "sendmail-not-found": "תוכנת sendmail לא נמצאה, נא בדוק שהיא מותקת וניתנת להרצה על ידי המשתמש שמריץ את NodeBB.", diff --git a/public/language/he/register.json b/public/language/he/register.json index fb22a64d32..a35a03b67c 100644 --- a/public/language/he/register.json +++ b/public/language/he/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "בקשתך להרשמה נשלחה. במידה ובקשתך יאושר, ישלח אישור לכתובת האימייל שהכנסת.", "registration-queue-average-time": "הזמן הממוצע לאישור משתמשים הוא %1 שעות ו-%2 דקות.", "registration-queue-auto-approve-time": "חשבונך יאושר תוך %1 שעות.", - "interstitial.intro": "אנו דורשים מידע נוסף לפני שנוכל ליצור עבורך את החשבון.", - "interstitial.errors-found": "לא הצלחנו להשלים את הרישום שלך:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "אני מסכים שפורום זה יאגור ויעבד את נתוני האישיים", "gdpr_agree_email": "אני מסכים לקבל מדי פעם מיילים מפורום זה עם סיכום נושאים מעניינים שפורסמו", "gdpr_consent_denied": "אין אפשרות להירשם ללא אישור הסכמה על תנאים אלו.", diff --git a/public/language/he/user.json b/public/language/he/user.json index 993f359906..237dd457b6 100644 --- a/public/language/he/user.json +++ b/public/language/he/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "יצוא תוכן שהועלה (ZIP.)", "consent.export-uploads-success": "ייצוא ההעלאות מתבצע כעת. תקבל התראה כאשר הייצוא יסתיים.", "consent.export_posts": "יצוא פוסטים (CVS.)", - "consent.export-posts-success": "ייצוא הפוסטים מתבצע כעת. תקבל התראה כאשר הייצוא יסתיים." + "consent.export-posts-success": "ייצוא הפוסטים מתבצע כעת. תקבל התראה כאשר הייצוא יסתיים.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/hr/admin/settings/email.json b/public/language/hr/admin/settings/email.json index b76e4551ba..b80c494740 100644 --- a/public/language/hr/admin/settings/email.json +++ b/public/language/hr/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "Pregled Sati.", "subscriptions.hour-help": "Unesite broj koji pretstavlja vrijeme kada će se poslati pregled mailom (npr. 0 za ponoć, 17za 5 popodne).Imajte na umu da to vrijeme predstavlja vrijeme servera te ne mora predstavljati vrijeme na Vašem sistemu. Vrijeme servera je:
Sljedeći pregled će biti poslan .", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/hr/email.json b/public/language/hr/email.json index 77aaf628bd..7ceccd4dca 100644 --- a/public/language/hr/email.json +++ b/public/language/hr/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Zdravo", "greeting_with_name": "Zdravo %1", "email.verify-your-email.subject": "Please verify your email", - "email.verify.text1": "Your email address has changed!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Zahvaljujemo na registraciji na %1!", "welcome.text2": "Da bi u potpunosti aktivirali Vaš račun, moramo provjeriti da li ste Vi pravi vlasnik email adrese sa kojom ste se registrirali.", "welcome.text3": "Administrator je prihvatio vaš zahtjev za registraciju. Možete se prijaviti koristeći svoje korisničko ime i lozinku.", diff --git a/public/language/hr/error.json b/public/language/hr/error.json index 6ad292b669..3c781d90c5 100644 --- a/public/language/hr/error.json +++ b/public/language/hr/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Netočno numeriranje stranica, mora biti %1 ili %2", "username-taken": "Korisničko ime je zauzeto", "email-taken": "Email je zauzet", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "Nemožete razgovarati dok Vaš email nije potvrđen, kliknite ovdje da bi potvrdili svoj email.", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "Ovaj forum zahtijeva potvrdu emaila, kliknite ovdje da bi potvrdili svoj email.", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Nismo u mogućnosti potvrditi Vaš email, pokušajte ponovno kasnije.", "confirm-email-already-sent": "Potvrdni email je poslan, počekajte %1 minuta za ponovni pokušaj.", "sendmail-not-found": "Sendmail nije pronađen, provjerite da li je instaliran?", diff --git a/public/language/hr/register.json b/public/language/hr/register.json index 79abf45de5..c79ad6d09e 100644 --- a/public/language/hr/register.json +++ b/public/language/hr/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Vaša registracija je dodana u listu zahtjeva za registraciju. Biti ćete obaviješteni kad Vas administrator prihvati.", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "Treba nam još par dodatnih informacija prije nego kreirate novi račun.", - "interstitial.errors-found": "Nismo uspijeli dovršiti registraciju:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "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.", diff --git a/public/language/hr/user.json b/public/language/hr/user.json index 6fc0aa6ddb..03864e12a1 100644 --- a/public/language/hr/user.json +++ b/public/language/hr/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Export Uploaded Content (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Export Posts (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/hu/admin/settings/email.json b/public/language/hu/admin/settings/email.json index a0b94fbe4f..d65bea6375 100644 --- a/public/language/hu/admin/settings/email.json +++ b/public/language/hu/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Minden email összefoglalás letiltása", "subscriptions.hour": "Összefoglalások küldési időpontja", "subscriptions.hour-help": "Kérjük adj meg egy számot, ami azt az órát jelenti, amikor az ütemezett összefoglalókat kiküldi a rendszer (0 az éjfél, 17 a délután 5 óra). Tartsd észben, hogy ez az időpont a szerver idejét veszi figyelembe és előfordulhat, hogy nem egyezik meg a Te gépeden jelzett idővel. A becsült szerver idő jelenleg:
A következő napi összefoglalás tervezett kiküldési ideje ", - "notifications.settings": "Email értesítés beállítások", - "notifications.remove-images": "Képek eltávolítása az email értesítésekből" + "notifications.remove-images": "Képek eltávolítása az email értesítésekből", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/hu/email.json b/public/language/hu/email.json index 017aefcf5a..ce86a47516 100644 --- a/public/language/hu/email.json +++ b/public/language/hu/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Helló", "greeting_with_name": "Helló %1", "email.verify-your-email.subject": "Kérlek erősítsd meg az email címed.", - "email.verify.text1": "Az email címed megváltozott!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Köszönjük a regisztrációt %1!", "welcome.text2": "A fiók aktiválásához ellenőriznünk kell, hogy valós e-mail cím lett e megadva.", "welcome.text3": "Egy adminisztrátor elfogadta a regisztrációdat. Mostantól a felhasználónév/jelszó párosoddal be tudsz lépni.", diff --git a/public/language/hu/error.json b/public/language/hu/error.json index aa91c864a6..301d68b78b 100644 --- a/public/language/hu/error.json +++ b/public/language/hu/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Érvénytelen lapozási érték, legalább %1 kell lennie és legfeljebb %2 -nak/nek", "username-taken": "Foglalt felhasználónév", "email-taken": "Foglalt e-mail", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Ez az email cím már meg lett hívva", "email-not-confirmed": "Nem tehetsz közzé bejegyzést amíg nem erősíted meg az emailcímed, kattints ide az emailcím megerősítéséhez!", "email-not-confirmed-chat": "Nem küldhetsz üzenetet amíg nem erősíted meg az email címed, kattints ide az email cím megerősítéséhez!", "email-not-confirmed-email-sent": "Az email címed még nem lett megerősítve, kérlek ellenőrizd az email fiókodba érkező leveleket. Amíg nincs az email címed megerősítve addig nem tudsz üzeneteket küldeni valamint bejegyzést közzé tenni.", - "no-email-to-confirm": "Ez a fórum e-mail megerősítést kíván, kérlek kattints ide egy cím beírásához", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Nem tudtuk ellenőrizni az e-mail címedet, kérlek próbálkozz később.", "confirm-email-already-sent": "A megerősítéshez szükséges email már el lett küldve, kérlek várj %1 percet az újraküldéshez.", "sendmail-not-found": "A levél küldés végrehajtása nem található, kérlek bizonyosodj meg róla, hogy telepítve van és végrehajtható a felhasználó által NodeBB-t futtatva.", diff --git a/public/language/hu/register.json b/public/language/hu/register.json index 61388caf5a..31eb8e7e74 100644 --- a/public/language/hu/register.json +++ b/public/language/hu/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "A regisztráció jóváhagyásra vár. Kapni fogsz egy e-mailt, amint az adminisztrátor elfogadja.", "registration-queue-average-time": "A tagság átlagos elfogadási ideje %1 óra %2 perc.", "registration-queue-auto-approve-time": "A fórum tagságod aktiválva lesz az elkövetkezendő %1 órában.", - "interstitial.intro": "Szükségünk van még további információkra a profilod létrehozásához.", - "interstitial.errors-found": "Nem tudtuk teljesíteni a regisztrációd:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "Hozzájárulok ahhoz, hogy személyes adataimat ez a weboldal gyűjtse és feldolgozza.", "gdpr_agree_email": "Hozzájárulok, hogy kapjak erről az oldalról összefoglalókat és értesítő emaileket.", "gdpr_consent_denied": "Hozzá kell járulnod ahhoz, hogy ez a feboldal megkapja a személyes információidat és emaileket küldhessen neked.", diff --git a/public/language/hu/user.json b/public/language/hu/user.json index 89d3ed4d02..5bf5740a84 100644 --- a/public/language/hu/user.json +++ b/public/language/hu/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Feltöltött tartalom exportálása (.zip)", "consent.export-uploads-success": "Feltöltött tartalom exportálása, értesítéssel, hogyha végzett a művelet.", "consent.export_posts": "Bejegyzések exportálása (.csv)", - "consent.export-posts-success": "Bejegyzések exportálása, értesítéssel, hogyha végzett a művelet." + "consent.export-posts-success": "Bejegyzések exportálása, értesítéssel, hogyha végzett a művelet.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/id/admin/settings/email.json b/public/language/id/admin/settings/email.json index 839fd2b6f6..9bdbde26a6 100644 --- a/public/language/id/admin/settings/email.json +++ b/public/language/id/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/id/email.json b/public/language/id/email.json index 9f40a7433c..863897efdd 100644 --- a/public/language/id/email.json +++ b/public/language/id/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Hai", "greeting_with_name": "Hai %1", "email.verify-your-email.subject": "Please verify your email", - "email.verify.text1": "Your email address has changed!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Terima kasih anda telah mendaftarkan diri anda dengan %1!", "welcome.text2": "Untuk mengaktifkan akun anda sepenuhnya, kami perlu memverifkasi bahwa anda adalah pemilik email yang terdaftar.", "welcome.text3": "Administrator telah menerima aplikasi pendaftaran anda. Anda dapat masuk dengan username/password anda sekarang", diff --git a/public/language/id/error.json b/public/language/id/error.json index 1927f1a111..5c91c0dd59 100644 --- a/public/language/id/error.json +++ b/public/language/id/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Nomor pagination tidak valid, minimal %1 dan maksimal %2", "username-taken": "Username sudah terdaftar", "email-taken": "Email sudah terdaftar", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "We could not confirm your email, please try again later.", "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.", "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.", diff --git a/public/language/id/register.json b/public/language/id/register.json index a93ad5b7bc..da2db909ce 100644 --- a/public/language/id/register.json +++ b/public/language/id/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Pendaftaranmu telah ditambahkan dalam daftar persetujuan. Kamu akan menerima email ketika pendaftaranmu disetujui oleh administrator.", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "We require some additional information before we can create your account.", - "interstitial.errors-found": "We could not complete your registration:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "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.", diff --git a/public/language/id/user.json b/public/language/id/user.json index ecb781f047..585ec802ac 100644 --- a/public/language/id/user.json +++ b/public/language/id/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Export Uploaded Content (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Export Posts (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/it/admin/settings/email.json b/public/language/it/admin/settings/email.json index 0f996e5154..af3ea96565 100644 --- a/public/language/it/admin/settings/email.json +++ b/public/language/it/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disabilita email riepilogo", "subscriptions.hour": "Orario riepilogo", "subscriptions.hour-help": "Si prega di inserire un numero che rappresenta l'ora per l'invio dell'email programmate (es. 0per mezzanotte, 17per le 17: 00). Tieni presente che questa è l'ora secondo il server stesso, e potrebbe non combaciare esattamente al tuo orologio di sistema.
L'orario approssimativo del server è:
La prossima trasmissione giornaliera è prevista alle ", - "notifications.settings": "Impostazioni di notifica email", - "notifications.remove-images": "Rimuovi le immagini dalle notifiche email" + "notifications.remove-images": "Rimuovi le immagini dalle notifiche email", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/it/email.json b/public/language/it/email.json index 883f0f103b..06bf78707d 100644 --- a/public/language/it/email.json +++ b/public/language/it/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Ciao", "greeting_with_name": "Ciao %1", "email.verify-your-email.subject": "Per favore verificare la tua email", - "email.verify.text1": "Il tuo indirizzo email è cambiato!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Grazie per esserti registrato su %1!", "welcome.text2": "Per attivare completamente il tuo account dobbiamo verificare che sei il proprietario dell'indirizzo email con cui ti sei registrato.", "welcome.text3": "Un amministratore ha accettato la tua richiesta di registrazione. Adesso puoi accedere con il tuo nome utente/password.", diff --git a/public/language/it/error.json b/public/language/it/error.json index b7b75bb77e..be2000b9e4 100644 --- a/public/language/it/error.json +++ b/public/language/it/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Valore di impaginazione non valido, deve essere almeno %1 ed al massimo %2", "username-taken": "Nome utente già esistente", "email-taken": "Email già esistente", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "L'email è già stata invitata", "email-not-confirmed": "Non puoi pubblicare post finché la tua email non è confermata, fai clic qui per confermare la tua email", "email-not-confirmed-chat": "Non puoi chattare finché non confermi la tua email, per favore clicca qui per confermare la tua email.", "email-not-confirmed-email-sent": "La tua email non è stata ancora confermata, controlla la tua casella di posta per l'email di conferma. Non potrai pubblicare post o chattare fino a quando la tua email non sarà confermata.", - "no-email-to-confirm": "Questo forum richiede una conferma via email, clicca qui per inserire un'email", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Non abbiamo potuto confermare la tua email, per favore riprovaci più tardi.", "confirm-email-already-sent": "Email di conferma già inviata, per favore attendere %1 minuto(i) per inviarne un'altra.", "sendmail-not-found": "Impossibile trovare l'eseguibile di sendmail, per favore assicurati che sia installato ed eseguibile dall'utente che esegue NodeBB.", diff --git a/public/language/it/register.json b/public/language/it/register.json index 642c469490..a2b170563a 100644 --- a/public/language/it/register.json +++ b/public/language/it/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "La tua registrazione è stata aggiunta alla coda di approvazione. Riceverai un'email quando sarà accettata da un amministratore.", "registration-queue-average-time": "Il nostro tempo medio per l'approvazione delle iscrizioni è di %1 ore %2 minuti.", "registration-queue-auto-approve-time": "La tua iscrizione a questo forum sarà completamente attivata entro un massimo di %1 ore.", - "interstitial.intro": "Abbiamo bisogno di alcune informazioni aggiuntive prima di poter creare il tuo account.", - "interstitial.errors-found": "Non abbiamo potuto completare la tua registrazione:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "Acconsento alla raccolta e al trattamento dei miei dati personali su questo sito web.", "gdpr_agree_email": "Acconsento a ricevere email di riepilogo e notifiche da questo sito web.", "gdpr_consent_denied": "È necessario dare il consenso a questo sito per raccogliere/elaborare i tuoi dati e per inviarti email.", diff --git a/public/language/it/user.json b/public/language/it/user.json index 9b37f1088f..d4121549a7 100644 --- a/public/language/it/user.json +++ b/public/language/it/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Esporta i contenuti caricati (.zip)", "consent.export-uploads-success": "Esportazione dei caricamenti, riceverai una notifica al termine.", "consent.export_posts": "Esporta i post (.csv)", - "consent.export-posts-success": "Esportazione dei post, riceverai una notifica al termine." + "consent.export-posts-success": "Esportazione dei post, riceverai una notifica al termine.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/ja/admin/settings/email.json b/public/language/ja/admin/settings/email.json index c1dd208061..ee843db6c5 100644 --- a/public/language/ja/admin/settings/email.json +++ b/public/language/ja/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "ダイジェストアワー", "subscriptions.hour-help": "スケジュールされたメールのダイジェストを送信する時間を表す数字を入力してください(深夜は0、午後5:00は17)これはサーバー自体に基づく時間であり、システムの時計と正確に一致しない場合があります。
次の日のダイジェストは", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/ja/email.json b/public/language/ja/email.json index f35bb3a752..e6402c6fd2 100644 --- a/public/language/ja/email.json +++ b/public/language/ja/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "こんにちは", "greeting_with_name": "%1さん、こんにちは", "email.verify-your-email.subject": "Please verify your email", - "email.verify.text1": "Your email address has changed!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "%1に登録していただき、ありがとうございます!", "welcome.text2": "あなたのアカウントを完全に有効化するには、アドレスが正しいことを確認する必要があります。", "welcome.text3": "管理者があなたの登録申請を承認しました。これから、自分のユーザ名とパスワードでログインできます。", diff --git a/public/language/ja/error.json b/public/language/ja/error.json index d39464f58b..a527f0936c 100644 --- a/public/language/ja/error.json +++ b/public/language/ja/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "無効なページネーション値です。%1 から%2の値でなければありません。", "username-taken": "ユーザー名は既に使われています", "email-taken": "メールアドレスは既に使われています", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "チャットを行うにはメールアドレスの確認を行う必要があります。メールアドレスを確認するためにはここをクリックしてください。", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "このフォーラムを利用するにはメールアドレスの確認を行う必要があります。メールアドレスを確認するためにはここをクリックしてください。", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "メールアドレスの確認が出来ませんでした。再度お試しください。", "confirm-email-already-sent": "確認のメールは既に送信されています。再度送信するには、%1分後に再度お試しください。", "sendmail-not-found": "Sendmailの実行ファイルが見つかりませんでした。インストールされ、ユーザーによってNodeBBが実行されていることを確認してください。", diff --git a/public/language/ja/register.json b/public/language/ja/register.json index 7138ce5ab7..926f1db44f 100644 --- a/public/language/ja/register.json +++ b/public/language/ja/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "あなたの登録申請は承認キューに追加されました。管理者によって受け入れられた時に、メールを受信します。", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "私たちは、あなたのアカウント作成においていくつかの情報をお訪ねします。", - "interstitial.errors-found": "私達はあなたの登録を完了できませんでした:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "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.", diff --git a/public/language/ja/user.json b/public/language/ja/user.json index 9df4a0e6e2..b37c2326fa 100644 --- a/public/language/ja/user.json +++ b/public/language/ja/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "アップデートしたコンテンツをエクスポート(.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "投稿をエクスポート (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/ko/admin/settings/email.json b/public/language/ko/admin/settings/email.json index 778ee382e6..8e3fe009a6 100644 --- a/public/language/ko/admin/settings/email.json +++ b/public/language/ko/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "포럼 메일 비활성화", "subscriptions.hour": "포럼 메일 발송 시간", "subscriptions.hour-help": "정기 포럼 메일을 보낼 시간을 입력해주세요. (예: 0은 자정, 17은 오후 5시 입니다. 이 시간은 서버 시간 기준이며, 사용자의 시스템 시간과 일치하지 않을 수 있습니다.
서버 시간은 입니다.
다음 정기 포럼 메일은 에 발송 예정입니다.", - "notifications.settings": "이메일 알림 설정", - "notifications.remove-images": "이메일 알림에서 이미지 제거" + "notifications.remove-images": "이메일 알림에서 이미지 제거", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/ko/email.json b/public/language/ko/email.json index f499459ee8..01ea9e33d4 100644 --- a/public/language/ko/email.json +++ b/public/language/ko/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "안녕하세요", "greeting_with_name": "안녕하세요 %1님", "email.verify-your-email.subject": "사용자의 이메일을 인증해주세요.", - "email.verify.text1": "사용자의 이메일 주소가 변경되었습니다!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "%1님 가입해주셔서 감사합니다.", "welcome.text2": "계정을 활성화하려면 등록한 메일 주소의 인증이 필요합니다.", "welcome.text3": "관리자에 의해 승인되었습니다. 이제 사용자명/비밀번호를 통해 로그인 하실 수 있습니다.", diff --git a/public/language/ko/error.json b/public/language/ko/error.json index 1ba383db83..5d8ff3d717 100644 --- a/public/language/ko/error.json +++ b/public/language/ko/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "올바르지 않은 페이지 값입니다. 최소 %1에서 최대 2% 사이로 설정해야 합니다.", "username-taken": "이미 사용 중인 사용자명입니다.", "email-taken": "이미 사용 중인 이메일입니다.", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "해당 이메일의 사용자는 이미 초대되었습니다.", "email-not-confirmed": "이메일 인증이 완료되기 전까지는 글을 작성할 수 없습니다. 여기를 눌러 이메일 인증을 진행해주세요.", "email-not-confirmed-chat": "아직 이메일이 인증되지 않아 채팅 기능을 사용할 수 없습니다. 여기를 눌러 이메일 인증을 진행하세요.", "email-not-confirmed-email-sent": "이메일 인증이 완료되지 않았습니다. 수신함에서 인증 메일을 확인해주세요. 인증이 완료되기 전까지는 글을 작성하거나 채팅 참여가 불가능합니다.", - "no-email-to-confirm": "이메일 인증이 필요합니다. 이곳을 클릭하여 이메일 주소를 입력하세요.", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "이메일 인증이 실패하였습니다. 잠시 후에 다시 시도하세요.", "confirm-email-already-sent": "인증 메일이 이미 발송되었습니다. 다시 보내려면 %1분을 기다리세요.", "sendmail-not-found": "Sendmail 실행파일을 찾을 수 없었습니다. 관리자가 sendmail을 설치했고 실행이 가능한 상태인지 확인해 주시기 바랍니다.", diff --git a/public/language/ko/register.json b/public/language/ko/register.json index bc53aa4122..0c6547f61f 100644 --- a/public/language/ko/register.json +++ b/public/language/ko/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "회원가입이 요청되었습니다. 관리자의 승인 후 메일이 발송됩니다.", "registration-queue-average-time": "가입 승인에는 평균적으로 %1시간 %2분이 소요됩니다.", "registration-queue-auto-approve-time": "%1시간 내로 이 포럼에서 사용자의 계정이 완전히 활성화될 예정입니다.", - "interstitial.intro": "계정을 생성하기 전 추가 정보가 더 필요합니다.", - "interstitial.errors-found": "회원가입을 완료하지 못했습니다.", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "나는 이 웹사이트에서 개인 정보를 수집하고 처리하는데 동의합니다.", "gdpr_agree_email": "나는 이 웹사이트에서 포럼 메일 및 알림 메일을 수신하는데 동의합니다.", "gdpr_consent_denied": "사용자는 이 사이트가 사용자의 정보를 수집/처리하고 이메일을 보내는 것에 동의해야 합니다.", diff --git a/public/language/ko/user.json b/public/language/ko/user.json index 6f1c4eb24a..17b554b0af 100644 --- a/public/language/ko/user.json +++ b/public/language/ko/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "업로드한 컨텐츠 내보내기 (.zip)", "consent.export-uploads-success": "업로드한 컨텐츠를 내보내기 합니다. 완료되면 알림을 수신합니다.", "consent.export_posts": "포스트 내보내기 (.csv)", - "consent.export-posts-success": "포스트를 내보내기 합니다. 완료되면 알림을 수신합니다." + "consent.export-posts-success": "포스트를 내보내기 합니다. 완료되면 알림을 수신합니다.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/lt/admin/settings/email.json b/public/language/lt/admin/settings/email.json index 839fd2b6f6..9bdbde26a6 100644 --- a/public/language/lt/admin/settings/email.json +++ b/public/language/lt/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/lt/email.json b/public/language/lt/email.json index b8a18e4c87..d003552502 100644 --- a/public/language/lt/email.json +++ b/public/language/lt/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Sveiki", "greeting_with_name": "Sveiki %1", "email.verify-your-email.subject": "Please verify your email", - "email.verify.text1": "Your email address has changed!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Ačiū kad užsiregistravote %1", "welcome.text2": "Kad pilnai aktyvuoti jūsų paskira, mums reikia įsitikinti kad jūs tikrai esate el.pašto valdytojas", "welcome.text3": "Administratorius priemė jūsų prašymą prisijungti prie mūsų. Dabar galite prisijungti su savo slapyvardžiu/slaptažodžiu", diff --git a/public/language/lt/error.json b/public/language/lt/error.json index cccc3ab524..eb15da643c 100644 --- a/public/language/lt/error.json +++ b/public/language/lt/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Bloga puslapių išdėstymo reikšmė. Ji turėtų būti ne mažesnė nei %1 ir ne didesnė nei %2", "username-taken": "Vartotojo vardas jau užimtas", "email-taken": "El. pašto adresas jau užimtas", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "Jūs negalite bendrauti, kol jūsų el.paštas nėra patvirtintas, prašome spausti čia kad aktyvuoti jūsų el.paštą", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "Šis forumas reikalauja patvirtinimo el. paštu prašome spausti čia el. adreso įrašymui", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Negalime patvirtinti jūsų el. adreso, prašom bandyti vėliau.", "confirm-email-already-sent": "Patvirtinimo laiškas išsiųstas, prašome palaukti %1 minute(s) kad išsiųstume kita", "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.", diff --git a/public/language/lt/register.json b/public/language/lt/register.json index c8dfcc8753..28698ba604 100644 --- a/public/language/lt/register.json +++ b/public/language/lt/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Jūsų registracijos prašymas buvo pridėtas į laukiančiųjų sąrašą. Jūs gausite el.paštu laišką kada administratorius patvirtins jus", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "We require some additional information before we can create your account.", - "interstitial.errors-found": "We could not complete your registration:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "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.", diff --git a/public/language/lt/user.json b/public/language/lt/user.json index 785c43e6aa..3042b4594d 100644 --- a/public/language/lt/user.json +++ b/public/language/lt/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Export Uploaded Content (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Export Posts (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/lv/admin/settings/email.json b/public/language/lv/admin/settings/email.json index 084dd5c055..0a17adb1dd 100644 --- a/public/language/lv/admin/settings/email.json +++ b/public/language/lv/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "Kopsavilkumu nosūtīšanas stunda", "subscriptions.hour-help": "Ievadīt skaitli, kas norāda stundu, kurā nosūtītu e-pasta rakstu apkopojumu (piemēram, 0 nozīmē pusnakts, 17 nozīmē plkst.1700). Paturēt prātā, ka šī ir stunda servera laikā, un tā var neatbilst Tavam pulkstenim. Aptuvens servera laiks ir:
Nākamais ikdienas apkopojums tiks nosūtīts ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/lv/email.json b/public/language/lv/email.json index c116c1537c..41862142b2 100644 --- a/public/language/lv/email.json +++ b/public/language/lv/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Sveiki", "greeting_with_name": "Sveiks %1", "email.verify-your-email.subject": "Lūdzu, apstiprini savu e-pastu", - "email.verify.text1": "Tava e-pasta adrese ir mainījusies", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Paldies, ka reģistrējies %1!", "welcome.text2": "Lai pilnībā aktivizētu Tavu kontu, mums ir jāpārliecinās, ka Tev pieder e-pasta adrese, ar ko reģistrējies.", "welcome.text3": "Administrators ir apstiprinājis Tavu reģistrācijas pieteikumu. Tu tagad vari ielogoties ar savu lietotājvārdu un paroli.", diff --git a/public/language/lv/error.json b/public/language/lv/error.json index 4c9a364f05..b4e5274d4b 100644 --- a/public/language/lv/error.json +++ b/public/language/lv/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Nederīgs vienību skaits, ir jābūt vismaz %1 un ne vairāk kā %2", "username-taken": "Lietotājvārds jau izmantots", "email-taken": "E-pasta adrese jau izmantota", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "Nevar sarunāties, kamēr Tava e-pasta adrese netiek apstiprināta, lūdzu, noklikšķini, lai apstiprinātu savu e-pasta adresi.", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "Šis forums pieprasa e-pasta apstiprinājumu, lūdzu, noklikšķini, lai ievadītu e-pasta adresi", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Mēs nevarējām apstiprināt Tavu e-pasta adresi, lūdzu, vēlāk mēģini vēlreiz.", "confirm-email-already-sent": "Apstiprinājuma e-pasts ir jau nosūtīts, lūdzu, uzgaidi %1 minūti(-es), lai nosūtītu vēl vienu.", "sendmail-not-found": "Sendmail programmu nevarēja atrast, lūdzu, pārliecinies, ka lietotājs, kas darbojas ar NodeBB, ir to instalējis un izdarījis palaižamu.", diff --git a/public/language/lv/register.json b/public/language/lv/register.json index adbdbc95fb..3a48e2235a 100644 --- a/public/language/lv/register.json +++ b/public/language/lv/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Tavs reģistrācijas pieteikums ir ievietots reģistrācijas rindā. Tu saņemsi e-pastu, kad administrators to apstiprinās.", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "Pirms varam izveidot Tavu kontu, mums ir nepieciešama papildu informācija.", - "interstitial.errors-found": "Mēs nevarējām pabeigt Tavu reģistrāciju:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "Es piekrītu manas personas informācijas vākšanai un apstrādei šajā vietnē.", "gdpr_agree_email": "Es piekrītu saņemt sakopojumu un paziņojumu e-pastus no šīs vietnes.", "gdpr_consent_denied": "Tev ir jādod piekrišana šai vietnei, lai savāktu / apstrādātu Tavu informāciju un nosūtītu Tev e-pastus.", diff --git a/public/language/lv/user.json b/public/language/lv/user.json index ed25b0eb96..435030e0c1 100644 --- a/public/language/lv/user.json +++ b/public/language/lv/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Eksportēt augšupielādēto saturu (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Eksportēt rakstus (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/ms/admin/settings/email.json b/public/language/ms/admin/settings/email.json index 839fd2b6f6..9bdbde26a6 100644 --- a/public/language/ms/admin/settings/email.json +++ b/public/language/ms/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/ms/email.json b/public/language/ms/email.json index dbd8d3bd70..6805c7b02d 100644 --- a/public/language/ms/email.json +++ b/public/language/ms/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Salam", "greeting_with_name": "Salam %1", "email.verify-your-email.subject": "Please verify your email", - "email.verify.text1": "Your email address has changed!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Terima kasih kerana mendaftar dengan %1!", "welcome.text2": "Untuk mengaktifkan akaun anda sepenuhnya, kami perlu mengesahkan bahawa anda memiliki alamat emel yang didaftarkan.", "welcome.text3": "An administrator has accepted your registration application. You can login with your username/password now.", diff --git a/public/language/ms/error.json b/public/language/ms/error.json index 2e35aa3e58..511f7e0542 100644 --- a/public/language/ms/error.json +++ b/public/language/ms/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Nombor halaman tidak sah, mesti tidak kurang dari %1 dan tidak lebih dari %2", "username-taken": "Nama pengguna telah digunakan", "email-taken": "Emel telah digunakan", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "Anda tidak dibenarkan sembang sehingga emel disahkan, sila sahkan emel anda.", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "Forum ini memerlukan pengesahan emel, sila klik sini untuk memasukkan emel", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Kami tidak dapat memastikan emel anda, sila cuba lagi nanti", "confirm-email-already-sent": "Pengesahan emel telah dihantar, sila tunggu %1 minit() untuk menghantar yang baru.", "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.", diff --git a/public/language/ms/register.json b/public/language/ms/register.json index f754628633..30c6759a2d 100644 --- a/public/language/ms/register.json +++ b/public/language/ms/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Pendaftaran anda sedang dimasukkan ke barisan pengesahan. Anda akan menerima emel setelah diterima oleh pentadbir.", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "We require some additional information before we can create your account.", - "interstitial.errors-found": "We could not complete your registration:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "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.", diff --git a/public/language/ms/user.json b/public/language/ms/user.json index 42d68f3370..264284041a 100644 --- a/public/language/ms/user.json +++ b/public/language/ms/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Export Uploaded Content (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Export Posts (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/nb/admin/settings/email.json b/public/language/nb/admin/settings/email.json index 839fd2b6f6..9bdbde26a6 100644 --- a/public/language/nb/admin/settings/email.json +++ b/public/language/nb/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/nb/email.json b/public/language/nb/email.json index 8d1feefa57..5f26decd75 100644 --- a/public/language/nb/email.json +++ b/public/language/nb/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Hei", "greeting_with_name": "Hei, %1", "email.verify-your-email.subject": "Bekreft e-postadressen din ", - "email.verify.text1": "E-postadressen er endret! ", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Takk for at du registrerte deg hos %1!", "welcome.text2": "For å aktivere kontoen din må vi verifisere at du eier e-postadressen du registrerte deg med.", "welcome.text3": "En administrator har akseptert din søknad om registering. Du kan nå logge inn med ditt brukernavn og passord.", diff --git a/public/language/nb/error.json b/public/language/nb/error.json index 1c2f096e4e..208d0964a8 100644 --- a/public/language/nb/error.json +++ b/public/language/nb/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Ugyldig sidetall, må være minst %1 og maks %2", "username-taken": "Brukernavn opptatt", "email-taken": "E-post opptatt", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "E-post har allerede fått invitasjon", "email-not-confirmed": "Du kan ikke skrive innlegg før e-posten din er bekreftet, vennligst klikk her for å bekrefte din e-post.", "email-not-confirmed-chat": "Du kan ikke chatte før e-posten din er bekreftet, vennligst klikk her for å bekrefte e-postadressen.", "email-not-confirmed-email-sent": "Din e-post har enda ikke blitt bekreftet, vennligst sjekk innboksen din for bekreftelsesmailen. Du har ikke tilgang til å skrive innlegg eller chatte før e-posten din er bekreftet.", - "no-email-to-confirm": "Dette forumet krever e-postbekreftelse, vennligst klikk her for å skrive inn en e-post", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Vi kunne ikke bekrefte e-posten din, vennligst prøv igjen senere.", "confirm-email-already-sent": "E-post for bekreftelse er allerede sendt, vennligst vent %1 minutt(er) for å sende en til.", "sendmail-not-found": "Funksjonaliteten \"sendmail\" ble ikke funnet, vennligst sjekk at den er installert og kjørbar av brukeren som kjører NodeBB.", diff --git a/public/language/nb/register.json b/public/language/nb/register.json index c1aae58d10..16f5fbc589 100644 --- a/public/language/nb/register.json +++ b/public/language/nb/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Din registrering har blitt lagt til i godkjenningskøen. Du vil motta en e-post når denne blir akseptert av en administrator.", "registration-queue-average-time": "Gjennomsnittlig tid for godkjenning av medlemskap er% 1 timer% 2 minutter.", "registration-queue-auto-approve-time": "Ditt medlemskap i dette forumet vil være fullt aktivert på opptil% 1 timer.", - "interstitial.intro": "Vi krever litt tilleggsinformasjon før vi kan opprette kontoen din.", - "interstitial.errors-found": "Vi kunne ikke fullføre registreringen:\n ", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "Jeg samtykker til innsamling og behandling av min personlige informasjon på dette nettstedet.", "gdpr_agree_email": "Jeg samtykker i å motta forumsammendrag og varsler på e-postmeldinger fra dette nettstedet. ", "gdpr_consent_denied": "Du må gi samtykke til at dette nettstedet kan samle inn / behandle informasjonen din, og til å sende deg e-post. ", diff --git a/public/language/nb/user.json b/public/language/nb/user.json index 216a003cd7..a34d787b54 100644 --- a/public/language/nb/user.json +++ b/public/language/nb/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Eksporter opplastet innhold (.zip)", "consent.export-uploads-success": "Når du eksporterer opplastinger, får du et varsel når det er fullført.", "consent.export_posts": "Eksporter innlegg (.csv)", - "consent.export-posts-success": "Eksporterer innlegg, du får en notifikasjon når eksporten er fullført." + "consent.export-posts-success": "Eksporterer innlegg, du får en notifikasjon når eksporten er fullført.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/nl/admin/settings/email.json b/public/language/nl/admin/settings/email.json index e1d062b536..d4cb9b7f6d 100644 --- a/public/language/nl/admin/settings/email.json +++ b/public/language/nl/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Schakel e-mail digests uit", "subscriptions.hour": "Uur van Digest", "subscriptions.hour-help": "Voer het nummer in dat het uur representeerd waarop scheduled email digests worden verstuurd (bv. 0 voor middernacht, 17 voor 17:00). Neem er s.v.p. notie van dat dit het uur is van de server self, dit hoeft niet exact overeen te komen met de klok van uw systeem.
De tijd op de server is bij benadering:
De volgende dagelijkse digest staat gepland om ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/nl/email.json b/public/language/nl/email.json index 59dc174cad..bb93113e37 100644 --- a/public/language/nl/email.json +++ b/public/language/nl/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Hallo", "greeting_with_name": "Hallo %1", "email.verify-your-email.subject": "Verifieer alstublieft uw e-mail", - "email.verify.text1": "Je e-mailadres is gewijzigd!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Bedank voor het registreren bij %1!", "welcome.text2": "Om je account volledig te activeren, moet je de instructies uit het bevestigingsbericht opvolgen. Controleer daarom nu eerst je e-mail inbox voor de activeringscode en volg de link in het bericht.", "welcome.text3": "Een administrator heeft uw registratie geaccepteerd. U kan nu inloggen met uw gebruikersnaam en wachtwoord.", diff --git a/public/language/nl/error.json b/public/language/nl/error.json index 0a064ed11e..42c1d36212 100644 --- a/public/language/nl/error.json +++ b/public/language/nl/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Ongeldig paginering waarde. De waarde moet op z'n minst %1 zijn en niet hoger dan %2 zijn.", "username-taken": "Gebruikersnaam is al in gebruik ", "email-taken": "E-mailadres is al in gebruik", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "E-mail was reeds uitgenodigd", "email-not-confirmed": "Het plaatsen van berichten is pas toegestaan na validatie van het e-mailadres.", "email-not-confirmed-chat": "Het gebruik van chatfunctionaliteit is pas toegestaan na validatie van het e-mailadres.", "email-not-confirmed-email-sent": "Je e-mailadres is nog niet bevestigd, kijk of je de bevestigingsmail hebt ontvangen. Tot je e-mailadres is bevestigd kun je geen berichten plaatsen of aan chats deelnemen.", - "no-email-to-confirm": "Dit berichtenforum vereist bevestiging per e-mail, klik hier om een e-mailadres te registreren", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Helaas kon het e-mailadres niet bevestigd worden, probeer het later nog eens.", "confirm-email-already-sent": "Bevestigingsmail is zojuist al verzonden, wacht alsjeblieft %1 minuut (minuten) voordat je opnieuw een bevestigingsmail aanvraagt.", "sendmail-not-found": "De sendmail executable kon niet worden gevonden, zorg ervoor dat deze is geïnstalleerd en dat de gebruiker die NodeBB draait deze kan uitvoeren.", diff --git a/public/language/nl/register.json b/public/language/nl/register.json index 89f3d423fc..58ea9503d7 100644 --- a/public/language/nl/register.json +++ b/public/language/nl/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Het registratieverzoek is toegevoegd aan de wachtrij. Een bericht wordt naar het opgegeven emailadres gestuurd wanneer de registratie is goedgekeurd.", "registration-queue-average-time": "Onze gemiddelde tijd om lidmaatschappen goed te keuren is %1 uur %2 minuten.", "registration-queue-auto-approve-time": "Je lidmaatschap op dit forum zal volledig worden geactiveerd binnen maximaal %1 uur.", - "interstitial.intro": "Je hebben meer informatie van je nodig voordat we je account kunnen aanmaken.", - "interstitial.errors-found": "Je konden jouw registratie niet afronden.", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "Ik geef toestemming voor het verzamelen en verwerken van mijn persoonlijke informatie op deze website.", "gdpr_agree_email": "Ik geef toestemming voor het verzenden van samenvattingen en notificaties per e-mail van deze website.", "gdpr_consent_denied": "Deze website heeft uw toestemming nodig voor het verzamelen en verwerken van uw gegevens, en voor het verzenden van e-mails.", diff --git a/public/language/nl/user.json b/public/language/nl/user.json index 5cdd7c751f..1845a11253 100644 --- a/public/language/nl/user.json +++ b/public/language/nl/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Exporteer geuploade inhoud (.zip)", "consent.export-uploads-success": "Uploads worden geëxporteerd. Je zult een notificatie krijgen als dit is voltooid.", "consent.export_posts": "Exporteer berichten (.csv)", - "consent.export-posts-success": "Berichten worden geëxporteerd. Je zult een notificatie krijgen als dit is voltooid." + "consent.export-posts-success": "Berichten worden geëxporteerd. Je zult een notificatie krijgen als dit is voltooid.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/pl/admin/settings/email.json b/public/language/pl/admin/settings/email.json index 0133f3617a..f8ffa2b0cc 100644 --- a/public/language/pl/admin/settings/email.json +++ b/public/language/pl/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Wyłącz podsumowania e-maili", "subscriptions.hour": "Godzina podsumowania", "subscriptions.hour-help": "Wprowadź liczbę odpowiadającą godzinie, o której mają być wysyłane regularne e-maile z podsumowaniem (np. 0 dla północy lub 17 dla 17:00). Pamiętaj, że godzina jest godziną serwera i nie musi zgadzać się z czasem lokalnym administratora. Przybliżony czas serwera to:
Wysłanie kolejnego e-maila z podsumowaniem zaplanowano na ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/pl/email.json b/public/language/pl/email.json index 6d189abdb8..c993013e17 100644 --- a/public/language/pl/email.json +++ b/public/language/pl/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Witaj", "greeting_with_name": "Witaj, %1", "email.verify-your-email.subject": "Zweryfikuj swój adres e-mail", - "email.verify.text1": "Twój adres e-mail został zmieniony", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Dziękujemy za rejestrację na %1", "welcome.text2": "Aby w pełni aktywować konto, musisz potwierdzić, że podany adres e-mail należy do Ciebie.", "welcome.text3": "Administrator zaakceptował Twoją prośbę o rejestrację. Możesz się teraz zalogować za pomocą swojej nazwy użytkownika i hasła.", diff --git a/public/language/pl/error.json b/public/language/pl/error.json index 0207ee6bc2..21cefdc10c 100644 --- a/public/language/pl/error.json +++ b/public/language/pl/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Błędna wartość paginacji, zakres od %1 do %2", "username-taken": "Login zajęty", "email-taken": "Email zajęty", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "Nie możesz opublikować, dopóki Twój adres e-mail nie zostanie potwierdzony, kliknij tutaj, aby potwierdzić swój adres e-mail.", "email-not-confirmed-chat": "Nie możesz prowadzić rozmów, dopóki twój email nie zostanie potwierdzony. Kliknij tutaj, aby potwierdzić swój email.", "email-not-confirmed-email-sent": "Twój e-mail nie został jeszcze potwierdzony, sprawdź swoją skrzynkę pocztową, aby znaleźć e-mail z potwierdzeniem. Nie będziesz mógł dodawać postów ani czatować, dopóki Twój adres e-mail nie zostanie potwierdzony.", - "no-email-to-confirm": "To forum wymaga weryfikacji przez email. Proszę kliknąć tutaj, aby wprowadzić adres.", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Nie byliśmy w stanie potwierdzić Twojego adresu e-mail. Spróbuj później.", "confirm-email-already-sent": "Email potwierdzający został już wysłany, proszę odczekaj jeszcze %1 minut(y), aby wysłać kolejny.", "sendmail-not-found": "Program sendmail nie został znaleziony, proszę upewnij się, że jest zainstalowany i możliwy do uruchomienia przez użytkownika uruchamiającego NodeBB.", diff --git a/public/language/pl/register.json b/public/language/pl/register.json index 4eeafc211f..18e2303972 100644 --- a/public/language/pl/register.json +++ b/public/language/pl/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Twoja rejestracja została dodana do kolejki oczekujących na akceptację. Otrzymasz e-mail, kiedy zostanie zatwierdzona przez administratora.", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "Do utworzenia Twojego konta potrzebne są dodatkowe informacje.", - "interstitial.errors-found": "Nie mogliśmy ukończyć procesu rejestracji:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "Wyrażam zgodę na zbieranie i przetwarzanie moich danych przez tę stronę.", "gdpr_agree_email": "Wyrażam zgodę na otrzymywanie e-maili z podsumowaniami i powiadomieniami od tej strony.", "gdpr_consent_denied": "Musisz wyrazić zgodę na zbieranie/przetwarzanie Twoich danych przez tę stronę oraz na otrzymywanie e-maili.", diff --git a/public/language/pl/user.json b/public/language/pl/user.json index 976b7ab4f0..b4c0a5eb0e 100644 --- a/public/language/pl/user.json +++ b/public/language/pl/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Eksportuj przesłane treści (zip)", "consent.export-uploads-success": "Eksportowanie przesłanych plików. Otrzymasz powiadomienie gdy będą gotowe.", "consent.export_posts": "Eksportuj wpisy (csv)", - "consent.export-posts-success": "Eksportowanie postów. Otrzymasz powiadomienie gdy będą gotowe." + "consent.export-posts-success": "Eksportowanie postów. Otrzymasz powiadomienie gdy będą gotowe.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/pt-BR/admin/settings/email.json b/public/language/pt-BR/admin/settings/email.json index 3997f2502f..a00c34d939 100644 --- a/public/language/pt-BR/admin/settings/email.json +++ b/public/language/pt-BR/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Desabilitar resumos por email", "subscriptions.hour": "Hora de Envio dos Resumos", "subscriptions.hour-help": "Por favor, entre um número representando a hora para enviar os resumos agendados via e-mail (por exemplo: 0 para meia-noite, 17 para 5:00pm). Tenha em mente que esta é a hora de acordo com o servidor e pode não combinar exatamente com o relógio do seu sistema.
O horário aproximado do servidor é:
O próximo resumo diário está agendado para ser enviado ", - "notifications.settings": "Configurações de notificação por email", - "notifications.remove-images": "Remover imagens de notificações por e-mail" + "notifications.remove-images": "Remover imagens de notificações por e-mail", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/pt-BR/email.json b/public/language/pt-BR/email.json index 64221ab6d9..8c53dadec2 100644 --- a/public/language/pt-BR/email.json +++ b/public/language/pt-BR/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Olá", "greeting_with_name": "Olà %1", "email.verify-your-email.subject": "Por favor, confirme o seu e-mail", - "email.verify.text1": "O seu endereço de e-mail foi alterado!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Obrigado por se registrar com %1!", "welcome.text2": "Para terminar de ativar sua conta, nós precisamos verificar que você é o dono do endereço de email com o que você se registrou.", "welcome.text3": "Um administrador aceitou o seu pedido de registro. Você pode fazer login agora com seu nome de usuário/senha.", diff --git a/public/language/pt-BR/error.json b/public/language/pt-BR/error.json index 7f151baff7..8985a54f9f 100644 --- a/public/language/pt-BR/error.json +++ b/public/language/pt-BR/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Valor de paginação inválido, precisa ser no mínimo %1 e no máximo %2", "username-taken": "Nome de usuário já existe", "email-taken": "Email já cadastrado", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "O email já foi convidado", "email-not-confirmed": "Você não poderá postar até que seu e-mail seja confirmado, clique aqui para confirmar seu e-mail.", "email-not-confirmed-chat": "Você não está habilitado a conversar até que seu email seja confirmado, por favor clique aqui para confirmar seu email.", "email-not-confirmed-email-sent": "Seu e-mail ainda não foi confirmado, verifique sua caixa de entrada para o e-mail de confirmação. Você não poderá postar ou usar o chat até que seu e-mail seja confirmado.", - "no-email-to-confirm": "Este fórum exige confirmação de email, por gentileza clique aqui para digitar um email", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Nós não pudemos confirmar seu email, por gentileza tente novamente mais tarde.", "confirm-email-already-sent": "O email de confirmação já foi enviado, por favor aguarde %1 minuto(s) para enviar outro.", "sendmail-not-found": "O executável do sendmail não pôde ser encontrado. Por favor, certifique-se de que ele está instalado e que está autorizado a ser executado pelo usuário que roda o NodeBB.", diff --git a/public/language/pt-BR/register.json b/public/language/pt-BR/register.json index b798390893..052ea03f97 100644 --- a/public/language/pt-BR/register.json +++ b/public/language/pt-BR/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "O seu cadastro foi adicionado à fila de aprovação. Você receberá um email quando ele for aceito por um administrador.", "registration-queue-average-time": "Nosso tempo médio para aprovação de associações é de %1 horas e %2 minutos.", "registration-queue-auto-approve-time": "Sua associação a este fórum será totalmente ativada em até %1 horas.", - "interstitial.intro": "Precisamos de algumas informações adicionais antes de podermos criar sua conta.", - "interstitial.errors-found": "Não foi possível concluir o seu cadastro:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "Eu concordo com a coleta e o processamento de minhas informações pessoais neste site.", "gdpr_agree_email": "Eu concordo em receber e-mails de resumo e notificação deste site.", "gdpr_consent_denied": "Você deve autorizar não só que este site colete e processe suas informações, como também de permitir que este envie e-mails para você.", diff --git a/public/language/pt-BR/user.json b/public/language/pt-BR/user.json index 29c94cb91e..190f90e8d2 100644 --- a/public/language/pt-BR/user.json +++ b/public/language/pt-BR/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Exportar Arquivos Enviados (.zip)", "consent.export-uploads-success": "Exportando uploads, você receberá uma notificação quando estiver concluído.", "consent.export_posts": "Exportar Posts (.csv)", - "consent.export-posts-success": "Exportando postagens, você receberá uma notificação quando estiver concluído." + "consent.export-posts-success": "Exportando postagens, você receberá uma notificação quando estiver concluído.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/pt-PT/admin/settings/email.json b/public/language/pt-PT/admin/settings/email.json index 8917a8ea07..2172f608f7 100644 --- a/public/language/pt-PT/admin/settings/email.json +++ b/public/language/pt-PT/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Desativar resumos por e-mail", "subscriptions.hour": "Hora do Resumo", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/pt-PT/email.json b/public/language/pt-PT/email.json index 68ac2bf93e..fc9b8671fa 100644 --- a/public/language/pt-PT/email.json +++ b/public/language/pt-PT/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Olá", "greeting_with_name": "Olá %1", "email.verify-your-email.subject": "Por favor verifica o teu e-mail", - "email.verify.text1": "O teu endereço de e-mail foi alterado!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Obrigado por te teres registado no %1!", "welcome.text2": "De forma a finalizar o processo de activação da tua conta, precisamos de verificar que és o legítimo dono da conta de e-mail registada.", "welcome.text3": "Um administrador aceitou o teu registo. Podes agora iniciar sessão com o teu nome de utilizador/palavra-passe.", diff --git a/public/language/pt-PT/error.json b/public/language/pt-PT/error.json index 433a80d7ca..d01399622b 100644 --- a/public/language/pt-PT/error.json +++ b/public/language/pt-PT/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Valor de paginação errado, deve ser no mínimo %1 e no máximo %2", "username-taken": "Nome de utilizar já utilizado", "email-taken": "E-mail já utilizado", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "Não podes utilizar o chat enquanto não confirmares o teu e-mail, por favor clica aqui para confirmares o teu e-mail.", "email-not-confirmed-email-sent": "O teu e-mail ainda não foi confirmado, por favor verifica a tua caixa de entrada para obteres o e-mail de confirmação. Não poderás publicar ou conversar até que o teu e-mail seja confirmado.", - "no-email-to-confirm": "Este fórum requer confirmação de e-mail, por favor clica aqui para inserires um e-mail", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Não conseguimos confirmar o teu e-mail, por favor tenta mais tarde.", "confirm-email-already-sent": "O e-mail de confirmação já foi enviado, por favor espera %1 minuto(s) para enviares outro.", "sendmail-not-found": "O executável sendmail não foi encontrado, por favor assegura-te que se encontra instalado e executável pelo utilizador a correr o NodeBB.", diff --git a/public/language/pt-PT/register.json b/public/language/pt-PT/register.json index fbb440bb58..ebfa6647d9 100644 --- a/public/language/pt-PT/register.json +++ b/public/language/pt-PT/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "O teu registo foi adicionado à fila de aprovação. Receberás um e-mail quando fores aceite por um administrador.", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "Requeremos informação adicional antes de criarmos a tua conta.", - "interstitial.errors-found": "Não pudemos completar o teu registro:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "Autorizo a recolha e o processamento das minhas informações pessoais neste website.", "gdpr_agree_email": "Aceito receber e-mails de resumo e de notificações deste website.", "gdpr_consent_denied": "You must give consent to this site to collect/process your information, and to send you emails.", diff --git a/public/language/pt-PT/user.json b/public/language/pt-PT/user.json index 4c2aadf08d..2097c5256f 100644 --- a/public/language/pt-PT/user.json +++ b/public/language/pt-PT/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Exportar Arquivos Enviados (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Exportar Publicações (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/ro/admin/settings/email.json b/public/language/ro/admin/settings/email.json index 839fd2b6f6..9bdbde26a6 100644 --- a/public/language/ro/admin/settings/email.json +++ b/public/language/ro/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/ro/email.json b/public/language/ro/email.json index 6b66f0deae..ad7870f784 100644 --- a/public/language/ro/email.json +++ b/public/language/ro/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Salut", "greeting_with_name": "Salut %1", "email.verify-your-email.subject": "Please verify your email", - "email.verify.text1": "Your email address has changed!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "îți mulțumim că te-ai Înregistrat cu %1!", "welcome.text2": "Pentru a-ți activa cu success contul trebuie să verificăm adresa de email pe care ai folosit-o la înregistrare.", "welcome.text3": "An administrator has accepted your registration application. You can login with your username/password now.", diff --git a/public/language/ro/error.json b/public/language/ro/error.json index f9566e8041..939f4263a9 100644 --- a/public/language/ro/error.json +++ b/public/language/ro/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2", "username-taken": "Numele de utilizator este deja folosit", "email-taken": "Adresa de email este deja folostă", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "Nu vei putea trimite mesaje daca email-ul tau nu e confirmat, click aici sa il confirmi.", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "Ca sa accesezi forumul trebuie sa iti confirmi email-ul, click aici ca sa intri in mail.", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Mail-ul tau nu a putut fi confirmat, te rog incearca mai tarziu.", "confirm-email-already-sent": "Email-ul de confirmare ti-a fost trimis, asteapta te rog %1 minut(e) ca sa trimiti inca unul.", "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.", diff --git a/public/language/ro/register.json b/public/language/ro/register.json index 785124faef..98070948b5 100644 --- a/public/language/ro/register.json +++ b/public/language/ro/register.json @@ -20,8 +20,9 @@ "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.", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "We require some additional information before we can create your account.", - "interstitial.errors-found": "We could not complete your registration:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "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.", diff --git a/public/language/ro/user.json b/public/language/ro/user.json index 7991981ccf..5b8bb273eb 100644 --- a/public/language/ro/user.json +++ b/public/language/ro/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Export Uploaded Content (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Export Posts (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/ru/admin/settings/email.json b/public/language/ru/admin/settings/email.json index e82e8cfa3e..e9c4b56c62 100644 --- a/public/language/ru/admin/settings/email.json +++ b/public/language/ru/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Отключить новостные рассылки", "subscriptions.hour": "Час отправки", "subscriptions.hour-help": "Введите число, соответствующее номеру часа (например, 0 для полуночи, 17 для 17:00). Имейте в виду, что время определяется по часовому поясу сервера.
Текущее время сервера:
Следующая рассылка запланирована на ", - "notifications.settings": "Настройки уведомлений по электронной почте", - "notifications.remove-images": "Удалить изображения из уведомлений по электронной почте" + "notifications.remove-images": "Удалить изображения из уведомлений по электронной почте", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/ru/email.json b/public/language/ru/email.json index 09a668a406..cf4102754f 100644 --- a/public/language/ru/email.json +++ b/public/language/ru/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Здравствуйте!", "greeting_with_name": "Здравствуйте, %1!", "email.verify-your-email.subject": "Пожалуйста, подтвердите свой адрес электронной почты", - "email.verify.text1": "Ваш адрес электронной почты был изменён!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Благодарим за регистрацию на форуме %1!", "welcome.text2": "Чтобы активировать учётную запись, необходимо подтвердить ваш адрес электронной почты.", "welcome.text3": "Администратор подтвердил вашу регистрацию. Теперь вы можете использовать вашу учётную запись.", diff --git a/public/language/ru/error.json b/public/language/ru/error.json index 67730d294f..00e5ede901 100644 --- a/public/language/ru/error.json +++ b/public/language/ru/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Неправильно указан номер страницы. Значение должно быть в диапазоне от %1 до %2", "username-taken": "Это имя пользователя уже занято", "email-taken": "Пользователь с таким адресом электронной почты уже зарегистрирован", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Электронная почта уже была приглашена", "email-not-confirmed": "Вы не сможете отправлять сообщения, пока ваш адрес электронной почты не подтверждён. Пожалуйста, нажмите здесь, чтобы подтвердить его.", "email-not-confirmed-chat": "Вы не можете оставлять сообщения, пока ваша электронная почта не подтверждена. Отправить письмо с кодом подтверждения повторно.", "email-not-confirmed-email-sent": "Ваш адрес электронной почты ещё не подтверждён. Пожалуйста, проверьте ваш почтовый ящик и пройдите по ссылке в письме с кодом подтверждения. Пока ваш e-mail не подтверждён, вы не можете пользоваться чатом или публиковать сообщения.", - "no-email-to-confirm": "Этот сайт требует подтверждения по электронной почте. Нажмите здесь для ввода адреса электронной почты.", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "По техническим причинам мы не можем подтвердить ваш адрес электронной почты. Приносим вам наши извинения, пожалуйста, попробуйте позже.", "confirm-email-already-sent": "Сообщение для подтверждения регистрации уже выслано на ваш адрес электронной почты. Повторная отправка возможна через %1 мин.", "sendmail-not-found": "Не можем найти sendmail, убедитесь что он установлен и управляется NodeBB.", diff --git a/public/language/ru/register.json b/public/language/ru/register.json index b7b4a6e054..3a9cca89d6 100644 --- a/public/language/ru/register.json +++ b/public/language/ru/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Ваша регистрация была добавлена в очередь на утверждение. Вы получите уведомление по электронной почте, когда она будет одобрена администратором.", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "Нам потребуется дополнительная информация, прежде чем мы сможем создать вашу учётную запись.", - "interstitial.errors-found": "Мы не смогли завершить регистрацию:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "Я соглашаюсь на сбор и обработку моей личной информации на этом веб-сайте.", "gdpr_agree_email": "Я соглашаюсь получать дайджесты и уведомления с этого сайта на свой адрес электронной почты.", "gdpr_consent_denied": "Вы должны дать согласие на сбор, обработку вашей информации и отправку вам сообщений по электронной почте.", diff --git a/public/language/ru/user.json b/public/language/ru/user.json index 570c9a77f8..afa702265a 100644 --- a/public/language/ru/user.json +++ b/public/language/ru/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Экспорт загруженного контента (.zip)", "consent.export-uploads-success": "Экспорт загрузок, вы получите уведомление, когда он будет завершен.", "consent.export_posts": "Экспорт сообщений (.csv)", - "consent.export-posts-success": "Экспорт постов, вы получите уведомление, когда он будет завершен." + "consent.export-posts-success": "Экспорт постов, вы получите уведомление, когда он будет завершен.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/rw/admin/settings/email.json b/public/language/rw/admin/settings/email.json index 839fd2b6f6..9bdbde26a6 100644 --- a/public/language/rw/admin/settings/email.json +++ b/public/language/rw/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/rw/email.json b/public/language/rw/email.json index df4855bad8..cd599394b4 100644 --- a/public/language/rw/email.json +++ b/public/language/rw/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Mwirwe", "greeting_with_name": "Mwiriwe %1", "email.verify-your-email.subject": "Please verify your email", - "email.verify.text1": "Your email address has changed!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Urakoze kwiyandika nk'ukoresha %1!", "welcome.text2": "Kugirango tuguhe uburenganzira busesuye bwo gukoresha konte yawe, tugomba kubanza gusuzuma niba email watanze wiyandikisha ari iyawe. ", "welcome.text3": "Umuyobozi w'urubuga yemeye ubusabe bwawe bwo kwandikwa nk'ukoresha urubuga. Ushobora noneho kwinjiramo ukoresheje izina n'ijambobanga byawe.", diff --git a/public/language/rw/error.json b/public/language/rw/error.json index 87bd5bb5d6..392b2edbeb 100644 --- a/public/language/rw/error.json +++ b/public/language/rw/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2", "username-taken": "Izina ryarafashwe mbere", "email-taken": "Email yarafashwe mbere", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "Ntabwo uremererwa kuganirira mu gikari kuko email yawe itari yemezwa. Kanda hano kugirango wemeze email yawe. ", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "Uru rubuga rusaba ko wemeza ko utunze email. Kanda hano kugirango utange email yawe", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Ntabwo email yawe yabashije kwemezwa. Ongera ugerageze mu bundi buryo. ", "confirm-email-already-sent": "Email yo kwemeza yamaze koherezwa. Tegereza iminota (umunota) %1 mbere yo kohereza indi. ", "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.", diff --git a/public/language/rw/register.json b/public/language/rw/register.json index 1a9489ece7..22e2e0b554 100644 --- a/public/language/rw/register.json +++ b/public/language/rw/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Icyifuzo cy'iyandikwa ryawe cyakiriwe ariko gitegereje isuzuma. Uzabimenyeshwa biciye muri email niba ubuyobozi bwakwemereye kwandikwa. ", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "We require some additional information before we can create your account.", - "interstitial.errors-found": "We could not complete your registration:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "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.", diff --git a/public/language/rw/user.json b/public/language/rw/user.json index 728eb73f66..92de6e2641 100644 --- a/public/language/rw/user.json +++ b/public/language/rw/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Export Uploaded Content (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Export Posts (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/sc/admin/settings/email.json b/public/language/sc/admin/settings/email.json index 839fd2b6f6..9bdbde26a6 100644 --- a/public/language/sc/admin/settings/email.json +++ b/public/language/sc/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/sc/email.json b/public/language/sc/email.json index 88c5c56696..95aa8cfdfa 100644 --- a/public/language/sc/email.json +++ b/public/language/sc/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Hello", "greeting_with_name": "Hello %1", "email.verify-your-email.subject": "Please verify your email", - "email.verify.text1": "Your email address has changed!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Thank you for registering with %1!", "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.", "welcome.text3": "An administrator has accepted your registration application. You can login with your username/password now.", diff --git a/public/language/sc/error.json b/public/language/sc/error.json index 7a8f98a879..d4a252df72 100644 --- a/public/language/sc/error.json +++ b/public/language/sc/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2", "username-taken": "Username taken", "email-taken": "Email taken", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "We could not confirm your email, please try again later.", "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.", "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.", diff --git a/public/language/sc/register.json b/public/language/sc/register.json index a06fceb6ad..ff16e87b0c 100644 --- a/public/language/sc/register.json +++ b/public/language/sc/register.json @@ -20,8 +20,9 @@ "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.", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "We require some additional information before we can create your account.", - "interstitial.errors-found": "We could not complete your registration:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "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.", diff --git a/public/language/sc/user.json b/public/language/sc/user.json index 17c0bc8252..650dfe896b 100644 --- a/public/language/sc/user.json +++ b/public/language/sc/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Export Uploaded Content (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Export Posts (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/sk/admin/settings/email.json b/public/language/sk/admin/settings/email.json index 35fc262867..1ecd846835 100644 --- a/public/language/sk/admin/settings/email.json +++ b/public/language/sk/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/sk/email.json b/public/language/sk/email.json index 833c13cf2e..2dfed3de9c 100644 --- a/public/language/sk/email.json +++ b/public/language/sk/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Dobrý deň", "greeting_with_name": "Dobrý deň %1", "email.verify-your-email.subject": "Overte si prosím, vašu e-mailovú adresu", - "email.verify.text1": "Vaša e-mailová adresa bola zmenená", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Ďakujeme Vám za registráciu s %1!", "welcome.text2": "Pre úplne aktivovanie Vášho účtu, musíme overiť e-mailovú adresu, ktorú ste zadali pri registrácií.", "welcome.text3": "Správca práve potvrdil vašu registráciu. Teraz sa môžete prihlásiť svojím menom a heslom.", diff --git a/public/language/sk/error.json b/public/language/sk/error.json index c7a8d5479a..0bce476207 100644 --- a/public/language/sk/error.json +++ b/public/language/sk/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Neplatná stránkovania hodnota, musí byť najmenej %1 a najviac %2", "username-taken": "Užívateľské meno je už obsadené", "email-taken": "Tento e-mail je už obsadený", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "Nemôžete vytvoriť konverzáciu pokiaľ Váš e-mail nebude overený. Prosím kliknite sem, pre overenie Vášho e-mailu.", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "Pre toto fórum je potrebné overenie e-mailom. Prosím kliknite sem, pre zadanie e-mailu.", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Momentálne nemôžeme overiť Váš e-mail, prosím zopakujte to neskôr.", "confirm-email-already-sent": "Overovací e-mail už bol odoslaný. Prosím počkajte %1 minút(y) k odoslaniu ďalšieho.", "sendmail-not-found": "Odoslaný spúšťač nebol nájdený, prosím uistite sa že je nainštalovaný a spustiteľný užívateľom používajúcim NodeBB.", diff --git a/public/language/sk/register.json b/public/language/sk/register.json index d9b83f7c2d..d0c1f5f469 100644 --- a/public/language/sk/register.json +++ b/public/language/sk/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Vaša registrácia bola pridaná do fronty na schválenie. Obdržíte e-mail, keď Vaša registrácia bude prijatá správcom.", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "Pred vytvorením účtu požadujeme nejaké dodatočné informácie.", - "interstitial.errors-found": "Nepodarilo sa nám dokončiť Vašu registráciu:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "Dávam súhlas so zberom a spracovaním mojich osobných údajov na tejto webovej stránke.", "gdpr_agree_email": "Dávam súhlas k prijímaniu e-mailových prehľadov a oznámení týkajúcich sa tejto webovej stránky.", "gdpr_consent_denied": "Musíte udeliť súhlas tejto stránke k zbieraniu/spracovaniu informácií o vašej činnosti a odosielať Vám e-maily.", diff --git a/public/language/sk/user.json b/public/language/sk/user.json index 5815c5c024..44864bc3e3 100644 --- a/public/language/sk/user.json +++ b/public/language/sk/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Exportovať nahraný obsah (*.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Exportovať príspevky (*.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/sl/admin/settings/email.json b/public/language/sl/admin/settings/email.json index 839fd2b6f6..9bdbde26a6 100644 --- a/public/language/sl/admin/settings/email.json +++ b/public/language/sl/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/sl/email.json b/public/language/sl/email.json index 5d15feff22..5b71fbec55 100644 --- a/public/language/sl/email.json +++ b/public/language/sl/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Pozdravljeni!", "greeting_with_name": "Pozdravljeni, %1!", "email.verify-your-email.subject": "Please verify your email", - "email.verify.text1": "Your email address has changed!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Hvala, da ste se registrirali na forumu %1!", "welcome.text2": "Pred aktiviranjem vašega računa moramo preveriti lastništvo elektronskega naslova, s katerim ste se registrirali.", "welcome.text3": "Skrbnik je sprejel vašo registracijo. Sedaj se lahko prijavite s svojim uporabniškim imenom in geslom.", diff --git a/public/language/sl/error.json b/public/language/sl/error.json index 7da40df6c8..9d7b673420 100644 --- a/public/language/sl/error.json +++ b/public/language/sl/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Napačna vrednost za številčenje strani. Vrednost mora biti najmanj %1 in največ %2.", "username-taken": "Uporabniško ime je že zasedeno.", "email-taken": "E-poštni naslov je že zaseden.", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "Ne morete klepetati, dokler ne potrdite svojega e-poštnega naslova. Prosimo, kliknite tu za potrditev e-poštnega naslova.", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "Ta forum zahteva potrjen e-poštni naslov. Prosim, kliknite tu za vnos e-poštnega naslova.", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Potrditev vašega e-poštnega naslova ni uspela. Prosimo, poskusite ponovno pozneje.", "confirm-email-already-sent": "Potrditveno e-sporočilo je že bilo poslano. Prosimo, počakajte %1 min za ponovno pošiljanje.", "sendmail-not-found": "Ne najdem izvršljive datoteke za pošiljanje e-pošte. Prepričajte se, da je ta nameščena in izvršljiva prek uporabnika, ki izvaja NodeBB.", diff --git a/public/language/sl/register.json b/public/language/sl/register.json index a56a600a00..17def24c5c 100644 --- a/public/language/sl/register.json +++ b/public/language/sl/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Registracija uporabniškega profila poteka. Ob potrditvi skrbnika boste v svoj e-poštni predal prejeli sporočilo.", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "Preden ustvarimo vaš račun, potrebujemo nekaj dodatnih informacij.", - "interstitial.errors-found": "Vaše registracije ne moremo dokončati:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "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.", diff --git a/public/language/sl/user.json b/public/language/sl/user.json index 9264da5992..c0ae8c0dfb 100644 --- a/public/language/sl/user.json +++ b/public/language/sl/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Export Uploaded Content (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Export Posts (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/sr/admin/settings/email.json b/public/language/sr/admin/settings/email.json index d7f907b94f..4b69f6e351 100644 --- a/public/language/sr/admin/settings/email.json +++ b/public/language/sr/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Molim unesite broj koji označava satnicu kada da pošalje zakazani sažeti email (nrp. 0 za ponoć, 17 za 5:00 pm). Uzmite u obzir da će se slanje događati po satnici samog servara, i da vrlo verovatno se ne poklapa sa satnicom vašeg sistema.
Trenutno vreme servera je:
Sledeći dnevni sažeti email zakazan je za slanje u ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/sr/email.json b/public/language/sr/email.json index aee71ed354..41aadc9d6a 100644 --- a/public/language/sr/email.json +++ b/public/language/sr/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Здраво", "greeting_with_name": "Здраво %1", "email.verify-your-email.subject": "Потврдите вашу е-пошту", - "email.verify.text1": "Ваша адреса е-поште је промењена!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Хвала што сте се регистровали на %1!", "welcome.text2": "Да бисте у потпуности активирали ваш налог, потребно је да проверимо да ли стварно поседујете адресу е-поште којом сте се регистровали. ", "welcome.text3": "Администратор је прихватио вашу регистрацију. Можете се пријавити са вашим именом и лозинком.", diff --git a/public/language/sr/error.json b/public/language/sr/error.json index 82f51737bf..debccd4493 100644 --- a/public/language/sr/error.json +++ b/public/language/sr/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Неважећа вредност приликом нумерисања страница, мора бити најмање %1 а највише %2 ", "username-taken": "Корисничко име је заузето", "email-taken": "Адреса е-поште је заузета", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Е-пошта је већ позвана", "email-not-confirmed": "Није вам дозвољено да шаљете поруке док не потврдите вашу е-пошту, кликните овде да то учините.", "email-not-confirmed-chat": "Није вам дозвољено да ћаскате док не потврдите вашу е-пошту, кликните овде да то учините.", "email-not-confirmed-email-sent": "Ваша е-пошта још увек није потврђена, проверите ваше пријемно сандуче. Неће вам бити дозвољено да шаљете поруке или ћаскате док не потврдите е-пошту.", - "no-email-to-confirm": "Форум захтева потврду е-поште, кликните овде да бисте навели е-пошту", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Потврда е-поште није успела, молимо вас да покушате касније.", "confirm-email-already-sent": "Е-порука за потврду је већ послата, молимо вас да сачекате %1 минут(а) да бисте послали други.", "sendmail-not-found": "Програм за слање поште није пронађен, проверите да ли је инсталиран и покренут од стране корисника NodeBB.", diff --git a/public/language/sr/register.json b/public/language/sr/register.json index 1800c17598..49179b18d7 100644 --- a/public/language/sr/register.json +++ b/public/language/sr/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Ваша регистрација је додата у ред одобравања. Добићете е-пошту када администратор прихвати вашу регистрацију.", "registration-queue-average-time": "Наше просечно време за одобравање чланства је %1 сата/и и %2 минут/а.", "registration-queue-auto-approve-time": "Ваше чланство на овом форуму биће у потпуности активирано за %1 сата/и.", - "interstitial.intro": "Захтевамо неке додатне информације пре него што отворимо ваш налог.", - "interstitial.errors-found": "Нисмо могли комплетирати вашу регистрацију:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "Пристајем на прикупљање и обраду мојих личних података на овој веб страници.", "gdpr_agree_email": "Пристајем на примање сажетака и обавештења путем е-поште са ове веб странице.", "gdpr_consent_denied": "Морате дати пристанак овом сајту да прикупља/обрађује ваше информације и да вам шаље е-пошту.", diff --git a/public/language/sr/user.json b/public/language/sr/user.json index 71f4603a92..5b0451d477 100644 --- a/public/language/sr/user.json +++ b/public/language/sr/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Извези отпремљени садржај (.zip)", "consent.export-uploads-success": "Извоз отпремања, добићете обавештење након завршетка.", "consent.export_posts": "Извези поруке (.csv)", - "consent.export-posts-success": "Извоз порука, добићете обавештење након завршетка." + "consent.export-posts-success": "Извоз порука, добићете обавештење након завршетка.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/sv/admin/settings/email.json b/public/language/sv/admin/settings/email.json index 8f11cd9449..206cd068d8 100644 --- a/public/language/sv/admin/settings/email.json +++ b/public/language/sv/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Avaktivera epostsammandrag", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/sv/email.json b/public/language/sv/email.json index 9bf3c5b1df..efc265c103 100644 --- a/public/language/sv/email.json +++ b/public/language/sv/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Hej", "greeting_with_name": "Hej %1", "email.verify-your-email.subject": "Vänligen bekräfta din e-postadress", - "email.verify.text1": "Din e-postadress har ändrats!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Tack för att du registerar dig på %1!", "welcome.text2": "För att slutföra aktiveringen av ditt konto, behöver vi verifiera att du har tillgång till den e-postadress du registrerade dig med.", "welcome.text3": "En administrator har accepterat din registreringsansökan. Du kan logga in med ditt användarnamn och lösenord nu.", diff --git a/public/language/sv/error.json b/public/language/sv/error.json index 4f5b793338..75dfd7b885 100644 --- a/public/language/sv/error.json +++ b/public/language/sv/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Ogiltigt värde för siduppdelning. Värdet måste vara mellan %1 och %2", "username-taken": "Användarnamn upptaget", "email-taken": "Epostadress upptagen", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "Du kan inte posta förrän din epost är bekräftad. Vänligen klicka här för att bekräfta din epost.", "email-not-confirmed-chat": "Du kan ej använda chatten förrän din epostadress har blivit bekräftad, var god klicka här för att bekräfta din epostadress.", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "Detta forum kräver bekräftning av epostadresser, var god klicka här för att fylla i en epostadress", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Vi kunde ej bekräfta din epostadress, var god försök igen senare.", "confirm-email-already-sent": "Bekräftningsbrev redan skickat, var god vänta %1 minut(er) innan du skickar ett nytt.", "sendmail-not-found": "Kunde inte hitta Sendmail, vänligen se till att den är installerad och får köras av den användare som kör NodeBB.", diff --git a/public/language/sv/register.json b/public/language/sv/register.json index cb29b2a3d1..fed8bd2618 100644 --- a/public/language/sv/register.json +++ b/public/language/sv/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Din registrering har lagts till i kön. Du kommer att få ett mail när den accepteras av en administratör.", "registration-queue-average-time": "Snittiden för att godkänna medlemskap är %1 timmar %2 minuter.", "registration-queue-auto-approve-time": "Ditt medlemskap på forumet kommer godkännas om upp till %1 timmar.", - "interstitial.intro": "Vi behöver ytterligare information innan vi kan skapa ditt konto.", - "interstitial.errors-found": "Vi kunde inte slutföra din registrering:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "Jag ger detta forum mitt medgivande att samla in och behandla min personliga information.", "gdpr_agree_email": "Jag går med på att få sammanfattningar och notiser från detta forum via e-post.", "gdpr_consent_denied": "Du måste ge ditt medgivande för att detta forum ska kunna samla in och behandla din information, samt skicka dig e-post.", diff --git a/public/language/sv/user.json b/public/language/sv/user.json index 42637827f3..d547512c71 100644 --- a/public/language/sv/user.json +++ b/public/language/sv/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Exportera uppladdat innehåll (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Exportera poster (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/th/admin/settings/email.json b/public/language/th/admin/settings/email.json index 839fd2b6f6..9bdbde26a6 100644 --- a/public/language/th/admin/settings/email.json +++ b/public/language/th/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/th/email.json b/public/language/th/email.json index 3fcad0b058..677f65b12e 100644 --- a/public/language/th/email.json +++ b/public/language/th/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "สวัสดี", "greeting_with_name": "สวัสดี %1", "email.verify-your-email.subject": "Please verify your email", - "email.verify.text1": "Your email address has changed!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "ขอบคุณที่ลงทะเบียนกับ %1", "welcome.text2": "เพื่อให้การบัญชีของคุณใช้งานได้อย่างเสร็จสมบูรณ์ เราจำเป็นต้องยืนยันว่าคุณเป็นเจ้าของที่แท้จริงของอีเมล์ที่ใช้สมัครสมาชิก", "welcome.text3": "ผู้ดูแลระบบได้ทำการยอมรับการสมัครสมาชิกของคุณแล้ว คุณสามารถเข้าสู่ระบบด้วย ชื่อผู้ใช้/รหัสผ่าน ได้แล้วตอนนี้", diff --git a/public/language/th/error.json b/public/language/th/error.json index 2d697ea2e3..762c59db2f 100644 --- a/public/language/th/error.json +++ b/public/language/th/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "หมายเลขหน้าไม่ถูกต้อง จำเป็นต้องเป็นตัวเลขอย่างน้อย %1 และอย่างมาก %2", "username-taken": "ชื่อผู้ใช้นี้มีการใช้แล้ว", "email-taken": "อีเมลนี้มีการใช้แล้ว", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.", "email-not-confirmed-chat": "คุณไม่สามารถแชทได้จนกว่าอีเมล์ของคุณจะได้รับการยืนยัน กรุณาคลิกที่นี่เพื่อยืนยันอีกมเมล์ของคุณ", "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.", - "no-email-to-confirm": "Forum นี้ต้องการการยืนยันอีเมล กรุณากดที่นี่เพื่อระบุอีเมล", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "เราไม่สามารถยืนยันอีเมลของคุณ ณ ขณะนี้ กรุณาลองใหม่อีกครั้งภายหลัง", "confirm-email-already-sent": "อีเมล์ยืนยันตัวตนถูกส่งไปยังคุณเรียบร้อยแล้ว กรุณารอ %1 นาที(s) ก่อนการตัดสินใจส่งอีกครั้ง", "sendmail-not-found": "ไม่พบการประมวลผลสำหรับการส่งอีเมล์ กรุณาตรวจสอบให้แน่ใจว่าได้มีการติดตั้งโปรแกรมการประมวลผลแล้วโดยผู้ใช้ที่กำลังใช้ NodeBB", diff --git a/public/language/th/register.json b/public/language/th/register.json index 22a64684e8..ab6b9d4cc3 100644 --- a/public/language/th/register.json +++ b/public/language/th/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "การสมัครใช้งานของถูกเพิ่มเข้าไปยังระบบเพิ่อรอการอนุมัติแล้ว คุณจะได้รับอีเมล์เมื่อการสมัครใช้งานของคุณถูกยอมรับโดยผู้ดูแลระบบหรือแอดมิน", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "เราต้องการข้อมูลบางอย่างเพิ่มเติมก่อนที่เราจะสร้างบัญชีให้คุณ", - "interstitial.errors-found": "เราไม่สามารถทำให้การสมัครสมาชิกของคุณสำเร็จได้:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "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.", diff --git a/public/language/th/user.json b/public/language/th/user.json index 01b1ed2340..633ed54f06 100644 --- a/public/language/th/user.json +++ b/public/language/th/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Export Uploaded Content (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Export Posts (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/tr/admin/settings/email.json b/public/language/tr/admin/settings/email.json index 73e7f67d21..073c41320e 100644 --- a/public/language/tr/admin/settings/email.json +++ b/public/language/tr/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Özet e-postalarını kapat", "subscriptions.hour": "Digest Hour", "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent ", - "notifications.settings": "E-posta bildirim seçenekleri", - "notifications.remove-images": "Görselleri e-posta bildirimlerinden kaldır" + "notifications.remove-images": "Görselleri e-posta bildirimlerinden kaldır", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/tr/email.json b/public/language/tr/email.json index eb67da9dd2..d91faa6217 100644 --- a/public/language/tr/email.json +++ b/public/language/tr/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Merhaba", "greeting_with_name": "Merhaba %1", "email.verify-your-email.subject": "Lütfen e-posta adresinizi doğrulayın", - "email.verify.text1": "E-posta adresiniz değişti!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Kaydolduğunuz için teşekkürler!", "welcome.text2": "Hesabınızı aktif hale getirmek için, kaydolduğunuz e-posta adresinin size ait olduğunu onaylamamız gerekiyor.", "welcome.text3": "Yönetici kayıt olma isteğinizi kabul etti. Kullanıcı adı/şifre ile giriş yapabilirsiniz.", diff --git a/public/language/tr/error.json b/public/language/tr/error.json index 9bb81f086e..577345d838 100644 --- a/public/language/tr/error.json +++ b/public/language/tr/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Geçersiz sayfa numarası girdiniz, en az %1 ve en fazla %2 olabilir", "username-taken": "Kullanıcı İsmi Alınmış", "email-taken": "E-posta Alınmış", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "E-posta halihazırda davet edilmiş", "email-not-confirmed": "E-posta adresiniz onaylanmadan ileti gönderemezsiniz, onay e-postası için buraya tıklayınız!", "email-not-confirmed-chat": "E-postanız onaylanana kadar sohbet edemezsiniz, onaylamak için lütfen buraya tıklayın.", "email-not-confirmed-email-sent": "E-posta adresiniz henüz onaylanmamış, lütfen onay e-postası için gelen kutunuzu kontrol ediniz. E-posta adresinizi onaylayana kadar foruma ileti gönderemeyeceksiniz veya sohbet edemeyeceksiniz!", - "no-email-to-confirm": "Bu forum e-posta doğrulaması gerektiriyor, lütfen buraya bir e-posta adresi girin", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "E-posta adresinizi doğrulayamıyoruz. Lütfen daha sonra tekrar deneyin.", "confirm-email-already-sent": "E-posta onayı zaten gönderilmiş, yeni bir onay göndermek için lütfen %1 dakika bekleyin.", "sendmail-not-found": "Sendmail yürütülemedi, lüften indirildiğinden ve NodeBB kullanıcısı tarafından uygulanabilir olduğundan emin olun.", diff --git a/public/language/tr/register.json b/public/language/tr/register.json index 9d994ac68c..242ac0af82 100644 --- a/public/language/tr/register.json +++ b/public/language/tr/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Kayıt olma isteğiniz kabul listesine eklenmiştir. Yönetici tarafından kabul edildiğinizde e-posta alacaksınız.", "registration-queue-average-time": "Üyelik onayı için bekleyeceğiniz ortalama süre: %1 saat %2 dakika.", "registration-queue-auto-approve-time": "Forum üyeliğiniz %1 saat içerisinde tamamen aktifleştirilecektir. ", - "interstitial.intro": "Hesabınızı yaratmadan önce bazı ekstra bilgiler gerekiyor.", - "interstitial.errors-found": "Kaydınız tamamlanamadı:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "Bu web sitesinde kişisel bilgilerimin toplanmasını ve işlenmesini kabul ediyorum.", "gdpr_agree_email": "Bu web sitesinden özet ve bildirim e-postası almaya izin veriyorum.", "gdpr_consent_denied": "Bilgilerinizi toplamak/işlemek ve size e-posta göndermek için bu siteye onay vermelisiniz.", diff --git a/public/language/tr/user.json b/public/language/tr/user.json index 560f04b006..1639e983c9 100644 --- a/public/language/tr/user.json +++ b/public/language/tr/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Karşıya Yüklenmiş İçeriği Dışarı Aktar (.zip)", "consent.export-uploads-success": "Yüklemeler aktarılmak üzere hazırlanıyor, işlem tamamlandığında bildirim alacaksınız!", "consent.export_posts": "Gönderileri Dışa Aktar (.csv)", - "consent.export-posts-success": "İletiler aktarılmak üzere hazırlanıyor, işlem tamamlandığında bildirim alacaksınız!" + "consent.export-posts-success": "İletiler aktarılmak üzere hazırlanıyor, işlem tamamlandığında bildirim alacaksınız!", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/uk/admin/settings/email.json b/public/language/uk/admin/settings/email.json index e8171e17e0..2f453ca312 100644 --- a/public/language/uk/admin/settings/email.json +++ b/public/language/uk/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Disable email digests", "subscriptions.hour": "Година дайджесту", "subscriptions.hour-help": "Вкажіть, будь ласка, годину о котрій кожного дня буде надсилатися дайджест (наприклад 0 — це північ, а 17 — п'ята година вечора). Зверніть увагу, що година визначається згідно налаштувань сервера і може не співпадати з часом вашого комп'ютера.
Приблизний час сервера:
Наступний дайджест заплановано до відправки ", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/uk/email.json b/public/language/uk/email.json index 6ff124ed95..82e8c756af 100644 --- a/public/language/uk/email.json +++ b/public/language/uk/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Привіт", "greeting_with_name": "Привіт %1", "email.verify-your-email.subject": "Будь-ласка перевірте вашу електронну адресу", - "email.verify.text1": "Ваша електронна адреса змінилась!", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Дякуємо за реєстрацію з %1!", "welcome.text2": "Щоб повністю активувати ваш акаунт, нам потрібно перевірити, що вам належить електронна адреса, яку ви вказали при реєстрації ", "welcome.text3": "Адміністратор схвалив ваш запит на реєстрацію. Ви можете залогінитись, використовуючи свій пароль та назву акаунту", diff --git a/public/language/uk/error.json b/public/language/uk/error.json index bea0643a51..c01fe2b9b8 100644 --- a/public/language/uk/error.json +++ b/public/language/uk/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Невірне значення сторінки, має бути щонайменше %1 та щонайбільше %2", "username-taken": "Це ім'я зайняте", "email-taken": "Ця електронна пошта зайнята", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "Ви не зможете постити до підтвердження вашої електронної адреси, будь-ласка натисніть тут щоб підтвердити свій емейл.", "email-not-confirmed-chat": "Ви не можете користуватися чатом поки ваша електронна пошта не буде підтверджена, натисніть тут, щоб це зробити.", "email-not-confirmed-email-sent": "Ваша електронна адреса ще не була підтверджена, будь-ласка перевірте свою поштову скриньку. Ви не зможете постити або чатитись до того як ваш емейл підтверджено.", - "no-email-to-confirm": "Цей форум вимагає підтвердження електронної пошти, будь-ласка, натисніть тут, щоб його ввести.", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Ми не можемо підтвердити вашу електронну пошту, будь ласка, спробуйте пізніше.", "confirm-email-already-sent": "Підтвердження по електронній пошті вже було надіслано, зачекайте, будь ласка, %1 хвилин(и), щоб відправити ще одне. ", "sendmail-not-found": "Виконуваний файл sendmail не знайдено, переконайтесь, будь ласка, що його встановлено та що він виконується власником процесу NodeBB.", diff --git a/public/language/uk/register.json b/public/language/uk/register.json index 38edb14e52..600fd448a9 100644 --- a/public/language/uk/register.json +++ b/public/language/uk/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Ваша реєстрація була додана в чергу затвердження. Ви отримаєте листа на електронну пошту, коли адміністратор її підтвердить.", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "Нам потрібна додаткова інформація, перш ніж ми створимо ваш обліковий запис.", - "interstitial.errors-found": "Нам не вдалося вас зареєструвати:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "Я надаю згоду на збір та обробку моїх особистих даних на цьому веб-сайті.", "gdpr_agree_email": "Я надаю згоду на отримання дайджесту та поштових повідомлень з цього веб-сайту.", "gdpr_consent_denied": "Ви мусите надати цьому веб-сайту свою згоду на збір/обробку ваших даних та на отримання поштових повідомлень.", diff --git a/public/language/uk/user.json b/public/language/uk/user.json index da9ed17871..e9d34ca359 100644 --- a/public/language/uk/user.json +++ b/public/language/uk/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Експортувати Завантажений Контент (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "Експортувати Пости (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/vi/admin/settings/email.json b/public/language/vi/admin/settings/email.json index 0eacc7e5e3..3806586311 100644 --- a/public/language/vi/admin/settings/email.json +++ b/public/language/vi/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "Tắt thông báo email", "subscriptions.hour": "Giờ Thông Báo", "subscriptions.hour-help": "Vui lòng nhập một số đại diện cho giờ để gửi thông báo email đã lên lịch (VD: 0 cho nửa đêm, 17 cho 5h chiều). Hãy nhớ rằng đây là giờ theo chính máy chủ và có thể không khớp chính xác với đồng hồ hệ thống của bạn.
Thời gian máy chủ gần đúng là:
Thông báo hàng ngày kế tiếp được lên lịch để gửi ", - "notifications.settings": "Cài dặt thông báo email", - "notifications.remove-images": "Xóa hình ảnh khỏi thông báo email" + "notifications.remove-images": "Xóa hình ảnh khỏi thông báo email", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/vi/email.json b/public/language/vi/email.json index a2131084cb..dfc0f947d0 100644 --- a/public/language/vi/email.json +++ b/public/language/vi/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "Xin chào", "greeting_with_name": "Xin chào %1", "email.verify-your-email.subject": "Vui lòng xác thực tài khoản của bạn", - "email.verify.text1": "Địa chỉ email của bạn đã được thay đổi !", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "Cảm ơn bạn đã đăng ký tại %1!", "welcome.text2": "Để kích hoạt đầy đủ tính năng của tài khoản, chúng tôi cần xác nhận địa chỉ email mà bạn đã đăng ký.", "welcome.text3": "Quản trị viên đã chấp nhận đơn đăng ký của bạn. Bạn có thể đăng nhập với tên đăng nhập/mật khẩu ngay bây giờ.", diff --git a/public/language/vi/error.json b/public/language/vi/error.json index fd1c2a65f7..e851754916 100644 --- a/public/language/vi/error.json +++ b/public/language/vi/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "Giá trị trang không hợp lệ, tối thiểu phải là %1 và tối đa là %2", "username-taken": "Tên đăng nhập đã tồn tại", "email-taken": "Email đã được đăng kí", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email đã được mời", "email-not-confirmed": "Bạn không thể đăng bài cho đến khi email của bạn được xác nhận, vui lòng nhấp vào đây để xác nhận email của bạn.", "email-not-confirmed-chat": "Bạn không thể trò chuyện cho đến khi email của bạn được xác nhận, vui lòng nhấp vào đây để xác nhận email của bạn.", "email-not-confirmed-email-sent": "Email của bạn vẫn chưa được xác nhận, vui lòng kiểm tra hộp thư đến của bạn. Bạn sẽ không thể đăng hoặc trò chuyện cho đến khi email được xác nhận.", - "no-email-to-confirm": "Diễn đàn này yêu cầu xác nhận email, vui lòng nhấn vào đây để nhập email.", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "Chúng tôi không thể xác nhận email của bạn, vui lòng thử lại sau.", "confirm-email-already-sent": "Email xác nhận đã được gửi, vui lòng chờ %1 phút để yêu cầu gửi lại.", "sendmail-not-found": "Không tìm thấy lệnh thực thi \"sendmail\", hãy chắc chắn nó đã được cài đặt và thực thi bởi người quản trị đang vận hành NodeBB", diff --git a/public/language/vi/register.json b/public/language/vi/register.json index e024ed4ffc..06723bf7de 100644 --- a/public/language/vi/register.json +++ b/public/language/vi/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "Đăng ký của bạn đã được thêm vào hàng đợi phê duyệt. Bạn sẽ nhận được email khi quản trị viên chấp nhận yêu cầu.", "registration-queue-average-time": "Thời gian chúng tôi phê duyệt tư cách thành viên là %1 giờ %2 phút.", "registration-queue-auto-approve-time": "Tư cách thành viên của bạn sẽ được kích hoạt đầy đủ trong tối đa %1 giờ.", - "interstitial.intro": "Yêu cầu một số thông tin bổ sung trước khi chúng tôi tạo tài khoản của bạn.", - "interstitial.errors-found": "Chúng tôi không thể hoàn thành đăng ký của bạn:", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "Tôi đồng ý với việc thu thập và xử lý thông tin cá nhân của tôi trên trang web này.", "gdpr_agree_email": "Tôi đồng ý nhận email thông báo và thông báo từ trang web này.", "gdpr_consent_denied": "Bạn phải đồng ý với trang web này để thu thập/xử lý thông tin của bạn và gửi email cho bạn.", diff --git a/public/language/vi/user.json b/public/language/vi/user.json index 6281e6f05c..e6e1e728f2 100644 --- a/public/language/vi/user.json +++ b/public/language/vi/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "Xuất nội dung đã tải lên (.zip)", "consent.export-uploads-success": "Đang xuất tải lên, bạn sẽ nhận được thông báo khi hoàn tất.", "consent.export_posts": "Xuất bài viết (.csv)", - "consent.export-posts-success": "Đang xuất bài viết, bạn sẽ nhận được thông báo khi hoàn tất." + "consent.export-posts-success": "Đang xuất bài viết, bạn sẽ nhận được thông báo khi hoàn tất.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/zh-CN/admin/settings/email.json b/public/language/zh-CN/admin/settings/email.json index 64b034879c..ba294937fa 100644 --- a/public/language/zh-CN/admin/settings/email.json +++ b/public/language/zh-CN/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "禁用电子邮件摘要", "subscriptions.hour": "摘要小时", "subscriptions.hour-help": "请输入一个代表小时的数字来发送计划的电子邮件摘要 (例如，对于午夜，0，对于下午5:00，17)。 请记住，这是根据服务器本身的时间，可能与您的系统时钟不完全匹配。
服务器的大致时间为：
下一个每日摘要被计划在发送", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/zh-CN/email.json b/public/language/zh-CN/email.json index bbb6d0e19a..2d8e3f4228 100644 --- a/public/language/zh-CN/email.json +++ b/public/language/zh-CN/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "您好", "greeting_with_name": "%1，您好", "email.verify-your-email.subject": "请验证你的电子邮箱", - "email.verify.text1": "你的电子邮箱地址已成功更改！", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "感谢您注册 %1 帐户！", "welcome.text2": "在您验证您绑定的邮箱地址之后，您的账户才能激活。", "welcome.text3": "管理员批准了您的注册申请，现在您可以登录您的账户了。", diff --git a/public/language/zh-CN/error.json b/public/language/zh-CN/error.json index 03cc0b3aa8..68fbcbfc85 100644 --- a/public/language/zh-CN/error.json +++ b/public/language/zh-CN/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "无效的分页数值，必须介于 %1 和 %2 之间", "username-taken": "此用户名已被占用", "email-taken": "此电子邮箱已被占用", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "已通过电子邮件进行邀请", "email-not-confirmed": "在您的电子邮件账户被确认前，您不能发帖。", "email-not-confirmed-chat": "您的电子邮箱尚未确认，无法聊天，请点击这里确认您的电子邮箱。", "email-not-confirmed-email-sent": "您的电子邮件账户尚未确认，请检查您的收件箱。在电子邮件帐户被确认前您不能发帖和聊天。", - "no-email-to-confirm": "本论坛需要电子邮箱确认，请点击这里输入电子邮箱地址", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "我们无法确认您的电子邮箱，请重试", "confirm-email-already-sent": "确认邮件已发出，如需重新发送请等待 %1 分钟后再试。", "sendmail-not-found": "无法找到 sendmail 可执行程序，请确保 sendmail 已经安装并可被运行 NodeBB 的用户执行", diff --git a/public/language/zh-CN/register.json b/public/language/zh-CN/register.json index df5f627a9c..e9088d0918 100644 --- a/public/language/zh-CN/register.json +++ b/public/language/zh-CN/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "您的注册正在等待批准。一旦通过，管理员会发送邮件通知您。", "registration-queue-average-time": "我们通常的注册批准时间为 %1 小时 %2 分钟。", "registration-queue-auto-approve-time": "您在此论坛的帐号将会在最迟 %1  小时后被完全激活。", - "interstitial.intro": "在创建您的账户前我们需要一些额外信息。", - "interstitial.errors-found": "我们无法完成您的注册：", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "我同意此网站对我个人信息的收集与处理。", "gdpr_agree_email": "我同意此网站向我发送摘要和通知邮件。", "gdpr_consent_denied": "您需要同意此网站收集与处理您的个人信息，以及向您发送电子邮件。", diff --git a/public/language/zh-CN/user.json b/public/language/zh-CN/user.json index 01df3bc8b7..a1267edfa6 100644 --- a/public/language/zh-CN/user.json +++ b/public/language/zh-CN/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "导出上传文件 (.zip)", "consent.export-uploads-success": "上传导出完成后，您将会收到一条通知。", "consent.export_posts": "导出帖子 (.csv)", - "consent.export-posts-success": "帖子导出完成后，您将会收到一条通知。" + "consent.export-posts-success": "帖子导出完成后，您将会收到一条通知。", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/zh-TW/admin/settings/email.json b/public/language/zh-TW/admin/settings/email.json index 987aef7c09..0939908f2e 100644 --- a/public/language/zh-TW/admin/settings/email.json +++ b/public/language/zh-TW/admin/settings/email.json @@ -36,6 +36,7 @@ "subscriptions.disable": "禁用電子郵件摘要", "subscriptions.hour": "摘要小時", "subscriptions.hour-help": "請輸入一個代表小時的數字來發送排程的電子郵件摘要 (例如，對於午夜，0，對於下午5:00，17)。 請記住，這是根據伺服器本身的時間，可能與您的系統時鐘不完全符合。
伺服器的大致時間為：
下一個每日摘要被排程在發送", - "notifications.settings": "Email notification settings", - "notifications.remove-images": "Remove images from email notifications" + "notifications.remove-images": "Remove images from email notifications", + "include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails", + "include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). Enable this setting at your own risk – sending emails to unverified addresses may be a violation of regional anti-spam laws." } \ No newline at end of file diff --git a/public/language/zh-TW/email.json b/public/language/zh-TW/email.json index c1f4504906..971cb7a6b7 100644 --- a/public/language/zh-TW/email.json +++ b/public/language/zh-TW/email.json @@ -6,7 +6,9 @@ "greeting_no_name": "您好", "greeting_with_name": "%1，您好", "email.verify-your-email.subject": "請驗證你的電子信箱", - "email.verify.text1": "你的電子信箱地址已成功更改！", + "email.verify.text1": "You've requested that we change or confirm your email address", + "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", + "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", "welcome.text1": "感謝您註冊 %1 帳戶！", "welcome.text2": "在您驗證您綁定的郵件地址之後，您的帳戶才能啟用。", "welcome.text3": "管理員批准了您的註冊申請，現在您可以登入您的帳戶了。", diff --git a/public/language/zh-TW/error.json b/public/language/zh-TW/error.json index a09f34ccdd..f564f26bfe 100644 --- a/public/language/zh-TW/error.json +++ b/public/language/zh-TW/error.json @@ -28,11 +28,12 @@ "invalid-pagination-value": "無效的分頁數，必須介於 %1 和 %2 之間", "username-taken": "此使用者名已被使用", "email-taken": "此電子信箱已被使用", + "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", "email-not-confirmed": "在您的電子信箱被確認前，您不能貼文。", "email-not-confirmed-chat": "您的電子信箱尚未確認，無法聊天，請點擊這裡確認您的電子信箱。", "email-not-confirmed-email-sent": "您的電子信箱尚未確認，請檢查您的收件匣。在電子信箱被確認前您不能貼文和聊天。", - "no-email-to-confirm": "本論壇需要電子信箱確認，請點擊這裡輸入電子信箱地址", + "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.", "email-confirm-failed": "我們無法確認您的電子信箱，請重試", "confirm-email-already-sent": "確認郵件已發出，如需重新發送請等待 %1 分鐘後再試。", "sendmail-not-found": "無法找到 sendmail 可執行檔，請確保 sendmail 已經安裝並可被運行 NodeBB 的系統帳戶執行", diff --git a/public/language/zh-TW/register.json b/public/language/zh-TW/register.json index ad537a7af0..9258b76735 100644 --- a/public/language/zh-TW/register.json +++ b/public/language/zh-TW/register.json @@ -20,8 +20,9 @@ "registration-added-to-queue": "您的註冊正在等待批准。一旦通過，管理員會發送郵件通知您。", "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.", "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.", - "interstitial.intro": "在建立您的帳戶前我們需要一些額外資訊。", - "interstitial.errors-found": "我們無法完成您的註冊：", + "interstitial.intro": "We'd like some additional information in order to update your account…", + "interstitial.intro-new": "We'd like some additional information before we can create your account…", + "interstitial.errors-found": "Please review the entered information:", "gdpr_agree_data": "我同意此網站對我個人資料的收集與處理。", "gdpr_agree_email": "我同意此網站向我發送摘要和通知郵件。", "gdpr_consent_denied": "您需要同意此網站收集與處理您的個人資料，以及向您發送電子郵件。", diff --git a/public/language/zh-TW/user.json b/public/language/zh-TW/user.json index 0630700b9a..6ac903144a 100644 --- a/public/language/zh-TW/user.json +++ b/public/language/zh-TW/user.json @@ -180,5 +180,8 @@ "consent.export_uploads": "導出上傳檔案 (.zip)", "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", "consent.export_posts": "導出貼文 (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete." + "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", + "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", + "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.", + "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file