Fix typos, remove dead language defines.

os_set: Add missing debug text in help output.

30 files changed, 106 insertions, 92 deletions

diff --git a/include/language.h b/include/language.h
index 9447119ad..6e2e9cd0b 100644
--- a/include/language.h
+++ b/include/language.h
@@ -85,12 +85,9 @@ namespace Language
 #define CHAN_X_NOT_IN_USE		_("Channel \002%s\002 doesn't exist.")
 #define NICK_IDENTIFY_REQUIRED		_("Password authentication required for that command.")
 #define MAIL_X_INVALID			_("\002%s\002 is not a valid e-mail address.")
-#define NO_REASON			_("No reason")
 #define UNKNOWN				_("<unknown>")
 #define NO_EXPIRE			_("does not expire")
 #define LIST_INCORRECT_RANGE		_("Incorrect range specified. The correct syntax is \002#\037from\037-\037to\037\002.")
-#define UNKNOWN_OPTION			_("Unknown option \002%s\002.\n" \
-						"Type %s%s HELP %s for more information.")
 #define NICK_IS_REGISTERED		_("This nick is owned by someone else.  Please choose another.\n" \
 						"(If this is your nick, type \002%s%s IDENTIFY \037password\037\002.)")
 #define NICK_IS_SECURE			_("This nickname is registered and protected.  If it is your\n" \
@@ -99,24 +96,15 @@ namespace Language
 #define FORCENICKCHANGE_NOW		_("This nickname has been registered; you may not use it.")
 #define NICK_CANNOT_BE_REGISTERED	_("Nickname \002%s\002 may not be registered.")
 #define NICK_ALREADY_REGISTERED		_("Nickname \002%s\002 is already registered!")
-#define NICK_SET_SYNTAX			_("SET \037option\037 \037parameters\037")
-#define NICK_SET_DISABLED		_("Sorry, nickname option setting is temporarily disabled.")
-#define NICK_SET_UNKNOWN_OPTION		_("Unknown SET option \002%s%s\002.")
 #define NICK_SET_DISPLAY_CHANGED	_("The new display is now \002%s\002.")
-#define NICK_LIST_SYNTAX		_("LIST \037pattern\037")
-#define NICK_RECOVERED			_("User claiming your nick has been killed.\n" \
-						"\002%s%s RELEASE %s\002 to get it back before %s timeout.")
-#define NICK_REQUESTED			_("This nick has already been requested, please check your e-mail address for the pass code")
-#define NICK_CONFIRM_INVALID		_("Invalid passcode has been entered, please check the e-mail again, and retry")
+#define NICK_CONFIRM_INVALID		_("Invalid passcode has been entered, please check the e-mail again, and retry.")
 #define CHAN_NOT_ALLOWED_TO_JOIN	_("You are not permitted to be on this channel.")
 #define CHAN_X_INVALID			_("Channel %s is not a valid channel.")
 #define CHAN_REACHED_CHANNEL_LIMIT	_("Sorry, you have already reached your limit of \002%d\002 channels.")
 #define CHAN_EXCEEDED_CHANNEL_LIMIT	_("Sorry, you have already exceeded your limit of \002%d\002 channels.")
-#define CHAN_SYMBOL_REQUIRED		_("Please use the symbol of \002#\002 when attempting to register")
-#define CHAN_SET_DISABLED		_("Sorry, channel option setting is temporarily disabled.")
+#define CHAN_SYMBOL_REQUIRED		_("Please use the symbol of \002#\002 when attempting to register.")
 #define CHAN_SETTING_CHANGED		_("%s for %s set to %s.")
 #define CHAN_SETTING_UNSET		_("%s for %s unset.")
-#define CHAN_SET_MLOCK_DEPRECATED	_("MLOCK is deprecated. Use \002%s%s HELP MODE\002 instead.")
 #define CHAN_ACCESS_LEVEL_RANGE		_("Access level must be between %d and %d inclusive.")
 #define CHAN_INFO_HEADER		_("Information for channel \002%s\002:")
 #define CHAN_EXCEPTED			_("\002%s\002 matches an except on %s and cannot be banned until the except have been removed.")
@@ -126,17 +114,16 @@ namespace Language
 						"Type \002%s%s READ %d\002 to read it.")
 #define MEMO_HAVE_NO_MEMOS		_("You have no memos.")
 #define MEMO_X_HAS_NO_MEMOS		_("%s has no memos.")
-#define MEMO_SEND_SYNTAX		_("SEND {\037nick\037 | \037channel\037} \037memo-text\037")
 #define MEMO_SEND_DISABLED		_("Sorry, memo sending is temporarily disabled.")
 #define MEMO_HAVE_NO_NEW_MEMOS		_("You have no new memos.")
 #define MEMO_X_HAS_NO_NEW_MEMOS		_("%s has no new memos.")
 #define BOT_DOES_NOT_EXIST		_("Bot \002%s\002 does not exist.")
 #define BOT_NOT_ASSIGNED		_("You must assign a bot to the channel before using this command.")
 #define BOT_NOT_ON_CHANNEL		_("Bot is not on channel \002%s\002.")
-#define HOST_SET_ERROR			_("A vhost must be in the format of a valid hostmask.")
-#define HOST_SET_IDENT_ERROR		_("A vhost ident must be in the format of a valid ident")
-#define HOST_SET_TOOLONG		_("Error! The vhost is too long, please use a host shorter than %d characters.")
-#define HOST_SET_IDENTTOOLONG		_("Error! The Ident is too long, please use an ident shorter than %d characters.")
-#define HOST_NOT_ASSIGNED		_("Please contact an Operator to get a vhost assigned to this nick.")
-#define HOST_NO_VIDENT			_("Your IRCD does not support vIdent's, if this is incorrect, please report this as a possible bug")
+#define HOST_SET_ERROR			_("A vHost must be in the format of a valid hostname.")
+#define HOST_SET_IDENT_ERROR		_("A vHost ident must be in the format of a valid ident.")
+#define HOST_SET_TOOLONG		_("Error! The vHost is too long, please use a hostname shorter than %d characters.")
+#define HOST_SET_IDENTTOOLONG		_("Error! The vHost ident is too long, please use an ident shorter than %d characters.")
+#define HOST_NOT_ASSIGNED		_("Please contact an Operator to get a vHost assigned to this nick.")
+#define HOST_NO_VIDENT			_("Your IRCd does not support vIdent's, if this is incorrect, please report this as a possible bug")
 
diff --git a/modules/commands/bs_assign.cpp b/modules/commands/bs_assign.cpp
index 96e75682f..1704aa09a 100644
--- a/modules/commands/bs_assign.cpp
+++ b/modules/commands/bs_assign.cpp
@@ -75,7 +75,7 @@ class CommandBSAssign : public Command
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Assigns a bot pointed out by nick to the channel chan. You\n"
+		source.Reply(_("Assigns a bot pointed out by nick to a channel. You\n"
 				"can then configure the bot for the channel so it fits\n"
 				"your needs."));
 		return true;
@@ -139,7 +139,7 @@ class CommandBSUnassign : public Command
 		source.Reply(_("Unassigns a bot from a channel. When you use this command,\n"
 				"the bot won't join the channel anymore. However, bot\n"
 				"configuration for the channel is kept, so you will always\n"
-				"be able to reassign a bot later without have to reconfigure\n"
+				"be able to reassign a bot later without having to reconfigure\n"
 				"it entirely."));
 		return true;
 	}
diff --git a/modules/commands/bs_bot.cpp b/modules/commands/bs_bot.cpp
index 020044aef..8e090a4c6 100644
--- a/modules/commands/bs_bot.cpp
+++ b/modules/commands/bs_bot.cpp
@@ -348,9 +348,11 @@ class CommandBSBot : public Command
 				"\002BOT ADD\002 adds a bot with the given nickname, username,\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"
+				" \n"
+				"\002BOT CHANGE\002 allows to change the nickname, username, hostname\n"
+				"or realname of a bot without actually having to delete it (and\n"
+				"all the data associated with it).\n"
+				" \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"
diff --git a/modules/commands/bs_kick.cpp b/modules/commands/bs_kick.cpp
index 6f8c3cd65..8cf90e5b7 100644
--- a/modules/commands/bs_kick.cpp
+++ b/modules/commands/bs_kick.cpp
@@ -270,6 +270,7 @@ class CommandBSKickAMSG : public CommandBSKickBase
 		source.Reply(_("Sets the AMSG kicker on or off. When enabled, the bot will\n"
 				"kick users who send the same message to multiple channels\n"
 				"where BotServ bots are.\n"
+				" \n"
 				"\037ttb\037 is the number of times a user can be kicked\n"
 				"before they get banned. Don't give ttb to disable\n"
 				"the ban system once activated."));
@@ -306,8 +307,9 @@ class CommandBSKickBadwords : public CommandBSKickBase
 				"You can define bad words for your channel using the\n"
 				"\002BADWORDS\002 command. Type \002%s%s HELP BADWORDS\002 for\n"
 				"more information.\n"
-				"ttb is the number of times a user can be kicked\n"
-				"before it get banned. Don't give ttb to disable\n"
+				" \n"
+				"\037ttb\037 is the number of times a user can be kicked\n"
+				"before it gets banned. Don't give ttb to disable\n"
 				"the ban system once activated."), Config->StrictPrivmsg.c_str(), source.service->nick.c_str());
 		return true;
 	}
@@ -337,8 +339,9 @@ class CommandBSKickBolds : public CommandBSKickBase
 	{
 		source.Reply(_("Sets the bolds kicker on or off. When enabled, this\n"
 				"option tells the bot to kick users who use bolds.\n"
-				"ttb is the number of times a user can be kicked\n"
-				"before it get banned. Don't give ttb to disable\n"
+				" \n"
+				"\037ttb\037 is the number of times a user can be kicked\n"
+				"before it gets banned. Don't give ttb to disable\n"
 				"the ban system once activated."));
 		return true;
 	}
@@ -430,8 +433,9 @@ class CommandBSKickCaps : public CommandBSKickBase
 				"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"
-				"before it get banned. Don't give ttb to disable\n"
+				" \n"
+				"\037ttb\037 is the number of times a user can be kicked\n"
+				"before it gets banned. Don't give ttb to disable\n"
 				"the ban system once activated."));
 		return true;
 	}
@@ -461,8 +465,9 @@ class CommandBSKickColors : public CommandBSKickBase
 	{
 		source.Reply(_("Sets the colors kicker on or off. When enabled, this\n"
 				"option tells the bot to kick users who use colors.\n"
-				"ttb is the number of times a user can be kicked\n"
-				"before it get banned. Don't give ttb to disable\n"
+				" \n"
+				"\037ttb\037 is the number of times a user can be kicked\n"
+				"before it gets banned. Don't give ttb to disable\n"
 				"the ban system once activated."));
 		return true;
 	}
@@ -557,8 +562,8 @@ class CommandBSKickFlood : public CommandBSKickBase
 				"the channel using at least \002ln\002 lines in \002secs\002 seconds\n"
 				"(if not given, it defaults to 6 lines in 10 seconds).\n"
 				" \n"
-				"ttb is the number of times a user can be kicked\n"
-				"before it get banned. Don't give ttb to disable\n"
+				"\037ttb\037 is the number of times a user can be kicked\n"
+				"before it gets banned. Don't give ttb to disable\n"
 				"the ban system once activated."));
 		return true;
 	}
@@ -588,8 +593,9 @@ class CommandBSKickItalics : public CommandBSKickBase
 	{
 		source.Reply(_("Sets the italics kicker on or off. When enabled, this\n"
 				"option tells the bot to kick users who use italics.\n"
-				"ttb is the number of times a user can be kicked\n"
-				"before it get banned. Don't give ttb to disable\n"
+				" \n"
+				"\037ttb\037 is the number of times a user can be kicked\n"
+				"before it gets banned. Don't give ttb to disable\n"
 				"the ban system once activated."));
 		return true;
 	}
@@ -673,8 +679,9 @@ class CommandBSKickRepeat : public CommandBSKickBase
 				"option tells the bot to kick users who are repeating\n"
 				"themselves \002num\002 times (if num is not given, it\n"
 				"defaults to 3).\n"
-				"ttb is the number of times a user can be kicked\n"
-				"before it get banned. Don't give ttb to disable\n"
+				" \n"
+				"\037ttb\037 is the number of times a user can be kicked\n"
+				"before it gets banned. Don't give ttb to disable\n"
 				"the ban system once activated."));
 		return true;
 	}
@@ -704,8 +711,9 @@ class CommandBSKickReverses : public CommandBSKickBase
 	{
 		source.Reply(_("Sets the reverses kicker on or off. When enabled, this\n"
 				"option tells the bot to kick users who use reverses.\n"
-				"ttb is the number of times a user can be kicked\n"
-				"before it get banned. Don't give ttb to disable\n"
+				" \n"
+				"\037ttb\037 is the number of times a user can be kicked\n"
+				"before it gets banned. Don't give ttb to disable\n"
 				"the ban system once activated."));
 		return true;
 	}
@@ -735,8 +743,9 @@ class CommandBSKickUnderlines : public CommandBSKickBase
 	{
 		source.Reply(_("Sets the underlines kicker on or off. When enabled, this\n"
 			"option tells the bot to kick users who use underlines.\n"
-			"ttb is the number of times a user can be kicked\n"
-			"before it get banned. Don't give ttb to disable\n"
+			" \n"
+			"\037ttb\037 is the number of times a user can be kicked\n"
+			"before it gets banned. Don't give ttb to disable\n"
 			"the ban system once activated."));
 		return true;
 	}
diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp
index 0abc5456f..b0419e1e2 100644
--- a/modules/commands/cs_access.cpp
+++ b/modules/commands/cs_access.cpp
@@ -550,7 +550,7 @@ class CommandCSAccess : public Command
 				"highest level entry in the access list."));
 		if (!Config->GetModule("chanserv")->Get<bool>("disallow_channel_access"))
 			source.Reply(_("The given mask may also be a channel, which will use the\n"
-					"access list from the other channel up to the given \037level\037"));
+					"access list from the other channel up to the given \037level\037."));
 		source.Reply(" ");
 		source.Reply(_("The \002ACCESS DEL\002 command removes the given nick from the\n"
 				"access list.  If a list of entry numbers is given, those\n"
diff --git a/modules/commands/cs_mode.cpp b/modules/commands/cs_mode.cpp
index f586f2c2a..e4ca072aa 100644
--- a/modules/commands/cs_mode.cpp
+++ b/modules/commands/cs_mode.cpp
@@ -812,9 +812,9 @@ class CommandCSModes : public Command
 		if (!m.second.empty())
 		{
 			if (m.first)
-				return Anope::printf(_("Gives you or the specific nick %s status on a channel"), m.second.c_str());
+				return Anope::printf(_("Gives you or the specified nick %s status on a channel"), m.second.c_str());
 			else
-				return Anope::printf(_("Removes %s status from you or the specific on a channel"), m.second.c_str());
+				return Anope::printf(_("Removes %s status from you or the specified nick on a channel"), m.second.c_str());
 		}
 		else
 			return "";
diff --git a/modules/commands/cs_register.cpp b/modules/commands/cs_register.cpp
index 135f833be..e10eda6fd 100644
--- a/modules/commands/cs_register.cpp
+++ b/modules/commands/cs_register.cpp
@@ -98,7 +98,8 @@ class CommandCSRegister : public Command
 		BotInfo *bi;
 		Anope::string cmd;
 		if (Command::FindCommandFromService("chanserv/access", bi, cmd))
-			source.Reply(_("See the \002%s002 command (\002%s%s HELP ACCESS\002) for\n"
+			source.Reply(_(" \n"
+				"See the \002%s\002 command (\002%s%s HELP ACCESS\002) for\n"
 				"information on giving a subset of these privileges to\n"
 				"other channel users.\n"), cmd.c_str(), Config->StrictPrivmsg.c_str(), bi->nick.c_str());
 		source.Reply(_(" \n"
diff --git a/modules/commands/cs_suspend.cpp b/modules/commands/cs_suspend.cpp
index 0326b38ba..241d28453 100644
--- a/modules/commands/cs_suspend.cpp
+++ b/modules/commands/cs_suspend.cpp
@@ -128,7 +128,7 @@ class CommandCSSuspend : public Command
 				"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"
+				"that period of time, else the default expiry from the\n"
 				"configuration is used.\n"
 				" \n"
 				"Reason may be required on certain networks."));
diff --git a/modules/commands/ms_list.cpp b/modules/commands/ms_list.cpp
index dff88667b..036b5b382 100644
--- a/modules/commands/ms_list.cpp
+++ b/modules/commands/ms_list.cpp
@@ -128,7 +128,7 @@ class CommandMSList : public Command
 			std::vector<Anope::string> replies;
 			list.Process(replies);
 
-			source.Reply(_("Memos for %s."), ci ? ci->name.c_str() : source.GetNick().c_str());
+			source.Reply(_("Memos for %s:"), ci ? ci->name.c_str() : source.GetNick().c_str());
 			for (unsigned i = 0; i < replies.size(); ++i)
 				source.Reply(replies[i]);
 		}
diff --git a/modules/commands/ms_set.cpp b/modules/commands/ms_set.cpp
index 03851a5f8..7fc426ee6 100644
--- a/modules/commands/ms_set.cpp
+++ b/modules/commands/ms_set.cpp
@@ -244,6 +244,7 @@ class CommandMSSet : public Command
 		}
 		else if (subcommand.equals_ci("NOTIFY"))
 			source.Reply(_("Syntax: \002NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\002\n"
+					" \n"
 					"Changes when you will be notified about new memos:\n"
 					" \n"
 					"    ON      You will be notified of memos when you log on,\n"
@@ -276,8 +277,9 @@ class CommandMSSet : public Command
 						"adding \002HARD\002 has the opposite effect, allowing the user to\n"
 						"change the limit (even if a previous limit was set with\n"
 						"\002HARD\002).\n"
+						" \n"
 						"This use of the \002SET LIMIT\002 command is limited to \002Services\002\n"
-						"\002Admins\002.  Other users may only enter a limit for themselves\n"
+						"\002Operators\002.  Other users may only enter a limit for themselves\n"
 						"or a channel on which they have such privileges, may not\n"
 						"remove their limit, may not set a limit above %d, and may\n"
 						"not set a hard limit."), max_memos);
diff --git a/modules/commands/ns_info.cpp b/modules/commands/ns_info.cpp
index 1800ac440..b15357b26 100644
--- a/modules/commands/ns_info.cpp
+++ b/modules/commands/ns_info.cpp
@@ -209,7 +209,7 @@ class CommandNSSetHide : public Command
 				"being displayed when someone does a %s \002INFO\002 on your\n"
 				"nick.  You can hide your E-mail address (\002EMAIL\002), last seen\n"
 				"user@host mask (\002USERMASK\002), your services access status\n"
-				"(\002STATUS\002) and  last quit message (\002QUIT\002).\n"
+				"(\002STATUS\002) and last quit message (\002QUIT\002).\n"
 				"The second parameter specifies whether the information should\n"
 				"be displayed (\002OFF\002) or hidden (\002ON\002)."), source.service->nick.c_str());
 		return true;
@@ -238,7 +238,7 @@ class CommandNSSASetHide : public CommandNSSetHide
 				"being displayed when someone does a %s \002INFO\002 on the\n"
 				"nick.  You can hide the E-mail address (\002EMAIL\002), last seen\n"
 				"user@host mask (\002USERMASK\002), the services access status\n"
-				"(\002STATUS\002) and  last quit message (\002QUIT\002).\n"
+				"(\002STATUS\002) and last quit message (\002QUIT\002).\n"
 				"The second parameter specifies whether the information should\n"
 				"be displayed (\002OFF\002) or hidden (\002ON\002)."), source.service->nick.c_str());
 		return true;
diff --git a/modules/commands/ns_recover.cpp b/modules/commands/ns_recover.cpp
index 3d7bdd49b..4aed411ea 100644
--- a/modules/commands/ns_recover.cpp
+++ b/modules/commands/ns_recover.cpp
@@ -68,7 +68,7 @@ class NSRecoverRequest : public IdentifyRequest
 			}
 
 			u->SendMessage(source.service, _("This nickname has been recovered by %s. If you did not do\n"
-							"this then %s may have your password, and you should change it.\n"),
+							"this then %s may have your password, and you should change it."),
 							source.GetNick().c_str(), source.GetNick().c_str());
 
 			Anope::string buf = source.command.upper() + " command used by " + source.GetNick();
diff --git a/modules/commands/ns_set.cpp b/modules/commands/ns_set.cpp
index 15ab593ad..bad5fc940 100644
--- a/modules/commands/ns_set.cpp
+++ b/modules/commands/ns_set.cpp
@@ -702,14 +702,14 @@ class CommandNSSetKill : public Command
 		this->SendSyntax(source);
 		source.Reply(" ");
 		source.Reply(_("Turns the automatic protection option for your nick\n"
-				"on or off.  With protection on, if another user\n"
+				"on or off. With protection on, if another user\n"
 				"tries to take your nick, they will be given one minute to\n"
 				"change to another nick, after which %s will forcibly change\n"
 				"their nick.\n"
 				" \n"
 				"If you select \002QUICK\002, the user will be given only 20 seconds\n"
-				"to change nicks instead of the usual 60.  If you select\n"
-				"\002IMMED\002, user's nick will be changed immediately \037without\037 being\n"
+				"to change nicks instead of the usual 60. If you select\n"
+				"\002IMMED\002, the user's nick will be changed immediately \037without\037 being\n"
 				"warned first or given a chance to change their nick; please\n"
 				"do not use this option unless necessary. Also, your\n"
 				"network's administrators may have disabled this option."), source.service->nick.c_str());
diff --git a/modules/commands/ns_status.cpp b/modules/commands/ns_status.cpp
index 3bfeab888..64d1f8db7 100644
--- a/modules/commands/ns_status.cpp
+++ b/modules/commands/ns_status.cpp
@@ -17,7 +17,7 @@ class CommandNSStatus : public Command
 	CommandNSStatus(Module *creator) : Command(creator, "nickserv/status", 0, 16)
 	{
 		this->SetDesc(_("Returns the owner status of the given nickname"));
-		this->SetSyntax(_("\037nickname\037"));
+		this->SetSyntax(_("[\037nickname\037]"));
 		this->AllowUnregistered(true);
 	}
 
@@ -65,7 +65,9 @@ class CommandNSStatus : public Command
 				"    0 - no such user online \002or\002 nickname not registered\n"
 				"    1 - user not recognized as nickname's owner\n"
 				"    2 - user recognized as owner via access list only\n"
-				"    3 - user recognized as owner via password identification"));
+				"    3 - user recognized as owner via password identification\n"
+				" \n"
+				"If no nickname is given, your status will be returned."));
 		return true;
 	}
 };
diff --git a/modules/commands/os_chankill.cpp b/modules/commands/os_chankill.cpp
index 76a1826da..8ddd9e3e3 100644
--- a/modules/commands/os_chankill.cpp
+++ b/modules/commands/os_chankill.cpp
@@ -94,7 +94,7 @@ class CommandOSChanKill : public Command
 		this->SendSyntax(source);
 		source.Reply(" ");
 		source.Reply(_("Puts an AKILL for every nick on the specified channel. It\n"
-				"uses the entire and complete real ident@host for every nick,\n"
+				"uses the entire real ident@host for every nick, and\n"
 				"then enforces the AKILL."));
 		return true;
 	}
diff --git a/modules/commands/os_defcon.cpp b/modules/commands/os_defcon.cpp
index 043ebf629..d56f71844 100644
--- a/modules/commands/os_defcon.cpp
+++ b/modules/commands/os_defcon.cpp
@@ -133,7 +133,7 @@ class DefConTimeout : public Timer
 				if (!DConfig.offmessage.empty())
 					GlobalService->SendGlobal(NULL, "", DConfig.offmessage);
 				else
-					GlobalService->SendGlobal(NULL, "", Anope::printf(Language::Translate(_("The Defcon Level is now at Level: \002%d\002")), DConfig.defaultlevel));
+					GlobalService->SendGlobal(NULL, "", Anope::printf(Language::Translate(_("The Defcon level is now at: \002%d\002")), DConfig.defaultlevel));
 
 				if (!DConfig.message.empty())
 					GlobalService->SendGlobal(NULL, "", DConfig.message);
@@ -155,13 +155,13 @@ class CommandOSDefcon : public Command
 		if (DConfig.Check(DEFCON_NO_MLOCK_CHANGE))
 			source.Reply(_("* No mode lock changes"));
 		if (DConfig.Check(DEFCON_FORCE_CHAN_MODES) && !DConfig.chanmodes.empty())
-			source.Reply(_("* Force Chan Modes (%s) to be set on all channels"), DConfig.chanmodes.c_str());
+			source.Reply(_("* Force channel modes (%s) to be set on all channels"), DConfig.chanmodes.c_str());
 		if (DConfig.Check(DEFCON_REDUCE_SESSION))
 			source.Reply(_("* Use the reduced session limit of %d"), DConfig.sessionlimit);
 		if (DConfig.Check(DEFCON_NO_NEW_CLIENTS))
-			source.Reply(_("* Kill any NEW clients connecting"));
+			source.Reply(_("* Kill any new clients connecting"));
 		if (DConfig.Check(DEFCON_OPER_ONLY))
-			source.Reply(_("* Ignore any non-opers with message"));
+			source.Reply(_("* Ignore non-opers with a message"));
 		if (DConfig.Check(DEFCON_SILENT_OPER_ONLY))
 			source.Reply(_("* Silently ignore non-opers"));
 		if (DConfig.Check(DEFCON_AKILL_NEW_CLIENTS))
diff --git a/modules/commands/os_info.cpp b/modules/commands/os_info.cpp
index f5239abb4..553798d07 100644
--- a/modules/commands/os_info.cpp
+++ b/modules/commands/os_info.cpp
@@ -256,7 +256,7 @@ class OSInfo : public Module
 		for (unsigned i = 0; i < (*oi)->size(); ++i)
 		{
 			OperInfo *o = (*oi)->at(i);
-			info[_("Oper Info")] = Anope::printf(_("(By %s on %s) %s"), o->adder.c_str(), Anope::strftime(o->created, source.GetAccount(), true).c_str(), o->info.c_str());
+			info[_("Oper Info")] = Anope::printf(_("(by %s on %s) %s"), o->adder.c_str(), Anope::strftime(o->created, source.GetAccount(), true).c_str(), o->info.c_str());
 		}
 	}
 
diff --git a/modules/commands/os_list.cpp b/modules/commands/os_list.cpp
index b72e3acbd..e0f8b4645 100644
--- a/modules/commands/os_list.cpp
+++ b/modules/commands/os_list.cpp
@@ -101,6 +101,7 @@ class CommandOSChanList : public Command
 		source.Reply(" ");
 		source.Reply(_("Lists all channels currently in use on the IRC network, whether they\n"
 				"are registered or not.\n"
+				" \n"
 				"If \002pattern\002 is given, lists only channels that match it. If a nickname\n"
 				"is given, lists only the channels the user using it is on. If SECRET is\n"
 				"specified, lists only channels matching \002pattern\002 that have the +s or\n"
diff --git a/modules/commands/os_mode.cpp b/modules/commands/os_mode.cpp
index 13f3f44d7..95fa9c6ba 100644
--- a/modules/commands/os_mode.cpp
+++ b/modules/commands/os_mode.cpp
@@ -125,7 +125,7 @@ class CommandOSMode : public Command
 		source.Reply(_("Allows Services Operators to change modes for any channel.\n"
 				"Parameters are the same as for the standard /MODE command.\n"
 				"Alternatively, CLEAR may be given to clear all modes on the channel.\n"
-				"If CLEAR ALL is given then all modes, including user status, is removed.\n"));
+				"If CLEAR ALL is given then all modes, including user status, is removed."));
 		return true;
 	}
 };
diff --git a/modules/commands/os_modinfo.cpp b/modules/commands/os_modinfo.cpp
index 972f8631e..8f172132e 100644
--- a/modules/commands/os_modinfo.cpp
+++ b/modules/commands/os_modinfo.cpp
@@ -29,7 +29,7 @@ class CommandOSModInfo : public Command
 		Module *m = ModuleManager::FindModule(file);
 		if (m)
 		{
-			source.Reply(_("Module: \002%s\002 Version: \002%s\002 Author: \002%s\002 loaded: \002%s\002"), m->name.c_str(), !m->version.empty() ? m->version.c_str() : "?", !m->author.empty() ? m->author.c_str() : "Unknown", Anope::strftime(m->created).c_str());
+			source.Reply(_("Module: \002%s\002 Version: \002%s\002 Author: \002%s\002 Loaded: \002%s\002"), m->name.c_str(), !m->version.empty() ? m->version.c_str() : "?", !m->author.empty() ? m->author.c_str() : "Unknown", Anope::strftime(m->created).c_str());
 			if (Anope::Debug)
 				source.Reply(_(" Loaded at: %p"), m->handle);
 
diff --git a/modules/commands/os_module.cpp b/modules/commands/os_module.cpp
index 8ff7498a7..d703d6814 100644
--- a/modules/commands/os_module.cpp
+++ b/modules/commands/os_module.cpp
@@ -165,8 +165,7 @@ class CommandOSModUnLoad : public Command
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("This command unloads the module named \037modname\037 from the modules\n"
-				"directory."));
+		source.Reply(_("This command unloads the module named \037modname\037."));
 		return true;
 	}
 };
diff --git a/modules/commands/os_news.cpp b/modules/commands/os_news.cpp
index c71d7ed27..ddfc3c3f9 100644
--- a/modules/commands/os_news.cpp
+++ b/modules/commands/os_news.cpp
@@ -266,7 +266,7 @@ class CommandOSLogonNews : public NewsBase
 		source.Reply(" ");
 		source.Reply(_("Edits or displays the list of logon news messages.  When a\n"
 			"user connects to the network, these messages will be sent\n"
-			"to them.  (However, no more than \002%d\002 messages will be\n"
+			"to them.  However, no more than \002%d\002 messages will be\n"
 			"sent in order to avoid flooding the user.  If there are\n"
 			"more news messages, only the most recent will be sent."),
 			Config->GetModule(this->owner)->Get<unsigned>("newscount", "3"));
@@ -293,7 +293,7 @@ class CommandOSOperNews : public NewsBase
 		source.Reply(" ");
 		source.Reply(_("Edits or displays the list of oper news messages.  When a\n"
 				"user opers up (with the /OPER command), these messages will\n"
-				"be sent to them.  (However, no more than \002%d\002 messages will\n"
+				"be sent to them.  However, no more than \002%d\002 messages will\n"
 				"be sent in order to avoid flooding the user.  If there are\n"
 				"more news messages, only the most recent will be sent."),
 				Config->GetModule(this->owner)->Get<unsigned>("newscount", "3"));
@@ -320,7 +320,7 @@ class CommandOSRandomNews : public NewsBase
 		source.Reply(" ");
 		source.Reply(_("Edits or displays the list of random news messages.  When a\n"
 				"user connects to the network, one (and only one) of the\n"
-				"random news will be randomly chosen and sent to them.\n"));
+				"random news will be randomly chosen and sent to them."));
 		return true;
 	}
 };
diff --git a/modules/commands/os_reload.cpp b/modules/commands/os_reload.cpp
index 0722eaa21..360c5d4ed 100644
--- a/modules/commands/os_reload.cpp
+++ b/modules/commands/os_reload.cpp
@@ -44,7 +44,7 @@ class CommandOSReload : public Command
 		source.Reply(_("Causes Services to reload the configuration file. Note that\n"
 				"some directives still need the restart of the Services to\n"
 				"take effect (such as Services' nicknames, activation of the\n"
-				"session limitation, etc.)"));
+