Merge branch '2.0' into 2.1.

19 files changed, 47 insertions, 48 deletions

diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
index 99e497e8d..ba7f67999 100644
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
@@ -4,7 +4,7 @@ about: Report a non-security issue with Anope.
 ---
 
 <!--
-Please fill in the template below. It will help us process your bug report a lot faster.
+Please fill in the template below. It will help us process your bug report a lot faster. If you have multiple bugs to report then please open one issue for each bug.
 -->
 
 **Description**
diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
index a2191c0e0..8b64999a4 100644
--- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
+++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
@@ -4,7 +4,7 @@ about: Request that a new feature is added to Anope.
 ---
 
 <!--
-Please fill in the template below. It will help us process your feature request a lot faster.
+Please fill in the template below. It will help us process your feature request a lot faster. If you have multiple features to request then please open one issue for each feature.
 -->
 
 **Description**
diff --git a/cmake/Anope.cmake b/cmake/Anope.cmake
index 818e548a6..6dd136421 100644
--- a/cmake/Anope.cmake
+++ b/cmake/Anope.cmake
@@ -90,7 +90,7 @@ endmacro()
 #   of TRUE is given, periods will be converted to \\. for CPack.
 ###############################################################################
 macro(add_to_cpack_ignored_files ITEM)
-  # Temporary copy of the orignal item
+  # Temporary copy of the original item
   set(REAL_ITEM "${ITEM}")
   # If we have 2+ arguments, assume that the second one was something like TRUE (doesn't matter really) and convert periods so they will be \\. for CPack
   if(${ARGC} GREATER 1)
diff --git a/include/anope.h b/include/anope.h
index a3b17a593..1d608f8e5 100644
--- a/include/anope.h
+++ b/include/anope.h
@@ -561,7 +561,7 @@ private:
 	/** Original string.
 	 */
 	Anope::string tokens;
-	/** Seperator value
+	/** Separator value
 	 */
 	char sep;
 	/** Current string position
diff --git a/include/modes.h b/include/modes.h
index cd42efcdd..870eb18e3 100644
--- a/include/modes.h
+++ b/include/modes.h
@@ -159,7 +159,7 @@ public:
 	virtual void OnDel(Channel *chan, const Anope::string &mask) { }
 };
 
-/** This is a mode with a paramater, eg +k/l. These modes should use/inherit from this
+/** This is a mode with a parameter, eg +k/l. These modes should use/inherit from this
 */
 class CoreExport ChannelModeParam : public ChannelMode
 {
diff --git a/include/modules.h b/include/modules.h
index 56c29434d..02d4f8736 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -375,7 +375,6 @@ public:
 	virtual EventReturn OnLoadDatabase() { throw NotImplementedException(); }
 
 	/** Called when anope needs to check passwords against encryption
-	 *  see src/encrypt.c for detailed informations
 	 */
 	virtual EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest) { throw NotImplementedException(); }
 
@@ -1038,7 +1037,7 @@ public:
 	/** Called when a nickserv/set command is used.
 	 * @param source The source of the command
 	 * @param cmd The command
-	 * @param nc The nickcore being modifed
+	 * @param nc The nickcore being modified
 	 * @param setting The setting passed to the command. Probably ON/OFF.
 	 * @return EVENT_STOP to halt immediately
 	 */
diff --git a/language/anope.en_US.po b/language/anope.en_US.po
index b34ccea6a..140767b9a 100644
--- a/language/anope.en_US.po
+++ b/language/anope.en_US.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-04 18:46+0000\n"
-"PO-Revision-Date: 2023-12-04 18:48+0000\n"
+"POT-Creation-Date: 2023-12-20 00:02+0000\n"
+"PO-Revision-Date: 2023-12-20 00:07+0000\n"
 "Last-Translator: Sadie Powell <sadie@witchery.services>\n"
 "Language-Team: English\n"
 "Language: en_US\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.2.2\n"
+"X-Generator: Poedit 3.4\n"
 
 #, c-format
 msgid "%d channel(s) cleared, and %d channel(s) dropped."
@@ -1715,11 +1715,11 @@ msgstr "A memo informing the user will also be sent."
 
 #, c-format
 msgid ""
-"A notification memo has been sent to %s informing him/her you have\n"
-"read his/her memo."
+"A notification memo has been sent to %s informing them you have\n"
+"read their memo."
 msgstr ""
-"A notification memo has been sent to %s informing him/her you have\n"
-"read his/her memo."
+"A notification memo has been sent to %s informing them you have\n"
+"read their memo."
 
 msgid "A vHost ident must be in the format of a valid ident."
 msgstr "A vHost ident must be in the format of a valid ident."
@@ -2183,18 +2183,18 @@ msgstr ""
 msgid ""
 "Allows Services Operators to manipulate the SNLINE list.  If\n"
 "a user with a realname matching an SNLINE mask attempts to\n"
-"connect, services will not allow it to pursue his IRC\n"
+"connect, services will not allow them to pursue their IRC\n"
 "session."
 msgstr ""
 "Allows Services Operators to manipulate the SNLINE list.  If\n"
 "a user with a realname matching an SNLINE mask attempts to\n"
-"connect, services will not allow it to pursue his IRC\n"
+"connect, services will not allow them to pursue their IRC\n"
 "session."
 
 msgid ""
 "Allows Services Operators to manipulate the SQLINE list.  If\n"
 "a user with a nick matching an SQLINE mask attempts to\n"
-"connect, services will not allow it to pursue his IRC\n"
+"connect, services will not allow them to pursue their IRC\n"
 "session.\n"
 "If the first character of the mask is #, services will\n"
 "prevent the use of matching channels. If the mask is a\n"
@@ -2203,7 +2203,7 @@ msgid ""
 msgstr ""
 "Allows Services Operators to manipulate the SQLINE list.  If\n"
 "a user with a nick matching an SQLINE mask attempts to\n"
-"connect, services will not allow it to pursue his IRC\n"
+"connect, services will not allow them to pursue their IRC\n"
 "session.\n"
 "If the first character of the mask is #, services will\n"
 "prevent the use of matching channels. If the mask is a\n"
@@ -3703,12 +3703,12 @@ msgid ""
 "Enables or disables the peace option for a channel.\n"
 "When peace is set, a user won't be able to kick,\n"
 "ban or remove a channel status of a user that has\n"
-"a level superior or equal to his via %s commands."
+"a level superior or equal to theirs via %s commands."
 msgstr ""
 "Enables or disables the peace option for a channel.\n"
 "When peace is set, a user won't be able to kick,\n"
 "ban or remove a channel status of a user that has\n"
-"a level superior or equal to his via %s commands."
+"a level superior or equal to theirs via %s commands."
 
 msgid "Enables or disables the private option for a channel."
 msgstr "Enables or disables the private option for a channel."
@@ -5643,7 +5643,7 @@ msgid ""
 "\"founder\" of the channel. The channel founder is allowed\n"
 "to change all of the channel settings for the channel;\n"
 "%s will also automatically give the founder\n"
-"channel-operator privileges when s/he enters the channel."
+"channel operator privileges when they enter the channel."
 msgstr ""
 "Registers a channel in the %s database.  In order\n"
 "to use this command, you must first be a channel operator\n"
@@ -5655,7 +5655,7 @@ msgstr ""
 "\"founder\" of the channel. The channel founder is allowed\n"
 "to change all of the channel settings for the channel;\n"
 "%s will also automatically give the founder\n"
-"channel-operator privileges when s/he enters the channel."
+"channel operator privileges when they enter the channel."
 
 #, c-format
 msgid ""
@@ -5993,29 +5993,29 @@ msgstr "Sends all services staff a memo containing memo-text."
 msgid ""
 "Sends the named nick or channel a memo containing\n"
 "memo-text. When sending to a nickname, the recipient will\n"
-"receive a notice that he/she has a new memo. The target\n"
+"receive a notice that they have a new memo. The target\n"
 "nickname/channel must be registered."
 msgstr ""
 "Sends the named nick or channel a memo containing\n"
 "memo-text. When sending to a nickname, the recipient will\n"
-"receive a notice that he/she has a new memo. The target\n"
+"receive a notice that they have a new memo. The target\n"
 "nickname/channel must be registered."
 
 msgid ""
 "Sends the named nick or channel a memo containing\n"
 "memo-text. When sending to a nickname, the recipient will\n"
-"receive a notice that he/she has a new memo. The target\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 him/her that the memo\n"
+"memo will be sent to the sender informing them that the memo\n"
 "has been read."
 msgstr ""
 "Sends the named nick or channel a memo containing\n"
 "memo-text. When sending to a nickname, the recipient will\n"
-"receive a notice that he/she has a new memo. The target\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 him/her that the memo\n"
+"memo will be sent to the sender informing them that the memo\n"
 "has been read."
 
 msgid ""
@@ -7241,7 +7241,7 @@ msgid ""
 "functions to be changed. LEVELS DISABLE (or DIS for short)\n"
 "disables an automatic feature or disallows access to a\n"
 "function by anyone, INCLUDING the founder (although, the founder\n"
-"can always reenable it). Use LEVELS SET founder to make a level\n"
+"can always re-enable it). Use LEVELS SET founder to make a level\n"
 "founder only.\n"
 " \n"
 "LEVELS LIST shows the current levels for each function or\n"
@@ -7261,7 +7261,7 @@ msgstr ""
 "functions to be changed. LEVELS DISABLE (or DIS for short)\n"
 "disables an automatic feature or disallows access to a\n"
 "function by anyone, INCLUDING the founder (although, the founder\n"
-"can always reenable it). Use LEVELS SET founder to make a level\n"
+"can always re-enable it). Use LEVELS SET founder to make a level\n"
 "founder only.\n"
 " \n"
 "LEVELS LIST shows the current levels for each function or\n"
@@ -8417,8 +8417,8 @@ msgstr "You are over your maximum number of memos (%d). You will be unable to re
 msgid "You can not NOOP Services."
 msgstr "You can not NOOP Services."
 
-msgid "You can not disable the founder privilege because it would be impossible to reenable it at a later time."
-msgstr "You can not disable the founder privilege because it would be impossible to reenable it at a later time."
+msgid "You can not disable the founder privilege because it would be impossible to re-enable it at a later time."
+msgstr "You can not disable the founder privilege because it would be impossible to re-enable it at a later time."
 
 msgid "You can not jupe an already juped server."
 msgstr "You can not jupe an already juped server."
diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp
index 451df5698..0a1203ec3 100644
--- a/modules/commands/cs_access.cpp
+++ b/modules/commands/cs_access.cpp
@@ -687,7 +687,7 @@ class CommandCSLevels : public Command
 		/* Don't allow disabling of the founder level. It would be hard to change it back if you don't have access to use this command */
 		if (what.equals_ci("FOUNDER"))
 		{
-			source.Reply(_("You can not disable the founder privilege because it would be impossible to reenable it at a later time."));
+			source.Reply(_("You can not disable the founder privilege because it would be impossible to re-enable it at a later time."));
 			return;
 		}
 
@@ -843,7 +843,7 @@ public:
 					"functions to be changed. \002LEVELS DISABLE\002 (or \002DIS\002 for short)\n"
 					"disables an automatic feature or disallows access to a\n"
 					"function by anyone, INCLUDING the founder (although, the founder\n"
-					"can always reenable it). Use \002LEVELS SET founder\002 to make a level\n"
+					"can always re-enable it). Use \002LEVELS SET founder\002 to make a level\n"
 					"founder only.\n"
 					" \n"
 					"\002LEVELS LIST\002 shows the current levels for each function or\n"
diff --git a/modules/commands/cs_ban.cpp b/modules/commands/cs_ban.cpp
index eae94110e..4d689a8ef 100644
--- a/modules/commands/cs_ban.cpp
+++ b/modules/commands/cs_ban.cpp
@@ -120,7 +120,7 @@ public:
 			if (u != u2 && ci->HasExt("PEACE") && u2_access >= u_access && !source.HasPriv("chanserv/kick"))
 				source.Reply(ACCESS_DENIED);
 			/*
-			 * Don't ban/kick the user on channels where he is excepted
+			 * Don't ban/kick the user on channels where they are excepted
 			 * to prevent services <-> server wars.
 			 */
 			else if (c->MatchesList(u2, "EXCEPT"))
diff --git a/modules/commands/cs_enforce.cpp b/modules/commands/cs_enforce.cpp
index 3e42c4166..06ddb81bd 100644
--- a/modules/commands/cs_enforce.cpp
+++ b/modules/commands/cs_enforce.cpp
@@ -7,7 +7,7 @@
  *
  * Please read COPYING and README for further details.
  *
- * Send any bug reports to the Anope Coder, as he will be able
+ * Send any bug reports to the Anope Coder, as they will be able
  * to deal with it best.
  */
 
diff --git a/modules/commands/cs_register.cpp b/modules/commands/cs_register.cpp
index 03d37232f..22ea8cb22 100644
--- a/modules/commands/cs_register.cpp
+++ b/modules/commands/cs_register.cpp
@@ -93,7 +93,7 @@ public:
 			"\"founder\" of the channel. The channel founder is allowed\n"
 			"to change all of the channel settings for the channel;\n"
 			"%s will also automatically give the founder\n"
-			"channel-operator privileges when s/he enters the channel."),
+			"channel operator privileges when they enter the channel."),
 				source.service->nick.c_str(), source.service->nick.c_str());
 		BotInfo *bi;
 		Anope::string cmd;
diff --git a/modules/commands/cs_set.cpp b/modules/commands/cs_set.cpp
index fe86b9bc2..93f08a87b 100644
--- a/modules/commands/cs_set.cpp
+++ b/modules/commands/cs_set.cpp
@@ -450,7 +450,7 @@ public:
 		source.Reply(_("Enables or disables the \002peace\002 option for a channel.\n"
 				"When \002peace\002 is set, a user won't be able to kick,\n"
 				"ban or remove a channel status of a user that has\n"
-				"a level superior or equal to his via %s commands."), source.service->nick.c_str());
+				"a level superior or equal to theirs via %s commands."), source.service->nick.c_str());
 		return true;
 	}
 };
diff --git a/modules/commands/ms_read.cpp b/modules/commands/ms_read.cpp
index 740243914..c0645ec3d 100644
--- a/modules/commands/ms_read.cpp
+++ b/modules/commands/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 him/her you have\n"
-				"read his/her memo."), nc->display.c_str());
+		source.Reply(_("A notification memo has been sent to %s informing them you have\n"
+				"read their memo."), nc->display.c_str());
 	}
 
 	/* Remove receipt flag from the original memo */
diff --git a/modules/commands/ms_rsend.cpp b/modules/commands/ms_rsend.cpp
index 1e756b07e..482fd4aa7 100644
--- a/modules/commands/ms_rsend.cpp
+++ b/modules/commands/ms_rsend.cpp
@@ -79,10 +79,10 @@ public:
 		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 he/she has a new memo. The target\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 him/her that the memo\n"
+				"memo will be sent to the sender informing them that the memo\n"
 				"has been read."));
 		return true;
 	}
diff --git a/modules/commands/ms_send.cpp b/modules/commands/ms_send.cpp
index fa641853a..430a06155 100644
--- a/modules/commands/ms_send.cpp
+++ b/modules/commands/ms_send.cpp
@@ -65,7 +65,7 @@ public:
 		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 he/she has a new memo. The target\n"
+				"receive a notice that they have a new memo. The target\n"
 				"nickname/channel must be registered."));
 		return true;
 	}
diff --git a/modules/commands/os_sxline.cpp b/modules/commands/os_sxline.cpp
index 09a005ae4..229d6dbd2 100644
--- a/modules/commands/os_sxline.cpp
+++ b/modules/commands/os_sxline.cpp
@@ -433,7 +433,7 @@ public:
 		source.Reply(" ");
 		source.Reply(_("Allows Services Operators to manipulate the SNLINE list.  If\n"
 				"a user with a realname matching an SNLINE mask attempts to\n"
-				"connect, services will not allow it to pursue his IRC\n"
+				"connect, services will not allow them to pursue their IRC\n"
 				"session."));
 		source.Reply(_(" \n"
 				"\002SNLINE ADD\002 adds the given realname mask to the SNLINE\n"
@@ -662,7 +662,7 @@ public:
 		source.Reply(" ");
 		source.Reply(_("Allows Services Operators to manipulate the SQLINE list.  If\n"
 				"a user with a nick matching an SQLINE mask attempts to\n"
-				"connect, services will not allow it to pursue his IRC\n"
+				"connect, services will not allow them to pursue their IRC\n"
 				"session.\n"
 				"If the first character of the mask is #, services will\n"
 				"prevent the use of matching channels. If the mask is a\n"
diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp
index 9f188450f..21f45185d 100644
--- a/modules/database/db_old.cpp
+++ b/modules/database/db_old.cpp
@@ -130,7 +130,7 @@ enum
 	LANG_JA_EUC, /* Japanese (EUC encoding) */
 	LANG_JA_SJIS, /* Japanese (SJIS encoding) */
 	LANG_ES, /* Spanish */
-	LANG_PT, /* Portugese */
+	LANG_PT, /* Portuguese */
 	LANG_FR, /* French */
 	LANG_TR, /* Turkish */
 	LANG_IT, /* Italian */
diff --git a/src/channels.cpp b/src/channels.cpp
index 5c6ba55e7..7c1405501 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -308,7 +308,7 @@ void Channel::SetModeInternal(MessageSource &setter, ChannelMode *ocm, const Ano
 
 	if (param.empty() && cm->type != MODE_REGULAR)
 	{
-		Log() << "Channel::SetModeInternal() mode " << cm->mchar << " for " << this->name << " with no paramater, but is a param mode";
+		Log() << "Channel::SetModeInternal() mode " << cm->mchar << " for " << this->name << " with no parameter, but is a param mode";
 		return;
 	}
 
diff --git a/src/win32/win32_memory.cpp b/src/win32/win32_memory.cpp
index db7a46eb8..2e25e8681 100644
--- a/src/win32/win32_memory.cpp
+++ b/src/win32/win32_memory.cpp
@@ -22,7 +22,7 @@
  * whereas on POSIX systems, shared objects loaded into an executable share
  * the executable's heap. This means that if we pass an arbitrary pointer to
  * a windows DLL which is not allocated in that dll, without some form of
- * marshalling, we get a page fault. To fix this, these overrided operators
+ * marshalling, we get a page fault. To fix this, these overridden operators
  * new and delete use the windows HeapAlloc and HeapFree functions to claim
  * memory from the windows global heap. This makes windows 'act like' POSIX
  * when it comes to memory usage between dlls and exes.