From 80b88562545bf43fd43df270c7bcd353f90723b7 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Fri, 20 Jun 2025 18:11:11 +0100 Subject: [PATCH] Consistently use "account" instead of "nick group". --- data/nickserv.example.conf | 6 +- language/anope.en_US.po | 110 ++++++++++++++-------------- modules/hostserv/hs_del.cpp | 8 +- modules/hostserv/hs_group.cpp | 4 +- modules/hostserv/hs_set.cpp | 8 +- modules/nickserv/nickserv.cpp | 8 +- modules/nickserv/ns_drop.cpp | 4 +- modules/nickserv/ns_group.cpp | 56 +++++++------- modules/nickserv/ns_register.cpp | 16 ++-- modules/nickserv/ns_resetpass.cpp | 2 +- modules/nickserv/ns_set.cpp | 12 +-- modules/nickserv/ns_set_protect.cpp | 9 +-- modules/operserv/os_stats.cpp | 2 +- 13 files changed, 122 insertions(+), 123 deletions(-) diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf index 92839c444..776e11d35 100644 --- a/data/nickserv.example.conf +++ b/data/nickserv.example.conf @@ -250,8 +250,8 @@ module maxpasslen = 50 /* - * Whether all of the secondary nicks of a nick group have to expire or be - dropped before the display nick can expire or be dropped. + * Whether all of the secondary nicks of an account have to expire or be + * dropped before the display nick can expire or be dropped. */ preservedisplay = no } @@ -400,7 +400,7 @@ command { service = "NickServ"; name = "SASET EMAIL"; command = "nickserv/saset/ * * Provides the commands nickserv/group, nickserv/glist, and nickserv/ungroup. * - * Used for controlling nick groups. + * Used for controlling grouped nicknames. */ module { diff --git a/language/anope.en_US.po b/language/anope.en_US.po index 50575ec47..10448ef1e 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-20 17:05+0100\n" -"PO-Revision-Date: 2025-06-20 17:05+0100\n" +"POT-Creation-Date: 2025-06-20 20:30+0100\n" +"PO-Revision-Date: 2025-06-20 20:30+0100\n" "Last-Translator: Sadie Powell \n" "Language-Team: English\n" "Language: en_US\n" @@ -1097,8 +1097,8 @@ msgstr[0] "" msgstr[1] "" #, c-format -msgid "%zu nickname in the group." -msgid_plural "%zu nicknames in the group." +msgid "%zu nickname in the account." +msgid_plural "%zu nicknames in the account." msgstr[0] "" msgstr[1] "" @@ -1310,6 +1310,9 @@ msgstr "" msgid "Activates your assigned vhost" msgstr "" +msgid "Add a nick to an account" +msgstr "" + msgid "Add or delete oper information for a given nick or channel. This will show to opers in the respective info command for the nick or channel." msgstr "" @@ -1414,7 +1417,7 @@ msgid "All user modes on %s have been synced." msgstr "" #, c-format -msgid "All vhosts in the group %s have been set to %s." +msgid "All vhosts for the account %s have been set to %s." msgstr "" msgid "Allowed to (de)halfop themself" @@ -1989,10 +1992,10 @@ msgstr "" msgid "Changed usermodes of %s to %s." msgstr "" -msgid "Changes the display used to refer to the nickname group in services. The new display MUST be a nick of the group." +msgid "Changes the display nickname used to refer to the account. The new displaynickname must already be associated with the account." msgstr "" -msgid "Changes the display used to refer to your nickname group in services. The new display MUST be a nick of your group." +msgid "Changes the display nickname used to refer to your account. The new display nickname must already be associated with your account." msgstr "" msgid "Changes the founder of a channel. The new nickname must be a registered one." @@ -2546,10 +2549,10 @@ msgstr "" msgid "Deletes the vhost assigned to the given nick from the database." msgstr "" -msgid "Deletes the vhost for all nicks in a group" +msgid "Deletes the vhost for all nicks in an account" msgstr "" -msgid "Deletes the vhost for all nicks in the same group as that of the given nick." +msgid "Deletes the vhost for all nicks in the same account as that of the given nick." msgstr "" #, c-format @@ -3090,9 +3093,6 @@ msgstr "" msgid "Italics kicker" msgstr "" -msgid "Join a group" -msgstr "" - msgid "Keep modes" msgstr "" @@ -3218,10 +3218,10 @@ msgid "List of entries matching %s:" msgstr "" #, c-format -msgid "List of nicknames in the group of %s:" +msgid "List of nicknames belonging to %s:" msgstr "" -msgid "List of nicknames in your group:" +msgid "List of nicknames belonging to your account:" msgstr "" msgid "List the options" @@ -3253,10 +3253,10 @@ msgid "" "Channels that have the NOEXPIRE option set will be prefixed by an exclamation mark. The nickname parameter is limited to Services Operators." msgstr "" -msgid "Lists all nicknames in your group" +msgid "Lists all nicknames in your account" msgstr "" -msgid "Lists all nicks in your group." +msgid "Lists all nicknames that belong to your account." msgstr "" msgid "Lists all registered channels matching the given pattern" @@ -3752,6 +3752,10 @@ msgstr "" msgid "Nick %s will not expire." msgstr "" +#, c-format +msgid "Nick %s does not belong to your account." +msgstr "" + #, c-format msgid "Nick %s doesn't have a memo from you." msgstr "" @@ -3768,10 +3772,6 @@ msgstr "" msgid "Nick %s is currently suspended." msgstr "" -#, c-format -msgid "Nick %s is not in your group." -msgstr "" - #, c-format msgid "Nick %s is not suspended." msgstr "" @@ -4234,11 +4234,11 @@ msgid "Registered" msgstr "" #, c-format -msgid "Registered channels: %zu entries, %zu buckets, longest chain is %zu" +msgid "Registered accounts: %zu entries, %zu buckets, longest chain is %zu" msgstr "" #, c-format -msgid "Registered nick groups: %zu entries, %zu buckets, longest chain is %zu" +msgid "Registered channels: %zu entries, %zu buckets, longest chain is %zu" msgstr "" #, c-format @@ -4289,7 +4289,7 @@ msgstr "" msgid "Reload services' configuration file" msgstr "" -msgid "Remove a nick from a group" +msgid "Remove a nick from an account" msgstr "" msgid "Remove all bans preventing a user from entering a channel" @@ -4676,7 +4676,7 @@ msgstr "" msgid "Set the channel description" msgstr "" -msgid "Set the display of your group in services" +msgid "Set the display nickname for your account" msgstr "" msgid "Set the founder of a channel" @@ -4691,7 +4691,7 @@ msgstr "" msgid "Set the successor for a channel" msgstr "" -msgid "Set the vhost for all nicks in a group" +msgid "Set the vhost for all nicks in an account" msgstr "" msgid "Set the vhost of another user" @@ -4791,9 +4791,9 @@ msgid "" msgstr "" msgid "" -"Sets the vhost for all nicks in the same group as that of the given nick. If your IRCD supports vidents, then using SETALL @ will set idents for users as well as vhosts.\n" +"Sets the vhost for all nicks in the same account as that of the given nick. If your IRCD supports vidents, then using SETALL @ will set idents for users as well as vhosts.\n" "\n" -"* NOTE, this will not update the vhost for any nicks added to the group after this command was used." +"* NOTE, this will not update the vhost for any nicks added to the account after this command was used." msgstr "" msgid "Sets the vhost for the given nick to that of the given hostmask. If your IRCD supports vidents, then using SET @ set idents for users as well as vhosts." @@ -4984,7 +4984,7 @@ msgstr "" msgid "Syncs all modes set on users on the channel with the modes they should have based on their access." msgstr "" -msgid "Syncs the vhost for all nicks in a group" +msgid "Syncs the vhost for all nicks in an account" msgstr "" msgid "Syntax" @@ -5298,11 +5298,11 @@ msgid "The network name you specified is incorrect. Did you mean to run %s on a msgstr "" #, c-format -msgid "The new display MUST be a nickname of the nickname group %s." +msgid "The new display is now %s." msgstr "" #, c-format -msgid "The new display is now %s." +msgid "The new display nickname must belong to the %s account." msgstr "" #, c-format @@ -5356,7 +5356,7 @@ msgstr "" msgid "There are no forbids of type %s." msgstr "" -msgid "There are too many nicks in your group." +msgid "There are too many nicks in your account." msgstr "" #, c-format @@ -5437,9 +5437,6 @@ msgstr "" msgid "This command allows users to set the vhost of their CURRENT nick to be the vhost for all nicks in the same group." msgstr "" -msgid "This command also creates a new group for your nickname, that will allow you to register other nicks later sharing the same configuration, the same set of memos and the same channel privileges." -msgstr "" - #, c-format msgid "This command is an alias to the command %s." msgstr "" @@ -5457,19 +5454,19 @@ msgid "This command loads the module named modname from the modules directory. msgstr "" msgid "" -"This command makes your nickname join the target nickname's group. password is the password of the target nickname. \n" +"This command makes your nickname join the target nickname's account. password is the password of the target nickname. \n" "\n" -"Joining a group will allow you to share your configuration, memos, and channel privileges with all the nicknames in the group, and much more!\n" +"Joining an account will allow you to share your configuration, memos, and channel privileges with all the nicknames in the account, and much more!\n" "\n" -"A group exists as long as it is useful. This means that even if a nick of the group is dropped, you won't lose the shared things described above, as long as there is at least one nick remaining in the group.\n" +"An account exists as long as it is useful. This means that even if a nick of the account is dropped, you won't lose the shared things described above, as long as there is at least one nick remaining in the account.\n" "\n" "You may be able to use this command even if you have not registered your nick yet. If your nick is already registered, you'll need to identify yourself before using this command. \n" "\n" -"It is recommended to use this command with a non-registered nick because it will be registered automatically when using this command. You may use it with a registered nick (to change your group) only if your network administrators allowed it.\n" +"It is recommended to use this command with a non-registered nick because it will be registered automatically when using this command. You may use it with a registered nick (to change your account) only if your network administrators allowed it.\n" "\n" -"You can only be in one group at a time. Group merging is not possible. \n" +"You can only be in one account at a time. Group merging is not possible. \n" "\n" -"Note: all the nicknames of a group have the same password." +"Note: all the nicknames of an account have the same password." msgstr "" msgid "This command manages your auto join list. When you identify you will automatically join the channels on your auto join list. Services Operators may provide a nick to modify other users' auto join lists." @@ -5496,7 +5493,7 @@ msgstr "" msgid "This command tells you what a users access is on a channel and what access entries, if any, they match. Additionally it will tell you of any auto kick entries they match. Usage of this command is limited to users who have the ability to modify access entries on the channel." msgstr "" -msgid "This command ungroups your nick, or if given, the specified nick, from the group it is in. The ungrouped nick keeps its registration time, password, email, greet, language, and url. Everything else is reset. You may not ungroup yourself if there is only one nick in your group." +msgid "This command ungroups your nick, or if given, the specified nick, from the account it is in. The ungrouped nick keeps its registration time, password, email, greet, language, and url. Everything else is reset. You may not ungroup yourself if there is only one nick in your account." msgstr "" msgid "This command unloads the module named modname." @@ -5604,11 +5601,11 @@ msgid "Turns %s's privacy option on or off for your nick. With PRIVATE set, yo msgstr "" #, c-format -msgid "Turns automatic protection for the nick on or off. With protection on if a user tries to use a nickname from the nick's group they will be given some time to change their nick after which %s will forcibly change their nick." +msgid "Turns automatic protection for the nick on or off. With protection on if a user tries to use a nickname from the nick's account they will be given some time to change their nick after which %s will forcibly change their nick." msgstr "" #, c-format -msgid "Turns automatic protection for your account on or off. With protection on if another user tries to use a nickname from your group they will be given some time to change their nick after which %s will forcibly change their nick." +msgid "Turns automatic protection for your account on or off. With protection on if another user tries to use a nickname from your account they will be given some time to change their nick after which %s will forcibly change their nick." msgstr "" msgid "Turns chanstats channel statistics ON or OFF for this user." @@ -5813,11 +5810,11 @@ msgid "VHost for %s has been rejected." msgstr "" #, c-format -msgid "VHost for group %s set to %s." +msgid "VHost for account %s set to %s." msgstr "" #, c-format -msgid "VHosts for group %s have been removed." +msgid "VHosts for account %s have been removed." msgstr "" msgid "VIEW host" @@ -5864,9 +5861,9 @@ msgid "" msgstr "" msgid "" -"Without a parameter, lists all nicknames that are in your group.\n" +"Without a parameter, lists all nicknames that belong to your account.\n" "\n" -"With a parameter, lists all nicknames that are in the group of the given nick.\n" +"With a parameter, lists all nicknames that belong to the account of the given nick.\n" "\n" "Specifying a nick is limited to Services Operators." msgstr "" @@ -5897,7 +5894,7 @@ msgid "Word" msgstr "" #, c-format -msgid "You are already a member of the group of %s." +msgid "You are already a member of the account of %s." msgstr "" msgid "You are already identified." @@ -5930,11 +5927,10 @@ msgid "You are now identified as %s. Change your password now using %s." msgstr "" #, c-format -msgid "You are now in the group of %s." +msgid "You are over your maximum number of memos (%d). You will be unable to receive any new memos until you delete some of your current ones." msgstr "" -#, c-format -msgid "You are over your maximum number of memos (%d). You will be unable to receive any new memos until you delete some of your current ones." +msgid "You can associate multiple nicknames with your account. All nicknames will share the same configuration, set of memos, and channel privileges." msgstr "" msgid "You can not NOOP services." @@ -6090,7 +6086,7 @@ msgstr "" msgid "You have regained control of %s." msgstr "" -msgid "You may drop any nick within your group." +msgid "You may drop any nick within your account." msgstr "" #, c-format @@ -6284,15 +6280,15 @@ msgstr "" msgid "Your message queue has been cleared." msgstr "" +msgid "Your nick does not belong to an account, you can't ungroup it." +msgstr "" + msgid "Your nick has been logged out." msgstr "" msgid "Your nick is already registered." msgstr "" -msgid "Your nick is not grouped to anything, you can't ungroup it." -msgstr "" - msgid "Your nick isn't registered." msgstr "" @@ -6300,6 +6296,10 @@ msgstr "" msgid "Your nickname is now being changed to %s" msgstr "" +#, c-format +msgid "Your nickname now belongs to the account %s." +msgstr "" + msgid "Your oper block doesn't require logging in." msgstr "" diff --git a/modules/hostserv/hs_del.cpp b/modules/hostserv/hs_del.cpp index 7ce67dbbe..fd08c78ff 100644 --- a/modules/hostserv/hs_del.cpp +++ b/modules/hostserv/hs_del.cpp @@ -57,7 +57,7 @@ class CommandHSDelAll final public: CommandHSDelAll(Module *creator) : Command(creator, "hostserv/delall", 1, 1) { - this->SetDesc(_("Deletes the vhost for all nicks in a group")); + this->SetDesc(_("Deletes the vhost for all nicks in an account")); this->SetSyntax(_("\037nick\037")); } @@ -80,8 +80,8 @@ public: na = alias; na->RemoveVHost(); } - Log(LOG_ADMIN, source, this) << "for all nicks in group " << nc->display; - source.Reply(_("VHosts for group \002%s\002 have been removed."), nc->display.c_str()); + Log(LOG_ADMIN, source, this) << "for all nicks in account " << nc->display; + source.Reply(_("VHosts for account \002%s\002 have been removed."), nc->display.c_str()); } else source.Reply(NICK_X_NOT_REGISTERED, nick.c_str()); @@ -91,7 +91,7 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Deletes the vhost for all nicks in the same group as that of the given nick.")); + source.Reply(_("Deletes the vhost for all nicks in the same account as that of the given nick.")); return true; } }; diff --git a/modules/hostserv/hs_group.cpp b/modules/hostserv/hs_group.cpp index 2aec7ee10..8018e3a36 100644 --- a/modules/hostserv/hs_group.cpp +++ b/modules/hostserv/hs_group.cpp @@ -39,7 +39,7 @@ public: CommandHSGroup(Module *creator) : Command(creator, "hostserv/group", 0, 0) { - this->SetDesc(_("Syncs the vhost for all nicks in a group")); + this->SetDesc(_("Syncs the vhost for all nicks in an account")); } void Execute(CommandSource &source, const std::vector ¶ms) override @@ -54,7 +54,7 @@ public: if (na && source.GetAccount() == na->nc && na->HasVHost()) { this->Sync(na); - source.Reply(_("All vhosts in the group \002%s\002 have been set to \002%s\002."), + source.Reply(_("All vhosts for the account \002%s\002 have been set to \002%s\002."), source.nc->display.c_str(), na->GetVHostMask().c_str()); } else diff --git a/modules/hostserv/hs_set.cpp b/modules/hostserv/hs_set.cpp index a86d2d8d3..63c517c75 100644 --- a/modules/hostserv/hs_set.cpp +++ b/modules/hostserv/hs_set.cpp @@ -122,7 +122,7 @@ class CommandHSSetAll final public: CommandHSSetAll(Module *creator) : Command(creator, "hostserv/setall", 2, 2) { - this->SetDesc(_("Set the vhost for all nicks in a group")); + this->SetDesc(_("Set the vhost for all nicks in an account")); this->SetSyntax(_("\037nick\037 \037hostmask\037")); } @@ -193,7 +193,7 @@ public: na->SetVHost(user, host, source.GetNick()); this->Sync(na); FOREACH_MOD(OnSetVHost, (na)); - source.Reply(_("VHost for group \002%s\002 set to \002%s\002."), nick.c_str(), na->GetVHostMask().c_str()); + source.Reply(_("VHost for account \002%s\002 set to \002%s\002."), nick.c_str(), na->GetVHostMask().c_str()); } bool OnHelp(CommandSource &source, const Anope::string &subcommand) override @@ -201,13 +201,13 @@ public: this->SendSyntax(source); source.Reply(" "); source.Reply(_( - "Sets the vhost for all nicks in the same group as that " + "Sets the vhost for all nicks in the same account as that " "of the given nick. If your IRCD supports vidents, then " "using SETALL @ will set idents " "for users as well as vhosts." "\n\n" "* NOTE, this will not update the vhost for any nicks " - "added to the group after this command was used." + "added to the account after this command was used." )); return true; } diff --git a/modules/nickserv/nickserv.cpp b/modules/nickserv/nickserv.cpp index 6e83ab4dd..c9277e47a 100644 --- a/modules/nickserv/nickserv.cpp +++ b/modules/nickserv/nickserv.cpp @@ -361,7 +361,7 @@ public: void OnDelCore(NickCore *nc) override { - Log(NickServ, "nick") << "Deleting nickname group " << nc->display; + Log(NickServ, "nick") << "Deleting account " << nc->display; /* Clean up this nick core from any users online */ for (std::list::iterator it = nc->users.begin(); it != nc->users.end();) @@ -377,7 +377,7 @@ public: void OnChangeCoreDisplay(NickCore *nc, const Anope::string &newdisplay) override { - Log(LOG_NORMAL, "nick", NickServ) << "Changing " << nc->display << " nickname group display to " << newdisplay; + Log(LOG_NORMAL, "nick", NickServ) << "Changing " << nc->display << " account display nickname to " << newdisplay; } void OnNickIdentify(User *u) override @@ -491,7 +491,7 @@ public: IRCD->SendLogin(u, na); if (!Config->GetModule("nickserv").Get("nonicknameownership") && na->nc == u->Account() && !na->nc->HasExt("UNCONFIRMED")) u->SetMode(NickServ, "REGISTERED"); - Log(u, "", NickServ) << u->GetMask() << " automatically identified for group " << u->Account()->display; + Log(u, "", NickServ) << u->GetMask() << " automatically identified for account " << u->Account()->display; } if (!u->nick.equals_ci(oldnick) && old_na) @@ -616,7 +616,7 @@ public: if (expire) { - Log(LOG_NORMAL, "nickserv/expire", NickServ) << "Expiring nickname " << na->nick << " (group: " << na->nc->display << ") (email: " << (na->nc->email.empty() ? "none" : na->nc->email) << ")"; + Log(LOG_NORMAL, "nickserv/expire", NickServ) << "Expiring nickname " << na->nick << " (account: " << na->nc->display << ") (email: " << (na->nc->email.empty() ? "none" : na->nc->email) << ")"; FOREACH_MOD(OnNickExpire, (na)); delete na; } diff --git a/modules/nickserv/ns_drop.cpp b/modules/nickserv/ns_drop.cpp index 046a8e543..9644617b7 100644 --- a/modules/nickserv/ns_drop.cpp +++ b/modules/nickserv/ns_drop.cpp @@ -79,7 +79,7 @@ public: FOREACH_MOD(OnNickDrop, (source, na)); - Log(!is_mine ? LOG_ADMIN : LOG_COMMAND, source, this) << "to drop nickname " << na->nick << " (group: " << na->nc->display << ") (email: " << (!na->nc->email.empty() ? na->nc->email : "none") << ")"; + Log(!is_mine ? LOG_ADMIN : LOG_COMMAND, source, this) << "to drop nickname " << na->nick << " (account: " << na->nc->display << ") (email: " << (!na->nc->email.empty() ? na->nc->email : "none") << ")"; delete na; source.Reply(_("Nickname \002%s\002 has been dropped."), nick.c_str()); @@ -98,7 +98,7 @@ public: source.Reply(" "); if (!source.HasPriv("nickserv/drop")) - source.Reply(_("You may drop any nick within your group.")); + source.Reply(_("You may drop any nick within your account.")); else source.Reply(_("As a Services Operator, you may drop any nick.")); diff --git a/modules/nickserv/ns_group.cpp b/modules/nickserv/ns_group.cpp index 83cfd5c0c..4e4fd6476 100644 --- a/modules/nickserv/ns_group.cpp +++ b/modules/nickserv/ns_group.cpp @@ -70,8 +70,8 @@ public: FOREACH_MOD(OnNickGroup, (u, target)); } - Log(LOG_COMMAND, source, cmd) << "to make " << nick << " join group of " << target->nick << " (" << target->nc->display << ") (email: " << (!target->nc->email.empty() ? target->nc->email : "none") << ")"; - source.Reply(_("You are now in the group of \002%s\002."), target->nick.c_str()); + Log(LOG_COMMAND, source, cmd) << "to make " << nick << " join account of of " << target->nick << " (" << target->nc->display << ") (email: " << (!target->nc->email.empty() ? target->nc->email : "none") << ")"; + source.Reply(_("Your nickname now belongs to the account \002%s\002."), target->nick.c_str()); if (u) u->lastnickreg = Anope::CurTime; @@ -99,7 +99,7 @@ class CommandNSGroup final public: CommandNSGroup(Module *creator) : Command(creator, "nickserv/group", 0, 2) { - this->SetDesc(_("Join a group")); + this->SetDesc(_("Add a nick to an account")); this->SetSyntax(_("\037[target]\037 \037[password]\037")); this->AllowUnregistered(true); } @@ -162,17 +162,17 @@ public: } else if (target->nc->HasExt("NS_SUSPENDED")) { - Log(LOG_COMMAND, source, this) << "and tried to group to SUSPENDED nick " << target->nick; + Log(LOG_COMMAND, source, this) << "and tried to group to SUSPENDED account " << target->nick; source.Reply(NICK_X_SUSPENDED, target->nick.c_str()); } else if (na && Config->GetModule(this->owner).Get("nogroupchange")) source.Reply(_("Your nick is already registered.")); else if (na && *target->nc == *na->nc) - source.Reply(_("You are already a member of the group of \002%s\002."), target->nick.c_str()); + source.Reply(_("You are already a member of the account of \002%s\002."), target->nick.c_str()); else if (na && na->nc != source.GetAccount()) source.Reply(NICK_IDENTIFY_REQUIRED); else if (maxaliases && target->nc->aliases->size() >= maxaliases && !target->nc->IsServicesOper()) - source.Reply(_("There are too many nicks in your group.")); + source.Reply(_("There are too many nicks in your account.")); else if (nickserv && nickserv->IsGuestNick(source.GetNick())) source.Reply(NICK_CANNOT_BE_REGISTERED, source.GetNick().c_str()); else @@ -209,16 +209,16 @@ public: source.Reply(" "); source.Reply(_( "This command makes your nickname join the \037target\037 nickname's " - "group. \037password\037 is the password of the target nickname. " + "account. \037password\037 is the password of the target nickname. " "\n\n" - "Joining a group will allow you to share your configuration, " + "Joining an account will allow you to share your configuration, " "memos, and channel privileges with all the nicknames in the " - "group, and much more!" + "account, and much more!" "\n\n" - "A group exists as long as it is useful. This means that even " - "if a nick of the group is dropped, you won't lose the " + "An account exists as long as it is useful. This means that even " + "if a nick of the account is dropped, you won't lose the " "shared things described above, as long as there is at " - "least one nick remaining in the group." + "least one nick remaining in the account." "\n\n" "You may be able to use this command even if you have not registered " "your nick yet. If your nick is already registered, you'll " @@ -227,13 +227,13 @@ public: "It is recommended to use this command with a non-registered " "nick because it will be registered automatically when " "using this command. You may use it with a registered nick (to " - "change your group) only if your network administrators allowed " + "change your account) only if your network administrators allowed " "it." "\n\n" - "You can only be in one group at a time. Group merging is " + "You can only be in one account at a time. Group merging is " "not possible. " "\n\n" - "\037Note\037: all the nicknames of a group have the same password." + "\037Note\037: all the nicknames of an account have the same password." )); return true; } @@ -245,7 +245,7 @@ class CommandNSUngroup final public: CommandNSUngroup(Module *creator) : Command(creator, "nickserv/ungroup", 0, 1) { - this->SetDesc(_("Remove a nick from a group")); + this->SetDesc(_("Remove a nick from an account")); this->SetSyntax(_("[\037nick\037]")); } @@ -255,11 +255,11 @@ public: NickAlias *na = NickAlias::Find(!nick.empty() ? nick : source.GetNick()); if (source.GetAccount()->aliases->size() == 1) - source.Reply(_("Your nick is not grouped to anything, you can't ungroup it.")); + source.Reply(_("Your nick does not belong to an account, you can't ungroup it.")); else if (!na) source.Reply(NICK_X_NOT_REGISTERED, !nick.empty() ? nick.c_str() : source.GetNick().c_str()); else if (na->nc != source.GetAccount()) - source.Reply(_("Nick %s is not in your group."), na->nick.c_str()); + source.Reply(_("Nick %s does not belong to your account."), na->nick.c_str()); else { NickCore *oldcore = na->nc; @@ -280,7 +280,7 @@ public: nc->email = oldcore->email; nc->language = oldcore->language; - Log(LOG_COMMAND, source, this) << "to make " << na->nick << " leave group of " << oldcore->display << " (email: " << (!oldcore->email.empty() ? oldcore->email : "none") << ")"; + Log(LOG_COMMAND, source, this) << "to make " << na->nick << " leave account of " << oldcore->display << " (email: " << (!oldcore->email.empty() ? oldcore->email : "none") << ")"; source.Reply(_("Nick %s has been ungrouped from %s."), na->nick.c_str(), oldcore->display.c_str()); User *user = User::Find(na->nick, true); @@ -296,10 +296,10 @@ public: source.Reply(" "); source.Reply(_( "This command ungroups your nick, or if given, the specified nick, " - "from the group it is in. The ungrouped nick keeps its registration " + "from the account it is in. The ungrouped nick keeps its registration " "time, password, email, greet, language, and url. Everything else " "is reset. You may not ungroup yourself if there is only one nick in " - "your group." + "your account." )); return true; } @@ -311,7 +311,7 @@ class CommandNSGList final public: CommandNSGList(Module *creator) : Command(creator, "nickserv/glist", 0, 1) { - this->SetDesc(_("Lists all nicknames in your group")); + this->SetDesc(_("Lists all nicknames in your account")); this->SetSyntax(_("[\037nickname\037]"), [](auto &source) { return source.IsServicesOper(); }); } @@ -361,14 +361,14 @@ public: list.AddEntry(entry); } - source.Reply(!nick.empty() ? _("List of nicknames in the group of \002%s\002:") : _("List of nicknames in your group:"), nc->display.c_str()); + source.Reply(!nick.empty() ? _("List of nicknames belonging to \002%s\002:") : _("List of nicknames belonging to your account:"), nc->display.c_str()); std::vector replies; list.Process(replies); for (const auto &reply : replies) source.Reply(reply); - source.Reply(nc->aliases->size(), N_("%zu nickname in the group.", "%zu nicknames in the group."), nc->aliases->size()); + source.Reply(nc->aliases->size(), N_("%zu nickname in the account.", "%zu nicknames in the account."), nc->aliases->size()); } bool OnHelp(CommandSource &source, const Anope::string &subcommand) override @@ -377,18 +377,16 @@ public: if (source.IsServicesOper()) { source.Reply(_( - "Without a parameter, lists all nicknames that are in " - "your group." + "Without a parameter, lists all nicknames that belong to your account." "\n\n" - "With a parameter, lists all nicknames that are in the " - "group of the given nick." + "With a parameter, lists all nicknames that belong to the account of the given nick." "\n\n" "Specifying a nick is limited to \002Services Operators\002." )); } else { - source.Reply(_("Lists all nicks in your group.")); + source.Reply(_("Lists all nicknames that belong to your account.")); } return true; diff --git a/modules/nickserv/ns_register.cpp b/modules/nickserv/ns_register.cpp index d528bde89..9d33fe9ec 100644 --- a/modules/nickserv/ns_register.cpp +++ b/modules/nickserv/ns_register.cpp @@ -225,13 +225,15 @@ public: )); } - source.Reply(" "); - source.Reply(_( - "This command also creates a new group for your nickname, " - "that will allow you to register other nicks later sharing " - "the same configuration, the same set of memos and the " - "same channel privileges." - )); + if (!Config->GetModule("nickserv").Get("nonicknameownership")) + { + source.Reply(" "); + source.Reply(_( + "You can associate multiple nicknames with your account. All nicknames will " + "share the same configuration, set of memos, and channel privileges." + )); + } + return true; } }; diff --git a/modules/nickserv/ns_resetpass.cpp b/modules/nickserv/ns_resetpass.cpp index 2a4808790..55a7fd60c 100644 --- a/modules/nickserv/ns_resetpass.cpp +++ b/modules/nickserv/ns_resetpass.cpp @@ -38,7 +38,7 @@ public: { if (SendResetEmail(source.GetUser(), na, source.service)) { - Log(LOG_COMMAND, source, this) << "for " << na->nick << " (group: " << na->nc->display << ")"; + Log(LOG_COMMAND, source, this) << "for " << na->nick << " (account: " << na->nc->display << ")"; source.Reply(_("Password reset email for \002%s\002 has been sent."), na->nick.c_str()); } } diff --git a/modules/nickserv/ns_set.cpp b/modules/nickserv/ns_set.cpp index c6d6d4dc7..d36fc1f42 100644 --- a/modules/nickserv/ns_set.cpp +++ b/modules/nickserv/ns_set.cpp @@ -439,7 +439,7 @@ class CommandNSSetDisplay public: CommandNSSetDisplay(Module *creator, const Anope::string &sname = "nickserv/set/display", size_t min = 1) : Command(creator, sname, min, min + 1) { - this->SetDesc(_("Set the display of your group in services")); + this->SetDesc(_("Set the display nickname for your account")); this->SetSyntax(_("\037new-display\037")); } @@ -465,7 +465,7 @@ public: } else if (!na || *na->nc != *user_na->nc) { - source.Reply(_("The new display MUST be a nickname of the nickname group %s."), user_na->nc->display.c_str()); + source.Reply(_("The new display nickname must belong to the %s account."), user_na->nc->display.c_str()); return; } @@ -498,8 +498,8 @@ public: this->SendSyntax(source); source.Reply(" "); source.Reply(_( - "Changes the display used to refer to your nickname group in " - "services. The new display MUST be a nick of your group." + "Changes the display nickname used to refer to your account. The new display " + "nickname must already be associated with your account." )); return true; } @@ -525,8 +525,8 @@ public: this->SendSyntax(source); source.Reply(" "); source.Reply(_( - "Changes the display used to refer to the nickname group in " - "services. The new display MUST be a nick of the group." + "Changes the display nickname used to refer to the account. The new display" + "nickname must already be associated with the account." )); return true; } diff --git a/modules/nickserv/ns_set_protect.cpp b/modules/nickserv/ns_set_protect.cpp index 5d3bd8c5b..92d1124e3 100644 --- a/modules/nickserv/ns_set_protect.cpp +++ b/modules/nickserv/ns_set_protect.cpp @@ -100,10 +100,9 @@ public: this->SendSyntax(source); source.Reply(" "); source.Reply(_( - "Turns automatic protection for your account on or off. With " - "protection on if another user tries to use a nickname from " - "your group they will be given some time to change their nick " - "after which %s will forcibly change their nick." + "Turns automatic protection for your account on or off. With protection on if " + "another user tries to use a nickname from your account they will be given some " + "time to change their nick after which %s will forcibly change their nick." ), source.service->nick.c_str()); return true; @@ -133,7 +132,7 @@ public: source.Reply(_( "Turns automatic protection for the nick on or off. With " "protection on if a user tries to use a nickname from the " - "nick's group they will be given some time to change their " + "nick's account they will be given some time to change their " "nick after which %s will forcibly change their nick." ), source.service->nick.c_str()); diff --git a/modules/operserv/os_stats.cpp b/modules/operserv/os_stats.cpp index 9bd1274d5..fd80c55b7 100644 --- a/modules/operserv/os_stats.cpp +++ b/modules/operserv/os_stats.cpp @@ -182,7 +182,7 @@ private: source.Reply(_("Registered nicknames: %zu entries, %zu buckets, longest chain is %zu"), entries, buckets, max_chain); GetHashStats(*NickCoreList, entries, buckets, max_chain); - source.Reply(_("Registered nick groups: %zu entries, %zu buckets, longest chain is %zu"), entries, buckets, max_chain); + source.Reply(_("Registered accounts: %zu entries, %zu buckets, longest chain is %zu"), entries, buckets, max_chain); if (session_service) {