diff --git a/include/language.h b/include/language.h index 402db17a4..f85a33e24 100644 --- a/include/language.h +++ b/include/language.h @@ -134,7 +134,6 @@ namespace Language #define NICK_CANNOT_BE_REGISTERED _("Nickname \002%s\002 may not be registered.") #define NICK_ALREADY_REGISTERED _("Nickname \002%s\002 is already registered!") #define NICK_SET_DISPLAY_CHANGED _("The new display is now \002%s\002.") -#define NICK_CONFIRM_INVALID _("Invalid passcode has been entered, please check the email again, and retry.") #define CHAN_NOT_ALLOWED_TO_JOIN _("You are not permitted to be on this channel.") #define CHAN_X_INVALID _("Channel %s is not a valid channel.") #define CHAN_REACHED_CHANNEL_LIMIT _("Sorry, you have already reached your limit of \002%d\002 channels.") diff --git a/language/anope.en_US.po b/language/anope.en_US.po index 0825b9f79..0d3736fb7 100644 --- a/language/anope.en_US.po +++ b/language/anope.en_US.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Anope\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-06-16 10:00+0100\n" -"PO-Revision-Date: 2025-06-16 10:00+0100\n" +"POT-Creation-Date: 2025-06-16 12:30+0100\n" +"PO-Revision-Date: 2025-06-16 12:30+0100\n" "Last-Translator: Sadie Powell \n" "Language-Team: English\n" "Language: en_US\n" @@ -2243,7 +2243,7 @@ msgid "Confirms an account registration. You have %s after registration to do th msgstr "" #, c-format -msgid "Confirms an change of email address. You have %s after requesting an email change to do this before your request expires." +msgid "Confirms an change of email address. You have %s after requesting an email address change to do this before your request expires." msgstr "" msgid "Control modes and mode locks on a channel" @@ -3074,9 +3074,6 @@ msgstr "" msgid "Invalid limit %s, using %d." msgstr "" -msgid "Invalid passcode has been entered, please check the email again, and retry." -msgstr "" - #, c-format msgid "Invalid session limit. It must be a valid integer greater than or equal to zero and less than %d." msgstr "" @@ -3518,7 +3515,7 @@ msgstr "" msgid "Masks and unregistered users may not be on access lists." msgstr "" -msgid "Matches and returns all users that registered using given email" +msgid "Matches and returns all users that registered using given email address" msgstr "" #, c-format @@ -4470,10 +4467,10 @@ msgstr "" msgid "Sender" msgstr "" -msgid "Sends a memo and requests a read receipt" +msgid "Sends a confirmation code to the nickname's email address with instructions on how to reset their password. email must be the email address associated with the account." msgstr "" -msgid "Sends a passcode to the nickname with instructions on how to reset their password. Email must be the email address associated to the nickname." +msgid "Sends a memo and requests a read receipt" msgstr "" msgid "Sends all registered users a memo containing memo-text." @@ -5179,7 +5176,7 @@ msgid "" " Will remove all entries that were added within the last 30 minutes." msgstr "" -msgid "The email parameter is optional and will set the email for your nick immediately. You may also wish to SETHIDE it after registering if it isn't the default setting already." +msgid "The email parameter is optional and will set the email address for your nick immediately. You may also wish to SETHIDE it after registering if it isn't the default setting already." msgstr "" #, c-format @@ -5993,7 +5990,7 @@ msgstr "" msgid "You cannot unassign bots while persist is set on the channel." msgstr "" -msgid "You cannot unset the email on this network." +msgid "You cannot unset the email address on this network." msgstr "" msgid "You cannot use this command." @@ -6102,10 +6099,10 @@ msgstr "" msgid "You may not (un)lock mode %c." msgstr "" -msgid "You may not change the email of an unconfirmed account." +msgid "You may not change the email address of an unconfirmed account." msgstr "" -msgid "You may not change the email of other Services Operators." +msgid "You may not change the email address of other Services Operators." msgstr "" msgid "You may not change the password of other Services Operators." @@ -6155,7 +6152,7 @@ msgid "You must have the %s(ME) privilege on the channel to use this command." msgstr "" #, c-format -msgid "You must now supply an email for your nick. This email will allow you to retrieve your password in case you forget it. Type %semail in order to set your email." +msgid "You must now supply an email address for your nick. This email address will allow you to recover your account in case you forget your password. Type %semail in order to set your email address." msgstr "" #, c-format @@ -6247,17 +6244,21 @@ msgstr "" msgid "Your account will expire, if not confirmed, in %s." msgstr "" +#, c-format +msgid "Your confirmation code has been re-sent to %s." +msgstr "" + +#, c-format +msgid "Your email address has been updated to %s" +msgstr "" + +#, c-format +msgid "Your email address has been updated to %s." +msgstr "" + msgid "Your email address is not allowed, choose a different one." msgstr "" -#, c-format -msgid "Your email has been updated to %s" -msgstr "" - -#, c-format -msgid "Your email has been updated to %s." -msgstr "" - msgid "Your memo limit has been disabled." msgstr "" @@ -6304,10 +6305,6 @@ msgstr "" msgid "Your oper block doesn't require logging in." msgstr "" -#, c-format -msgid "Your passcode has been re-sent to %s." -msgstr "" - #, c-format msgid "Your password is too long. It must be shorter than %u characters." msgstr "" diff --git a/modules/database/db_atheme.cpp b/modules/database/db_atheme.cpp index 971a45068..50ceb83c7 100644 --- a/modules/database/db_atheme.cpp +++ b/modules/database/db_atheme.cpp @@ -512,7 +512,7 @@ private: if (!forbid_service) { - Log(this) << "Unable to convert forbidden email " << email << " as os_forbid is not loaded"; + Log(this) << "Unable to convert forbidden email address " << email << " as os_forbid is not loaded"; return true; } diff --git a/modules/ldap_authentication.cpp b/modules/ldap_authentication.cpp index f0e37506b..4f127c00a 100644 --- a/modules/ldap_authentication.cpp +++ b/modules/ldap_authentication.cpp @@ -161,7 +161,7 @@ public: u->Account()->email = email; BotInfo *NickServ = Config->GetClient("NickServ"); if (NickServ) - u->SendMessage(NickServ, _("Your email has been updated to \002%s\002"), email.c_str()); + u->SendMessage(NickServ, _("Your email address has been updated to \002%s\002"), email.c_str()); Log(this->owner) << "Updated email address for " << u->nick << " (" << u->Account()->display << ") to " << email; } } diff --git a/modules/nickserv/nickserv.cpp b/modules/nickserv/nickserv.cpp index ea45ac97a..6e83ab4dd 100644 --- a/modules/nickserv/nickserv.cpp +++ b/modules/nickserv/nickserv.cpp @@ -401,10 +401,9 @@ public: if (block.Get("forceemail", "yes") && u->Account()->email.empty()) { u->SendMessage(NickServ, _( - "You must now supply an email for your nick. " - "This email will allow you to retrieve your password in " - "case you forget it. " - "Type \002%s\032\037email\037\002 in order to set your email." + "You must now supply an email address for your nick. This email address will " + "allow you to recover your account in case you forget your password. Type " + "\002%s\032\037email\037\002 in order to set your email address." ), NickServ->GetQueryCommand("nickserv/set/email").c_str()); } diff --git a/modules/nickserv/ns_email.cpp b/modules/nickserv/ns_email.cpp index c7a662484..4c6f9aca4 100644 --- a/modules/nickserv/ns_email.cpp +++ b/modules/nickserv/ns_email.cpp @@ -163,7 +163,7 @@ public: nc->email = nse->email; ns_set_email.Unset(nc); - Log(nc == source.GetAccount() ? LOG_COMMAND : LOG_ADMIN, source, this) << "to confirm the email change of " + Log(nc == source.GetAccount() ? LOG_COMMAND : LOG_ADMIN, source, this) << "to confirm the email address change of " << nc->display << " from " << old_email << " to " << nc->email; source.Reply(_("The email address of %s has been changed from \002%s\002 to \002%s\002."), @@ -178,7 +178,7 @@ public: source.Reply(" "); source.Reply(_( "Confirms an change of email address. You have %s after requesting an email " - "change to do this before your request expires." + "address change to do this before your request expires." ), Anope::Duration(changeexpire, source.GetAccount()).c_str()); @@ -202,7 +202,7 @@ public: CommandNSGetEmail(Module *creator) : Command(creator, "nickserv/getemail", 1, 1) { - this->SetDesc(_("Matches and returns all users that registered using given email")); + this->SetDesc(_("Matches and returns all users that registered using given email address")); this->SetSyntax(_("\037email\037")); } @@ -292,18 +292,18 @@ public: if (nc->HasExt("UNCONFIRMED")) { - source.Reply(_("You may not change the email of an unconfirmed account.")); + source.Reply(_("You may not change the email address of an unconfirmed account.")); return; } if (param.empty() && Config->GetModule("nickserv").Get("forceemail", "yes")) { - source.Reply(_("You cannot unset the email on this network.")); + source.Reply(_("You cannot unset the email address on this network.")); return; } else if (Config->GetModule("nickserv").Get("secureadmins", "yes") && source.nc != nc && nc->IsServicesOper()) { - source.Reply(_("You may not change the email of other Services Operators.")); + source.Reply(_("You may not change the email address of other Services Operators.")); return; } else if (!param.empty() && !Mail::Validate(param)) @@ -324,7 +324,7 @@ public: { if (SendConfirmMail(source.GetUser(), source.GetAccount(), source.service, param)) { - Log(LOG_COMMAND, source, this) << "to request changing the email of " << nc->display << " to " << param; + Log(LOG_COMMAND, source, this) << "to request changing the email address of " << nc->display << " to " << param; source.Reply(_("A confirmation email has been sent to \002%s\002. Follow the instructions in it to change your email address."), param.c_str()); } } @@ -332,13 +332,13 @@ public: { if (!param.empty()) { - Log(nc == source.GetAccount() ? LOG_COMMAND : LOG_ADMIN, source, this) << "to change the email of " << nc->display << " to " << param; + Log(nc == source.GetAccount() ? LOG_COMMAND : LOG_ADMIN, source, this) << "to change the email address of " << nc->display << " to " << param; nc->email = param; source.Reply(_("Email address for \002%s\002 changed to \002%s\002."), nc->display.c_str(), param.c_str()); } else { - Log(nc == source.GetAccount() ? LOG_COMMAND : LOG_ADMIN, source, this) << "to unset the email of " << nc->display; + Log(nc == source.GetAccount() ? LOG_COMMAND : LOG_ADMIN, source, this) << "to unset the email address of " << nc->display; nc->email.clear(); source.Reply(_("Email address for \002%s\002 unset."), nc->display.c_str()); } diff --git a/modules/nickserv/ns_register.cpp b/modules/nickserv/ns_register.cpp index 51a46b9dc..d528bde89 100644 --- a/modules/nickserv/ns_register.cpp +++ b/modules/nickserv/ns_register.cpp @@ -219,9 +219,9 @@ public: { source.Reply(" "); source.Reply(_( - "The \037email\037 parameter is optional and will set the email " - "for your nick immediately. You may also wish to \002SET\032HIDE\002 it " - "after registering if it isn't the default setting already." + "The \037email\037 parameter is optional and will set the email address for your " + "nick immediately. You may also wish to \002SET\032HIDE\002 it after registering " + "if it isn't the default setting already." )); } @@ -375,11 +375,11 @@ public: else if (SendRegmail(source.GetUser(), na, source.service)) { na->nc->lastmail = Anope::CurTime; - source.Reply(_("Your passcode has been re-sent to %s."), na->nc->email.c_str()); - Log(LOG_COMMAND, source, this) << "to resend registration verification code"; + source.Reply(_("Your confirmation code has been re-sent to %s."), na->nc->email.c_str()); + Log(LOG_COMMAND, source, this) << "to resend registration confirmation code"; } else - Log(this->owner) << "Unable to resend registration verification code for " << source.GetNick(); + Log(this->owner) << "Unable to resend registration confirmation code for " << source.GetNick(); } return; diff --git a/modules/nickserv/ns_resetpass.cpp b/modules/nickserv/ns_resetpass.cpp index 227b7420a..2a4808790 100644 --- a/modules/nickserv/ns_resetpass.cpp +++ b/modules/nickserv/ns_resetpass.cpp @@ -51,9 +51,9 @@ public: this->SendSyntax(source); source.Reply(" "); source.Reply(_( - "Sends a passcode to the nickname with instructions on how to " - "reset their password. Email must be the email address associated " - "to the nickname." + "Sends a confirmation code to the nickname's email address with instructions on " + "how to reset their password. \037email\037 must be the email address associated " + "with the account." )); return true; } diff --git a/modules/sql_authentication.cpp b/modules/sql_authentication.cpp index 341405365..c2cf2e9d0 100644 --- a/modules/sql_authentication.cpp +++ b/modules/sql_authentication.cpp @@ -88,7 +88,7 @@ public: { na->nc->email = email; if (user && NickServ) - user->SendMessage(NickServ, _("Your email has been updated to \002%s\002."), email.c_str()); + user->SendMessage(NickServ, _("Your email address has been updated to \002%s\002."), email.c_str()); } req->Success(me);