Some more typo and help text fixes, proper formatting of control codes, missing privileges, and settings corrections.

76 files changed, 516 insertions, 473 deletions

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<Anope::string> 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<Anope::string> &params) 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