Merge branch '2.0' into 2.1.

1 files changed, 25 insertions, 25 deletions

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."