Update as many messages as possible for automatic line wrapping.

11 files changed, 162 insertions, 118 deletions

diff --git a/modules/memoserv/memoserv.cpp b/modules/memoserv/memoserv.cpp
index b653e8ade..e25497f0d 100644
--- a/modules/memoserv/memoserv.cpp
+++ b/modules/memoserv/memoserv.cpp
@@ -214,12 +214,17 @@ public:
 	{
 		if (!params.empty() || source.c || source.service != *MemoServ)
 			return EVENT_CONTINUE;
-		source.Reply(_("\002%s\002 is a utility allowing IRC users to send short\n"
-			"messages to other IRC users, whether they are online at\n"
-			"the time or not, or to channels(*). Both the sender's\n"
-			"nickname and the target nickname or channel must be\n"
-			"registered in order to send a memo.\n"
-			"%s's commands include:"), MemoServ->nick.c_str(), MemoServ->nick.c_str());
+		source.Reply(_(
+				"\002%s\002 is a utility allowing IRC users to send short "
+				"messages to other IRC users, whether they are online at "
+				"the time or not, or to channels(*). Both the sender's "
+				"nickname and the target nickname or channel must be "
+				"registered in order to send a memo."
+				"\n\n"
+				"%s's commands include:"
+			),
+			MemoServ->nick.c_str(),
+			MemoServ->nick.c_str());
 		return EVENT_CONTINUE;
 	}
 
@@ -227,9 +232,9 @@ public:
 	{
 		if (!params.empty() || source.c || source.service != *MemoServ)
 			return;
-		source.Reply(_(" \n"
-			"Type \002%s \037command\037\002 for help on any of the\n"
-			"above commands."),
+
+		source.Reply(" ");
+		source.Reply(_("Type \002%s\032\037command\037\002 for help on any of the above commands."),
 			MemoServ->GetQueryCommand("generic/help").c_str());
 	}
 };
diff --git a/modules/memoserv/ms_cancel.cpp b/modules/memoserv/ms_cancel.cpp
index b423899b0..5a93497fe 100644
--- a/modules/memoserv/ms_cancel.cpp
+++ b/modules/memoserv/ms_cancel.cpp
@@ -82,8 +82,10 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Cancels the last memo you sent to the given nick or channel,\n"
-				"provided it has not been read at the time you use the command."));
+		source.Reply(_(
+			"Cancels the last memo you sent to the given nick or channel, "
+			"provided it has not been read at the time you use the command."
+		));
 		return true;
 	}
 };
diff --git a/modules/memoserv/ms_check.cpp b/modules/memoserv/ms_check.cpp
index 7c478b02b..31efa70c3 100644
--- a/modules/memoserv/ms_check.cpp
+++ b/modules/memoserv/ms_check.cpp
@@ -67,8 +67,10 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Checks whether the _last_ memo you sent to \037nick\037 has been read\n"
-				"or not. Note that this only works with nicks, not with channels."));
+		source.Reply(_(
+			"Checks whether the _last_ memo you sent to \037nick\037 has been read "
+			"or not. Note that this only works with nicks, not with channels."
+		));
 		return true;
 	}
 };
diff --git a/modules/memoserv/ms_del.cpp b/modules/memoserv/ms_del.cpp
index 56700b0bd..d905a2e08 100644
--- a/modules/memoserv/ms_del.cpp
+++ b/modules/memoserv/ms_del.cpp
@@ -128,20 +128,23 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Deletes the specified memo or memos. You can supply\n"
-				"multiple memo numbers or ranges of numbers instead of a\n"
-				"single number, as in the second example below.\n"
-				" \n"
-				"If \002LAST\002 is given, the last memo will be deleted.\n"
-				"If \002ALL\002 is given, deletes all of your memos.\n"
-				" \n"
-				"Examples:\n"
-				" \n"
-				"   \002DEL 1\002\n"
-				"      Deletes your first memo.\n"
-				" \n"
-				"   \002DEL 2-5,7-9\002\n"
-				"      Deletes memos numbered 2 through 5 and 7 through 9."));
+		source.Reply(_(
+			"Deletes the specified memo or memos. You can supply "
+			"multiple memo numbers or ranges of numbers instead of a "
+			"single number, as in the second example below."
+			"\n\n"
+			"If \002LAST\002 is given, the last memo will be deleted."
+			"\n\n"
+			"If \002ALL\002 is given, deletes all of your memos."
+			"\n\n"
+			"Examples:"
+			"\n\n"
+			"   \002DEL\0321\002\n"
+			"      Deletes your first memo."
+			"\n\n"
+			"   \002DEL\0322-5,7-9\002\n"
+			"      Deletes memos numbered 2 through 5 and 7 through 9."
+		));
 		return true;
 	}
 };
diff --git a/modules/memoserv/ms_ignore.cpp b/modules/memoserv/ms_ignore.cpp
index 6b50d90bc..022a95bc4 100644
--- a/modules/memoserv/ms_ignore.cpp
+++ b/modules/memoserv/ms_ignore.cpp
@@ -103,10 +103,12 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Allows you to ignore users by nick or host from memoing\n"
-					"you or a channel. If someone on the memo ignore list tries\n"
-					"to memo you or a channel, they will not be told that you have\n"
-					"them ignored."));
+		source.Reply(_(
+			"Allows you to ignore users by nick or host from memoing "
+			"you or a channel. If someone on the memo ignore list tries "
+			"to memo you or a channel, they will not be told that you have "
+			"them ignored."
+		));
 		return true;
 	}
 };
diff --git a/modules/memoserv/ms_info.cpp b/modules/memoserv/ms_info.cpp
index 91acaabde..e325c13e2 100644
--- a/modules/memoserv/ms_info.cpp
+++ b/modules/memoserv/ms_info.cpp
@@ -204,16 +204,18 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Without a parameter, displays information on the number of\n"
-				"memos you have, how many of them are unread, and how many\n"
-				"total memos you can receive.\n"
-				" \n"
-				"With a channel parameter, displays the same information for\n"
-				"the given channel.\n"
-				" \n"
-				"With a nickname parameter, displays the same information\n"
-				"for the given nickname. This is limited to \002Services\002\n"
-				"\002Operators\002."));
+		source.Reply(_(
+			"Without a parameter, displays information on the number of "
+			"memos you have, how many of them are unread, and how many "
+			"total memos you can receive."
+			"\n\n"
+			"With a channel parameter, displays the same information for "
+			"the given channel."
+			"\n\n"
+			"With a nickname parameter, displays the same information "
+			"for the given nickname. This is limited to \002Services "
+			"Operators\002."
+		));
 
 		return true;
 	}
diff --git a/modules/memoserv/ms_list.cpp b/modules/memoserv/ms_list.cpp
index d421efe86..d7926b39f 100644
--- a/modules/memoserv/ms_list.cpp
+++ b/modules/memoserv/ms_list.cpp
@@ -141,12 +141,14 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Lists any memos you currently have.  With \002NEW\002, lists only\n"
-				"new (unread) memos. Unread memos are marked with a \"*\"\n"
-				"to the left of the memo number. You can also specify a list\n"
-				"of numbers, as in the example below:\n"
-				"   \002LIST 2-5,7-9\002\n"
-				"      Lists memos numbered 2 through 5 and 7 through 9."));
+		source.Reply(_(
+			"Lists any memos you currently have.  With \002NEW\002, lists only "
+			"new (unread) memos. Unread memos are marked with a \"*\" "
+			"to the left of the memo number. You can also specify a list "
+			"of numbers, as in the example below:\n"
+			"   \002LIST 2-5,7-9\002\n"
+			"      Lists memos numbered 2 through 5 and 7 through 9."
+		));
 		return true;
 	}
 };
diff --git a/modules/memoserv/ms_read.cpp b/modules/memoserv/ms_read.cpp
index 7878027bf..4fec8cdb8 100644
--- a/modules/memoserv/ms_read.cpp
+++ b/modules/memoserv/ms_read.cpp
@@ -39,8 +39,8 @@ static void rsend_notify(CommandSource &source, MemoInfo *mi, Memo *m, const Ano
 
 		/* Notify recipient of the memo that a notification has
 		   been sent to the sender */
-		source.Reply(_("A notification memo has been sent to %s informing them you have\n"
-				"read their memo."), nc->display.c_str());
+		source.Reply(_("A notification memo has been sent to %s informing them you have read their memo."),
+			nc->display.c_str());
 	}
 
 	/* Remove receipt flag from the original memo */
@@ -198,15 +198,17 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Sends you the text of the memos specified. If LAST is\n"
-				"given, sends you the memo you most recently received. If\n"
-				"NEW is given, sends you all of your new memos.  If ALL is\n"
-				"given, sends you all of your memos. Otherwise, sends you\n"
-				"memo number \037num\037. You can also give a list of numbers,\n"
-				"as in this example:\n"
-				" \n"
-				"   \002READ 2-5,7-9\002\n"
-				"      Displays memos numbered 2 through 5 and 7 through 9."));
+		source.Reply(_(
+			"Sends you the text of the memos specified. If LAST is "
+			"given, sends you the memo you most recently received. If "
+			"NEW is given, sends you all of your new memos.  If ALL is "
+			"given, sends you all of your memos. Otherwise, sends you "
+			"memo number \037num\037. You can also give a list of numbers, "
+			"as in this example:"
+			"\n\n"
+			"   \002READ 2-5,7-9\002\n"
+			"      Displays memos numbered 2 through 5 and 7 through 9."
+		));
 		return true;
 	}
 };
diff --git a/modules/memoserv/ms_rsend.cpp b/modules/memoserv/ms_rsend.cpp
index 6543e2451..22b27a4f4 100644
--- a/modules/memoserv/ms_rsend.cpp
+++ b/modules/memoserv/ms_rsend.cpp
@@ -82,13 +82,15 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Sends the named \037nick\037 or \037channel\037 a memo containing\n"
-				"\037memo-text\037. When sending to a nickname, the recipient will\n"
-				"receive a notice that they have a new memo. The target\n"
-				"nickname/channel must be registered.\n"
-				"Once the memo is read by its recipient, an automatic notification\n"
-				"memo will be sent to the sender informing them that the memo\n"
-				"has been read."));
+		source.Reply(_(
+			"Sends the named \037nick\037 or \037channel\037 a memo containing "
+			"\037memo-text\037. When sending to a nickname, the recipient will "
+			"receive a notice that they have a new memo. The target "
+			"nickname/channel must be registered. "
+			"Once the memo is read by its recipient, an automatic notification "
+			"memo will be sent to the sender informing them that the memo "
+			"has been read."
+		));
 		return true;
 	}
 };
diff --git a/modules/memoserv/ms_send.cpp b/modules/memoserv/ms_send.cpp
index ba025a5ca..8e348b949 100644
--- a/modules/memoserv/ms_send.cpp
+++ b/modules/memoserv/ms_send.cpp
@@ -68,10 +68,12 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Sends the named \037nick\037 or \037channel\037 a memo containing\n"
-				"\037memo-text\037. When sending to a nickname, the recipient will\n"
-				"receive a notice that they have a new memo. The target\n"
-				"nickname/channel must be registered."));
+		source.Reply(_(
+			"Sends the named \037nick\037 or \037channel\037 a memo containing "
+			"\037memo-text\037. When sending to a nickname, the recipient will "
+			"receive a notice that they have a new memo. The target "
+			"nickname/channel must be registered."
+		));
 		return true;
 	}
 };
diff --git a/modules/memoserv/ms_set.cpp b/modules/memoserv/ms_set.cpp
index ac2f066ba..f4158c855 100644
--- a/modules/memoserv/ms_set.cpp
+++ b/modules/memoserv/ms_set.cpp
@@ -225,65 +225,85 @@ public:
 		{
 			this->SendSyntax(source);
 			source.Reply(" ");
-			source.Reply(_("Sets various memo options.  \037option\037 can be one of:\n"
-					" \n"
+			source.Reply(_(
+					"Sets various memo options.  \037option\037 can be one of:"
+					"\n\n"
 					"    NOTIFY      Changes when you will be notified about\n"
-					"                   new memos (only for nicknames)\n"
+					"                   new memos (only for nicknames)"
+					"\n\n"
 					"    LIMIT       Sets the maximum number of memos you can\n"
-					"                   receive\n"
-					" \n"
-					"Type \002%s \037option\037\002 for more information\n"
-					"on a specific option."),
+					"                   receive"
+					"\n\n"
+					"Type \002%s\032\037option\037\002 for more information "
+					"on a specific option."
+				),
 				source.service->GetQueryCommand("generic/help", source.command).c_str());
 		}
 		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"
-					"               when you unset /AWAY, and when they are sent\n"
-					"               to you.\n"
-					"    LOGON   You will only be notified of memos when you log\n"
-					"               on or when you unset /AWAY.\n"
-					"    NEW     You will only be notified of memos when they\n"
-					"               are sent to you.\n"
-					"    MAIL    You will be notified of memos by email as well as\n"
-					"               any other settings you have.\n"
-					"    NOMAIL  You will not be notified of memos by email.\n"
-					"    OFF     You will not receive any notification of memos.\n"
-					" \n"
-					"\002ON\002 is essentially \002LOGON\002 and \002NEW\002 combined."));
+		{
+			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"
+				"               when you unset /AWAY, and when they are sent\n"
+				"               to you."
+				"\n\n"
+				"    LOGON   You will only be notified of memos when you log\n"
+				"               on or when you unset /AWAY."
+				"\n\n"
+				"    NEW     You will only be notified of memos when they\n"
+				"               are sent to you."
+				"\n\n"
+				"    MAIL    You will be notified of memos by email as well as\n"
+				"               any other settings you have."
+				"\n\n"
+				"    NOMAIL  You will not be notified of memos by email."
+				"\n\n"
+				"    OFF     You will not receive any notification of memos."
+				"\n\n"
+				"\002ON\002 is essentially \002LOGON\002 and \002NEW\002 combined."
+			));
+		}
 		else if (subcommand.equals_ci("LIMIT"))
 		{
 			int max_memos = Config->GetModule("memoserv").Get<int>("maxmemos");
 			if (source.IsServicesOper())
-				source.Reply(_("Syntax: \002LIMIT [\037user\037 | \037channel\037] {\037limit\037 | NONE} [HARD]\002\n"
-						" \n"
-						"Sets the maximum number of memos a user or channel is\n"
-						"allowed to have.  Setting the limit to 0 prevents the user\n"
-						"from receiving any memos; setting it to \002NONE\002 allows the\n"
-						"user to receive and keep as many memos as they want.  If\n"
-						"you do not give a nickname or channel, your own limit is\n"
-						"set.\n"
-						" \n"
-						"Adding \002HARD\002 prevents the user from changing the limit.  Not\n"
-						"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"
-						"\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);
+			{
+				source.Reply(_(
+						"Syntax: \002LIMIT [\037user\037 | \037channel\037] {\037limit\037 | NONE} [HARD]\002"
+						"\n\n"
+						"Sets the maximum number of memos a user or channel is "
+						"allowed to have.  Setting the limit to 0 prevents the user "
+						"from receiving any memos; setting it to \002NONE\002 allows the "
+						"user to receive and keep as many memos as they want.  If "
+						"you do not give a nickname or channel, your own limit is "
+						"set."
+						"\n\n"
+						"Adding \002HARD\002 prevents the user from changing the limit.  Not "
+						"adding \002HARD\002 has the opposite effect, allowing the user to "
+						"change the limit (even if a previous limit was set with "
+						"\002HARD\002)."
+						"\n\n"
+						"This use of the \002SET\032LIMIT\002 command is limited to \002Services "
+						"Operators\002.  Other users may only enter a limit for themselves "
+						"or a channel on which they have such privileges, may not "
+						"remove their limit, may not set a limit above %d, and may "
+						"not set a hard limit."
+					),
+					max_memos);
+			}
 			else
-				source.Reply(_("Syntax: \002LIMIT [\037channel\037] \037limit\037\002\n"
-									" \n"
-									"Sets the maximum number of memos you (or the given channel)\n"
-									"are allowed to have. If you set this to 0, no one will be\n"
-									"able to send any memos to you.  However, you cannot set\n"
-									"this any higher than %d."), max_memos);
+				source.Reply(_(
+						"Syntax: \002LIMIT [\037channel\037] \037limit\037\002"
+						"\n\n"
+						"Sets the maximum number of memos you (or the given channel) "
+						"are allowed to have. If you set this to 0, no one will be "
+						"able to send any memos to you.  However, you cannot set "
+						"this any higher than %d."
+					),
+					max_memos);
 		}
 		else
 			return false;