summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmake/Anope.cmake2
-rw-r--r--docs/Changes4
-rw-r--r--docs/Changes.conf2
-rw-r--r--include/anope.h2
-rw-r--r--include/modes.h2
-rw-r--r--include/modules.h3
-rw-r--r--language/anope.en_US.po53
-rw-r--r--modules/commands/cs_access.cpp4
-rw-r--r--modules/commands/cs_ban.cpp2
-rw-r--r--modules/commands/cs_enforce.cpp2
-rw-r--r--modules/commands/cs_register.cpp2
-rw-r--r--modules/commands/cs_set.cpp2
-rw-r--r--modules/commands/ms_read.cpp4
-rw-r--r--modules/commands/ms_rsend.cpp4
-rw-r--r--modules/commands/ms_send.cpp2
-rw-r--r--modules/commands/os_sxline.cpp4
-rw-r--r--modules/database/db_old.cpp2
-rw-r--r--src/channels.cpp2
-rw-r--r--src/win32/win32_memory.cpp2
19 files changed, 50 insertions, 50 deletions
diff --git a/cmake/Anope.cmake b/cmake/Anope.cmake
index 1b924bc5d..581dc5164 100644
--- a/cmake/Anope.cmake
+++ b/cmake/Anope.cmake
@@ -539,7 +539,7 @@ endmacro(check_functions)
# 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/docs/Changes b/docs/Changes
index 493e2fd68..17798d841 100644
--- a/docs/Changes
+++ b/docs/Changes
@@ -159,7 +159,7 @@ Show memo notify settings in ms_info
Fix some actions bumping channels last used time that shouldn't have
Add maxlogins configuration directive to limit the number of concurrent logins to one account
Fix race with auto svsnick on ghost sometimes causing nick collisions instead
-Fix saset langauge reply
+Fix saset language reply
Show akill/sxlines ids in VIEW
Fix crash when an oper is configured in both the configuration and via os_oper
Fix m_ldap reconnect logic not properly setting protocol and network timeout settings
@@ -226,7 +226,7 @@ A Added SQL logging support
A Added Redis database support
A Added ability to configure what privileges XOP commands give
U Updated Dutch language file, from Robby <robby@chat.be>
-U Updated Spanish langauge file, from Isaac Fontal <i_fontal@hotmail.com>
+U Updated Spanish language file, from Isaac Fontal <i_fontal@hotmail.com>
F Fix build on Solaris and OSX
F Fixed setting BotServ's default settings in the config
F Fixed some names of config items, including NickServ's kill protect
diff --git a/docs/Changes.conf b/docs/Changes.conf
index a756ef89b..8a651e3c7 100644
--- a/docs/Changes.conf
+++ b/docs/Changes.conf
@@ -4,7 +4,7 @@ No significant changes.
Anope Version 2.0.14
--------------------
-Added mail:content_type to allow customising the content type of emails.
+Added mail:content_type to allow customizing the content type of emails.
Anope Version 2.0.13
--------------------
diff --git a/include/anope.h b/include/anope.h
index ed894c4ce..056cc5f7e 100644
--- a/include/anope.h
+++ b/include/anope.h
@@ -572,7 +572,7 @@ class CoreExport sepstream
/** 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 134fb04b2..32a2e1f9b 100644
--- a/include/modes.h
+++ b/include/modes.h
@@ -160,7 +160,7 @@ class CoreExport ChannelModeList : public ChannelMode
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 659804b1d..0b5e4903e 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -402,7 +402,6 @@ class CoreExport Module : public Extensible
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(); }
virtual EventReturn OnDecrypt(const Anope::string &hashm, const Anope::string &src, Anope::string &dest) { throw NotImplementedException(); }
@@ -1066,7 +1065,7 @@ class CoreExport Module : public Extensible
/** 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 3a39af7dc..5db3c0fa0 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-02-19 11:11+0000\n"
-"PO-Revision-Date: 2023-02-19 11:11+0000\n"
+"POT-Creation-Date: 2023-12-17 19:24+0000\n"
+"PO-Revision-Date: 2023-12-17 19:27+0000\n"
"Last-Translator: Sadie Powell <sadie@witchery.services>\n"
"Language-Team: English\n"
"Language: en_US\n"
@@ -16,6 +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.4\n"
#, c-format
msgid "%d channel(s) cleared, and %d channel(s) dropped."
@@ -808,7 +809,7 @@ msgstr ""
msgid ""
" \n"
-"SQLINE ADD adds the given (nick's) mask to the SQLINE\n"
+"SQLINE ADD adds the given (nick/channel) mask to the SQLINE\n"
"list for the given reason (which must be given).\n"
"expiry is specified as an integer followed by one of d\n"
"(days), h (hours), or m (minutes). Combinations (such as\n"
@@ -821,7 +822,7 @@ msgid ""
"STATS AKILL command."
msgstr ""
" \n"
-"SQLINE ADD adds the given (nick's) mask to the SQLINE\n"
+"SQLINE ADD adds the given (nick/channel) mask to the SQLINE\n"
"list for the given reason (which must be given).\n"
"expiry is specified as an integer followed by one of d\n"
"(days), h (hours), or m (minutes). Combinations (such as\n"
@@ -1705,11 +1706,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."
@@ -2182,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"
@@ -2202,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"
@@ -3702,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."
@@ -5661,7 +5662,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"
@@ -5673,7 +5674,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 ""
@@ -6025,29 +6026,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 ""
@@ -7267,7 +7268,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"
@@ -7287,7 +7288,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"
@@ -8446,8 +8447,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 cab343057..ce251ab98 100644
--- a/modules/commands/cs_access.cpp
+++ b/modules/commands/cs_access.cpp
@@ -674,7 +674,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;
}
@@ -833,7 +833,7 @@ class CommandCSLevels : public Command
"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 88b0c5168..b5b23f4a6 100644
--- a/modules/commands/cs_ban.cpp
+++ b/modules/commands/cs_ban.cpp
@@ -120,7 +120,7 @@ class CommandCSBan : public Command
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 2a8c43478..a7c30aa09 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 e69d83526..f51f21fa2 100644
--- a/modules/commands/cs_register.cpp
+++ b/modules/commands/cs_register.cpp
@@ -93,7 +93,7 @@ class CommandCSRegister : public Command
"\"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 73fa9f4a0..e5b7d8e9b 100644
--- a/modules/commands/cs_set.cpp
+++ b/modules/commands/cs_set.cpp
@@ -452,7 +452,7 @@ class CommandCSSetPeace : public Command
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 1bfe86437..a80829166 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 f7f64b725..45e414db3 100644
--- a/modules/commands/ms_rsend.cpp
+++ b/modules/commands/ms_rsend.cpp
@@ -79,10 +79,10 @@ class CommandMSRSend : public Command
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 7a1edd039..b5124cf9f 100644
--- a/modules/commands/ms_send.cpp
+++ b/modules/commands/ms_send.cpp
@@ -65,7 +65,7 @@ class CommandMSSend : public Command
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 4918a1793..667cf5fdb 100644
--- a/modules/commands/os_sxline.cpp
+++ b/modules/commands/os_sxline.cpp
@@ -435,7 +435,7 @@ class CommandOSSNLine : public CommandOSSXLineBase
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"
@@ -669,7 +669,7 @@ class CommandOSSQLine : public CommandOSSXLineBase
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 492c5faa8..4f2ce117b 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 8a1f89081..cb05be01b 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.
generated by cgit (git 2.34.1) at 2025-06-16 22:41:00 +0000