Update more messages to use gettext plural forms.

8 files changed, 21 insertions, 47 deletions

diff --git a/modules/botserv/bs_badwords.cpp b/modules/botserv/bs_badwords.cpp
index 946549713..a0399ef6a 100644
--- a/modules/botserv/bs_badwords.cpp
+++ b/modules/botserv/bs_badwords.cpp
@@ -176,12 +176,10 @@ public:
 
 	~BadwordsDelCallback() override
 	{
-		if (!deleted)
-			source.Reply(_("No matching entries on %s bad words list."), ci->name.c_str());
-		else if (deleted == 1)
-			source.Reply(_("Deleted 1 entry from %s bad words list."), ci->name.c_str());
+		if (deleted)
+			source.Reply(deleted, N_("Deleted %d entry from %s bad words list.", "Deleted %d entries from %s bad words list."), deleted, ci->name.c_str());
 		else
-			source.Reply(_("Deleted %d entries from %s bad words list."), deleted, ci->name.c_str());
+			source.Reply(_("No matching entries on %s bad words list."), ci->name.c_str());
 	}
 
 	void HandleNumber(unsigned Number) override
diff --git a/modules/chanserv/cs_access.cpp b/modules/chanserv/cs_access.cpp
index 5f13f56df..cf7ad90f4 100644
--- a/modules/chanserv/cs_access.cpp
+++ b/modules/chanserv/cs_access.cpp
@@ -284,11 +284,7 @@ class CommandCSAccess final
 					else
 					{
 						Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, c, ci) << "to delete " << Nicks;
-
-						if (deleted == 1)
-							source.Reply(_("Deleted 1 entry from %s access list."), ci->name.c_str());
-						else
-							source.Reply(_("Deleted %d entries from %s access list."), deleted, ci->name.c_str());
+						source.Reply(deleted, N_("Deleted %d entry from %s access list.", "Deleted %d entries from %s access list."), deleted, ci->name.c_str());
 					}
 				}
 
diff --git a/modules/chanserv/cs_akick.cpp b/modules/chanserv/cs_akick.cpp
index ad58a814b..5453aa5d2 100644
--- a/modules/chanserv/cs_akick.cpp
+++ b/modules/chanserv/cs_akick.cpp
@@ -219,12 +219,10 @@ class CommandCSAKick final
 
 				~AkickDelCallback() override
 				{
-					if (!deleted)
-						source.Reply(_("No matching entries on %s autokick list."), ci->name.c_str());
-					else if (deleted == 1)
-						source.Reply(_("Deleted 1 entry from %s autokick list."), ci->name.c_str());
+					if (deleted)
+						source.Reply(deleted, N_("Deleted %d entry from %s autokick list.", "Deleted %d entries from %s autokick list."), deleted, ci->name.c_str());
 					else
-						source.Reply(_("Deleted %d entries from %s autokick list."), deleted, ci->name.c_str());
+						source.Reply(_("No matching entries on %s autokick list."), ci->name.c_str());
 				}
 
 				void HandleNumber(unsigned number) override
diff --git a/modules/chanserv/cs_xop.cpp b/modules/chanserv/cs_xop.cpp
index 3ba3096ae..b005af2d1 100644
--- a/modules/chanserv/cs_xop.cpp
+++ b/modules/chanserv/cs_xop.cpp
@@ -319,11 +319,7 @@ private:
 					else
 					{
 						Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, c, ci) << "to delete " << nicks;
-
-						if (deleted == 1)
-							source.Reply(_("Deleted one entry from %s %s list."), ci->name.c_str(), source.command.c_str());
-						else
-							source.Reply(_("Deleted %d entries from %s %s list."), deleted, ci->name.c_str(), source.command.c_str());
+						source.Reply(deleted, N_("Deleted %d entry from %s %s list.", "Deleted %d entries from %s %s list."), deleted, ci->name.c_str(), source.command.c_str());
 					}
 				}
 
diff --git a/modules/global/gl_queue.cpp b/modules/global/gl_queue.cpp
index 7ac4605fa..864176c01 100644
--- a/modules/global/gl_queue.cpp
+++ b/modules/global/gl_queue.cpp
@@ -31,18 +31,10 @@ public:
 
 	~QueueDelCallback() override
 	{
-		switch (deleted)
-		{
-			case 0:
-				source.Reply(_("No matching entries in your message queue."));
-				break;
-			case 1:
-				source.Reply(_("Deleted one entry from your message queue."));
-				break;
-			default:
-				source.Reply(_("Deleted %u entries from your message queue."), deleted);
-				break;
-		}
+		if (deleted)
+			source.Reply(deleted, N_("Deleted %u entry from your message queue.", "Deleted %u entries from your message queue."), deleted);
+		else
+			source.Reply(_("No matching entries in your message queue."));
 	}
 
 	void HandleNumber(unsigned number) override
diff --git a/modules/operserv/os_akill.cpp b/modules/operserv/os_akill.cpp
index e24b7fca6..e2be2ed7a 100644
--- a/modules/operserv/os_akill.cpp
+++ b/modules/operserv/os_akill.cpp
@@ -26,12 +26,10 @@ public:
 
 	~AkillDelCallback() override
 	{
-		if (!deleted)
-			source.Reply(_("No matching entries on the AKILL list."));
-		else if (deleted == 1)
-			source.Reply(_("Deleted 1 entry from the AKILL list."));
+		if (deleted)
+			source.Reply(deleted, N_("Deleted %d entry from the AKILL list.", "Deleted %d entries from the AKILL list."), deleted);
 		else
-			source.Reply(_("Deleted %d entries from the AKILL list."), deleted);
+			source.Reply(_("No matching entries on the AKILL list."));
 	}
 
 	void HandleNumber(unsigned number) override
diff --git a/modules/operserv/os_session.cpp b/modules/operserv/os_session.cpp
index e6111827f..3db90f132 100644
--- a/modules/operserv/os_session.cpp
+++ b/modules/operserv/os_session.cpp
@@ -182,12 +182,10 @@ public:
 
 	~ExceptionDelCallback() override
 	{
-		if (!deleted)
-			source.Reply(_("No matching entries on session-limit exception list."));
-		else if (deleted == 1)
-			source.Reply(_("Deleted 1 entry from session-limit exception list."));
+		if (deleted)
+			source.Reply(deleted, N_("Deleted %d entry from session-limit exception list.", "Deleted %d entries from session-limit exception list."), deleted);
 		else
-			source.Reply(_("Deleted %d entries from session-limit exception list."), deleted);
+			source.Reply(_("No matching entries on session-limit exception list."));
 	}
 
 	void HandleNumber(unsigned number) override
diff --git a/modules/operserv/os_sxline.cpp b/modules/operserv/os_sxline.cpp
index 18ae3c0c0..ebb935c33 100644
--- a/modules/operserv/os_sxline.cpp
+++ b/modules/operserv/os_sxline.cpp
@@ -25,12 +25,10 @@ public:
 
 	~SXLineDelCallback() override
 	{
-		if (!deleted)
-			source.Reply(_("No matching entries on the %s list."), source.command.c_str());
-		else if (deleted == 1)
-			source.Reply(_("Deleted 1 entry from the %s list."), source.command.c_str());
+		if (deleted)
+			source.Reply(deleted, N_("Deleted %d entry from the %s list.", "Deleted %d entries from the %s list."), deleted, source.command.c_str());
 		else
-			source.Reply(_("Deleted %d entries from the %s list."), deleted, source.command.c_str());
+			source.Reply(_("No matching entries on the %s list."), source.command.c_str());
 	}
 
 	void HandleNumber(unsigned number) override