From 15b37c1e38b20a3f6244af179dfdb395ee929800 Mon Sep 17 00:00:00 2001 From: Robby- Date: Sat, 2 Feb 2013 07:30:53 +0100 Subject: Some more typo and help text fixes, proper formatting of control codes, missing privileges, and settings corrections. --- data/botserv.example.conf | 4 +- data/chanserv.example.conf | 4 +- data/chanstats.example.conf | 2 +- data/example.conf | 14 ++--- data/global.example.conf | 4 +- data/hostserv.example.conf | 4 +- data/memoserv.example.conf | 4 +- data/modules.example.conf | 38 ++++++------ data/nickserv.example.conf | 4 +- data/operserv.example.conf | 14 ++--- modules/commands/bs_badwords.cpp | 12 ++-- modules/commands/bs_bot.cpp | 41 +++++++------ modules/commands/bs_botlist.cpp | 2 +- modules/commands/bs_info.cpp | 2 +- modules/commands/bs_kick.cpp | 75 ++++++++++++----------- modules/commands/bs_set.cpp | 10 ++-- modules/commands/cs_access.cpp | 6 +- modules/commands/cs_akick.cpp | 2 +- modules/commands/cs_ban.cpp | 4 +- modules/commands/cs_clone.cpp | 8 +-- modules/commands/cs_drop.cpp | 4 +- modules/commands/cs_enforce.cpp | 16 ++--- modules/commands/cs_fantasy_stats.cpp | 2 +- modules/commands/cs_fantasy_top.cpp | 2 +- modules/commands/cs_flags.cpp | 8 +-- modules/commands/cs_kick.cpp | 4 +- modules/commands/cs_list.cpp | 12 ++-- modules/commands/cs_seen.cpp | 20 +++---- modules/commands/cs_set.cpp | 20 +++---- modules/commands/cs_status.cpp | 14 ++--- modules/commands/cs_suspend.cpp | 4 +- modules/commands/cs_topic.cpp | 8 +-- modules/commands/cs_updown.cpp | 2 +- modules/commands/cs_xop.cpp | 16 ++--- modules/commands/gl_global.cpp | 2 +- modules/commands/help.cpp | 4 +- modules/commands/hs_group.cpp | 4 +- modules/commands/hs_list.cpp | 20 +++---- modules/commands/hs_off.cpp | 2 +- modules/commands/hs_on.cpp | 2 +- modules/commands/hs_request.cpp | 12 ++-- modules/commands/hs_set.cpp | 2 +- modules/commands/ms_check.cpp | 2 +- modules/commands/ms_ignore.cpp | 22 ++++--- modules/commands/ms_info.cpp | 4 +- modules/commands/ms_rsend.cpp | 4 +- modules/commands/ms_send.cpp | 2 +- modules/commands/ms_set.cpp | 2 +- modules/commands/ns_access.cpp | 4 +- modules/commands/ns_ajoin.cpp | 6 +- modules/commands/ns_drop.cpp | 8 +-- modules/commands/ns_getemail.cpp | 12 ++-- modules/commands/ns_getpass.cpp | 2 +- modules/commands/ns_group.cpp | 18 +++--- modules/commands/ns_info.cpp | 4 +- modules/commands/ns_list.cpp | 11 ++-- modules/commands/ns_logout.cpp | 10 ++-- modules/commands/ns_register.cpp | 25 ++++---- modules/commands/ns_resetpass.cpp | 4 +- modules/commands/ns_set.cpp | 110 ++++++++++++++++++---------------- modules/commands/ns_status.cpp | 8 +-- modules/commands/ns_suspend.cpp | 4 +- modules/commands/os_akill.cpp | 38 ++++++------ modules/commands/os_defcon.cpp | 14 ++--- modules/commands/os_dns.cpp | 14 ++--- modules/commands/os_forbid.cpp | 20 ++++--- modules/commands/os_ignore.cpp | 23 +++---- modules/commands/os_jupe.cpp | 4 +- modules/commands/os_list.cpp | 20 +++++-- modules/commands/os_logsearch.cpp | 18 +++--- modules/commands/os_mode.cpp | 4 +- modules/commands/os_modinfo.cpp | 10 ++-- modules/commands/os_module.cpp | 26 ++++---- modules/commands/os_news.cpp | 2 +- modules/commands/os_noop.cpp | 2 +- modules/commands/os_oline.cpp | 4 +- modules/commands/os_oper.cpp | 28 ++++----- modules/commands/os_reload.cpp | 2 +- modules/commands/os_session.cpp | 10 ++-- modules/commands/os_set.cpp | 20 +++---- modules/commands/os_stats.cpp | 16 ++--- modules/commands/os_svs.cpp | 14 ++--- modules/commands/os_sxline.cpp | 84 +++++++++++++------------- modules/protocol/inspircd12.cpp | 2 +- modules/pseudoclients/botserv.cpp | 4 +- modules/pseudoclients/operserv.cpp | 6 +- 86 files changed, 562 insertions(+), 519 deletions(-) diff --git a/data/botserv.example.conf b/data/botserv.example.conf index 93d9a9d16..9f13850cb 100644 --- a/data/botserv.example.conf +++ b/data/botserv.example.conf @@ -9,7 +9,7 @@ service { /* - * The name of the BotServ client + * The name of the BotServ client. */ nick = "BotServ" @@ -149,7 +149,7 @@ botserv * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior. */ -/* Give it a help command */ +/* Give it a help command. */ command { service = "BotServ"; name = "HELP"; command = "generic/help"; } /* diff --git a/data/chanserv.example.conf b/data/chanserv.example.conf index e885fd8fe..aec506c8e 100644 --- a/data/chanserv.example.conf +++ b/data/chanserv.example.conf @@ -9,7 +9,7 @@ service { /* - * The name of the ChanServ client + * The name of the ChanServ client. */ nick = "ChanServ" @@ -873,7 +873,7 @@ command_group description = "Services Operator commands" } -/* Give it a help command */ +/* Give it a help command. */ command { service = "ChanServ"; name = "HELP"; command = "generic/help"; } /* diff --git a/data/chanstats.example.conf b/data/chanstats.example.conf index 3244ce751..0f131a85a 100644 --- a/data/chanstats.example.conf +++ b/data/chanstats.example.conf @@ -1,5 +1,5 @@ /* - * Example configuration file for chanstats + * Example configuration file for Chanstats. * Make sure BotServ, ChanServ and NickServ are running. */ diff --git a/data/example.conf b/data/example.conf index ae6ead694..88a2fb21e 100644 --- a/data/example.conf +++ b/data/example.conf @@ -778,9 +778,9 @@ log * global/global * * operserv/news operserv/stats operserv/kick operserv/exception operserv/seen - * operserv/mode operserv/session operserv/modinfo operserv/ignore - * operserv/chankill operserv/akill operserv/sqline operserv/snline - * operserv/global operserv/oper operserv/config operserv/umode + * operserv/mode operserv/session operserv/modinfo operserv/ignore operserv/chanlist + * operserv/chankill operserv/akill operserv/sqline operserv/snline operserv/userlist + * operserv/global operserv/oper operserv/config operserv/umode operserv/logsearch * operserv/modload operserv/jupe operserv/set operserv/noop * operserv/quit operserv/update operserv/reload operserv/restart * operserv/shutdown operserv/svs operserv/oline operserv/kill @@ -1178,7 +1178,8 @@ module { name = "enc_sha256" } */ #module { name = "enc_old" } -/* Extra (optional) modules */ + +/* Extra (optional) modules. */ include { type = "file" @@ -1186,10 +1187,9 @@ include } /* - * Chanstats Modules - * Requires a MySQL Database + * Chanstats module. + * Requires a MySQL Database. */ - #include #{ # type = "file" diff --git a/data/global.example.conf b/data/global.example.conf index dfc7ad163..2ae7cdc99 100644 --- a/data/global.example.conf +++ b/data/global.example.conf @@ -9,7 +9,7 @@ service { /* - * The name of the Global client + * The name of the Global client. */ nick = "Global" @@ -109,7 +109,7 @@ global * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior. */ -/* Give it a help command */ +/* Give it a help command. */ command { service = "Global"; name = "HELP"; command = "generic/help"; } /* diff --git a/data/hostserv.example.conf b/data/hostserv.example.conf index 6b1b471c4..1d406ef5b 100644 --- a/data/hostserv.example.conf +++ b/data/hostserv.example.conf @@ -9,7 +9,7 @@ service { /* - * The name of the HostServ client + * The name of the HostServ client. */ nick = "HostServ" @@ -108,7 +108,7 @@ hostserv * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior. */ -/* Give it a help command */ +/* Give it a help command. */ command { service = "HostServ"; name = "HELP"; command = "generic/help"; } /* diff --git a/data/memoserv.example.conf b/data/memoserv.example.conf index 84ad32f06..40678bf53 100644 --- a/data/memoserv.example.conf +++ b/data/memoserv.example.conf @@ -9,7 +9,7 @@ service { /* - * The name of the MemoServ client + * The name of the MemoServ client. */ nick = "MemoServ" @@ -111,7 +111,7 @@ memoserv * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior. */ -/* Give it a help command */ +/* Give it a help command. */ command { service = "MemoServ"; name = "HELP"; command = "generic/help"; } /* diff --git a/data/modules.example.conf b/data/modules.example.conf index 350c85193..fea868c02 100644 --- a/data/modules.example.conf +++ b/data/modules.example.conf @@ -9,7 +9,7 @@ /* * help * - * Provides commands generic/help + * Provides the command generic/help. * * This is a generic help command that can be used with any client. */ @@ -153,16 +153,16 @@ m_helpchan #module { name = "m_httpd" } httpd { - /* Name of this service */ + /* Name of this service. */ name = "httpd/main" - /* IP to listen on */ + /* IP to listen on. */ ip = "0.0.0.0" - /* Port to listen on */ + /* Port to listen on. */ port = 8080 - /* Time before connections to this server are timed out */ + /* Time before connections to this server are timed out. */ timeout = 30 /* Listen using SSL. Requires m_ssl. */ @@ -242,12 +242,12 @@ m_ldap_authentication password_attribute = "userPassword" /* - * Enable to have this module disable /nickserv register. + * Enable this to have this module disable "/msg NickServ REGISTER". */ disable_ns_register = false /* - * The reason to give the users who try to /ns register if + * The reason to give the users who try to "/msg NickServ REGISTER" if * disable_ns_register is enabled. */ #disable_reason = "To register on this network, visit http://some.misconfigured.site/register" @@ -301,7 +301,7 @@ m_ldap_oper #module { name = "m_mysql" } mysql { - /* The name of this service */ + /* The name of this service. */ name = "mysql/main" database = "anope" server = "127.0.0.1" @@ -377,13 +377,13 @@ m_proxyscan */ proxyscan { - /* The type of proxy to check for. A comma separated list is allowed */ + /* The type of proxy to check for. A comma separated list is allowed. */ type = "HTTP" - /* The ports to check */ + /* The ports to check. */ port = "80,8080" - /* How long to set the ban for */ + /* How long to set the ban for. */ time = 4h /* @@ -433,12 +433,12 @@ m_sql_authentication query = "SELECT `email_addr` AS `email` FROM `my_users` WHERE `username` = @a@ AND `password` = MD5(CONCAT('salt', @p@))" /* - * Enable to have this module disable /nickserv register. + * Enable this to have this module disable "/msg NickServ REGISTER". */ disable_ns_register = false /* - * The reason to give the users who try to /ns register if + * The reason to give the users who try to "/msg NickServ REGISTER" if * disable_ns_register is enabled. */ #disable_reason = "To register on this network visit http://some.misconfigured.site/register" @@ -477,7 +477,7 @@ m_sql_oper #module { name = "m_sqlite" } sqlite { - /* The name of this service */ + /* The name of this service. */ name = "sqlite/main" /* The database name, it will be created if it does not exist. */ @@ -516,7 +516,7 @@ module { name = "m_rewrite" } #{ # service = "ChanServ"; name = "CLEAR"; command = "rewrite" # -# /* Enable m_rewrite */ +# /* Enable m_rewrite. */ # rewrite = true # # /* Source message to match. A $ can be used to match anything. */ @@ -589,15 +589,15 @@ m_xmlrpc #module { name = "webcpanel" } webcpanel { - /* Web server to use */ + /* Web server to use. */ server = "httpd/main"; - /* Template to use */ + /* Template to use. */ template = "default"; - /* Page title */ + /* Page title. */ title = "Anope IRC Services"; - /* Whether or not to use https on redirecting URLS */ + /* Whether or not to use https on redirecting URLs. */ ssl = no } diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf index 1030f08f5..be36e0e4a 100644 --- a/data/nickserv.example.conf +++ b/data/nickserv.example.conf @@ -9,7 +9,7 @@ service { /* - * The name of the NickServ client + * The name of the NickServ client. */ nick = "NickServ" @@ -317,7 +317,7 @@ command_group description = "Services Operator commands" } -/* Give it a help command */ +/* Give it a help command. */ command { service = "NickServ"; name = "HELP"; command = "generic/help"; } /* diff --git a/data/operserv.example.conf b/data/operserv.example.conf index 5ffc015a4..8e2afbc0a 100644 --- a/data/operserv.example.conf +++ b/data/operserv.example.conf @@ -9,7 +9,7 @@ service { /* - * The name of the OperServ client + * The name of the OperServ client. */ nick = "OperServ" @@ -185,7 +185,7 @@ operserv /* * Sets the CIDR value used to determine which IP addresses represent the same person. - * By default this would limit 3 connections per IPv4 IP and 3 conenctions per IPv6 IP. + * By default this would limit 3 connections per IPv4 IP and 3 connections per IPv6 IP. */ session_ipv4_cidr = 32 session_ipv6_cidr = 128 @@ -223,7 +223,7 @@ operserv * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior. */ -/* Give it a help command */ +/* Give it a help command. */ command { service = "OperServ"; name = "HELP"; command = "generic/help"; } /* @@ -350,7 +350,7 @@ defcon * Defines the reason to use when clients are KILLed or AKILLed from the network while the proper * DefCon operation is in effect. */ - #akillreason = "This network is currently not accepting connections, please try again later" + #akillreason = "This network is currently not accepting connections, please try again later." } /* @@ -481,8 +481,8 @@ command { service = "OperServ"; name = "KILL"; command = "operserv/kill"; permis * Used to list and search the channels and users currently on the network. */ module { name = "os_list" } -command { service = "OperServ"; name = "CHANLIST"; command = "operserv/chanlist"; } -command { service = "OperServ"; name = "USERLIST"; command = "operserv/userlist"; } +command { service = "OperServ"; name = "CHANLIST"; command = "operserv/chanlist"; permission = "operserv/chanlist"; } +command { service = "OperServ"; name = "USERLIST"; command = "operserv/userlist"; permission = "operserv/userlist"; } /* * os_login @@ -503,7 +503,7 @@ command { service = "OperServ"; name = "LOGOUT"; command = "operserv/logout"; } * Used to search services log files. */ module { name = "os_logsearch" } -command { service = "OperServ"; name = "LOGSEARCH"; command = "operserv/logsearch"; } +command { service = "OperServ"; name = "LOGSEARCH"; command = "operserv/logsearch"; permission = "operserv/logsearch"; } logsearch { /* The log file name to search. There should be a log{} block configured to log diff --git a/modules/commands/bs_badwords.cpp b/modules/commands/bs_badwords.cpp index 65977cf04..147b23b95 100644 --- a/modules/commands/bs_badwords.cpp +++ b/modules/commands/bs_badwords.cpp @@ -110,18 +110,18 @@ class CommandBSBadwords : public Command } if (list.IsEmpty()) - source.Reply(_("No matching entries on %s badword list."), ci->name.c_str()); + source.Reply(_("No matching entries on %s bad words list."), ci->name.c_str()); else { std::vector replies; list.Process(replies); - source.Reply(_("Badword list for %s:"), ci->name.c_str()); + source.Reply(_("Bad words list for %s:"), ci->name.c_str()); for (unsigned i = 0; i < replies.size(); ++i) source.Reply(replies[i]); - source.Reply(_("End of badword list.")); + source.Reply(_("End of bad words list.")); } } @@ -222,7 +222,7 @@ class CommandBSBadwords : public Command public: CommandBSBadwords(Module *creator) : Command(creator, "botserv/badwords", 2, 3) { - this->SetDesc(_("Maintains bad words list")); + this->SetDesc(_("Maintains the bad words list")); this->SetSyntax(_("\037channel\037 ADD \037word\037 [\037SINGLE\037 | \037START\037 | \037END\037]")); this->SetSyntax(_("\037channel\037 DEL {\037word\037 | \037entry-num\037 | \037list\037}")); this->SetSyntax(_("\037channel\037 LIST [\037mask\037 | \037list\037]")); @@ -282,8 +282,8 @@ class CommandBSBadwords : public Command "type \002%s%s HELP KICK %s\002.\n" " \n" "The \002ADD\002 command adds the given word to the\n" - "badword list. If SINGLE is specified, a kick will be\n" - "done only if a user says the entire word. If START is \n" + "bad words list. If SINGLE is specified, a kick will be\n" + "done only if a user says the entire word. If START is\n" "specified, a kick will be done if a user says a word\n" "that starts with \037word\037. If END is specified, a kick\n" "will be done if a user says a word that ends with\n" diff --git a/modules/commands/bs_bot.cpp b/modules/commands/bs_bot.cpp index 793d739c8..f46d61ef9 100644 --- a/modules/commands/bs_bot.cpp +++ b/modules/commands/bs_bot.cpp @@ -31,38 +31,37 @@ class CommandBSBot : public Command if (nick.length() > Config->NickLen) { - source.Reply(_("Bot Nicks may only contain valid nick characters.")); + source.Reply(_("Bot nicks may only be %d characters long."), Config->NickLen); return; } if (user.length() > Config->UserLen) { - source.Reply(_("Bot Idents may only contain %d characters."), Config->UserLen); + source.Reply(_("Bot idents may only be %d characters long."), Config->UserLen); return; } if (host.length() > Config->HostLen) { - source.Reply(_("Bot Hosts may only contain %d characters."), Config->HostLen); + source.Reply(_("Bot hosts may only be %d characters long."), Config->HostLen); return; } if (!IRCD->IsNickValid(nick)) { - source.Reply(_("Bot Nicks may only contain valid nick characters.")); + source.Reply(_("Bot nicks may only contain valid nick characters.")); return; } - /* Check the host is valid */ - if (!IRCD->IsHostValid(host)) + if (!IRCD->IsIdentValid(user)) { - source.Reply(_("Bot Hosts may only contain valid host characters.")); + source.Reply(_("Bot idents may only contain valid ident characters.")); return; } - if (!IRCD->IsIdentValid(user)) + if (!IRCD->IsHostValid(host)) { - source.Reply(_("Bot Idents may only contain valid characters.")); + source.Reply(_("Bot hosts may only contain valid host characters.")); return; } @@ -109,25 +108,25 @@ class CommandBSBot : public Command if (bi->conf) { - source.Reply(_("Bot %s is not changable."), bi->nick.c_str()); + source.Reply(_("Bot %s is not changeable."), bi->nick.c_str()); return; } if (nick.length() > Config->NickLen) { - source.Reply(_("Bot Nicks may only contain valid nick characters.")); + source.Reply(_("Bot nicks may only be %d characters long."), Config->NickLen); return; } if (!user.empty() && user.length() > Config->UserLen) { - source.Reply(_("Bot Idents may only contain %d characters."), Config->UserLen); + source.Reply(_("Bot idents may only be %d characters long."), Config->UserLen); return; } if (!host.empty() && host.length() > Config->HostLen) { - source.Reply(_("Bot Hosts may only contain %d characters."), Config->HostLen); + source.Reply(_("Bot hosts may only be %d characters long."), Config->HostLen); return; } @@ -144,19 +143,19 @@ class CommandBSBot : public Command if (!IRCD->IsNickValid(nick)) { - source.Reply(_("Bot Nicks may only contain valid nick characters.")); + source.Reply(_("Bot nicks may only contain valid nick characters.")); return; } - if (!host.empty() && !IRCD->IsHostValid(host)) + if (!user.empty() && !IRCD->IsIdentValid(user)) { - source.Reply(_("Bot Hosts may only contain valid host characters.")); + source.Reply(_("Bot idents may only contain valid ident characters.")); return; } - if (!user.empty() && !IRCD->IsIdentValid(user)) + if (!host.empty() && !IRCD->IsHostValid(host)) { - source.Reply(_("Bot Idents may only contain valid characters."), Config->UserLen); + source.Reply(_("Bot hosts may only contain valid host characters.")); return; } @@ -208,7 +207,7 @@ class CommandBSBot : public Command bi->RejoinAll(); } - source.Reply(_("Bot \002%s\002 has been changed to %s!%s@%s (%s)"), oldnick.c_str(), bi->nick.c_str(), bi->GetIdent().c_str(), bi->host.c_str(), bi->realname.c_str()); + source.Reply(_("Bot \002%s\002 has been changed to %s!%s@%s (%s)."), oldnick.c_str(), bi->nick.c_str(), bi->GetIdent().c_str(), bi->host.c_str(), bi->realname.c_str()); Log(LOG_ADMIN, source, this) << "CHANGE " << oldnick << " to " << bi->GetMask() << " " << bi->realname; FOREACH_MOD(I_OnBotChange, OnBotChange(bi)); @@ -337,12 +336,12 @@ class CommandBSBot : public Command "channels.\n" " \n" "\002BOT ADD\002 adds a bot with the given nickname, username,\n" - "hostname and realname. Since no integrity checks are done \n" + "hostname and realname. Since no integrity checks are done\n" "for these settings, be really careful.\n" "\002BOT CHANGE\002 allows to change nickname, username, hostname\n" "or realname of a bot without actually delete it (and all\n" "the data associated with it).\n" - "\002BOT DEL\002 removes the given bot from the bot list. \n" + "\002BOT DEL\002 removes the given bot from the bot list.\n" " \n" "\002Note\002: you cannot create a bot that has a nick that is\n" "currently registered. If an unregistered user is currently\n" diff --git a/modules/commands/bs_botlist.cpp b/modules/commands/bs_botlist.cpp index dcaa691d9..cacfce903 100644 --- a/modules/commands/bs_botlist.cpp +++ b/modules/commands/bs_botlist.cpp @@ -65,7 +65,7 @@ class CommandBSBotList : public Command this->SendSyntax(source); source.Reply(" "); source.Reply(_("Lists all available bots on this network.\n" - "Bots prefixed by a * are reserved for IRC operators.")); + "Bots prefixed by a * are reserved for IRC Operators.")); return true; } }; diff --git a/modules/commands/bs_info.cpp b/modules/commands/bs_info.cpp index bc92b6fe3..b1e05bb17 100644 --- a/modules/commands/bs_info.cpp +++ b/modules/commands/bs_info.cpp @@ -52,7 +52,7 @@ class CommandBSInfo : public Command CommandBSInfo(Module *creator) : Command(creator, "botserv/info", 1, 1) { this->SetDesc(_("Allows you to see BotServ information about a channel or a bot")); - this->SetSyntax(_("\002INFO {\037chan\037 | \037nick\037}\002")); + this->SetSyntax(_("{\037chan\037|\037nick\037}")); } void Execute(CommandSource &source, const std::vector ¶ms) anope_override diff --git a/modules/commands/bs_kick.cpp b/modules/commands/bs_kick.cpp index 499f21464..d351d29b2 100644 --- a/modules/commands/bs_kick.cpp +++ b/modules/commands/bs_kick.cpp @@ -74,17 +74,17 @@ class CommandBSKick : public Command ci->ExtendMetadata("BS_KICK_BADWORDS"); if (ci->ttb[TTB_BADWORDS]) - source.Reply(_("Bot will now kick \002bad words\002, and will place a ban after \n" - "%d kicks for the same user. Use the BADWORDS command\n" - "to add or remove a bad word."), ci->ttb[TTB_BADWORDS]); + source.Reply(_("Bot will now kick for \002bad words\002, and will place a ban\n" + "after %d kicks for the same user. Use the BADWORDS command\n" + "to add or remove a bad word."), ci->ttb[TTB_BADWORDS]); else - source.Reply(_("Bot will now kick \002bad words\002. Use the BADWORDS command\n" + source.Reply(_("Bot will now kick for \002bad words\002. Use the BADWORDS command\n" "to add or remove a bad word.")); } else { ci->Shrink("BS_KICK_BADWORDS"); - source.Reply(_("Bot won't kick \002bad words\002 anymore.")); + source.Reply(_("Bot won't kick for \002bad words\002 anymore.")); } } else if (option.equals_ci("BOLDS")) @@ -110,14 +110,15 @@ class CommandBSKick : public Command ci->ttb[TTB_BOLDS] = 0; ci->ExtendMetadata("BS_KICK_BOLDS"); if (ci->ttb[TTB_BOLDS]) - source.Reply(_("Bot will now kick \002bolds\002, and will place a ban after\n%d kicks to the same user."), ci->ttb[TTB_BOLDS]); + source.Reply(_("Bot will now kick for \002bolds\002, and will place a ban\n" + "after %d kicks for the same user."), ci->ttb[TTB_BOLDS]); else - source.Reply(_("Bot will now kick \002bolds\002.")); + source.Reply(_("Bot will now kick for \002bolds\002.")); } else { ci->Shrink("BS_KICK_BOLDS"); - source.Reply(_("Bot won't kick \002bolds\002 anymore.")); + source.Reply(_("Bot won't kick for \002bolds\002 anymore.")); } } else if (option.equals_ci("CAPS")) @@ -165,17 +166,17 @@ class CommandBSKick : public Command ci->ExtendMetadata("BS_KICK_CAPS"); if (ci->ttb[TTB_CAPS]) - source.Reply(_("Bot will now kick \002caps\002 (they must constitute at least\n" - "%d characters and %d%% of the entire message), and will \n" + source.Reply(_("Bot will now kick for \002caps\002 (they must constitute at least\n" + "%d characters and %d%% of the entire message), and will\n" "place a ban after %d kicks for the same user."), ci->capsmin, ci->capspercent, ci->ttb[TTB_CAPS]); else - source.Reply(_("Bot will now kick \002caps\002 (they must constitute at least\n" + source.Reply(_("Bot will now kick for \002caps\002 (they must constitute at least\n" "%d characters and %d%% of the entire message)."), ci->capsmin, ci->capspercent); } else { ci->Shrink("BS_KICK_CAPS"); - source.Reply(_("Bot won't kick \002caps\002 anymore.")); + source.Reply(_("Bot won't kick for \002caps\002 anymore.")); } } else if (option.equals_ci("COLORS")) @@ -202,14 +203,15 @@ class CommandBSKick : public Command ci->ExtendMetadata("BS_KICK_COLORS"); if (ci->ttb[TTB_COLORS]) - source.Reply(_("Bot will now kick \002colors\002, and will place a ban after %d\nkicks for the same user."), ci->ttb[TTB_COLORS]); + source.Reply(_("Bot will now kick for \002colors\002, and will place a ban\n" + "after %d kicks for the same user."), ci->ttb[TTB_COLORS]); else - source.Reply(_("Bot will now kick \002colors\002.")); + source.Reply(_("Bot will now kick for \002colors\002.")); } else { ci->Shrink("BS_KICK_COLORS"); - source.Reply(_("Bot won't kick \002colors\002 anymore.")); + source.Reply(_("Bot won't kick for \002colors\002 anymore.")); } } else if (option.equals_ci("FLOOD")) @@ -259,14 +261,15 @@ class CommandBSKick : public Command ci->ExtendMetadata("BS_KICK_FLOOD"); if (ci->ttb[TTB_FLOOD]) - source.Reply(_("Bot will now kick \002flood\002 (%d lines in %d seconds and\nwill place a ban after %d kicks for the same user."), ci->floodlines, ci->floodsecs, ci->ttb[TTB_FLOOD]); + source.Reply(_("Bot will now kick for \002flood\002 (%d lines in %d seconds\n" + "and will place a ban after %d kicks for the same user."), ci->floodlines, ci->floodsecs, ci->ttb[TTB_FLOOD]); else - source.Reply(_("Bot will now kick \002flood\002 (%d lines in %d seconds)."), ci->floodlines, ci->floodsecs); + source.Reply(_("Bot will now kick for \002flood\002 (%d lines in %d seconds)."), ci->floodlines, ci->floodsecs); } else { ci->Shrink("BS_KICK_FLOOD"); - source.Reply(_("Bot won't kick \002flood\002 anymore.")); + source.Reply(_("Bot won't kick for \002flood\002 anymore.")); } } else if (option.equals_ci("REPEAT")) @@ -304,17 +307,17 @@ class CommandBSKick : public Command ci->ExtendMetadata("BS_KICK_REPEAT"); if (ci->ttb[TTB_REPEAT]) - source.Reply(_("Bot will now kick \002repeats\002 (users that say the\n" - "same thing %d times), and will place a ban after %d \n" + source.Reply(_("Bot will now kick for \002repeats\002 (users that say the\n" + "same thing %d times), and will place a ban after %d\n" "kicks for the same user."), ci->repeattimes, ci->ttb[TTB_REPEAT]); else - source.Reply(_("Bot will now kick \002repeats\002 (users that say the\n" + source.Reply(_("Bot will now kick for \002repeats\002 (users that say the\n" "same thing %d times)."), ci->repeattimes); } else { ci->Shrink("BS_KICK_REPEAT"); - source.Reply(_("Bot won't kick \002repeats\002 anymore.")); + source.Reply(_("Bot won't kick for \002repeats\002 anymore.")); } } else if (option.equals_ci("REVERSES")) @@ -340,14 +343,15 @@ class CommandBSKick : public Command ci->ttb[TTB_REVERSES] = 0; ci->ExtendMetadata("BS_KICK_REVERSES"); if (ci->ttb[TTB_REVERSES]) - source.Reply(_("Bot will now kick \002reverses\002, and will place a ban after %d\nkicks for the same user."), ci->ttb[TTB_REVERSES]); + source.Reply(_("Bot will now kick for \002reverses\002, and will place a ban\n" + "after %d kicks for the same user."), ci->ttb[TTB_REVERSES]); else - source.Reply(_("Bot will now kick \002reverses\002.")); + source.Reply(_("Bot will now kick for \002reverses\002.")); } else { ci->Shrink("BS_KICK_REVERSES"); - source.Reply(_("Bot won't kick \002reverses\002 anymore.")); + source.Reply(_("Bot won't kick for \002reverses\002 anymore.")); } } else if (option.equals_ci("UNDERLINES")) @@ -374,14 +378,15 @@ class CommandBSKick : public Command ci->ExtendMetadata("BS_KICK_UNDERLINES"); if (ci->ttb[TTB_UNDERLINES]) - source.Reply(_("Bot will now kick \002underlines\002, and will place a ban after %d\nkicks for the same user."), ci->ttb[TTB_UNDERLINES]); + source.Reply(_("Bot will now kick for \002underlines\002, and will place a ban\n" + "after %d kicks for the same user."), ci->ttb[TTB_UNDERLINES]); else - source.Reply(_("Bot will now kick \002underlines\002.")); + source.Reply(_("Bot will now kick for \002underlines\002.")); } else { ci->Shrink("BS_KICK_UNDERLINES"); - source.Reply(_("Bot won't kick \002underlines\002 anymore.")); + source.Reply(_("Bot won't kick for \002underlines\002 anymore.")); } } else if (option.equals_ci("ITALICS")) @@ -408,14 +413,15 @@ class CommandBSKick : public Command ci->ExtendMetadata("BS_KICK_ITALICS"); if (ci->ttb[TTB_ITALICS]) - source.Reply(_("Bot will now kick \002italics\002, and will place a ban after\n%d kicks for the same user."), ci->ttb[TTB_ITALICS]); + source.Reply(_("Bot will now kick for \002italics\002, and will place a ban\n" + "after %d kicks for the same user."), ci->ttb[TTB_ITALICS]); else - source.Reply(_("Bot will now kick \002italics\002.")); + source.Reply(_("Bot will now kick for \002italics\002.")); } else { ci->Shrink("BS_KICK_ITALICS"); - source.Reply(_("Bot won't kick \002italics\002 anymore.")); + source.Reply(_("Bot won't kick for \002italics\002 anymore.")); } } else if (option.equals_ci("AMSGS")) @@ -442,7 +448,8 @@ class CommandBSKick : public Command ci->ExtendMetadata("BS_KICK_AMSGS"); if (ci->ttb[TTB_AMSGS]) - source.Reply(_("Bot will now kick for \002amsgs\002, and will place a ban after %d\nkicks for the same user."), ci->ttb[TTB_AMSGS]); + source.Reply(_("Bot will now kick for \002amsgs\002, and will place a ban\n" + "after %d kicks for the same user."), ci->ttb[TTB_AMSGS]); else source.Reply(_("Bot will now kick for \002amsgs\002")); } @@ -485,7 +492,7 @@ class CommandBSKick : public Command "level SET."), Config->UseStrictPrivMsgString.c_str(), source.service->nick.c_str()); } else if (subcommand.equals_ci("BADWORDS")) - source.Reply(_("Syntax: \002\037#channel\037 BADWORDS {\037ON|OFF\037} [\037ttb\037]\002\n" + source.Reply(_("Syntax: \002\037channel\037 BADWORDS {\037ON|OFF\037} [\037ttb\037]\002\n" "Sets the bad words kicker on or off. When enabled, this\n" "option tells the bot to kick users who say certain words\n" "on the channels.\n" @@ -508,7 +515,7 @@ class CommandBSKick : public Command "option tells the bot to kick users who are talking in\n" "CAPS.\n" "The bot kicks only if there are at least \002min\002 caps\n" - "and they constitute at least \002percent\002%% of the total \n" + "and they constitute at least \002percent\002%% of the total\n" "text line (if not given, it defaults to 10 characters\n" "and 25%%).\n" "ttb is the number of times a user can be kicked\n" diff --git a/modules/commands/bs_set.cpp b/modules/commands/bs_set.cpp index 1bb0992b3..123120289 100644 --- a/modules/commands/bs_set.cpp +++ b/modules/commands/bs_set.cpp @@ -242,7 +242,7 @@ class CommandBSSetFantasy : public Command "Note that users wanting to use fantaisist\n" "commands MUST have enough level for both\n" "the FANTASIA and another level depending\n" - "of the command if required (for example, to use \n" + "of the command if required (for example, to use\n" "!op, user must have enough access for the OPDEOP\n" "level)."), Config->ChanServ.c_str(), Config->BSFantasyCharacter.c_str()); return true; @@ -341,7 +341,7 @@ class CommandBSSetNoBot : public Command ci->ExtendMetadata("BS_NOBOT"); if (ci->bi) ci->bi->UnAssign(source.GetUser(), ci); - source.Reply(_("No Bot mode is now \002on\002 on channel %s."), ci->name.c_str()); + source.Reply(_("No-bot mode is now \002on\002 on channel %s."), ci->name.c_str()); } else if (value.equals_ci("OFF")) { @@ -349,7 +349,7 @@ class CommandBSSetNoBot : public Command Log(override ? LOG_ADMIN : LOG_COMMAND, source, this, ci) << "to disable nobot"; ci->Shrink("BS_NOBOT"); - source.Reply(_("No Bot mode is now \002off\002 on channel %s."), ci->name.c_str()); + source.Reply(_("No-bot mode is now \002off\002 on channel %s."), ci->name.c_str()); } else this->OnSyntaxError(source, source.command); @@ -359,7 +359,7 @@ class CommandBSSetNoBot : public Command { this->SendSyntax(source); source.Reply(_(" \n" - "This option makes a channel be unassignable. If a bot \n" + "This option makes a channel be unassignable. If a bot\n" "is already assigned to the channel, it is unassigned\n" "automatically when you enable the option.")); return true; @@ -405,7 +405,7 @@ class CommandBSSetPrivate : public Command this->SendSyntax(source); source.Reply(_(" \n" "This option prevents a bot from being assigned to a\n" - "channel by users that aren't IRC operators.")); + "channel by users that aren't IRC Operators.")); return true; } }; diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp index fbec13303..5cbe3024e 100644 --- a/modules/commands/cs_access.cpp +++ b/modules/commands/cs_access.cpp @@ -604,7 +604,7 @@ class CommandCSLevels : public Command { Privilege *p = PrivilegeManager::FindPrivilege(what); if (p == NULL) - source.Reply(_("Setting \002%s\002 not known. Type \002%s%s HELP LEVELS \002 for a list of valid settings."), what.c_str(), Config->UseStrictPrivMsgString.c_str(), source.service->nick.c_str()); + source.Reply(_("Setting \002%s\002 not known. Type \002%s%s HELP LEVELS\002 for a list of valid settings."), what.c_str(), Config->UseStrictPrivMsgString.c_str(), source.service->nick.c_str()); else { ci->SetLevel(p->name, level); @@ -642,7 +642,7 @@ class CommandCSLevels : public Command } } - source.Reply(_("Setting \002%s\002 not known. Type \002%s%s HELP LEVELS \002 for a list of valid settings."), what.c_str(), Config->UseStrictPrivMsgString.c_str(), source.service->nick.c_str()); + source.Reply(_("Setting \002%s\002 not known. Type \002%s%s HELP LEVELS\002 for a list of valid settings."), what.c_str(), Config->UseStrictPrivMsgString.c_str(), source.service->nick.c_str()); return; } @@ -741,7 +741,7 @@ class CommandCSLevels : public Command { if (subcommand.equals_ci("DESC")) { - source.Reply(_("The following feature/function names are understood.")); + source.Reply(_("The following feature/function names are available:")); ListFormatter list; list.AddColumn("Name").AddColumn("Description"); diff --git a/modules/commands/cs_akick.cpp b/modules/commands/cs_akick.cpp index 1559113b8..3eea49097 100644 --- a/modules/commands/cs_akick.cpp +++ b/modules/commands/cs_akick.cpp @@ -479,7 +479,7 @@ class CommandCSAKick : public Command "optionally only those AutoKick entries which match the\n" "given mask.\n" " \n" - "The \002AKICK VIEW\002 command is a more verbose version of\n" + "The \002AKICK VIEW\002 command is a more verbose version of the\n" "\002AKICK LIST\002 command.\n" " \n" "The \002AKICK ENFORCE\002 command causes %s to enforce the\n" diff --git a/modules/commands/cs_ban.cpp b/modules/commands/cs_ban.cpp index 2ec40582d..2da17bb98 100644 --- a/modules/commands/cs_ban.cpp +++ b/modules/commands/cs_ban.cpp @@ -119,7 +119,7 @@ class CommandCSBan : public Command if (ban_time) { new TempBan(ban_time, c, mask); - source.Reply(_("Ban on \2%s\2 expires in %s."), mask.c_str(), Anope::Duration(ban_time, source.GetAccount()).c_str()); + source.Reply(_("Ban on \002%s\002 expires in %s."), mask.c_str(), Anope::Duration(ban_time, source.GetAccount()).c_str()); } } @@ -143,7 +143,7 @@ class CommandCSBan : public Command if (ban_time) { new TempBan(ban_time, c, target); - source.Reply(_("Ban on \2%s\2 expires in %s."), target.c_str(), Anope::Duration(ban_time, source.GetAccount()).c_str()); + source.Reply(_("Ban on \002%s\002 expires in %s."), target.c_str(), Anope::Duration(ban_time, source.GetAccount()).c_str()); } } diff --git a/modules/commands/cs_clone.cpp b/modules/commands/cs_clone.cpp index 631f69ec9..94e7c424f 100644 --- a/modules/commands/cs_clone.cpp +++ b/modules/commands/cs_clone.cpp @@ -102,7 +102,7 @@ public: FOREACH_MOD(I_OnChanRegistered, OnChanRegistered(target_ci)); - source.Reply(_("All settings from \002%s\002 have been cloned to \002%s\002"), channel.c_str(), target.c_str()); + source.Reply(_("All settings from \002%s\002 have been cloned to \002%s\002."), channel.c_str(), target.c_str()); } else if (what.equals_ci("ACCESS")) { @@ -122,7 +122,7 @@ public: target_ci->AddAccess(newaccess); } - source.Reply(_("All access entries from \002%s\002 have been cloned to \002%s\002"), channel.c_str(), target.c_str()); + source.Reply(_("All access entries from \002%s\002 have been cloned to \002%s\002."), channel.c_str(), target.c_str()); } else if (what.equals_ci("AKICK")) { @@ -136,7 +136,7 @@ public: target_ci->AddAkick(akick->creator, akick->mask, akick->reason, akick->addtime, akick->last_used); } - source.Reply(_("All akick entries from \002%s\002 have been cloned to \002%s\002"), channel.c_str(), target.c_str()); + source.Reply(_("All akick entries from \002%s\002 have been cloned to \002%s\002."), channel.c_str(), target.c_str()); } else if (what.equals_ci("BADWORDS")) { @@ -147,7 +147,7 @@ public: target_ci->AddBadWord(bw->word, bw->type); } - source.Reply(_("All badword entries from \002%s\002 have been cloned to \002%s\002"), channel.c_str(), target.c_str()); + source.Reply(_("All badword entries from \002%s\002 have been cloned to \002%s\002."), channel.c_str(), target.c_str()); } else { diff --git a/modules/commands/cs_drop.cpp b/modules/commands/cs_drop.cpp index 36912527f..b51add79c 100644 --- a/modules/commands/cs_drop.cpp +++ b/modules/commands/cs_drop.cpp @@ -73,10 +73,10 @@ class CommandCSDrop : public Command source.Reply(" "); if (source.IsServicesOper()) source.Reply(_("Unregisters the named channel. Only \002Services Operators\002\n" - "can drop a channel for which they have not identified.")); + "can drop a channel of which they are not the founder.")); else source.Reply(_("Unregisters the named channel. Can only be used by\n" - "\002channel founder\002.")); + "the \002channel founder\002.")); return true; } diff --git a/modules/commands/cs_enforce.cpp b/modules/commands/cs_enforce.cpp index cf080f1cc..e9ddb2943 100644 --- a/modules/commands/cs_enforce.cpp +++ b/modules/commands/cs_enforce.cpp @@ -253,15 +253,15 @@ class CommandCSEnforce : public Command source.Reply(_("Enforce various channel modes and set options. The \037channel\037\n" "option indicates what channel to enforce the modes and options\n" "on. The \037what\037 option indicates what modes and options to\n" - "enforce, and can be any of SECUREOPS, RESTRICTED, REGONLY, SSLONLY,\n" - "BANS, or LIMIT.\n" + "enforce, and can be any of \002SECUREOPS\002, \002RESTRICTED\002, \002REGONLY\002, \002SSLONLY\002,\n" + "\002BANS\002, or \002LIMIT\002.\n" " \n" - "Use SECUREOPS to enforce the SECUREOPS option, even if it is not\n" - "enabled. Use RESTRICTED to enfore the RESTRICTED option, also\n" - "if it's not enabled. Use REGONLY to kick all unregistered users\n" - "from the channel. Use SSLONLY to kick all users not using a secure\n" - "connection from the channel. BANS will enforce bans on the channel by\n" - "kicking users affected by them, and LIMIT will kick users until the\n" + "Use \002SECUREOPS\002 to enforce the SECUREOPS option, even if it is not\n" + "enabled. Use \002RESTRICTED\002 to enfore the RESTRICTED option, also\n" + "if it's not enabled. Use \002REGONLY\002 to kick all unregistered users\n" + "from the channel. Use \002SSLONLY\002 to kick all users not using a secure\n" + "connection from the channel. \002BANS\002 will enforce bans on the channel by\n" + "kicking users affected by them, and \002LIMIT\002 will kick users until the\n" "user count drops below the channel limit, if one is set.")); return true; } diff --git a/modules/commands/cs_fantasy_stats.cpp b/modules/commands/cs_fantasy_stats.cpp index 10222cb41..580307441 100644 --- a/modules/commands/cs_fantasy_stats.cpp +++ b/modules/commands/cs_fantasy_stats.cpp @@ -140,7 +140,7 @@ class CSStats : public Module res.Get(0, "actions").c_str()); } else - source.Reply(_("No stats for %s"), display.c_str()); + source.Reply(_("No stats for %s."), display.c_str()); } catch (const SQL::Exception &ex) { diff --git a/modules/commands/cs_fantasy_top.cpp b/modules/commands/cs_fantasy_top.cpp index 2af5cd0dd..16d65dd05 100644 --- a/modules/commands/cs_fantasy_top.cpp +++ b/modules/commands/cs_fantasy_top.cpp @@ -170,7 +170,7 @@ class CSTop : public Module } } else - source.Reply(_("No stats for %s"), is_global ? "Network" : channel.c_str()); + source.Reply(_("No stats for %s."), is_global ? "Network" : channel.c_str()); } catch (const SQL::Exception &ex) { diff --git a/modules/commands/cs_flags.cpp b/modules/commands/cs_flags.cpp index 7820d298f..9824ab22f 100644 --- a/modules/commands/cs_flags.cpp +++ b/modules/commands/cs_flags.cpp @@ -186,7 +186,7 @@ class CommandCSFlags : public Command } else { - source.Reply(_("Insufficient flags given")); + source.Reply(_("Insufficient flags given.")); } return; } @@ -348,19 +348,19 @@ class CommandCSFlags : public Command source.Reply(_("%s is another way to modify the channel access list, similar to\n" "the XOP and ACCESS methods."), source.command.c_str()); source.Reply(" "); - source.Reply(_("The MODIFY command allows you to modify the access list. If mask is\n" + source.Reply(_("The \002MODIFY\002 command allows you to modify the access list. If mask is\n" "not already on the access list is it added, then the changes are applied.\n" "If the mask has no more flags, then the mask is removed from the access list.\n" "Additionally, you may use +* or -* to add or remove all flags, respectively. You are\n" "only able to modify the access list if you have the proper permission on the channel,\n" "and even then you can only give other people access to up what you already have.")); source.Reply(" "); - source.Reply(_("The LIST command allows you to list existing entries on the channel access list.\n" + source.Reply(_("The \002LIST\002 command allows you to list existing entries on the channel access list.\n" "If a mask is given, the mask is wildcard matched against all existing entries on the\n" "access list, and only those entries are returned. If a set of flags is given, only those\n" "on the access list with the specified flags are returned.")); source.Reply(" "); - source.Reply(_("The CLEAR command clears the channel access list, which requires channel founder.")); + source.Reply(_("The \002CLEAR\002 command clears the channel access list, which requires channel founder.")); source.Reply(" "); source.Reply(_("The available flags are:")); diff --git a/modules/commands/cs_kick.cpp b/modules/commands/cs_kick.cpp index cfc8908c4..062c8f04d 100644 --- a/modules/commands/cs_kick.cpp +++ b/modules/commands/cs_kick.cpp @@ -18,7 +18,7 @@ class CommandCSKick : public Command public: CommandCSKick(Module *creator) : Command(creator, "chanserv/kick", 2, 3) { - this->SetDesc(_("Kicks a selected nick from a channel")); + this->SetDesc(_("Kicks a specified nick from a channel")); this->SetSyntax(_("\037channel\037 \037nick\037 [\037reason\037]")); this->SetSyntax(_("\037channel\037 \037mask\037 [\037reason\037]")); } @@ -112,7 +112,7 @@ class CommandCSKick : public Command { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Kicks a selected nick on a channel.\n" + source.Reply(_("Kicks a specified nick from a channel.\n" " \n" "By default, limited to AOPs or those with level 5 access\n" "and above on the channel. Channel founders may use masks too.")); diff --git a/modules/commands/cs_list.cpp b/modules/commands/cs_list.cpp index 09e89c219..d762a54ba 100644 --- a/modules/commands/cs_list.cpp +++ b/modules/commands/cs_list.cpp @@ -144,11 +144,15 @@ class CommandCSList : public Command " Lists all registered channels which have been set to not expire.\n" " \n" " \002LIST #51-100\002\n" - " Lists all registered channels within the given range (51-100).\n")); + " Lists all registered channels within the given range (51-100).")); + if (!Config->RegexEngine.empty()) - source.Reply(" \n" - "Regex matches are also supported using the %s engine.\n" - "Enclose your pattern in // if this desired.", Config->RegexEngine.c_str()); + { + source.Reply(" "); + source.Reply(_("Regex matches are also supported using the %s engine.\n" + "Enclose your pattern in // if this is desired."), Config->RegexEngine.c_str()); + } + return true; } }; diff --git a/modules/commands/cs_seen.cpp b/modules/commands/cs_seen.cpp index 76cfe1eb9..95194a3e7 100644 --- a/modules/commands/cs_seen.cpp +++ b/modules/commands/cs_seen.cpp @@ -113,8 +113,8 @@ class CommandOSSeen : public Command CommandOSSeen(Module *creator) : Command(creator, "operserv/seen", 1, 2) { this->SetDesc(_("Statistics and maintenance for seen data")); - this->SetSyntax(_("\037STATS\037")); - this->SetSyntax(_("\037CLEAR\037 \037time\037")); + this->SetSyntax(_("STATS")); + this->SetSyntax(_("CLEAR \037time\037")); } void Execute(CommandSource &source, const std::vector ¶ms) anope_override @@ -132,7 +132,7 @@ class CommandOSSeen : public Command mem_counter += it->second->channel.capacity(); mem_counter += it->second->message.capacity(); } - source.Reply(_("%lu nicks are stored in the database, using %.2Lf kB of memory"), database.size(), static_cast(mem_counter) / 1024); + source.Reply(_("%lu nicks are stored in the database, using %.2Lf kB of memory."), database.size(), static_cast(mem_counter) / 1024); } else if (params[0].equals_ci("CLEAR")) { @@ -158,7 +158,7 @@ class CommandOSSeen : public Command } } Log(LOG_ADMIN, source, this) << "CLEAR and removed " << counter << " nicks that were added after " << Anope::strftime(time, NULL, true); - source.Reply(_("Database cleared, removed %lu nicks that were added after %s"), counter, Anope::strftime(time, source.nc, true).c_str()); + source.Reply(_("Database cleared, removed %lu nicks that were added after %s."), counter, Anope::strftime(time, source.nc, true).c_str()); } else this->SendSyntax(source); @@ -173,8 +173,8 @@ class CommandOSSeen : public Command "entries from the database that were added within \037time\037.\n" " \n" "Example:\n" - "%s CLEAR 30m\n" - "will remove all entries that were added within the last 30 minutes."), source.command.c_str()); + " %s CLEAR 30m\n" + " Will remove all entries that were added within the last 30 minutes."), source.command.c_str()); return true; } }; @@ -194,7 +194,7 @@ class CommandSeen : public Command if (target.length() > Config->NickLen) { - source.Reply(_("Nick too long, max length is %u chars"), Config->NickLen); + source.Reply(_("Nick too long, max length is %u characters."), Config->NickLen); return; } @@ -238,7 +238,7 @@ class CommandSeen : public Command if (u2) onlinestatus = Anope::printf( _(". %s is still online."), u2->nick.c_str()); else - onlinestatus = Anope::printf(_(", but %s mysteriously dematerialized"), info->nick2.c_str()); + onlinestatus = Anope::printf(_(", but %s mysteriously dematerialized."), info->nick2.c_str()); source.Reply(_("%s (%s) was last seen changing nick to %s %s ago%s"), target.c_str(), info->vhost.c_str(), info->nick2.c_str(), timebuf.c_str(), onlinestatus.c_str()); @@ -308,12 +308,12 @@ class DataBasePurger : public CallBack if ((Anope::CurTime - cur->second->last) > purgetime) { - Log(LOG_DEBUG) << cur->first << " was last seen " << Anope::strftime(cur->second->last) << ", purging entry"; + Log(LOG_DEBUG) << cur->first << " was last seen " << Anope::strftime(cur->second->last) << ", purging entries"; cur->second->Destroy(); database.erase(cur); } } - Log(LOG_DEBUG) << "cs_seen: Purged Database, checked " << previous_size << " nicks and removed " << (previous_size - database.size()) << " old entries."; + Log(LOG_DEBUG) << "cs_seen: Purged database, checked " << previous_size << " nicks and removed " << (previous_size - database.size()) << " old entries."; } }; diff --git a/modules/commands/cs_set.cpp b/modules/commands/cs_set.cpp index 49ad2acf3..8c6aa48c1 100644 --- a/modules/commands/cs_set.cpp +++ b/modules/commands/cs_set.cpp @@ -131,12 +131,12 @@ class CommandCSSetAutoOp : public Command if (params[1].equals_ci("ON")) { ci->Shrink("NOAUTOOP"); - source.Reply(_("Services will now automatically give modes to users in \2%s\2"), ci->name.c_str()); + source.Reply(_("Services will now automatically give modes to users in \002%s\002."), ci->name.c_str()); } else if (params[1].equals_ci("OFF")) { ci->ExtendMetadata("NOAUTOOP"); - source.Reply(_("Services will no longer automatically give modes to users in \2%s\2"), ci->name.c_str()); + source.Reply(_("Services will no longer automatically give modes to users in \002%s\002."), ci->name.c_str()); } else this->OnSyntaxError(source, "AUTOOP"); @@ -148,7 +148,7 @@ class CommandCSSetAutoOp : public Command source.Reply(" "); source.Reply(_("Enables or disables %s's autoop feature for a\n" "channel. When disabled, users who join the channel will\n" - "not automatically gain any status from %s"), Config->ChanServ.c_str(), + "not automatically gain any status from %s."), Config->ChanServ.c_str(), Config->ChanServ.c_str(), this->name.c_str()); return true; } @@ -206,7 +206,7 @@ class CommandCSSetBanType : public Command source.Reply(_("Sets the ban type that will be used by services whenever\n" "they need to ban someone from your channel.\n" " \n" - "bantype is a number between 0 and 3 that means:\n" + "Bantype is a number between 0 and 3 that means:\n" " \n" "0: ban in the form *!user@host\n" "1: ban in the form *!*user@host\n" @@ -248,12 +248,12 @@ class CommandCSSetChanstats : public Command if (params[1].equals_ci("ON")) { ci->ExtendMetadata("STATS"); - source.Reply(_("Chanstats statistics are now enabled for this channel")); + source.Reply(_("Chanstats statistics are now enabled for this channel.")); } else if (params[1].equals_ci("OFF")) { ci->Shrink("STATS"); - source.Reply(_("Chanstats statistics are now disabled for this channel")); + source.Reply(_("Chanstats statistics are now disabled for this channel.")); } else this->OnSyntaxError(source, ""); @@ -264,7 +264,7 @@ class CommandCSSetChanstats : public Command { this->SendSyntax(source); source.Reply(" "); - source.Reply("Turn Chanstats channel statistics ON or OFF"); + source.Reply("Turn Chanstats channel statistics ON or OFF."); return true; } }; @@ -650,7 +650,7 @@ class CommandCSSetPrivate : public Command public: CommandCSSetPrivate(Module *creator, const Anope::string &cname = "chanserv/set/private") : Command(creator, cname, 2, 2) { - this->SetDesc(_("Hide channel from LIST command")); + this->SetDesc(_("Hide channel from the LIST command")); this->SetSyntax(_("\037channel\037 {ON | OFF}")); } @@ -935,7 +935,7 @@ class CommandCSSetSignKick : public Command public: CommandCSSetSignKick(Module *creator, const Anope::string &cname = "chanserv/set/signkick") : Command(creator, cname, 2, 2) { - this->SetDesc(_("Sign kicks that are done with KICK command")); + this->SetDesc(_("Sign kicks that are done with the KICK command")); this->SetSyntax(_("\037channel\037 SIGNKICK {ON | LEVEL | OFF}")); } @@ -969,7 +969,7 @@ class CommandCSSetSignKick : public Command { ci->ExtendMetadata("SIGNKICK_LEVEL"); ci->Shrink("SIGNKICK"); - source.Reply(_("Signed kick option for %s is now \002ON\002, but depends of the\n" + source.Reply(_("Signed kick option for %s is now \002on\002, but depends of the\n" "level of the user that is using the command."), ci->name.c_str()); } else if (params[1].equals_ci("OFF")) diff --git a/modules/commands/cs_status.cpp b/modules/commands/cs_status.cpp index 078de28e0..1d1aa619c 100644 --- a/modules/commands/cs_status.cpp +++ b/modules/commands/cs_status.cpp @@ -50,20 +50,20 @@ public: } if (ag.super_admin) - source.Reply(_("\2%s\2 is a super administrator."), nick.c_str()); + source.Reply(_("\002%s\002 is a super administrator."), nick.c_str()); else if (ag.founder) - source.Reply(_("\2%s\2 is the channel founder."), nick.c_str()); + source.Reply(_("\002%s\002 is the channel founder."), nick.c_str()); else if (ag.empty()) - source.Reply(_("\2%s\2 has no access on \2%s\2."), nick.c_str(), ci->name.c_str()); + source.Reply(_("\002%s\002 has no access on \002%s\002."), nick.c_str(), ci->name.c_str()); else { - source.Reply(_("Access for \2%s\2 on \2%s\2"), nick.c_str(), ci->name.c_str()); + source.Reply(_("Access for \002%s\002 on \002%s\002:"), nick.c_str(), ci->name.c_str()); for (unsigned i = 0; i < ag.size(); ++i) { ChanAccess *acc = ag[i]; - source.Reply(_("\2%s\2 matches access entry %s, which has privilege %s."), nick.c_str(), acc->mask.c_str(), acc->AccessSerialize().c_str()); + source.Reply(_("\002%s\002 matches access entry %s, which has privilege %s."), nick.c_str(), acc->mask.c_str(), acc->AccessSerialize().c_str()); } } @@ -74,13 +74,13 @@ public: if (autokick->nc) { if (na && *autokick->nc == na->nc) - source.Reply(_("\2%s\2 is on the auto kick list (%s)."), na->nc->display.c_str(), autokick->reason.c_str()); + source.Reply(_("\002%s\002 is on the auto kick list (%s)."), na->nc->display.c_str(), autokick->reason.c_str()); } else if (u != NULL) { Entry akick_mask("", autokick->mask); if (akick_mask.Matches(u)) - source.Reply(_("\2%s\2 matches auto kick entry %s (%s)."), u->nick.c_str(), autokick->mask.c_str(), autokick->reason.c_str()); + source.Reply(_("\002%s\002 matches auto kick entry %s (%s)."), u->nick.c_str(), autokick->mask.c_str(), autokick->reason.c_str()); } } } diff --git a/modules/commands/cs_suspend.cpp b/modules/commands/cs_suspend.cpp index 594d72772..fdfd2d55a 100644 --- a/modules/commands/cs_suspend.cpp +++ b/modules/commands/cs_suspend.cpp @@ -92,7 +92,7 @@ class CommandCSSuspend : public Command this->SendSyntax(source); source.Reply(" "); source.Reply(_("Disallows anyone from using the given channel.\n" - "May be cancelled by using the UNSUSPEND\n" + "May be cancelled by using the \002UNSUSPEND\002\n" "command to preserve all previous channel data/settings.\n" "If an expiry is given the channel will be unsuspended after\n" "that period of time, else the default expiry from the" @@ -128,7 +128,7 @@ class CommandCSUnSuspend : public Command /* Only UNSUSPEND already suspended channels */ if (!ci->HasExt("SUSPENDED")) { - source.Reply(_("Channel \2%s\2 isn't suspended."), ci->name.c_str()); + source.Reply(_("Channel \002%s\002 isn't suspended."), ci->name.c_str()); return; } diff --git a/modules/commands/cs_topic.cpp b/modules/commands/cs_topic.cpp index 6518b0959..8b55a2da4 100644 --- a/modules/commands/cs_topic.cpp +++ b/modules/commands/cs_topic.cpp @@ -97,12 +97,12 @@ class CommandCSTopic : public Command this->SendSyntax(source); source.Reply(" "); source.Reply(_("Allows manipulating the topic of the specified channel.\n" - "The \2SET\2 command changes the topic of the channel to the given topic\n" - "or unsets the topic if no topic is given. The \2APPEND\2 command appends\n" + "The \002SET\002 command changes the topic of the channel to the given topic\n" + "or unsets the topic if no topic is given. The \002APPEND\002 command appends\n" "the given topic to the existing topic.\n" " \n" - "\2LOCK\2 and \2UNLOCK\2 may be used to enable and disable topic lock. When\n" - "topic lock is set, the channel topic will be unchangable except via this command.")); + "\002LOCK\002 and \002UNLOCK\002 may be used to enable and disable topic lock. When\n" + "topic lock is set, the channel topic will be unchangeable except via this command.")); return true; } }; diff --git a/modules/commands/cs_updown.cpp b/modules/commands/cs_updown.cpp index bfd9574a9..196fce2e2 100644 --- a/modules/commands/cs_updown.cpp +++ b/modules/commands/cs_updown.cpp @@ -108,7 +108,7 @@ class CommandCSDown : public Command this->SendSyntax(source); source.Reply(" "); source.Reply(_("Removes your status modes on a channel. If \037channel\037 is ommited\n" - "your channel status is remove on every channel you are in.")); + "your channel status is removed on every channel you are in.")); return true; } }; diff --git a/modules/commands/cs_xop.cpp b/modules/commands/cs_xop.cpp index 82ceab604..72197aeec 100644 --- a/modules/commands/cs_xop.cpp +++ b/modules/commands/cs_xop.cpp @@ -622,11 +622,11 @@ class CommandCSQOP : public XOPBase " 7 through 9.\n" " \n" "The \002QOP CLEAR\002 command clears all entries of the\n" - "QOP list.\n")); + "QOP list.")); source.Reply(_(" \n" "The \002QOP\002 commands are limited to founders\n" "(unless SECUREOPS is off). However, any user on the\n" - "VOP list may use the \002QOP LIST\002 command.\n" + "VOP list or above may use the \002QOP LIST\002 command.\n" " \n")); source.Reply(_("Alternative methods of modifying channel access lists are\n" "available. See \002%s%s HELP ACCESS\002 for information\n" @@ -676,12 +676,12 @@ class CommandCSAOP : public XOPBase " 7 through 9.\n" " \n" "The \002AOP CLEAR\002 command clears all entries of the\n" - "AOP list.\n")); + "AOP list.")); source.Reply(_(" \n" "The \002AOP ADD\002 and \002AOP DEL\002 commands are limited to\n" "SOPs or above, while the \002AOP CLEAR\002 command can only\n" "be used by the channel founder. However, any user on the\n" - "VOP list may use the \002AOP LIST\002 command.\n" + "VOP list or above may use the \002AOP LIST\002 command.\n" " \n")); source.Reply(_("Alternative methods of modifying channel access lists are\n" "available. See \002%s%s HELP ACCESS\002 for information\n" @@ -730,7 +730,7 @@ class CommandCSHOP : public XOPBase " 7 through 9.\n" " \n" "The \002HOP CLEAR\002 command clears all entries of the\n" - "HOP list.\n")); + "HOP list.")); source.Reply(_(" \n" "The \002HOP ADD\002 and \002HOP DEL\002 commands are limited\n" "to SOPs or above, while \002HOP LIST\002 is available to VOPs\n" @@ -785,11 +785,11 @@ class CommandCSSOP : public XOPBase " 7 through 9.\n" " \n" "The \002SOP CLEAR\002 command clears all entries of the\n" - "SOP list.\n")); + "SOP list.")); source.Reply(_(" \n" "The \002SOP ADD\002, \002SOP DEL\002 and \002SOP CLEAR\002 commands are\n" "limited to the channel founder. However, any user on the\n" - "VOP list may use the \002SOP LIST\002 command.\n" + "VOP list or above may use the \002SOP LIST\002 command.\n" " \n")); source.Reply(_("Alternative methods of modifying channel access lists are\n" "available. See \002%s%s HELP ACCESS\002 for information\n" @@ -838,7 +838,7 @@ class CommandCSVOP : public XOPBase " 7 through 9.\n" " \n" "The \002VOP CLEAR\002 command clears all entries of the\n" - "VOP list.\n")); + "VOP list.")); source.Reply(_(" \n" "The \002VOP ADD\002 and \002VOP DEL\002 commands are limited\n" "to SOPs or above, while \002VOP LIST\002 is available to VOPs\n" diff --git a/modules/commands/gl_global.cpp b/modules/commands/gl_global.cpp index 77360075d..7cc4dbdc8 100644 --- a/modules/commands/gl_global.cpp +++ b/modules/commands/gl_global.cpp @@ -42,7 +42,7 @@ class CommandGLGlobal : public Command { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Allows Administrators to send messages to all users on the \n" + source.Reply(_("Allows Administrators to send messages to all users on the\n" "network. The message will be sent from the nick \002%s\002."), source.service->nick.c_str()); return true; } diff --git a/modules/commands/help.cpp b/modules/commands/help.cpp index 890964fc9..fcac6863c 100644 --- a/modules/commands/help.cpp +++ b/modules/commands/help.cpp @@ -54,7 +54,7 @@ class CommandHelp : public Command GroupInfo groups; if (all) - source.Reply(_("All available commands for \2%s\2:"), source.service->nick.c_str()); + source.Reply(_("All available commands for \002%s\002:"), source.service->nick.c_str()); for (CommandInfo::map::const_iterator it = map.begin(), it_end = map.end(); it != it_end; ++it) { @@ -124,7 +124,7 @@ class CommandHelp : public Command if (!groups.empty()) { source.Reply(" "); - source.Reply(_("Use the \2%s ALL\2 command to list all command descriptions."), source_command.c_str()); + source.Reply(_("Use the \002%s ALL\002 command to list all commands and their descriptions."), source_command.c_str()); } } else diff --git a/modules/commands/hs_group.cpp b/modules/commands/hs_group.cpp index 5263f55b8..9027fddac 100644 --- a/modules/commands/hs_gr