Update as many messages as possible for automatic line wrapping.

26 files changed, 488 insertions, 371 deletions

diff --git a/modules/operserv/os_akill.cpp b/modules/operserv/os_akill.cpp
index e2be2ed7a..0cb2f51d3 100644
--- a/modules/operserv/os_akill.cpp
+++ b/modules/operserv/os_akill.cpp
@@ -421,53 +421,61 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Allows Services Operators to manipulate the AKILL list. If\n"
-				"a user matching an AKILL mask attempts to connect, services\n"
-				"will issue a KILL for that user and, on supported server\n"
-				"types, will instruct all servers to add a ban for the mask\n"
-				"which the user matched.\n"
-				" \n"
-				"\002AKILL ADD\002 adds the given mask to the AKILL\n"
-				"list for the given reason, which \002must\002 be given.\n"
-				"Mask should be in the format of nick!user@host#real name,\n"
-				"though all that is required is user@host. If a real name is specified,\n"
-				"the reason must be prepended with a :.\n"
-				"\037expiry\037 is specified as an integer followed by one of \037d\037\n"
-				"(days), \037h\037 (hours), or \037m\037 (minutes). Combinations (such as\n"
-				"\0371h30m\037) are not permitted. If a unit specifier is not\n"
-				"included, the default is days (so \037+30\037 by itself means 30\n"
-				"days). To add an AKILL which does not expire, use \037+0\037. If the\n"
-				"usermask to be added starts with a \037+\037, an expiry time must\n"
-				"be given, even if it is the same as the default. The\n"
-				"current AKILL default expiry time can be found with the\n"
-				"\002STATS AKILL\002 command."));
+		source.Reply(_(
+			"Allows Services Operators to manipulate the AKILL list. If "
+			"a user matching an AKILL mask attempts to connect, services "
+			"will issue a KILL for that user and, on supported server "
+			"types, will instruct all servers to add a ban for the mask "
+			"which the user matched."
+			"\n\n"
+			"\002AKILL\032ADD\002 adds the given mask to the AKILL "
+			"list for the given reason, which \002must\002 be given. "
+			"Mask should be in the format of nick!user@host#real\032name, "
+			"though all that is required is user@host. If a real name is specified, "
+			"the reason must be prepended with a :. "
+			"\037expiry\037 is specified as an integer followed by one of \037d\037 "
+			"(days), \037h\037 (hours), or \037m\037 (minutes). Combinations (such as "
+			"\0371h30m\037) are not permitted. If a unit specifier is not "
+			"included, the default is days (so \037+30\037 by itself means 30 "
+			"days). To add an AKILL which does not expire, use \037+0\037. If the "
+			"usermask to be added starts with a \037+\037, an expiry time must "
+			"be given, even if it is the same as the default. The "
+			"current AKILL default expiry time can be found with the "
+			"\002STATS\032AKILL\002 command."
+		));
+
 		const Anope::string &regexengine = Config->GetBlock("options").Get<const Anope::string>("regexengine");
 		if (!regexengine.empty())
 		{
 			source.Reply(" ");
-			source.Reply(_("Regex matches are also supported using the %s engine.\n"
-					"Enclose your mask in // if this is desired."), regexengine.c_str());
+			source.Reply(_(
+					"Regex matches are also supported using the %s engine. "
+					"Enclose your mask in // if this is desired."
+				),
+				regexengine.c_str());
 		}
+
+		source.Reply(" ");
 		source.Reply(_(
-				" \n"
-				"The \002AKILL DEL\002 command removes the given mask from the\n"
-				"AKILL list if it is present.  If a list of entry numbers is\n"
-				"given, those entries are deleted.  (See the example for LIST\n"
-				"below.)\n"
-				" \n"
-				"The \002AKILL LIST\002 command displays the AKILL list.\n"
-				"If a wildcard mask is given, only those entries matching the\n"
-				"mask are displayed.  If a list of entry numbers is given,\n"
-				"only those entries are shown; for example:\n"
-				"   \002AKILL LIST 2-5,7-9\002\n"
-				"      Lists AKILL entries numbered 2 through 5 and 7\n"
-				"      through 9.\n"
-				"      \n"
-				"\002AKILL VIEW\002 is a more verbose version of \002AKILL LIST\002, and\n"
-				"will show who added an AKILL, the date it was added, and when\n"
-				"it expires, as well as the user@host/ip mask and reason.\n"
-				" \n"
-				"\002AKILL CLEAR\002 clears all entries of the AKILL list."));
+			"The \002AKILL\032DEL\002 command removes the given mask from the "
+			"AKILL list if it is present.  If a list of entry numbers is "
+			"given, those entries are deleted.  (See the example for LIST "
+			"below.)"
+			"\n\n"
+			"The \002AKILL\032LIST\002 command displays the AKILL list. "
+			"If a wildcard mask is given, only those entries matching the "
+			"mask are displayed.  If a list of entry numbers is given, "
+			"only those entries are shown; for example:\n"
+			"   \002AKILL\032LIST\0322-5,7-9\002\n"
+			"      Lists AKILL entries numbered 2 through 5 and 7\n"
+			"      through 9."
+			"\n\n"
+			"\002AKILL\032VIEW\002 is a more verbose version of \002AKILL\032LIST\002, and "
+			"will show who added an AKILL, the date it was added, and when "
+			"it expires, as well as the user@host/ip mask and reason."
+			"\n\n"
+			"\002AKILL\032CLEAR\002 clears all entries of the AKILL list."
+		));
 		return true;
 	}
 };
diff --git a/modules/operserv/os_chankill.cpp b/modules/operserv/os_chankill.cpp
index e66123a62..bed10c505 100644
--- a/modules/operserv/os_chankill.cpp
+++ b/modules/operserv/os_chankill.cpp
@@ -96,9 +96,11 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Puts an AKILL for every nick on the specified channel. It\n"
-				"uses the entire real ident@host for every nick, and\n"
-				"then enforces the AKILL."));
+		source.Reply(_(
+			"Puts an AKILL for every nick on the specified channel. It "
+			"uses the entire real ident@host for every nick, and "
+			"then enforces the AKILL."
+		));
 		return true;
 	}
 };
diff --git a/modules/operserv/os_config.cpp b/modules/operserv/os_config.cpp
index b10c59e4d..d889df31e 100644
--- a/modules/operserv/os_config.cpp
+++ b/modules/operserv/os_config.cpp
@@ -122,13 +122,15 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Allows you to change and view configuration settings.\n"
-				"Settings changed by this command are temporary and will not be reflected\n"
-				"back into the configuration file, and will be lost if Anope is shut down,\n"
-				"restarted, or the configuration is reloaded.\n"
-				" \n"
-				"Example:\n"
-				"     \002MODIFY nickserv regdelay 15m\002"));
+		source.Reply(_(
+			"Allows you to change and view configuration settings. "
+			"Settings changed by this command are temporary and will not be reflected "
+			"back into the configuration file, and will be lost if Anope is shut down, "
+			"restarted, or the configuration is reloaded."
+			"\n\n"
+			"Example:\n"
+			"     \002MODIFY\032nickserv\032regdelay\03215m\002"
+		));
 		return true;
 	}
 };
diff --git a/modules/operserv/os_defcon.cpp b/modules/operserv/os_defcon.cpp
index 53ceef8a3..0965b0961 100644
--- a/modules/operserv/os_defcon.cpp
+++ b/modules/operserv/os_defcon.cpp
@@ -235,9 +235,11 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("The defcon system can be used to implement a pre-defined\n"
-				"set of restrictions to services useful during an attempted\n"
-				"attack on the network."));
+		source.Reply(_(
+			"The defcon system can be used to implement a pre-defined "
+			"set of restrictions to services useful during an attempted "
+			"attack on the network."
+		));
 		return true;
 	}
 };
diff --git a/modules/operserv/os_dns.cpp b/modules/operserv/os_dns.cpp
index a045b9ce2..9e8a6ac4e 100644
--- a/modules/operserv/os_dns.cpp
+++ b/modules/operserv/os_dns.cpp
@@ -722,20 +722,22 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("This command allows managing DNS zones used for controlling what servers users\n"
-				"are directed to when connecting. Omitting all parameters prints out the status of\n"
-				"the DNS zone.\n"
-				" \n"
-				"\002ADDZONE\002 adds a zone, eg us.yournetwork.tld. Servers can then be added to this\n"
-				"zone with the \002ADDSERVER\002 command.\n"
-				" \n"
-				"The \002ADDSERVER\002 command adds a server to the given zone. When a query is done, the\n"
-				"zone in question is served if it exists, else all servers in all zones are served.\n"
-				"A server may be in more than one zone.\n"
-				" \n"
-				"The \002ADDIP\002 command associates an IP with a server.\n"
-				" \n"
-				"The \002POOL\002 and \002DEPOOL\002 commands actually add and remove servers to their given zones."));
+		source.Reply(_(
+			"This command allows managing DNS zones used for controlling what servers users "
+			"are directed to when connecting. Omitting all parameters prints out the status of "
+			"the DNS zone."
+			"\n\n"
+			"\002ADDZONE\002 adds a zone, eg us.yournetwork.tld. Servers can then be added to this "
+			"zone with the \002ADDSERVER\002 command."
+			"\n\n"
+			"The \002ADDSERVER\002 command adds a server to the given zone. When a query is done, the "
+			"zone in question is served if it exists, else all servers in all zones are served. "
+			"A server may be in more than one zone."
+			"\n\n"
+			"The \002ADDIP\002 command associates an IP with a server."
+			"\n\n"
+			"The \002POOL\002 and \002DEPOOL\002 commands actually add and remove servers to their given zones."
+		));
 		return true;
 	}
 };
diff --git a/modules/operserv/os_forbid.cpp b/modules/operserv/os_forbid.cpp
index 6c34cb0e7..ed836817f 100644
--- a/modules/operserv/os_forbid.cpp
+++ b/modules/operserv/os_forbid.cpp
@@ -457,15 +457,20 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Forbid allows you to forbid usage of certain nicknames, channels,\n"
-				"and email addresses. Wildcards are accepted for all entries."));
+		source.Reply(_(
+			"Forbid allows you to forbid usage of certain nicknames, channels, "
+			"and email addresses. Wildcards are accepted for all entries."
+		));
 
 		const Anope::string &regexengine = Config->GetBlock("options").Get<const Anope::string>("regexengine");
 		if (!regexengine.empty())
 		{
 			source.Reply(" ");
-			source.Reply(_("Regex matches are also supported using the %s engine.\n"
-					"Enclose your pattern in // if this is desired."), regexengine.c_str());
+			source.Reply(_(
+					"Regex matches are also supported using the %s engine. "
+					"Enclose your pattern in // if this is desired."
+				),
+				regexengine.c_str());
 		}
 
 		return true;
diff --git a/modules/operserv/os_ignore.cpp b/modules/operserv/os_ignore.cpp
index 41b7ae858..c30cfe8b2 100644
--- a/modules/operserv/os_ignore.cpp
+++ b/modules/operserv/os_ignore.cpp
@@ -381,24 +381,29 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Allows Services Operators to make services ignore a nick or mask\n"
-				"for a certain time or until the next restart. The default\n"
-				"time format is seconds. You can specify it by using units.\n"
-				"Valid units are: \037s\037 for seconds, \037m\037 for minutes,\n"
-				"\037h\037 for hours and \037d\037 for days.\n"
-				"Combinations of these units are not permitted.\n"
-				"To make services permanently ignore the user, type 0 as time.\n"
-				"When adding a \037mask\037, it should be in the format nick!user@host,\n"
-				"everything else will be considered a nick. Wildcards are permitted.\n"
-				" \n"
-				"Ignores will not be enforced on IRC Operators."));
+		source.Reply(_(
+			"Allows Services Operators to make services ignore a nick or mask "
+			"for a certain time or until the next restart. The default "
+			"time format is seconds. You can specify it by using units. "
+			"Valid units are: \037s\037 for seconds, \037m\037 for minutes, "
+			"\037h\037 for hours and \037d\037 for days. "
+			"Combinations of these units are not permitted. "
+			"To make services permanently ignore the user, type 0 as time. "
+			"When adding a \037mask\037, it should be in the format nick!user@host, "
+			"everything else will be considered a nick. Wildcards are permitted."
+			"\n\n"
+			"Ignores will not be enforced on IRC Operators."
+		));
 
 		const Anope::string &regexengine = Config->GetBlock("options").Get<const Anope::string>("regexengine");
 		if (!regexengine.empty())
 		{
 			source.Reply(" ");
-			source.Reply(_("Regex matches are also supported using the %s engine.\n"
-					"Enclose your pattern in // if this is desired."), regexengine.c_str());
+			source.Reply(_(
+					"Regex matches are also supported using the %s engine. "
+					"Enclose your pattern in // if this is desired."
+				),
+				regexengine.c_str());
 		}
 
 		return true;
diff --git a/modules/operserv/os_info.cpp b/modules/operserv/os_info.cpp
index 05ff6af07..62ccef2f0 100644
--- a/modules/operserv/os_info.cpp
+++ b/modules/operserv/os_info.cpp
@@ -254,9 +254,11 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Add or delete oper information for a given nick or channel.\n"
-				"This will show to opers in the respective info command for\n"
-				"the nick or channel."));
+		source.Reply(_(
+			"Add or delete oper information for a given nick or channel. "
+			"This will show to opers in the respective info command for "
+			"the nick or channel."
+		));
 		return true;
 	}
 };
diff --git a/modules/operserv/os_jupe.cpp b/modules/operserv/os_jupe.cpp
index c6823449d..acd5e5112 100644
--- a/modules/operserv/os_jupe.cpp
+++ b/modules/operserv/os_jupe.cpp
@@ -54,14 +54,16 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Tells services to jupiter a server -- that is, to create\n"
-				"a fake \"server\" connected to services which prevents\n"
-				"the real server of that name from connecting.  The jupe\n"
-				"may be removed using a standard \002SQUIT\002. If a reason is\n"
-				"given, it is placed in the server information field;\n"
-				"otherwise, the server information field will contain the\n"
-				"text \"Juped by <nick>\", showing the nickname of the\n"
-				"person who jupitered the server."));
+		source.Reply(_(
+			"Tells services to jupiter a server -- that is, to create "
+			"a fake \"server\" connected to services which prevents "
+			"the real server of that name from connecting.  The jupe "
+			"may be removed using a standard \002SQUIT\002. If a reason is "
+			"given, it is placed in the server information field; "
+			"otherwise, the server information field will contain the "
+			"text \"Juped by <nick>\", showing the nickname of the "
+			"person who jupitered the server."
+		));
 		return true;
 	}
 };
diff --git a/modules/operserv/os_kick.cpp b/modules/operserv/os_kick.cpp
index 667b8aa50..d9df7feec 100644
--- a/modules/operserv/os_kick.cpp
+++ b/modules/operserv/os_kick.cpp
@@ -60,12 +60,15 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Allows staff to kick a user from any channel.\n"
-				"Parameters are the same as for the standard /KICK\n"
-				"command. The kick message will have the nickname of the\n"
-				"IRCop sending the KICK command prepended; for example:\n"
-				" \n"
-				"*** SpamMan has been kicked off channel #my_channel by %s (Alcan (Flood))"), source.service->nick.c_str());
+		source.Reply(_(
+				"Allows staff to kick a user from any channel. "
+				"Parameters are the same as for the standard /KICK "
+				"command. The kick message will have the nickname of the "
+				"IRCop sending the KICK command prepended; for example:"
+				"\n\n"
+				"*** SpamMan has been kicked off channel #my_channel by %s (Alcan (Flood))"
+			),
+			source.service->nick.c_str());
 		return true;
 	}
 };
diff --git a/modules/operserv/os_kill.cpp b/modules/operserv/os_kill.cpp
index 7ad58d062..b0ae2ce59 100644
--- a/modules/operserv/os_kill.cpp
+++ b/modules/operserv/os_kill.cpp
@@ -46,9 +46,11 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Allows you to kill a user from the network.\n"
-				"Parameters are the same as for the standard /KILL\n"
-				"command."));
+		source.Reply(_(
+			"Allows you to kill a user from the network. "
+			"Parameters are the same as for the standard /KILL "
+			"command."
+		));
 		return true;
 	}
 };
diff --git a/modules/operserv/os_list.cpp b/modules/operserv/os_list.cpp
index 46c4c89bb..83069ec2e 100644
--- a/modules/operserv/os_list.cpp
+++ b/modules/operserv/os_list.cpp
@@ -109,20 +109,25 @@ public:
 	{
 		this->SendSyntax(source);
 		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"
-				"+p mode."));
+		source.Reply(_(
+			"Lists all channels currently in use on the IRC network, whether they "
+			"are registered or not."
+			"\n\n"
+			"If \002pattern\002 is given, lists only channels that match it. If a nickname "
+			"is given, lists only the channels the user using it is on. If SECRET is "
+			"specified, lists only channels matching \002pattern\002 that have the +s or "
+			"+p mode."
+		));
 
 		const Anope::string &regexengine = Config->GetBlock("options").Get<const Anope::string>("regexengine");
 		if (!regexengine.empty())
 		{
 			source.Reply(" ");
-			source.Reply(_("Regex matches are also supported using the %s engine.\n"
-					"Enclose your pattern in // if this is desired."), regexengine.c_str());
+			source.Reply(_(
+					"Regex matches are also supported using the %s engine. "
+					"Enclose your pattern in // if this is desired."
+				),
+				regexengine.c_str());
 		}
 
 		return true;
@@ -252,20 +257,25 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Lists all users currently online on the IRC network, whether their\n"
-				"nick is registered or not.\n"
-				" \n"
-				"If \002pattern\002 is given, lists only users that match it (it must be in\n"
-				"the format nick!user@host[#realname]). If \002channel\002 is given, lists\n"
-				"only users that are on the given channel. If INVISIBLE is specified, only users\n"
-				"with the +i flag will be listed."));
+		source.Reply(_(
+			"Lists all users currently online on the IRC network, whether their "
+			"nick is registered or not."
+			"\n\n"
+			"If \002pattern\002 is given, lists only users that match it (it must be in "
+			"the format nick!user@host[#realname]). If \002channel\002 is given, lists "
+			"only users that are on the given channel. If INVISIBLE is specified, only users "
+			"with the +i flag will be listed."
+		));
 
 		const Anope::string &regexengine = Config->GetBlock("options").Get<const Anope::string>("regexengine");
 		if (!regexengine.empty())
 		{
 			source.Reply(" ");
-			source.Reply(_("Regex matches are also supported using the %s engine.\n"
-					"Enclose your pattern in // if this is desired."), regexengine.c_str());
+			source.Reply(_(
+					"Regex matches are also supported using the %s engine. "
+					"Enclose your pattern in // if this is desired."
+				),
+				regexengine.c_str());
 		}
 
 		return true;
diff --git a/modules/operserv/os_login.cpp b/modules/operserv/os_login.cpp
index 9cf62e947..f453bd8f0 100644
--- a/modules/operserv/os_login.cpp
+++ b/modules/operserv/os_login.cpp
@@ -48,9 +48,12 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Logs you in to %s so you gain Services Operator privileges.\n"
-				"This command may be unnecessary if your oper block is\n"
-				"configured without a password."), source.service->nick.c_str());
+		source.Reply(_(
+				"Logs you in to %s so you gain Services Operator privileges. "
+				"This command may be unnecessary if your oper block is "
+				"configured without a password."
+			),
+			source.service->nick.c_str());
 		return true;
 	}
 
@@ -91,9 +94,12 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Logs you out from %s so you lose Services Operator privileges.\n"
-				"This command is only useful if your oper block is configured\n"
-				"with a password."), source.service->nick.c_str());
+		source.Reply(_(
+				"Logs you out from %s so you lose Services Operator privileges. "
+				"This command is only useful if your oper block is configured "
+				"with a password."
+			),
+			source.service->nick.c_str());
 		return true;
 	}
 
diff --git a/modules/operserv/os_logsearch.cpp b/modules/operserv/os_logsearch.cpp
index cd3781ae1..d969cf74f 100644
--- a/modules/operserv/os_logsearch.cpp
+++ b/modules/operserv/os_logsearch.cpp
@@ -147,17 +147,19 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("This command searches the services logfiles for messages\n"
-				"that match the given pattern. The day and limit argument\n"
-				"may be used to specify how many days of logs to search\n"
-				"and the number of replies to limit to. By default this\n"
-				"command searches one week of logs, and limits replies\n"
-				"to 50.\n"
-				" \n"
-				"For example:\n"
-				"    \002LOGSEARCH +21d +500l Anope\002\n"
-				"      Searches the last 21 days worth of logs for messages\n"
-				"      containing Anope and lists the most recent 500 of them."));
+		source.Reply(_(
+			"This command searches the services logfiles for messages "
+			"that match the given pattern. The day and limit argument "
+			"may be used to specify how many days of logs to search "
+			"and the number of replies to limit to. By default this "
+			"command searches one week of logs, and limits replies "
+			"to 50."
+			"\n\n"
+			"For example:\n"
+			"    \002LOGSEARCH\032+21d\032+500l\032Anope\002\n"
+			"      Searches the last 21 days worth of logs for messages\n"
+			"      containing Anope and lists the most recent 500 of them."
+		));
 		return true;
 	}
 };
diff --git a/modules/operserv/os_mode.cpp b/modules/operserv/os_mode.cpp
index 3a6b2159e..0ac9b48d4 100644
--- a/modules/operserv/os_mode.cpp
+++ b/modules/operserv/os_mode.cpp
@@ -128,10 +128,12 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		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."));
+		source.Reply(_(
+			"Allows Services Operators to change modes for any channel. "
+			"Parameters are the same as for the standard /MODE command. "
+			"Alternatively, CLEAR may be given to clear all modes on the channel. "
+			"If CLEAR\032ALL is given then all modes, including user status, is removed."
+		));
 		return true;
 	}
 };
@@ -169,8 +171,10 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Allows Services Operators to change modes for any user.\n"
-				"Parameters are the same as for the standard /MODE command."));
+		source.Reply(_(
+			"Allows Services Operators to change modes for any user. "
+			"Parameters are the same as for the standard /MODE command."
+		));
 		return true;
 	}
 };
diff --git a/modules/operserv/os_module.cpp b/modules/operserv/os_module.cpp
index 2a54d9a67..2055f3cd9 100644
--- a/modules/operserv/os_module.cpp
+++ b/modules/operserv/os_module.cpp
@@ -43,8 +43,7 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("This command loads the module named \037modname\037 from the modules\n"
-				"directory."));
+		source.Reply(_("This command loads the module named \037modname\037 from the modules directory."));
 		return true;
 	}
 };
diff --git a/modules/operserv/os_news.cpp b/modules/operserv/os_news.cpp
index e5b6b057c..37eeef1c1 100644
--- a/modules/operserv/os_news.cpp
+++ b/modules/operserv/os_news.cpp
@@ -319,12 +319,14 @@ public:
 	{
 		this->SendSyntax(source);
 		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"
-				"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"));
+		source.Reply(_(
+				"Edits or displays the list of logon news messages.  When a "
+				"user connects to the network, these messages will be sent "
+				"to them.  However, no more than \002%d\002 messages will be "
+				"sent in order to avoid flooding the user.  If there are "
+				"more news messages, only the most recent will be sent."
+			),
+			Config->GetModule(this->owner).Get<unsigned>("newscount", "3"));
 		return true;
 	}
 };
@@ -347,12 +349,14 @@ public:
 	{
 		this->SendSyntax(source);
 		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 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"));
+		source.Reply(_(
+				"Edits or displays the list of oper news messages.  When a "
+				"user opers up (with the /OPER command), these messages will "
+				"be sent to them.  However, no more than \002%d\002 messages will "
+				"be sent in order to avoid flooding the user.  If there are "
+				"more news messages, only the most recent will be sent."
+			),
+			Config->GetModule(this->owner).Get<unsigned>("newscount", "3"));
 		return true;
 	}
 };
@@ -375,9 +379,11 @@ public:
 	{
 		this->SendSyntax(source);
 		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."));
+		source.Reply(_(
+			"Edits or displays the list of random news messages.  When a "
+			"user connects to the network, one (and only one) of the "
+			"random news will be randomly chosen and sent to them."
+		));
 		return true;
 	}
 };
diff --git a/modules/operserv/os_noop.cpp b/modules/operserv/os_noop.cpp
index 6e4b412fd..23bb6636e 100644
--- a/modules/operserv/os_noop.cpp
+++ b/modules/operserv/os_noop.cpp
@@ -64,10 +64,12 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("\002SET\002 kills all operators from the given\n"
-				"\002server\002 and prevents operators from opering\n"
-				"up on the given server. \002REVOKE\002 removes this\n"
-				"restriction."));
+		source.Reply(_(
+			"\002SET\002 kills all operators from the given "
+			"\002server\002 and prevents operators from opering "
+			"up on the given server. \002REVOKE\002 removes this "
+			"restriction."
+		));
 		return true;
 	}
 };
diff --git a/modules/operserv/os_oper.cpp b/modules/operserv/os_oper.cpp
index 5a87cd6ba..d19567f9a 100644
--- a/modules/operserv/os_oper.cpp
+++ b/modules/operserv/os_oper.cpp
@@ -253,9 +253,11 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Allows you to change and view Services Operators.\n"
-				"Note that operators removed by this command but are still set in\n"
-				"the configuration file are not permanently affected by this."));
+		source.Reply(_(
+			"Allows you to change and view Services Operators. "
+			"Note that operators removed by this command but are still set in "
+			"the configuration file are not permanently affected by this."
+		));
 		return true;
 	}
 };
diff --git a/modules/operserv/os_reload.cpp b/modules/operserv/os_reload.cpp
index 88bcead7c..4330b5175 100644
--- a/modules/operserv/os_reload.cpp
+++ b/modules/operserv/os_reload.cpp
@@ -45,10 +45,12 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		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.)."));
+		source.Reply(_(
+			"Causes services to reload the configuration file. Note that "
+			"some directives still need the restart of the services to "
+			"take effect (such as services' nicknames, activation of the "
+			"session limitation, etc.)."
+		));
 		return true;
 	}
 };
diff --git a/modules/operserv/os_session.cpp b/modules/operserv/os_session.cpp
index 858b1b2a9..4920e478e 100644