Release 2.1.1.

Unlike other regular expression engines this is available on all
systems.

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

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

.github/workflows/ci-linux.yml

@@ -21,14 +21,13 @@ jobs:
             libldap2-dev \
             libmysqlclient-dev \
             libpcre2-dev \
-            libpcre3-dev \
             libsqlite3-dev \
             libssl-dev \
             libtre-dev \
             ninja-build
       - name: Enable extras
         run: |
-          for MODULE in m_ldap.cpp m_ldap_authentication.cpp m_ldap_oper.cpp m_mysql.cpp m_regex_pcre.cpp m_regex_pcre2.cpp m_regex_posix.cpp m_regex_tre.cpp m_sql_authentication.cpp m_sql_log.cpp m_sql_oper.cpp m_sqlite.cpp m_ssl_gnutls.cpp m_ssl_openssl.cpp stats
+          for MODULE in m_ldap.cpp m_ldap_authentication.cpp m_ldap_oper.cpp m_mysql.cpp m_regex_pcre2.cpp m_regex_posix.cpp m_regex_tre.cpp m_sql_authentication.cpp m_sql_log.cpp m_sql_oper.cpp m_sqlite.cpp m_ssl_gnutls.cpp m_ssl_openssl.cpp stats
           do
             ln -s ${{ github.workspace }}/modules/extra/$MODULE ${{ github.workspace }}/modules
           done

.gitignore

@@ -17,3 +17,4 @@ modules/m_ssl_gnutls.cpp
 modules/m_ssl_openssl.cpp
 modules/stats
 run/
+*.mo

CMakeLists.txt

@@ -253,8 +253,10 @@ if(LDFLAGS)
 endif()
 
 # Search for the following programs
-find_program(CHGRP "chgrp" REQUIRED)
-find_program(CHMOD "chmod" REQUIRED)
+if(NOT WIN32 AND RUNGROUP)
+  find_program(CHGRP "chgrp" REQUIRED)
+  find_program(CHMOD "chmod" REQUIRED)
+endif()
 
 # If a INSTDIR was passed in to CMake, use it as the install prefix, otherwise set the default install prefix to the anope directory under the user's home directory
 if(INSTDIR)

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)

data/anope.example.conf

@@ -527,7 +527,7 @@ options
 	 *
 	 * Note for this to work the regex module providing the regex engine must be loaded.
 	 */
-	#regexengine = "regex/pcre"
+	#regexengine = "regex/stdlib"
 
 	/*
 	 * A list of languages to load on startup that will be available in /NICKSERV SET LANGUAGE.

data/botserv.example.conf

@@ -323,6 +323,7 @@ command { service = "NickServ"; name = "SASET GREET"; command = "nickserv/saset/
 privilege
 {
 	name = "GREET"
+	desc = _("Greet message displayed on join")
 	rank = 40
 	level = 5
 	flag = "g"

data/chanserv.example.conf

@@ -216,6 +216,7 @@ module
 privilege
 {
 	name = "ACCESS_CHANGE"
+	desc = _("Allowed to modify the access list")
 	rank = 0
 	level = 10
 	flag = "f"
@@ -232,6 +233,7 @@ privilege
 privilege
 {
 	name = "ACCESS_LIST"
+	desc = _("Allowed to view the access list")
 	rank = 10
 	level = 3
 	flag = "f"
@@ -248,6 +250,7 @@ privilege
 privilege
 {
 	name = "AKICK"
+	desc = _("Allowed to use the AKICK command")
 	rank = 250
 	level = 10
 	flag = "K"
@@ -264,6 +267,7 @@ privilege
 privilege
 {
 	name = "ASSIGN"
+	desc = _("Allowed to assign/unassign a bot")
 	rank = 270
 	level = "founder"
 	flag = "s"
@@ -280,6 +284,7 @@ privilege
 privilege
 {
 	name = "AUTOHALFOP"
+	desc = _("Automatic halfop upon join")
 	rank = 100
 	level = 4
 	flag = "H"
@@ -296,6 +301,7 @@ privilege
 privilege
 {
 	name = "AUTOOP"
+	desc = _("Automatic channel operator status upon join")
 	rank = 210
 	level = 5
 	flag = "O"
@@ -312,6 +318,7 @@ privilege
 privilege
 {
 	name = "AUTOOWNER"
+	desc = _("Automatic owner upon join")
 	rank = 330
 	level = 9999
 	flag = "Q"
@@ -328,6 +335,7 @@ privilege
 privilege
 {
 	name = "AUTOPROTECT"
+	desc = _("Automatic protect upon join")
 	rank = 240
 	level = 10
 	flag = "A"
@@ -344,6 +352,7 @@ privilege
 privilege
 {
 	name = "AUTOVOICE"
+	desc = _("Automatic voice on join")
 	rank = 50
 	level = 3
 	flag = "V"
@@ -360,6 +369,7 @@ privilege
 privilege
 {
 	name = "BADWORDS"
+	desc = _("Allowed to modify channel badwords list")
 	rank = 260
 	level = 10
 	flag = "K"
@@ -376,6 +386,7 @@ privilege
 privilege
 {
 	name = "BAN"
+	desc = _("Allowed to ban users")
 	rank = 150
 	level = 4
 	flag = "b"
@@ -392,6 +403,7 @@ privilege
 privilege
 {
 	name = "FANTASIA"
+	desc = _("Allowed to use fantasy commands")
 	rank = 30
 	level = 3
 	flag = "c"
@@ -411,6 +423,7 @@ privilege
 privilege
 {
 	name = "FOUNDER"
+	desc = _("Allowed to issue commands restricted to channel founders")
 	rank = 360
 	level = 10000
 	flag = "F"
@@ -428,6 +441,7 @@ privilege
 privilege
 {
 	name = "GETKEY"
+	desc = _("Allowed to use GETKEY command")
 	rank = 180
 	level = 5
 	flag = "G"
@@ -445,6 +459,7 @@ privilege
 privilege
 {
 	name = "HALFOP"
+	desc = _("Allowed to (de)halfop users")
 	rank = 120
 	level = 5
 	flag = "h"
@@ -462,6 +477,7 @@ privilege
 privilege
 {
 	name = "HALFOPME"
+	desc = _("Allowed to (de)halfop themself")
 	rank = 110
 	level = 4
 	flag = "h"
@@ -479,6 +495,7 @@ privilege
 privilege
 {
 	name = "INFO"
+	desc = _("Allowed to get full INFO output")
 	rank = 80
 	level = 9999
 	flag = "I"
@@ -496,6 +513,7 @@ privilege
 privilege
 {
 	name = "INVITE"
+	desc = _("Allowed to use the INVITE command")
 	rank = 190
 	level = 5
 	flag = "i"
@@ -512,6 +530,7 @@ privilege
 privilege
 {
 	name = "KICK"
+	desc = _("Allowed to use the KICK command")
 	rank = 130
 	level = 4
 	flag = "k"
@@ -529,6 +548,7 @@ privilege
 privilege
 {
 	name = "MEMO"
+	desc = _("Allowed to read channel memos")
 	rank = 280
 	level = 10
 	flag = "m"
@@ -546,6 +566,7 @@ privilege
 privilege
 {
 	name = "MODE"
+	desc = _("Allowed to use the MODE command")
 	rank = 170
 	level = 9999
 	flag = "s"
@@ -562,6 +583,7 @@ privilege
 privilege
 {
 	name = "NOKICK"
+	desc = _("Prevents users being kicked by services")
 	rank = 20
 	level = 1
 	flag = "N"
@@ -579,6 +601,7 @@ privilege
 privilege
 {
 	name = "OP"
+	desc = _("Allowed to (de)op users")
 	rank = 230
 	level = 5
 	flag = "o"
@@ -596,6 +619,7 @@ privilege
 privilege
 {
 	name = "OPME"
+	desc = _("Allowed to (de)op themself")
 	rank = 220
 	level = 5
 	flag = "o"
@@ -613,6 +637,7 @@ privilege
 privilege
 {
 	name = "OWNER"
+	desc = _("Allowed to (de)owner users")
 	rank = 350
 	level = "founder"
 	flag = "q"
@@ -630,6 +655,7 @@ privilege
 privilege
 {
 	name = "OWNERME"
+	desc = _("Allowed to (de)owner themself")
 	rank = 340
 	level = 9999
 	flag = "q"
@@ -647,6 +673,7 @@ privilege
 privilege
 {
 	name = "PROTECT"
+	desc = _("Allowed to (de)protect users")
 	rank = 310
 	level = 9999
 	flag = "a"
@@ -664,6 +691,7 @@ privilege
 privilege
 {
 	name = "PROTECTME"
+	desc = _("Allowed to (de)protect themself")
 	rank = 300
 	level = 10
 	flag = "a"
@@ -681,6 +709,7 @@ privilege
 privilege
 {
 	name = "SAY"
+	desc = _("Allowed to use SAY and ACT commands")
 	rank = 90
 	level = 5
 	flag = "B"
@@ -700,6 +729,7 @@ privilege
 privilege
 {
 	name = "SET"
+	desc = _("Allowed to set channel settings")
 	rank = 320
 	level = 9999
 	flag = "s"
@@ -717,6 +747,7 @@ privilege
 privilege
 {
 	name = "SIGNKICK"
+	desc = _("No signed kick when SIGNKICK LEVEL is used")
 	rank = 140
 	level = 9999
 	flag = "K"
@@ -733,6 +764,7 @@ privilege
 privilege
 {
 	name = "TOPIC"
+	desc = _("Allowed to change channel topics")
 	rank = 160
 	level = 5
 	flag = "t"
@@ -749,12 +781,30 @@ privilege
 privilege
 {
 	name = "UNBAN"
+	desc = _("Allowed to unban users")
 	rank = 200
 	level = 4
 	flag = "u"
 	xop = "HOP"
 }
 
+/*
+ * UNBANME privilege.
+ *
+ * Used by chanserv/unban.
+ *
+ * Users with this permission can unban themself through ChanServ.
+ */
+privilege
+{
+	name = "UNBANME"
+	desc = _("Allowed to unban themself")
+	rank = 200
+	level = 4
+	flag = "U"
+	xop = "HOP"
+}
+
 /*
  * VOICE privilege.
  *
@@ -766,6 +816,7 @@ privilege
 privilege
 {
 	name = "VOICE"
+	desc = _("Allowed to (de)voice users")
 	rank = 70
 	level = 4
 	flag = "v"
@@ -783,6 +834,7 @@ privilege
 privilege
 {
 	name = "VOICEME"
+	desc = _("Allowed to (de)voice themself")
 	rank = 60
 	level = 3
 	flag = "v"

data/modules.example.conf

@@ -400,29 +400,44 @@ module { name = "help" }
 	}
 }
 
-/*
- * m_regex_pcre [EXTRA]
- *
- * Provides the regex engine regex/pcre, which uses version 1 of the Perl Compatible Regular
- * Expressions library. This can not be loaded at the same time as the m_regex_pcre2 module.
- */
-#module { name = "m_regex_pcre" }
-
 /*
  * m_regex_pcre2 [EXTRA]
  *
  * Provides the regex engine regex/pcre, which uses version 2 of the Perl Compatible Regular
- * Expressions library. This can not be loaded at the same time as the m_regex_pcre module.
+ * Expressions library.
+ */
 #module { name = "m_regex_pcre2" }
 
 /*
  * m_regex_posix [EXTRA]
  *
  * Provides the regex engine regex/posix, which uses the POSIX compliant regular expressions.
- * This is likely the only regex module you will not need extra libraries for.
  */
 #module { name = "m_regex_posix" }
 
+/*
+ * m_regex_stdlib
+ *
+ * Provides the regex engine regex/stdlib, which uses the regular expression library that is part of
+ * the C++ standard library.
+*/
+module
+{
+	name = "m_regex_stdlib"
+
+	/*
+	 * The syntax scheme to use. Can be set to awk to use the regular expression grammar used by the
+	 * awk utility in POSIX, basic to use the basic POSIX regular expression grammar, ecmascript to
+	 * use the modified ECMAScript regular expression grammar, egrep to use the regular expression
+	 * grammar used by the grep utility with the -E option in POSIX, extended to use the extended
+	 * POSIX regular expression grammar, or grep to use the regular expression grammar used by the
+	 * grep utility in POSIX.
+	 *
+	 * See https://en.cppreference.com/w/cpp/regex/syntax_option_type for more information.
+	 */
+	syntax = "ecmascript"
+}
+
 /*
  * m_regex_tre [EXTRA]
  *

docs/Changes

@@ -1,3 +1,13 @@
+Anope Version 2.1.1
+-------------------
+Added the UNBANME privilege to allow users to unban themselves.
+Fixed building on Windows systems without chgrp/chmod.
+Fixed creating sockets in the m_dns, m_httpd, m_proxyscan, and m_redis modules.
+Fixed reading the values of command line arguments.
+Moved core privilege descriptions to the example configs.
+Updated the Italian translation.
+Updated the Polish translation.
+
 Anope Version 2.1.0
 -------------------
 Added support for access list entry descriptions.

docs/Changes.conf

@@ -1,3 +1,8 @@
+Anope Version 2.1.1
+-------------------
+Added the m_regex_stdlib module.
+Removed the m_regex_pcre module (use m_regex_pcre2 instead).
+
 Anope Version 2.1.0
 -------------------
 Added nickserv:minpasslen for configuring the minimum password length.
@@ -5,7 +10,7 @@ Removed nickserv:strictpasswords as it is obsolete now nickserv:minpasslen exist
 Removed the inspircd12 and inspircd20 modules (use inspircd instead).
 Removed the ns_getpass module (no supported encryption modules).
 Removed the os_oline module (no supported IRCds).
-Removed the unreal module (use unrealircd instead)
+Removed the unreal module (use unrealircd instead).
 Renamed nickserv:passlen to nickserv:maxpasslen.
 Renamed the charybdis module to solanum.
 Renamed the inspircd3 module to inspircd.

include/access.h

@@ -41,7 +41,7 @@ struct CoreExport Privilege
 class CoreExport PrivilegeManager
 {
 	static std::vector<Privilege> Privileges;
- public:
+public:
 	static void AddPrivilege(Privilege p);
 	static void RemovePrivilege(Privilege &p);
 	static Privilege *FindPrivilege(const Anope::string &name);
@@ -54,7 +54,7 @@ class CoreExport PrivilegeManager
  */
 class CoreExport AccessProvider : public Service
 {
- public:
+public:
 	AccessProvider(Module *owner, const Anope::string &name);
 	virtual ~AccessProvider();
 
@@ -63,9 +63,9 @@ class CoreExport AccessProvider : public Service
 	 */
 	virtual ChanAccess *Create() = 0;
 
- private:
+private:
 	static std::list<AccessProvider *> Providers;
- public:
+public:
 	static const std::list<AccessProvider *>& GetProviders();
 };
 
@@ -76,7 +76,7 @@ class CoreExport ChanAccess : public Serializable
 	/* account this access entry is for, if any */
 	Serialize::Reference<NickCore> nc;
 
- public:
+public:
 	typedef std::vector<ChanAccess *> Path;
 
 	/* The provider that created this access entry */
@@ -135,7 +135,7 @@ class CoreExport ChanAccess : public Serializable
  */
 class CoreExport AccessGroup
 {
- public:
+public:
 	/* access entries + paths */
 	std::vector<ChanAccess::Path> paths;
 	/* Channel these access entries are on */

include/account.h

@@ -33,7 +33,7 @@ class CoreExport NickAlias : public Serializable, public Extensible
 	Anope::string vhost_ident, vhost_host, vhost_creator;
 	time_t vhost_created;
 
- public:
+public:
 	Anope::string nick;
 	Anope::string last_quit;
 	Anope::string last_realname;
@@ -110,7 +110,7 @@ class CoreExport NickCore : public Serializable, public Extensible
 	Serialize::Checker<std::map<ChannelInfo *, int> > chanaccess;
 	/* Unique identifier for the account. */
 	uint64_t id;
- public:
+public:
 	/* Name of the account. Find(display)->nc == this. */
 	Anope::string display;
 	/* User password in form of hashm:data */
@@ -244,11 +244,11 @@ class CoreExport IdentifyRequest
 
 	static std::set<IdentifyRequest *> Requests;
 
- protected:
+protected:
 	IdentifyRequest(Module *o, const Anope::string &acc, const Anope::string &pass);
 	virtual ~IdentifyRequest();
 
- public:
+public:
 	/* One of these is called when the request goes through */
 	virtual void OnSuccess() = 0;
 	virtual void OnFail() = 0;

include/anope.h

@@ -24,13 +24,13 @@ namespace Anope
 	 */
 	class CoreExport string
 	{
-	 private:
+	private:
 		/**
 		 * The actual string is stored in an std::string as it can be converted to
 		 * ci::string, or a C-style string at any time.
 		 */
 		std::string _string;
-	 public:
+	public:
 		/**
 		 * Extras.
 		 */
@@ -557,11 +557,11 @@ namespace Anope
  */
 class CoreExport sepstream
 {
- private:
+private:
 	/** Original string.
 	 */
 	Anope::string tokens;
-	/** Seperator value
+	/** Separator value
 	 */
 	char sep;
 	/** Current string position
@@ -570,7 +570,7 @@ class CoreExport sepstream
 	/** If set then GetToken() can return an empty string
 	 */
 	bool allow_empty;
- public:
+public:
 	/** Create a sepstream and fill it with the provided data
 	 */
 	sepstream(const Anope::string &source, char separator, bool allowempty = false);
@@ -626,7 +626,7 @@ class CoreExport sepstream
  */
 class commasepstream : public sepstream
 {
- public:
+public:
 	/** Initialize with comma separator
 	 */
 	commasepstream(const Anope::string &source, bool allowempty = false) : sepstream(source, ',', allowempty) { }
@@ -636,7 +636,7 @@ class commasepstream : public sepstream
  */
 class spacesepstream : public sepstream
 {
- public:
+public:
 	/** Initialize with space separator
 	 */
 	spacesepstream(const Anope::string &source) : sepstream(source, ' ') { }
@@ -650,14 +650,14 @@ class spacesepstream : public sepstream
  */
 class CoreException : public std::exception
 {
- protected:
+protected:
 	/** Holds the error message to be displayed
 	 */
 	Anope::string err;
 	/** Source of the exception
 	 */
 	Anope::string source;
- public:
+public:
 	/** Default constructor, just uses the error message 'Core threw an exception'.
 	 */
 	CoreException() : err("Core threw an exception"), source("The core") { }
@@ -689,7 +689,7 @@ class CoreException : public std::exception
 
 class ModuleException : public CoreException
 {
- public:
+public:
 	/** Default constructor, just uses the error message 'Module threw an exception'.
 	 */
 	ModuleException() : CoreException("Module threw an exception", "A Module") { }
@@ -706,7 +706,7 @@ class ModuleException : public CoreException
 
 class ConvertException : public CoreException
 {
- public:
+public:
 	ConvertException(const Anope::string &reason = "") : CoreException(reason) { }
 
 	virtual ~ConvertException() noexcept = default;

include/base.h

@@ -16,7 +16,7 @@ class CoreExport Base
 {
 	/* References to this base class */
 	std::set<ReferenceBase *> *references = nullptr;
- public:
+public:
 	virtual ~Base();
 
 	/** Adds a reference to this object. Eg, when a Reference
@@ -30,9 +30,9 @@ class CoreExport Base
 
 class ReferenceBase
 {
- protected:
+protected:
 	bool invalid = false;
- public:
+public:
 	ReferenceBase() = default;
 	ReferenceBase(const ReferenceBase &other) : invalid(other.invalid) { }
 	virtual ~ReferenceBase() = default;
@@ -45,9 +45,9 @@ class ReferenceBase
 template<typename T>
 class Reference : public ReferenceBase
 {
- protected:
+protected:
 	T *ref = nullptr;
- public:
+public:
 	Reference() = default;
 
 	Reference(T *obj) : ref(obj)

include/bots.h

@@ -23,7 +23,7 @@ class CoreExport BotInfo : public User, public Serializable
 {
 	/* Channels this bot is assigned to */
 	Serialize::Checker<std::set<ChannelInfo *> > channels;
- public:
+public:
 	time_t created;
 	/* Last time this bot said something (via privmsg) */
 	time_t lastmsg;

include/channels.h

@@ -32,14 +32,14 @@ class CoreExport Channel : public Base, public Extensible
 {
 	static std::vector<Channel *> deleting;
 
- public:
+public:
 	typedef std::multimap<Anope::string, Anope::string> ModeList;
- private:
+private:
 	/** A map of channel modes with their parameters set on this channel
 	 */
 	ModeList modes;
 
- public:
+public:
 	/* Channel name */
 	Anope::string name;
 	/* Set if this channel is registered. ci->c == this. Contains information relevant to the registered channel */
@@ -73,14 +73,14 @@ class CoreExport Channel : public Base, public Extensible
 	int16_t chanserv_modecount;	/* Number of check_mode()'s this sec */
 	int16_t bouncy_modes;		/* Did we fail to set modes here? */
 
- private:
+private:
 	/** Constructor
 	 * @param name The channel name
 	 * @param ts The time the channel was created
 	 */
 	Channel(const Anope::string &nname, time_t ts = Anope::CurTime);
 
- public:
+public:
 	/** Destructor
 	 */
 	~Channel();

include/commands.h

@@ -53,7 +53,7 @@ class CoreExport CommandSource
 	Anope::string nick;
 	/* User executing the command, may be NULL */
 	Reference<User> u;
- public:
+public:
 	/* The account executing the command */
 	Reference<NickCore> nc;
 	/* for web clients */
@@ -97,7 +97,7 @@ class CoreExport Command : public Service
 	/* Command requires that a user is executing it */
 	bool require_user;
 
- public:
+public:
 	/* Maximum parameters accepted by this command */
 	size_t max_params;
 	/* Minimum parameters required to use this command */
@@ -106,7 +106,7 @@ class CoreExport Command : public Service
 	/* Module which owns us */
 	Module *module;
 
- protected:
+protected:
 	/** Create a new command.
 	 * @param owner The owner of the command
 	 * @param sname The command name
@@ -116,10 +116,10 @@ class CoreExport Command : public Service
 	 */
 	Command(Module *owner, const Anope::string &sname, size_t min_params, size_t max_params = 0);
 
- public:
+public:
 	virtual ~Command() = default;
 
- protected:
+protected:
 	void SetDesc(const Anope::string &d);
 
 	void ClearSyntax();
@@ -129,7 +129,7 @@ class CoreExport Command : public Service
 	void AllowUnregistered(bool b);
 	void RequireUser(bool b);
 
- public:
+public:
 	bool AllowUnregistered() const;
 	bool RequireUser() const;
 

include/config.h

@@ -25,11 +25,11 @@ namespace Configuration
 	{
 		friend struct Configuration::Conf;
 
-	 public:
+	public:
 		typedef Anope::map<Anope::string> item_map;
 		typedef Anope::multimap<Block> block_map;
 
-	 private:
+	private:
 		Anope::string name;
 		item_map items;
 		block_map blocks;
@@ -38,7 +38,7 @@ namespace Configuration
 		/* Represents a missing tag. */
 		static Block EmptyBlock;
 
-	 public:
+	public:
 		Block(const Anope::string &);
 		const Anope::string &GetName() const;
 		int CountBlock(const Anope::string &name) const;
@@ -83,7 +83,7 @@ namespace Configuration
 		Anope::string name;
 		bool executable;
 		FILE *fp = nullptr;
-	 public:
+	public:
 		File(const Anope::string &, bool);
 		~File();
 		const Anope::string &GetName() const;
@@ -173,7 +173,7 @@ namespace Configuration
  */
 class ConfigException : public CoreException
 {
- public:
+public:
 	/** Default constructor, just uses the error message 'Config threw an exception'.
 	 */
 	ConfigException() : CoreException("Config threw an exception", "Config Parser") { }

include/extensible.h

@@ -17,13 +17,13 @@ class Extensible;
 
 class CoreExport ExtensibleBase : public Service
 {
- protected:
+protected:
 	std::map<Extensible *, void *> items;
 
 	ExtensibleBase(Module *m, const Anope::string &n);
 	~ExtensibleBase();
 
- public:
+public:
 	virtual void Unset(Extensible *obj) = 0;
 
 	/* called when an object we are keep track of is serializing */
@@ -33,7 +33,7 @@ class CoreExport ExtensibleBase : public Service
 
 class CoreExport Extensible
 {
- public:
+public:
 	std::set<ExtensibleBase *> extension_items;
 
 	virtual ~Extensible();
@@ -55,10 +55,10 @@ class CoreExport Extensible
 template<typename T>
 class BaseExtensibleItem : public ExtensibleBase
 {
- protected:
+protected:
 	virtual T *Create(Extensible *) = 0;
 
- public:
+public:
 	BaseExtensibleItem(Module *m, const Anope::string &n) : ExtensibleBase(m, n) { }
 
 	~BaseExtensibleItem()
@@ -126,43 +126,43 @@ class BaseExtensibleItem : public ExtensibleBase
 template<typename T>
 class ExtensibleItem : public BaseExtensibleItem<T>
 {
- protected:
+protected:
 	T* Create(Extensible *obj) override
 	{
 		return new T(obj);
 	}
- public:
+public:
 	ExtensibleItem(Module *m, const Anope::string &n) : BaseExtensibleItem<T>(m, n) { }
 };
 
 template<typename T>
 class PrimitiveExtensibleItem : public BaseExtensibleItem<T>
 {
- protected:
+protected:
 	T* Create(Extensible *obj) override
 	{
 		return new T();
 	}
- public:
+public:
 	PrimitiveExtensibleItem(Module *m, const Anope::string &n) : BaseExtensibleItem<T>(m, n) { }
 };
 
 template<>
 class PrimitiveExtensibleItem<bool> : public BaseExtensibleItem<bool>
 {
- protected:
+protected:
 	bool* Create(Extensible *) override
 	{
 		return NULL;
 	}
- public:
+public:
 	PrimitiveExtensibleItem(Module *m, const Anope::string &n) : BaseExtensibleItem<bool>(m, n) { }
 };
 
 template<typename T>
 class SerializableExtensibleItem : public PrimitiveExtensibleItem<T>
 {
- public:
+public:
 	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<T>(m, n) { }
 
 	void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const override
@@ -184,7 +184,7 @@ class SerializableExtensibleItem : public PrimitiveExtensibleItem<T>
 template<>
 class SerializableExtensibleItem<bool> : public PrimitiveExtensibleItem<bool>
 {
- public:
+public:
 	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<bool>(m, n) { }
 
 	void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const override

include/hashcomp.h

@@ -29,7 +29,7 @@ namespace Anope
 	template<typename char_type>
 	class ascii_ctype : public std::ctype<char_type>
 	{
-	 public:
+	public:
 		char_type do_toupper(char_type c) const override
 		{
 			if (c >= 'a' && c <= 'z')
@@ -51,7 +51,7 @@ namespace Anope
 	template<typename char_type>
 	class rfc1459_ctype : public ascii_ctype<char_type>
 	{
-	 public:
+	public:
 		char_type do_toupper(char_type c) const override
 		{
 			if (c == '{' || c == '}' || c == '|')

include/lists.h

@@ -23,13 +23,13 @@
  */
 class CoreExport NumberList
 {
- private:
+private:
 	bool is_valid = true;
 
 	std::set<unsigned> numbers;
 
 	bool desc;
- public:
+public:
 	/** Processes a numbered list
 	 * @param list The list
 	 * @param descending True to make HandleNumber get called with numbers in descending order
@@ -62,13 +62,13 @@ class CoreExport NumberList
  */
 class CoreExport ListFormatter
 {
- public:
+public:
 	typedef std::map<Anope::string, Anope::string> ListEntry;
- private:
+private:
 	NickCore *nc;
 	std::vector<Anope::string> columns;
 	std::vector<ListEntry> entries;
- public:
+public:
 	ListFormatter(NickCore *nc);
 	ListFormatter &AddColumn(const Anope::string &name);
 	void AddEntry(const ListEntry &entry);
@@ -83,7 +83,7 @@ class CoreExport InfoFormatter
 	NickCore *nc;
 	std::vector<std::pair<Anope::string, Anope::string> > replies;
 	unsigned longest = 0;
- public:
+public:
 	InfoFormatter(NickCore *nc);
 	void Process(std::vector<Anope::string> &);
 	Anope::string &operator[](const Anope::string &key);

include/logger.h

@@ -50,7 +50,7 @@ struct LogFile
 /* Represents a single log message */
 class CoreExport Log
 {
- public:
+public:
 	/* Bot that should log this message */
 	BotInfo *bi = nullptr;
 	/* For commands, the user executing the command, but might not always exist */
@@ -94,11 +94,11 @@ class CoreExport Log
 
 	~Log();
 
- private:
+private:
 	Anope::string FormatSource() const;
 	Anope::string FormatCommand() const;
 
- public:
+public:
 	Anope::string BuildPrefix() const;
 
 	template<typename T> Log &operator<<(T val)
@@ -111,7 +111,7 @@ class CoreExport Log
 /* Configured in the configuration file, actually does the message logging */
 class CoreExport LogInfo
 {
- public:
+public:
 	BotInfo *bot = nullptr;
 	std::vector<Anope::string> targets;
 	std::vector<LogFile *> logfiles;

include/mail.h

@@ -24,7 +24,7 @@ namespace Mail
 	/* A email message being sent */
 	class Message : public Thread
 	{
-	 private:
+	private:
 		Anope::string sendmail_path;
 		Anope::string send_from;
 		Anope::string mail_to;
@@ -35,7 +35,7 @@ namespace Mail
 		bool dont_quote_addresses;
 
 		bool success = false;
-	 public:
+	public:
 		/** Construct this message. Once constructed call Thread::Start to launch the mail sending.
 		 * @param sf Config->SendFrom
 		 * @param mailto Name of person being mailed (u->nick, nc->display, etc)

include/memo.h

@@ -16,7 +16,7 @@
 
 class CoreExport Memo : public Serializable
 {
- public:
+public:
 	MemoInfo *mi;
 	bool unread;
 	bool receipt;

include/modes.h

@@ -37,7 +37,7 @@ enum ModeClass
  */
 class CoreExport Mode : public Base
 {
- public:
+public:
 	/* Mode name */
 	Anope::string name;
 	/* Class of mode this is (user/channel) */
@@ -66,7 +66,7 @@ class CoreExport Mode : public Base
  */
 class CoreExport UserMode : public Mode
 {
- public:
+public:
 	/** constructor
 	 * @param name The mode name
 	 * @param mc The mode char
@@ -76,7 +76,7 @@ class CoreExport UserMode : public Mode
 
 class CoreExport UserModeParam : public UserMode
 {
- public:
+public:
 	/** constructor
 	 * @param name The mode name
 	 * @param mc The mode char
@@ -94,7 +94,7 @@ class CoreExport UserModeParam : public UserMode
  */
 class CoreExport ChannelMode : public Mode
 {
- public:
+public:
 	/* channel modes that can possibly unwrap this mode */
 	std::vector<ChannelMode *> listeners;
 
@@ -125,7 +125,7 @@ class CoreExport ChannelMode : public Mode
  */
 class CoreExport ChannelModeList : public ChannelMode
 {
- public:
+public:
 	/** constructor
 	 * @param name The mode name
 	 * @param mc The mode char
@@ -159,11 +159,11 @@ 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
 {
- public:
+public:
 	/** constructor
 	 * @param name The mode name
 	 * @param mc The mode char
@@ -185,7 +185,7 @@ class CoreExport ChannelModeParam : public ChannelMode
 */
 class CoreExport ChannelModeStatus : public ChannelMode
 {
- public:
+public:
 	/* The symbol, eg @ % + */
 	char symbol;
 	/* The "level" of the mode, used to compare with other modes.
@@ -211,7 +211,7 @@ class CoreExport ChannelModeVirtual : public T
 	Anope::string base;
 	ChannelMode *basech;
 
- public:
+public:
 	ChannelModeVirtual(const Anope::string &mname, const Anope::string &basename);
 
 	~ChannelModeVirtual();
@@ -227,7 +227,7 @@ class CoreExport ChannelModeVirtual : public T
 class CoreExport ChannelStatus
 {
 	Anope::string modes;
- public:
+public:
 	ChannelStatus() = default;
 	ChannelStatus(const Anope::string &modes);
 	void AddMode(char c);
@@ -241,7 +241,7 @@ class CoreExport ChannelStatus
 
 class CoreExport UserModeOperOnly : public UserMode
 {
- public:
+public:
 	UserModeOperOnly(const Anope::string &mname, char um) : UserMode(mname, um) { }
 
 	bool CanSet(User *u) const override;
@@ -249,7 +249,7 @@ class CoreExport UserModeOperOnly : public UserMode
 
 class CoreExport UserModeNoone : public UserMode
 {
- public:
+public:
 	UserModeNoone(const Anope::string &mname, char um) : UserMode(mname, um) { }
 
 	bool CanSet(User *u) const override;
@@ -259,7 +259,7 @@ class CoreExport UserModeNoone : public UserMode
  */
 class CoreExport ChannelModeKey : public ChannelModeParam
 {
- public:
+public:
 	ChannelModeKey(char mc) : ChannelModeParam("KEY", mc) { }
 
 	bool IsValid(Anope::string &value) const override;
@@ -269,7 +269,7 @@ class CoreExport ChannelModeKey : public ChannelModeParam
  */
 class CoreExport ChannelModeOperOnly : public ChannelMode
 {
- public:
+public:
 	ChannelModeOperOnly(const Anope::string &mname, char mc) : ChannelMode(mname, mc) { }
 
 	/* Opers only */
@@ -280,7 +280,7 @@ class CoreExport ChannelModeOperOnly : public ChannelMode
  */
 class CoreExport ChannelModeNoone : public ChannelMode
 {
- public:
+public:
 	ChannelModeNoone(const Anope::string &mname, char mc) : ChannelMode(mname, mc) { }
 
 	bool CanSet(User *u) const override;
@@ -294,7 +294,7 @@ class CoreExport ChannelModeNoone : public ChannelMode
  */
 class CoreExport ModeManager
 {
- public:
+public:
 
 	/* Number of generic channel and user modes we are tracking */
 	static unsigned GenericChannelModes;
@@ -392,7 +392,7 @@ class CoreExport Entry
 {
 	Anope::string name;
 	Anope::string mask;
- public:
+public:
 	unsigned short cidr_len = 0;
 	int family = 0;
 	Anope::string nick, user, host, real;

include/modules.h

@@ -172,12 +172,12 @@ struct ModuleVersionC
  */
 class ModuleVersion
 {
- private:
+private:
 	int version_major;
 	int version_minor;
 	int version_patch;
 
- public:
+public:
 	ModuleVersion(const ModuleVersionC &);
 
 	/** Get the major version of Anope this was built against
@@ -202,9 +202,9 @@ class NotImplementedException : public CoreException { };
  */
 class CoreExport Module : public Extensible
 {
- private:
+private:
 	bool permanent;
- public:
+public:
 	/** The module name (e.g. os_modload)
 	 */
 	Anope::string name;
@@ -375,7 +375,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(); }
 
@@ -1038,7 +1037,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
 	 */
@@ -1112,7 +1111,7 @@ enum Implementation
  */
 class CoreExport ModuleManager
 {
- public:
+public:
 	/** Event handler hooks.
 	 */
 	static std::vector<Module *> EventHandlers[I_SIZE];
@@ -1195,7 +1194,7 @@ class CoreExport ModuleManager
 	 */
 	static void UnloadAll();
 
- private:
+private:
 	/** Call the module_delete function to safely delete the module
 	 * @param m the module to delete
 	 * @return MOD_ERR_OK on success, anything else on fail

include/modules/bs_badwords.h

@@ -33,7 +33,7 @@ struct BadWord
 	BadWordType type;
 
 	virtual ~BadWord() = default;
- protected:
+protected:
 	BadWord() = default;
 };
 

include/modules/bs_kick.h

@@ -37,10 +37,10 @@ struct KickerData
 
 	bool dontkickops, dontkickvoices;
 
- protected:
+protected:
 	KickerData() = default;
 
- public:
+public:
 	virtual ~KickerData() = default;
 	virtual void Check(ChannelInfo *ci) = 0;
 };

include/modules/cs_entrymsg.h

@@ -16,16 +16,16 @@ struct EntryMsg
 	time_t when;
 
 	virtual ~EntryMsg() = default;
- protected:
+protected:
 	EntryMsg() = default;
 };
 
 struct EntryMessageList : Serialize::Checker<std::vector<EntryMsg *> >
 {
- protected:
+protected:
 	EntryMessageList() : Serialize::Checker<std::vector<EntryMsg *> >("EntryMsg") { }
 
- public:
+public:
 	virtual ~EntryMessageList()
 	{
 		for (unsigned i = (*this)->size(); i > 0; --i)

include/modules/cs_log.h

@@ -25,7 +25,7 @@ struct LogSetting
 	time_t created;
 
 	virtual ~LogSetting() = default;
- protected:
+protected:
 	LogSetting() = default;
 };
 
@@ -33,12 +33,12 @@ struct LogSettings : Serialize::Checker<std::vector<LogSetting *> >
 {
 	typedef std::vector<LogSetting *>::iterator iterator;
 
- protected:
+protected:
 	LogSettings() : Serialize::Checker<std::vector<LogSetting *> >("LogSetting")
 	{
 	}
 
- public:
+public:
 	virtual ~LogSettings() = default;
 	virtual LogSetting *Create() = 0;
 };

include/modules/cs_mode.h

@@ -21,7 +21,7 @@ struct ModeLock
 	time_t created;
 
 	virtual ~ModeLock() = default;
- protected:
+protected:
 	ModeLock() = default;
 };
 

include/modules/dns.h

@@ -115,7 +115,7 @@ namespace DNS
 	 */
 	class Manager : public Service
 	{
-	 public:
+	public:
 		Manager(Module *creator) : Service(creator, "DNS::Manager", "dns/manager") { }
 		virtual ~Manager() = default;
 
@@ -134,7 +134,7 @@ namespace DNS
 	class Request : public Timer, public Question
 	{
 		Manager *manager;
-	 public:
+	public:
 		/* Use result cache if available */
 		bool use_cache;
 		/* Request id */

include/modules/encryption.h

@@ -18,7 +18,7 @@ namespace Encryption
 
 	class Context
 	{
-	 public:
+	public:
 		virtual ~Context() = default;
 		virtual void Update(const unsigned char *data, size_t len) = 0;
 		virtual void Finalize() = 0;
@@ -27,7 +27,7 @@ namespace Encryption
 
 	class Provider : public Service
 	{
-	 public:
+	public:
 		Provider(Module *creator, const Anope::string &sname) : Service(creator, "Encryption::Provider", sname) { }
 		virtual ~Provider() = default;
 

include/modules/httpd.h

@@ -98,7 +98,7 @@ class HTTPPage : public virtual Base
 	Anope::string url;
 	Anope::string content_type;
 
- public:
+public:
 	HTTPPage(const Anope::string &u, const Anope::string &ct = "text/html") : url(u), content_type(ct) { }
 
 	const Anope::string &GetURL() const { return this->url; }
@@ -117,13 +117,13 @@ class HTTPPage : public virtual Base
 
 class HTTPClient : public ClientSocket, public BinarySocket, public Base
 {
- protected:
+protected:
 	void WriteClient(const Anope::string &message)
 	{
 		BinarySocket::Write(message + "\r\n");
 	}
 
- public:
+public:
 	HTTPClient(ListenSocket *l, int f, const sockaddrs &a) : ClientSocket(l, a), BinarySocket() { }
 
 	virtual const Anope::string GetIP()
@@ -140,7 +140,7 @@ class HTTPProvider : public ListenSocket, public Service
 	Anope::string ip;
 	unsigned short port;
 	bool ssl;
- public:
+public:
 	std::vector<Anope::string> ext_ips;
 	std::vector<Anope::string> ext_headers;
 

include/modules/ldap.h

@@ -10,7 +10,7 @@
 
 class LDAPException : public ModuleException
 {
- public:
+public:
 	LDAPException(const Anope::string &reason) : ModuleException(reason) { }
 
 	virtual ~LDAPException() noexcept = default;
@@ -111,7 +111,7 @@ struct LDAPResult
 
 class LDAPInterface
 {
- public:
+public:
 	Module *owner;
 
 	LDAPInterface(Module *m) : owner(m) { }
@@ -124,7 +124,7 @@ class LDAPInterface
 
 class LDAPProvider : public Service
 {
- public:
+public:
 	LDAPProvider(Module *c, const Anope::string &n) : Service(c, "LDAPProvider", n) { }
 
 	/** Attempt to bind to the LDAP server as an admin

include/modules/ns_cert.h

@@ -13,9 +13,9 @@
 
 struct NSCertList
 {
- protected:
+protected:
 	NSCertList() = default;
- public:
+public:
 	virtual ~NSCertList() = default;
 
 	/** Add an entry to the nick's certificate list
@@ -65,7 +65,7 @@ struct NSCertList
 
 class CertService : public Service
 {
- public:
+public:
 	CertService(Module *c) : Service(c, "CertService", "certs") { }
 
 	virtual NickCore* FindAccountFromCert(const Anope::string &cert) = 0;

include/modules/os_forbid.h

@@ -27,13 +27,13 @@ struct ForbidData
 	ForbidType type;
 
 	virtual ~ForbidData() = default;
- protected:
+protected:
 	ForbidData() = default;
 };
 
 class ForbidService : public Service
 {
- public:
+public:
 	ForbidService(Module *m) : Service(m, "ForbidService", "forbid") { }
 
 	virtual void AddForbid(ForbidData *d) = 0;

include/modules/os_ignore.h

@@ -19,16 +19,16 @@ struct IgnoreData
 	time_t time = 0; /* When do we stop ignoring them? */
 
 	virtual ~IgnoreData() = default;
- protected:
+protected:
 	IgnoreData() = default;
 };
 
 class IgnoreService : public Service
 {
- protected:
+protected:
 	IgnoreService(Module *c) : Service(c, "IgnoreService", "ignore") { }
 
- public:
+public:
 	virtual void AddIgnore(IgnoreData *) = 0;
 
 	virtual void DelIgnore(IgnoreData *) = 0;

include/modules/os_news.h

@@ -34,7 +34,7 @@ struct NewsItem : Serializable
 
 class NewsService : public Service
 {
- public:
+public:
 	NewsService(Module *m) : Service(m, "NewsService", "news") { }
 
 	virtual NewsItem *CreateNewsItem() = 0;

include/modules/os_session.h

@@ -33,7 +33,7 @@ struct Exception : Serializable
 
 class SessionService : public Service
 {
- public:
+public:
 	typedef std::unordered_map<cidr, Session *, cidr::hash> SessionMap;
 	typedef std::vector<Exception *> ExceptionVector;
 

include/modules/pseudoclients/chanserv.h

@@ -10,7 +10,7 @@
 
 class ChanServService : public Service
 {
- public:
+public:
 	ChanServService(Module *m) : Service(m, "ChanServService", "ChanServ")
 	{
 	}

include/modules/pseudoclients/global.h

@@ -10,7 +10,7 @@
 
 class GlobalService : public Service
 {
- public:
+public:
 	GlobalService(Module *m) : Service(m, "GlobalService", "Global")
 	{
 	}

include/modules/pseudoclients/memoserv.h

@@ -10,7 +10,7 @@
 
 class MemoServService : public Service
 {
- public:
+public:
 	enum MemoResult
 	{
 		MEMO_SUCCESS,

include/modules/pseudoclients/nickserv.h

@@ -10,7 +10,7 @@
 
 class NickServService : public Service
 {
- public:
+public:
 	NickServService(Module *m) : Service(m, "NickServService", "NickServ")
 	{
 	}

include/modules/redis.h

@@ -45,7 +45,7 @@ namespace Redis
 
 	class Interface
 	{
-	 public:
+	public:
 		Module *owner;
 
 		Interface(Module *m) : owner(m) { }
@@ -57,7 +57,7 @@ namespace Redis
 
 	class Provider : public Service
 	{
-	 public:
+	public:
 		Provider(Module *c, const Anope::string &n) : Service(c, "Redis::Provider", n) { }
 
 		virtual bool IsSocketDead() = 0;

include/modules/sasl.h

@@ -24,7 +24,7 @@ namespace SASL
 
 	class Service : public ::Service
 	{
-	 public:
+	public:
 		Service(Module *o) : ::Service(o, "SASL::Service", "sasl") { }
 
 		virtual void ProcessMessage(const Message &) = 0;
@@ -62,7 +62,7 @@ namespace SASL
 	/* PLAIN, EXTERNAL, etc */
 	class Mechanism : public ::Service
 	{
-	 public:
+	public:
 		Mechanism(Module *o, const Anope::string &sname) : Service(o, "SASL::Mechanism", sname) { }
 
 		virtual Session* CreateSession(const Anope::string &uid) { return new Session(this, uid); }
@@ -81,7 +81,7 @@ namespace SASL
 		Anope::string uid;
 		Anope::string hostname, ip;
 
-	 public:
+	public:
 		IdentifyRequest(Module *m, const Anope::string &id, const Anope::string &acc, const Anope::string &pass, const Anope::string &h, const Anope::string &i) : ::IdentifyRequest(m, acc, pass), uid(id), hostname(h), ip(i) { }
 
 		void OnSuccess() override

include/modules/set_misc.h

@@ -15,6 +15,6 @@ struct MiscData
 	Anope::string data;
 
 	virtual ~MiscData() = default;
- protected:
+protected:
 	MiscData() = default;
 };

include/modules/sql.h

@@ -13,7 +13,7 @@ namespace SQL
 
 	class Data : public Serialize::Data
 	{
-	 public:
+	public:
 		typedef std::map<Anope::string, std::stringstream *> Map;
 		Map data;
 		std::map<Anope::string, Type> types;
@@ -83,7 +83,7 @@ namespace SQL
 	 */
 	class Exception : public ModuleException
 	{
-	 public:
+	public:
 		Exception(const Anope::string &reason) : ModuleException(reason) { }
 
 		virtual ~Exception() noexcept = default;
@@ -139,12 +139,12 @@ namespace SQL
 	 */
 	class Result
 	{
-	 protected:
+	protected:
 		/* Rows, column, item */
 		std::vector<std::map<Anope::string, Anope::string> > entries;
 		Query query;
 		Anope::string error;
-	 public:
+	public:
 		unsigned int id = 0;
 		Anope::string finished_query;
 
@@ -187,7 +187,7 @@ namespace SQL
 	 */
 	class Interface
 	{
-	 public:
+	public:
 		Module *owner;
 
 		Interface(Module *m) : owner(m) { }
@@ -201,7 +201,7 @@ namespace SQL
 	 */
 	class Provider : public Service
 	{
-	 public:
+	public:
 		Provider(Module *c, const Anope::string &n) : Service(c, "SQL::Provider", n) { }
 
 		virtual void Run(Interface *i, const Query &query) = 0;

include/modules/ssl.h

@@ -10,7 +10,7 @@
 
 class SSLService : public Service
 {
- public:
+public:
 	SSLService(Module *o, const Anope::string &n) : Service(o, "SSLService", n) { }
 
 	virtual void Init(Socket *s) = 0;

include/modules/xmlrpc.h

@@ -14,7 +14,7 @@ class XMLRPCRequest
 {
 	std::map<Anope::string, Anope::string> replies;
 
- public:
+public:
 	Anope::string name;
 	Anope::string id;
 	std::deque<Anope::string> data;
@@ -29,14 +29,14 @@ class XMLRPCServiceInterface;
 
 class XMLRPCEvent
 {
- public:
+public:
 	virtual ~XMLRPCEvent() = default;
 	virtual bool Run(XMLRPCServiceInterface *iface, HTTPClient *client, XMLRPCRequest &request) = 0;
 };
 
 class XMLRPCServiceInterface : public Service
 {
- public:
+public:
 	XMLRPCServiceInterface(Module *creator, const Anope::string &sname) : Service(creator, "XMLRPCServiceInterface", sname) { }
 
 	virtual void Register(XMLRPCEvent *event) = 0;

include/opertype.h

@@ -42,7 +42,7 @@ struct CoreExport Oper
 
 class CoreExport OperType
 {
- private:
+private:
 	/** The name of this opertype, e.g. "sra".
 	 */
 	Anope::string name;
@@ -65,7 +65,7 @@ class CoreExport OperType
 	/** Set of opertypes we inherit from
 	 */
 	std::set<OperType *> inheritances;
- public:
+public:
 	/** Modes to set when someone identifies using this opertype
 	 */
 	Anope::string modes;

include/protocol.h

@@ -21,9 +21,9 @@ class CoreExport IRCDProto : public Service
 {
 	Anope::string proto_name;
 
- protected:
+protected:
 	IRCDProto(Module *creator, const Anope::string &proto_name);
- public:
+public:
 	virtual ~IRCDProto();
 
 	virtual void SendSVSKillInternal(const MessageSource &, User *, const Anope::string &);
@@ -250,7 +250,7 @@ class CoreExport MessageSource
 	User *u = nullptr;
 	Server *s = nullptr;
 
- public:
+public:
 	MessageSource(const Anope::string &);
 	MessageSource(User *u);
 	MessageSource(Server *s);
@@ -273,7 +273,7 @@ class CoreExport IRCDMessage : public Service
 	Anope::string name;
 	unsigned param_count;
 	std::set<IRCDMessageFlag> flags;
- public:
+public:
 	IRCDMessage(Module *owner, const Anope::string &n, unsigned p = 0);
 	unsigned GetParamCount() const;
 	virtual void Run(MessageSource &, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) = 0;
@@ -292,7 +292,7 @@ private:
 	/** The current position within the message. */
 	Anope::string::size_type position = 0;
 
- public:
+public:
 	/** Create a tokenstream and fill it with the provided data. */
 	MessageTokenizer(const Anope::string &msg);
 

include/regchannel.h

@@ -23,7 +23,7 @@ extern CoreExport Serialize::Checker<registered_channel_map> RegisteredChannelLi
 /* AutoKick data. */
 class CoreExport AutoKick : public Serializable
 {
- public:
+public:
 	/* Channel this autokick is on */
 	Serialize::Reference<ChannelInfo> ci;
 
@@ -47,14 +47,14 @@ class CoreExport ChannelInfo : public Serializable, public Extensible
 {
 	/* channels who reference this one */
 	Anope::map<int> references;
- private:
+private:
 	Serialize::Reference<NickCore> founder;					/* Channel founder */
 	Serialize::Reference<NickCore> successor;                               /* Who gets the channel if the founder nick is dropped or expires */
 	Serialize::Checker<std::vector<ChanAccess *> > access;			/* List of authorized users */
 	Serialize::Checker<std::vector<AutoKick *> > akick;			/* List of users to kickban */
 	Anope::map<int16_t> levels;
 
- public:
+public:
 	friend class ChanAccess;
 	friend class AutoKick;
 

include/regexpr.h

@@ -17,7 +17,7 @@
 
 class RegexException : public CoreException
 {
- public:
+public:
 	RegexException(const Anope::string &reason = "") : CoreException(reason) { }
 
 	virtual ~RegexException() noexcept = default;
@@ -26,9 +26,9 @@ class RegexException : public CoreException
 class CoreExport Regex
 {
 	Anope::string expression;
- protected:
+protected:
 	Regex(const Anope::string &expr) : expression(expr) { }
- public:
+public:
 	virtual ~Regex() = default;
 	const Anope::string &GetExpression() { return expression; }
 	virtual bool Matches(const Anope::string &str) = 0;
@@ -36,7 +36,7 @@ class CoreExport Regex
 
 class CoreExport RegexProvider : public Service
 {
- public:
+public:
 	RegexProvider(Module *o, const Anope::string &n) : Service(o, "Regex", n) { }
 	virtual Regex *Compile(const Anope::string &) = 0;
 };

include/serialize.h

@@ -20,7 +20,7 @@ namespace Serialize
 {
 	class Data
 	{
-	 public:
+	public:
 		enum Type
 		{
 			DT_TEXT,
@@ -51,7 +51,7 @@ namespace Serialize
  */
 class CoreExport Serializable : public virtual Base
 {
- private:
+private:
 	/* A list of every serializable item in Anope.
 	 * Some of these are static and constructed at runtime,
 	 * so this list must be on the heap, as it is not always
@@ -68,13 +68,13 @@ class CoreExport Serializable : public virtual Base
 	/* The last time this object was committed to the database */
 	time_t last_commit_time = 0;
 
- protected:
+protected:
 	Serializable(const Anope::string &serialize_type);
 	Serializable(const Serializable &);
 
 	Serializable &operator=(const Serializable &);
 
- public:
+public:
 	virtual ~Serializable();
 
 	/* Unique ID (per type, not globally) for this object */
@@ -128,7 +128,7 @@ class CoreExport Serialize::Type : public Base
 	 */
 	time_t timestamp = 0;
 
- public:
+public:
 	/* Map of Serializable::id to Serializable objects */
 	std::map<uint64_t, Serializable *> objects;
 
@@ -196,7 +196,7 @@ class Serialize::Checker
 			type->Check();
 	}
 
- public:
+public:
 	Checker(const Anope::string &n) : name(n) { }
 
 	inline const T* operator->() const
@@ -242,10 +242,10 @@ class Serialize::Checker
 template<typename T>
 class Serialize::Reference : public ReferenceBase
 {
- protected:
+protected:
 	T *ref = nullptr;
 
- public:
+public:
 	Reference() = default;
 
 	Reference(T *obj) : ref(obj)

include/servers.h

@@ -39,7 +39,7 @@ namespace Servers
  */
 class CoreExport Server : public Extensible
 {
- private:
+private:
 	/* Server name */
 	Anope::string name;
 	/* Hops between services and server */
@@ -61,7 +61,7 @@ class CoreExport Server : public Extensible
 	/* Reason this server was quit */
 	Anope::string quit_reason;
 
- public:
+public:
 	/** Constructor
 	 * @param uplink The uplink this server is from, is only NULL when creating Me
 	 * @param name The server name
@@ -72,12 +72,12 @@ class CoreExport Server : public Extensible
 	 */
 	Server(Server *uplink, const Anope::string &name, unsigned hops, const Anope::string &description, const Anope::string &sid = "", bool jupe = false);
 
- private:
+private:
 	/** Destructor
 	 */
 	~Server();
 
- public:
+public:
 	/* Number of users on the server */
 	unsigned users = 0;
 

include/service.h

@@ -41,7 +41,7 @@ class CoreExport Service : public virtual Base
 		return NULL;
 	}
 
- public:
+public:
 	static Service *FindService(const Anope::string &t, const Anope::string &n)
 	{
 		std::map<Anope::string, std::map<Anope::string, Service *> >::const_iterator it = Services.find(t);
@@ -120,7 +120,7 @@ class ServiceReference : public Reference<T>
 	Anope::string type;
 	Anope::string name;
 
- public:
+public:
 	ServiceReference() = default;
 
 	ServiceReference(const Anope::string &t, const Anope::string &n) : type(t), name(n)
@@ -161,7 +161,7 @@ class ServiceReference : public Reference<T>
 class ServiceAlias
 {
 	Anope::string t, f;
- public:
+public:
 	ServiceAlias(const Anope::string &type, const Anope::string &from, const Anope::string &to) : t(type), f(from)
 	{
 		Service::AddAlias(type, from, to);

include/socketengine.h

@@ -17,7 +17,7 @@
 class CoreExport SocketEngine
 {
 	static const int DefaultSize = 2; // Uplink, mode stacker
- public:
+public:
 	/* Map of sockets */
 	static std::map<int, Socket *> Sockets;
 

include/sockets.h

@@ -108,7 +108,7 @@ class CoreExport cidr
 	sockaddrs addr;
 	Anope::string cidr_ip;
 	unsigned short cidr_len;
- public:
+public:
 	cidr(const Anope::string &ip);
 	cidr(const Anope::string &ip, unsigned char len);
 	cidr(const sockaddrs &ip, unsigned char len);
@@ -128,7 +128,7 @@ class CoreExport cidr
 
 class SocketException : public CoreException
 {
- public:
+public:
 	/** Constructor for socket exceptions
 	 * @param message Error message
 	 */
@@ -154,7 +154,7 @@ enum SocketFlag
 
 class CoreExport SocketIO
 {
- public:
+public:
 	virtual ~SocketIO() = default;
 
 	/** Receive something from the buffer
@@ -212,14 +212,14 @@ class CoreExport SocketIO
 
 class CoreExport Socket
 {
- protected:
+protected:
 	/* Socket FD */
 	int sock;
 
 	/* The family of this socket FD */
 	int family;
 
- public:
+public:
 	std::bitset<SF_SIZE> flags;
 
 	/* Sockaddrs for bind() (if it's bound) */
@@ -288,7 +288,7 @@ class CoreExport Socket
 
 class CoreExport BufferedSocket : public virtual Socket
 {
- protected:
+protected:
 	/* Things read from the socket */
 	Anope::string read_buffer;
 	/* Things to be written to the socket */
@@ -296,7 +296,7 @@ class CoreExport BufferedSocket : public virtual Socket
 	/* How much data was received from this socket on this recv() */
 	int recv_len;
 
- public:
+public:
 	virtual ~BufferedSocket() = default;
 
 	/** Called when there is something to be received for this socket
@@ -316,9 +316,9 @@ class CoreExport BufferedSocket : public virtual Socket
 	/** Write to the socket
 	* @param message The message
 	*/
- protected:
+protected:
 	virtual void Write(const char *buffer, size_t l);
- public:
+public:
 	void Write(const char *message, ...);
 	void Write(const Anope::string &message);
 
@@ -335,7 +335,7 @@ class CoreExport BufferedSocket : public virtual Socket
 
 class CoreExport BinarySocket : public virtual Socket
 {
- protected:
+protected:
 	struct DataBlock
 	{
 		char *orig;
@@ -349,7 +349,7 @@ class CoreExport BinarySocket : public virtual Socket
 	/* Data to be written out */
 	std::deque<DataBlock *> write_buffer;
 
- public:
+public:
 	virtual ~BinarySocket() = default;
 
 	/** Called when there is something to be received for this socket
@@ -380,7 +380,7 @@ class CoreExport BinarySocket : public virtual Socket
 
 class CoreExport ListenSocket : public virtual Socket
 {
- public:
+public:
 	/** Constructor
 	 * @param bindip The IP to bind to
 	 * @param port The port to listen on
@@ -404,7 +404,7 @@ class CoreExport ListenSocket : public virtual Socket
 
 class CoreExport ConnectionSocket : public virtual Socket
 {
- public:
+public:
 	/* Sockaddrs for connection ip/port */
 	sockaddrs conaddr;
 
@@ -437,7 +437,7 @@ class CoreExport ConnectionSocket : public virtual Socket
 
 class CoreExport ClientSocket : public virtual Socket
 {
- public:
+public:
 	/* Listen socket this connection came from */
 	ListenSocket *ls;
 	/* Clients address */
@@ -471,7 +471,7 @@ class CoreExport ClientSocket : public virtual Socket
 
 class CoreExport Pipe : public Socket
 {
- public:
+public:
 	/** The FD of the write pipe
 	 * this->sock is the readfd
 	 */

include/threadengine.h

@@ -16,11 +16,11 @@
 
 class CoreExport Thread : public Pipe, public Extensible
 {
- private:
+private:
 	/* Set to true to tell the thread to finish and we are waiting for it */
 	bool exit = false;
 
- public:
+public:
 	/* Handle for this thread */
 	pthread_t handle;
 
@@ -60,11 +60,11 @@ class CoreExport Thread : public Pipe, public Extensible
 
 class CoreExport Mutex
 {
- protected:
+protected:
 	/* A mutex, used to keep threads in sync */
 	pthread_mutex_t mutex;
 
- public:
+public:
 	/** Constructor
 	 */
 	Mutex();
@@ -90,11 +90,11 @@ class CoreExport Mutex
 
 class CoreExport Condition : public Mutex
 {
- private:
+private:
 	/* A condition */
 	pthread_cond_t cond;
 
- public:
+public:
 	/** Constructor
 	 */
 	Condition();

include/timers.h

@@ -15,7 +15,7 @@
 
 class CoreExport Timer
 {
- private:
+private:
 	/** The owner of the timer, if any
 	 */
 	Module *owner;
@@ -36,7 +36,7 @@ class CoreExport Timer
 	 */
 	bool repeat;
 
- public:
+public:
 	/** Constructor, initializes the triggering time
 	 * @param time_from_now The number of seconds from now to trigger the timer
 	 * @param now The time now
@@ -106,7 +106,7 @@ class CoreExport TimerManager
 	/** A list of timers
 	 */
 	static std::multimap<time_t, Timer *> Timers;
- public:
+public:
 	/** Add a timer to the list
 	 * @param t A Timer derived class to add
 	 */

include/uplink.h

@@ -22,7 +22,7 @@ namespace Uplink
 /* This is the socket to our uplink */
 class UplinkSocket : public ConnectionSocket, public BufferedSocket
 {
- public:
+public:
 	bool error;
 	UplinkSocket();
 	~UplinkSocket();
@@ -36,7 +36,7 @@ class UplinkSocket : public ConnectionSocket, public BufferedSocket
 		MessageSource source;
 		std::stringstream buffer;
 
-	 public:
+	public:
 		Message();
 		Message(const MessageSource &);
 		~Message();

include/users.h

@@ -35,9 +35,9 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe
 	/* Users that are in the process of quitting */
 	static std::list<User *> quitting_users;
 
- public:
+public:
 	typedef std::map<Anope::string, Anope::string> ModeList;
- protected:
+protected:
 	Anope::string vident;
 	Anope::string ident;
 	Anope::string uid;
@@ -54,7 +54,7 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe
 	time_t invalid_pw_time;
 
 
- public: // XXX: exposing a tiny bit too much
+public: // XXX: exposing a tiny bit too much
 	/* User's current nick */
 	Anope::string nick;
 
@@ -90,7 +90,7 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe
 	/* Last time this user sent an email */
 	time_t lastmail;
 
- protected:
+protected:
 	/** Create a new user object, initialising necessary fields and
 	 * adds it to the hash
 	 *
@@ -112,7 +112,7 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe
 	 */
 	virtual ~User();
 
- public:
+public:
 	static User* OnIntroduce(const Anope::string &snick, const Anope::string &sident, const Anope::string &shost, const Anope::string &svhost, const Anope::string &sip, Server *sserver, const Anope::string &srealname, time_t ts, const Anope::string &smodes, const Anope::string &suid, NickCore *nc);
 
 	/** Update the nickname of a user record accordingly, should be

include/xline.h

@@ -17,7 +17,7 @@ class CoreExport XLine : public Serializable
 {
 	void Init();
 	Anope::string nick, user, host, real;
- public:
+public:
 	cidr *c;
 	Anope::string mask;
 	Regex *regex;
@@ -55,7 +55,7 @@ class CoreExport XLineManager : public Service
 	Serialize::Checker<std::vector<XLine *> > xlines;
 	/* Akills can have the same IDs, sometimes */
 	static Serialize::Checker<std::multimap<Anope::string, XLine *, ci::less> > XLinesByUID;
- public:
+public:
 	/* List of XLine managers we check users against in XLineManager::CheckAll */
 	static std::list<XLineManager *> XLineManagers;
 

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-22 15:42+0000\n"
+"PO-Revision-Date: 2023-12-22 15:44+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."
@@ -209,6 +210,10 @@ msgstr "%s deleted from the AKILL list."
 msgid "%s disabled on channel %s."
 msgstr "%s disabled on channel %s."
 
+#, c-format
+msgid "%s does not wish to be added to channel access lists."
+msgstr "%s does not wish to be added to channel access lists."
+
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s has been invited to %s."
@@ -524,11 +529,11 @@ msgstr "channel user reason"
 msgid "channel what"
 msgstr "channel what"
 
-msgid "channel ADD mask"
-msgstr "channel ADD mask"
+msgid "channel ADD mask level [description]"
+msgstr "channel ADD mask level [description]"
 
-msgid "channel ADD mask level"
-msgstr "channel ADD mask level"
+msgid "channel ADD mask [description]"
+msgstr "channel ADD mask [description]"
 
 msgid "channel ADD message"
 msgstr "channel ADD message"
@@ -614,8 +619,8 @@ msgstr "channel [+expiry] [reason]"
 msgid "channel [+expiry] {nick | mask} [reason]"
 msgstr "channel [+expiry] {nick | mask} [reason]"
 
-msgid "channel [MODIFY] mask changes"
-msgstr "channel [MODIFY] mask changes"
+msgid "channel [MODIFY] mask changes [description]"
+msgstr "channel [MODIFY] mask changes [description]"
 
 msgid "channel [SET] [topic]"
 msgstr "channel [SET] [topic]"
@@ -677,9 +682,6 @@ msgstr "nick channel"
 msgid "nick channel [reason]"
 msgstr "nick channel [reason]"
 
-msgid "nick flags"
-msgstr "nick flags"
-
 msgid "nick hostmask"
 msgstr "nick hostmask"
 
@@ -808,7 +810,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 +823,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"
@@ -1268,8 +1270,8 @@ msgstr "%-8s %s"
 msgid "%2lu %-16s letters: %s, words: %s, lines: %s, smileys: %s, actions: %s"
 msgstr "%2lu %-16s letters: %s, words: %s, lines: %s, smileys: %s, actions: %s"
 
-msgid "%b %d %H:%M:%S %Y %Z"
-msgstr "%b %d %H:%M:%S %Y %Z"
+msgid "%b %d %Y %H:%M:%S %Z"
+msgstr "%b %d %Y %H:%M:%S %Z"
 
 #, c-format
 msgid "%c is an unknown status mode."
@@ -1395,6 +1397,14 @@ msgstr "%s autokick list is empty."
 msgid "%s bad words list is empty."
 msgstr "%s bad words list is empty."
 
+#, c-format
+msgid "%s can no longer be added to channel access lists."
+msgstr "%s can no longer be added to channel access lists."
+
+#, c-format
+msgid "%s can now be added to channel access lists."
+msgstr "%s can now be added to channel access lists."
+
 #, c-format
 msgid "%s cannot be the successor on channel %s as they are the founder."
 msgstr "%s cannot be the successor on channel %s as they are the founder."
@@ -1705,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."
@@ -1955,32 +1965,32 @@ msgstr "All vhosts in the group %s have been set to %s."
 msgid "All vhosts in the group %s have been set to %s@%s."
 msgstr "All vhosts in the group %s have been set to %s@%s."
 
-msgid "Allowed to (de)halfop him/herself"
-msgstr "Allowed to (de)halfop him/herself"
+msgid "Allowed to (de)halfop themself"
+msgstr "Allowed to (de)halfop themself"
 
 msgid "Allowed to (de)halfop users"
 msgstr "Allowed to (de)halfop users"
 
-msgid "Allowed to (de)op him/herself"
-msgstr "Allowed to (de)op him/herself"
+msgid "Allowed to (de)op themself"
+msgstr "Allowed to (de)op themself"
 
 msgid "Allowed to (de)op users"
 msgstr "Allowed to (de)op users"
 
-msgid "Allowed to (de)owner him/herself"
-msgstr "Allowed to (de)owner him/herself"
+msgid "Allowed to (de)owner themself"
+msgstr "Allowed to (de)owner themself"
 
 msgid "Allowed to (de)owner users"
 msgstr "Allowed to (de)owner users"
 
-msgid "Allowed to (de)protect him/herself"
-msgstr "Allowed to (de)protect him/herself"
+msgid "Allowed to (de)protect themself"
+msgstr "Allowed to (de)protect themself"
 
 msgid "Allowed to (de)protect users"
 msgstr "Allowed to (de)protect users"
 
-msgid "Allowed to (de)voice him/herself"
-msgstr "Allowed to (de)voice him/herself"
+msgid "Allowed to (de)voice themself"
+msgstr "Allowed to (de)voice themself"
 
 msgid "Allowed to (de)voice users"
 msgstr "Allowed to (de)voice users"
@@ -2012,6 +2022,9 @@ msgstr "Allowed to read channel memos"
 msgid "Allowed to set channel settings"
 msgstr "Allowed to set channel settings"
 
+msgid "Allowed to unban themself"
+msgstr "Allowed to unban themself"
+
 msgid "Allowed to unban users"
 msgstr "Allowed to unban users"
 
@@ -2103,34 +2116,25 @@ msgstr ""
 "using the nick, they will be killed."
 
 msgid ""
-"Allows Services Operators to give Operflags to any user.\n"
-"Flags have to be prefixed with a \"+\" or a \"-\". To\n"
-"remove all flags simply type a \"-\" instead of any flags."
-msgstr ""
-"Allows Services Operators to give Operflags to any user.\n"
-"Flags have to be prefixed with a \"+\" or a \"-\". To\n"
-"remove all flags simply type a \"-\" instead of any flags."
-
-msgid ""
-"Allows Services Operators to make Services ignore a nick or mask\n"
+"Allows Services Operators to make services ignore a nick or mask\n"
 "for a certain time or until the next restart. The default\n"
 "time format is seconds. You can specify it by using units.\n"
 "Valid units are: s for seconds, m for minutes,\n"
 "h for hours and d for days.\n"
 "Combinations of these units are not permitted.\n"
-"To make Services permanently ignore the user, type 0 as time.\n"
+"To make services permanently ignore the user, type 0 as time.\n"
 "When adding a mask, it should be in the format nick!user@host,\n"
 "everything else will be considered a nick. Wildcards are permitted.\n"
 " \n"
 "Ignores will not be enforced on IRC Operators."
 msgstr ""
-"Allows Services Operators to make Services ignore a nick or mask\n"
+"Allows Services Operators to make services ignore a nick or mask\n"
 "for a certain time or until the next restart. The default\n"
 "time format is seconds. You can specify it by using units.\n"
 "Valid units are: s for seconds, m for minutes,\n"
 "h for hours and d for days.\n"
 "Combinations of these units are not permitted.\n"
-"To make Services permanently ignore the user, type 0 as time.\n"
+"To make services permanently ignore the user, type 0 as time.\n"
 "When adding a mask, it should be in the format nick!user@host,\n"
 "everything else will be considered a nick. Wildcards are permitted.\n"
 " \n"
@@ -2182,18 +2186,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 +2206,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"
@@ -2332,22 +2336,22 @@ msgstr ""
 "     MODIFY nickserv forcemail no"
 
 msgid ""
-"Allows you to choose the way Services are communicating with\n"
-"the given user. With MSG set, Services will use messages,\n"
+"Allows you to choose the way services are communicating with\n"
+"the given user. With MSG set, services will use messages,\n"
 "else they'll use notices."
 msgstr ""
-"Allows you to choose the way Services are communicating with\n"
-"the given user. With MSG set, Services will use messages,\n"
+"Allows you to choose the way services are communicating with\n"
+"the given user. With MSG set, services will use messages,\n"
 "else they'll use notices."
 
 #, c-format
 msgid ""
-"Allows you to choose the way Services are communicating with\n"
-"you. With %s set, Services will use messages, else they'll\n"
+"Allows you to choose the way services are communicating with\n"
+"you. With %s set, services will use messages, else they'll\n"
 "use notices."
 msgstr ""
-"Allows you to choose the way Services are communicating with\n"
-"you. With %s set, Services will use messages, else they'll\n"
+"Allows you to choose the way services are communicating with\n"
+"you. With %s set, services will use messages, else they'll\n"
 "use notices."
 
 msgid ""
@@ -2426,10 +2430,10 @@ msgstr ""
 
 msgid ""
 "Alternative methods of modifying channel access lists are\n"
-"available. "
+"available."
 msgstr ""
 "Alternative methods of modifying channel access lists are\n"
-"available. "
+"available."
 
 msgid "Approve the requested vHost of a user"
 msgstr "Approve the requested vHost of a user"
@@ -2780,42 +2784,42 @@ msgid "Caps kicker"
 msgstr "Caps kicker"
 
 msgid ""
-"Causes Services to do an immediate shutdown; databases are\n"
+"Causes services to do an immediate shutdown; databases are\n"
 "not saved.  This command should not be used unless\n"
 "damage to the in-memory copies of the databases is feared\n"
 "and they should not be saved."
 msgstr ""
-"Causes Services to do an immediate shutdown; databases are\n"
+"Causes services to do an immediate shutdown; databases are\n"
 "not saved.  This command should not be used unless\n"
 "damage to the in-memory copies of the databases is feared\n"
 "and they should not be saved."
 
 msgid ""
-"Causes Services to reload the configuration file. Note that\n"
-"some directives still need the restart of the Services to\n"
-"take effect (such as Services' nicknames, activation of the\n"
+"Causes services to reload the configuration file. Note that\n"
+"some directives still need the restart of the services to\n"
+"take effect (such as services' nicknames, activation of the\n"
 "session limitation, etc.)."
 msgstr ""
-"Causes Services to reload the configuration file. Note that\n"
-"some directives still need the restart of the Services to\n"
-"take effect (such as Services' nicknames, activation of the\n"
+"Causes services to reload the configuration file. Note that\n"
+"some directives still need the restart of the services to\n"
+"take effect (such as services' nicknames, activation of the\n"
 "session limitation, etc.)."
 
 msgid ""
-"Causes Services to save all databases and then restart\n"
+"Causes services to save all databases and then restart\n"
 "(i.e. exit and immediately re-run the executable)."
 msgstr ""
-"Causes Services to save all databases and then restart\n"
+"Causes services to save all databases and then restart\n"
 "(i.e. exit and immediately re-run the executable)."
 
-msgid "Causes Services to save all databases and then shut down."
-msgstr "Causes Services to save all databases and then shut down."
+msgid "Causes services to save all databases and then shut down."
+msgstr "Causes services to save all databases and then shut down."
 
 msgid ""
-"Causes Services to update all database files as soon as you\n"
+"Causes services to update all database files as soon as you\n"
 "send the command."
 msgstr ""
-"Causes Services to update all database files as soon as you\n"
+"Causes services to update all database files as soon as you\n"
 "send the command."
 
 #, c-format
@@ -2828,8 +2832,8 @@ msgstr "ChanServ is required to enable persist on this network."
 msgid "Change channel modes"
 msgstr "Change channel modes"
 
-msgid "Change the communication method of Services"
-msgstr "Change the communication method of Services"
+msgid "Change the communication method of services"
+msgstr "Change the communication method of services"
 
 msgid "Change user modes"
 msgstr "Change user modes"
@@ -2860,23 +2864,23 @@ msgstr ""
 "be a registered one."
 
 msgid ""
-"Changes the language Services uses when sending messages to\n"
+"Changes the language services uses when sending messages to\n"
 "the given user (for example, when responding to a command they send).\n"
 "language should be chosen from the following list of\n"
 "supported languages:"
 msgstr ""
-"Changes the language Services uses when sending messages to\n"
+"Changes the language services uses when sending messages to\n"
 "the given user (for example, when responding to a command they send).\n"
 "language should be chosen from the following list of\n"
 "supported languages:"
 
 msgid ""
-"Changes the language Services uses when sending messages to\n"
+"Changes the language services uses when sending messages to\n"
 "you (for example, when responding to a command you send).\n"
 "language should be chosen from the following list of\n"
 "supported languages:"
 msgstr ""
-"Changes the language Services uses when sending messages to\n"
+"Changes the language services uses when sending messages to\n"
 "you (for example, when responding to a command you send).\n"
 "language should be chosen from the following list of\n"
 "supported languages:"
@@ -3702,12 +3706,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."
@@ -4019,8 +4023,8 @@ msgstr "Forbid on %s was not found."
 msgid "Forbid usage of nicknames, channels, and emails"
 msgstr "Forbid usage of nicknames, channels, and emails"
 
-msgid "Force the Services databases to be updated immediately"
-msgstr "Force the Services databases to be updated immediately"
+msgid "Force the services databases to be updated immediately"
+msgstr "Force the services databases to be updated immediately"
 
 msgid "Forcefully change a user's nickname"
 msgstr "Forcefully change a user's nickname"
@@ -4047,15 +4051,9 @@ msgstr "Founder"
 msgid "Founder of %s changed to %s."
 msgstr "Founder of %s changed to %s."
 
-msgid "GETPASS command unavailable because encryption is in use."
-msgstr "GETPASS command unavailable because encryption is in use."
-
 msgid "Ghost with your nick has been killed."
 msgstr "Ghost with your nick has been killed."
 
-msgid "Give Operflags to a certain user"
-msgstr "Give Operflags to a certain user"
-
 #, c-format
 msgid ""
 "Gives %s status to the selected nick on a channel. If nick is\n"
@@ -4988,9 +4986,6 @@ msgstr ""
 "may provide a nick to modify other users' certificate lists.\n"
 " \n"
 
-msgid "Modify the Services ignore list"
-msgstr "Modify the Services ignore list"
-
 #, c-format
 msgid "Modify the list of %s users"
 msgstr "Modify the list of %s users"
@@ -5004,6 +4999,9 @@ msgstr "Modify the list of privileged users"
 msgid "Modify the nickname client certificate list"
 msgstr "Modify the nickname client certificate list"
 
+msgid "Modify the services ignore list"
+msgstr "Modify the services ignore list"
+
 msgid "Modify the session-limit exception list"
 msgstr "Modify the session-limit exception list"
 
@@ -5054,6 +5052,9 @@ msgstr "Network stats for %s:"
 msgid "Never"
 msgstr "Never"
 
+msgid "Never-op"
+msgstr "Never-op"
+
 msgid "Nick"
 msgstr "Nick"
 
@@ -5339,14 +5340,6 @@ msgstr "Oper privileges removed from %s (%s)."
 msgid "Oper type %s has not been configured."
 msgstr "Oper type %s has not been configured."
 
-#, c-format
-msgid "Operflags %s have been added for %s."
-msgstr "Operflags %s have been added for %s."
-
-#, c-format
-msgid "Operflags %s have been removed from %s."
-msgstr "Operflags %s have been removed from %s."
-
 #, c-format
 msgid "Opertype %s has no allowed commands."
 msgstr "Opertype %s has no allowed commands."
@@ -5377,18 +5370,10 @@ msgstr "Password accepted - you are now recognized."
 msgid "Password accepted."
 msgstr "Password accepted."
 
-#, c-format
-msgid "Password for %s changed to %s."
-msgstr "Password for %s changed to %s."
-
 #, c-format
 msgid "Password for %s changed."
 msgstr "Password for %s changed."
 
-#, c-format
-msgid "Password for %s is %s."
-msgstr "Password for %s is %s."
-
 msgid "Password incorrect."
 msgstr "Password incorrect."
 
@@ -5414,13 +5399,13 @@ msgid "Please contact an Operator to get a vHost assigned to this nick."
 msgstr "Please contact an Operator to get a vHost assigned to this nick."
 
 msgid ""
-"Please try again with a more obscure password. Passwords should be at least\n"
-"five characters long, should not be something easily guessed\n"
-"(e.g. your real name or your nick), and cannot contain the space or tab characters."
+"Please try again with a more obscure password. Passwords should not be\n"
+"something that could be easily guessed (e.g. your real name or your nick) and\n"
+"cannot contain the space or tab characters.\n"
 msgstr ""
-"Please try again with a more obscure password. Passwords should be at least\n"
-"five characters long, should not be something easily guessed\n"
-"(e.g. your real name or your nick), and cannot contain the space or tab characters."
+"Please try again with a more obscure password. Passwords should not be\n"
+"something that could be easily guessed (e.g. your real name or your nick) and\n"
+"cannot contain the space or tab characters.\n"
 
 msgid "Please use a valid server name when juping."
 msgstr "Please use a valid server name when juping."
@@ -5476,8 +5461,8 @@ msgstr "Prevent the nickname from appearing in the LIST command"
 msgid "Prevent the nickname from expiring"
 msgstr "Prevent the nickname from expiring"
 
-msgid "Prevents users being kicked by Services"
-msgstr "Prevents users being kicked by Services"
+msgid "Prevents users being kicked by services"
+msgstr "Prevents users being kicked by services"
 
 msgid "Private"
 msgstr "Private"
@@ -5661,7 +5646,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 +5658,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 ""
@@ -5832,9 +5817,6 @@ msgstr "Retain modes when channel is not in use"
 msgid "Retain topic when channel is not in use"
 msgstr "Retain topic when channel is not in use"
 
-msgid "Retrieve the password for a nickname"
-msgstr "Retrieve the password for a nickname"
-
 msgid "Retrieves the vhost requests"
 msgstr "Retrieves the vhost requests"
 
@@ -5850,17 +5832,6 @@ msgstr "Returns the matching accounts that used given email."
 msgid "Returns the owner status of the given nickname"
 msgstr "Returns the owner status of the given nickname"
 
-msgid ""
-"Returns the password for the given nickname.  Note that\n"
-"whenever this command is used, a message including the\n"
-"person who issued the command and the nickname it was used\n"
-"on will be logged and sent out as a WALLOPS/GLOBOPS."
-msgstr ""
-"Returns the password for the given nickname.  Note that\n"
-"whenever this command is used, a message including the\n"
-"person who issued the command and the nickname it was used\n"
-"on will be logged and sent out as a WALLOPS/GLOBOPS."
-
 msgid ""
 "Returns whether the user using the given nickname is\n"
 "recognized as the owner of the nickname. The response has\n"
@@ -6025,29 +5996,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 ""
@@ -6227,8 +6198,8 @@ msgstr "Set SET-options on another nickname"
 msgid "Set channel options and information"
 msgstr "Set channel options and information"
 
-msgid "Set how Services make bans on the channel"
-msgstr "Set how Services make bans on the channel"
+msgid "Set how services make bans on the channel"
+msgstr "Set how services make bans on the channel"
 
 msgid "Set options related to memos"
 msgstr "Set options related to memos"
@@ -6248,8 +6219,8 @@ msgstr "Set the display of your group in Services"
 msgid "Set the founder of a channel"
 msgstr "Set the founder of a channel"
 
-msgid "Set the language Services will use when messaging you"
-msgstr "Set the language Services will use when messaging you"
+msgid "Set the language services will use when messaging you"
+msgstr "Set the language services will use when messaging you"
 
 msgid "Set the nickname password"
 msgstr "Set the nickname password"
@@ -6263,8 +6234,8 @@ msgstr "Set the vhost for all nicks in a group"
 msgid "Set the vhost of another user"
 msgstr "Set the vhost of another user"
 
-msgid "Set various global Services options"
-msgstr "Set various global Services options"
+msgid "Set various global services options"
+msgstr "Set various global services options"
 
 msgid "Set your nickname password"
 msgstr "Set your nickname password"
@@ -6505,7 +6476,7 @@ msgstr ""
 "well as vhosts."
 
 msgid ""
-"Sets various global Services options.  Option names\n"
+"Sets various global services options.  Option names\n"
 "currently defined are:\n"
 "    READONLY   Set read-only or read-write mode\n"
 "    DEBUG      Activate or deactivate debug mode\n"
@@ -6513,7 +6484,7 @@ msgid ""
 "    SUPERADMIN Activate or deactivate super admin mode\n"
 "    LIST       List the options"
 msgstr ""
-"Sets various global Services options.  Option names\n"
+"Sets various global services options.  Option names\n"
 "currently defined are:\n"
 "    READONLY   Set read-only or read-write mode\n"
 "    DEBUG      Activate or deactivate debug mode\n"
@@ -6556,6 +6527,9 @@ msgstr ""
 "Sets whether the given channel will expire.  Setting this\n"
 "to ON prevents the channel from expiring."
 
+msgid "Sets whether the given nickname can be added to a channel access list."
+msgstr "Sets whether the given nickname can be added to a channel access list."
+
 #, c-format
 msgid ""
 "Sets whether the given nickname will be given its status modes\n"
@@ -6577,6 +6551,9 @@ msgstr ""
 "Sets whether the given nickname will expire.  Setting this\n"
 "to ON prevents the nickname from expiring."
 
+msgid "Sets whether you can be added to a channel access list."
+msgstr "Sets whether you can be added to a channel access list."
+
 #, c-format
 msgid ""
 "Sets whether you will be given your channel status modes automatically.\n"
@@ -6608,8 +6585,8 @@ msgstr "Setting for super admin must be ON or OFF."
 msgid "Should services automatically give status to users"
 msgstr "Should services automatically give status to users"
 
-msgid "Show status of Services and network"
-msgstr "Show status of Services and network"
+msgid "Show status of services and network"
+msgstr "Show status of services and network"
 
 #, c-format
 msgid "Showed %d/%d matches for %s."
@@ -6986,13 +6963,13 @@ msgid ""
 "Syntax: READONLY {ON | OFF}\n"
 " \n"
 "Sets read-only mode on or off.  In read-only mode, normal\n"
-"users will not be allowed to modify any Services data,\n"
+"users will not be allowed to modify any services data,\n"
 "including channel and nickname access lists, etc.  IRCops\n"
-"with sufficient Services privileges will be able to modify\n"
+"with sufficient services privileges will be able to modify\n"
 "Services' AKILL, SQLINE, SNLINE and ignore lists, drop,\n"
 "suspend or forbid nicknames and channels, and manage news,\n"
 "oper info and DNS, but any such changes will not be saved\n"
-"unless read-only mode is deactivated before Services are\n"
+"unless read-only mode is deactivated before services are\n"
 "terminated or restarted.\n"
 " \n"
 "This option is equivalent to the command-line option\n"
@@ -7001,13 +6978,13 @@ msgstr ""
 "Syntax: READONLY {ON | OFF}\n"
 " \n"
 "Sets read-only mode on or off.  In read-only mode, normal\n"
-"users will not be allowed to modify any Services data,\n"
+"users will not be allowed to modify any services data,\n"
 "including channel and nickname access lists, etc.  IRCops\n"
-"with sufficient Services privileges will be able to modify\n"
+"with sufficient services privileges will be able to modify\n"
 "Services' AKILL, SQLINE, SNLINE and ignore lists, drop,\n"
 "suspend or forbid nicknames and channels, and manage news,\n"
 "oper info and DNS, but any such changes will not be saved\n"
-"unless read-only mode is deactivated before Services are\n"
+"unless read-only mode is deactivated before services are\n"
 "terminated or restarted.\n"
 " \n"
 "This option is equivalent to the command-line option\n"
@@ -7077,8 +7054,8 @@ msgstr ""
 "on the channel."
 
 msgid ""
-"Tells Services to jupiter a server -- that is, to create\n"
-"a fake \"server\" connected to Services which prevents\n"
+"Tells services to jupiter a server -- that is, to create\n"
+"a fake \"server\" connected to services which prevents\n"
 "the real server of that name from connecting.  The jupe\n"
 "may be removed using a standard SQUIT. If a reason is\n"
 "given, it is placed in the server information field;\n"
@@ -7086,8 +7063,8 @@ msgid ""
 "text \"Juped by <nick>\", showing the nickname of the\n"
 "person who jupitered the server."
 msgstr ""
-"Tells Services to jupiter a server -- that is, to create\n"
-"a fake \"server\" connected to Services which prevents\n"
+"Tells services to jupiter a server -- that is, to create\n"
+"a fake \"server\" connected to services which prevents\n"
 "the real server of that name from connecting.  The jupe\n"
 "may be removed using a standard SQUIT. If a reason is\n"
 "given, it is placed in the server information field;\n"
@@ -7098,8 +7075,8 @@ msgstr ""
 msgid "Tells you about the last time a user was seen"
 msgstr "Tells you about the last time a user was seen"
 
-msgid "Terminate Services WITHOUT saving"
-msgstr "Terminate Services WITHOUT saving"
+msgid "Terminate services WITHOUT saving"
+msgstr "Terminate services WITHOUT saving"
 
 msgid "Terminate services with save"
 msgstr "Terminate services with save"
@@ -7267,7 +7244,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 +7264,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"
@@ -7773,7 +7750,7 @@ msgid "This command retrieves the vhost requests."
 msgstr "This command retrieves the vhost requests."
 
 msgid ""
-"This command searches the Services logfiles for messages\n"
+"This command searches the services logfiles for messages\n"
 "that match the given pattern. The day and limit argument\n"
 "may be used to specify how many days of logs to search\n"
 "and the number of replies to limit to. By default this\n"
@@ -7785,7 +7762,7 @@ msgid ""
 "      Searches the last 21 days worth of logs for messages\n"
 "      containing Anope and lists the most recent 500 of them."
 msgstr ""
-"This command searches the Services logfiles for messages\n"
+"This command searches the services logfiles for messages\n"
 "that match the given pattern. The day and limit argument\n"
 "may be used to specify how many days of logs to search\n"
 "and the number of replies to limit to. By default this\n"
@@ -8350,7 +8327,7 @@ msgid ""
 "yourself.\n"
 " \n"
 "With a parameter, does the same for the given nick. If you\n"
-"specify REVALIDATE as well, Services will ask the given nick\n"
+"specify REVALIDATE as well, services will ask the given nick\n"
 "to re-identify. This is limited to Services Operators."
 msgstr ""
 "Without a parameter, reverses the effect of the IDENTIFY\n"
@@ -8359,13 +8336,13 @@ msgstr ""
 "yourself.\n"
 " \n"
 "With a parameter, does the same for the given nick. If you\n"
-"specify REVALIDATE as well, Services will ask the given nick\n"
+"specify REVALIDATE as well, services will ask the given nick\n"
 "to re-identify. This is limited to Services Operators."
 
 msgid ""
 "Without any option, shows the current number of users online,\n"
-"and the highest number of users online since Services was\n"
-"started, and the length of time Services has been running.\n"
+"and the highest number of users online since services was\n"
+"started, and the length of time services has been running.\n"
 " \n"
 "With the AKILL option, displays the current size of the\n"
 "AKILL list and the current default expiry time.\n"
@@ -8381,8 +8358,8 @@ msgid ""
 "The ALL option displays all of the above statistics."
 msgstr ""
 "Without any option, shows the current number of users online,\n"
-"and the highest number of users online since Services was\n"
-"started, and the length of time Services has been running.\n"
+"and the highest number of users online since services was\n"
+"started, and the length of time services has been running.\n"
 " \n"
 "With the AKILL option, displays the current size of the\n"
 "AKILL list and the current default expiry time.\n"
@@ -8429,9 +8406,6 @@ msgstr "You are not using a client certificate."
 msgid "You are now a super admin."
 msgstr "You are now a super admin."
 
-msgid "You are now an IRC Operator."
-msgstr "You are now an IRC Operator."
-
 msgid "You are now identified for your nick. Change your password now."
 msgstr "You are now identified for your nick. Change your password now."
 
@@ -8446,8 +8420,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."
@@ -8609,9 +8583,6 @@ msgstr "You may not change the password of other Services Operators."
 msgid "You may not drop other Services Operators' nicknames."
 msgstr "You may not drop other Services Operators' nicknames."
 
-msgid "You may not get the password of other Services Operators."
-msgstr "You may not get the password of other Services Operators."
-
 msgid "You may not suspend other Services Operators' nicknames."
 msgstr "You may not suspend other Services Operators' nicknames."
 
@@ -8791,12 +8762,12 @@ msgid "Your passcode has been re-sent to %s."
 msgstr "Your passcode has been re-sent to %s."
 
 #, c-format
-msgid "Your password is %s - remember this for later use."
-msgstr "Your password is %s - remember this for later use."
+msgid "Your password is too long. It must be shorter than %u characters."
+msgstr "Your password is too long. It must be shorter than %u characters."
 
 #, c-format
-msgid "Your password is too long. It must not exceed %u characters."
-msgstr "Your password is too long. It must not exceed %u characters."
+msgid "Your password is too short. It must must be longer than %u characters."
+msgstr "Your password is too short. It must must be longer than %u characters."
 
 msgid "Your password reset request has expired."
 msgstr "Your password reset request has expired."

language/anope.it_IT.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-04 13:57+0200\n"
-"PO-Revision-Date: 2023-10-04 14:01+0200\n"
+"POT-Creation-Date: 2023-12-22 15:42+0000\n"
+"PO-Revision-Date: 2023-12-22 15:53+0000\n"
 "Last-Translator: Dragone2 <dragone2@risposteinformatiche.it>\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 3.4\n"
 
 #, c-format
 msgid "%d channel(s) cleared, and %d channel(s) dropped."
@@ -209,6 +209,10 @@ msgstr "%s eliminato dalla lista AKILL."
 msgid "%s disabled on channel %s."
 msgstr "%s disabilitato sul canale %s."
 
+#, c-format
+msgid "%s does not wish to be added to channel access lists."
+msgstr "%s non desidera essere aggiunto agli elenchi di accesso ai canali."
+
 #, c-format
 msgid "%s has been invited to %s."
 msgstr "%s è stato invitato in %s."
@@ -521,7 +525,7 @@ msgid "channel text"
 msgstr "canale testo"
 
 msgid "channel time"
-msgstr "canale tempo"
+msgstr "canale durata"
 
 msgid "channel user reason"
 msgstr "canale utente motivo"
@@ -529,11 +533,11 @@ msgstr "canale utente motivo"
 msgid "channel what"
 msgstr "canale cosa"
 
-msgid "channel ADD mask"
-msgstr "canale ADD mashera"
+msgid "channel ADD mask level [description]"
+msgstr "canale ADD maschera livello [descrizione]"
 
-msgid "channel ADD mask level"
-msgstr "canale ADD maschera livello"
+msgid "channel ADD mask [description]"
+msgstr "canale ADD maschera [descrizione]"
 
 msgid "channel ADD message"
 msgstr "canale ADD messaggio"
@@ -560,13 +564,13 @@ msgid "channel DEL num"
 msgstr "canale DEL num"
 
 msgid "channel DEL {mask | entry-num | list}"
-msgstr "canale DEL {maschera | num-voce | list}"
+msgstr "canale DEL {maschera | num-voce | lista}"
 
 msgid "channel DEL {nick | mask | entry-num | list}"
-msgstr "canale DEL {nick | maschera | num-voce | list}"
+msgstr "canale DEL {nick | maschera | num-voce | lista}"
 
 msgid "channel DEL {word | entry-num | list}"
-msgstr "canale DEL {parola | num-voce | list}"
+msgstr "canale DEL {parola | num-voce | lista}"
 
 msgid "channel ENFORCE"
 msgstr "canale ENFORCE"
@@ -575,10 +579,10 @@ msgid "channel LIST"
 msgstr "canale LIST"
 
 msgid "channel LIST [mask | entry-num | list]"
-msgstr "canale LIST [maschera | num-voce | list]"
+msgstr "canale LIST [maschera | num-voce | lista]"
 
 msgid "channel LIST [mask | list]"
-msgstr "canale LIST [maschera | list]"
+msgstr "canale LIST [maschera | lista]"
 
 msgid "channel LIST [mask | +flags]"
 msgstr "canale LIST [maschera | +flag]"
@@ -596,10 +600,10 @@ msgid "channel SET type level"
 msgstr "canale SET tipo livello"
 
 msgid "channel VIEW [mask | entry-num | list]"
-msgstr "canale VIEW [maschera | num-voce | list]"
+msgstr "canale VIEW [maschera | num-voce | lista]"
 
 msgid "channel VIEW [mask | list]"
-msgstr "canale VIEW [maschera | list]"
+msgstr "canale VIEW [maschera | lista]"
 
 msgid "channel [description]"
 msgstr "canale [descrizione]"
@@ -619,8 +623,8 @@ msgstr "canale [+scadenza] [motivo]"
 msgid "channel [+expiry] {nick | mask} [reason]"
 msgstr "canale [+scadenza] {nick | maschera} [motivo]"
 
-msgid "channel [MODIFY] mask changes"
-msgstr "canale MODIFY maschera modifiche"
+msgid "channel [MODIFY] mask changes [description]"
+msgstr "canale [MODIFY] maschera modifiche [descrizione]"
 
 msgid "channel [SET] [topic]"
 msgstr "canale SET [topic]"
@@ -682,9 +686,6 @@ msgstr "nick canale"
 msgid "nick channel [reason]"
 msgstr "nick canale [motivo]"
 
-msgid "nick flags"
-msgstr "nick flag"
-
 msgid "nick hostmask"
 msgstr "nick maschera-host"
 
@@ -1275,8 +1276,8 @@ msgstr "%-8s %s"
 msgid "%2lu %-16s letters: %s, words: %s, lines: %s, smileys: %s, actions: %s"
 msgstr "%2lu %-16s lettere: %s, parole: %s, linee: %s, faccine: %s, azioni: %s"
 
-msgid "%b %d %H:%M:%S %Y %Z"
-msgstr "%b %d %H:%M:%S %Y %Z"
+msgid "%b %d %Y %H:%M:%S %Z"
+msgstr "%b %d %Y %H:%M:%S %Z"
 
 #, c-format
 msgid "%c is an unknown status mode."
@@ -1402,6 +1403,14 @@ msgstr "La lista autokick di %s è vuota."
 msgid "%s bad words list is empty."
 msgstr "La lista delle parolacce di %s è vuota."
 
+#, c-format
+msgid "%s can no longer be added to channel access lists."
+msgstr "%s non può più essere aggiunto agli elenchi di accesso ai canali."
+
+#, c-format
+msgid "%s can now be added to channel access lists."
+msgstr "%s ora può essere aggiunto agli elenchi di accesso ai canali."
+
 #, c-format
 msgid "%s cannot be the successor on channel %s as they are the founder."
 msgstr "%s non può essere il successore del canale %s perché ne è il fondatore."
@@ -1712,8 +1721,8 @@ msgstr "Sarà anche inviato un memo che informerà l'utente."
 
 #, 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 ""
 "Un memo di notifica è stato mandato a %s informandolo/a che hai\n"
 "letto il suo memo."
@@ -1963,31 +1972,31 @@ msgstr "Tutti i vHost nel gruppo %s sono stati impostati a %s."
 msgid "All vhosts in the group %s have been set to %s@%s."
 msgstr "Tutti i vHost nel gruppo %s sono stati impostati a %s@%s."
 
-msgid "Allowed to (de)halfop him/herself"
+msgid "Allowed to (de)halfop themself"
 msgstr "Autorizzato a dare o rimuovere lo stato di halfop a sé stesso"
 
 msgid "Allowed to (de)halfop users"
 msgstr "Autorizzato a dare o rimuovere lo stato di halfop agli utenti"
 
-msgid "Allowed to (de)op him/herself"
+msgid "Allowed to (de)op themself"
 msgstr "Autorizzato a dare o rimuovere lo stato di op a sé stesso"
 
 msgid "Allowed to (de)op users"
 msgstr "Autorizzato a dare o rimuovere lo stato di op agli utenti"
 
-msgid "Allowed to (de)owner him/herself"
+msgid "Allowed to (de)owner themself"
 msgstr "Autorizzato a dare o rimuovere lo stato di owner a sé stesso"
 
 msgid "Allowed to (de)owner users"
 msgstr "Autorizzato a dare o rimuovere lo stato di owner agli utenti"
 
-msgid "Allowed to (de)protect him/herself"
+msgid "Allowed to (de)protect themself"
 msgstr "Autorizzato a dare o rimuovere lo stato di protect a sé stesso"
 
 msgid "Allowed to (de)protect users"
 msgstr "Autorizzato a dare o rimuovere lo stato di protect agli utenti"
 
-msgid "Allowed to (de)voice him/herself"
+msgid "Allowed to (de)voice themself"
 msgstr "Autorizzato a dare o rimuovere lo stato di voice a sé stesso"
 
 msgid "Allowed to (de)voice users"
@@ -2020,6 +2029,9 @@ msgstr "Autorizzato alla lettura dei memo del canale"
 msgid "Allowed to set channel settings"
 msgstr "Autorizzato ad impostare i impostazioni del canale"
 
+msgid "Allowed to unban themself"
+msgstr ""
+
 msgid "Allowed to unban users"
 msgstr "Autorizzato a rimuovere i ban sugli utenti"
 
@@ -2113,23 +2125,13 @@ msgstr ""
 "usando, verrà automaticamente disconnesso."
 
 msgid ""
-"Allows Services Operators to give Operflags to any user.\n"
-"Flags have to be prefixed with a \"+\" or a \"-\". To\n"
-"remove all flags simply type a \"-\" instead of any flags."
-msgstr ""
-"Permette ai Services Operators di impostare le Operflag\n"
-"per qualsiasi utente. Le flag devono essere introdotte\n"
-"da \"+\" o \"-\". Per rimuovere tutte le flag, è sufficiente\n"
-"usare \"-\" senza altri parametri."
-
-msgid ""
-"Allows Services Operators to make Services ignore a nick or mask\n"
+"Allows Services Operators to make services ignore a nick or mask\n"
 "for a certain time or until the next restart. The default\n"
 "time format is seconds. You can specify it by using units.\n"
 "Valid units are: s for seconds, m for minutes,\n"
 "h for hours and d for days.\n"
 "Combinations of these units are not permitted.\n"
-"To make Services permanently ignore the user, type 0 as time.\n"
+"To make services permanently ignore the user, type 0 as time.\n"
 "When adding a mask, it should be in the format nick!user@host,\n"
 "everything else will be considered a nick. Wildcards are permitted.\n"
 " \n"
@@ -2142,8 +2144,8 @@ msgstr ""
 "h per le ore e d per i giorni. \n"
 "La combinazione di queste unità non è permessa. Per far\n"
 "ignorare ai Services un utente in modo permanente, usa 0 come durata.\n"
-"Se viene aggiunta una maschera, deve essere nel formato user@host\n"
-"o nick!user@host, ogni altro formato sarà considerato come un nick.\n"
+"Se viene aggiunta una maschera, deve essere nel formato nick!user@host,\n"
+"ogni altro formato sarà considerato come un nick.\n"
 "L'uso di Wildcard è permesso.\n"
 "\n"
 "Nota: non sarà forzato sugli IRC Operators."
@@ -2191,7 +2193,7 @@ 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 ""
 "Permette ai Services Operators di manipolare la lista delle SNLINE.  Se\n"
@@ -2202,7 +2204,7 @@ msgstr ""
 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"
@@ -2213,8 +2215,10 @@ msgstr ""
 "un utente con un nick corrispondente una maschera in SQLINE prova a\n"
 "connettersi, i Services non gli permetteranno di proseguire\n"
 "la sua sessione su IRC.\n"
-"Se il primo carattere della maschera è #, i servizi\n"
-"impediranno l'uso dei canali corrispondenti."
+"Se il primo carattere della maschera è #, i Services\n"
+"impediranno l'uso dei canali corrispondenti. Se la maschera è una\n"
+"espressione regolare, l'espressione verrà confrontata\n"
+"anche con i canali."
 
 msgid ""
 "Allows Services Operators to manipulate the list of hosts that\n"
@@ -2340,22 +2344,22 @@ msgstr ""
 "     MODIFY nickserv forcemail no"
 
 msgid ""
-"Allows you to choose the way Services are communicating with\n"
-"the given user. With MSG set, Services will use messages,\n"
+"Allows you to choose the way services are communicating with\n"
+"the given user. With MSG set, services will use messages,\n"
 "else they'll use notices."
 msgstr ""
-"Permette di scegliere la modalità in cui i Services comunicano\n"
-"con il nick fornito. Se MSG è attivo, i Services useranno i messaggi (query),\n"
+"Ti permette di scegliere la modalità con cui i Services comunicheranno\n"
+"con l'utente specificato. Se MSG è attivo, i Services useranno i messaggi privati,\n"
 "altrimenti useranno i notice."
 
 #, c-format
 msgid ""
-"Allows you to choose the way Services are communicating with\n"
-"you. With %s set, Services will use messages, else they'll\n"
+"Allows you to choose the way services are communicating with\n"
+"you. With %s set, services will use messages, else they'll\n"
 "use notices."
 msgstr ""
-"Ti permette di scegliere la modalità in cui i Services comunicano\n"
-"con te. Se %s è attivo, i Services useranno i messaggi (query),\n"
+"Ti permette di scegliere la modalità con cui i Services comunicheranno\n"
+"con te. Se %s è attivo, i Services useranno i messaggi privati,\n"
 "altrimenti useranno i notice."
 
 msgid ""
@@ -2435,10 +2439,10 @@ msgstr ""
 
 msgid ""
 "Alternative methods of modifying channel access lists are\n"
-"available. "
+"available."
 msgstr ""
 "Sono disponibili metodi alternativi per la modifica delle\n"
-"liste di accesso dei canali. "
+"liste di accesso dei canali."
 
 msgid "Approve the requested vHost of a user"
 msgstr "Approva il vHost richiesto da un utente"
@@ -2791,46 +2795,45 @@ msgid "Caps kicker"
 msgstr "Espulsione per maiuscole"
 
 msgid ""
-"Causes Services to do an immediate shutdown; databases are\n"
+"Causes services to do an immediate shutdown; databases are\n"
 "not saved.  This command should not be used unless\n"
 "damage to the in-memory copies of the databases is feared\n"
 "and they should not be saved."
 msgstr ""
-"Termina immediatamente i Services senza salvarne i\n"
-"database. Questo comando non deve mai essere usato,\n"
+"Fa terminare immediatamente i Services senza salvarne i\n"
+"database.  Questo comando non deve mai essere usato,\n"
 "se non in caso di danni alla copia in memoria dei\n"
 "database, per evitare che la copia danneggiata venga\n"
 "salvata."
 
 msgid ""
-"Causes Services to reload the configuration file. Note that\n"
-"some directives still need the restart of the Services to\n"
-"take effect (such as Services' nicknames, activation of the\n"
+"Causes services to reload the configuration file. Note that\n"
+"some directives still need the restart of the services to\n"
+"take effect (such as services' nicknames, activation of the\n"
 "session limitation, etc.)."
 msgstr ""
-"Rilegge il file di configurazione dei Services. Alcune\n"
-"impostazioni contenute nel file richiedono il riavvio\n"
-"effettivo dei Services per essere attivate (ad esempio\n"
-"il cambio dei nick dei Services, l'attivazione della\n"
-"limitazione delle sessioni, eccetera)."
+"Fa rileggere il file di configurazione dei Services. Si noti che\n"
+"alcune impostazioni richiedono l'effettivo riavvio dei Services\n"
+"per essere applicate (ad esempio\n"
+" il cambio dei nick dei Services,\n"
+"l'attivazione della limitazione delle sessioni, eccetera)."
 
 msgid ""
-"Causes Services to save all databases and then restart\n"
+"Causes services to save all databases and then restart\n"
 "(i.e. exit and immediately re-run the executable)."
 msgstr ""
-"Salva i database su disco e riavvia i Services\n"
-"(uscita con immediato ri-esecuzione dell'eseguibile)."
+"Fa salvare i database e riavviare i Services\n"
+"(es: uscita con immediata ri-esecuzione dell'eseguibile)."
 
-msgid "Causes Services to save all databases and then shut down."
-msgstr "Salva i database su disco e termina i Services."
+msgid "Causes services to save all databases and then shut down."
+msgstr "Fa salvare i database e terminare i Services."
 
 msgid ""
-"Causes Services to update all database files as soon as you\n"
+"Causes services to update all database files as soon as you\n"
 "send the command."
 msgstr ""
-"Forza la scrittura su disco immediata dei database dei\n"
-"Services nello stesso istante in cui il comando viene\n"
-"inviato."
+"Fa aggiornare immediatamente i file di database dei\n"
+"Services non appena il comando viene inviato."
 
 #, c-format
 msgid "Certificate list for %s:"
@@ -2842,7 +2845,7 @@ msgstr "ChanServ è richiesto per abilitare la persistenza su questo network."
 msgid "Change channel modes"
 msgstr "Cambia le modalità del canale"
 
-msgid "Change the communication method of Services"
+msgid "Change the communication method of services"
 msgstr "Cambia il metodo di comunicazione usato dai Services"
 
 msgid "Change user modes"
@@ -2874,24 +2877,24 @@ msgstr ""
 "deve essere registrato."
 
 msgid ""
-"Changes the language Services uses when sending messages to\n"
+"Changes the language services uses when sending messages to\n"
 "the given user (for example, when responding to a command they send).\n"
 "language should be chosen from the following list of\n"
 "supported languages:"
 msgstr ""
-"Cambia la lingua utilizzata dai Services per inviarti\n"
-"i messaggi, ad esempio per rispondere a un comando che invii.\n"
+"Cambia la lingua utilizzata dai Services per inviare messaggi\n"
+"all'utente specificato (ad esempio per rispondere a un comando che invia).\n"
 "La lingua può essere scelta dalla seguente lista di\n"
 "lingue supportate:"
 
 msgid ""
-"Changes the language Services uses when sending messages to\n"
+"Changes the language services uses when sending messages to\n"
 "you (for example, when responding to a command you send).\n"
 "language should be chosen from the following list of\n"
 "supported languages:"
 msgstr ""
-"Cambia la lingua utilizzata dai Services per inviarti\n"
-"i messaggi, ad esempio per rispondere a un comando che invii.\n"
+"Cambia la lingua utilizzata dai Services per inviarti messaggi\n"
+"(ad esempio per rispondere a un comando che invii).\n"
 "La lingua può essere scelta dalla seguente lista di\n"
 "lingue supportate:"
 
@@ -3365,7 +3368,7 @@ msgstr "Eliminati %d record dalla lista delle eccezioni."
 
 #, c-format
 msgid "Deleted %d entries from the %s list."
-msgstr "Eliminati %d record dalla lista %s."
+msgstr "Eliminati %d record dalla lista %s."
 
 #, c-format
 msgid "Deleted %d entries from the AKILL list."
@@ -3461,7 +3464,7 @@ msgstr "La descrizione di %s è stata impostata a %s."
 
 #, c-format
 msgid "Description of %s unset."
-msgstr "La descrizione di %s è stata rimossa."
+msgstr "La descrizione di %s è stata rimossa."
 
 msgid "Disabled"
 msgstr "Disattivato"
@@ -3723,7 +3726,7 @@ 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 ""
 "Attiva o disattiva l'opzione \"pace\" per il canale.\n"
 "Quando l'opzione è attiva, gli utenti non potranno\n"
@@ -4045,7 +4048,7 @@ msgstr "Il forbid su %s non è stato trovato."
 msgid "Forbid usage of nicknames, channels, and emails"
 msgstr "Vieta l'uso di nickname, canali e indirizzi email"
 
-msgid "Force the Services databases to be updated immediately"
+msgid "Force the services databases to be updated immediately"
 msgstr "Forza l'aggiornamento immediato del database dei Services"
 
 msgid "Forcefully change a user's nickname"
@@ -4073,15 +4076,9 @@ msgstr "Fondatore"
 msgid "Founder of %s changed to %s."
 msgstr "Il fondatore del canale %s adesso è %s."
 
-msgid "GETPASS command unavailable because encryption is in use."
-msgstr "Il comando GETPASS non è disponibile perché è in uso la criptazione dei dati."
-
 msgid "Ghost with your nick has been killed."
 msgstr "La connessione fantasma con il tuo nick è stata disconnessa."
 
-msgid "Give Operflags to a certain user"
-msgstr "Imposta le operflag di un utente"
-
 #, c-format
 msgid ""
 "Gives %s status to the selected nick on a channel. If nick is\n"
@@ -5025,9 +5022,6 @@ msgstr ""
 "lista dei certificati degli altri utenti.\n"
 " \n"
 
-msgid "Modify the Services ignore list"
-msgstr "Modifica la lista ignorati dei Services"
-
 #, c-format
 msgid "Modify the list of %s users"
 msgstr "Modifica la lista degli utenti %s"
@@ -5041,6 +5035,9 @@ msgstr "Modifica la lista degli utenti con privilegi"
 msgid "Modify the nickname client certificate list"
 msgstr "Modifica la lista dei certificati del client per il nickname"
 
+msgid "Modify the services ignore list"
+msgstr "Modifica la lista ignorati dei Services"
+
 msgid "Modify the session-limit exception list"
 msgstr "Modifica la lista delle eccezioni del limite delle sessioni"
 
@@ -5091,6 +5088,9 @@ msgstr "Statistiche network per %s:"
 msgid "Never"
 msgstr "Mai"
 
+msgid "Never-op"
+msgstr "Mai-op"
+
 msgid "Nick"
 msgstr "Nick"
 
@@ -5375,14 +5375,6 @@ msgstr "Privilegi di operatore rimossi da %s (%s)."
 msgid "Oper type %s has not been configured."
 msgstr "Il tipo di operatore %s non è stato configurato."
 
-#, c-format
-msgid "Operflags %s have been added for %s."
-msgstr "Le operflags %s sono state aggiunte a %s."
-
-#, c-format
-msgid "Operflags %s have been removed from %s."
-msgstr "Le operflags %s sono state rimosse a %s."
-
 #, c-format
 msgid "Opertype %s has no allowed commands."
 msgstr "Il tipo di oper %s non ha comandi permessi."
@@ -5413,18 +5405,10 @@ msgstr "Password accettata - adesso sei riconosciuto."
 msgid "Password accepted."
 msgstr "Password accettata."
 
-#, c-format
-msgid "Password for %s changed to %s."
-msgstr "La password di %s è stata cambiata in %s."
-
 #, c-format
 msgid "Password for %s changed."
 msgstr "La password di %s è stata cambiata."
 
-#, c-format
-msgid "Password for %s is %s."
-msgstr "La password di %s è %s."
-
 msgid "Password incorrect."
 msgstr "Password errata."
 
@@ -5450,13 +5434,14 @@ msgid "Please contact an Operator to get a vHost assigned to this nick."
 msgstr "Per favore contatta un Operatore per avere un vHost assegnato a questo nick."
 
 msgid ""
-"Please try again with a more obscure password. Passwords should be at least\n"
-"five characters long, should not be something easily guessed\n"
-"(e.g. your real name or your nick), and cannot contain the space or tab characters."
+"Please try again with a more obscure password. Passwords should not be\n"
+"something that could be easily guessed (e.g. your real name or your nick) and\n"
+"cannot contain the space or tab characters.\n"
 msgstr ""
-"Attenzione, prova di nuovo con una password più sicura. Le password devono essere lunghe almeno\n"
-"5 caratteri,  non devono essere facilmente intuibili (ad es. il proprio nome o nick)\n"
-"e non possono contenere i caratteri di spazio e di tabulazione."
+"Attenzione, prova di nuovo con una password più sicura. Le password non \n"
+"devono essere facilmente intuibili (ad es. il proprio nome o nick)\n"
+" e \n"
+"non possono contenere i caratteri di spazio e di tabulazione.\n"
 
 msgid "Please use a valid server name when juping."
 msgstr "Utilizza un nome server valido per eseguire il \"jupe\"."
@@ -5512,7 +5497,7 @@ msgstr "Nasconde il nickname dall'output del comando LIST"
 msgid "Prevent the nickname from expiring"
 msgstr "Impedisce ad un nickname di scadere"
 
-msgid "Prevents users being kicked by Services"
+msgid "Prevents users being kicked by services"
 msgstr "Impedisce agli utenti di essere espulsi dai Services"
 
 msgid "Private"
@@ -5697,16 +5682,16 @@ 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 ""
-"Registra un canale nel database di %s. Per poter usare\n"
+"Registra un canale nel database di %s.  Per poter usare\n"
 "questo commando, prima di tutto, devi essere operatore (op)\n"
 "del canale che intendi registrare. La descrizione, che deve\n"
 "essere specificata, è una descrizione generica dello scopo\n"
 "del canale.\n"
 " \n"
 "Quando registri un canale, vieni registrato come \"fondatore\"\n"
-"del canale.  Il fondatore di un canale può modificare tutte le'\n"
+"del canale. Il fondatore di un canale può modificare tutte le'\n"
 "impostazioni del canale e riceverà automaticamente da %s\n"
 "i privilegi di operatore del canale quando vi accede."
 
@@ -5871,9 +5856,6 @@ msgstr "Mantiene il modi quando il canale non è in uso"
 msgid "Retain topic when channel is not in use"
 msgstr "Mantiene il topic quando il canale non è in uso"
 
-msgid "Retrieve the password for a nickname"
-msgstr "Recupera la password di un nickname"
-
 msgid "Retrieves the vhost requests"
 msgstr "Recupera le richieste di vHost"
 
@@ -5889,18 +5871,6 @@ msgstr "Restituisce l'account corrispondente all'email specificata."
 msgid "Returns the owner status of the given nickname"
 msgstr "Indica lo stato di proprietario del nickname specificato"
 
-msgid ""
-"Returns the password for the given nickname.  Note that\n"
-"whenever this command is used, a message including the\n"
-"person who issued the command and the nickname it was used\n"
-"on will be logged and sent out as a WALLOPS/GLOBOPS."
-msgstr ""
-"Restituisce la password del nick specificato.\n"
-"Da notare che quando questo comando viene usato,\n"
-"verrà inviato un WALLOPS o GLOBOPS ad indicare la\n"
-"persona che l'ha utilizzato e su quale nick è stato\n"
-"utilizzato."
-
 msgid ""
 "Returns whether the user using the given nickname is\n"
 "recognized as the owner of the nickname. The response has\n"
@@ -6067,7 +6037,7 @@ msgstr "Invia un memo contenente testo-memo a tutto lo staff dei servizi."
 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 ""
 "Invia un memo che contiene il testo-memo al nick\n"
@@ -6079,10 +6049,10 @@ msgstr ""
 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 ""
 "Invia un memo contenente testo-memo al nick o canale\n"
@@ -6270,8 +6240,8 @@ msgstr "Imposta le opzioni SET su un altro nickname"
 msgid "Set channel options and information"
 msgstr "Imposta le opzioni e le informazioni di un canale"
 
-msgid "Set how Services make bans on the channel"
-msgstr "Imposta il tipo di ban che sarà usato dai Services"
+msgid "Set how services make bans on the channel"
+msgstr "Imposta il modo in cui i Services effettuano i ban sul canale"
 
 msgid "Set options related to memos"
 msgstr "Imposta le opzioni relative ai memo"
@@ -6291,8 +6261,8 @@ msgstr "Imposta il nome del tuo gruppo"
 msgid "Set the founder of a channel"
 msgstr "Imposta il fondatore del canale"
 
-msgid "Set the language Services will use when messaging you"
-msgstr "Imposta la lingua utilizzata dai Services"
+msgid "Set the language services will use when messaging you"
+msgstr "Imposta la lingua utilizzata dai Services per inviarti messaggi"
 
 msgid "Set the nickname password"
 msgstr "Imposta la password del nick"
@@ -6306,7 +6276,7 @@ msgstr "Imposta il vHost per tutti i nick di un gruppo"
 msgid "Set the vhost of another user"
 msgstr "Imposta il vHost di un altro utente"
 
-msgid "Set various global Services options"
+msgid "Set various global services options"
 msgstr "Imposta varie opzioni globali dei Services"
 
 msgid "Set your nickname password"
@@ -6556,7 +6526,7 @@ msgstr ""
 "oltre che il vHost."
 
 msgid ""
-"Sets various global Services options.  Option names\n"
+"Sets various global services options.  Option names\n"
 "currently defined are:\n"
 "    READONLY   Set read-only or read-write mode\n"
 "    DEBUG      Activate or deactivate debug mode\n"
@@ -6564,7 +6534,7 @@ msgid ""
 "    SUPERADMIN Activate or deactivate super admin mode\n"
 "    LIST       List the options"
 msgstr ""
-"Imposta varie opzioni globali dei Services. Le opzioni\n"
+"Imposta varie opzioni globali dei Services.  Le opzioni\n"
 "configurabili sono:\n"
 "    READONLY   Imposta la modalità sola-lettura o lettura-scrittura\n"
 "    DEBUG      Attiva o disattiva la modalità di debug\n"
@@ -6608,6 +6578,9 @@ msgstr ""
 "Imposta se il canale scadrà o meno in caso di inutilizzo. Se\n"
 "l'opzione è impostata a ON, il canale non scadrà."
 
+msgid "Sets whether the given nickname can be added to a channel access list."
+msgstr "Imposta se il nickname specificato può essere aggiunto a un elenco di accesso al canale."
+
 #, c-format
 msgid ""
 "Sets whether the given nickname will be given its status modes\n"
@@ -6628,6 +6601,9 @@ msgstr ""
 "Imposta se il nickname specificato scadrà.  Impostandolo su\n"
 "ON eviterà che il nickname scada."
 
+msgid "Sets whether you can be added to a channel access list."
+msgstr "Imposta se puoi essere aggiunto a un elenco di accesso ai canali."
+
 #, c-format
 msgid ""
 "Sets whether you will be given your channel status modes automatically.\n"
@@ -6659,7 +6635,7 @@ msgstr "Il parametro dell'opzione super admin deve essere ON o OFF."
 msgid "Should services automatically give status to users"
 msgstr "Abilita/disabilita l'impostazione automatica dello stato agli utenti"
 
-msgid "Show status of Services and network"
+msgid "Show status of services and network"
 msgstr "Mostra lo stato dei Services e della rete"
 
 #, c-format
@@ -7042,13 +7018,13 @@ msgid ""
 "Syntax: READONLY {ON | OFF}\n"
 " \n"
 "Sets read-only mode on or off.  In read-only mode, normal\n"
-"users will not be allowed to modify any Services data,\n"
+"users will not be allowed to modify any services data,\n"
 "including channel and nickname access lists, etc.  IRCops\n"
-"with sufficient Services privileges will be able to modify\n"
+"with sufficient services privileges will be able to modify\n"
 "Services' AKILL, SQLINE, SNLINE and ignore lists, drop,\n"
 "suspend or forbid nicknames and channels, and manage news,\n"
 "oper info and DNS, but any such changes will not be saved\n"
-"unless read-only mode is deactivated before Services are\n"
+"unless read-only mode is deactivated before services are\n"
 "terminated or restarted.\n"
 " \n"
 "This option is equivalent to the command-line option\n"
@@ -7135,8 +7111,8 @@ msgstr ""
 "livello di accesso 5 o superiori sul canale."
 
 msgid ""
-"Tells Services to jupiter a server -- that is, to create\n"
-"a fake \"server\" connected to Services which prevents\n"
+"Tells services to jupiter a server -- that is, to create\n"
+"a fake \"server\" connected to services which prevents\n"
 "the real server of that name from connecting.  The jupe\n"
 "may be removed using a standard SQUIT. If a reason is\n"
 "given, it is placed in the server information field;\n"
@@ -7146,7 +7122,7 @@ msgid ""
 msgstr ""
 "Fa sì che i Services blocchino un server, creando un server\n"
 "\"fasullo\" connesso ai Services per evitare che il server reale\n"
-"possa connettersi alla rete. Questo blocco può essere rimosso\n"
+"possa connettersi alla rete.  Questo blocco può essere rimosso\n"
 "utilizzando il comando standard SQUIT. Se viene indicato\n"
 "un motivo, questo sarà utilizzato nel campo delle informazioni\n"
 "del server, altrimenti, le informazioni conterranno il testo\n"
@@ -7156,8 +7132,8 @@ msgstr ""
 msgid "Tells you about the last time a user was seen"
 msgstr "Ti informa sull'ultima volta che un utente è stato visto online"
 
-msgid "Terminate Services WITHOUT saving"
-msgstr "Termina i Services senza salvare i database"
+msgid "Terminate services WITHOUT saving"
+msgstr "Termina i Services SENZA salvare"
 
 msgid "Terminate services with save"
 msgstr "Termina i Services salvando i database"
@@ -7326,7 +7302,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"
@@ -7832,7 +7808,7 @@ msgid "This command retrieves the vhost requests."
 msgstr "Questo comando recupera le richieste di vHosts."
 
 msgid ""
-"This command searches the Services logfiles for messages\n"
+"This command searches the services logfiles for messages\n"
 "that match the given pattern. The day and limit argument\n"
 "may be used to specify how many days of logs to search\n"
 "and the number of replies to limit to. By default this\n"
@@ -7845,10 +7821,12 @@ msgid ""
 "      containing Anope and lists the most recent 500 of them."
 msgstr ""
 "Questo comando effettua una ricerca nel file di log dei Services\n"
-"utilizzando il pattern specificato. Gli argomenti day e limit possono essere usati per specificare fino a quanti giorni\n"
-"estendere la ricerca nei log e il limite dei risultati da mostrare.\n"
-"Come impostazione predefinita questo comando recupera una settimana di\n"
-"log e limita i risultati a 50.\n"
+"utilizzando il pattern specificato. Gli argomenti day e limit possono\n"
+"essere usati per specificare fino a quanti giorni estendere la ricerca\n"
+"nei log e il limite dei risultati da mostrare.\n"
+" Come impostazione\n"
+"predefinita questo comando recupera una settimana di log e limita\n"
+"i risultati a 50.\n"
 " \n"
 "Per esempio:\n"
 "    LOGSEARCH +21d +500l Anope\n"
@@ -8335,10 +8313,10 @@ msgid "VIEW host"
 msgstr "VIEW host"
 
 msgid "VIEW [mask | list | id]"
-msgstr "VIEW [maschera | list | id]"
+msgstr "VIEW [maschera | lista | id]"
 
 msgid "VIEW [mask | list]"
-msgstr "VIEW [maschera | list]"
+msgstr "VIEW [maschera | lista]"
 
 msgid "Value"
 msgstr "Valore"
@@ -8407,7 +8385,7 @@ msgid ""
 "yourself.\n"
 " \n"
 "With a parameter, does the same for the given nick. If you\n"
-"specify REVALIDATE as well, Services will ask the given nick\n"
+"specify REVALIDATE as well, services will ask the given nick\n"
 "to re-identify. This is limited to Services Operators."
 msgstr ""
 "Senza nessun parametro, annulla l'effetto del comando IDENTIFY,\n"
@@ -8416,14 +8394,14 @@ msgstr ""
 "di nuovo.\n"
 " \n"
 "Con un parametro, il funzionamento è identico ma viene applicato\n"
-"al nick specificato. Se si indica anche REVALIDATE, i Services\n"
+"al nick specificato. Se si indica anche REVALIDATE, i Services\n"
 "chiederanno al nick specificato di re-identificarsi.\n"
-"Questo modo di utilizzo è limitato ai Services Operator."
+"Questo utilizzo è limitato ai Services Operator."
 
 msgid ""
 "Without any option, shows the current number of users online,\n"
-"and the highest number of users online since Services was\n"
-"started, and the length of time Services has been running.\n"
+"and the highest number of users online since services was\n"
+"started, and the length of time services has been running.\n"
 " \n"
 "With the AKILL option, displays the current size of the\n"
 "AKILL list and the current default expiry time.\n"
@@ -8488,9 +8466,6 @@ msgstr "Non stai usando un certificato del client."
 msgid "You are now a super admin."
 msgstr "Ora sei un Super Admin."
 
-msgid "You are now an IRC Operator."
-msgstr "Ora sei un IRC Operator."
-
 msgid "You are now identified for your nick. Change your password now."
 msgstr "Adesso sei identificato per il tuo nick. Cambia la tua password adesso."
 
@@ -8505,7 +8480,7 @@ msgstr "Attenzione: Hai superato il numero massimo di memo (%d). Non potrai ri
 msgid "You can not NOOP Services."
 msgstr "Non puoi usare NOOP sui Services."
 
-msgid "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 "Non puoi disabilitare il privilegio di fondatore perché in seguito sarebbe impossibile riabilitarlo."
 
 msgid "You can not jupe an already juped server."
@@ -8668,9 +8643,6 @@ msgstr "Non puoi cambiare la password di altri Services Operators."
 msgid "You may not drop other Services Operators' nicknames."
 msgstr "Non puoi de-registrare il nickname di altri Services Operators."
 
-msgid "You may not get the password of other Services Operators."
-msgstr "Non puoi richiedere la password di altri Services Operators."
-
 msgid "You may not suspend other Services Operators' nicknames."
 msgstr "Non uoi sospendere il nickname di altri Services Operators."
 
@@ -8850,12 +8822,12 @@ msgid "Your passcode has been re-sent to %s."
 msgstr "Il codice di attivazione è stato re-inviato a %s."
 
 #, c-format
-msgid "Your password is %s - remember this for later use."
-msgstr "La tua password è %s - non dimenticarla."
+msgid "Your password is too long. It must be shorter than %u characters."
+msgstr "La password scelta è troppo lunga. Non deve superare %u caratteri."
 
 #, c-format
-msgid "Your password is too long. It must not exceed %u characters."
-msgstr "La password scelta è troppo lunga. Non deve superare %u caratteri."
+msgid "Your password is too short. It must must be longer than %u characters."
+msgstr "La password scelta è troppo corta. Deve contenere almeno %u caratteri."
 
 msgid "Your password reset request has expired."
 msgstr "La tua richiesta di reset della password è scaduta."
@@ -8920,16 +8892,16 @@ msgid "[channel] LIST"
 msgstr "[canale] LIST"
 
 msgid "[channel] [list | NEW]"
-msgstr "[canale] [list | NEW]"
+msgstr "[canale] [lista | NEW]"
 
 msgid "[channel] [nick]"
 msgstr "[canale] [nick]"
 
 msgid "[channel] {num | list | LAST | ALL}"
-msgstr "[canale] {num | list | LAST | ALL}"
+msgstr "[canale] {num | lista | LAST | ALL}"
 
 msgid "[channel] {num | list | LAST | NEW | ALL}"
-msgstr "[canale] {num | list | LAST | NEW | ALL}"
+msgstr "[canale] {num | lista | LAST | NEW | ALL}"
 
 msgid "[key|#X-Y]"
 msgstr "[chiave|#X-Y]"

modules/bs_autoassign.cpp

@@ -11,7 +11,7 @@
 
 class BSAutoAssign : public Module
 {
- public:
+public:
 	BSAutoAssign(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR)
 	{
 	}

modules/commands/bs_assign.cpp

@@ -13,7 +13,7 @@
 
 class CommandBSAssign : public Command
 {
- public:
+public:
 	CommandBSAssign(Module *creator) : Command(creator, "botserv/assign", 2, 2)
 	{
 		this->SetDesc(_("Assigns a bot to a channel"));
@@ -84,7 +84,7 @@ class CommandBSAssign : public Command
 
 class CommandBSUnassign : public Command
 {
- public:
+public:
 	CommandBSUnassign(Module *creator) : Command(creator, "botserv/unassign", 1, 1)
 	{
 		this->SetDesc(_("Unassigns a bot from a channel"));
@@ -147,7 +147,7 @@ class CommandBSUnassign : public Command
 
 class CommandBSSetNoBot : public Command
 {
- public:
+public:
 	CommandBSSetNoBot(Module *creator, const Anope::string &sname = "botserv/set/nobot") : Command(creator, sname, 2, 2)
 	{
 		this->SetDesc(_("Prevent a bot from being assigned to a channel"));
@@ -210,7 +210,7 @@ class BSAssign : public Module
 	CommandBSUnassign commandbsunassign;
 	CommandBSSetNoBot commandbssetnobot;
 
- public:
+public:
 	BSAssign(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		nobot(this, "BS_NOBOT"),
 		commandbsassign(this), commandbsunassign(this), commandbssetnobot(this)

modules/commands/bs_badwords.cpp

@@ -152,7 +152,7 @@ class BadwordsDelCallback : public NumberList
 	Command *c;
 	unsigned deleted = 0;
 	bool override = false;
- public:
+public:
 	BadwordsDelCallback(CommandSource &_source, ChannelInfo *_ci, Command *_c, const Anope::string &list) : NumberList(list, true), source(_source), ci(_ci), c(_c)
 	{
 		if (!source.AccessFor(ci).HasPriv("BADWORDS") && source.HasPriv("botserv/administration"))
@@ -183,7 +183,7 @@ class BadwordsDelCallback : public NumberList
 
 class CommandBSBadwords : public Command
 {
- private:
+private:
 	void DoList(CommandSource &source, ChannelInfo *ci, const Anope::string &word)
 	{
 		bool override = !source.AccessFor(ci).HasPriv("BADWORDS");
@@ -204,7 +204,7 @@ class CommandBSBadwords : public Command
 			{
 				ListFormatter &list;
 				BadWords *bw;
-			 public:
+			public:
 				BadwordsListCallback(ListFormatter &_list, BadWords *_bw, const Anope::string &numlist) : NumberList(numlist, false), list(_list), bw(_bw)
 				{
 				}
@@ -364,7 +364,7 @@ class CommandBSBadwords : public Command
 		source.Reply(_("Bad words list is now empty."));
 	}
 
- public:
+public:
 	CommandBSBadwords(Module *creator) : Command(creator, "botserv/badwords", 2, 3)
 	{
 		this->SetDesc(_("Maintains the bad words list"));
@@ -459,7 +459,7 @@ class BSBadwords : public Module
 	ExtensibleItem<BadWordsImpl> badwords;
 	Serialize::Type badword_type;
 
- public:
+public:
 	BSBadwords(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandbsbadwords(this), badwords(this, "badwords"), badword_type("BadWord", BadWordImpl::Unserialize)
 	{

modules/commands/bs_bot.cpp

@@ -13,7 +13,7 @@
 
 class CommandBSBot : public Command
 {
- private:
+private:
 	void DoAdd(CommandSource &source, const std::vector<Anope::string> &params)
 	{
 		const Anope::string &nick = params[1];
@@ -263,7 +263,7 @@ class CommandBSBot : public Command
 		delete bi;
 		return;
 	}
- public:
+public:
 	CommandBSBot(Module *creator) : Command(creator, "botserv/bot", 1, 6)
 	{
 		this->SetDesc(_("Maintains network bot list"));
@@ -374,7 +374,7 @@ class BSBot : public Module
 {
 	CommandBSBot commandbsbot;
 
- public:
+public:
 	BSBot(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandbsbot(this)
 	{

modules/commands/bs_botlist.cpp

@@ -13,7 +13,7 @@
 
 class CommandBSBotList : public Command
 {
- public:
+public:
 	CommandBSBotList(Module *creator) : Command(creator, "botserv/botlist", 0, 0)
 	{
 		this->SetDesc(_("Lists available bots"));
@@ -69,7 +69,7 @@ class BSBotList : public Module
 {
 	CommandBSBotList commandbsbotlist;
 
- public:
+public:
 	BSBotList(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandbsbotlist(this)
 	{

modules/commands/bs_control.cpp

@@ -13,7 +13,7 @@
 
 class CommandBSSay : public Command
 {
- public:
+public:
 	CommandBSSay(Module *creator) : Command(creator, "botserv/say", 2, 2)
 	{
 		this->SetDesc(_("Makes the bot say the specified text on the specified channel"));
@@ -73,7 +73,7 @@ class CommandBSSay : public Command
 
 class CommandBSAct : public Command
 {
- public:
+public:
 	CommandBSAct(Module *creator) : Command(creator, "botserv/act", 2, 2)
 	{
 		this->SetDesc(_("Makes the bot do the equivalent of a \"/me\" command"));
@@ -135,7 +135,7 @@ class BSControl : public Module
 	CommandBSSay commandbssay;
 	CommandBSAct commandbsact;
 
- public:
+public:
 	BSControl(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandbssay(this), commandbsact(this)
 	{

modules/commands/bs_info.cpp

@@ -13,7 +13,7 @@
 
 class CommandBSInfo : public Command
 {
- private:
+private:
 	void send_bot_channels(std::vector<Anope::string> &buffers, const BotInfo *bi)
 	{
 		Anope::string buf;
@@ -33,7 +33,7 @@ class CommandBSInfo : public Command
 			buffers.push_back(buf);
 	}
 
- public:
+public:
 	CommandBSInfo(Module *creator) : Command(creator, "botserv/info", 1, 1)
 	{
 		this->SetSyntax(_("{\037channel\037 | \037nickname\037}"));
@@ -121,7 +121,7 @@ class BSInfo : public Module
 {
 	CommandBSInfo commandbsinfo;
 
- public:
+public:
 	BSInfo(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandbsinfo(this)
 	{

modules/commands/bs_kick.cpp

@@ -117,7 +117,7 @@ struct KickerDataImpl : KickerData
 
 class CommandBSKick : public Command
 {
- public:
+public:
 	CommandBSKick(Module *creator) : Command(creator, "botserv/kick", 0)
 	{
 		this->SetDesc(_("Configures kickers"));
@@ -161,7 +161,7 @@ class CommandBSKick : public Command
 
 class CommandBSKickBase : public Command
 {
- public:
+public:
 	CommandBSKickBase(Module *creator, const Anope::string &cname, int minarg, int maxarg) : Command(creator, cname, minarg, maxarg)
 	{
 	}
@@ -170,7 +170,7 @@ class CommandBSKickBase : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override = 0;
 
- protected:
+protected:
 	bool CheckArguments(CommandSource &source, const std::vector<Anope::string> &params, ChannelInfo* &ci)
 	{
 		const Anope::string &chan = params[0];
@@ -246,7 +246,7 @@ class CommandBSKickBase : public Command
 
 class CommandBSKickAMSG : public CommandBSKickBase
 {
- public:
+public:
 	CommandBSKickAMSG(Module *creator) : CommandBSKickBase(creator, "botserv/kick/amsg", 2, 3)
 	{
 		this->SetDesc(_("Configures AMSG kicker"));
@@ -282,7 +282,7 @@ class CommandBSKickAMSG : public CommandBSKickBase
 
 class CommandBSKickBadwords : public CommandBSKickBase
 {
- public:
+public:
 	CommandBSKickBadwords(Module *creator) : CommandBSKickBase(creator, "botserv/kick/badwords", 2, 3)
 	{
 		this->SetDesc(_("Configures badwords kicker"));
@@ -321,7 +321,7 @@ class CommandBSKickBadwords : public CommandBSKickBase
 
 class CommandBSKickBolds : public CommandBSKickBase
 {
- public:
+public:
 	CommandBSKickBolds(Module *creator) : CommandBSKickBase(creator, "botserv/kick/bolds", 2, 3)
 	{
 		this->SetDesc(_("Configures bolds kicker"));
@@ -355,7 +355,7 @@ class CommandBSKickBolds : public CommandBSKickBase
 
 class CommandBSKickCaps : public CommandBSKickBase
 {
- public:
+public:
 	CommandBSKickCaps(Module *creator) : CommandBSKickBase(creator, "botserv/kick/caps", 2, 5)
 	{
 		this->SetDesc(_("Configures caps kicker"));
@@ -451,7 +451,7 @@ class CommandBSKickCaps : public CommandBSKickBase
 
 class CommandBSKickColors : public CommandBSKickBase
 {
- public:
+public:
 	CommandBSKickColors(Module *creator) : CommandBSKickBase(creator, "botserv/kick/colors", 2, 3)
 	{
 		this->SetDesc(_("Configures color kicker"));
@@ -485,7 +485,7 @@ class CommandBSKickColors : public CommandBSKickBase
 
 class CommandBSKickFlood : public CommandBSKickBase
 {
- public:
+public:
 	CommandBSKickFlood(Module *creator) : CommandBSKickBase(creator, "botserv/kick/flood", 2, 5)
 	{
 		this->SetDesc(_("Configures flood kicker"));
@@ -583,7 +583,7 @@ class CommandBSKickFlood : public CommandBSKickBase
 
 class CommandBSKickItalics : public CommandBSKickBase
 {
- public:
+public:
 	CommandBSKickItalics(Module *creator) : CommandBSKickBase(creator, "botserv/kick/italics", 2, 3)
 	{
 		this->SetDesc(_("Configures italics kicker"));
@@ -617,7 +617,7 @@ class CommandBSKickItalics : public CommandBSKickBase
 
 class CommandBSKickRepeat : public CommandBSKickBase
 {
- public:
+public:
 	CommandBSKickRepeat(Module *creator) : CommandBSKickBase(creator, "botserv/kick/repeat", 2, 4)
 	{
 		this->SetDesc(_("Configures repeat kicker"));
@@ -718,7 +718,7 @@ class CommandBSKickRepeat : public CommandBSKickBase
 
 class CommandBSKickReverses : public CommandBSKickBase
 {
- public:
+public:
 	CommandBSKickReverses(Module *creator) : CommandBSKickBase(creator, "botserv/kick/reverses", 2, 3)
 	{
 		this->SetDesc(_("Configures reverses kicker"));
@@ -752,7 +752,7 @@ class CommandBSKickReverses : public CommandBSKickBase
 
 class CommandBSKickUnderlines : public CommandBSKickBase
 {
- public:
+public:
 	CommandBSKickUnderlines(Module *creator) : CommandBSKickBase(creator, "botserv/kick/underlines", 2, 3)
 	{
 		this->SetDesc(_("Configures underlines kicker"));
@@ -786,7 +786,7 @@ class CommandBSKickUnderlines : public CommandBSKickBase
 
 class CommandBSSetDontKickOps : public Command
 {
- public:
+public:
 	CommandBSSetDontKickOps(Module *creator, const Anope::string &sname = "botserv/set/dontkickops") : Command(creator, sname, 2, 2)
 	{
 		this->SetDesc(_("To protect ops against bot kicks"));
@@ -851,7 +851,7 @@ class CommandBSSetDontKickOps : public Command
 
 class CommandBSSetDontKickVoices : public Command
 {
- public:
+public:
 	CommandBSSetDontKickVoices(Module *creator, const Anope::string &sname = "botserv/set/dontkickvoices") : Command(creator, sname, 2, 2)
 	{
 		this->SetDesc(_("To protect voices against bot kicks"));
@@ -930,11 +930,11 @@ struct BanData
 		}
 	};
 
- private:
+private:
 	typedef Anope::map<Data> data_type;
 	data_type data_map;
 
- public:
+public:
 	BanData(Extensible *) { }
 
 	Data &get(const Anope::string &key)
@@ -987,7 +987,7 @@ struct UserData
 
 class BanDataPurger : public Timer
 {
- public:
+public:
 	BanDataPurger(Module *o) : Timer(o, 300, Anope::CurTime, true) { }
 
 	void Tick(time_t) override
@@ -1086,7 +1086,7 @@ class BSKick : public Module
 		ci->c->Kick(ci->bi, u, "%s", buf);
 	}
 
- public:
+public:
 	BSKick(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		bandata(this, "bandata"),
 		userdata(this, "userdata"),

modules/commands/bs_set.cpp

@@ -13,7 +13,7 @@
 
 class CommandBSSet : public Command
 {
- public:
+public:
 	CommandBSSet(Module *creator) : Command(creator, "botserv/set", 3, 3)
 	{
 		this->SetDesc(_("Configures bot options"));
@@ -66,13 +66,13 @@ class CommandBSSet : public Command
 
 class CommandBSSetBanExpire : public Command
 {
- public:
+public:
 	class UnbanTimer : public Timer
 	{
 		Anope::string chname;
 		Anope::string mask;
 
-	 public:
+	public:
 		UnbanTimer(Module *creator, const Anope::string &ch, const Anope::string &bmask, time_t t) : Timer(creator, t), chname(ch), mask(bmask) { }
 
 		void Tick(time_t) override
@@ -153,7 +153,7 @@ class CommandBSSetBanExpire : public Command
 
 class CommandBSSetPrivate : public Command
 {
- public:
+public:
 	CommandBSSetPrivate(Module *creator, const Anope::string &sname = "botserv/set/private") : Command(creator, sname, 2, 2)
 	{
 		this->SetDesc(_("Prevent a bot from being assigned by non IRC operators"));
@@ -207,7 +207,7 @@ class BSSet : public Module
 	CommandBSSetBanExpire commandbssetbanexpire;
 	CommandBSSetPrivate commandbssetprivate;
 
- public:
+public:
 	BSSet(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandbsset(this), commandbssetbanexpire(this),
 		commandbssetprivate(this)

modules/commands/cs_access.cpp

@@ -22,7 +22,7 @@ static inline void reset_levels(ChannelInfo *ci)
 
 class AccessChanAccess : public ChanAccess
 {
- public:
+public:
 	int level = 0;
 
 	AccessChanAccess(AccessProvider *p) : ChanAccess(p)
@@ -69,7 +69,7 @@ class AccessChanAccess : public ChanAccess
 
 class AccessAccessProvider : public AccessProvider
 {
- public:
+public:
 	static AccessAccessProvider *me;
 
 	AccessAccessProvider(Module *o) : AccessProvider(o, "access/access")
@@ -266,7 +266,7 @@ class CommandCSAccess : public Command
 				Anope::string Nicks;
 				bool denied = false;
 				bool override = false;
-			 public:
+			public:
 				AccessDelCallback(CommandSource &_source, ChannelInfo *_ci, Command *_c, const Anope::string &numlist) : NumberList(numlist, true), source(_source), ci(_ci), c(_c)
 				{
 					if (!source.AccessFor(ci).HasPriv("ACCESS_CHANGE") && source.HasPriv("chanserv/access/modify"))
@@ -366,7 +366,7 @@ class CommandCSAccess : public Command
 				ListFormatter &list;
 				ChannelInfo *ci;
 
-			 public:
+			public:
 				AccessListCallback(ListFormatter &_list, ChannelInfo *_ci, const Anope::string &numlist) : NumberList(numlist, false), list(_list), ci(_ci)
 				{
 				}
@@ -510,7 +510,7 @@ class CommandCSAccess : public Command
 		return;
 	}
 
- public:
+public:
 	CommandCSAccess(Module *creator) : Command(creator, "chanserv/access", 2, 5)
 	{
 		this->SetDesc(_("Modify the list of privileged users"));
@@ -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;
 		}
 
@@ -752,7 +752,7 @@ class CommandCSLevels : public Command
 		return;
 	}
 
- public:
+public:
 	CommandCSLevels(Module *creator) : Command(creator, "chanserv/levels", 2, 4)
 	{
 		this->SetDesc(_("Redefine the meanings of access levels"));
@@ -843,7 +843,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"
@@ -863,7 +863,7 @@ class CSAccess : public Module
 	CommandCSAccess commandcsaccess;
 	CommandCSLevels commandcslevels;
 
- public:
+public:
 	CSAccess(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		accessprovider(this), commandcsaccess(this), commandcslevels(this)
 	{

modules/commands/cs_akick.cpp

@@ -210,7 +210,7 @@ class CommandCSAKick : public Command
 				Command *c;
 				unsigned deleted = 0;
 				AccessGroup ag;
-			 public:
+			public:
 				AkickDelCallback(CommandSource &_source, ChannelInfo *_ci, Command *_c, const Anope::string &list) : NumberList(list, true), source(_source), ci(_ci), c(_c), ag(source.AccessFor(ci))
 				{
 				}
@@ -285,7 +285,7 @@ class CommandCSAKick : public Command
 				ListFormatter &list;
 				ChannelInfo *ci;
 
-			 public:
+			public:
 				AkickListCallback(ListFormatter &_list, ChannelInfo *_ci, const Anope::string &numlist) : NumberList(numlist, false), list(_list), ci(_ci)
 				{
 				}
@@ -425,7 +425,7 @@ class CommandCSAKick : public Command
 		source.Reply(_("Channel %s akick list has been cleared."), ci->name.c_str());
 	}
 
- public:
+public:
 	CommandCSAKick(Module *creator) : Command(creator, "chanserv/akick", 2, 4)
 	{
 		this->SetDesc(_("Maintain the AutoKick list"));
@@ -529,7 +529,7 @@ class CSAKick : public Module
 {
 	CommandCSAKick commandcsakick;
 
- public:
+public:
 	CSAKick(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcsakick(this)
 	{

modules/commands/cs_ban.cpp

@@ -15,12 +15,12 @@ static Module *me;
 
 class TempBan : public Timer
 {
- private:
+private:
 	Anope::string channel;
 	Anope::string mask;
 	Anope::string mode;
 
- public:
+public:
 	TempBan(time_t seconds, Channel *c, const Anope::string &banmask, const Anope::string &mod) : Timer(me, seconds), channel(c->name), mask(banmask), mode(mod) { }
 
 	void Tick(time_t ctime) override
@@ -33,7 +33,7 @@ class TempBan : public Timer
 
 class CommandCSBan : public Command
 {
- public:
+public:
 	CommandCSBan(Module *creator) : Command(creator, "chanserv/ban", 2, 4)
 	{
 		this->SetDesc(_("Bans a given nick or mask on a channel"));
@@ -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"))
@@ -241,7 +241,7 @@ class CSBan : public Module
 {
 	CommandCSBan commandcsban;
 
- public:
+public:
 	CSBan(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsban(this)
 	{
 		me = this;

modules/commands/cs_clone.cpp

@@ -250,7 +250,7 @@ class CSClone : public Module
 {
 	CommandCSClone commandcsclone;
 
- public:
+public:
 	CSClone(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsclone(this)
 	{
 

modules/commands/cs_drop.cpp

@@ -13,7 +13,7 @@
 
 class CommandCSDrop : public Command
 {
- public:
+public:
 	CommandCSDrop(Module *creator) : Command(creator, "chanserv/drop", 1, 2)
 	{
 		this->SetDesc(_("Cancel the registration of a channel"));
@@ -85,7 +85,7 @@ class CSDrop : public Module
 {
 	CommandCSDrop commandcsdrop;
 
- public:
+public:
 	CSDrop(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsdrop(this)
 	{
 

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.
  */
 
@@ -15,7 +15,7 @@
 
 class CommandCSEnforce : public Command
 {
- private:
+private:
 	void DoSecureOps(CommandSource &source, ChannelInfo *ci)
 	{
 		bool override = !source.AccessFor(ci).HasPriv("AKICK") && source.HasPriv("chanserv/access/modify");
@@ -206,7 +206,7 @@ class CommandCSEnforce : public Command
 		source.Reply(_("LIMIT enforced on %s, %d users removed."), ci->name.c_str(), users.size());
 	}
 
- public:
+public:
 	CommandCSEnforce(Module *creator) : Command(creator, "chanserv/enforce", 2, 2)
 	{
 		this->SetDesc(_("Enforce various channel modes and set options"));
@@ -266,7 +266,7 @@ class CSEnforce : public Module
 {
 	CommandCSEnforce commandcsenforce;
 
- public:
+public:
 	CSEnforce(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcsenforce(this)
 	{

modules/commands/cs_entrymsg.cpp

@@ -99,7 +99,7 @@ Serializable* EntryMsgImpl::Unserialize(Serializable *obj, Serialize::Data &data
 
 class CommandEntryMessage : public Command
 {
- private:
+private:
 	void DoList(CommandSource &source, ChannelInfo *ci)
 	{
 		EntryMessageList *messages = ci->Require<EntryMessageList>("entrymsg");
@@ -187,7 +187,7 @@ class CommandEntryMessage : public Command
 		source.Reply(_("Entry messages for \002%s\002 have been cleared."), ci->name.c_str());
 	}
 
- public:
+public:
 	CommandEntryMessage(Module *creator) : Command(creator, "chanserv/entrymsg", 2, 3)
 	{
 		this->SetDesc(_("Manage the channel's entry messages"));
@@ -266,7 +266,7 @@ class CSEntryMessage : public Module
 	ExtensibleItem<EntryMessageListImpl> eml;
 	Serialize::Type entrymsg_type;
 
- public:
+public:
 	CSEntryMessage(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 	commandentrymsg(this),
 	eml(this, "entrymsg"), entrymsg_type("EntryMsg", EntryMsgImpl::Unserialize)

modules/commands/cs_flags.cpp

@@ -15,7 +15,7 @@ static std::map<Anope::string, char> defaultFlags;
 
 class FlagsChanAccess : public ChanAccess
 {
- public:
+public:
 	std::set<char> flags;
 
 	FlagsChanAccess(AccessProvider *p) : ChanAccess(p)
@@ -61,7 +61,7 @@ class FlagsChanAccess : public ChanAccess
 
 class FlagsAccessProvider : public AccessProvider
 {
- public:
+public:
 	static FlagsAccessProvider *ap;
 
 	FlagsAccessProvider(Module *o) : AccessProvider(o, "access/flags")
@@ -375,7 +375,7 @@ class CommandCSFlags : public Command
 		return;
 	}
 
- public:
+public:
 	CommandCSFlags(Module *creator) : Command(creator, "chanserv/flags", 1, 5)
 	{
 		this->SetDesc(_("Modify the list of privileged users"));
@@ -480,7 +480,7 @@ class CSFlags : public Module
 	FlagsAccessProvider accessprovider;
 	CommandCSFlags commandcsflags;
 
- public:
+public:
 	CSFlags(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		accessprovider(this), commandcsflags(this)
 	{

modules/commands/cs_getkey.cpp

@@ -13,7 +13,7 @@
 
 class CommandCSGetKey : public Command
 {
- public:
+public:
 	CommandCSGetKey(Module *creator) : Command(creator, "chanserv/getkey", 1, 1)
 	{
 		this->SetDesc(_("Returns the key of the given channel"));
@@ -63,7 +63,7 @@ class CSGetKey : public Module
 {
 	CommandCSGetKey commandcsgetkey;
 
- public:
+public:
 	CSGetKey(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsgetkey(this)
 	{
 

modules/commands/cs_info.cpp

@@ -13,7 +13,7 @@
 
 class CommandCSInfo : public Command
 {
- public:
+public:
 	CommandCSInfo(Module *creator) : Command(creator, "chanserv/info", 1, 2)
 	{
 		this->SetDesc(_("Lists information about the specified registered channel"));
@@ -87,7 +87,7 @@ class CSInfo : public Module
 {
 	CommandCSInfo commandcsinfo;
 
- public:
+public:
 	CSInfo(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcsinfo(this)
 	{

modules/commands/cs_invite.cpp

@@ -13,7 +13,7 @@
 
 class CommandCSInvite : public Command
 {
- public:
+public:
 	CommandCSInvite(Module *creator) : Command(creator, "chanserv/invite", 1, 3)
 	{
 		this->SetDesc(_("Invites you or an optionally specified nick into a channel"));
@@ -101,7 +101,7 @@ class CSInvite : public Module
 {
 	CommandCSInvite commandcsinvite;
 
- public:
+public:
 	CSInvite(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsinvite(this)
 	{
 

modules/commands/cs_kick.cpp

@@ -13,7 +13,7 @@
 
 class CommandCSKick : public Command
 {
- public:
+public:
 	CommandCSKick(Module *creator) : Command(creator, "chanserv/kick", 2, 3)
 	{
 		this->SetDesc(_("Kicks a specified nick from a channel"));
@@ -137,7 +137,7 @@ class CSKick : public Module
 {
 	CommandCSKick commandcskick;
 
- public:
+public:
 	CSKick(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcskick(this)
 	{
 

modules/commands/cs_list.cpp

@@ -14,7 +14,7 @@
 
 class CommandCSList : public Command
 {
- public:
+public:
 	CommandCSList(Module *creator) : Command(creator, "chanserv/list", 1, 2)
 	{
 		this->SetDesc(_("Lists all registered channels matching the given pattern"));
@@ -172,7 +172,7 @@ class CommandCSList : public Command
 
 class CommandCSSetPrivate : public Command
 {
- public:
+public:
 	CommandCSSetPrivate(Module *creator, const Anope::string &cname = "chanserv/set/private") : Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Hide channel from the LIST command"));
@@ -245,7 +245,7 @@ class CSList : public Module
 
 	SerializableExtensibleItem<bool> priv;
 
- public:
+public:
 	CSList(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcslist(this), commandcssetprivate(this), priv(this, "CS_PRIVATE")
 	{

modules/commands/cs_log.cpp

@@ -295,7 +295,7 @@ class CSLog : public Module
 
 	std::vector<LogDefault> defaults;
 
- public:
+public:
 	CSLog(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		MSService("MemoServService", "MemoServ"), commandcslog(this),
 		logsettings(this, "logsettings"), logsetting_type("LogSetting", LogSettingImpl::Unserialize)

modules/commands/cs_mode.cpp

@@ -717,7 +717,7 @@ class CommandCSMode : public Command
 		this->DoSet(source, ci, new_params);
 	}
 
- public:
+public:
 	CommandCSMode(Module *creator) : Command(creator, "chanserv/mode", 2, 4)
 	{
 		this->SetDesc(_("Control modes and mode locks on a channel"));
@@ -791,7 +791,7 @@ static Anope::map<std::pair<bool, Anope::string> > modes;
 
 class CommandCSModes : public Command
 {
- public:
+public:
 	CommandCSModes(Module *creator) : Command(creator, "chanserv/modes", 1, 2)
 	{
 		this->SetSyntax(_("\037channel\037 [\037user\037]"));
@@ -913,7 +913,7 @@ class CSMode : public Module
 	ExtensibleItem<ModeLocksImpl> modelocks;
 	Serialize::Type modelocks_type;
 
- public:
+public:
 	CSMode(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcsmode(this), commandcsmodes(this),
 		modelocks(this, "modelocks"),

modules/commands/cs_register.cpp

@@ -13,7 +13,7 @@
 
 class CommandCSRegister : public Command
 {
- public:
+public:
 	CommandCSRegister(Module *creator) : Command(creator, "chanserv/register", 1, 2)
 	{
 		this->SetDesc(_("Register a channel"));
@@ -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;
@@ -114,7 +114,7 @@ class CSRegister : public Module
 {
 	CommandCSRegister commandcsregister;
 
- public:
+public:
 	CSRegister(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcsregister(this)
 	{

modules/commands/cs_seen.cpp

@@ -111,7 +111,7 @@ static bool ShouldHide(const Anope::string &channel, User *u)
 
 class CommandOSSeen : public Command
 {
- public:
+public:
 	CommandOSSeen(Module *creator) : Command(creator, "operserv/seen", 1, 2)
 	{
 		this->SetDesc(_("Statistics and maintenance for seen data"));
@@ -252,7 +252,7 @@ class CommandSeen : public Command
 			source.Reply(_("%s was last seen here %s ago."), na->nick.c_str(), Anope::Duration(Anope::CurTime - last, source.GetAccount()).c_str());
 	}
 
- public:
+public:
 	CommandSeen(Module *creator) : Command(creator, "chanserv/seen", 1, 2)
 	{
 		this->SetDesc(_("Tells you about the last time a user was seen"));
@@ -373,7 +373,7 @@ class CSSeen : public Module
 	Serialize::Type seeninfo_type;
 	CommandSeen commandseen;
 	CommandOSSeen commandosseen;
- public:
+public:
 	CSSeen(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), seeninfo_type("SeenInfo", SeenInfo::Unserialize), commandseen(this), commandosseen(this)
 	{
 	}
@@ -435,7 +435,7 @@ class CSSeen : public Module
 		UpdateUser(cu->user, KICK, cu->user->nick, source.GetSource(), cu->chan->name, msg);
 	}
 
- private:
+private:
 	void UpdateUser(const User *u, const TypeInfo Type, const Anope::string &nick, const Anope::string &nick2, const Anope::string &channel, const Anope::string &message)
 	{
 		if (simple || !u->server->IsSynced())

modules/commands/cs_set.cpp

@@ -14,7 +14,7 @@
 
 class CommandCSSet : public Command
 {
- public:
+public:
 	CommandCSSet(Module *creator) : Command(creator, "chanserv/set", 2, 3)
 	{
 		this->SetDesc(_("Set channel options and information"));
@@ -66,7 +66,7 @@ class CommandCSSet : public Command
 
 class CommandCSSetAutoOp : public Command
 {
- public:
+public:
 	CommandCSSetAutoOp(Module *creator, const Anope::string &cname = "chanserv/set/autoop") : Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Should services automatically give status to users"));
@@ -129,7 +129,7 @@ class CommandCSSetAutoOp : public Command
 
 class CommandCSSetBanType : public Command
 {
- public:
+public:
 	CommandCSSetBanType(Module *creator, const Anope::string &cname = "chanserv/set/bantype") : Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Set how services make bans on the channel"));
@@ -196,7 +196,7 @@ class CommandCSSetBanType : public Command
 
 class CommandCSSetDescription : public Command
 {
- public:
+public:
 	CommandCSSetDescription(Module *creator, const Anope::string &cname = "chanserv/set/description") : Command(creator, cname, 1, 2)
 	{
 		this->SetDesc(_("Set the channel description"));
@@ -258,7 +258,7 @@ class CommandCSSetDescription : public Command
 
 class CommandCSSetFounder : public Command
 {
- public:
+public:
 	CommandCSSetFounder(Module *creator, const Anope::string &cname = "chanserv/set/founder") : Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Set the founder of a channel"));
@@ -327,7 +327,7 @@ class CommandCSSetFounder : public Command
 
 class CommandCSSetKeepModes : public Command
 {
- public:
+public:
 	CommandCSSetKeepModes(Module *creator, const Anope::string &cname = "chanserv/set/keepmodes") :  Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Retain modes when channel is not in use"));
@@ -392,7 +392,7 @@ class CommandCSSetKeepModes : public Command
 
 class CommandCSSetPeace : public Command
 {
- public:
+public:
 	CommandCSSetPeace(Module *creator, const Anope::string &cname = "chanserv/set/peace") : Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Regulate the use of critical commands"));
@@ -450,7 +450,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;
 	}
 };
@@ -464,7 +464,7 @@ inline static Anope::string BotModes()
 
 class CommandCSSetPersist : public Command
 {
- public:
+public:
 	CommandCSSetPersist(Module *creator, const Anope::string &cname = "chanserv/set/persist") : Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Set the channel as permanent"));
@@ -613,7 +613,7 @@ class CommandCSSetPersist : public Command
 
 class CommandCSSetRestricted : public Command
 {
- public:
+public:
 	CommandCSSetRestricted(Module *creator, const Anope::string &cname = "chanserv/set/restricted") : Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Restrict access to the channel"));
@@ -675,7 +675,7 @@ class CommandCSSetRestricted : public Command
 
 class CommandCSSetSecure : public Command
 {
- public:
+public:
 	CommandCSSetSecure(Module *creator, const Anope::string &cname = "chanserv/set/secure") : Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Activate security features"));
@@ -738,7 +738,7 @@ class CommandCSSetSecure : public Command
 
 class CommandCSSetSecureFounder : public Command
 {
- public:
+public:
 	CommandCSSetSecureFounder(Module *creator, const Anope::string &cname = "chanserv/set/securefounder") : Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Stricter control of channel founder status"));
@@ -802,7 +802,7 @@ class CommandCSSetSecureFounder : public Command
 
 class CommandCSSetSecureOps : public Command
 {
- public:
+public:
 	CommandCSSetSecureOps(Module *creator, const Anope::string &cname = "chanserv/set/secureops") : Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Stricter control of chanop status"));
@@ -864,7 +864,7 @@ class CommandCSSetSecureOps : public Command
 
 class CommandCSSetSignKick : public Command
 {
- public:
+public:
 	CommandCSSetSignKick(Module *creator, const Anope::string &cname = "chanserv/set/signkick") : Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Sign kicks that are done with the KICK command"));
@@ -941,7 +941,7 @@ class CommandCSSetSignKick : public Command
 
 class CommandCSSetSuccessor : public Command
 {
- public:
+public:
 	CommandCSSetSuccessor(Module *creator, const Anope::string &cname = "chanserv/set/successor") : Command(creator, cname, 1, 2)
 	{
 		this->SetDesc(_("Set the successor for a channel"));
@@ -1035,7 +1035,7 @@ class CommandCSSetSuccessor : public Command
 
 class CommandCSSetNoexpire : public Command
 {
- public:
+public:
 	CommandCSSetNoexpire(Module *creator) : Command(creator, "chanserv/saset/noexpire", 2, 2)
 	{
 		this->SetDesc(_("Prevent the channel from expiring"));
@@ -1163,7 +1163,7 @@ class CSSet : public Module
 
 	bool persist_lower_ts;
 
- public:
+public:
 	CSSet(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		noautoop(this, "NOAUTOOP"), peace(this, "PEACE"),
 		securefounder(this, "SECUREFOUNDER"), restricted(this, "RESTRICTED"),

modules/commands/cs_set_misc.cpp

@@ -90,7 +90,7 @@ static Anope::string GetAttribute(const Anope::string &command)
 
 class CommandCSSetMisc : public Command
 {
- public:
+public:
 	CommandCSSetMisc(Module *creator, const Anope::string &cname = "chanserv/set/misc") : Command(creator, cname, 1, 2)
 	{
 		this->SetSyntax(_("\037channel\037 [\037parameters\037]"));
@@ -169,7 +169,7 @@ class CSSetMisc : public Module
 	CommandCSSetMisc commandcssetmisc;
 	Serialize::Type csmiscdata_type;
 
- public:
+public:
 	CSSetMisc(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcssetmisc(this), csmiscdata_type("CSMiscData", CSMiscData::Unserialize)
 	{

modules/commands/cs_status.cpp

@@ -114,7 +114,7 @@ class CSStatus : public Module
 {
 	CommandCSStatus commandcsstatus;
 
- public:
+public:
 	CSStatus(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsstatus(this)
 	{
 	}

modules/commands/cs_suspend.cpp

@@ -52,7 +52,7 @@ struct CSSuspendInfo : SuspendInfo, Serializable
 
 class CommandCSSuspend : public Command
 {
- public:
+public:
 	CommandCSSuspend(Module *creator) : Command(creator, "chanserv/suspend", 2, 3)
 	{
 		this->SetDesc(_("Prevent a channel from being used preserving channel data and settings"));
@@ -144,7 +144,7 @@ class CommandCSSuspend : public Command
 
 class CommandCSUnSuspend : public Command
 {
- public:
+public:
 	CommandCSUnSuspend(Module *creator) : Command(creator, "chanserv/unsuspend", 1, 1)
 	{
 		this->SetDesc(_("Releases a suspended channel"));
@@ -214,7 +214,7 @@ class CSSuspend : public Module
 		return source.IsOper() || std::find(show.begin(), show.end(), what) != show.end();
 	}
 
- public:
+public:
 	CSSuspend(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcssuspend(this), commandcsunsuspend(this), suspend(this, "CS_SUSPENDED"),
 		suspend_type("CSSuspendInfo", CSSuspendInfo::Unserialize)

modules/commands/cs_sync.cpp

@@ -13,7 +13,7 @@
 
 class CommandCSSync : public Command
 {
- public:
+public:
 	CommandCSSync(Module *creator) : Command(creator, "chanserv/sync", 1, 1)
 	{
 		this->SetDesc(_("Sync users channel modes"));
@@ -55,7 +55,7 @@ class CommandCSSync : public Command
 class CSSync : public Module
 {
 	CommandCSSync commandcssync;
- public:
+public:
 	CSSync(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcssync(this)
 	{